[PATCH v2 0/3] MR6744: dlls/setupapi: Implement SetupDiGetDevicePropertyKeys

[Vibhav Pant (＠vibhavp)]

--
  v2: dlls/setupapi: Implement SetupDiGetDevicePropertyKeys.
      dlls/setupapi/tests: Add tests for SetupDiGetDevicePropertyKeys.
      dlls/setupapi: Add stub for SetupDiGetDevicePropertyKeys.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744

[PATCH v2 1/3] dlls/setupapi: Add stub for SetupDiGetDevicePropertyKeys.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/setupapi/devinst.c     | 10 ++++++++++
 dlls/setupapi/setupapi.spec |  1 +
 include/setupapi.h          |  1 +
 3 files changed, 12 insertions(+)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index e70431e4ec9..4334e9e5cf3 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -4495,6 +4495,16 @@ static LSTATUS get_device_property(struct device *device, const DEVPROPKEY *prop
     return ls;
 }
 
+BOOL WINAPI SetupDiGetDevicePropertyKeys( HDEVINFO devinfo, PSP_DEVINFO_DATA device_data,
+                                          DEVPROPKEY *prop_keys, DWORD prop_keys_len,
+                                          DWORD *required_prop_keys, DWORD flags )
+{
+    FIXME( "(%p, %p, %p, %ld, %p, %#lx) stub!\n", devinfo, device_data, prop_keys, prop_keys_len,
+           required_prop_keys, flags);
+    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
+    return FALSE;
+}
+
 /***********************************************************************
  *              SetupDiGetDevicePropertyW (SETUPAPI.@)
  */
diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec
index 84d008fe4d7..958e26235ea 100644
--- a/dlls/setupapi/setupapi.spec
+++ b/dlls/setupapi/setupapi.spec
@@ -357,6 +357,7 @@
 @ stub SetupDiGetDeviceInterfaceAlias
 @ stdcall SetupDiGetDeviceInterfaceDetailA(long ptr ptr long ptr ptr)
 @ stdcall SetupDiGetDeviceInterfaceDetailW(long ptr ptr long ptr ptr)
+@ stdcall SetupDiGetDevicePropertyKeys(ptr ptr ptr long ptr long)
 @ stdcall SetupDiGetDevicePropertyW(ptr ptr ptr ptr ptr long ptr long)
 @ stdcall SetupDiGetDeviceRegistryPropertyA(long ptr long ptr ptr long ptr)
 @ stdcall SetupDiGetDeviceRegistryPropertyW(long ptr long ptr ptr long ptr)
diff --git a/include/setupapi.h b/include/setupapi.h
index 831efdd4f50..74b5d003453 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -1573,6 +1573,7 @@ WINSETUPAPI BOOL     WINAPI SetupDiGetDeviceInterfaceAlias(HDEVINFO, PSP_DEVICE_
 WINSETUPAPI BOOL     WINAPI SetupDiGetDeviceInterfaceDetailA(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_A, DWORD, PDWORD, PSP_DEVINFO_DATA);
 WINSETUPAPI BOOL     WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, PSP_DEVICE_INTERFACE_DETAIL_DATA_W, DWORD, PDWORD, PSP_DEVINFO_DATA);
 #define                     SetupDiGetDeviceInterfaceDetail WINELIB_NAME_AW(SetupDiGetDeviceInterfaceDetail)
+WINSETUPAPI BOOL WINAPI SetupDiGetDevicePropertyKeys(HDEVINFO, PSP_DEVINFO_DATA, DEVPROPKEY *, DWORD, DWORD *, DWORD);
 WINSETUPAPI BOOL     WINAPI SetupDiGetDevicePropertyW(HDEVINFO, PSP_DEVINFO_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD);
 #define                     SetupDiGetDeviceProperty WINELIB_NAME_AW(SetupDiGetDeviceProperty)  /* note: A function doesn't exist */
 WINSETUPAPI BOOL     WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO, PSP_DEVINFO_DATA, DWORD, PDWORD, PBYTE, DWORD, PDWORD);
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/6744

[PATCH v2 2/3] dlls/setupapi/tests: Add tests for SetupDiGetDevicePropertyKeys.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/setupapi/tests/devinst.c | 83 +++++++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)

diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index cd05548870c..5f33c7af6e8 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -56,6 +56,7 @@ static HRESULT (WINAPI *pDriverStoreFindDriverPackageA)(const char *inf_path, vo
 static BOOL (WINAPI *pSetupDiSetDevicePropertyW)(HDEVINFO, SP_DEVINFO_DATA *, const DEVPROPKEY *, DEVPROPTYPE, const BYTE *, DWORD, DWORD);
 static BOOL (WINAPI *pSetupDiGetDevicePropertyW)(HDEVINFO, SP_DEVINFO_DATA *, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD);
 static BOOL (WINAPI *pSetupQueryInfOriginalFileInformationA)(SP_INF_INFORMATION *, UINT, SP_ALTPLATFORM_INFO *, SP_ORIGINAL_FILE_INFO_A *);
+static BOOL (WINAPI *pSetupDiGetDevicePropertyKeys)(HDEVINFO, PSP_DEVINFO_DATA, DEVPROPKEY *,DWORD, DWORD *, DWORD);
 
 static BOOL wow64;
 
@@ -885,6 +886,7 @@ static void test_device_property(void)
     hmod = LoadLibraryA("setupapi.dll");
     pSetupDiSetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiSetDevicePropertyW");
     pSetupDiGetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiGetDevicePropertyW");
+    pSetupDiGetDevicePropertyKeys = (void *)GetProcAddress(hmod, "SetupDiGetDevicePropertyKeys");
 
     if (!pSetupDiSetDevicePropertyW || !pSetupDiGetDevicePropertyW)
     {
@@ -1190,6 +1192,87 @@ static void test_device_property(void)
     ok(size == sizeof(valueW), "Got size %ld\n", size);
     ok(!lstrcmpW((WCHAR *)buffer, valueW), "Expect buffer %s, got %s\n", wine_dbgstr_w(valueW), wine_dbgstr_w((WCHAR *)buffer));
 
+    if (pSetupDiGetDevicePropertyKeys)
+    {
+        DWORD keys_len = 0, n, expected_keys = 1;
+        DEVPROPKEY *keys;
+
+        ret = SetupDiGetDevicePropertyKeys(NULL, NULL, NULL, 0, NULL, 0);
+        ok(!ret, "Expect failure\n");
+        err = GetLastError();
+        todo_wine ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#lx\n",
+           ERROR_INVALID_HANDLE, err);
+
+        SetLastError(0xdeadbeef);
+        ret = SetupDiGetDevicePropertyKeys(set, NULL, NULL, 0, NULL, 0);
+        ok(!ret, "Expect failure\n");
+        err = GetLastError();
+        todo_wine ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#lx\n",
+           ERROR_INVALID_PARAMETER, err);
+
+        SetLastError(0xdeadbeef);
+        ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 10, NULL, 0);
+        ok(!ret, "Expect failure\n");
+        err = GetLastError();
+        todo_wine ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#lx\n",
+           ERROR_INVALID_USER_BUFFER, err);
+
+        SetLastError(0xdeadbeef);
+        ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 0, NULL, 0);
+        ok(!ret, "Expect failure\n");
+        err = GetLastError();
+        todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#lx\n",
+           ERROR_INSUFFICIENT_BUFFER, err);
+
+        SetLastError(0xdeadbeef);
+        ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 0, &keys_len, 0xdeadbeef);
+        ok(!ret, "Expect failure\n");
+        err = GetLastError();
+        todo_wine ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#lx\n",
+           ERROR_INVALID_FLAGS, err);
+
+        SetLastError(0xdeadbeef);
+        ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 0, &keys_len, 0);
+        ok(!ret, "Expect failure\n");
+        err = GetLastError();
+        todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#lx\n",
+           ERROR_INSUFFICIENT_BUFFER, err);
+
+        keys = malloc(sizeof(*keys) * keys_len);
+        todo_wine ok(keys_len && !!keys, "Failed to allocate buffer\n");
+        SetLastError(0xdeadbeef);
+
+        ret = SetupDiGetDevicePropertyKeys(set, &device_data, keys, keys_len, &keys_len, 0xdeadbeef);
+        ok(!ret, "Expect failure\n");
+        err = GetLastError();
+        todo_wine ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#lx\n",
+           ERROR_INVALID_FLAGS, err);
+
+        n = keys_len;
+        keys_len = 0xdeadbeef;
+        ret = SetupDiGetDevicePropertyKeys(set, &device_data, keys, keys_len, &keys_len, 0);
+        todo_wine ok(ret, "Expect success\n");
+        err = GetLastError();
+        todo_wine ok(!err, "Expect last error %#x, got %#lx\n", ERROR_SUCCESS, err);
+        todo_wine ok(n == keys_len, "%ld != %ld\n", n, keys_len);
+        todo_wine ok(n >= expected_keys, "Expected %ld >= %ld\n", n, expected_keys);
+
+        keys_len = 0;
+        if (keys)
+        {
+            for (n = 0; n < expected_keys; n++)
+            {
+                if (IsEqualGUID(&keys[n], &DEVPKEY_Device_FriendlyName))
+                    keys_len++;
+            }
+
+        }
+        todo_wine ok(keys_len == expected_keys, "%ld != %ld\n", keys_len, expected_keys);
+        free(keys);
+    }
+    else
+        win_skip("SetupDiGetDevicePropertyKeys not available\n");
+
     ret = SetupDiRemoveDevice(set, &device_data);
     ok(ret, "Got unexpected error %#lx.\n", GetLastError());
 
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/6744

[PATCH v2 3/3] dlls/setupapi: Implement SetupDiGetDevicePropertyKeys.

[Vibhav Pant]

From: Vibhav Pant <vibhavp(a)gmail.com>

---
 dlls/setupapi/devinst.c       | 109 +++++++++++++++++++++++++++++++++-
 dlls/setupapi/tests/devinst.c |  26 ++++----
 2 files changed, 119 insertions(+), 16 deletions(-)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 4334e9e5cf3..544d4ae62a7 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -4499,10 +4499,113 @@ BOOL WINAPI SetupDiGetDevicePropertyKeys( HDEVINFO devinfo, PSP_DEVINFO_DATA dev
                                           DEVPROPKEY *prop_keys, DWORD prop_keys_len,
                                           DWORD *required_prop_keys, DWORD flags )
 {
-    FIXME( "(%p, %p, %p, %ld, %p, %#lx) stub!\n", devinfo, device_data, prop_keys, prop_keys_len,
+    WCHAR props_path[] = L"Properties\\";
+    struct device *device;
+    DWORD count = 0, i;
+    HKEY hkey;
+    LSTATUS ls;
+    DEVPROPKEY *keys_buf = NULL;
+
+    TRACE( "(%p, %p, %p, %ld, %p, %#lx)\n", devinfo, device_data, prop_keys, prop_keys_len,
            required_prop_keys, flags);
-    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
-    return FALSE;
+
+    if (flags)
+    {
+        SetLastError( ERROR_INVALID_FLAGS );
+        return FALSE;
+    }
+    if (!prop_keys && prop_keys_len)
+    {
+        SetLastError( ERROR_INVALID_USER_BUFFER );
+        return FALSE;
+    }
+
+    device = get_device( devinfo, device_data );
+    if (!device)
+        return FALSE;
+
+    ls = RegOpenKeyExW( device->key, props_path, 0, KEY_ENUMERATE_SUB_KEYS, &hkey );
+    if (ls)
+    {
+        SetLastError( ls );
+        return FALSE;
+    }
+
+    keys_buf = malloc( sizeof( *keys_buf ) * prop_keys_len );
+    if (!keys_buf && prop_keys_len)
+    {
+        RegCloseKey( hkey );
+        SetLastError( ERROR_NOT_ENOUGH_MEMORY );
+        return FALSE;
+    }
+
+    for (i = 0; ;i++)
+    {
+        WCHAR guid_str[39], key_name[55];
+        HKEY propkey;
+        DWORD len, j;
+        GUID prop_guid;
+
+        len = 39;
+        ls = RegEnumKeyExW( hkey, i, guid_str, &len, NULL, NULL, NULL, NULL );
+        if (ls)
+        {
+            if (ls == ERROR_NO_MORE_ITEMS)
+                ls = ERROR_SUCCESS;
+            else
+                ERR( "Could not enumerate subkeys for device %s: %lu\n",
+                     debugstr_w( device->instanceId ), ls );
+            break;
+        }
+        swprintf( key_name, ARRAY_SIZE( key_name ), L"Properties\\%s", guid_str );
+        ls = RegOpenKeyExW( device->key, key_name, 0, KEY_ENUMERATE_SUB_KEYS, &propkey );
+        if (ls)
+            break;
+        if (FAILED( CLSIDFromString( guid_str, &prop_guid ) ))
+        {
+            ERR( "Could not parse propkey GUID string %s\n", debugstr_w( guid_str ) );
+            RegCloseKey( propkey );
+            continue;
+        }
+        for (j = 0; ;j++)
+        {
+            DEVPROPID pid;
+
+            len = 5;
+            ls = RegEnumKeyExW( propkey, j, key_name, &len, NULL, NULL, NULL, NULL );
+            if (ls)
+            {
+                ERR( "Could not enumerate subkeys for device %s under %s: %lu\n", debugstr_w( key_name ),
+                     debugstr_w( key_name ), ls );
+                break;
+            }
+            swscanf( key_name, L"%04X", &pid );
+            if (++count < prop_keys_len)
+            {
+                keys_buf[count-1].fmtid = prop_guid;
+                keys_buf[count-1].pid = pid;
+            }
+        }
+        RegCloseKey( propkey );
+    }
+
+    RegCloseKey( hkey );
+    if (!ls)
+    {
+        if (required_prop_keys)
+            *required_prop_keys = count;
+
+        if (prop_keys_len < count)
+        {
+            free( keys_buf );
+            SetLastError( ERROR_INSUFFICIENT_BUFFER );
+            return FALSE;
+        }
+        memcpy( prop_keys, keys_buf, count * sizeof( *keys_buf ) );
+    }
+    free( keys_buf );
+    SetLastError( ls );
+    return !ls;
 }
 
 /***********************************************************************
diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index 5f33c7af6e8..25a39870bc0 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -1200,62 +1200,62 @@ static void test_device_property(void)
         ret = SetupDiGetDevicePropertyKeys(NULL, NULL, NULL, 0, NULL, 0);
         ok(!ret, "Expect failure\n");
         err = GetLastError();
-        todo_wine ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#lx\n",
+        ok(err == ERROR_INVALID_HANDLE, "Expect last error %#x, got %#lx\n",
            ERROR_INVALID_HANDLE, err);
 
         SetLastError(0xdeadbeef);
         ret = SetupDiGetDevicePropertyKeys(set, NULL, NULL, 0, NULL, 0);
         ok(!ret, "Expect failure\n");
         err = GetLastError();
-        todo_wine ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#lx\n",
+        ok(err == ERROR_INVALID_PARAMETER, "Expect last error %#x, got %#lx\n",
            ERROR_INVALID_PARAMETER, err);
 
         SetLastError(0xdeadbeef);
         ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 10, NULL, 0);
         ok(!ret, "Expect failure\n");
         err = GetLastError();
-        todo_wine ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#lx\n",
+        ok(err == ERROR_INVALID_USER_BUFFER, "Expect last error %#x, got %#lx\n",
            ERROR_INVALID_USER_BUFFER, err);
 
         SetLastError(0xdeadbeef);
         ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 0, NULL, 0);
         ok(!ret, "Expect failure\n");
         err = GetLastError();
-        todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#lx\n",
+        ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#lx\n",
            ERROR_INSUFFICIENT_BUFFER, err);
 
         SetLastError(0xdeadbeef);
         ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 0, &keys_len, 0xdeadbeef);
         ok(!ret, "Expect failure\n");
         err = GetLastError();
-        todo_wine ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#lx\n",
+        ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#lx\n",
            ERROR_INVALID_FLAGS, err);
 
         SetLastError(0xdeadbeef);
         ret = SetupDiGetDevicePropertyKeys(set, &device_data, NULL, 0, &keys_len, 0);
         ok(!ret, "Expect failure\n");
         err = GetLastError();
-        todo_wine ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#lx\n",
+        ok(err == ERROR_INSUFFICIENT_BUFFER, "Expect last error %#x, got %#lx\n",
            ERROR_INSUFFICIENT_BUFFER, err);
 
         keys = malloc(sizeof(*keys) * keys_len);
-        todo_wine ok(keys_len && !!keys, "Failed to allocate buffer\n");
+        ok(keys_len && !!keys, "Failed to allocate buffer\n");
         SetLastError(0xdeadbeef);
 
         ret = SetupDiGetDevicePropertyKeys(set, &device_data, keys, keys_len, &keys_len, 0xdeadbeef);
         ok(!ret, "Expect failure\n");
         err = GetLastError();
-        todo_wine ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#lx\n",
+        ok(err == ERROR_INVALID_FLAGS, "Expect last error %#x, got %#lx\n",
            ERROR_INVALID_FLAGS, err);
 
         n = keys_len;
         keys_len = 0xdeadbeef;
         ret = SetupDiGetDevicePropertyKeys(set, &device_data, keys, keys_len, &keys_len, 0);
-        todo_wine ok(ret, "Expect success\n");
+        ok(ret, "Expect success\n");
         err = GetLastError();
-        todo_wine ok(!err, "Expect last error %#x, got %#lx\n", ERROR_SUCCESS, err);
-        todo_wine ok(n == keys_len, "%ld != %ld\n", n, keys_len);
-        todo_wine ok(n >= expected_keys, "Expected %ld >= %ld\n", n, expected_keys);
+        ok(!err, "Expect last error %#x, got %#lx\n", ERROR_SUCCESS, err);
+        ok(n == keys_len, "%ld != %ld\n", n, keys_len);
+        ok(n >= expected_keys, "Expected %ld >= %ld\n", n, expected_keys);
 
         keys_len = 0;
         if (keys)
@@ -1267,7 +1267,7 @@ static void test_device_property(void)
             }
 
         }
-        todo_wine ok(keys_len == expected_keys, "%ld != %ld\n", keys_len, expected_keys);
+        ok(keys_len == expected_keys, "%ld != %ld\n", keys_len, expected_keys);
         free(keys);
     }
     else
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6744

[PATCH v2 3/3] dlls/setupapi: Implement SetupDiGetDevicePropertyKeys.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=149483

Your paranoid android.


=== w7u_2qxl (32 bit report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0xd
devinst.c:1257: Test failed: 8 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== w7u_el (32 bit report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0xd
devinst.c:1257: Test failed: 8 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== w8 (32 bit report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 12 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== w1064v1507 (32 bit report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 12 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== w7pro64 (64 bit report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0xd
devinst.c:1257: Test failed: 8 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit ar:MA report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit de report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit fr report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit he:IL report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit hi:IN report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit ja:JP report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11 (32 bit zh:CN report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11b (32 bit WoW report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

=== debian11b (64 bit WoW report) ===

setupapi:
devinst.c:1254: Test failed: Expect success
devinst.c:1256: Test failed: Expect last error 0, got 0x8
devinst.c:1257: Test failed: 1 != -559038737
devinst.c:1270: Test failed: 0 != 1

[Elizabeth Figura (＠zfigura)]

Elizabeth Figura (@zfigura) commented about dlls/setupapi/devinst.c:
> +        DWORD len, j;
> +        GUID prop_guid;
> +
> +        len = 39;
> +        ls = RegEnumKeyExW( hkey, i, guid_str, &len, NULL, NULL, NULL, NULL );
> +        if (ls)
> +        {
> +            if (ls == ERROR_NO_MORE_ITEMS)
> +                ls = ERROR_SUCCESS;
> +            else
> +                ERR( "Could not enumerate subkeys for device %s: %lu\n",
> +                     debugstr_w( device->instanceId ), ls );
> +            break;
> +        }
> +        swprintf( key_name, ARRAY_SIZE( key_name ), L"Properties\\%s", guid_str );
> +        ls = RegOpenKeyExW( device->key, key_name, 0, KEY_ENUMERATE_SUB_KEYS, &propkey );
> You already have the Properties key open here; you can skip concatenating the strings and instead just use "hkey" as a parent.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744#note_87519

[Elizabeth Figura (＠zfigura)]

Elizabeth Figura (@zfigura) commented about dlls/setupapi/devinst.c:
> DEVPROPKEY *prop_keys, DWORD prop_keys_len,
>                                            DWORD *required_prop_keys, DWORD flags )
>  {
> -    FIXME( "(%p, %p, %p, %ld, %p, %#lx) stub!\n", devinfo, device_data, prop_keys, prop_keys_len,
> +    WCHAR props_path[] = L"Properties\\";
> +    struct device *device;
> +    DWORD count = 0, i;
> +    HKEY hkey;
> +    LSTATUS ls;
> +    DEVPROPKEY *keys_buf = NULL;
> +
> +    TRACE( "(%p, %p, %p, %ld, %p, %#lx)\n", devinfo, device_data, prop_keys, prop_keys_len,

I'd advocate for using the trace style in e.g. SetupDiInstallDevice() for new code. Also, DWORDs are unsigned and should use %lu.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744#note_87522

[Elizabeth Figura (＠zfigura)]

Elizabeth Figura (@zfigura) commented about dlls/setupapi/devinst.c:
> DEVPROPKEY *prop_keys, DWORD prop_keys_len,
>                                            DWORD *required_prop_keys, DWORD flags )
>  {
> -    FIXME( "(%p, %p, %p, %ld, %p, %#lx) stub!\n", devinfo, device_data, prop_keys, prop_keys_len,
> +    WCHAR props_path[] = L"Properties\\";

I don't think there's any need for this to be a variable; you can just put the string constant directly in RegOpenKey(). I also don't think you need the trailing slash.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744#note_87517

[Elizabeth Figura (＠zfigura)]

Elizabeth Figura (@zfigura) commented about dlls/setupapi/devinst.c:
> +        if (FAILED( CLSIDFromString( guid_str, &prop_guid ) ))
> +        {
> +            ERR( "Could not parse propkey GUID string %s\n", debugstr_w( guid_str ) );
> +            RegCloseKey( propkey );
> +            continue;
> +        }
> +        for (j = 0; ;j++)
> +        {
> +            DEVPROPID pid;
> +
> +            len = 5;
> +            ls = RegEnumKeyExW( propkey, j, key_name, &len, NULL, NULL, NULL, NULL );
> +            if (ls)
> +            {
> +                ERR( "Could not enumerate subkeys for device %s under %s: %lu\n", debugstr_w( key_name ),
> +                     debugstr_w( key_name ), ls );
> We don't want an ERR() for ERROR_NO_MORE_ITEMS.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744#note_87521

[Elizabeth Figura (＠zfigura)]

Elizabeth Figura (@zfigura) commented about dlls/setupapi/devinst.c:
> +        len = 39;
> +        ls = RegEnumKeyExW( hkey, i, guid_str, &len, NULL, NULL, NULL, NULL );
> +        if (ls)
> +        {
> +            if (ls == ERROR_NO_MORE_ITEMS)
> +                ls = ERROR_SUCCESS;
> +            else
> +                ERR( "Could not enumerate subkeys for device %s: %lu\n",
> +                     debugstr_w( device->instanceId ), ls );
> +            break;
> +        }
> +        swprintf( key_name, ARRAY_SIZE( key_name ), L"Properties\\%s", guid_str );
> +        ls = RegOpenKeyExW( device->key, key_name, 0, KEY_ENUMERATE_SUB_KEYS, &propkey );
> +        if (ls)
> +            break;
> +        if (FAILED( CLSIDFromString( guid_str, &prop_guid ) ))
> Should be UuidFromStringW() like the rest of the file. Using CLSIDFromString() will trigger ole32 delay import which I think we want to avoid.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744#note_87520

[Elizabeth Figura (＠zfigura)]

Elizabeth Figura (@zfigura) commented about dlls/setupapi/devinst.c:
> +    keys_buf = malloc( sizeof( *keys_buf ) * prop_keys_len );
> +    if (!keys_buf && prop_keys_len)
> +    {
> +        RegCloseKey( hkey );
> +        SetLastError( ERROR_NOT_ENOUGH_MEMORY );
> +        return FALSE;
> +    }
> +
> +    for (i = 0; ;i++)
> +    {
> +        WCHAR guid_str[39], key_name[55];
> +        HKEY propkey;
> +        DWORD len, j;
> +        GUID prop_guid;
> +
> +        len = 39;
> len = ARRAY_SIZE(guid_str)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744#note_87518

[Elizabeth Figura (＠zfigura)]

Sorry for the late review; I didn't anticipate setupapi patches being assigned to me.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6744#note_87523