Zebediah Figura : user32: Use GUID_DEVINTERFACE_HID directly.

Alexandre Julliard julliard at winehq.org
Thu Jun 2 16:26:08 CDT 2022


Module: wine
Branch: master
Commit: a448ae89ca8974b7fc1f954b662c52aaaef87295
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=a448ae89ca8974b7fc1f954b662c52aaaef87295

Author: Zebediah Figura <zfigura at codeweavers.com>
Date:   Mon May  2 14:20:46 2022 -0500

user32: Use GUID_DEVINTERFACE_HID directly.

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 e9ac5e9aff2..c9afc18ea53 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"
@@ -224,14 +225,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 */
@@ -243,9 +241,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;




More information about the wine-cvs mailing list