Rebase against c18152630362c1bff1813fe8ad5c75ffb8dbb7cf.

This commit is contained in:
Zebediah Figura
2020-04-16 17:42:47 -05:00
parent a23c076055
commit 767b90c5dd
6 changed files with 58 additions and 68 deletions

View File

@@ -1,4 +1,4 @@
From 683426b80996fab19231f272ce60184f0688f806 Mon Sep 17 00:00:00 2001
From 668e30532f05ca04015a0f7afd52999cbef9f7f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 26 Aug 2019 16:06:58 +0200
Subject: [PATCH] user32: Implement GetRegisteredRawInputDevices.
@@ -11,7 +11,7 @@ Subject: [PATCH] user32: Implement GetRegisteredRawInputDevices.
4 files changed, 83 insertions(+), 15 deletions(-)
diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c
index f3e7b542355..72a59878d8a 100644
index ea5ab751098..24af7399b84 100644
--- a/dlls/dinput8/tests/device.c
+++ b/dlls/dinput8/tests/device.c
@@ -602,7 +602,6 @@ static void test_mouse_keyboard(void)
@@ -79,10 +79,10 @@ index f3e7b542355..72a59878d8a 100644
IDirectInputDevice8_Release(di_mouse);
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
index 85ff0c5e809..3792360b057 100644
index 2465262f74e..7d2034e6594 100644
--- a/dlls/user32/rawinput.c
+++ b/dlls/user32/rawinput.c
@@ -501,14 +501,65 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE device, UINT command, void *data, UINT
@@ -522,14 +522,65 @@ UINT WINAPI GetRawInputDeviceInfoW(HANDLE handle, UINT command, void *data, UINT
return *data_size;
}
@@ -151,12 +151,12 @@ index 85ff0c5e809..3792360b057 100644
diff --git a/server/protocol.def b/server/protocol.def
index d74400f0eec..06620b4f8d4 100644
index 4ab2392771b..17e676950e8 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3879,6 +3879,12 @@ struct handle_info
VARARG(devices,rawinput_devices);
@END
@@ -3881,6 +3881,12 @@ struct handle_info
#define SET_CURSOR_CLIP 0x08
#define SET_CURSOR_NOCLIP 0x10
+/* Retrieve the list of registered rawinput devices */
+@REQ(get_rawinput_devices)
@@ -165,10 +165,10 @@ index d74400f0eec..06620b4f8d4 100644
+ VARARG(devices,rawinput_devices);
+@END
/* Retrieve the suspended context of a thread */
@REQ(get_suspend_context)
/* Modify the list of registered rawinput devices */
@REQ(update_rawinput_devices)
diff --git a/server/queue.c b/server/queue.c
index 05c9481f8a9..6e5022b2311 100644
index 7c6402012ba..46905f3ce41 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -3193,3 +3193,27 @@ DECL_HANDLER(update_rawinput_devices)