Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-13 21:18:30 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS:PNP] Directly accept a UNICODE_STRING in LocateChildDevice. CORE-15882

Browse source
This commit is contained in:
Thomas Faber 2020-05-02 17:57:46 +02:00
parent 2242ca6920
commit c60d25fb26
No known key found for this signature in database
GPG key ID: 076E7C3D44720826
1 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ntoskrnl/io/pnpmgr/pnproot.c
View file

@ -92,16 +92,15 @@ static PDEVICE_OBJECT PnpRootDeviceObject = NULL;
static NTSTATUS static NTSTATUS
LocateChildDevice( LocateChildDevice(
IN PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension, IN PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension,
IN PCWSTR DeviceId, IN PCUNICODE_STRING DeviceId,
IN PCWSTR InstanceId, IN PCWSTR InstanceId,
OUT PPNPROOT_DEVICE* ChildDevice) OUT PPNPROOT_DEVICE* ChildDevice)
{ {
PPNPROOT_DEVICE Device; PPNPROOT_DEVICE Device;
UNICODE_STRING DeviceIdU, InstanceIdU; UNICODE_STRING InstanceIdU;
PLIST_ENTRY NextEntry; PLIST_ENTRY NextEntry;
/* Initialize the strings to compare */ /* Initialize the string to compare */
RtlInitUnicodeString(&DeviceIdU, DeviceId);
RtlInitUnicodeString(&InstanceIdU, InstanceId); RtlInitUnicodeString(&InstanceIdU, InstanceId);
/* Start looping */ /* Start looping */
@ -113,7 +112,7 @@ LocateChildDevice(
Device = CONTAINING_RECORD(NextEntry, PNPROOT_DEVICE, ListEntry); Device = CONTAINING_RECORD(NextEntry, PNPROOT_DEVICE, ListEntry);
/* See if the strings match */ /* See if the strings match */
if (RtlEqualUnicodeString(&DeviceIdU, &Device->DeviceID, TRUE) && if (RtlEqualUnicodeString(DeviceId, &Device->DeviceID, TRUE) &&
RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE)) RtlEqualUnicodeString(&InstanceIdU, &Device->InstanceID, TRUE))
{ {
/* They do, so set the pointer and return success */ /* They do, so set the pointer and return success */
@ -267,7 +266,7 @@ tryagain:
for (NextInstance = 0; NextInstance <= 9999; NextInstance++) for (NextInstance = 0; NextInstance <= 9999; NextInstance++)
{ {
_snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance); _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance);
Status = LocateChildDevice(DeviceExtension, Device->DeviceID.Buffer, InstancePath, &Device); Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, &Device);
if (Status == STATUS_NO_SUCH_DEVICE) if (Status == STATUS_NO_SUCH_DEVICE)
break; break;
} }
@ -281,7 +280,7 @@ tryagain:
} }
_snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance); _snwprintf(InstancePath, sizeof(InstancePath) / sizeof(WCHAR), L"%04lu", NextInstance);
Status = LocateChildDevice(DeviceExtension, Device->DeviceID.Buffer, InstancePath, &Device); Status = LocateChildDevice(DeviceExtension, &Device->DeviceID, InstancePath, &Device);
if (Status != STATUS_NO_SUCH_DEVICE || NextInstance > 9999) if (Status != STATUS_NO_SUCH_DEVICE || NextInstance > 9999)
{ {
DPRINT1("NextInstance value is corrupt! (%lu)\n", NextInstance); DPRINT1("NextInstance value is corrupt! (%lu)\n", NextInstance);
@ -460,8 +459,7 @@ CreateDeviceFromRegistry(
BUFFER Buffer1, Buffer2; BUFFER Buffer1, Buffer2;
/* If the device already exists, there's nothing to do */ /* If the device already exists, there's nothing to do */
NT_ASSERT(DevicePath->Buffer[DevicePath->Length / sizeof(WCHAR)] == UNICODE_NULL); Status = LocateChildDevice(DeviceExtension, DevicePath, InstanceId, &Device);
Status = LocateChildDevice(DeviceExtension, DevicePath->Buffer, InstanceId, &Device);
if (Status != STATUS_NO_SUCH_DEVICE) if (Status != STATUS_NO_SUCH_DEVICE)
{ {
return STATUS_SUCCESS; return STATUS_SUCCESS;