[PATCH 1/3] user32/tests: Add more tests for GetKeyState from background thread.
It looks like that GetKeyState is supposed to catch key presses when called from a background thread even after its thread message queue and thread input structures have been created. This happens in Bioshock 2 Remaster, and causes the game to stay forever on a "Press space to continue" screen, as the thread checking for space key press calls GetKeyState repeatedly (and PeekMessage), although it's in background. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 138 ++++++++++++++++++++++++++++---------- 1 file changed, 104 insertions(+), 34 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 1249f8cf5a1..18b38968f39 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3715,74 +3715,144 @@ static void test_attach_input(void) DestroyWindow(Wnd2); } +struct get_key_state_test_desc +{ + BOOL peek_message; + BOOL peek_message_main; +}; + +struct get_key_state_test_desc get_key_state_tests[] = +{ + /* 0: not peeking in thread, no msg queue: GetKeyState misses key press */ + {FALSE, TRUE}, + /* 1: peeking on thread init, not in main: GetKeyState catches key press */ + { TRUE, FALSE}, + /* 2: peeking on thread init, and in main: GetKeyState catches key press */ + { TRUE, TRUE}, +}; + +struct get_key_state_thread_params +{ + HANDLE semaphores[2]; + int index; +}; + static DWORD WINAPI get_key_state_thread(void *arg) { - HANDLE *semaphores = arg; + struct get_key_state_thread_params *params = arg; + struct get_key_state_test_desc* test; + HANDLE *semaphores = params->semaphores; DWORD result; + BOOL has_queue; + MSG msg; + int i = params->index; + + test = get_key_state_tests + i; + has_queue = test->peek_message; + + if (test->peek_message) + { + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + ok(!is_keyboard_message(msg.message), "%d: PeekMessageA got keyboard message.\n", i); + } + /* initialization */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - result = GetKeyState('X'); - ok((result & 0x8000) || broken(!(result & 0x8000)), /* > Win 2003 */ - "expected that highest bit is set, got %x\n", result); + /* key pressed */ + ReleaseSemaphore(semaphores[0], 1, NULL); + result = WaitForSingleObject(semaphores[1], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + result = GetKeyState('X'); + if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); result = GetKeyState('X'); - ok(!(result & 0x8000), "expected that highest bit is unset, got %x\n", result); - - ok((SHORT)(result & 0x007e) == 0, - "expected that undefined bits are unset, got %x\n", result); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); return 0; } static void test_GetKeyState(void) { - HANDLE semaphores[2]; + struct get_key_state_thread_params params; HANDLE thread; DWORD result; HWND hwnd; + MSG msg; + int i; - semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); - semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); - ok(semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); + params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); + ok(params.semaphores[1] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); hwnd = CreateWindowA("static", "Title", WS_OVERLAPPEDWINDOW | WS_VISIBLE, 10, 10, 200, 200, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowA failed %u\n", GetLastError()); + empty_message_queue(); - thread = CreateThread(NULL, 0, get_key_state_thread, semaphores, 0, NULL); - ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + for (i = 0; i < ARRAY_SIZE(get_key_state_tests); ++i) + { + struct get_key_state_test_desc* test = get_key_state_tests + i; - SetForegroundWindow(hwnd); - SetFocus(hwnd); - keybd_event('X', 0, 0, 0); + params.index = i; + thread = CreateThread(NULL, 0, get_key_state_thread, ¶ms, 0, NULL); + ok(thread != NULL, "CreateThread failed %u\n", GetLastError()); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(semaphores[0], 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + /* initialization */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); - keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + SetForegroundWindow(hwnd); + SetFocus(hwnd); + empty_message_queue(); - ReleaseSemaphore(semaphores[1], 1, NULL); - result = WaitForSingleObject(thread, 1000); - ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); - CloseHandle(thread); + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + /* key pressed */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + + keybd_event('X', 0, 0, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + result = GetKeyState('X'); + if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); + else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + /* key released */ + result = WaitForSingleObject(params.semaphores[0], 1000); + ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + + keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + + result = GetKeyState('X'); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); + + ReleaseSemaphore(params.semaphores[1], 1, NULL); + + result = WaitForSingleObject(thread, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + CloseHandle(thread); + } DestroyWindow(hwnd); - CloseHandle(semaphores[0]); - CloseHandle(semaphores[1]); + CloseHandle(params.semaphores[0]); + CloseHandle(params.semaphores[1]); } static void test_OemKeyScan(void) -- 2.30.0
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 18b38968f39..30168c3ba50 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3723,11 +3723,13 @@ struct get_key_state_test_desc struct get_key_state_test_desc get_key_state_tests[] = { - /* 0: not peeking in thread, no msg queue: GetKeyState misses key press */ + /* 0: not peeking in thread, no msg queue: GetKeyState / GetKeyboardState miss key press */ {FALSE, TRUE}, - /* 1: peeking on thread init, not in main: GetKeyState catches key press */ + /* 1: peeking on thread init, not in main: GetKeyState / GetKeyboardState catch key press */ + /* - GetKeyboardState misses key press if called before GetKeyState */ + /* - GetKeyboardState catches key press, if called after GetKeyState */ { TRUE, FALSE}, - /* 2: peeking on thread init, and in main: GetKeyState catches key press */ + /* 2: peeking on thread init, and in main: GetKeyState / GetKeyboardState catch key press */ { TRUE, TRUE}, }; @@ -3743,7 +3745,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) struct get_key_state_test_desc* test; HANDLE *semaphores = params->semaphores; DWORD result; + BYTE keystate[256]; BOOL has_queue; + BOOL ret; MSG msg; int i = params->index; @@ -3766,20 +3770,48 @@ static DWORD WINAPI get_key_state_thread(void *arg) result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + todo_wine_if(!has_queue) + ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); + result = GetKeyState('X'); if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); + else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); + else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + result = GetKeyState('X'); ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); + ret = GetKeyboardState(keystate); + ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); + result = keystate['X']; + if (!has_queue) todo_wine ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); + else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); + return 0; } -- 2.30.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85265 Your paranoid android. === w10pro64_ja (64 bit report) === user32: input.c:3876: Test failed: 0: expected that highest bit is unset, got 0xffffff81 input.c:3876: Test failed: 2: expected that highest bit is unset, got 0xffffff81 input.c:2747: Test failed: 0: expected WM_MOUSEMOVE message input.c:2747: Test failed: 1: expected WM_MOUSEMOVE message input.c:2747: Test failed: 2: expected WM_MOUSEMOVE message === w10pro64_zh_CN (64 bit report) === user32: input.c:3876: Test failed: 0: expected that highest bit is unset, got 0xffffff81 input.c:3876: Test failed: 2: expected that highest bit is unset, got 0xffffff81
On 2/8/21 8:57 PM, Marvin wrote:
Hi,
While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85265
Your paranoid android.
=== w10pro64_ja (64 bit report) ===
user32: input.c:3876: Test failed: 0: expected that highest bit is unset, got 0xffffff81 input.c:3876: Test failed: 2: expected that highest bit is unset, got 0xffffff81 input.c:2747: Test failed: 0: expected WM_MOUSEMOVE message input.c:2747: Test failed: 1: expected WM_MOUSEMOVE message input.c:2747: Test failed: 2: expected WM_MOUSEMOVE message
=== w10pro64_zh_CN (64 bit report) ===
user32: input.c:3876: Test failed: 0: expected that highest bit is unset, got 0xffffff81 input.c:3876: Test failed: 2: expected that highest bit is unset, got 0xffffff81
I think I also messed up the todo_wine in this patch, I guess it's going to need another version. -- Rémi Bernon <rbernon(a)codeweavers.com>
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=26269 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 30168c3ba50..eee36c3ddea 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -3777,11 +3777,18 @@ static DWORD WINAPI get_key_state_thread(void *arg) todo_wine_if(!has_queue) ok(!result, "%d: expected that keystate is not set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + result = GetKeyState('X'); if (!has_queue) todo_wine ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); else todo_wine ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + result = GetKeyState('C'); + ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); ret = GetKeyboardState(keystate); ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); @@ -3789,6 +3796,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + /* key released */ ReleaseSemaphore(semaphores[0], 1, NULL); result = WaitForSingleObject(semaphores[1], 1000); @@ -3801,10 +3811,17 @@ static DWORD WINAPI get_key_state_thread(void *arg) if (!has_queue) todo_wine ok(!result, "%d: expected that keystate is unset, got %#x\n", i, result); else todo_wine ok(result, "%d: expected that keystate is set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + result = GetKeyState('X'); ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); ok(!(result & 0x007e), "%d: expected that undefined bits are unset, got %#x\n", i, result); + result = GetKeyState('C'); + ok(!(result & 0x8000), "%d: expected that C highest bit is unset, got %#x\n", i, result); + ok(!(result & 0x007e), "%d: expected that C undefined bits are unset, got %#x\n", i, result); + memset(keystate, 0, sizeof(keystate)); ret = GetKeyboardState(keystate); ok(ret, "GetKeyboardState failed, %u\n", GetLastError()); @@ -3812,6 +3829,9 @@ static DWORD WINAPI get_key_state_thread(void *arg) if (!has_queue) todo_wine ok(!result || broken(result) /* w2008 */, "%d: expected that keystate is unset, got %#x\n", i, result); else todo_wine ok(result || broken(!result) /* w2008 */, "%d: expected that keystate is set, got %#x\n", i, result); + result = keystate['C']; + ok(!result, "%d: expected that C keystate is not set, got %#x\n", i, result); + return 0; } @@ -3820,10 +3840,12 @@ static void test_GetKeyState(void) struct get_key_state_thread_params params; HANDLE thread; DWORD result; + BYTE keystate[256]; HWND hwnd; MSG msg; int i; + memset(keystate, 0, sizeof(keystate)); params.semaphores[0] = CreateSemaphoreA(NULL, 0, 1, NULL); ok(params.semaphores[0] != NULL, "CreateSemaphoreA failed %u\n", GetLastError()); params.semaphores[1] = CreateSemaphoreA(NULL, 0, 1, NULL); @@ -3857,8 +3879,12 @@ static void test_GetKeyState(void) ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); keybd_event('X', 0, 0, 0); + keystate['C'] = 0xff; + SetKeyboardState(keystate); if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + result = GetKeyState('C'); + ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); result = GetKeyState('X'); if (test->peek_message_main) ok((result & 0x8000), "%d: expected that highest bit is set, got %#x\n", i, result); else ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); @@ -3870,8 +3896,12 @@ static void test_GetKeyState(void) ok(result == WAIT_OBJECT_0, "%d: WaitForSingleObject returned %u\n", i, result); keybd_event('X', 0, KEYEVENTF_KEYUP, 0); + keystate['C'] = 0x00; + SetKeyboardState(keystate); if (test->peek_message_main) while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + result = GetKeyState('C'); + ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); result = GetKeyState('X'); ok(!(result & 0x8000), "%d: expected that highest bit is unset, got %#x\n", i, result); -- 2.30.0
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85266 Your paranoid android. === w10pro64_ja (64 bit report) === user32: input.c:2747: Test failed: 0: expected WM_MOUSEMOVE message input.c:2747: Test failed: 1: expected WM_MOUSEMOVE message input.c:2747: Test failed: 2: expected WM_MOUSEMOVE message === w10pro64_zh_CN (64 bit report) === user32: input.c:1302: Test failed: Wrong set pos: (100,100) input.c:1322: Test failed: GetCursorPos: (100,100)
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=85264 Your paranoid android. === w10pro64_ja (64 bit report) === user32: input.c:3844: Test failed: 2: expected that highest bit is unset, got 0xffffff81 input.c:2747: Test failed: 0: expected WM_MOUSEMOVE message input.c:2747: Test failed: 1: expected WM_MOUSEMOVE message input.c:2747: Test failed: 2: expected WM_MOUSEMOVE message === w10pro64_zh_CN (64 bit report) === user32: input.c:3844: Test failed: 0: expected that highest bit is unset, got 0xffffff81 input.c:3844: Test failed: 2: expected that highest bit is unset, got 0xffffff81
participants (2)
-
Marvin -
Rémi Bernon