Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 08:15:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't create a key name with a final \0

Browse source 
svn path=/trunk/; revision=31165
This commit is contained in:
Hervé Poussineau 2007-12-11 20:07:04 +00:00
parent 1979944d7f
commit ba6959d161
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2704,6 +2704,7 @@ IopEnumerateDetectedDevices(
const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerController"); const UNICODE_STRING IdentifierMouse = RTL_CONSTANT_STRING(L"PointerController");
UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*PNP0F13\0"); UNICODE_STRING HardwareIdMouse = RTL_CONSTANT_STRING(L"*PNP0F13\0");
static ULONG DeviceIndexMouse = 0; static ULONG DeviceIndexMouse = 0;
UNICODE_STRING HardwareIdKey;
PUNICODE_STRING pHardwareId; PUNICODE_STRING pHardwareId;
ULONG DeviceIndex = 0; ULONG DeviceIndex = 0;
@ -2980,8 +2981,12 @@ IopEnumerateDetectedDevices(
goto nextdevice; goto nextdevice;
} }
/* Prepare hardware id key (hardware id value without final \0) */
HardwareIdKey = *pHardwareId;
HardwareIdKey.Length -= sizeof(UNICODE_NULL);
/* Add the detected device to Root key */ /* Add the detected device to Root key */
InitializeObjectAttributes(&ObjectAttributes, pHardwareId, OBJ_KERNEL_HANDLE, hRootKey, NULL); InitializeObjectAttributes(&ObjectAttributes, &HardwareIdKey, OBJ_KERNEL_HANDLE, hRootKey, NULL);
Status = ZwCreateKey( Status = ZwCreateKey(
&hLevel1Key, &hLevel1Key,
KEY_CREATE_SUB_KEY, KEY_CREATE_SUB_KEY,
@ -3012,7 +3017,7 @@ IopEnumerateDetectedDevices(
DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status); DPRINT("ZwCreateKey() failed with status 0x%08lx\n", Status);
goto nextdevice; goto nextdevice;
} }
DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, pHardwareId); DPRINT("Found %wZ #%lu (%wZ)\n", &ValueName, DeviceIndex, &HardwareIdKey);
Status = ZwSetValueKey(hLevel2Key, &DeviceDescU, 0, REG_SZ, ValueName.Buffer, ValueName.MaximumLength); Status = ZwSetValueKey(hLevel2Key, &DeviceDescU, 0, REG_SZ, ValueName.Buffer, ValueName.MaximumLength);
if (!NT_SUCCESS(Status)) if (!NT_SUCCESS(Status))
{ {