[PATCH 0/3] MR4704: user32/tests: Fix and workaround some keyboard layout tests.

[Rémi Bernon (＠rbernon)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51478
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55327
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55328

[PATCH 1/3] user32/tests: Skip some keyboard layout tests on broken VMs.

[Rémi Bernon]

From: Rémi Bernon

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55327
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55328
---
 dlls/user32/tests/input.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 6a28bd24301..6989720d4a5 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -3369,6 +3369,16 @@ static void test_keyboard_layout_name(void)
     ok(GetLastError() == ERROR_NOACCESS, "got %ld\n", GetLastError());

layout = GetKeyboardLayout(0);
+    if (broken( layout == (HKL)0x040a0c0a ))
+    {
+        /* The testbot w7u_es has a broken layout configuration, its active layout is 040a:0c0a,
+         * with 0c0a its user locale and 040a its layout langid. Its layout preload list contains
+         * a 00000c0a layout but the system layouts OTOH only contains the standard 0000040a layout.
+         * Later, after activating 0409:0409 layout, GetKeyboardLayoutNameW returns 00000c0a.
+         */
+        win_skip( "broken keyboard layout, skipping tests\n" );
+        return;
+    }

len = GetKeyboardLayoutList(0, NULL);
     ok(len > 0, "GetKeyboardLayoutList returned %d\n", len);
@@ -3547,6 +3557,13 @@ static void test_ActivateKeyboardLayout( char **argv )
     DWORD ret;

layout = GetKeyboardLayout( 0 );
+    if (broken( layout == (HKL)0x040a0c0a ))
+    {
+        /* The testbot w7u_es has a broken layout configuration, see test_keyboard_layout_name above. */
+        win_skip( "broken keyboard layout, skipping tests\n" );
+        return;
+    }
+
     count = GetKeyboardLayoutList( 0, NULL );
     ok( count > 0, "GetKeyboardLayoutList returned %d\n", count );
     layouts = malloc( count * sizeof(HKL) );

[PATCH 2/3] dinput/tests: Avoid calling UnloadKeyboardLayout.

[Rémi Bernon]

From: Rémi Bernon

This seems to later mess up with the preload keyboard list and
GetKeyboardLayoutNameW.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51478
---
 dlls/dinput/tests/device8.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/dinput/tests/device8.c b/dlls/dinput/tests/device8.c
index 1d53d35a93b..5d4c2bb4366 100644
--- a/dlls/dinput/tests/device8.c
+++ b/dlls/dinput/tests/device8.c
@@ -1707,7 +1707,6 @@ static void test_dik_codes( IDirectInputDevice8W *device, HANDLE event, HWND hwn

skip_key_tests:
         ActivateKeyboardLayout( old_hkl, 0 );
-        UnloadKeyboardLayout( hkl );

winetest_pop_context();
     }
@@ -2253,7 +2252,6 @@ static void test_sys_keyboard( DWORD version )

skip_key_tests:
     ActivateKeyboardLayout( old_hkl, 0 );
-    UnloadKeyboardLayout( hkl );

test_dik_codes( device, event, hwnd, version );

[PATCH 3/3] user32/tests: Avoid calling UnloadKeyboardLayout.

[Rémi Bernon]

From: Rémi Bernon

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51478
---
 dlls/user32/tests/msg.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 0059afcbac7..bb7b74558c4 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -16535,7 +16535,6 @@ static void test_unicode_wm_char(void)

DestroyWindow( hwnd );
     ActivateKeyboardLayout( hkl_orig, 0 );
-    UnloadKeyboardLayout( hkl_greek );
 }

#define ID_LISTBOX 0x000f

[PATCH 3/3] user32/tests: Avoid calling UnloadKeyboardLayout.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=141313

Your paranoid android.

=== debian11 (32 bit ar:MA report) ===

dinput:
device8.c:800: Test failed: Expected 1 element, received 2
device8.c:804: Test failed: Expected DIK_SPACE key state down
device8.c:812: Test failed: Expected 1 element, received 0

[Rémi Bernon (＠rbernon)]

Might be something with the Windows test failures, I'll have a look.