[PATCH 4/6] user32: Use GUID_DEVINTERFACE_HID directly.
Zebediah Figura
wine at gitlab.winehq.org
Wed May 25 14:35:48 CDT 2022
From: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
---
dlls/user32/rawinput.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c
index 34197701c24..86f011579bf 100644
--- a/dlls/user32/rawinput.c
+++ b/dlls/user32/rawinput.c
@@ -38,6 +38,7 @@
#include "user_private.h"
#include "initguid.h"
+#include "ddk/hidclass.h"
#include "devpkey.h"
#include "ntddmou.h"
#include "ntddkbd.h"
@@ -233,14 +234,11 @@ void rawinput_update_device_list(void)
{
SP_DEVICE_INTERFACE_DATA iface = { sizeof(iface) };
struct device *device;
- GUID hid_guid;
HDEVINFO set;
DWORD idx;
TRACE("\n");
- HidD_GetHidGuid(&hid_guid);
-
EnterCriticalSection(&rawinput_devices_cs);
/* destroy previous list */
@@ -252,9 +250,9 @@ void rawinput_update_device_list(void)
}
rawinput_devices_count = 0;
- set = SetupDiGetClassDevsW(&hid_guid, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
+ set = SetupDiGetClassDevsW(&GUID_DEVINTERFACE_HID, NULL, NULL, DIGCF_DEVICEINTERFACE | DIGCF_PRESENT);
- for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &hid_guid, idx, &iface); ++idx)
+ for (idx = 0; SetupDiEnumDeviceInterfaces(set, NULL, &GUID_DEVINTERFACE_HID, idx, &iface); ++idx)
{
if (!(device = add_device( set, &iface, RIM_TYPEHID )))
continue;
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/130
More information about the wine-devel
mailing list