From e113a0975244e5faa25b3086517487ab136f6afb Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Wed, 1 Feb 2023 10:02:22 +1100
Subject: [PATCH] Rebase against 6c75cddb9851095694dfa397870919d4cc70d3ef.

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

diff --git a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
index b765e8e4..42367406 100644
--- a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
+++ b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
@@ -1,4 +1,4 @@
-From f57e7a06cffc47773c647a10ed4d298b58fbd408 Mon Sep 17 00:00:00 2001
+From c1ecb277d4b77d59bd113a530bea556c356f81cc 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,7 +13,7 @@ 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 c5387cf9212..2507a86e3b6 100644
+index 3b0a13842c8..2027ce10358 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
 @@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
@@ -21,14 +21,14 @@ index c5387cf9212..2507a86e3b6 100644
  }
  
 -
- /***********************************************************************
-  *		EnableMouseInPointer (USER32.@)
-  */
+ static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header)
+ {
+     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 bf913b8e6a6..8ac46bedc71 100644
+index f8b40099091..6551367788c 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -4837,6 +4837,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
+@@ -4875,6 +4875,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
      CloseHandle( info.hProcess );
  }
  
@@ -69,7 +69,7 @@ index bf913b8e6a6..8ac46bedc71 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4887,6 +4921,7 @@ START_TEST(input)
+@@ -4925,6 +4959,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
@@ -78,7 +78,7 @@ index bf913b8e6a6..8ac46bedc71 100644
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index fd16d03f733..fb452843803 100644
+index 36f7404b296..bdbd24b5695 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
 @@ -934,11 +934,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
@@ -129,5 +129,5 @@ index fd16d03f733..fb452843803 100644
  
      return count;
 -- 
-2.39.0
+2.39.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 07c67219..9ca85aa1 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-4e5fab6214d9304004369d50b6c73b8d88cf46d8
+6c75cddb9851095694dfa397870919d4cc70d3ef