[PATCH v4 0/4] MR8405: setupapi: Implement SetupDiGetDeviceInterfacePropertyKeys, add additional built-in properties for SetupDiGetDeviceInterfacePropertyW.
-- v4: setupapi: Add additional tests for device instance properties DEVPKEY_{DeviceInterface_ClassGuid, Device_InstanceId}. setupapi: Implement additional built-in properties in SetupDiGetDeviceInterfacePropertyW. setupapi: Implement SetupDiGetDeviceInterfacePropertyKeys. https://gitlab.winehq.org/wine/wine/-/merge_requests/8405
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/setupapi/devinst.c | 9 ++++ dlls/setupapi/setupapi.spec | 1 + dlls/setupapi/tests/devinst.c | 89 ++++++++++++++++++++++++++++++++++- include/setupapi.h | 1 + 4 files changed, 99 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 42345ed3327..f138b7776dd 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3108,6 +3108,15 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA return ret; } +BOOL WINAPI SetupDiGetDeviceInterfacePropertyKeys( HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, + DEVPROPKEY *buf, DWORD buf_len, DWORD *req_len, DWORD flags ) +{ + FIXME( "devinfo %p, iface_data %p, buf %p, buf_len %lu, req_len %p, flags %#lx: stub!\n", devinfo, iface_data, buf, + buf_len, req_len, flags ); + SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); + return FALSE; +} + static DWORD get_device_reg_property( HKEY base_key, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, BYTE *buf, DWORD buf_size, DWORD *req_size, DWORD flags ) { diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 3eef37658f9..9ac1c6c9831 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 SetupDiGetDeviceInterfacePropertyKeys(ptr ptr ptr long ptr long) @ stdcall SetupDiGetDeviceInterfacePropertyW(ptr ptr ptr ptr ptr long ptr long) @ stdcall SetupDiGetDevicePropertyKeys(ptr ptr ptr long ptr long) @ stdcall SetupDiGetDevicePropertyW(ptr ptr ptr ptr ptr long ptr long) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index efbd1e728c7..2917ccd8670 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2727,12 +2727,21 @@ static void test_open_device_interface_key(void) static void test_device_interface_properties(void) { + struct { + DEVPROPKEY key; + DEVPROPTYPE type; + } default_keys[] = { + { DEVPKEY_DeviceInterface_Enabled, DEVPROP_TYPE_BOOLEAN }, + { DEVPKEY_DeviceInterface_ClassGuid, DEVPROP_TYPE_GUID }, + { DEVPKEY_Device_InstanceId, DEVPROP_TYPE_STRING } + }; const WCHAR str[] = L"Wine is not an emulator."; DEVPROPTYPE type = DEVPROP_TYPE_EMPTY; DEVPROP_BOOLEAN boolean = DEVPROP_TRUE; SP_DEVICE_INTERFACE_DATA iface; SP_DEVINFO_DATA device; - DWORD err, req; + DEVPROPKEY *keys; + DWORD err, req, size, i, rem = ARRAY_SIZE(default_keys); WCHAR buf[50]; HDEVINFO set; BOOL ret; @@ -2870,6 +2879,84 @@ static void test_device_interface_properties(void) err = GetLastError(); ok(!ret && err == ERROR_INVALID_DATA, "%lu != %d\n", err, ERROR_INVALID_DATA); + ret = SetupDiGetDeviceInterfacePropertyKeys(NULL, NULL, NULL, 0, NULL, 0); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, "%lu != %d\n", err, ERROR_INVALID_HANDLE); + + ret = SetupDiGetDeviceInterfacePropertyKeys(set, NULL, NULL, 0, NULL, 0); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INVALID_PARAMETER, "%lu != %d\n", err, ERROR_INVALID_PARAMETER); + + ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 0, NULL, 0); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INSUFFICIENT_BUFFER); + + ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 0, &req, 1); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INVALID_FLAGS, "%lu != %d\n", err, ERROR_INVALID_FLAGS); + + ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 1, &req, 0); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INVALID_USER_BUFFER, "%lu != %d\n", err, ERROR_INVALID_USER_BUFFER); + + ret = SetupDiSetDeviceInterfacePropertyW(set, &iface, &DEVPKEY_DeviceInterface_FriendlyName, DEVPROP_TYPE_STRING, + (const BYTE *)str, sizeof(str), 0); + err = GetLastError(); + ok(ret, "SetupDiSetDeviceInterfacePropertyW failed: %lu\n", err); + if (ret) rem += 1; + + req = 0; + ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 0, &req, 0); + err = GetLastError(); + todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INVALID_FLAGS); + + size = req; + keys = calloc(size, sizeof(*keys)); + ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, keys, size, &req, 0); + todo_wine ok(ret, "SetupDiGetDeviceInterfacePropertyKeys failed: %lu\n", GetLastError()); + todo_wine_if(ret) ok(size == req, "%lu != %lu\n", size, req); + todo_wine ok(size >= ARRAY_SIZE(default_keys), "got size %lu, should be >= %lu\n", size, (DWORD)ARRAY_SIZE(default_keys)); + + for (i = 0; i < size && rem; i++) + { + DWORD j; + for (j = 0; j < ARRAY_SIZE(default_keys); j++) + { + DEVPROPKEY key = default_keys[j].key; + DEVPROPTYPE exp_type = default_keys[j].type; + + if (IsEqualDevPropKey(key, keys[i])) + { + BYTE *buf; + DWORD size, req = 0; + + winetest_push_context("default_keys[%lu]", j); + + type = DEVPROP_TYPE_EMPTY; + ret = SetupDiGetDeviceInterfacePropertyW(set, &iface, &key, &type, NULL, 0, &req, 0); + err = GetLastError(); + todo_wine_if(!ret && err == ERROR_NOT_FOUND) + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INSUFFICIENT_BUFFER); + todo_wine_if(!ret && err == ERROR_NOT_FOUND) ok(type == exp_type, "%#lx != %#lx\n", type, exp_type); + + size = req; + buf = calloc( 1, size ); + ret = SetupDiGetDeviceInterfacePropertyW(set, &iface, &key, &type, buf, size, &req, 0); + err = GetLastError(); + todo_wine_if(!ret && err == ERROR_NOT_FOUND) ok(ret, "SetupDiGetDeviceInterfacePropertyW failed: %lu\n", err); + free(buf); + + winetest_pop_context(); + + rem--; + break; + } + } + if (IsEqualDevPropKey(keys[i], DEVPKEY_DeviceInterface_FriendlyName) && rem) rem--; + } + free(keys); + todo_wine ok(!rem, "got rem %lu, should be 0\n", rem); + ret = SetupDiRemoveDeviceInterface(set, &iface); ok(ret, "Failed to remove device interface, error %#lx.\n", GetLastError()); ret = SetupDiRemoveDevice(set, &device); diff --git a/include/setupapi.h b/include/setupapi.h index e46f35ca2d4..98528e96af5 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 SetupDiGetDeviceInterfacePropertyKeys(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, DEVPROPKEY *, DWORD, DWORD *, DWORD); WINSETUPAPI BOOL WINAPI SetupDiGetDeviceInterfacePropertyW(HDEVINFO, PSP_DEVICE_INTERFACE_DATA, const DEVPROPKEY *, DEVPROPTYPE *, BYTE *, DWORD, DWORD *, DWORD); 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); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8405
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/setupapi/devinst.c | 207 +++++++++++++++++++--------------- dlls/setupapi/tests/devinst.c | 20 ++-- 2 files changed, 125 insertions(+), 102 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index f138b7776dd..cc287d4f8e4 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3108,13 +3108,121 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW(HDEVINFO devinfo, SP_DEVICE_INTERFA return ret; } +static DWORD get_device_reg_properties( HKEY base_key, DEVPROPKEY *buf, DWORD buf_len, DWORD *req_len ) +{ + HKEY properties; + DEVPROPKEY *keys; + LSTATUS ls; + DWORD i, count = 0; + + if ((ls = RegOpenKeyExW( base_key, L"Properties", 0, KEY_ENUMERATE_SUB_KEYS, &properties ))) + return ls; + + keys = malloc( sizeof( *keys ) * buf_len ); + if (!keys && buf_len) + { + RegCloseKey( properties ); + return ERROR_NOT_ENOUGH_MEMORY; + } + + for (i = 0; ;i++) + { + WCHAR guid_str[39]; + HKEY prop_fmtid_key; + GUID prop_guid; + DWORD len, j; + + len = ARRAY_SIZE( guid_str ); + if ((ls = RegEnumKeyExW( properties, i, guid_str, &len, NULL, NULL, NULL, NULL ))) + { + if (ls == ERROR_NO_MORE_ITEMS) + ls = ERROR_SUCCESS; + else + ERR( "Could not enumerate subkeys: %lu\n", ls ); + break; + } + if ((ls = RegOpenKeyExW( properties, guid_str, 0, KEY_ENUMERATE_SUB_KEYS, &prop_fmtid_key ))) + break; + guid_str[37] = '\0'; + if (UuidFromStringW( &guid_str[1], &prop_guid )) + { + ERR( "Could not parse propkey GUID string %s\n", debugstr_w( &guid_str[1] ) ); + RegCloseKey( prop_fmtid_key ); + continue; + } + for (j = 0; ;j++) + { + DEVPROPID pid; + WCHAR key_name[6]; + + len = 5; + if ((ls = RegEnumKeyExW( prop_fmtid_key, j, key_name, &len, NULL, NULL, NULL, NULL ))) + { + if (ls != ERROR_NO_MORE_ITEMS) + ERR( "Could not enumerate subkeys under fmtid %s: %lu", debugstr_guid( &prop_guid ), ls ); + break; + } + swscanf( key_name, L"%04X", &pid ); + if (++count <= buf_len) + { + keys[count - 1].fmtid = prop_guid; + keys[count - 1].pid = pid; + } + } + RegCloseKey( prop_fmtid_key ); + } + + RegCloseKey( properties ); + if (!ls) + { + if (req_len) + *req_len = count; + if (buf_len < count) + ls = ERROR_INSUFFICIENT_BUFFER; + else + memcpy( buf, keys, count * sizeof( *keys ) ); + } + free( keys ); + return ls; +} + BOOL WINAPI SetupDiGetDeviceInterfacePropertyKeys( HDEVINFO devinfo, SP_DEVICE_INTERFACE_DATA *iface_data, DEVPROPKEY *buf, DWORD buf_len, DWORD *req_len, DWORD flags ) { - FIXME( "devinfo %p, iface_data %p, buf %p, buf_len %lu, req_len %p, flags %#lx: stub!\n", devinfo, iface_data, buf, + DEVPROPKEY default_props[] = { DEVPKEY_DeviceInterface_Enabled, DEVPKEY_DeviceInterface_ClassGuid, + DEVPKEY_Device_InstanceId }; + struct device_iface *iface; + DWORD ret, required = 0; + + TRACE( "devinfo %p, iface_data %p, buf %p, buf_len %lu, req_len %p, flags %#lx\n", devinfo, iface_data, buf, buf_len, req_len, flags ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + + if (!(iface = get_device_iface( devinfo, iface_data ))) + return FALSE; + if (flags) + { + SetLastError( ERROR_INVALID_FLAGS ); + return FALSE; + } + if (!buf && buf_len) + { + SetLastError( ERROR_INVALID_USER_BUFFER ); + return FALSE; + } + + ret = get_device_reg_properties( iface->refstr_key, buf, buf_len, &required ); + if (!ret || ret == ERROR_INSUFFICIENT_BUFFER) + { + required += ARRAY_SIZE( default_props ); + if (required <= buf_len) + memcpy( &buf[required - ARRAY_SIZE( default_props )], &default_props, sizeof( default_props ) ); + else + ret = ERROR_INSUFFICIENT_BUFFER; + } + if (req_len) + *req_len = required; + SetLastError( ret ); + return !ret; } static DWORD get_device_reg_property( HKEY base_key, const DEVPROPKEY *prop_key, DEVPROPTYPE *prop_type, @@ -5119,10 +5227,7 @@ BOOL WINAPI SetupDiGetDevicePropertyKeys( HDEVINFO devinfo, PSP_DEVINFO_DATA dev DWORD *required_prop_keys, DWORD flags ) { struct device *device; - DWORD count = 0, i; - HKEY hkey; - LSTATUS ls; - DEVPROPKEY *keys_buf = NULL; + LSTATUS ret; TRACE( "%p, %p, %p, %lu, %p, %#lx\n", devinfo, device_data, prop_keys, prop_keys_len, required_prop_keys, flags); @@ -5141,91 +5246,9 @@ BOOL WINAPI SetupDiGetDevicePropertyKeys( HDEVINFO devinfo, PSP_DEVINFO_DATA dev device = get_device( devinfo, device_data ); if (!device) return FALSE; - - ls = RegOpenKeyExW( device->key, L"Properties", 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]; - HKEY propkey; - DWORD len, j; - GUID prop_guid; - - len = ARRAY_SIZE( guid_str ); - 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; - } - ls = RegOpenKeyExW( hkey, guid_str, 0, KEY_ENUMERATE_SUB_KEYS, &propkey ); - if (ls) - break; - guid_str[37] = 0; - if (UuidFromStringW( &guid_str[1], &prop_guid )) - { - ERR( "Could not parse propkey GUID string %s\n", debugstr_w( &guid_str[1] ) ); - RegCloseKey( propkey ); - continue; - } - for (j = 0; ;j++) - { - DEVPROPID pid; - WCHAR key_name[6]; - - len = 5; - ls = RegEnumKeyExW( propkey, j, key_name, &len, NULL, NULL, NULL, NULL ); - if (ls) - { - if (ls != ERROR_NO_MORE_ITEMS) - ERR( "Could not enumerate subkeys for device %s under %s: %lu\n", debugstr_w( device->instanceId ), - debugstr_guid( &prop_guid ), 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; + ret = get_device_reg_properties( device->key, prop_keys, prop_keys_len, required_prop_keys ); + SetLastError( ret ); + return !ret; } /*********************************************************************** diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2917ccd8670..62624fd592a 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2881,23 +2881,23 @@ static void test_device_interface_properties(void) ret = SetupDiGetDeviceInterfacePropertyKeys(NULL, NULL, NULL, 0, NULL, 0); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_HANDLE, "%lu != %d\n", err, ERROR_INVALID_HANDLE); + ok(!ret && err == ERROR_INVALID_HANDLE, "%lu != %d\n", err, ERROR_INVALID_HANDLE); ret = SetupDiGetDeviceInterfacePropertyKeys(set, NULL, NULL, 0, NULL, 0); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_PARAMETER, "%lu != %d\n", err, ERROR_INVALID_PARAMETER); + ok(!ret && err == ERROR_INVALID_PARAMETER, "%lu != %d\n", err, ERROR_INVALID_PARAMETER); ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 0, NULL, 0); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INSUFFICIENT_BUFFER); + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INSUFFICIENT_BUFFER); ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 0, &req, 1); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_FLAGS, "%lu != %d\n", err, ERROR_INVALID_FLAGS); + ok(!ret && err == ERROR_INVALID_FLAGS, "%lu != %d\n", err, ERROR_INVALID_FLAGS); ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 1, &req, 0); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INVALID_USER_BUFFER, "%lu != %d\n", err, ERROR_INVALID_USER_BUFFER); + ok(!ret && err == ERROR_INVALID_USER_BUFFER, "%lu != %d\n", err, ERROR_INVALID_USER_BUFFER); ret = SetupDiSetDeviceInterfacePropertyW(set, &iface, &DEVPKEY_DeviceInterface_FriendlyName, DEVPROP_TYPE_STRING, (const BYTE *)str, sizeof(str), 0); @@ -2908,14 +2908,14 @@ static void test_device_interface_properties(void) req = 0; ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, NULL, 0, &req, 0); err = GetLastError(); - todo_wine ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INVALID_FLAGS); + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INVALID_FLAGS); size = req; keys = calloc(size, sizeof(*keys)); ret = SetupDiGetDeviceInterfacePropertyKeys(set, &iface, keys, size, &req, 0); - todo_wine ok(ret, "SetupDiGetDeviceInterfacePropertyKeys failed: %lu\n", GetLastError()); - todo_wine_if(ret) ok(size == req, "%lu != %lu\n", size, req); - todo_wine ok(size >= ARRAY_SIZE(default_keys), "got size %lu, should be >= %lu\n", size, (DWORD)ARRAY_SIZE(default_keys)); + ok(ret, "SetupDiGetDeviceInterfacePropertyKeys failed: %lu\n", GetLastError()); + ok(size == req, "%lu != %lu\n", size, req); + ok(size >= ARRAY_SIZE(default_keys), "got size %lu, should be >= %lu\n", size, (DWORD)ARRAY_SIZE(default_keys)); for (i = 0; i < size && rem; i++) { @@ -2955,7 +2955,7 @@ static void test_device_interface_properties(void) if (IsEqualDevPropKey(keys[i], DEVPKEY_DeviceInterface_FriendlyName) && rem) rem--; } free(keys); - todo_wine ok(!rem, "got rem %lu, should be 0\n", rem); + ok(!rem, "got rem %lu, should be 0\n", rem); ret = SetupDiRemoveDeviceInterface(set, &iface); ok(ret, "Failed to remove device interface, error %#lx.\n", GetLastError()); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8405
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/setupapi/devinst.c | 24 +++++++++++++++++++++++- dlls/setupapi/tests/devinst.c | 7 +++---- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index cc287d4f8e4..434ae120573 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3301,10 +3301,10 @@ BOOL WINAPI SetupDiGetDeviceInterfacePropertyW( HDEVINFO devinfo, SP_DEVICE_INTE return FALSE; } + ret = ERROR_SUCCESS; if (IsEqualDevPropKey( *key, DEVPKEY_DeviceInterface_Enabled )) { *type = DEVPROP_TYPE_BOOLEAN; - ret = ERROR_SUCCESS; if (buf_size >= sizeof( DEVPROP_BOOLEAN )) *buf = (iface->flags & SPINT_ACTIVE) ? DEVPROP_TRUE : DEVPROP_FALSE; else @@ -3312,6 +3312,28 @@ BOOL WINAPI SetupDiGetDeviceInterfacePropertyW( HDEVINFO devinfo, SP_DEVICE_INTE if (req_size) *req_size = sizeof( DEVPROP_BOOLEAN ); } + else if (IsEqualDevPropKey( *key, DEVPKEY_DeviceInterface_ClassGuid )) + { + *type = DEVPROP_TYPE_GUID; + if (buf_size >= sizeof( iface->class )) + memcpy( buf, &iface->class, sizeof( iface->class ) ); + else + ret = ERROR_INSUFFICIENT_BUFFER; + if (req_size) + *req_size = sizeof( GUID ); + } + else if (IsEqualDevPropKey( *key, DEVPKEY_Device_InstanceId )) + { + DWORD size = wcslen( iface->device->instanceId ) + 1; + + *type = DEVPROP_TYPE_STRING; + if (buf_size >= size) + wcscpy( (WCHAR *)buf, iface->device->instanceId ); + else + ret = ERROR_INSUFFICIENT_BUFFER; + if (req_size) + *req_size = size; + } else ret = get_device_reg_property( iface->refstr_key, key, type, buf, buf_size, req_size, flags ); diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 62624fd592a..199cef2b209 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2935,15 +2935,14 @@ static void test_device_interface_properties(void) type = DEVPROP_TYPE_EMPTY; ret = SetupDiGetDeviceInterfacePropertyW(set, &iface, &key, &type, NULL, 0, &req, 0); err = GetLastError(); - todo_wine_if(!ret && err == ERROR_NOT_FOUND) - ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INSUFFICIENT_BUFFER); - todo_wine_if(!ret && err == ERROR_NOT_FOUND) ok(type == exp_type, "%#lx != %#lx\n", type, exp_type); + ok(!ret && err == ERROR_INSUFFICIENT_BUFFER, "%lu != %d\n", err, ERROR_INSUFFICIENT_BUFFER); + ok(type == exp_type, "%#lx != %#lx\n", type, exp_type); size = req; buf = calloc( 1, size ); ret = SetupDiGetDeviceInterfacePropertyW(set, &iface, &key, &type, buf, size, &req, 0); err = GetLastError(); - todo_wine_if(!ret && err == ERROR_NOT_FOUND) ok(ret, "SetupDiGetDeviceInterfacePropertyW failed: %lu\n", err); + ok(ret, "SetupDiGetDeviceInterfacePropertyW failed: %lu\n", err); free(buf); winetest_pop_context(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8405
From: Vibhav Pant <vibhavp(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 199cef2b209..2f46e5beb95 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -2736,6 +2736,7 @@ static void test_device_interface_properties(void) { DEVPKEY_Device_InstanceId, DEVPROP_TYPE_STRING } }; const WCHAR str[] = L"Wine is not an emulator."; + const WCHAR instance_id[] = L"ROOT\\LEGACY_BOGUS\\0000"; DEVPROPTYPE type = DEVPROP_TYPE_EMPTY; DEVPROP_BOOLEAN boolean = DEVPROP_TRUE; SP_DEVICE_INTERFACE_DATA iface; @@ -2745,12 +2746,13 @@ static void test_device_interface_properties(void) WCHAR buf[50]; HDEVINFO set; BOOL ret; + GUID guid_val = {0}; set = SetupDiCreateDeviceInfoList(&guid, NULL); ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#lx\n", GetLastError()); device.cbSize = sizeof(device); - ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ret = SetupDiCreateDeviceInfoW(set, instance_id, &guid, NULL, NULL, 0, &device); ok(ret, "Failed to create device, error %#lx.\n", GetLastError()); iface.cbSize = sizeof(iface); @@ -2956,6 +2958,25 @@ static void test_device_interface_properties(void) free(keys); ok(!rem, "got rem %lu, should be 0\n", rem); + type = DEVPROP_TYPE_EMPTY; + req = 0; + ret = SetupDiGetDeviceInterfacePropertyW(set, &iface, &DEVPKEY_DeviceInterface_ClassGuid, &type, (BYTE *)&guid_val, + sizeof(guid_val), &req, 0); + ok(ret, "SetupDiGetDeviceInterfacePropertyW failed: %lu\n", GetLastError()); + ok(type == DEVPROP_TYPE_GUID, "%#lx != %#x\n", type, DEVPROP_TYPE_GUID); + ok(req == sizeof(guid), "%lu != %lu\n", req, (DWORD)sizeof(guid)); + ok(IsEqualGUID(&guid_val, &guid), "%s != %s", debugstr_guid( &guid_val ), debugstr_guid( &guid )); + + type = DEVPROP_TYPE_EMPTY; + req = 0; + buf[0] = '\0'; + ret = SetupDiGetDeviceInterfacePropertyW(set, &iface, &DEVPKEY_Device_InstanceId, &type, (BYTE *)buf, + sizeof(instance_id), &req, 0); + ok(ret, "SetupDiGetDeviceInterfacePropertyW failed: %lu\n", GetLastError()); + ok(type == DEVPROP_TYPE_STRING, "%#lx != %#x", type, DEVPROP_TYPE_STRING); + ok(req == sizeof(instance_id), "%lu != %lu\n", req, (DWORD)sizeof(instance_id)); + ok(!wcscmp(buf, instance_id), "%s != %s\n", debugstr_w(buf), debugstr_w(instance_id)); + ret = SetupDiRemoveDeviceInterface(set, &iface); ok(ret, "Failed to remove device interface, error %#lx.\n", GetLastError()); ret = SetupDiRemoveDevice(set, &device); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8405
participants (2)
-
Vibhav Pant -
Vibhav Pant (＠vibhavp)