From 7db26cf72773c616ee216e0bbe46e81de5a4cc3d Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Sun, 22 Jun 2025 18:07:01 +1000
Subject: [PATCH] Rebase against e9dcdf38041a1911d37117e0219dced5ba5dbf7f.

---
 patches/eventfd_synchronization/definition    |  1 +
 ...user32-Improve-GetKeyboardLayoutList.patch | 22 +++++++++----------
 staging/upstream-commit                       |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/patches/eventfd_synchronization/definition b/patches/eventfd_synchronization/definition
index 93909cfd..2ad18768 100644
--- a/patches/eventfd_synchronization/definition
+++ b/patches/eventfd_synchronization/definition
@@ -2,3 +2,4 @@ Fixes: [36692] Many multi-threaded applications have poor performance due to hea
 Depends: ntdll-Junction_Points
 Depends: server-PeekMessage
 Depends: server-Signal_Thread
+Disabled: True
diff --git a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
index a5cdf2d9..6dbb11dd 100644
--- a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
+++ b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
@@ -1,4 +1,4 @@
-From a808aeb6fbb9c7cace366a262715607379ca1b58 Mon Sep 17 00:00:00 2001
+From fec0755a2826b69658dd5a894dc424a8e1111f1a 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 00337aa72b7..375ca3abee3 100644
+index 22c296cf213..70fa8009d3b 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -497,7 +497,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
+@@ -450,7 +450,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
      return FALSE;
  }
  
@@ -25,10 +25,10 @@ index 00337aa72b7..375ca3abee3 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 b92e59396ac..364afc08b26 100644
+index a82ca5941a2..eb565c6845b 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -5637,6 +5637,40 @@ static void test_LoadKeyboardLayoutEx(void)
+@@ -6103,6 +6103,40 @@ static void test_LoadKeyboardLayoutEx( HKL orig_hkl )
      ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" );
  }
  
@@ -69,19 +69,19 @@ index b92e59396ac..364afc08b26 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 )
-@@ -5730,6 +5764,7 @@ START_TEST(input)
+@@ -6377,6 +6411,7 @@ START_TEST(input)
      test_GetKeyState();
      test_OemKeyScan();
      test_rawinput(argv[0]);
 +    test_GetKeyboardLayoutList();
      test_DefRawInputProc();
+     test_ScheduleDispatchNotification();
  
-     if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index 1886ff979d7..1834ae40441 100644
+index 1f824f85c50..e51fe494b29 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -1266,11 +1266,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -1379,11 +1379,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index 1886ff979d7..1834ae40441 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -1284,33 +1280,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -1397,33 +1393,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
@@ -129,5 +129,5 @@ index 1886ff979d7..1834ae40441 100644
  
      return count;
 -- 
-2.43.0
+2.47.2
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 162d3bfb..af5a2488 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-057e1d73e84b06fac90cba96dbf0305d219df3d5
+e9dcdf38041a1911d37117e0219dced5ba5dbf7f