setupapi: Don't use the devnode to allocate driver keys.

The devnode is a local handle, but driver keys should be unique to the device. (Note that MSDN, confusingly, refers to this number as a "device instance ID".) Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

setupapi: Don't use the devnode to allocate driver keys.
dca175b2 · Zebediah Figura · Alexandre Julliard · e26f8464 · dca175b2
Commit dca175b2 authored Jan 22, 2019 by Zebediah Figura Committed by Alexandre Julliard Jan 23, 2019
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

devinst.c dlls/setupapi/devinst.c +12 -2

No files found.
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -527,7 +527,9 @@ static HKEY create_driver_key(struct device *device)
    static const WCHAR formatW[] = {'%','0','4','u',0};
    static const WCHAR slash[] = { '\\',0 };
    HKEY class_key, key;
+    unsigned int i = 0;
    WCHAR path[50];
+    DWORD dispos;
    LONG l;
    if ((key = open_driver_key(device, KEY_READ | KEY_WRITE)) != INVALID_HANDLE_VALUE)
@@ -543,13 +545,21 @@ static HKEY create_driver_key(struct device *device)
    SETUPDI_GuidToString(&device->class, path);
    strcatW(path, slash);
-    sprintfW(path + strlenW(path), formatW, device->devnode);
+    /* Allocate a new driver key, by finding the first integer value that's not
-    if (!(l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, NULL)))
+     * already taken. */
+    for (;;)
+    {
+        sprintfW(path + 39, formatW, i++);
+        if ((l = RegCreateKeyExW(class_key, path, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &key, &dispos)))
+            break;
+        else if (dispos == REG_CREATED_NEW_KEY)
        {
            RegSetValueExW(device->key, Driver, 0, REG_SZ, (BYTE *)path, strlenW(path) * sizeof(WCHAR));
            RegCloseKey(class_key);
            return key;
        }
+        RegCloseKey(key);
+    }
    ERR("Failed to create driver key, error %u.\n", l);
    RegCloseKey(class_key);
    SetLastError(l);