[PATCH 0/1] MR8657: user32/tests: Use switch statement in test_keyboard_layout.

[Jacek Caban (＠jacek)]

Silences Clang -Wsometimes-uninitialized warning.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/8657

[PATCH 1/1] user32/tests: Use switch statement in test_keyboard_layout.

[Jacek Caban]

From: Jacek Caban <jacek(a)codeweavers.com>

Silences Clang -Wsometimes-uninitialized warning.
---
 dlls/user32/tests/input.c | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index a82ca5941a2..9b52599b6b0 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -6144,20 +6144,26 @@ static void test_keyboard_layout(void)
     /* Test that the high word of the keyboard layout in CJK locale is the same as the low word,
      * even when IME is on */
     lang_id = PRIMARYLANGID(GetUserDefaultLCID());
-    if (lang_id == LANG_CHINESE || lang_id == LANG_JAPANESE || lang_id == LANG_KOREAN)
-    {
-        hkl = GetKeyboardLayout(0);
-        ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl);
-
-        if (lang_id == LANG_CHINESE)
-            layout_name = "00000804";
-        else if (lang_id == LANG_JAPANESE)
-            layout_name = "00000411";
-        else if (lang_id == LANG_KOREAN)
-            layout_name = "00000412";
-        hkl = LoadKeyboardLayoutA(layout_name, 0);
-        ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl);
+    switch (lang_id)
+    {
+    case LANG_CHINESE:
+        layout_name = "00000804";
+        break;
+    case LANG_JAPANESE:
+        layout_name = "00000411";
+        break;
+    case LANG_KOREAN:
+        layout_name = "00000412";
+        break;
+    default:
+        return;
     }
+
+    hkl = GetKeyboardLayout(0);
+    ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl);
+
+    hkl = LoadKeyboardLayoutA(layout_name, 0);
+    ok(HIWORD(hkl) == LOWORD(hkl), "Got unexpected hkl %p.\n", hkl);
 }
 
 static void test_system_messages_with_rawinput_nolegacy(void)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/8657