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 2d0e84e60196693d1caa6e2d70422051b56cfe08.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2022-02-25 10:03:42 +11:00
parent c1cf0bc05a
commit 5d957e4169
4 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From fb1dbda120ff9777832d125ad31fee292fdd2123 Mon Sep 17 00:00:00 2001
From dc71919fd156f8fabcb47594cb13ee3210ff571c 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
@@ -9,21 +9,21 @@ not the complete list from the registry.
---
dlls/user32/input.c | 1 -
dlls/user32/tests/input.c | 35 +++++++++++++++++++++++++++++++++++
dlls/win32u/input.c | 33 +--------------------------------
3 files changed, 36 insertions(+), 33 deletions(-)
dlls/win32u/input.c | 35 ++---------------------------------
3 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/dlls/user32/input.c b/dlls/user32/input.c
index 08a00c0e647..ae496e5d703 100644
index 6cf60abeae2..3907430dd22 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -809,7 +809,6 @@ BOOL WINAPI BlockInput(BOOL fBlockIt)
return FALSE;
@@ -802,7 +802,6 @@ static void CALLBACK TrackMouseEventProc(HWND hwnd, UINT uMsg, UINT_PTR idEvent,
}
}
-
/***********************************************************************
* RegisterHotKey (USER32.@)
*/
* TrackMouseEvent [USER32]
*
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 79f3dfc3dc0..b3c1bd560ae 100644
--- a/dlls/user32/tests/input.c
@@ -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 90a77639d1a..1fe2fb88911 100644
index 72af32fd471..a18f81fc331 100644
--- a/dlls/win32u/input.c
+++ b/dlls/win32u/input.c
@@ -621,11 +621,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
@@ -821,11 +821,7 @@ HKL WINAPI NtUserActivateKeyboardLayout( HKL layout, UINT flags )
*/
UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
{
@@ -94,7 +94,7 @@ index 90a77639d1a..1fe2fb88911 100644
HKL layout;
TRACE_(keyboard)( "size %d, layouts %p.\n", size, layouts );
@@ -639,33 +635,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
@@ -839,33 +835,6 @@ UINT WINAPI NtUserGetKeyboardLayoutList( INT size, HKL *layouts )
if (size && layouts)
{
layouts[count - 1] = layout;
@@ -129,5 +129,5 @@ index 90a77639d1a..1fe2fb88911 100644
return count;
--
2.33.0
2.34.1