From 3ab77c0239a9542d0375294fc9c2bc07bfdf86d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Date: Sun, 17 Sep 2006 15:24:55 +0000 Subject: [PATCH] DeviceNode->ResourceList and DeviceNode->ResourceListTranslated should not share memory with DeviceNode->BootResources svn path=/trunk/; revision=24170 --- reactos/ntoskrnl/io/pnpmgr/pnpmgr.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c index 8b97c5bc01d..22c1b2c65f0 100644 --- a/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c +++ b/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c @@ -132,6 +132,12 @@ IopStartDevice( Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList; Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated; + /* FIXME: Not sure of this! */ + if (!Stack.Parameters.StartDevice.AllocatedResources) + Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->BootResources; + if (!Stack.Parameters.StartDevice.AllocatedResourcesTranslated) + Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->BootResources; + Status = IopInitiatePnpIrp( Fdo, &IoStatusBlock, @@ -1233,13 +1239,6 @@ IopAssignDeviceResources(PDEVICE_NODE DeviceNode) ULONG i; NTSTATUS Status; - if (DeviceNode->BootResources) - { - /* FIXME: Not sure of this! */ - DeviceNode->ResourceList = DeviceNode->ResourceListTranslated = DeviceNode->BootResources; - return STATUS_SUCCESS; - } - /* Fill DeviceNode->ResourceList and DeviceNode->ResourceListTranslated; * by using DeviceNode->ResourceRequirements */