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

[NTOSKRNL]

Browse source 
- Handle NULL device relations better

svn path=/trunk/; revision=53292
This commit is contained in:
Cameron Gutman 2011-08-18 00:33:19 +00:00
parent 14345748e5
commit e1776e956d
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1773,7 +1773,7 @@ IopHandleDeviceRemoval(
NextChild = Child->Sibling; NextChild = Child->Sibling;
Found = FALSE; Found = FALSE;
for (i = 0; i < DeviceRelations->Count; i++) for (i = 0; DeviceRelations && i < DeviceRelations->Count; i++)
{ {
if (IopGetDeviceNode(DeviceRelations->Objects[i]) == Child) if (IopGetDeviceNode(DeviceRelations->Objects[i]) == Child)
{ {
@ -1839,18 +1839,21 @@ IopEnumerateDevice(
DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information; DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information;
/*
* Send removal IRPs for devices that have disappeared
* NOTE: This code handles the case where no relations are specified
*/
IopHandleDeviceRemoval(DeviceNode, DeviceRelations);
/* Now we bail if nothing was returned */
if (!DeviceRelations) if (!DeviceRelations)
{ {
/* We're all done */
DPRINT("No PDOs\n"); DPRINT("No PDOs\n");
return STATUS_UNSUCCESSFUL; return STATUS_SUCCESS;
} }
DPRINT("Got %u PDOs\n", DeviceRelations->Count); DPRINT("Got %u PDOs\n", DeviceRelations->Count);
/*
* Send removal IRPs for devices that have disappeared
*/
IopHandleDeviceRemoval(DeviceNode, DeviceRelations);
/* /*
* Create device nodes for all discovered devices * Create device nodes for all discovered devices