Rebase against 2b29d02aa5ba65465b4adc017cdca9a8932b0dbe

This commit is contained in:
Alistair Leslie-Hughes
2019-11-05 12:23:05 +11:00
parent 1f77584097
commit ded2e22686
5 changed files with 35 additions and 36 deletions

View File

@@ -1,4 +1,4 @@
From 9d2559409ee8860dd21dd86aedb9442389ba41fe Mon Sep 17 00:00:00 2001
From 7bb09137aab184c1c2a36c1be27f6d8105ce2a11 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,7 +11,7 @@ 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 921ea2c962..953eec47de 100644
index 921ea2c962d..953eec47dea 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -213,12 +213,9 @@ static SHORT CDECL nulldrv_GetAsyncKeyState( INT key )
@@ -59,10 +59,10 @@ index 921ea2c962..953eec47de 100644
if (baselayout != 0)
{
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index d0dc4a8bcf..4a99d8d4e9 100644
index 1e6be311eeb..1653c07b20b 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -2862,6 +2862,40 @@ static void test_GetPointerType(void)
@@ -2990,6 +2990,40 @@ static void test_GetPointerType(void)
ok(type == PT_MOUSE, " type %d\n", type );
}
@@ -103,14 +103,14 @@ index d0dc4a8bcf..4a99d8d4e9 100644
START_TEST(input)
{
POINT pos;
@@ -2885,6 +2919,7 @@ START_TEST(input)
@@ -3013,6 +3047,7 @@ START_TEST(input)
test_GetKeyState();
test_OemKeyScan();
test_GetRawInputData();
+ test_GetKeyboardLayoutList();
test_RegisterRawInputDevices();
if(pGetMouseMovePointsEx)
test_GetMouseMovePointsEx();
--
2.17.1
2.24.0.rc1