October 2022 - Wine-commits

Eric Pouech : conhost: Fix tests on ReadConsole with CONSOLE_READCONSOLE_CONTROL.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: c19f3b620acda9125cc975c02992a544b27e5929 URL: https://gitlab.winehq.org/wine/wine/-/commit/c19f3b620acda9125cc975c02992a5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Sat Oct 8 17:44:54 2022 +0200 conhost: Fix tests on ReadConsole with CONSOLE_READCONSOLE_CONTROL. It should fix the errors around line 1370 in conhost/tests/tty.c, but it doesn't fix other errors around line 1530 and 1550 which are completly unrelated to this change. So failures to be expected on the latter. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52648 Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- programs/conhost/tests/tty.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 849986a1c29..cab7cd5574f 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1337,6 +1337,9 @@ static void test_read_console_control(void) /* test simple behavior */ for (ctrl = 0; ctrl < ' '; ctrl++) { + DWORD state; + SHORT cc; + /* don't play with fire */ if (ctrl == 0 || ctrl == 3 || ctrl == '\n' || ctrl == 27) continue; @@ -1359,10 +1362,13 @@ static void test_read_console_control(void) strcpy(buf, "def."); buf[3] = ctrl; write_console_pipe(buf); wcscpy(bufw, L"abcdef."); bufw[6] = (WCHAR)ctrl; - child_expect_read_control_result(child_pipe, bufw, - (ctrl == '\t' || ctrl == '\r') ? 0 - : ((ctrl == 30 || ctrl == 31) ? (LEFT_CTRL_PRESSED | SHIFT_PRESSED) - : LEFT_CTRL_PRESSED)); + /* ^H requires special handling */ + cc = (ctrl == 8) ? 0x0200 : VkKeyScanA(ctrl); + if (cc == -1) cc = 0; + state = 0; + if (cc & 0x0100) state |= SHIFT_PRESSED; + if (cc & 0x0200) state |= LEFT_CTRL_PRESSED; + child_expect_read_control_result(child_pipe, bufw, state); skip_sequence("\x1b[?25l"); /* hide cursor */ expect_output_sequence("def"); skip_sequence("\x1b[?25h"); /* show cursor */

1 0

Alex Henrie : include: Fix typos in NIN_BALLOON*.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 7d223c5326f21cc4152d39b225c6b1528edca559 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d223c5326f21cc4152d39b225c6b1… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 9 22:33:33 2022 -0600 include: Fix typos in NIN_BALLOON*. Needed to compile Tera Term. --- include/shellapi.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index e02869f14e8..b7c136c2efa 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -385,10 +385,10 @@ void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lp #define NIN_SELECT (WM_USER+0) #define NINF_KEY 1 #define NIN_KEYSELECT (NIN_SELECT|NINF_KEY) /* WM_USER+1 */ -#define NIN_BALOONSHOW (WM_USER+2) -#define NIN_BALOONHIDE (WM_USER+3) -#define NIN_BALOONTIMEOUT (WM_USER+4) -#define NIN_BALOONCLICK (WM_USER+5) +#define NIN_BALLOONSHOW (WM_USER+2) +#define NIN_BALLOONHIDE (WM_USER+3) +#define NIN_BALLOONTIMEOUT (WM_USER+4) +#define NIN_BALLOONUSERCLICK (WM_USER+5) #define NIN_POPUPOPEN (WM_USER+6) #define NIN_POPUPCLOSE (WM_USER+7)

1 0

Jacek Caban : winevulkan: Use host Vulkan structures for private thunks arguments.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 000a7bbb5a10ca9144b7ab7a23c4716edf1a83b0 URL: https://gitlab.winehq.org/wine/wine/-/commit/000a7bbb5a10ca9144b7ab7a23c471… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Sep 23 21:37:45 2022 +0200 winevulkan: Use host Vulkan structures for private thunks arguments. --- dlls/winevulkan/make_vulkan | 176 ++++++++++++++++----------------- dlls/winevulkan/vulkan.c | 70 ++++++++------ dlls/winevulkan/vulkan_thunks.c | 209 +++++++++++----------------------------- dlls/winevulkan/vulkan_thunks.h | 112 +++++++++------------ 4 files changed, 225 insertions(+), 342 deletions(-)

1 0

Francois Gouget : d3d9/tests: Mark the test_wndproc() tests failing randomly on Windows as flaky.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 61ee891c67037fcadd6d8d831542d5f687c74ded URL: https://gitlab.winehq.org/wine/wine/-/commit/61ee891c67037fcadd6d8d831542d5… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sat Oct 1 10:32:30 2022 +0200 d3d9/tests: Mark the test_wndproc() tests failing randomly on Windows as flaky. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53281 --- dlls/d3d9/tests/d3d9ex.c | 1 + dlls/d3d9/tests/device.c | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index b9c5ecd2e05..d1ea5587f3a 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -3096,6 +3096,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky_if(i == 0 || i == 1) ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL; diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9fe05625190..c824edec9df 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -4342,6 +4342,7 @@ static void test_wndproc(void) SetForegroundWindow(GetDesktopWindow()); ok(!expect_messages->message, "Expected message %#x for window %#x, but didn't receive it, i=%u.\n", expect_messages->message, expect_messages->window, i); + flaky_if(i == 0) ok(!windowposchanged_received, "Received WM_WINDOWPOSCHANGED but did not expect it, i=%u.\n", i); expect_messages = NULL;

1 0

Eric Pouech : wined3d: Ensure function declaration matches implementation.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 414543f6abe63d4ba46018615da4b525d96d6127 URL: https://gitlab.winehq.org/wine/wine/-/commit/414543f6abe63d4ba46018615da4b5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:54:43 2022 +0200 wined3d: Ensure function declaration matches implementation. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/wined3d_private.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5217ee7d221..b02bf1bef36 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2939,7 +2939,7 @@ void context_gl_apply_texture_draw_state(struct wined3d_context_gl *context_gl, void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) DECLSPEC_HIDDEN; void context_invalidate_compute_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; -void context_invalidate_state(struct wined3d_context *context, DWORD state_id) DECLSPEC_HIDDEN; +void context_invalidate_state(struct wined3d_context *context, unsigned int state_id) DECLSPEC_HIDDEN; void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; @@ -4055,7 +4055,7 @@ LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; -void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; +void device_invalidate_state(const struct wined3d_device *device, unsigned int state) DECLSPEC_HIDDEN; HRESULT wined3d_device_set_implicit_swapchain(struct wined3d_device *device, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_device_uninit_3d(struct wined3d_device *device) DECLSPEC_HIDDEN;

1 0

Eric Pouech : wined3d: Ensure method declaration matches implementations.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 25f6693048ab26cabfccccec715b89c6f568dc96 URL: https://gitlab.winehq.org/wine/wine/-/commit/25f6693048ab26cabfccccec715b89… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:54:45 2022 +0200 wined3d: Ensure method declaration matches implementations. wined3d_resource_ops.resource_sub_resource_map() Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a065d0ae54f..c76a50ea6ae 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3689,7 +3689,7 @@ static void texture_resource_sub_resource_get_map_pitch(struct wined3d_resource } static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resource, unsigned int sub_resource_idx, - void **map_ptr, const struct wined3d_box *box, DWORD flags) + void **map_ptr, const struct wined3d_box *box, uint32_t flags) { struct wined3d_texture_sub_resource *sub_resource; struct wined3d_device *device = resource->device; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b02bf1bef36..b7d3b579ed2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4393,7 +4393,7 @@ struct wined3d_resource_ops void (*resource_sub_resource_get_map_pitch)(struct wined3d_resource *resource, unsigned int sub_resource_idx, unsigned int *row_pitch, unsigned int *slice_pitch); HRESULT (*resource_sub_resource_map)(struct wined3d_resource *resource, unsigned int sub_resource_idx, - void **map_ptr, const struct wined3d_box *box, DWORD flags); + void **map_ptr, const struct wined3d_box *box, uint32_t flags); HRESULT (*resource_sub_resource_unmap)(struct wined3d_resource *resource, unsigned int sub_resource_idx); };

1 0

Eric Pouech : wined3d: Use I width modifier for debug traces on DWORD_PTR.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 0d359fb8de728ea433e43465d5897de81aebbc3d URL: https://gitlab.winehq.org/wine/wine/-/commit/0d359fb8de728ea433e43465d5897d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri Oct 7 11:54:46 2022 +0200 wined3d: Use I width modifier for debug traces on DWORD_PTR. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/buffer.c | 2 +- dlls/wined3d/context_vk.c | 4 ++-- dlls/wined3d/device.c | 2 +- dlls/wined3d/shader_sm4.c | 6 +++--- dlls/wined3d/wined3d_main.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 3a2263d109f..1a953f8e218 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -282,7 +282,7 @@ static BOOL buffer_process_converted_attribute(struct wined3d_buffer *buffer, DWORD_PTR idx = (data + i) % buffer->stride; if (buffer->conversion_map[idx] != conversion_type) { - TRACE("Byte %lu in vertex changed:\n", idx); + TRACE("Byte %Iu in vertex changed:\n", idx); TRACE(" It was type %#x, is %#x now.\n", buffer->conversion_map[idx], conversion_type); ret = TRUE; buffer->conversion_map[idx] = conversion_type; diff --git a/dlls/wined3d/context_vk.c b/dlls/wined3d/context_vk.c index d47f7cf5d1a..13700c6dfb9 100644 --- a/dlls/wined3d/context_vk.c +++ b/dlls/wined3d/context_vk.c @@ -781,7 +781,7 @@ static void wined3d_bo_slab_vk_free_slice(struct wined3d_bo_slab_vk *slab, struct wined3d_bo_slab_vk_key key; struct wine_rb_entry *entry; - TRACE("slab %p, idx %lu, context_vk %p.\n", slab, idx, context_vk); + TRACE("slab %p, idx %Iu, context_vk %p.\n", slab, idx, context_vk); wined3d_device_vk_allocator_lock(device_vk); @@ -819,7 +819,7 @@ static void wined3d_context_vk_destroy_bo_slab_slice(struct wined3d_context_vk * if (!(o = wined3d_context_vk_get_retired_object_vk(context_vk))) { - ERR("Leaking slab %p, slice %#lx.\n", slab, idx); + ERR("Leaking slab %p, slice %#Ix.\n", slab, idx); return; } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e214c47f071..d1c18177d62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1112,7 +1112,7 @@ bool wined3d_device_gl_create_bo(struct wined3d_device_gl *device_gl, struct win GLsizeiptr buffer_offset = 0; GLuint id = 0; - TRACE("device_gl %p, context_gl %p, size %lu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", + TRACE("device_gl %p, context_gl %p, size %Iu, binding %#x, usage %#x, coherent %#x, flags %#x, bo %p.\n", device_gl, context_gl, size, binding, usage, coherent, flags, bo); if (gl_info->supported[ARB_BUFFER_STORAGE]) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 73001d90833..62aba18a235 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -1717,7 +1717,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } if (!len || remaining < len) { - WARN("Read invalid length %u (remaining %lu).\n", len, remaining); + WARN("Read invalid length %u (remaining %Iu).\n", len, remaining); goto fail; } --len; @@ -1920,7 +1920,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (chunk_offset >= data_size || !require_space(chunk_offset, 2, sizeof(DWORD), data_size)) { - WARN("Invalid chunk offset %#x (data size %#lx).\n", chunk_offset, data_size); + WARN("Invalid chunk offset %#x (data size %#Ix).\n", chunk_offset, data_size); return E_FAIL; } @@ -1931,7 +1931,7 @@ static HRESULT parse_dxbc(const char *data, SIZE_T data_size, if (!require_space(chunk_ptr - data, 1, chunk_size, data_size)) { - WARN("Invalid chunk size %#x (data size %#lx, chunk offset %#x).\n", + WARN("Invalid chunk size %#x (data size %#Ix, chunk offset %#x).\n", chunk_size, data_size, chunk_offset); return E_FAIL; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 4b718746b6a..2e4dda2c473 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -630,7 +630,7 @@ static LRESULT CALLBACK wined3d_wndproc(HWND window, UINT message, WPARAM wparam { if (filter && message != WM_DISPLAYCHANGE) { - TRACE("Filtering message: window %p, message %#x, wparam %#lx, lparam %#lx.\n", + TRACE("Filtering message: window %p, message %#x, wparam %#Ix, lparam %#Ix.\n", window, message, wparam, lparam); if (unicode)

1 0

Alex Henrie : include: Fix typo in LR_VGACOLOR.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 9d2b879d1773a95239d7225503137f79f635d9bc URL: https://gitlab.winehq.org/wine/wine/-/commit/9d2b879d1773a95239d7225503137f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Oct 9 22:14:36 2022 -0600 include: Fix typo in LR_VGACOLOR. Needed to compile Tera Term. --- include/winuser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index b17f30debd3..2f4afffb8a3 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3132,7 +3132,7 @@ typedef struct tagTRACKMOUSEEVENT { #define LR_LOADFROMFILE 0x0010 #define LR_LOADTRANSPARENT 0x0020 #define LR_DEFAULTSIZE 0x0040 -#define LR_VGA_COLOR 0x0080 +#define LR_VGACOLOR 0x0080 #define LR_LOADMAP3DCOLORS 0x1000 #define LR_CREATEDIBSECTION 0x2000 #define LR_COPYFROMRESOURCE 0x4000

1 0

Rémi Bernon : mf: Avoid clearing media session command list while it is running.
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: 16d975fc128bdd754b6ce912a45927cf113efd28 URL: https://gitlab.winehq.org/wine/wine/-/commit/16d975fc128bdd754b6ce912a45927… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Sep 16 13:30:31 2022 +0200 mf: Avoid clearing media session command list while it is running. This fixes a random crash with mfmediaengine tests, which quickly starts then shuts down a media session. --- dlls/mf/session.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 8be3ffcd7f3..b410a5fe861 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -47,6 +47,7 @@ enum session_command SESSION_CMD_PAUSE, SESSION_CMD_STOP, SESSION_CMD_SET_RATE, + SESSION_CMD_SHUTDOWN, }; struct session_op @@ -460,7 +461,10 @@ static HRESULT session_submit_command(struct media_session *session, struct sess { if (list_empty(&session->commands) && !(session->presentation.flags & SESSION_FLAG_PENDING_COMMAND)) hr = MFPutWorkItem(MFASYNC_CALLBACK_QUEUE_STANDARD, &session->commands_callback, &op->IUnknown_iface); - list_add_tail(&session->commands, &op->entry); + if (op->command == SESSION_CMD_SHUTDOWN) + list_add_head(&session->commands, &op->entry); + else + list_add_tail(&session->commands, &op->entry); IUnknown_AddRef(&op->IUnknown_iface); } LeaveCriticalSection(&session->cs); @@ -2041,7 +2045,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) IMFPresentationClock_Release(session->clock); session->clock = NULL; session_clear_presentation(session); - session_clear_command_list(session); + session_submit_simple_command(session, SESSION_CMD_SHUTDOWN); } LeaveCriticalSection(&session->cs); @@ -2383,6 +2387,10 @@ static HRESULT WINAPI session_commands_callback_Invoke(IMFAsyncCallback *iface, case SESSION_CMD_SET_RATE: session_set_rate(session, op->set_rate.thin, op->set_rate.rate); break; + case SESSION_CMD_SHUTDOWN: + session_clear_command_list(session); + session_command_complete(session); + break; default: ; }

1 0

Zebediah Figura : d3d8: Factor out d3d8_texture_init().
by Alexandre Julliard 10 Oct '22

10 Oct '22

Module: wine Branch: master Commit: a72e2613aeea4c24fbb21feedd3fdc00fe6ba7e4 URL: https://gitlab.winehq.org/wine/wine/-/commit/a72e2613aeea4c24fbb21feedd3fdc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 29 18:06:00 2022 -0500 d3d8: Factor out d3d8_texture_init(). --- dlls/d3d8/d3d8_private.h | 13 +++--- dlls/d3d8/device.c | 6 +-- dlls/d3d8/texture.c | 119 ++++++++++++++++------------------------------- 3 files changed, 49 insertions(+), 89 deletions(-)

1 0