From 0525ea8268a60fff27ea319dc1205c7e8e868b9b Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 6 Feb 2024 13:31:27 +1100
Subject: [PATCH] Rebase against 23f98e9663a1737c94f6bd6c7612baa8b4a47bc5.

---
 ...user32-Improve-GetKeyboardLayoutList.patch | 22 +++++++++----------
 staging/upstream-commit                       |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
index 2734ca8a..3a18bf8e 100644
--- a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
+++ b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
@@ -1,4 +1,4 @@
-From 10df8c207e3e880bd578392e266a191e6b8ef9dd Mon Sep 17 00:00:00 2001
+From d4f9fa0c33b6a414fe3b6c604f3039e98d416263 Mon Sep 17 00:00:00 2001
 From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
 Date: Tue, 9 Jul 2019 14:13:28 +1000
 Subject: [PATCH] user32: Do not enumerate the registry in
@@ -13,10 +13,10 @@ not the complete list from the registry.
  3 files changed, 36 insertions(+), 33 deletions(-)
 
 diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 8f3cd8acae7..072f1fab23a 100644
+index 1fff29c7f87..9bf65573d87 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -499,7 +499,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
+@@ -486,7 +486,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
      return FALSE;
  }
  
@@ -25,10 +25,10 @@ index 8f3cd8acae7..072f1fab23a 100644
  {
      SendMessageTimeoutW(handle, WM_DEVICECHANGE, flags, (LPARAM)header, SMTO_ABORTIFHUNG, 2000, NULL);
 diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
-index d48440a20be..3a5df122ff4 100644
+index 350baff600d..27066fc46f4 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -5215,6 +5215,40 @@ static void test_keyboard_ll_hook_blocking(void)
+@@ -5542,6 +5542,40 @@ static void test_keyboard_ll_hook_blocking(void)
      ok_ret( 1, DestroyWindow( hwnd ) );
  }
  
@@ -69,19 +69,19 @@ index d48440a20be..3a5df122ff4 100644
  /* run the tests in a separate desktop to avoid interaction with other
   * tests, current desktop state, or user actions. */
  static void test_input_desktop( char **argv )
-@@ -5279,6 +5313,7 @@ START_TEST(input)
-     test_GetRawInputBuffer();
-     test_RegisterRawInputDevices();
+@@ -5633,6 +5667,7 @@ START_TEST(input)
+     test_GetKeyState();
+     test_OemKeyScan();
      test_rawinput(argv[0]);
 +    test_GetKeyboardLayoutList();
      test_DefRawInputProc();
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index aaaac12ce36..85820a74aba 100644
+index ef8d564c264..9a7c58f359d 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -1280,11 +1280,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -1267,11 +1267,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index aaaac12ce36..85820a74aba 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -1298,33 +1294,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -1285,33 +1281,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
diff --git a/staging/upstream-commit b/staging/upstream-commit
index dd506caa..ecd208ec 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-e607da943aa6869ba334611ccfd044f2ffe212c4
+23f98e9663a1737c94f6bd6c7612baa8b4a47bc5