Zebediah Figura : hidclass.sys: Use GUID_DEVINTERFACE_HID directly.

Alexandre Julliard julliard at winehq.org
Fri Apr 16 15:56:21 CDT 2021


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Apr 15 21:04:00 2021 -0500

hidclass.sys: Use GUID_DEVINTERFACE_HID directly.

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/hidclass.sys/Makefile.in | 2 +-
 dlls/hidclass.sys/device.c    | 7 ++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/dlls/hidclass.sys/Makefile.in b/dlls/hidclass.sys/Makefile.in
index b1b26dba70b..58bb2b5088f 100644
--- a/dlls/hidclass.sys/Makefile.in
+++ b/dlls/hidclass.sys/Makefile.in
@@ -1,7 +1,7 @@
 MODULE    = hidclass.sys
 IMPORTLIB = hidclass
 IMPORTS   = hal ntoskrnl
-DELAYIMPORTS = setupapi hid
+DELAYIMPORTS = setupapi
 
 EXTRADLLFLAGS = -mno-cygwin
 
diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c
index df20b60fcee..9c3fbdb66b0 100644
--- a/dlls/hidclass.sys/device.c
+++ b/dlls/hidclass.sys/device.c
@@ -21,6 +21,7 @@
 #include <stdarg.h>
 #define NONAMELESSUNION
 #define NONAMELESSSTRUCT
+#include "initguid.h"
 #include "hid.h"
 #include "winreg.h"
 #include "winuser.h"
@@ -30,8 +31,6 @@
 #include "ddk/hidsdi.h"
 #include "ddk/hidtypes.h"
 #include "ddk/wdm.h"
-
-#include "initguid.h"
 #include "devguid.h"
 #include "ntddmou.h"
 
@@ -86,10 +85,8 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device)
     SP_DEVINFO_DATA Data;
     NTSTATUS status;
     HDEVINFO devinfo;
-    GUID hidGuid;
     BASE_DEVICE_EXTENSION *ext;
 
-    HidD_GetHidGuid(&hidGuid);
     ext = device->DeviceExtension;
 
     lstrcpyW(device_instance_id, ext->device_id);
@@ -118,7 +115,7 @@ NTSTATUS HID_LinkDevice(DEVICE_OBJECT *device)
     }
     SetupDiDestroyDeviceInfoList(devinfo);
 
-    status = IoRegisterDeviceInterface(device, &hidGuid, NULL, &ext->link_name);
+    status = IoRegisterDeviceInterface(device, &GUID_DEVINTERFACE_HID, NULL, &ext->link_name);
     if (status != STATUS_SUCCESS)
     {
         FIXME( "failed to register device interface %x\n", status );




More information about the wine-cvs mailing list