wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 7c5b9304a62b794ba07110e15eef6aec3a46ef0a.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2024-03-23 17:27:34 +11:00
parent 5a1e1cb2e0
commit 126e7db0e0
6 changed files with 74 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
patches/loader-KeyboardLayouts/0002-user32-Improve-GetKeyboardLayoutList.patch
View File

@@ -1,4 +1,4 @@
From d4f9fa0c33b6a414fe3b6c604f3039e98d416263 Mon Sep 17 00:00:00 2001
From a808aeb6fbb9c7cace366a262715607379ca1b58 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 1fff29c7f87..9bf65573d87 100644
index 00337aa72b7..375ca3abee3 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -486,7 +486,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
@@ -497,7 +497,6 @@ BOOL WINAPI UnloadKeyboardLayout( HKL layout )
return FALSE;
}
@@ -25,11 +25,11 @@ index 1fff29c7f87..9bf65573d87 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 350baff600d..27066fc46f4 100644
index b92e59396ac..364afc08b26 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -5542,6 +5542,40 @@ static void test_keyboard_ll_hook_blocking(void)
ok_ret( 1, DestroyWindow( hwnd ) );
@@ -5637,6 +5637,40 @@ static void test_LoadKeyboardLayoutEx(void)
ok_eq( old_hkl, GetKeyboardLayout( 0 ), HKL, "%p" );
}
+static void test_GetKeyboardLayoutList(void)
@@ -69,7 +69,7 @@ index 350baff600d..27066fc46f4 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 )
@@ -5633,6 +5667,7 @@ START_TEST(input)
@@ -5730,6 +5764,7 @@ START_TEST(input)
test_GetKeyState();
test_OemKeyScan();
test_rawinput(argv[0]);
@@ -78,10 +78,10 @@ index 350baff600d..27066fc46f4 100644
if(pGetMouseMovePointsEx)
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index ef8d564c264..9a7c58f359d 100644
index 1886ff979d7..1834ae40441 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -1267,11 +1267,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
@@ -1266,11 +1266,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
*/
UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
{
@@ -94,7 +94,7 @@ index ef8d564c264..9a7c58f359d 100644
HKL layout;
TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
@@ -1285,33 +1281,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
@@ -1284,33 +1280,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
if (size && layouts)
{
layouts[count - 1] = layout;