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 e48fabff525061c8eea9558084a97308cebe6b7b.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2020-05-28 08:46:43 +10:00
parent 9ff4e2dc44
commit 4e692b5301
7 changed files with 31 additions and 175 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 7bb09137aab184c1c2a36c1be27f6d8105ce2a11 Mon Sep 17 00:00:00 2001
From 440f90abdcbe7e9a1d43e06900a4674e6fabd805 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: Improve GetKeyboardLayoutList
@ -11,10 +11,10 @@ not the complete list from the registry.
2 files changed, 35 insertions(+), 27 deletions(-)
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 921ea2c962d..953eec47dea 100644
index 6d916c7d65d..b9e0dc60e7c 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -213,12 +213,9 @@ static SHORT CDECL nulldrv_GetAsyncKeyState( INT key )
@@ -210,12 +210,9 @@ static void CDECL nulldrv_Beep(void)
static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts )
{
@ -27,7 +27,7 @@ index 921ea2c962d..953eec47dea 100644
baselayout = GetUserDefaultLCID();
langid = PRIMARYLANGID(LANGIDFROMLCID(baselayout));
@@ -227,30 +224,6 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts )
@@ -224,30 +221,6 @@ static UINT CDECL nulldrv_GetKeyboardLayoutList( INT size, HKL *layouts )
else
baselayout |= baselayout << 16;
@ -59,11 +59,11 @@ index 921ea2c962d..953eec47dea 100644
if (baselayout != 0)
{
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 1e6be311eeb..1653c07b20b 100644
index 913fabfbd85..dd84ff5cbb2 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -2990,6 +2990,40 @@ static void test_GetPointerType(void)
ok(type == PT_MOUSE, " type %d\n", type );
@@ -3010,6 +3010,40 @@ static void test_UnregisterDeviceNotification(void)
ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret);
}
+static void test_GetKeyboardLayoutList(void)
@ -103,7 +103,7 @@ index 1e6be311eeb..1653c07b20b 100644
START_TEST(input)
{
POINT pos;
@@ -3013,6 +3047,7 @@ START_TEST(input)
@@ -3033,6 +3067,7 @@ START_TEST(input)
test_GetKeyState();
test_OemKeyScan();
test_GetRawInputData();
@ -112,5 +112,5 @@ index 1e6be311eeb..1653c07b20b 100644
if(pGetMouseMovePointsEx)
--
2.24.0.rc1
2.26.2