wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 6b0836e3f157318b00effc1de563da4d4b0d16b8.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2023-06-01 14:58:39 +10:00
parent 6173bd8b0d
commit 1039d808e2
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From 2a1229098b39f923ff6e9a13bde05e161c797b0a Mon Sep 17 00:00:00 2001
From 7dff09756ebc13c38695050b9de271a84c2ea7b6 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
@@ -25,11 +25,11 @@ index 8f3cd8acae7..072f1fab23a 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 8f3d5750c2f..3bdfd042e85 100644
index 197a82db251..6385ef002b9 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -5091,6 +5091,40 @@ static void test_EnableMouseInPointer( char **argv, BOOL enable )
CloseHandle( info.hProcess );
@@ -5369,6 +5369,40 @@ static void test_ClipCursor( char **argv )
if (!EqualRect( &rect, &virtual_rect )) ok_ret( 1, ClipCursor( NULL ) );
}
+static void test_GetKeyboardLayoutList(void)
@@ -69,7 +69,7 @@ index 8f3d5750c2f..3bdfd042e85 100644
START_TEST(input)
{
char **argv;
@@ -5142,6 +5176,7 @@ START_TEST(input)
@@ -5413,6 +5447,7 @@ START_TEST(input)
test_GetRawInputBuffer();
test_RegisterRawInputDevices();
test_rawinput(argv[0]);
@@ -78,10 +78,10 @@ index 8f3d5750c2f..3bdfd042e85 100644
if(pGetMouseMovePointsEx)
diff --git a/dlls/win32u/input.c b/dlls/win32u/input.c
index 11bb129134c..9864d80ceff 100644
index 22f371969b9..e0a0bd332ed 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -1250,11 +1250,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
@@ -1257,11 +1257,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
*/
UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
{
@@ -94,7 +94,7 @@ index 11bb129134c..9864d80ceff 100644
HKL layout;
TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
@@ -1268,33 +1264,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
@@ -1275,33 +1271,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
if (size && layouts)
{
layouts[count - 1] = layout;
@@ -129,5 +129,5 @@ index 11bb129134c..9864d80ceff 100644
return count;
--
2.39.2
2.40.1