Rebase against 359ee2ecc21b08e4118f0f77b3a208e4b5e1e63d.

This commit is contained in:
Zebediah Figura
2020-06-30 17:11:27 -05:00
parent 4995d0d3af
commit 70f6f6d7e4
11 changed files with 127 additions and 191 deletions

View File

@@ -1,4 +1,4 @@
From cd8b9cfdbc4ab1c7120c411b65ac079eddd3a675 Mon Sep 17 00:00:00 2001
From 7595b344c4fc7d03f07a163b3f2f0b38123f7264 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
@@ -59,10 +59,10 @@ index 6d916c7d65d..b9e0dc60e7c 100644
if (baselayout != 0)
{
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index 9ec829860af..56fbc558de2 100644
index bab0fd97536..ea0cac6d18a 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -3385,6 +3385,40 @@ static void test_UnregisterDeviceNotification(void)
@@ -3706,6 +3706,40 @@ static void test_UnregisterDeviceNotification(void)
ok(ret == FALSE, "Unregistering NULL Device Notification returned: %d\n", ret);
}
@@ -103,14 +103,14 @@ index 9ec829860af..56fbc558de2 100644
START_TEST(input)
{
char **argv;
@@ -3417,6 +3451,7 @@ START_TEST(input)
test_GetKeyState();
test_OemKeyScan();
test_GetRawInputData();
+ test_GetKeyboardLayoutList();
@@ -3741,6 +3775,7 @@ START_TEST(input)
test_GetRawInputBuffer();
test_RegisterRawInputDevices();
test_rawinput(argv[0]);
+ test_GetKeyboardLayoutList();
if(pGetMouseMovePointsEx)
test_GetMouseMovePointsEx();
--
2.27.0