mirror of
https://github.com/reactos/reactos.git
synced 2025-04-25 08:00:24 +00:00
- Fix a bug with querying registry values (a typo, spotted/fixed by Herve).
- Fix a problem when a device, which was already in the list is freed and memory corruption is introduced. svn path=/trunk/; revision=27137
This commit is contained in:
parent
9b0d081e49
commit
80f6386261
1 changed files with 5 additions and 5 deletions
|
@ -331,7 +331,7 @@ EnumerateDevices(
|
||||||
UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM "\\" REGSTR_KEY_ROOTENUM);
|
UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\" REGSTR_PATH_SYSTEMENUM "\\" REGSTR_KEY_ROOTENUM);
|
||||||
UNICODE_STRING SubKeyName;
|
UNICODE_STRING SubKeyName;
|
||||||
WCHAR DevicePath[MAX_PATH + 1];
|
WCHAR DevicePath[MAX_PATH + 1];
|
||||||
RTL_QUERY_REGISTRY_TABLE QueryTable[4];
|
RTL_QUERY_REGISTRY_TABLE QueryTable[5];
|
||||||
PPNPROOT_DEVICE Device = NULL;
|
PPNPROOT_DEVICE Device = NULL;
|
||||||
HANDLE KeyHandle = INVALID_HANDLE_VALUE;
|
HANDLE KeyHandle = INVALID_HANDLE_VALUE;
|
||||||
HANDLE SubKeyHandle = INVALID_HANDLE_VALUE;
|
HANDLE SubKeyHandle = INVALID_HANDLE_VALUE;
|
||||||
|
@ -502,9 +502,9 @@ EnumerateDevices(
|
||||||
QueryTable[2].QueryRoutine = QueryBinaryValueCallback;
|
QueryTable[2].QueryRoutine = QueryBinaryValueCallback;
|
||||||
QueryTable[2].Name = L"BasicConfigVector";
|
QueryTable[2].Name = L"BasicConfigVector";
|
||||||
QueryTable[2].EntryContext = &Buffer1;
|
QueryTable[2].EntryContext = &Buffer1;
|
||||||
QueryTable[2].QueryRoutine = QueryBinaryValueCallback;
|
QueryTable[3].QueryRoutine = QueryBinaryValueCallback;
|
||||||
QueryTable[2].Name = L"BootConfig";
|
QueryTable[3].Name = L"BootConfig";
|
||||||
QueryTable[2].EntryContext = &Buffer2;
|
QueryTable[3].EntryContext = &Buffer2;
|
||||||
|
|
||||||
Status = RtlQueryRegistryValues(
|
Status = RtlQueryRegistryValues(
|
||||||
RTL_REGISTRY_HANDLE,
|
RTL_REGISTRY_HANDLE,
|
||||||
|
@ -526,8 +526,8 @@ EnumerateDevices(
|
||||||
&DeviceExtension->DeviceListHead,
|
&DeviceExtension->DeviceListHead,
|
||||||
&Device->ListEntry);
|
&Device->ListEntry);
|
||||||
DeviceExtension->DeviceListCount++;
|
DeviceExtension->DeviceListCount++;
|
||||||
Device = NULL;
|
|
||||||
}
|
}
|
||||||
|
Device = NULL;
|
||||||
|
|
||||||
Index2++;
|
Index2++;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue