November 2021 - Wine-commits

Alexandre Julliard : Release 6.22.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 986254d6c17ee1e5fb3aed6effcf2766bf1e787e URL: https://source.winehq.org/git/wine.git/?a=commit;h=986254d6c17ee1e5fb3aed6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 19 22:42:48 2021 +0100 Release 6.22. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1052 ++++++++++++++++++++++++++++++++----------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 18 +- 4 files changed, 558 insertions(+), 518 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=986254d6c17ee1e5fb3a…

1 0

Tag wine-6.22 : Alexandre Julliard : Release 6.22
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: refs/tags/wine-6.22 Tag: 5e3d859748c39579e9af525fa4a62b7f54fd785d URL: https://source.winehq.org/git/wine.git/?a=tag;h=5e3d859748c39579e9af525fa4a… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 19 22:42:48 2021 +0100 Release 6.22

1 0

Ivo Ivanov : joy.cpl: Allow devices as steering wheels, that only support single-axis effects.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: c2235c44c5f8fedaad775c69b9a475725874bbc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2235c44c5f8fedaad775c69… Author: Ivo Ivanov <logos128(a)gmail.com> Date: Fri Nov 19 09:39:42 2021 +0100 joy.cpl: Allow devices as steering wheels, that only support single-axis effects. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51873 Signed-off-by: Ivo Ivanov <logos128(a)gmail.com> Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/main.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index c96efb17aa3..a1308606f98 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -790,6 +790,7 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) DIEFFECT dieffect; DWORD axes[2] = {DIJOFS_X, DIJOFS_Y}; int direction[2] = {0, 0}; + int num_axes = 2; struct Joystick *joystick = pvRef; DIRAMPFORCE rforce; DICONSTANTFORCE cforce; @@ -811,8 +812,8 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) dieffect.dwSize = sizeof(dieffect); dieffect.dwFlags = DIEFF_CARTESIAN|DIEFF_OBJECTOFFSETS; dieffect.dwDuration = FF_PLAY_TIME; + dieffect.dwGain = DI_FFNOMINALMAX; - dieffect.cAxes = 2; dieffect.rgdwAxes = axes; dieffect.rglDirection = direction; @@ -865,8 +866,14 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef) dieffect.dwFlags |= DIEP_TYPESPECIFICPARAMS; } - hr = IDirectInputDevice2_CreateEffect( - joystick->device, &pdei->guid, &dieffect, &joystick->effects[joystick->cur_effect].effect, NULL); + do + { + dieffect.cAxes = num_axes--; + hr = IDirectInputDevice2_CreateEffect( + joystick->device, &pdei->guid, &dieffect, &joystick->effects[joystick->cur_effect].effect, NULL); + } + while (FAILED(hr) && num_axes); + if (FAILED(hr)) { FIXME("Failed to create effect with type %s, hr %#x\n", debugstr_guid(&pdei->guid), hr);

1 0

Zebediah Figura : wined3d: Add a helper to calculate the vertex attribute address for a stream element.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 6f0d15e0e3af22f5c3c347ccd62a45a9feb64de1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f0d15e0e3af22f5c3c347cc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 18 21:06:16 2021 -0600 wined3d: Add a helper to calculate the vertex attribute address for a stream element. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 58 +++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6f0d15e0e3af22f5c3c3…

1 0

Henri Verbeet : wined3d: Allow OpenGL vertex buffer objects to be suballocated from a larger BO.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: a9584bf5218d67e64f7c2bbf30d2e6b588a6246c URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9584bf5218d67e64f7c2bbf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:17 2021 -0600 wined3d: Allow OpenGL vertex buffer objects to be suballocated from a larger BO. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 7 ++++++- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index cec698d7a6b..3868351a4b3 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -2922,6 +2922,7 @@ bool wined3d_context_gl_create_bo(struct wined3d_context_gl *context_gl, GLsizei list_init(&bo->b.users); bo->command_fence_id = 0; bo->b.memory_offset = 0; + bo->buffer_offset = 0; bo->b.map_ptr = NULL; return true; @@ -5070,7 +5071,11 @@ void wined3d_context_gl_unload_tex_coords(const struct wined3d_context_gl *conte static const void *get_vertex_attrib_pointer(const struct wined3d_stream_info_element *element, const struct wined3d_state *state) { - return element->data.addr + state->load_base_vertex_index * element->stride; + const uint8_t *offset = element->data.addr + state->load_base_vertex_index * element->stride; + + if (element->data.buffer_object) + offset += wined3d_bo_gl(element->data.buffer_object)->buffer_offset; + return offset; } void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90824d83290..79b02c2448d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1606,6 +1606,7 @@ struct wined3d_bo_gl struct wined3d_bo b; GLuint id; + GLsizeiptr buffer_offset; GLsizeiptr size; GLenum binding; GLenum usage;

1 0

Henri Verbeet : wined3d: Allow OpenGL index buffer objects to be suballocated from a larger BO.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 6c6fcff96e5a1188816658871974f1aaaa575955 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c6fcff96e5a118881665887… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:18 2021 -0600 wined3d: Allow OpenGL index buffer objects to be suballocated from a larger BO. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 3868351a4b3..5767258973d 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -4909,10 +4909,12 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s if (parameters->indexed) { struct wined3d_buffer *index_buffer = state->index_buffer; - if (!index_buffer->buffer_object || !stream_info->all_vbo) + struct wined3d_bo *bo = index_buffer->buffer_object; + + if (!bo || !stream_info->all_vbo) idx_data = index_buffer->resource.heap_memory; else - idx_data = NULL; + idx_data = (void *)wined3d_bo_gl(bo)->buffer_offset; idx_data = (const BYTE *)idx_data + state->index_offset; if (state->index_format == WINED3DFMT_R16_UINT)

1 0

Zebediah Figura : wined3d: Allow OpenGL transform feedback buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 3057929d5473ca9b4416fb9ece5a66623d9b8325 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3057929d5473ca9b4416fb9e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Nov 18 21:06:19 2021 -0600 wined3d: Allow OpenGL transform feedback buffer objects to be suballocated from a larger buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 21b5ba1d032..adbaa50a349 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4651,6 +4651,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state const struct wined3d_gl_info *gl_info = context_gl->gl_info; struct wined3d_buffer *buffer; unsigned int offset, size, i; + struct wined3d_bo_gl *bo_gl; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -4666,6 +4667,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state buffer = state->stream_output[i].buffer; offset = state->stream_output[i].offset; + bo_gl = wined3d_bo_gl(buffer->buffer_object); if (offset == ~0u) { FIXME("Appending to stream output buffers not implemented.\n"); @@ -4673,7 +4675,7 @@ static void state_so(struct wined3d_context *context, const struct wined3d_state } size = buffer->resource.size - offset; GL_EXTCALL(glBindBufferRange(GL_TRANSFORM_FEEDBACK_BUFFER, i, - wined3d_bo_gl(buffer->buffer_object)->id, offset, size)); + bo_gl->id, bo_gl->buffer_offset + offset, size)); buffer->bo_user.valid = true; } checkGLcall("bind transform feedback buffers");

1 0

Henri Verbeet : wined3d: Allow OpenGL uniform buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: 8f0c9e490bc8266787cb1adf07f11791ca2d23ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=8f0c9e490bc8266787cb1adf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:20 2021 -0600 wined3d: Allow OpenGL uniform buffer objects to be suballocated from a larger buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index adbaa50a349..e0dba8701bc 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4577,6 +4577,7 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state enum wined3d_shader_type shader_type; struct wined3d_buffer *buffer; unsigned int i, base, count; + struct wined3d_bo_gl *bo_gl; TRACE("context %p, state %p, state_id %#x.\n", context, state, state_id); @@ -4597,8 +4598,9 @@ static void state_cb(struct wined3d_context *context, const struct wined3d_state } buffer = buffer_state->buffer; + bo_gl = wined3d_bo_gl(buffer->buffer_object); GL_EXTCALL(glBindBufferRange(GL_UNIFORM_BUFFER, base + i, - wined3d_bo_gl(buffer->buffer_object)->id, buffer_state->offset, buffer_state->size)); + bo_gl->id, bo_gl->buffer_offset + buffer_state->offset, buffer_state->size)); buffer->bo_user.valid = true; } checkGLcall("bind constant buffers");

1 0

Henri Verbeet : wined3d: Allow OpenGL atomic counter buffer objects to be suballocated from a larger buffer.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: ba5f90b29ac237e2aaf97b2cd132c913de47061f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba5f90b29ac237e2aaf97b2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Nov 18 21:06:21 2021 -0600 wined3d: Allow OpenGL atomic counter buffer objects to be suballocated from a larger buffer. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context_gl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context_gl.c b/dlls/wined3d/context_gl.c index 5767258973d..2751a4a2182 100644 --- a/dlls/wined3d/context_gl.c +++ b/dlls/wined3d/context_gl.c @@ -3788,7 +3788,8 @@ static void wined3d_context_gl_bind_unordered_access_views(struct wined3d_contex format_gl->internal)); if (view_gl->counter_bo.id) - GL_EXTCALL(glBindBufferBase(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo.id)); + GL_EXTCALL(glBindBufferRange(GL_ATOMIC_COUNTER_BUFFER, i, view_gl->counter_bo.id, + view_gl->counter_bo.buffer_offset, view_gl->counter_bo.size)); } checkGLcall("Bind unordered access views"); }

1 0

Piotr Caban : msvcp140: Fix _Winerror_message test failures.
by Alexandre Julliard 19 Nov '21

19 Nov '21

Module: wine Branch: master Commit: afc0d31d3e4a5861fa20cf2e82aec92c8cee14f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afc0d31d3e4a5861fa20cf2e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Nov 19 13:26:18 2021 +0100 msvcp140: Fix _Winerror_message test failures. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51307 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/tests/msvcp140.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msvcp140/tests/msvcp140.c b/dlls/msvcp140/tests/msvcp140.c index 8a3771842a0..31c8cfc4f59 100644 --- a/dlls/msvcp140/tests/msvcp140.c +++ b/dlls/msvcp140/tests/msvcp140.c @@ -1254,8 +1254,10 @@ static void test__Winerror_message(void) memset(buf, 'a', sizeof(buf)); ret = p__Winerror_message(0, buf, sizeof(buf)); - ok(ret == ret_fm, "ret = %u, expected %u\n", ret, ret_fm); - ok(!strcmp(buf, buf_fm), "buf = %s, expected %s\n", buf, buf_fm); + ok(ret == ret_fm || (ret_fm > 2 && buf_fm[ret_fm - 1] == '\n' && + buf_fm[ret_fm - 2] == '\r' && ret + 2 == ret_fm), + "ret = %u, expected %u\n", ret, ret_fm); + ok(!strncmp(buf, buf_fm, ret), "buf = %s, expected %s\n", buf, buf_fm); memset(buf, 'a', sizeof(buf)); ret = p__Winerror_message(0, buf, 2);

1 0