[PATCH 1/4] user32/tests: Update input test result for w1064v1809.
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d0dc4a8bcf3..d768e64cdc1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1409,7 +1409,9 @@ static void test_mouse_ll_hook(void) ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); - ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ok((pt_old.x == 150 && pt_old.y == 150) || + broken(pt_old.x == 149 && pt_old.y == 149) /* w1064v1809 */, + "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); todo_wine -- 2.24.0.rc0
Results may depend on the keyboard layout, and the tests were failing on VMs with non-us layouts. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d768e64cdc1..14399a6aac0 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1763,15 +1763,16 @@ static const struct tounicode_tests WCHAR expect_buf[4]; } utests[] = { - { 'A', 0, 0, 1, {'a',0}}, - { 'A', ctrl, 0, 1, {1, 0}}, - { 'A', shift|ctrl, 0, 1, {1, 0}}, + { 0, 0, 'a', 1, {'a',0}}, + { 0, shift, 'a', 1, {'A',0}}, + { 0, ctrl, 'a', 1, {1, 0}}, + { 0, shift|ctrl, 'a', 1, {1, 0}}, { VK_TAB, ctrl, 0, 0, {}}, { VK_TAB, shift|ctrl, 0, 0, {}}, { VK_RETURN, ctrl, 0, 1, {'\n', 0}}, { VK_RETURN, shift|ctrl, 0, 0, {}}, - { '4', ctrl, 0, 0, {}}, - { '4', shift|ctrl, 0, 0, {}}, + { 0, ctrl, '4', 0, {}}, + { 0, shift|ctrl, '4', 0, {}}, { 0, ctrl, '!', 0, {}}, { 0, ctrl, '\"', 0, {}}, { 0, ctrl, '#', 0, {}}, -- 2.24.0.rc0
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=58281 Your paranoid android. === w8adm (32 bit report) === user32: input.c:2138: Test failed: expected WM_LBUTTONDOWN message input.c:2139: Test failed: expected WM_LBUTTONUP message input.c:2166: Test failed: expected WM_NCHITTEST message input.c:2167: Test failed: expected WM_RBUTTONDOWN message input.c:2168: Test failed: expected WM_RBUTTONUP message input.c:2196: Test failed: expected WM_NCHITTEST message input.c:2197: Test failed: expected WM_LBUTTONDOWN message input.c:2198: Test failed: expected WM_LBUTTONUP message input.c:2224: Test failed: expected WM_NCHITTEST message input.c:2251: Test failed: expected loop with WM_NCHITTEST messages input.c:2304: Test failed: expected WM_LBUTTONDOWN message input.c:2305: Test failed: expected WM_LBUTTONUP message === w1064v1809_ar (32 bit report) === user32: input.c:1899: Test failed: ToAscii for character 'A' was 212 (expected 97) === w1064v1809_he (32 bit report) === user32: input.c:1899: Test failed: ToAscii for character 'A' was 249 (expected 97) === w1064v1809_zh_CN (32 bit report) === user32: input.c:261: Test failed: 2/0: wrong message 100/000000e5/002d0001 expected WM_KEYDOWN/00000058/002d0001 input.c:261: Test failed: 2/1: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 2/2: wrong message 105/000000e5/c0380001 expected WM_SYSKEYUP/00000012/c0380001 input.c:261: Test failed: 2/3: wrong message 101/00000058/802d0001 expected WM_KEYUP/00000058/c02d0001 input.c:261: Test failed: 3/0: wrong message 100/000000e5/002d0001 expected WM_KEYDOWN/00000058/002d0001 input.c:261: Test failed: 3/1: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 3/3: wrong message 101/000000e5/c0380001 expected WM_KEYUP/00000012/c0380001 input.c:261: Test failed: 4/0: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 4/3: wrong message 101/000000e5/c0380001 expected WM_KEYUP/00000012/c0380001 input.c:261: Test failed: 5/0: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:1155: Test failed: Unexpected vkCode 0xa2, expected 0. input.c:2752: Test failed: 0: wrong originId 4 input.c:2752: Test failed: 0: wrong originId 4
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14399a6aac0..130ce49bb57 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1885,6 +1885,7 @@ static void test_ToAscii(void) const BYTE SC_RETURN = 0x1c, SC_A = 0x1e; const BYTE HIGHEST_BIT = 0x80; int ret; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); memset(state, 0, sizeof(state)); @@ -1896,7 +1897,7 @@ static void test_ToAscii(void) character = 0; ret = ToAscii('A', SC_A, state, &character, 0); ok(ret == 1, "ToAscii for character 'A' didn't return 1 (was %i)\n", ret); - ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); + if (us_kbd) ok(character == 'a', "ToAscii for character 'A' was %i (expected %i)\n", character, 'a'); state[VK_CONTROL] |= HIGHEST_BIT; state[VK_LCONTROL] |= HIGHEST_BIT; -- 2.24.0.rc0
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=58282 Your paranoid android. === w1064v1809_ar (32 bit report) === user32: input.c:2225: Test failed: expected WM_NCHITTEST message input.c:2226: Test failed: unexpected WM_RBUTTONDOWN message input.c:2227: Test failed: unexpected WM_RBUTTONUP message === w1064v1809_zh_CN (32 bit report) === user32: input.c:261: Test failed: 2/0: wrong message 100/000000e5/002d0001 expected WM_KEYDOWN/00000058/002d0001 input.c:261: Test failed: 2/1: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 2/2: wrong message 105/000000e5/80380001 expected WM_SYSKEYUP/00000012/c0380001 input.c:261: Test failed: 2/3: wrong message 101/00000058/802d0001 expected WM_KEYUP/00000058/c02d0001 input.c:261: Test failed: 3/0: wrong message 100/000000e5/002d0001 expected WM_KEYDOWN/00000058/002d0001 input.c:261: Test failed: 3/1: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 3/3: wrong message 101/000000e5/c0380001 expected WM_KEYUP/00000012/c0380001 input.c:261: Test failed: 4/0: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 4/3: wrong message 101/000000e5/c0380001 expected WM_KEYUP/00000012/c0380001 input.c:261: Test failed: 5/0: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 === w1064v1809 (64 bit report) === user32: input.c:2139: Test failed: expected WM_LBUTTONDOWN message input.c:2140: Test failed: expected WM_LBUTTONUP message input.c:1409: Test failed: Wrong new pos: (150,150)
See the same binary being tested twice here: * https://testbot.winehq.org/JobDetails.pl?Key=58277 * https://testbot.winehq.org/JobDetails.pl?Key=58278 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- It would be better to fix the inconsistencies, but in the meantime this creates noise on testbot. dlls/user32/tests/input.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 130ce49bb57..10437670b0b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -284,6 +284,10 @@ static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ int i,j,k,l,m,n; static int count=0; KEV kbuf[MAXKEYEVENTS]; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + skip( "skipping test with inconsistent results on non-us keyboard\n" ); + assert( nrkev==2 || nrkev==3); for(i=0;i<MAXKEYEVENTS;i++) kbuf[i]=0; /* two keys involved gives 4 test cases */ @@ -1184,6 +1188,9 @@ static void test_Input_unicode(void) HHOOK hook; HMODULE hModuleImm32; BOOL (WINAPI *pImmDisableIME)(DWORD); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + skip( "skipping test with inconsistent results on non-us keyboard\n" ); wclass.lpszClassName = classNameW; wclass.style = CS_HREDRAW | CS_VREDRAW; -- 2.24.0.rc0
On 10/23/19 12:34 PM, Rémi Bernon wrote:
See the same binary being tested twice here: * https://testbot.winehq.org/JobDetails.pl?Key=58277 * https://testbot.winehq.org/JobDetails.pl?Key=58278
Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- It would be better to fix the inconsistencies, but in the meantime this creates noise on testbot.
dlls/user32/tests/input.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 130ce49bb57..10437670b0b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -284,6 +284,10 @@ static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ int i,j,k,l,m,n; static int count=0; KEV kbuf[MAXKEYEVENTS]; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + skip( "skipping test with inconsistent results on non-us keyboard\n" ); + assert( nrkev==2 || nrkev==3); for(i=0;i<MAXKEYEVENTS;i++) kbuf[i]=0; /* two keys involved gives 4 test cases */ @@ -1184,6 +1188,9 @@ static void test_Input_unicode(void) HHOOK hook; HMODULE hModuleImm32; BOOL (WINAPI *pImmDisableIME)(DWORD); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + skip( "skipping test with inconsistent results on non-us keyboard\n" );
wclass.lpszClassName = classNameW; wclass.style = CS_HREDRAW | CS_VREDRAW; -- 2.24.0.rc0
I've been too quick on the send button and haven't checked that this one actually compiles or does what's expected, just ignore this patch. -- Rémi Bernon <rbernon(a)codeweavers.com>
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=58280 Your paranoid android. === w1064v1809_ar (32 bit report) === user32: input.c:1859: Test failed: 0: got L"\0634" expected L"a" input.c:1857: Test failed: 8: got 1 expected 0 input.c:1898: Test failed: ToAscii for character 'A' was 212 (expected 97) === w1064v1809_he (32 bit report) === user32: input.c:1859: Test failed: 0: got L"\05e9" expected L"a" input.c:1857: Test failed: 8: got 1 expected 0 input.c:1898: Test failed: ToAscii for character 'A' was 249 (expected 97) === w1064v1809_zh_CN (32 bit report) === user32: input.c:261: Test failed: 2/0: wrong message 100/000000e5/002d0001 expected WM_KEYDOWN/00000058/002d0001 input.c:261: Test failed: 2/1: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 2/2: wrong message 105/000000e5/c0380001 expected WM_SYSKEYUP/00000012/c0380001 input.c:261: Test failed: 3/0: wrong message 100/000000e5/002d0001 expected WM_KEYDOWN/00000058/002d0001 input.c:261: Test failed: 3/1: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 3/3: wrong message 101/000000e5/c0380001 expected WM_KEYUP/00000012/c0380001 input.c:261: Test failed: 4/0: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 4/3: wrong message 101/000000e5/80380001 expected WM_KEYUP/00000012/c0380001 input.c:261: Test failed: 5/0: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:261: Test failed: 5/3: wrong message 101/000000e5/c0380001 expected WM_KEYUP/00000012/c0380001 input.c:261: Test failed: 6/0: wrong message 104/000000e5/20380001 expected WM_SYSKEYDOWN/00000012/20380001 input.c:1859: Test failed: 0: got L"\0634" expected L"a" input.c:1857: Test failed: 8: got 1 expected 0 input.c:1898: Test failed: ToAscii for character 'A' was 63 (expected 97)
participants (2)
-
Marvin -
Rémi Bernon