January 2024 - Wine-Commits

Fabian Maurer : dmsynth: Leave critical section when out of memory (Coverity).
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 0459802ac1544bfa56d0c9aa016badc40ad80aad URL: https://gitlab.winehq.org/wine/wine/-/commit/0459802ac1544bfa56d0c9aa016bad… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jan 6 21:14:33 2024 +0100 dmsynth: Leave critical section when out of memory (Coverity). --- dlls/dmsynth/synth.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 3eed05f35a0..5453c296be3 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -585,7 +585,11 @@ static HRESULT WINAPI synth_Open(IDirectMusicSynth8 *iface, DMUS_PORTPARAMS *par !!(actual.dwEffectFlags & DMUS_EFFECT_REVERB)); fluid_settings_setint(This->fluid_settings, "synth.chorus.active", !!(actual.dwEffectFlags & DMUS_EFFECT_CHORUS)); - if (!(This->fluid_synth = new_fluid_synth(This->fluid_settings))) return E_OUTOFMEMORY; + if (!(This->fluid_synth = new_fluid_synth(This->fluid_settings))) + { + LeaveCriticalSection(&This->cs); + return E_OUTOFMEMORY; + } if ((id = fluid_synth_add_sfont(This->fluid_synth, This->fluid_sfont)) == FLUID_FAILED) WARN("Failed to add fluid_sfont to fluid_synth\n"); synth_reset_default_values(This);

1 0

Eric Pouech : winedbg: Print all pid and tid with 4 hex characters.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 1d53204ebfba01975ee22d42cf7c73b70139ac31 URL: https://gitlab.winehq.org/wine/wine/-/commit/1d53204ebfba01975ee22d42cf7c73… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jan 6 21:50:40 2024 +0100 winedbg: Print all pid and tid with 4 hex characters. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/winedbg/gdbproxy.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/programs/winedbg/gdbproxy.c b/programs/winedbg/gdbproxy.c index 83ad5ef3535..2d20c6a4f5c 100644 --- a/programs/winedbg/gdbproxy.c +++ b/programs/winedbg/gdbproxy.c @@ -587,7 +587,7 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load return TRUE; case UNLOAD_DLL_DEBUG_EVENT: - fprintf(stderr, "%08lx:%08lx: unload DLL @%p\n", + fprintf(stderr, "%04lx:%04lx: unload DLL @%p\n", de->dwProcessId, de->dwThreadId, de->u.UnloadDll.lpBaseOfDll); SymUnloadModule(gdbctx->process->handle, (DWORD_PTR)de->u.UnloadDll.lpBaseOfDll); @@ -596,16 +596,16 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load return TRUE; case EXCEPTION_DEBUG_EVENT: - TRACE("%08lx:%08lx: exception code=0x%08lx\n", de->dwProcessId, - de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); + TRACE("%04lx:%04lx: exception code=0x%08lx\n", de->dwProcessId, + de->dwThreadId, de->u.Exception.ExceptionRecord.ExceptionCode); if (handle_exception(gdbctx, &de->u.Exception)) return TRUE; break; case CREATE_THREAD_DEBUG_EVENT: - fprintf(stderr, "%08lx:%08lx: create thread D @%p\n", de->dwProcessId, - de->dwThreadId, de->u.CreateThread.lpStartAddress); + fprintf(stderr, "%04lx:%04lx: create thread D @%p\n", de->dwProcessId, + de->dwThreadId, de->u.CreateThread.lpStartAddress); dbg_add_thread(gdbctx->process, de->dwThreadId, @@ -614,14 +614,14 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load return TRUE; case EXIT_THREAD_DEBUG_EVENT: - fprintf(stderr, "%08lx:%08lx: exit thread (%lu)\n", + fprintf(stderr, "%04lx:%04lx: exit thread (%lu)\n", de->dwProcessId, de->dwThreadId, de->u.ExitThread.dwExitCode); if ((thread = dbg_get_thread(gdbctx->process, de->dwThreadId))) dbg_del_thread(thread); return TRUE; case EXIT_PROCESS_DEBUG_EVENT: - fprintf(stderr, "%08lx:%08lx: exit process (%lu)\n", + fprintf(stderr, "%04lx:%04lx: exit process (%lu)\n", de->dwProcessId, de->dwThreadId, de->u.ExitProcess.dwExitCode); dbg_del_process(gdbctx->process); @@ -632,18 +632,18 @@ static BOOL handle_debug_event(struct gdb_context* gdbctx, BOOL stop_on_dll_load memory_get_string(gdbctx->process, de->u.DebugString.lpDebugStringData, TRUE, de->u.DebugString.fUnicode, u.bufferA, sizeof(u.bufferA)); - fprintf(stderr, "%08lx:%08lx: output debug string (%s)\n", - de->dwProcessId, de->dwThreadId, debugstr_a(u.bufferA)); + fprintf(stderr, "%04lx:%04lx: output debug string (%s)\n", + de->dwProcessId, de->dwThreadId, debugstr_a(u.bufferA)); return TRUE; case RIP_EVENT: - fprintf(stderr, "%08lx:%08lx: rip error=%lu type=%lu\n", de->dwProcessId, - de->dwThreadId, de->u.RipInfo.dwError, de->u.RipInfo.dwType); + fprintf(stderr, "%04lx:%04lx: rip error=%lu type=%lu\n", de->dwProcessId, + de->dwThreadId, de->u.RipInfo.dwError, de->u.RipInfo.dwType); return TRUE; default: - FIXME("%08lx:%08lx: unknown event (%lu)\n", - de->dwProcessId, de->dwThreadId, de->dwDebugEventCode); + FIXME("%04lx:%04lx: unknown event (%lu)\n", + de->dwProcessId, de->dwThreadId, de->dwDebugEventCode); } LIST_FOR_EACH_ENTRY(thread, &gdbctx->process->threads, struct dbg_thread, entry)

1 0

Rémi Bernon : dinput/tests: Make some failing keyboard test flaky_wine.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: ee51d536f0b63d69ede4dfe1160cb37e8f54c043 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee51d536f0b63d69ede4dfe1160cb3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 13 21:47:45 2024 +0100 dinput/tests: Make some failing keyboard test flaky_wine. --- dlls/dinput/tests/device8.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c index 5d4c2bb4366..3a702b8f2fe 100644 --- a/dlls/dinput/tests/device8.c +++ b/dlls/dinput/tests/device8.c @@ -2234,6 +2234,7 @@ static void test_sys_keyboard( DWORD version ) memset( key_state, 0xcd, sizeof(key_state) ); hr = IDirectInputDevice8_GetDeviceState( device, sizeof(key_state), key_state ); ok( hr == DI_OK, "GetDeviceState returned %#lx\n", hr ); + flaky_wine_if( version < 0x800 && key_state[0] == 0 ) ok( key_state[0] == (version < 0x800 ? 0x80 : 0), "got key_state[0] %lu\n", key_state[0] ); /* unacquiring should reset the device state */

1 0

Rémi Bernon : imm32/tests: Add todo_himc to some ImmTranslateMessage expected calls.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 5f7094ffd42568407bdb47f1631919158bbfc2df URL: https://gitlab.winehq.org/wine/wine/-/commit/5f7094ffd42568407bdb47f1631919… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jan 15 10:42:51 2024 +0100 imm32/tests: Add todo_himc to some ImmTranslateMessage expected calls. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=55491 --- dlls/imm32/tests/imm32.c | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 66ebbfd161d..488afbd34a9 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -385,6 +385,7 @@ struct ime_call BOOL broken; BOOL flaky_himc; BOOL todo_value; + BOOL todo_himc; }; struct ime_call empty_sequence[] = {{0}}; @@ -399,7 +400,13 @@ static int ok_call_( const char *file, int line, const struct ime_call *expected if ((ret = expected->func - received->func)) goto done; /* Wine doesn't allocate HIMC in a deterministic order, ignore them when they are enumerated */ if (expected->flaky_himc && (ret = !!(UINT_PTR)expected->himc - !!(UINT_PTR)received->himc)) goto done; - if (!expected->flaky_himc && (ret = (UINT_PTR)expected->himc - (UINT_PTR)received->himc)) goto done; + if (!expected->flaky_himc && (ret = (UINT_PTR)expected->himc - (UINT_PTR)received->himc)) + { + /* on some Wine configurations the IME UI doesn't get an HIMC */ + if (!winetest_platform_is_wine || !expected->todo_himc) goto done; + else todo_wine ok( 0, "got himc %p\n", received->himc ); + } + if ((ret = (UINT)(UINT_PTR)expected->hkl - (UINT)(UINT_PTR)received->hkl)) goto done; switch (expected->func) { @@ -7081,17 +7088,25 @@ static void test_ImmTranslateMessage( BOOL kbd_char_first ) struct ime_call post_messages[] = { {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 1}}, - {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 1}}, + {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 1}, + .todo_himc = TRUE /* on some Wine configurations the IME UI doesn't get an HIMC */ + }, {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_ENDCOMPOSITION, .wparam = 1}}, - {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_ENDCOMPOSITION, .wparam = 1}}, + {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_ENDCOMPOSITION, .wparam = 1}, + .todo_himc = TRUE /* on some Wine configurations the IME UI doesn't get an HIMC */ + }, {0}, }; struct ime_call sent_messages[] = { {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 2}}, - {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 2}}, + {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_STARTCOMPOSITION, .wparam = 2}, + .todo_himc = TRUE /* on some Wine configurations the IME UI doesn't get an HIMC */ + }, {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_TEST_WIN, .message = {.msg = WM_IME_ENDCOMPOSITION, .wparam = 2}}, - {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_ENDCOMPOSITION, .wparam = 2}}, + {.hkl = expect_ime, .himc = 0/*himc*/, .func = MSG_IME_UI, .message = {.msg = WM_IME_ENDCOMPOSITION, .wparam = 2}, + .todo_himc = TRUE /* on some Wine configurations the IME UI doesn't get an HIMC */ + }, {0}, }; HWND hwnd, other_hwnd;

1 0

Nikolay Sivov : ntdll: Update RTL_HEAP_PARAMETERS definition.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 73647adaef44a76e108a5c2e65d66aed3d1ca52a URL: https://gitlab.winehq.org/wine/wine/-/commit/73647adaef44a76e108a5c2e65d66a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 9 15:07:00 2024 +0100 ntdll: Update RTL_HEAP_PARAMETERS definition. --- dlls/ntdll/heap.c | 20 +++----------------- include/winternl.h | 22 +++++++++++++++++----- tools/winapi/win32.api | 2 +- 3 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4dc3e7296b6..ec4e376bd4b 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1490,23 +1490,9 @@ static void heap_set_debug_flags( HANDLE handle ) /*********************************************************************** * RtlCreateHeap (NTDLL.@) - * - * Create a new Heap. - * - * PARAMS - * flags [I] HEAP_ flags from "winnt.h" - * addr [I] Desired base address - * totalSize [I] Total size of the heap, or 0 for a growable heap - * commitSize [I] Amount of heap space to commit - * unknown [I] Not yet understood - * definition [I] Heap definition - * - * RETURNS - * Success: A HANDLE to the newly created heap. - * Failure: a NULL HANDLE. */ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T commit_size, - void *unknown, RTL_HEAP_DEFINITION *definition ) + void *lock, RTL_HEAP_PARAMETERS *params ) { struct entry *entry; struct heap *heap; @@ -1514,8 +1500,8 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T SUBHEAP *subheap; unsigned int i; - TRACE( "flags %#lx, addr %p, total_size %#Ix, commit_size %#Ix, unknown %p, definition %p\n", - flags, addr, total_size, commit_size, unknown, definition ); + TRACE( "flags %#lx, addr %p, total_size %#Ix, commit_size %#Ix, lock %p, params %p\n", + flags, addr, total_size, commit_size, lock, params ); flags &= ~(HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED); if (process_heap) flags |= HEAP_PRIVATE; diff --git a/include/winternl.h b/include/winternl.h index ff8756211a1..b1687349ff6 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2577,11 +2577,23 @@ typedef struct _PROCESS_STACK_ALLOCATION_INFORMATION_EX PROCESS_STACK_ALLOCATION_INFORMATION AllocInfo; } PROCESS_STACK_ALLOCATION_INFORMATION_EX, *PPROCESS_STACK_ALLOCATION_INFORMATION_EX; -typedef struct _RTL_HEAP_DEFINITION { - ULONG Length; /* = sizeof(RTL_HEAP_DEFINITION) */ +typedef NTSTATUS (NTAPI RTL_HEAP_COMMIT_ROUTINE)(PVOID base, PVOID *address, PSIZE_T size); +typedef RTL_HEAP_COMMIT_ROUTINE *PRTL_HEAP_COMMIT_ROUTINE; - ULONG Unknown[11]; -} RTL_HEAP_DEFINITION, *PRTL_HEAP_DEFINITION; +typedef struct _RTL_HEAP_PARAMETERS +{ + ULONG Length; + SIZE_T SegmentReserve; + SIZE_T SegmentCommit; + SIZE_T DeCommitFreeblockThreshold; + SIZE_T DeCommitTotalFreeThreshold; + SIZE_T MaximumAllocationSize; + SIZE_T VirtualMemoryThreshold; + SIZE_T InitialCommit; + SIZE_T InitialReserve; + PRTL_HEAP_COMMIT_ROUTINE CommitRoutine; + SIZE_T Reserved[2]; +} RTL_HEAP_PARAMETERS, *PRTL_HEAP_PARAMETERS; typedef struct _RTL_RWLOCK { RTL_CRITICAL_SECTION rtlCS; @@ -4665,7 +4677,7 @@ NTSYSAPI NTSTATUS WINAPI RtlCreateAcl(PACL,DWORD,DWORD); NTSYSAPI NTSTATUS WINAPI RtlCreateActivationContext(HANDLE*,const void*); NTSYSAPI NTSTATUS WINAPI RtlCreateAtomTable(ULONG,RTL_ATOM_TABLE*); NTSYSAPI NTSTATUS WINAPI RtlCreateEnvironment(BOOLEAN, PWSTR*); -NTSYSAPI HANDLE WINAPI RtlCreateHeap(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEAP_DEFINITION); +NTSYSAPI HANDLE WINAPI RtlCreateHeap(ULONG,PVOID,SIZE_T,SIZE_T,PVOID,PRTL_HEAP_PARAMETERS); NTSYSAPI NTSTATUS WINAPI RtlCreateProcessParameters(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*); NTSYSAPI NTSTATUS WINAPI RtlCreateProcessParametersEx(RTL_USER_PROCESS_PARAMETERS**,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,PWSTR,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,const UNICODE_STRING*,ULONG); NTSYSAPI PDEBUG_BUFFER WINAPI RtlCreateQueryDebugBuffer(ULONG,BOOLEAN); diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api index db3c8e7941e..9e40b61654a 100644 --- a/tools/winapi/win32.api +++ b/tools/winapi/win32.api @@ -3344,7 +3344,7 @@ POBJECT_ATTRIBUTES PPRIVILEGE_SET PRTL_BITMAP PRTL_BITMAP_RUN -PRTL_HEAP_DEFINITION +PRTL_HEAP_PARAMETERS PRTL_QUERY_REGISTRY_TABLE PRTL_THREAD_START_ROUTINE PRTL_USER_PROCESS_PARAMETERS

1 0

Rémi Bernon : user32/tests: Test SendInput messages with other keyboard layouts.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 28b75e9f1de6c7b4680a452a089c15eefc644bf3 URL: https://gitlab.winehq.org/wine/wine/-/commit/28b75e9f1de6c7b4680a452a089c15… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 13 18:18:28 2024 +0100 user32/tests: Test SendInput messages with other keyboard layouts. --- dlls/user32/tests/input.c | 186 ++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 173 insertions(+), 13 deletions(-)

1 0

Rémi Bernon : vulkan/tests: Add gitlab Win10 VM results.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 416fc8067bf24ed1d79201933b2d1a41a23beed6 URL: https://gitlab.winehq.org/wine/wine/-/commit/416fc8067bf24ed1d79201933b2d1a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Jan 13 22:01:11 2024 +0100 vulkan/tests: Add gitlab Win10 VM results. --- dlls/vulkan-1/tests/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/vulkan-1/tests/vulkan.c b/dlls/vulkan-1/tests/vulkan.c index 74b9ccd4431..c4fd0f40256 100644 --- a/dlls/vulkan-1/tests/vulkan.c +++ b/dlls/vulkan-1/tests/vulkan.c @@ -365,7 +365,7 @@ static void test_unsupported_instance_extensions(void) for (i = 0; i < ARRAY_SIZE(extensions); ++i) { vr = create_instance(1, &extensions[i], &vk_instance); - ok(vr == VK_ERROR_EXTENSION_NOT_PRESENT, + ok(vr == VK_ERROR_EXTENSION_NOT_PRESENT || vr == VK_ERROR_INCOMPATIBLE_DRIVER, "Got VkResult %d for extension %s.\n", vr, extensions[i]); } }

1 0

Zebediah Figura : ddraw: Use the sysmem wined3d texture for sysmem surfaces if possible.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: d6204ccd54fd2cb6404d86ce5d89ed92c856db0a URL: https://gitlab.winehq.org/wine/wine/-/commit/d6204ccd54fd2cb6404d86ce5d89ed… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jan 3 20:49:04 2024 -0600 ddraw: Use the sysmem wined3d texture for sysmem surfaces if possible. --- dlls/ddraw/ddraw_private.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index f40188f75ef..6fc93b91860 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -698,7 +698,8 @@ static inline struct wined3d_texture *ddraw_surface_get_draw_texture(struct ddra static inline struct wined3d_texture *ddraw_surface_get_any_texture(struct ddraw_surface *surface, unsigned int flags) { - if (surface->texture_location & DDRAW_SURFACE_LOCATION_DEFAULT) + if ((surface->texture_location & DDRAW_SURFACE_LOCATION_DEFAULT) + || (surface->surface_desc.ddsCaps.dwCaps & DDSCAPS_SYSTEMMEMORY)) return ddraw_surface_get_default_texture(surface, flags); assert(surface->texture_location & DDRAW_SURFACE_LOCATION_DRAW);

1 0

Rémi Bernon : user32/tests: Test SendInput messages with KEYEVENTF_SCANCODE flag.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 0601b4eef259a3552acf70117a310c39eccf771b URL: https://gitlab.winehq.org/wine/wine/-/commit/0601b4eef259a3552acf70117a310c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 12 20:03:46 2024 +0100 user32/tests: Test SendInput messages with KEYEVENTF_SCANCODE flag. --- dlls/user32/tests/input.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index c67b59b8abe..4da8022f361 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -840,6 +840,22 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W {0}, }; + struct send_input_test rshift_scan[] = + { + {.scan = 0x36, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80}, + .todo_state = {[0] = TRUE, [VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE}, + .expect = {KEY_HOOK(WM_KEYDOWN, 0x36, VK_RSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, 0x36, VK_SHIFT, .todo_value = TRUE), {0}}}, + {.scan = scan, .flags = KEYEVENTF_SCANCODE, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80, /*[vkey] = 0x80*/}, + .todo_state = {[0] = TRUE, [VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE, /*[vkey] = TRUE*/}, + .expect = {KEY_HOOK(WM_KEYDOWN, scan, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYDOWN, scan, vkey, .todo_value = TRUE), WIN_MSG(WM_CHAR, wch_shift, MAKELONG(1, scan), .todo = TRUE), {0}}}, + {.scan = scan, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, .expect_state = {[VK_SHIFT] = 0x80, [VK_LSHIFT] = 0x80}, + .todo_state = {[VK_SHIFT] = TRUE, [VK_LSHIFT] = TRUE}, + .expect = {KEY_HOOK(WM_KEYUP, scan, vkey, .todo_value = TRUE), KEY_MSG(WM_KEYUP, scan, vkey, .todo_value = TRUE), {0}}}, + {.scan = 0x36, .flags = KEYEVENTF_SCANCODE | KEYEVENTF_KEYUP, + .expect = {KEY_HOOK(WM_KEYUP, 0x36, VK_RSHIFT, .todo_value = TRUE), KEY_MSG(WM_KEYUP, 0x36, VK_SHIFT, .todo_value = TRUE), {0}}}, + {0}, + }; + #undef WIN_MSG #undef KBD_HOOK #undef KEY_HOOK_ @@ -872,6 +888,8 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W lcontrol_vkey[1].expect_state[vkey] = 0x80; lmenu_lcontrol_vkey[2].expect_state[vkey] = 0x80; shift_vkey[1].expect_state[vkey] = 0x80; + rshift_scan[1].expect_state[vkey] = 0x80; + rshift_scan[1].todo_state[vkey] = 0x80; /* test peeked messages */ winetest_push_context( "peek" ); @@ -895,6 +913,7 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W check_send_input_test( menu_peeked, TRUE ); check_send_input_test( menu_ext_peeked, TRUE ); check_send_input_test( lrshift_ext, TRUE ); + check_send_input_test( rshift_scan, TRUE ); winetest_pop_context(); wait_messages( 100, FALSE ); @@ -925,6 +944,7 @@ static void test_SendInput_keyboard_messages( WORD vkey, WORD scan, WCHAR wch, W check_send_input_test( menu, FALSE ); check_send_input_test( menu_ext, FALSE ); check_send_input_test( lrshift_ext, FALSE ); + check_send_input_test( rshift_scan, FALSE ); winetest_pop_context(); ok_ret( 1, DestroyWindow( hwnd ) );

1 0

Rémi Bernon : user32/tests: Cleanup SendInput keyboard message sequence tests.
by Alexandre Julliard Jan. 17, 2024

Jan. 17, 2024

Module: wine Branch: master Commit: 998003bda16a52cd834869f9a0e987438a130849 URL: https://gitlab.winehq.org/wine/wine/-/commit/998003bda16a52cd834869f9a0e987… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jan 12 20:03:46 2024 +0100 user32/tests: Cleanup SendInput keyboard message sequence tests. --- dlls/user32/tests/input.c | 1575 ++++++++++++++++++++------------------------- 1 file changed, 707 insertions(+), 868 deletions(-)

1 0