From: Rémi Bernon <rbernon@codeweavers.com> --- dlls/cfgmgr32/cfgmgr32.c | 263 +++++++++++++++++++++++++++++++++ dlls/cfgmgr32/cfgmgr32.spec | 20 +-- dlls/cfgmgr32/tests/cfgmgr32.c | 107 ++++++++++++++ dlls/setupapi/devinst.c | 169 --------------------- dlls/setupapi/setupapi.spec | 20 +-- dlls/setupapi/stubs.c | 20 --- 6 files changed, 390 insertions(+), 209 deletions(-) diff --git a/dlls/cfgmgr32/cfgmgr32.c b/dlls/cfgmgr32/cfgmgr32.c index ff179295f02..5d3ad003a8b 100644 --- a/dlls/cfgmgr32/cfgmgr32.c +++ b/dlls/cfgmgr32/cfgmgr32.c @@ -106,6 +106,13 @@ static LSTATUS query_value( HKEY hkey, const WCHAR *value, WCHAR *buffer, DWORD return RegQueryValueExW( hkey, value, NULL, NULL, (BYTE *)buffer, &len ); } +static LSTATUS open_enum_key( HKEY root, const WCHAR *key, REGSAM access, BOOL open, HKEY *hkey ) +{ + WCHAR path[MAX_PATH]; + swprintf( path, ARRAY_SIZE(path), L"%s%s", enum_rootW, key ); + return open_key( root, path, access, open, hkey ); +} + static LSTATUS open_class_key( HKEY root, const WCHAR *key, REGSAM access, BOOL open, HKEY *hkey ) { WCHAR path[MAX_PATH]; @@ -528,6 +535,99 @@ static LSTATUS get_device_interface_property_keys( const struct device_interface return err; } +struct device +{ + WCHAR enumerator[MAX_PATH]; + WCHAR device[MAX_PATH]; + WCHAR instance[MAX_PATH]; +}; + +static LSTATUS init_device( struct device *dev, const WCHAR *name ) +{ + WCHAR *tmp; + + dev->enumerator[0] = dev->device[0] = dev->instance[0] = 0; + tmp = lstrcpynW( dev->enumerator, name, ARRAY_SIZE(dev->enumerator) ); + if (!(tmp = wcschr( dev->enumerator, '\\' ))) return ERROR_INVALID_DATA; + + *tmp++ = 0; + wcscpy( dev->device, tmp ); + if ((tmp = wcschr( dev->device, '\\' ))) *tmp++ = 0; + if (tmp) wcscpy( dev->instance, tmp ); + + return ERROR_SUCCESS; +} + +static LSTATUS open_device_key( HKEY root, const struct device *dev, REGSAM access, BOOL open, HKEY *hkey ) +{ + WCHAR path[MAX_PATH]; + UINT len; + + len = swprintf( path, ARRAY_SIZE(path), L"%s", dev->enumerator ); + if (*dev->device) len += swprintf( path + len, ARRAY_SIZE(path) - len, L"\\%s", dev->device ); + if (*dev->instance) len += swprintf( path + len, ARRAY_SIZE(path) - len, L"\\%s", dev->instance ); + + return open_enum_key( root, path, access, open, hkey ); +} + +static CRITICAL_SECTION devnode_cs; +static CRITICAL_SECTION_DEBUG devnode_cs_debug = { + 0, 0, &devnode_cs, + { &devnode_cs_debug.ProcessLocksList, + &devnode_cs_debug.ProcessLocksList }, + 0, 0, { (DWORD_PTR)(__FILE__ ": devnode_cs") } +}; +static CRITICAL_SECTION devnode_cs = { &devnode_cs_debug, -1, 0, 0, 0, 0 }; + +/* tree of the devnodes which have been accessed */ +static struct device *devnodes; +static UINT devnodes_count, devnodes_capacity; + +/* devnode_cs must be held */ +static DEVINST devnodes_lookup( const struct device *dev ) +{ + for (DEVINST i = 0; i < devnodes_count; ++i) + { + if (wcsicmp( devnodes[i].enumerator, dev->enumerator )) continue; + if (wcsicmp( devnodes[i].device, dev->device )) continue; + if (!wcsicmp( devnodes[i].instance, dev->instance )) return i + 1; + } + + return 0; +} + +/* devnode_cs must be held */ +static LSTATUS devnodes_append( const struct device *dev, DEVINST *node ) +{ + if (devnodes_count == devnodes_capacity) + { + UINT capacity = max( 256, devnodes_capacity * 3 / 2 ); + struct device *tmp; + + if (capacity <= devnodes_capacity || !(tmp = realloc( devnodes, capacity * sizeof(*devnodes) ))) return ERROR_OUTOFMEMORY; + memset( tmp + devnodes_capacity, 0, (capacity - devnodes_capacity) * sizeof(*devnodes) ); + devnodes_capacity = capacity; + devnodes = tmp; + } + + devnodes[devnodes_count] = *dev; + *node = ++devnodes_count; /* index 0 is reserved */ + + return ERROR_SUCCESS; +} + +static LSTATUS devnode_get_device( DEVINST node, struct device *dev ) +{ + LSTATUS err = ERROR_SUCCESS; + + EnterCriticalSection( &devnode_cs ); + if (!node || node > devnodes_count) err = ERROR_NO_SUCH_DEVICE; + else *dev = devnodes[node - 1]; + LeaveCriticalSection( &devnode_cs ); + + return err; +} + static CONFIGRET map_error( LSTATUS err ) { switch (err) @@ -544,6 +644,17 @@ static CONFIGRET map_error( LSTATUS err ) } } +static CONFIGRET map_error_node( LSTATUS err ) +{ + switch (err) + { + case ERROR_INVALID_DATA: return CR_INVALID_DEVNODE; + case ERROR_NOT_FOUND: return CR_NO_SUCH_DEVNODE; + case ERROR_FILE_NOT_FOUND: return CR_NO_SUCH_DEVNODE; + default: return map_error( err ); + } +} + /*********************************************************************** * CM_MapCrToWin32Err (cfgmgr32.@) */ @@ -1080,3 +1191,155 @@ CONFIGRET WINAPI CM_Get_Device_Interface_Property_KeysW( const WCHAR *iface, DEV { return CM_Get_Device_Interface_Property_Keys_ExW( iface, keys, count, flags, NULL ); } + +/*********************************************************************** + * CM_Locate_DevNode_ExW (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Locate_DevNode_ExW( DEVINST *node, DEVINSTID_W instance_id, ULONG flags, HMACHINE machine ) +{ + const WCHAR *instance = instance_id && *instance_id ? instance_id : L"HTREE\\ROOT\\0"; + struct device dev; + LSTATUS err; + HKEY hkey; + + TRACE( "node %p, instance_id %s, flags %#lx, machine %p\n", node, debugstr_w(instance_id), flags, machine ); + if (machine) FIXME( "machine %p not implemented!\n", machine ); + if (flags) FIXME( "flags %#lx not implemented!\n", flags ); + if (!node) return CR_INVALID_POINTER; + *node = 0; + + if (init_device( &dev, instance )) return CR_INVALID_DEVICE_ID; + + EnterCriticalSection( &devnode_cs ); + + if ((*node = devnodes_lookup( &dev ))) err = ERROR_SUCCESS; + else if (!(err = open_device_key( HKEY_LOCAL_MACHINE, &dev, KEY_ALL_ACCESS, TRUE, &hkey ))) + { + err = devnodes_append( &dev, node ); + RegCloseKey( hkey ); + } + + LeaveCriticalSection( &devnode_cs ); + + return map_error_node( err ); +} + +/*********************************************************************** + * CM_Locate_DevNode_ExA (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Locate_DevNode_ExA( DEVINST *node, DEVINSTID_A instance_idA, ULONG flags, HMACHINE machine ) +{ + WCHAR instance_idW[MAX_PATH]; + + TRACE( "node %p, instance_idA %s, flags %#lx, machine %p\n", node, debugstr_a(instance_idA), flags, machine ); + + if (instance_idA) MultiByteToWideChar( CP_ACP, 0, instance_idA, -1, instance_idW, ARRAY_SIZE(instance_idW) ); + return CM_Locate_DevNode_ExW( node, instance_idA ? instance_idW : NULL, flags, NULL ); +} + +/*********************************************************************** + * CM_Locate_DevNodeW (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Locate_DevNodeW( DEVINST *node, DEVINSTID_W instance_id, ULONG flags ) +{ + return CM_Locate_DevNode_ExW( node, instance_id, flags, NULL ); +} + +/*********************************************************************** + * CM_Locate_DevNodeA (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Locate_DevNodeA( DEVINST *node, DEVINSTID_A instance_id, ULONG flags ) +{ + return CM_Locate_DevNode_ExA( node, instance_id, flags, NULL ); +} + +/*********************************************************************** + * CM_Get_Device_ID_Size_Ex (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_Size_Ex( ULONG *len, DEVINST node, ULONG flags, HMACHINE machine ) +{ + struct device dev; + + TRACE( "len %p, node %#lx, flags %#lx, machine %p\n", len, node, flags, machine ); + if (machine) FIXME( "machine %p not implemented!\n", machine ); + if (flags) FIXME( "flags %#lx not implemented!\n", flags ); + + if (!len) return CR_INVALID_POINTER; + if (devnode_get_device( node, &dev )) return CR_INVALID_DEVNODE; + + *len = wcslen( dev.enumerator ); + if (*dev.device) *len += 1 + wcslen( dev.device ); + if (*dev.instance) *len += 1 + wcslen( dev.instance ); + + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Get_Device_ID_Size (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_Size( ULONG *len, DEVINST node, ULONG flags ) +{ + return CM_Get_Device_ID_Size_Ex( len, node, flags, NULL ); +} + +/*********************************************************************** + * CM_Get_Device_ID_ExW (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_ExW( DEVINST node, WCHAR *buffer, ULONG len, ULONG flags, HMACHINE machine ) +{ + WCHAR path[MAX_PATH]; + struct device dev; + ULONG path_len; + + TRACE( "node %#lx, buffer %p, len %lu, flags %#lx, machine %p\n", node, buffer, len, flags, machine ); + if (machine) FIXME( "machine %p not implemented!\n", machine ); + if (flags) FIXME( "flags %#lx not implemented!\n", flags ); + + if (!buffer) return CR_INVALID_POINTER; + if (devnode_get_device( node, &dev )) return CR_INVALID_DEVNODE; + + path_len = swprintf( path, ARRAY_SIZE(path), L"%s", dev.enumerator ); + if (*dev.device) path_len += swprintf( path + path_len, ARRAY_SIZE(path) - path_len, L"\\%s", dev.device ); + if (*dev.instance) path_len += swprintf( path + path_len, ARRAY_SIZE(path) - path_len, L"\\%s", dev.instance ); + + if (path_len > len) return CR_BUFFER_SMALL; + memcpy( buffer, path, (path_len + 1) * sizeof(WCHAR) ); + + return CR_SUCCESS; +} + +/*********************************************************************** + * CM_Get_Device_ID_ExA (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_ID_ExA( DEVINST node, char *bufferA, ULONG len, ULONG flags, HMACHINE machine ) +{ + WCHAR *bufferW; + CONFIGRET ret; + + bufferW = bufferA ? malloc( len * sizeof(WCHAR) ) : NULL; + ret = CM_Get_Device_ID_ExW( node, bufferA ? bufferW : NULL, len, flags, machine ); + if (!ret && bufferA && len && !WideCharToMultiByte( CP_ACP, 0, bufferW, len, bufferA, len, 0, 0 )) + { + if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) ret = CR_BUFFER_SMALL; + else ret = CR_FAILURE; + } + free( bufferW ); + + return ret; +} + +/*********************************************************************** + * CM_Get_Device_IDW (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_IDW( DEVINST node, WCHAR *buffer, ULONG len, ULONG flags ) +{ + return CM_Get_Device_ID_ExW( node, buffer, len, flags, NULL ); +} + +/*********************************************************************** + * CM_Get_Device_IDA (cfgmgr32.@) + */ +CONFIGRET WINAPI CM_Get_Device_IDA( DEVINST node, char *buffer, ULONG len, ULONG flags ) +{ + return CM_Get_Device_ID_ExA( node, buffer, len, flags, NULL ); +} diff --git a/dlls/cfgmgr32/cfgmgr32.spec b/dlls/cfgmgr32/cfgmgr32.spec index 2aee10c2672..1b8a515ab8a 100644 --- a/dlls/cfgmgr32/cfgmgr32.spec +++ b/dlls/cfgmgr32/cfgmgr32.spec @@ -94,10 +94,10 @@ @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) setupapi.CM_Get_DevNode_Registry_Property_ExW @ stdcall CM_Get_DevNode_Status(ptr ptr long long) setupapi.CM_Get_DevNode_Status @ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) setupapi.CM_Get_DevNode_Status_Ex -@ stdcall CM_Get_Device_IDA(ptr ptr long long) setupapi.CM_Get_Device_IDA -@ stdcall CM_Get_Device_IDW(ptr ptr long long) setupapi.CM_Get_Device_IDW -@ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExA -@ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) setupapi.CM_Get_Device_ID_ExW +@ stdcall CM_Get_Device_IDA(ptr ptr long long) +@ stdcall CM_Get_Device_IDW(ptr ptr long long) +@ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) +@ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) @ stdcall CM_Get_Device_ID_ListA(str ptr long long) setupapi.CM_Get_Device_ID_ListA @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) setupapi.CM_Get_Device_ID_ListW @ stdcall CM_Get_Device_ID_List_ExA(str ptr long long ptr) setupapi.CM_Get_Device_ID_List_ExA @@ -106,8 +106,8 @@ @ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) setupapi.CM_Get_Device_ID_List_SizeW @ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long ptr) setupapi.CM_Get_Device_ID_List_Size_ExA @ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long ptr) setupapi.CM_Get_Device_ID_List_Size_ExW -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) setupapi.CM_Get_Device_ID_Size -@ stub CM_Get_Device_ID_Size_Ex +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) +@ stdcall CM_Get_Device_ID_Size_Ex(ptr ptr long ptr) @ stdcall CM_Get_Device_Interface_AliasA(str ptr ptr ptr long) setupapi.CM_Get_Device_Interface_AliasA @ stdcall CM_Get_Device_Interface_AliasW(wstr ptr ptr ptr long) setupapi.CM_Get_Device_Interface_AliasW @ stub CM_Get_Device_Interface_Alias_ExA @@ -164,10 +164,10 @@ @ stub CM_Is_Dock_Station_Present_Ex @ stub CM_Is_Version_Available @ stub CM_Is_Version_Available_Ex -@ stdcall CM_Locate_DevNodeA(ptr str long) setupapi.CM_Locate_DevNodeA -@ stdcall CM_Locate_DevNodeW(ptr wstr long) setupapi.CM_Locate_DevNodeW -@ stdcall CM_Locate_DevNode_ExA(ptr str long long) setupapi.CM_Locate_DevNode_ExA -@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) setupapi.CM_Locate_DevNode_ExW +@ stdcall CM_Locate_DevNodeA(ptr str long) +@ stdcall CM_Locate_DevNodeW(ptr wstr long) +@ stdcall CM_Locate_DevNode_ExA(ptr str long long) +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) @ stub CM_MapCrToSpErr @ stdcall CM_MapCrToWin32Err(long long) @ stub CM_Merge_Range_List diff --git a/dlls/cfgmgr32/tests/cfgmgr32.c b/dlls/cfgmgr32/tests/cfgmgr32.c index 7c6fa283f50..9cf0eb37c11 100644 --- a/dlls/cfgmgr32/tests/cfgmgr32.c +++ b/dlls/cfgmgr32/tests/cfgmgr32.c @@ -86,6 +86,8 @@ static const WCHAR *guid_string( const GUID *guid, WCHAR *buffer, UINT length ) return buffer; } +static DEVINST next_devinst = 1; + static void test_CM_MapCrToWin32Err(void) { unsigned int i; @@ -2889,6 +2891,110 @@ static void test_CM_Open_Device_Interface_Key(void) } } +static void test_CM_Locate_DevNode(void) +{ + WCHAR iface[4096], path[MAX_PATH], instance_id[MAX_PATH]; + DEVINST node, root = 0; + DWORD size, type, len; + CONFIGRET ret; + GUID guid; + + ret = CM_Locate_DevNodeW( NULL, (WCHAR *)L"INVALID", 0 ); + ok_x4( ret, ==, CR_INVALID_POINTER ); + + ret = CM_Get_Device_ID_Size( &len, 0, 0 ); + ok_x4( ret, ==, CR_INVALID_DEVNODE ); + ret = CM_Get_Device_ID_Size( &len, 1, 0 ); + ok_x4( ret, ==, CR_INVALID_DEVNODE ); + ret = CM_Get_Device_ID_Size( &len, 2, 0 ); + ok_x4( ret, ==, CR_INVALID_DEVNODE ); + + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, NULL, 0 ); + todo_wine ok_x4( ret, ==, CR_SUCCESS ); + todo_wine ok_x4( node, ==, next_devinst ); + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, (WCHAR *)L"", 0 ); + todo_wine ok_x4( ret, ==, CR_SUCCESS ); + todo_wine ok_x4( node, ==, next_devinst ); + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, (WCHAR *)L"HTREE\\ROOT\\0", 0 ); + todo_wine ok_x4( ret, ==, CR_SUCCESS ); + todo_wine ok_x4( node, ==, next_devinst ); + if (node == next_devinst) root = next_devinst++; + + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, (WCHAR *)L"INVALID", 0 ); + ok_x4( ret, ==, CR_INVALID_DEVICE_ID ); + ok_x4( node, ==, 0 ); + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, (WCHAR *)L"WINETEST\\WINETEST\\0123456", 0 ); + ok_x4( ret, ==, CR_NO_SUCH_DEVNODE ); + ok_x4( node, ==, 0 ); + + guid = GUID_DEVINTERFACE_HID; + ret = CM_Get_Device_Interface_ListW( &guid, NULL, iface, ARRAY_SIZE(iface), CM_GET_DEVICE_INTERFACE_LIST_PRESENT ); + if (broken( !*iface )) + { + skip( "No HID device present, skipping tests\n" ); + return; + } + ok_x4( ret, ==, CR_SUCCESS ); + size = sizeof(instance_id); + ret = CM_Get_Device_Interface_PropertyW( iface, &DEVPKEY_Device_InstanceId, &type, (BYTE *)instance_id, &size, 0 ); + ok_x4( ret, ==, CR_SUCCESS ); + ok_x4( type, ==, DEVPROP_TYPE_STRING ); + + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, instance_id, 0 ); + ok_x4( ret, ==, CR_SUCCESS ); + ok_x4( node, ==, next_devinst ); + + wcslwr( instance_id ); + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, instance_id, 0 ); + ok_x4( ret, ==, CR_SUCCESS ); + ok_x4( node, ==, next_devinst ); + + wcsupr( instance_id ); + node = 0xdeadbeef; + ret = CM_Locate_DevNodeW( &node, instance_id, 0 ); + ok_x4( ret, ==, CR_SUCCESS ); + ok_x4( node, ==, next_devinst ); + if (node == next_devinst) next_devinst++; + + + ret = CM_Get_Device_ID_Size( &len, 0, 0 ); + ok_x4( ret, ==, CR_INVALID_DEVNODE ); + + len = 0xdeadbeef; + ret = CM_Get_Device_ID_Size( &len, root, 0 ); + todo_wine ok_x4( ret, ==, CR_SUCCESS ); + todo_wine ok_u4( len, ==, 12 ); + len = 0xdeadbeef; + ret = CM_Get_Device_ID_Size( &len, node, 0 ); + ok_x4( ret, ==, CR_SUCCESS ); + ok_u4( len, ==, wcslen( instance_id ) ); + + + ret = CM_Get_Device_IDW( 0, path, ARRAY_SIZE(path), 0 ); + ok_x4( ret, ==, CR_INVALID_DEVNODE ); + ret = CM_Get_Device_IDW( root, path, 0, 0 ); + todo_wine ok_x4( ret, ==, CR_INVALID_POINTER ); + ret = CM_Get_Device_IDW( root, NULL, ARRAY_SIZE(path), 0 ); + ok_x4( ret, ==, CR_INVALID_POINTER ); + + memset( path, 0xcd, sizeof(path) ); + ret = CM_Get_Device_IDW( root, path, ARRAY_SIZE(path), 0 ); + todo_wine ok_x4( ret, ==, CR_SUCCESS ); + todo_wine ok_wcs( L"HTREE\\ROOT\\0", path ); + + memset( path, 0xcd, sizeof(path) ); + ret = CM_Get_Device_IDW( node, path, ARRAY_SIZE(path), 0 ); + ok_x4( ret, ==, CR_SUCCESS ); + ok_wcs( instance_id, path ); +} + static void test_CM_Get_Class_Property_Keys(void) { GUID guid = GUID_DEVCLASS_HIDCLASS; @@ -2947,6 +3053,7 @@ START_TEST(cfgmgr32) pDevFindProperty = (void *)GetProcAddress(mod, "DevFindProperty"); test_CM_MapCrToWin32Err(); + test_CM_Locate_DevNode(); test_CM_Enumerate_Classes(); test_CM_Enumerate_Enumerators(); test_CM_Get_Class_Key_Name(); diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index de628d81bd2..96e47c1c084 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -243,47 +243,6 @@ static inline void copy_device_iface_data(SP_DEVICE_INTERFACE_DATA *data, data->Reserved = (ULONG_PTR)iface; } -static WCHAR **devinst_table; -static unsigned int devinst_table_size; - -static DEVINST get_devinst_for_device_id(const WCHAR *id) -{ - unsigned int i; - - for (i = 0; i < devinst_table_size; ++i) - { - if (!devinst_table[i]) - break; - if (!wcsicmp(devinst_table[i], id)) - return i; - } - return i; -} - -static DEVINST alloc_devinst_for_device_id(const WCHAR *id) -{ - DEVINST ret; - - ret = get_devinst_for_device_id(id); - if (ret == devinst_table_size) - { - if (devinst_table) - { - devinst_table = realloc(devinst_table, devinst_table_size * 2 * sizeof(*devinst_table)); - memset(devinst_table + devinst_table_size, 0, devinst_table_size * sizeof(*devinst_table)); - devinst_table_size *= 2; - } - else - { - devinst_table_size = 256; - devinst_table = calloc(devinst_table_size, sizeof(*devinst_table)); - } - } - if (!devinst_table[ret]) - devinst_table[ret] = wcsdup(id); - return ret; -} - static void SETUPDI_GuidToString(const GUID *guid, LPWSTR guidStr) { swprintf(guidStr, 39, L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}", @@ -4225,134 +4184,6 @@ BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_dat return !l; } -/*********************************************************************** - * CM_Get_Device_IDA (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Get_Device_IDA(DEVINST devnode, char *buffer, ULONG len, ULONG flags) -{ - TRACE("%lu, %p, %lu, %#lx\n", devnode, buffer, len, flags); - - if (devnode >= devinst_table_size || !devinst_table[devnode]) - return CR_NO_SUCH_DEVINST; - - WideCharToMultiByte(CP_ACP, 0, devinst_table[devnode], -1, buffer, len, 0, 0); - TRACE("Returning %s\n", debugstr_a(buffer)); - return CR_SUCCESS; -} - -/*********************************************************************** - * CM_Get_Device_IDW (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Get_Device_IDW(DEVINST devnode, WCHAR *buffer, ULONG len, ULONG flags) -{ - TRACE("%lu, %p, %lu, %#lx\n", devnode, buffer, len, flags); - - if (devnode >= devinst_table_size || !devinst_table[devnode]) - return CR_NO_SUCH_DEVINST; - - lstrcpynW(buffer, devinst_table[devnode], len); - TRACE("Returning %s\n", debugstr_w(buffer)); - return CR_SUCCESS; -} - -/*********************************************************************** - * CM_Get_Device_ID_Size (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Get_Device_ID_Size(ULONG *len, DEVINST devnode, ULONG flags) -{ - TRACE("%p, %lu, %#lx\n", len, devnode, flags); - - if (devnode >= devinst_table_size || !devinst_table[devnode]) - return CR_NO_SUCH_DEVINST; - - *len = lstrlenW(devinst_table[devnode]); - return CR_SUCCESS; -} - -/*********************************************************************** - * CM_Locate_DevNodeA (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Locate_DevNodeA(DEVINST *devinst, DEVINSTID_A device_id, ULONG flags) -{ - TRACE("%p %s %#lx.\n", devinst, debugstr_a(device_id), flags); - - return CM_Locate_DevNode_ExA(devinst, device_id, flags, NULL); -} - -/*********************************************************************** - * CM_Locate_DevNodeW (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Locate_DevNodeW(DEVINST *devinst, DEVINSTID_W device_id, ULONG flags) -{ - TRACE("%p %s %#lx.\n", devinst, debugstr_w(device_id), flags); - - return CM_Locate_DevNode_ExW(devinst, device_id, flags, NULL); -} - -/*********************************************************************** - * CM_Locate_DevNode_ExA (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Locate_DevNode_ExA(DEVINST *devinst, DEVINSTID_A device_id, ULONG flags, HMACHINE machine) -{ - CONFIGRET ret; - DEVINSTID_W device_idw; - unsigned int slen; - - TRACE("%p %s %#lx %p.\n", devinst, debugstr_a(device_id), flags, machine); - - if (!device_id) - { - FIXME("NULL device_id unsupported.\n"); - return CR_CALL_NOT_IMPLEMENTED; - } - - slen = strlen(device_id) + 1; - if (!(device_idw = malloc(slen * sizeof(*device_idw)))) - return CR_OUT_OF_MEMORY; - - MultiByteToWideChar(CP_ACP, 0, device_id, slen, device_idw, slen); - ret = CM_Locate_DevNode_ExW(devinst, device_idw, flags, NULL); - free(device_idw); - return ret; -} - -/*********************************************************************** - * CM_Locate_DevNode_ExW (SETUPAPI.@) - */ -CONFIGRET WINAPI CM_Locate_DevNode_ExW(DEVINST *devinst, DEVINSTID_W device_id, ULONG flags, HMACHINE machine) -{ - HKEY enum_hkey, device_hkey; - LSTATUS status; - - TRACE("%p %s %#lx %p.\n", devinst, debugstr_w(device_id), flags, machine); - - if (!devinst) - return CR_INVALID_POINTER; - - *devinst = 0; - - if (machine) - FIXME("machine %p not supported.\n", machine); - if (flags) - FIXME("flags %#lx are not supported.\n", flags); - - if (!device_id) - { - FIXME("NULL device_id unsupported.\n"); - return CR_CALL_NOT_IMPLEMENTED; - } - - RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL, &enum_hkey, NULL); - if (!(status = RegOpenKeyExW(enum_hkey, device_id, 0, KEY_READ, &device_hkey))) - RegCloseKey(device_hkey); - RegCloseKey(enum_hkey); - if (status) - return CR_NO_SUCH_DEVNODE; - - *devinst = alloc_devinst_for_device_id(device_id); - return CR_SUCCESS; -} - static CONFIGRET get_device_id_list(const WCHAR *filter, WCHAR *buffer, ULONG *len, ULONG flags) { const ULONG supported_flags = CM_GETIDLIST_FILTER_NONE | CM_GETIDLIST_FILTER_CLASS | CM_GETIDLIST_FILTER_PRESENT; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 6bfe922a1d7..db9fa24514e 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -75,10 +75,10 @@ @ stdcall CM_Get_DevNode_Registry_Property_ExW(long long ptr ptr ptr long ptr) @ stdcall CM_Get_DevNode_Status(ptr ptr long long) @ stdcall CM_Get_DevNode_Status_Ex(ptr ptr long long ptr) -@ stdcall CM_Get_Device_IDA(ptr ptr long long) -@ stdcall CM_Get_Device_IDW(ptr ptr long long) -@ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) -@ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) +@ stdcall CM_Get_Device_IDA(ptr ptr long long) cfgmgr32.CM_Get_Device_IDA +@ stdcall CM_Get_Device_IDW(ptr ptr long long) cfgmgr32.CM_Get_Device_IDW +@ stdcall CM_Get_Device_ID_ExA(ptr ptr long long ptr) cfgmgr32.CM_Get_Device_ID_ExA +@ stdcall CM_Get_Device_ID_ExW(ptr ptr long long ptr) cfgmgr32.CM_Get_Device_ID_ExW @ stdcall CM_Get_Device_ID_ListA(str ptr long long) @ stdcall CM_Get_Device_ID_ListW(wstr ptr long long) @ stdcall CM_Get_Device_ID_List_ExA(str ptr long long ptr) @@ -87,8 +87,8 @@ @ stdcall CM_Get_Device_ID_List_SizeW(ptr wstr long) @ stdcall CM_Get_Device_ID_List_Size_ExA(ptr str long ptr) @ stdcall CM_Get_Device_ID_List_Size_ExW(ptr wstr long ptr) -@ stdcall CM_Get_Device_ID_Size(ptr ptr long) -@ stub CM_Get_Device_ID_Size_Ex +@ stdcall CM_Get_Device_ID_Size(ptr ptr long) cfgmgr32.CM_Get_Device_ID_Size +@ stdcall CM_Get_Device_ID_Size_Ex(ptr ptr long ptr) cfgmgr32.CM_Get_Device_ID_Size_Ex @ stdcall CM_Get_Device_Interface_AliasA(str ptr ptr ptr long) @ stdcall CM_Get_Device_Interface_AliasW(wstr ptr ptr ptr long) @ stub CM_Get_Device_Interface_Alias_ExA @@ -132,10 +132,10 @@ @ stub CM_Intersect_Range_List @ stub CM_Invert_Range_List @ stub CM_Is_Dock_Station_Present -@ stdcall CM_Locate_DevNodeA(ptr str long) -@ stdcall CM_Locate_DevNodeW(ptr wstr long) -@ stdcall CM_Locate_DevNode_ExA(ptr str long long) -@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) +@ stdcall CM_Locate_DevNodeA(ptr str long) cfgmgr32.CM_Locate_DevNodeA +@ stdcall CM_Locate_DevNodeW(ptr wstr long) cfgmgr32.CM_Locate_DevNodeW +@ stdcall CM_Locate_DevNode_ExA(ptr str long long) cfgmgr32.CM_Locate_DevNode_ExA +@ stdcall CM_Locate_DevNode_ExW(ptr wstr long long) cfgmgr32.CM_Locate_DevNode_ExW @ stub CM_Merge_Range_List @ stub CM_Modify_Res_Des @ stub CM_Modify_Res_Des_Ex diff --git a/dlls/setupapi/stubs.c b/dlls/setupapi/stubs.c index 3b2641f9875..b14c5a958c2 100644 --- a/dlls/setupapi/stubs.c +++ b/dlls/setupapi/stubs.c @@ -110,26 +110,6 @@ CONFIGRET WINAPI CM_Get_Child_Ex( return CR_SUCCESS; } -/*********************************************************************** - * CM_Get_Device_ID_ExA (SETUPAPI.@) - */ -DWORD WINAPI CM_Get_Device_ID_ExA( - DEVINST dnDevInst, PCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) -{ - FIXME("0x%08lx %p 0x%08lx 0x%08lx %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); - return CR_SUCCESS; -} - -/*********************************************************************** - * CM_Get_Device_ID_ExW (SETUPAPI.@) - */ -DWORD WINAPI CM_Get_Device_ID_ExW( - DEVINST dnDevInst, PWCHAR Buffer, ULONG BufferLen, ULONG ulFlags, HMACHINE hMachine) -{ - FIXME("0x%08lx %p 0x%08lx 0x%08lx %p: stub\n", dnDevInst, Buffer, BufferLen, ulFlags, hMachine); - return CR_SUCCESS; -} - /*********************************************************************** * CM_Get_Parent (SETUPAPI.@) */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10436