diff --git a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch index 77e39265..b765e8e4 100644 --- a/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch +++ b/patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch @@ -1,4 +1,4 @@ -From c4a4d47fb07faee6ef6d20b967e21eafe6a60ea4 Mon Sep 17 00:00:00 2001 +From f57e7a06cffc47773c647a10ed4d298b58fbd408 Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes 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 bb7477ed482..55ab8d246e7 100644 +index c5387cf9212..2507a86e3b6 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -494,7 +494,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout ) @@ -25,11 +25,11 @@ index bb7477ed482..55ab8d246e7 100644 * EnableMouseInPointer (USER32.@) */ diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c -index 8477645fad5..e92548c7402 100644 +index bf913b8e6a6..8ac46bedc71 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c -@@ -4566,6 +4566,40 @@ static void test_SendInput(void) - DestroyWindow( hwnd ); +@@ -4837,6 +4837,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable ) + CloseHandle( info.hProcess ); } +static void test_GetKeyboardLayoutList(void) @@ -69,7 +69,7 @@ index 8477645fad5..e92548c7402 100644 START_TEST(input) { char **argv; -@@ -4608,6 +4642,7 @@ START_TEST(input) +@@ -4887,6 +4921,7 @@ START_TEST(input) test_GetRawInputBuffer(); test_RegisterRawInputDevices(); test_rawinput(argv[0]); @@ -78,7 +78,7 @@ index 8477645fad5..e92548c7402 100644 if(pGetMouseMovePointsEx) diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c -index f3b724e7010..a971e1ee776 100644 +index fd16d03f733..fb452843803 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 f3b724e7010..a971e1ee776 100644 return count; -- -2.37.2 +2.39.0 diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 9ca5aa69..fcf3f15b 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -51,7 +51,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "17e5ff74308f41ab662d46f684db2c6023a4a16b" + echo "2b0cd25b5f5794463a59cac999583fb52fa021cc" } # Show version information diff --git a/staging/upstream-commit b/staging/upstream-commit index 6e8a65d8..da7124d8 100644 --- a/staging/upstream-commit +++ b/staging/upstream-commit @@ -1 +1 @@ -17e5ff74308f41ab662d46f684db2c6023a4a16b +2b0cd25b5f5794463a59cac999583fb52fa021cc