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

setupapi: Include enumerator string as part of device instance ID.

This commit is contained in:
Juan Lang 2007-10-25 08:10:59 -07:00 committed by Alexandre Julliard
parent e51f8490f2
commit e2f1f39b52
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dlls/setupapi/devinst.c
View File

@ -2176,16 +2176,17 @@ static void SETUPDI_EnumerateMatchingDeviceInstances(struct DeviceInfoSet *set,
if ((flags & DIGCF_ALLCLASSES) || if ((flags & DIGCF_ALLCLASSES) ||
IsEqualGUID(class, &deviceClass)) IsEqualGUID(class, &deviceClass))
{ {
static const WCHAR fmt[] = {'%','s','\\','%','s',0}; static const WCHAR fmt[] =
{'%','s','\\','%','s','\\','%','s',0};
LPWSTR instanceId; LPWSTR instanceId;
instanceId = HeapAlloc(GetProcessHeap(), 0, instanceId = HeapAlloc(GetProcessHeap(), 0,
(lstrlenW(deviceName) + (lstrlenW(enumerator) + lstrlenW(deviceName) +
lstrlenW(deviceInstance) + 2) * sizeof(WCHAR)); lstrlenW(deviceInstance) + 3) * sizeof(WCHAR));
if (instanceId) if (instanceId)
{ {
sprintfW(instanceId, fmt, deviceName, sprintfW(instanceId, fmt, enumerator,
deviceInstance); deviceName, deviceInstance);
SETUPDI_AddDeviceToSet(set, &deviceClass, SETUPDI_AddDeviceToSet(set, &deviceClass,
0 /* FIXME: DevInst */, instanceId, 0 /* FIXME: DevInst */, instanceId,
FALSE, NULL); FALSE, NULL);