Zebediah Figura : wineusb.sys: Return compatible IDs.

Alexandre Julliard julliard at winehq.org
Fri Apr 17 16:12:54 CDT 2020


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Thu Apr 16 19:58:17 2020 -0500

wineusb.sys: Return compatible IDs.

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

---

 dlls/wineusb.sys/wineusb.c | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c
index 8798645f2f..eb1b7a261f 100644
--- a/dlls/wineusb.sys/wineusb.c
+++ b/dlls/wineusb.sys/wineusb.c
@@ -301,6 +301,26 @@ static void get_hardware_ids(const struct usb_device *device, WCHAR *buffer)
     *buffer = 0;
 }
 
+static void get_compatible_ids(const struct usb_device *device, WCHAR *buffer)
+{
+    static const WCHAR prot_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x',
+            '&','S','u','b','C','l','a','s','s','_','%','0','2','x',
+            '&','P','r','o','t','_','%','0','2','x',0};
+    static const WCHAR subclass_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x',
+            '&','S','u','b','C','l','a','s','s','_','%','0','2','x',0};
+    static const WCHAR class_format[] = {'U','S','B','\\','C','l','a','s','s','_','%','0','2','x',0};
+
+    struct libusb_device_descriptor device_desc;
+
+    libusb_get_device_descriptor(device->libusb_device, &device_desc);
+
+    buffer += sprintfW(buffer, prot_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass,
+            device_desc.bDeviceProtocol) + 1;
+    buffer += sprintfW(buffer, subclass_format, device_desc.bDeviceClass, device_desc.bDeviceSubClass) + 1;
+    buffer += sprintfW(buffer, class_format, device_desc.bDeviceClass) + 1;
+    *buffer = 0;
+}
+
 static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID_TYPE type)
 {
     WCHAR *id = NULL;
@@ -325,6 +345,11 @@ static NTSTATUS query_id(const struct usb_device *device, IRP *irp, BUS_QUERY_ID
                 get_hardware_ids(device, id);
             break;
 
+        case BusQueryCompatibleIDs:
+            if ((id = ExAllocatePool(PagedPool, (33 + 25 + 13 + 1) * sizeof(WCHAR))))
+                get_compatible_ids(device, id);
+            break;
+
         default:
             FIXME("Unhandled ID query type %#x.\n", type);
             return irp->IoStatus.Status;




More information about the wine-cvs mailing list