Rebase against 3f6102080e632b9f4d8a97c0f0b1231fbd8e759b.

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

@@ -1,4 +1,4 @@
-From 8db4007bfa0d09e3d75d00a48b7762e9ec746357 Mon Sep 17 00:00:00 2001
+From fb1dbda120ff9777832d125ad31fee292fdd2123 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
@@ -8,15 +8,15 @@ This function returns the current list of *installed* Keyboard layouts
 not the complete list from the registry.
 ---
  dlls/user32/input.c       |  1 -
- dlls/user32/tests/input.c | 35 +++++++++++++++++++++++++++++++
- dlls/win32u/input.c       | 43 +--------------------------------------
- 3 files changed, 36 insertions(+), 43 deletions(-)
+ dlls/user32/tests/input.c | 35 +++++++++++++++++++++++++++++++++++
+ dlls/win32u/input.c       | 33 +--------------------------------
+ 3 files changed, 36 insertions(+), 33 deletions(-)
 
 diff --git a/dlls/user32/input.c b/dlls/user32/input.c
-index 7349d865f01..23ef817ff29 100644
+index 08a00c0e647..ae496e5d703 100644
 --- a/dlls/user32/input.c
 +++ b/dlls/user32/input.c
-@@ -883,7 +883,6 @@ BOOL WINAPI BlockInput(BOOL fBlockIt)
+@@ -809,7 +809,6 @@ BOOL WINAPI BlockInput(BOOL fBlockIt)
      return FALSE;
  }
  
@@ -78,10 +78,10 @@ index 79f3dfc3dc0..b3c1bd560ae 100644
      if(pGetMouseMovePointsEx)
          test_GetMouseMovePointsEx(argv[0]);
 diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
-index bc3cd17a29e..4ae1b0c900f 100644
+index 90a77639d1a..1fe2fb88911 100644
 --- a/dlls/win32u/input.c
 +++ b/dlls/win32u/input.c
-@@ -611,23 +611,9 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
+@@ -621,11 +621,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
   */
  UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
  {
@@ -93,20 +93,8 @@ index bc3cd17a29e..4ae1b0c900f 100644
 +    DWORD count;
      HKL layout;
  
--    static const WCHAR keyboard_layouts_keyW[] =
--    {
--        '\\','R','e','g','i','s','t','r','y',
--        '\\','M','a','c','h','i','n','e',
--        '\\','S','y','s','t','e','m',
--        '\\','C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t',
--        '\\','C','o','n','t','r','o','l',
--        '\\','K','e','y','b','o','a','r','d',' ','L','a','y','o','u','t','s'
--    };
--
      TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
- 
-     if ((count = user_driver->pGetKeyboardLayoutList( size, layouts )) != ~0) return count;
-@@ -639,33 +625,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
+@@ -639,33 +635,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
      if (size && layouts)
      {
          layouts[count - 1] = layout;

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "27584c14497163dc2a15a9e8db9ddd40d3a516f8"
+	echo "3f6102080e632b9f4d8a97c0f0b1231fbd8e759b"
 }
 
 # Show version information

staging/upstream-commit

@@ -1 +1 @@
-27584c14497163dc2a15a9e8db9ddd40d3a516f8
+3f6102080e632b9f4d8a97c0f0b1231fbd8e759b