Rémi Bernon : winebus.sys: Use WINEBUS\ as device id prefix for all buses.

[Alexandre Julliard]

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

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Mon Sep 20 09:37:04 2021 +0200

winebus.sys: Use WINEBUS\ as device id prefix for all buses.

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/winebus.sys/main.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c
index d3f40806e73..92a41e4d8ef 100644
--- a/dlls/winebus.sys/main.c
+++ b/dlls/winebus.sys/main.c
@@ -209,15 +209,19 @@ static WCHAR *get_instance_id(DEVICE_OBJECT *device)
 static WCHAR *get_device_id(DEVICE_OBJECT *device)
 {
     static const WCHAR input_format[] = L"&MI_%02u";
-    static const WCHAR format[] = L"%s\\vid_%04x&pid_%04x";
+    static const WCHAR winebus_format[] = L"WINEBUS\\VID_%04X&PID_%04X";
     struct device_extension *ext = (struct device_extension *)device->DeviceExtension;
-    DWORD pos = 0, len = wcslen(ext->desc.busid) + 34;
+    DWORD pos = 0, len = 0, input_len = 0, winebus_len = 25;
     WCHAR *dst;
 
+    if (ext->desc.input != -1) input_len = 14;
+
+    len += winebus_len + input_len + 1;
+
     if ((dst = ExAllocatePool(PagedPool, len * sizeof(WCHAR))))
     {
-        pos += swprintf(dst + pos, len - pos, format, ext->desc.busid, ext->desc.vid, ext->desc.pid);
-        if (ext->desc.input != -1) pos += swprintf(dst + pos, len - pos, input_format, ext->desc.input);
+        pos += swprintf(dst + pos, len - pos, winebus_format, ext->desc.vid, ext->desc.pid);
+        if (input_len) pos += swprintf(dst + pos, len - pos, input_format, ext->desc.input);
     }
 
     return dst;