ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

setupapi: Correct device enumeration.

This commit is contained in:
Juan Lang 2007-10-12 08:30:10 -07:00 committed by Alexandre Julliard
parent 162911baef
commit a10a8eb134
1 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
dlls/setupapi/devinst.c
View File

@ -2137,25 +2137,26 @@ static void SETUPDI_EnumerateInterfaces(HDEVINFO DeviceInfoSet,
} }
} }
static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet, static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set,
LPCWSTR parent, HKEY key, const GUID *class, DWORD flags) LPCWSTR enumerator, LPCWSTR deviceName, HKEY deviceKey,
const GUID *class, DWORD flags)
{ {
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
DWORD i, len; DWORD i, len;
WCHAR subKeyName[MAX_PATH]; WCHAR deviceInstance[MAX_PATH];
LONG l = ERROR_SUCCESS; LONG l = ERROR_SUCCESS;
TRACE("%s\n", debugstr_w(parent)); TRACE("%s %s\n", debugstr_w(enumerator), debugstr_w(deviceName));
for (i = 0; !l; i++) for (i = 0; !l; i++)
{ {
len = sizeof(subKeyName) / sizeof(subKeyName[0]); len = sizeof(deviceInstance) / sizeof(deviceInstance[0]);
l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL); l = RegEnumKeyExW(deviceKey, i, deviceInstance, &len, NULL, NULL, NULL,
NULL);
if (!l) if (!l)
{ {
HKEY subKey; HKEY subKey;
l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey); l = RegOpenKeyExW(deviceKey, deviceInstance, 0, KEY_READ, &subKey);
if (!l) if (!l)
{ {
WCHAR classGuid[40]; WCHAR classGuid[40];
@ -2179,11 +2180,12 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet,
LPWSTR instanceId; LPWSTR instanceId;
instanceId = HeapAlloc(GetProcessHeap(), 0, instanceId = HeapAlloc(GetProcessHeap(), 0,
(lstrlenW(parent) + lstrlenW(subKeyName) + 2) (lstrlenW(deviceName) +
* sizeof(WCHAR)); lstrlenW(deviceInstance) + 2) * sizeof(WCHAR));
if (instanceId) if (instanceId)
{ {
sprintfW(instanceId, fmt, parent, subKeyName); sprintfW(instanceId, fmt, deviceName,
deviceInstance);
SETUPDI_AddDeviceToSet(set, &deviceClass, SETUPDI_AddDeviceToSet(set, &deviceClass,
0 /* FIXME: DevInst */, instanceId, 0 /* FIXME: DevInst */, instanceId,
FALSE, NULL); FALSE, NULL);
@ -2200,46 +2202,80 @@ static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet,
} }
} }
static void SETUPDI_EnumerateMatchingDevices(HDEVINFO DeviceInfoSet,
LPCWSTR parent, HKEY key, const GUID *class, DWORD flags)
{
struct DeviceInfoSet *set = (struct DeviceInfoSet *)DeviceInfoSet;
DWORD i, len;
WCHAR subKeyName[MAX_PATH];
LONG l = ERROR_SUCCESS;
TRACE("%s\n", debugstr_w(parent));
for (i = 0; !l; i++)
{
len = sizeof(subKeyName) / sizeof(subKeyName[0]);
l = RegEnumKeyExW(key, i, subKeyName, &len, NULL, NULL, NULL, NULL);
if (!l)
{
HKEY subKey;
l = RegOpenKeyExW(key, subKeyName, 0, KEY_READ, &subKey);
if (!l)
{
TRACE("%s\n", debugstr_w(subKeyName));
SETUPDI_EnumerateMatchingDeviceInstances(set, parent,
subKeyName, subKey, class, flags);
RegCloseKey(subKey);
}
/* Allow enumeration to continue */
l = ERROR_SUCCESS;
}
}
}
static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class, static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
LPCWSTR enumstr, DWORD flags) LPCWSTR enumstr, DWORD flags)
{ {
HKEY classesKey = SetupDiOpenClassRegKeyExW(class, KEY_READ, HKEY enumKey;
DIOCR_INSTALLER, NULL, NULL); LONG l;
TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(class), TRACE("%p, %s, %s, %08x\n", DeviceInfoSet, debugstr_guid(class),
debugstr_w(enumstr), flags); debugstr_w(enumstr), flags);
if (classesKey != INVALID_HANDLE_VALUE) l = RegCreateKeyExW(HKEY_LOCAL_MACHINE, Enum, 0, NULL, 0, KEY_READ, NULL,
&enumKey, NULL);
if (enumKey != INVALID_HANDLE_VALUE)
{ {
if (enumstr) if (enumstr)
{ {
HKEY enumKey; HKEY enumStrKey;
LONG l = RegOpenKeyExW(classesKey, enumstr, 0, KEY_READ,
&enumKey);
l = RegOpenKeyExW(enumKey, enumstr, 0, KEY_READ,
&enumStrKey);
if (!l) if (!l)
{ {
SETUPDI_EnumerateMatchingDevices(DeviceInfoSet, enumstr, SETUPDI_EnumerateMatchingDevices(DeviceInfoSet, enumstr,
enumKey, class, flags); enumStrKey, class, flags);
RegCloseKey(enumKey); RegCloseKey(enumStrKey);
} }
} }
else else
{ {
DWORD i, len; DWORD i, len;
WCHAR subKeyName[MAX_PATH]; WCHAR subKeyName[MAX_PATH];
LONG l = ERROR_SUCCESS;
l = ERROR_SUCCESS;
for (i = 0; !l; i++) for (i = 0; !l; i++)
{ {
len = sizeof(subKeyName) / sizeof(subKeyName[0]); len = sizeof(subKeyName) / sizeof(subKeyName[0]);
l = RegEnumKeyExW(classesKey, i, subKeyName, &len, NULL, l = RegEnumKeyExW(enumKey, i, subKeyName, &len, NULL,
NULL, NULL, NULL); NULL, NULL, NULL);
if (!l) if (!l)
{ {
HKEY subKey; HKEY subKey;
l = RegOpenKeyExW(classesKey, subKeyName, 0, KEY_READ, l = RegOpenKeyExW(enumKey, subKeyName, 0, KEY_READ,
&subKey); &subKey);
if (!l) if (!l)
{ {
@ -2252,7 +2288,7 @@ static void SETUPDI_EnumerateDevices(HDEVINFO DeviceInfoSet, const GUID *class,
} }
} }
} }
RegCloseKey(classesKey); RegCloseKey(enumKey);
} }
} }