winebus.sys: Make the device and instance IDs consistent.

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

winebus.sys: Make the device and instance IDs consistent.
f39adfe9 · Zebediah Figura · Alexandre Julliard · 6e999b4a · f39adfe9
Commit f39adfe9 authored Jun 04, 2019 by Zebediah Figura Committed by Alexandre Julliard Jun 04, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 3 deletions

main.c dlls/winebus.sys/main.c +16 -3

No files found.
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -168,13 +168,26 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device)

 static WCHAR *get_device_id(DEVICE_OBJECT *device)
 {
-    static const WCHAR formatW[] =  {'%','s','\\','V','i','d','_','%','0','4','x','&','P','i','d','_','%','0','4','x',0};
+    static const WCHAR formatW[] = {'%','s','\\','v','i','d','_','%','0','4','x',
+            '&','p','i','d','_','%','0','4','x',0};
+    static const WCHAR format_inputW[] = {'%','s','\\','v','i','d','_','%','0','4','x',
+            '&','p','i','d','_','%','0','4','x','&','%','s','_','%','i',0};
    struct device_extension *ext = (struct device_extension *)device->DeviceExtension;
-    DWORD len = strlenW(ext->busid) + 19;
+    DWORD len = strlenW(ext->busid) + 34;
    WCHAR *dst;

    if ((dst = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR))))
-        sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid);
+    {
+        if (ext->input == (WORD)-1)
+        {
+            sprintfW(dst, formatW, ext->busid, ext->vid, ext->pid);
+        }
+        else
+        {
+            sprintfW(dst, format_inputW, ext->busid, ext->vid, ext->pid,
+                    ext->is_gamepad ? igW : miW, ext->input);
+        }
+    }

    return dst;
 }