Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-06 12:45:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOSKRNL]

Browse source 
- Don't always use the value name as the device description
- Fixes bug 3416

svn path=/trunk/; revision=46500
This commit is contained in:
Cameron Gutman 2010-03-27 21:45:35 +00:00
parent 79cb786ef5
commit fd3fa1abb6
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/ntoskrnl/io/pnpmgr/pnpmgr.c
View file

@ -2192,6 +2192,7 @@ IopEnumerateDetectedDevices(
UNICODE_STRING HardwareIdKey;
PUNICODE_STRING pHardwareId;
ULONG DeviceIndex = 0;
BOOLEAN IsDeviceDesc;
if (RelativePath)
{
@ -2418,16 +2419,19 @@ IopEnumerateDetectedDevices(
{
pHardwareId = &HardwareIdSerial;
DeviceIndex = DeviceIndexSerial++;
IsDeviceDesc = TRUE;
}
else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierKeyboard, FALSE) == 0)
{
pHardwareId = &HardwareIdKeyboard;
DeviceIndex = DeviceIndexKeyboard++;
IsDeviceDesc = FALSE;
}
else if (RelativePath && RtlCompareUnicodeString(RelativePath, &IdentifierMouse, FALSE) == 0)
{
pHardwareId = &HardwareIdMouse;
DeviceIndex = DeviceIndexMouse++;
IsDeviceDesc = FALSE;
}
else if (NT_SUCCESS(Status))
{
@ -2436,17 +2440,20 @@ IopEnumerateDetectedDevices(
{
pHardwareId = &HardwareIdPci;
DeviceIndex = DeviceIndexPci++;
IsDeviceDesc = FALSE;
}
else if (RtlCompareUnicodeString(&ValueName, &IdentifierIsa, FALSE) == 0)
{
pHardwareId = &HardwareIdIsa;
DeviceIndex = DeviceIndexIsa++;
IsDeviceDesc = FALSE;
}
#ifdef ENABLE_ACPI
else if (RtlCompareUnicodeString(&ValueName, &IdentifierAcpi, FALSE) == 0)
{
pHardwareId = &HardwareIdAcpi;
DeviceIndex = DeviceIndexAcpi++;
IsDeviceDesc = FALSE;
}
#endif
else /* Now let's detect devices with a device number at the end */
@ -2459,12 +2466,14 @@ IopEnumerateDetectedDevices(
{
pHardwareId = &HardwareIdFloppy;
DeviceIndex = DeviceIndexFloppy++;
IsDeviceDesc = FALSE;
}
/* Nope, is it a parallel port? */
else if (RtlCompareUnicodeString(&ValueName, &IdentifierParallel, FALSE) == 0)
{
pHardwareId = &HardwareIdParallel;
DeviceIndex = DeviceIndexParallel++;
IsDeviceDesc = FALSE;
}
/* Nope, out of ideas so let's skip this one */
else
@ -2522,12 +2531,15 @@ IopEnumerateDetectedDevices(
goto nextdevice;
}
DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, &HardwareIdKey);
Status = ZwSetValueKey(hLevel2Key, &DeviceDescU, 0, REG_SZ, ValueName.Buffer, ValueName.MaximumLength);
if (!NT_SUCCESS(Status))
if (IsDeviceDesc)
{
DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status);
ZwDeleteKey(hLevel2Key);
goto nextdevice;
Status = ZwSetValueKey(hLevel2Key, &DeviceDescU, 0, REG_SZ, ValueName.Buffer, ValueName.MaximumLength);
if (!NT_SUCCESS(Status))
{
DPRINT("ZwSetValueKey() failed with status 0x%08lx\n", Status);
ZwDeleteKey(hLevel2Key);
goto nextdevice;
}
}
Status = ZwSetValueKey(hLevel2Key, &HardwareIDU, 0, REG_MULTI_SZ, pHardwareId->Buffer, pHardwareId->MaximumLength);
if (!NT_SUCCESS(Status))