Rebase against f4a66ad257df4605e73dfea792eec55a70a04e84.

This commit is contained in:
Alistair Leslie-Hughes
2020-10-14 08:12:47 +11:00
parent b49e874386
commit 3cea972271
11 changed files with 27 additions and 698 deletions

View File

@@ -1,4 +1,4 @@
From 5a1737e74415871fd5b0646ece31f191fa74bb69 Mon Sep 17 00:00:00 2001
From 27332457e843bbef5d08dd45249956ade1258476 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(+), 26 deletions(-)
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 8ff6b0a817e..ddf00cfd7b5 100644
index 7ac77141696..56009667b00 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -198,8 +198,6 @@ static void CDECL nulldrv_Beep(void)
@@ -55,10 +55,10 @@ index 8ff6b0a817e..ddf00cfd7b5 100644
if (baselayout != 0)
{
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 1809c147cbd..fd8f26e9ee4 100644
index ce272ed73f4..9ac14b607cf 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -3791,6 +3791,40 @@ static void test_UnregisterDeviceNotification(void)
@@ -3979,6 +3979,40 @@ static void test_UnregisterDeviceNotification(void)
ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret);
}
@@ -99,14 +99,14 @@ index 1809c147cbd..fd8f26e9ee4 100644
START_TEST(input)
{
char **argv;
@@ -3826,6 +3860,7 @@ START_TEST(input)
@@ -4020,6 +4054,7 @@ START_TEST(input)
test_GetRawInputBuffer();
test_RegisterRawInputDevices();
test_rawinput(argv[0]);
+ test_GetKeyboardLayoutList();
if(pGetMouseMovePointsEx)
test_GetMouseMovePointsEx();
test_GetMouseMovePointsEx(argv[0]);
--
2.28.0