Rebase against 2436964d5678956a362a9bef34625885442740f6.

patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch

@@ -1,4 +1,4 @@
-From c1ecb277d4b77d59bd113a530bea556c356f81cc Mon Sep 17 00:00:00 2001
+From be7001f58850fb46ee07e9b4fba310c64157ee0f 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 3b0a13842c8..2027ce10358 100644
+index 2f4dc06f6ce..7345b78eaeb 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 3b0a13842c8..2027ce10358 100644
  }
  
 -
- static DWORD CALLBACK devnotify_window_callback(HANDLE handle, DWORD flags, DEV_BROADCAST_HDR *header)
+ static DWORD CALLBACK devnotify_window_callbackW(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 f8b40099091..6551367788c 100644
+index ee39b11fc12..35670ca7538 100644
 --- a/dlls/user32/tests/input.c
 +++ b/dlls/user32/tests/input.c
-@@ -4875,6 +4875,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
+@@ -4899,6 +4899,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
      CloseHandle( info.hProcess );
  }
  
@@ -69,7 +69,7 @@ index f8b40099091..6551367788c 100644
  START_TEST(input)
  {
      char **argv;
-@@ -4925,6 +4959,7 @@ START_TEST(input)
+@@ -4949,6 +4983,7 @@ START_TEST(input)
      test_GetRawInputBuffer();
      test_RegisterRawInputDevices();
      test_rawinput(argv[0]);
@@ -78,10 +78,10 @@ index f8b40099091..6551367788c 100644
  
      if(pGetMouseMovePointsEx)
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index 36f7404b296..bdbd24b5695 100644
+index 36f2a45f4ef..bf4e871d107 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -934,11 +934,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -1187,11 +1187,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -94,7 +94,7 @@ index 36f7404b296..bdbd24b5695 100644
      HKL layout;
  
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
-@@ -952,33 +948,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -1205,33 +1201,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;
@@ -129,5 +129,5 @@ index 36f7404b296..bdbd24b5695 100644
  
      return count;
 -- 
-2.39.1
+2.39.2
 

staging/upstream-commit

@@ -1 +1 @@
-df5f6f66de80085249d392be5efa085e6ee056a0
+2436964d5678956a362a9bef34625885442740f6