[PATCH 0/2] MR8515: setupapi: Support in-built properties for device instances in SetupDiGetDevicePropertyW.

[PATCH 1/2] setupapi/tests: Add tests for getting "in-built" properties from SetupDiGetDevicePropertyW and SetupDiGetDevicePropertyKeys.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/setupapi/tests/devinst.c | 42 ++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c
index ed9d197e3bd..2355631b976 100644
--- a/dlls/setupapi/tests/devinst.c
+++ b/dlls/setupapi/tests/devinst.c
@@ -875,6 +875,7 @@ static void test_device_info(void)
 static void test_device_property(void)
 {
     static const WCHAR valueW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0};
+    static const WCHAR instance_id[] = L"Root\LEGACY_BOGUS\0000";
     SP_DEVINFO_DATA device_data = {sizeof(device_data)};
     HMODULE hmod;
     HDEVINFO set;
@@ -883,6 +884,7 @@ static void test_device_property(void)
     BYTE buffer[256];
     DWORD err;
     BOOL ret;
+    GUID guid_val = {0};

hmod = LoadLibraryA("setupapi.dll");
     pSetupDiSetDevicePropertyW = (void *)GetProcAddress(hmod, "SetupDiSetDevicePropertyW");
@@ -899,7 +901,7 @@ static void test_device_property(void)
     set = SetupDiCreateDeviceInfoList(&guid, NULL);
     ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#lx.\n", GetLastError());

-    ret = SetupDiCreateDeviceInfoA(set, "Root\LEGACY_BOGUS\0000", &guid, NULL, NULL, 0, &device_data);
+    ret = SetupDiCreateDeviceInfoW(set, instance_id, &guid, NULL, NULL, 0, &device_data);
     ok(ret, "Failed to create device, error %#lx.\n", GetLastError());

/* SetupDiSetDevicePropertyW */
@@ -1193,9 +1195,31 @@ 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));

+    /* #15 Innate properties */
+    type = DEVPROP_TYPE_EMPTY;
+    size = 0;
+    buffer[0] = '\0';
+    ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_InstanceId, &type, buffer, sizeof(buffer), &size, 0);
+    err = GetLastError();
+    todo_wine ok(ret, "Expect success\n");
+    todo_wine ok(err == NO_ERROR, "Expect last error %#x, got %#lx\n", NO_ERROR, err);
+    todo_wine ok(type == DEVPROP_TYPE_STRING, "Expect type %#x, got %#lx\n", DEVPROP_TYPE_STRING, type);
+    todo_wine ok(size == sizeof(instance_id), "Got size %lu\n", size);
+    todo_wine ok(!wcsicmp(instance_id, (WCHAR *)buffer), "Expect buffer %s, got %s\n", debugstr_w(instance_id), debugstr_w((WCHAR*)buffer));
+    type = DEVPROP_TYPE_EMPTY;
+    size = 0;
+    ret = pSetupDiGetDevicePropertyW(set, &device_data, &DEVPKEY_Device_ClassGuid, &type, (BYTE *)&guid_val, sizeof(guid_val), &size, 0);
+    err = GetLastError();
+    todo_wine ok(ret, "Expect success\n");
+    todo_wine ok(err == NO_ERROR, "Expect last error %#x, got %#lx\n", NO_ERROR, err);
+    todo_wine ok(type == DEVPROP_TYPE_GUID, "Expect type %#x, got %#lx\n", DEVPROP_TYPE_GUID, type);
+    todo_wine ok(size == sizeof(guid_val), "Got size %lu\n", size);
+    todo_wine ok(IsEqualGUID(&guid_val, &guid), "Expect buffer %s, got %s\n", debugstr_guid(&guid), debugstr_guid(&guid_val));
+
     if (pSetupDiGetDevicePropertyKeys)
     {
-        DWORD keys_len = 0, n, required_len, expected_keys = 1;
+        DEVPROPKEY default_keys[] = { DEVPKEY_Device_ClassGuid, DEVPKEY_Device_InstanceId };
+        DWORD keys_len = 0, n, required_len, expected_keys = 1 + ARRAY_SIZE(default_keys);
         DEVPROPKEY *keys;

ret = pSetupDiGetDevicePropertyKeys(NULL, NULL, NULL, 0, NULL, 0);
@@ -1262,12 +1286,24 @@ static void test_device_property(void)
         {
             for (n = 0; n < required_len; n++)
             {
+                DWORD i;
                 if (!memcmp(&keys[n], &DEVPKEY_Device_FriendlyName, sizeof(keys[n])))
+                {
                     keys_len++;
+                    continue;
+                }
+                for (i = 0; i < ARRAY_SIZE(default_keys); i++)
+                {
+                    if (!memcmp(&keys[n], &default_keys[i], sizeof(keys[n])))
+                    {
+                        keys_len++;
+                        break;
+                    }
+                }
             }

}
-        ok(keys_len == expected_keys, "%lu != %lu\n", keys_len, expected_keys);
+        todo_wine ok(keys_len == expected_keys, "%lu != %lu\n", keys_len, expected_keys);
         free(keys);
     }
     else

[PATCH 2/2] setupapi: Support getting the instance id and class GUID as in-built properties in SetupDiGetDevicePropertyW and CM_Get_DevNode_Property_ExW.

[Vibhav Pant]

From: Vibhav Pant

---
 dlls/setupapi/devinst.c | 43 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 066bd6f09c2..e065e6cbe98 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -5275,6 +5275,45 @@ BOOL WINAPI SetupDiGetDevicePropertyKeys( HDEVINFO devinfo, PSP_DEVINFO_DATA dev
     return !ret;
 }

+static DWORD get_device_property( struct device *device, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type,
+                                  BYTE *buf, DWORD buf_size, DWORD *req_size, DWORD flags )
+{
+    DWORD ret = ERROR_SUCCESS;
+
+    if (!prop_key)
+        return ERROR_INVALID_DATA;
+    if (!prop_type || (!buf && buf_size))
+        return ERROR_INVALID_USER_BUFFER;
+    if (flags)
+        return ERROR_INVALID_FLAGS;
+
+    if (IsEqualDevPropKey( *prop_key, DEVPKEY_Device_InstanceId ))
+    {
+        DWORD size = (wcslen( device->instanceId ) + 1) * sizeof( WCHAR );
+        *prop_type = DEVPROP_TYPE_STRING;
+        if (buf_size >= size)
+            wcscpy( (WCHAR *)buf, device->instanceId );
+        else
+            ret = ERROR_INSUFFICIENT_BUFFER;
+        if (req_size)
+            *req_size = size;
+    }
+    else if (IsEqualDevPropKey( *prop_key, DEVPKEY_Device_ClassGuid ))
+    {
+        DWORD size = sizeof( device->class );
+        *prop_type = DEVPROP_TYPE_GUID;
+        if (buf_size >= size)
+            memcpy( buf, &device->class, sizeof( device->class ) );
+        else
+            ret = ERROR_INSUFFICIENT_BUFFER;
+        if (req_size)
+            *req_size = size;
+    }
+    else
+        ret = get_device_reg_property( device->key, prop_key, prop_type, buf, buf_size, req_size, flags );
+    return ret;
+}
+
 /***********************************************************************
  *              SetupDiGetDevicePropertyW (SETUPAPI.@)
  */
@@ -5291,7 +5330,7 @@ BOOL WINAPI SetupDiGetDevicePropertyW(HDEVINFO devinfo, PSP_DEVINFO_DATA device_
     if (!(device = get_device(devinfo, device_data)))
         return FALSE;

-    ls = get_device_reg_property(device->key, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags);
+    ls = get_device_property(device, prop_key, prop_type, prop_buff, prop_buff_size, required_size, flags);

SetLastError(ls);
     return !ls;
@@ -5319,7 +5358,7 @@ CONFIGRET WINAPI CM_Get_DevNode_Property_ExW(DEVINST devnode, const DEVPROPKEY *
     if (!(device = get_devnode_device(devnode, &set)))
         return CR_NO_SUCH_DEVINST;

-    ls = get_device_reg_property(device->key, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags);
+    ls = get_device_property(device, prop_key, prop_type, prop_buff, *prop_buff_size, prop_buff_size, flags);
     SetupDiDestroyDeviceInfoList(set);
     switch (ls)
     {

[PATCH 0/4] MR8515: setupapi: Support in-built properties for device instances in SetupDiGetDevicePropertyW.

[Vibhav Pant (＠vibhavp)]

v2:

* Support Device_CompatibleIds, Device_HardwareIds, and Device_ContainerIds for PnP devices (hidapi uses them for detecting the bus type of the device: https://github.com/libusb/hidapi/blob/f18d2c0768bed300d13758dd9f52b57163c049...).
* Add ntoskrnl tests for the same.