[PATCH 4/6] user32/tests: Skip tests expecting ascii VK wparam on non-us keyboards.
Rémi Bernon
rbernon at codeweavers.com
Tue Nov 5 13:44:50 CST 2019
Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
dlls/user32/tests/msg.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index f3854d65cab..0db99385c75 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -9186,6 +9186,7 @@ static void test_accelerators(void)
HACCEL hAccel;
HWND hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE,
100, 100, 200, 200, 0, 0, 0, NULL);
+ BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409);
BOOL ret;
assert(hwnd != 0);
@@ -9208,6 +9209,12 @@ static void test_accelerators(void)
pump_msg_loop(hwnd, 0);
flush_sequence();
+ if (!us_kbd)
+ {
+ skip("skipping ascii VK events on non-us keyboard\n");
+ goto done;
+ }
+
trace("testing VK_N press/release\n");
flush_sequence();
keybd_event('N', 0, 0, 0);
@@ -15254,6 +15261,7 @@ static void test_menu_messages(void)
HMENU hmenu, hmenu_popup;
HWND hwnd;
DWORD style;
+ BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409);
if (!pGetMenuInfo || !pSetMenuInfo)
{
@@ -15300,6 +15308,12 @@ static void test_menu_messages(void)
style = get_menu_style(hmenu_popup);
ok(style == 0, "expected 0, got %u\n", style);
+ if (!us_kbd)
+ {
+ skip("skipping ascii VK events on non-us keyboard\n");
+ goto done;
+ }
+
/* Alt+E, Enter */
trace("testing a popup menu command\n");
flush_sequence();
--
2.24.0.rc2
More information about the wine-devel
mailing list