[NTOS:IO] Move device manipulation functions from pnpmgr/pnpmgr.c to pnpmgr/devaction.c
[reactos.git] / ntoskrnl / io / pnpmgr / pnpmgr.c
index 5c18437..8b9c92c 100644 (file)
 
 /* GLOBALS *******************************************************************/
 
-PDEVICE_NODE IopRootDeviceNode;
-KSPIN_LOCK IopDeviceTreeLock;
 ERESOURCE PpRegistryDeviceResource;
 KGUARDED_MUTEX PpDeviceReferenceTableLock;
 RTL_AVL_TABLE PpDeviceReferenceTable;
 
 extern ULONG ExpInitializationPhase;
-extern BOOLEAN ExpInTextModeSetup;
-extern BOOLEAN PnpSystemInit;
 
 /* DATA **********************************************************************/
 
 PDRIVER_OBJECT IopRootDriverObject;
 PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList = NULL;
 
-typedef struct _INVALIDATE_DEVICE_RELATION_DATA
-{
-    PDEVICE_OBJECT DeviceObject;
-    DEVICE_RELATION_TYPE Type;
-    PIO_WORKITEM WorkItem;
-} INVALIDATE_DEVICE_RELATION_DATA, *PINVALIDATE_DEVICE_RELATION_DATA;
-
 /* FUNCTIONS *****************************************************************/
-NTSTATUS
-NTAPI
-IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
-                       IN ULONG CreateOptions,
-                       OUT PHANDLE Handle);
-
-VOID
-IopCancelPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject);
-
-NTSTATUS
-IopPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject, BOOLEAN Force);
-
-PDEVICE_OBJECT
-IopGetDeviceObjectFromDeviceInstance(PUNICODE_STRING DeviceInstance);
-
-PDEVICE_NODE
-FASTCALL
-IopGetDeviceNode(PDEVICE_OBJECT DeviceObject)
-{
-   return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode;
-}
 
 VOID
 IopFixupDeviceId(PWCHAR String)
@@ -87,9 +55,9 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode)
     PKEY_VALUE_PARTIAL_INFORMATION PartialInfo;
     ULONG HidLength = 0, CidLength = 0, BufferLength;
     PWCHAR IdBuffer, OriginalIdBuffer;
-    
+
     /* Open the device instance key */
-    Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey);
+    Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, REG_OPTION_NON_VOLATILE, &InstanceKey);
     if (Status != STATUS_SUCCESS)
         return;
 
@@ -174,7 +142,7 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode)
             ZwClose(InstanceKey);
             return;
         }
-        
+
         /* Copy CID next */
         CidLength = PartialInfo->DataLength;
         RtlCopyMemory(((PUCHAR)IdBuffer) + HidLength, PartialInfo->Data, CidLength);
@@ -182,7 +150,7 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode)
 
     /* Free our temp buffer */
     ExFreePool(PartialInfo);
-    
+
     InitializeObjectAttributes(&ObjectAttributes,
                                &CriticalDeviceKeyU,
                                OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE,
@@ -203,15 +171,15 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode)
     while (*IdBuffer)
     {
         USHORT StringLength = (USHORT)wcslen(IdBuffer) + 1, Index;
-        
+
         IopFixupDeviceId(IdBuffer);
-        
+
         /* Look through all subkeys for a match */
         for (Index = 0; TRUE; Index++)
         {
             ULONG NeededLength;
             PKEY_BASIC_INFORMATION BasicInfo;
-            
+
             Status = ZwEnumerateKey(CriticalDeviceKey,
                                     Index,
                                     KeyBasicInformation,
@@ -385,7 +353,7 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode)
                             continue;
                         }
 
-                        DPRINT1("Installed service '%S' for critical device '%wZ'\n", PartialInfo->Data, &ChildIdNameU);
+                        DPRINT("Installed service '%S' for critical device '%wZ'\n", PartialInfo->Data, &ChildIdNameU);
                     }
                     else
                     {
@@ -415,7 +383,7 @@ IopInstallCriticalDevice(PDEVICE_NODE DeviceNode)
         /* Advance to the next ID */
         IdBuffer += StringLength;
     }
-    
+
     ExFreePool(OriginalIdBuffer);
     ZwClose(InstanceKey);
     ZwClose(CriticalDeviceKey);
@@ -426,964 +394,253 @@ FASTCALL
 IopInitializeDevice(PDEVICE_NODE DeviceNode,
                     PDRIVER_OBJECT DriverObject)
 {
-   PDEVICE_OBJECT Fdo;
-   NTSTATUS Status;
-    
-   if (!DriverObject)
-   {
-      /* Special case for bus driven devices */
-      DeviceNode->Flags |= DNF_ADDED;
-      return STATUS_SUCCESS;
-   }
-
-   if (!DriverObject->DriverExtension->AddDevice)
-   {
-      DeviceNode->Flags |= DNF_LEGACY_DRIVER;
-   }
+    PDEVICE_OBJECT Fdo;
+    NTSTATUS Status;
 
-   if (DeviceNode->Flags & DNF_LEGACY_DRIVER)
-   {
-      DeviceNode->Flags |= DNF_ADDED + DNF_STARTED;
-      return STATUS_SUCCESS;
-   }
+    if (!DriverObject)
+    {
+        /* Special case for bus driven devices */
+        DeviceNode->Flags |= DNF_ADDED;
+        return STATUS_SUCCESS;
+    }
 
-   /* This is a Plug and Play driver */
-   DPRINT("Plug and Play driver found\n");
-   ASSERT(DeviceNode->PhysicalDeviceObject);
+    if (!DriverObject->DriverExtension->AddDevice)
+    {
+        DeviceNode->Flags |= DNF_LEGACY_DRIVER;
+    }
 
-   DPRINT("Calling %wZ->AddDevice(%wZ)\n",
-      &DriverObject->DriverName,
-      &DeviceNode->InstancePath);
-   Status = DriverObject->DriverExtension->AddDevice(
-      DriverObject, DeviceNode->PhysicalDeviceObject);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("%wZ->AddDevice(%wZ) failed with status 0x%x\n",
-              &DriverObject->DriverName,
-              &DeviceNode->InstancePath,
-              Status);
-      IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED);
-      DeviceNode->Problem = CM_PROB_FAILED_ADD;
-      return Status;
-   }
+    if (DeviceNode->Flags & DNF_LEGACY_DRIVER)
+    {
+        DeviceNode->Flags |= (DNF_ADDED | DNF_STARTED);
+        return STATUS_SUCCESS;
+    }
 
-   Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject);
+    /* This is a Plug and Play driver */
+    DPRINT("Plug and Play driver found\n");
+    ASSERT(DeviceNode->PhysicalDeviceObject);
 
-   /* Check if we have a ACPI device (needed for power management) */
-   if (Fdo->DeviceType == FILE_DEVICE_ACPI)
-   {
-      static BOOLEAN SystemPowerDeviceNodeCreated = FALSE;
+    DPRINT("Calling %wZ->AddDevice(%wZ)\n",
+           &DriverObject->DriverName,
+           &DeviceNode->InstancePath);
+    Status = DriverObject->DriverExtension->AddDevice(DriverObject,
+                                                      DeviceNode->PhysicalDeviceObject);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("%wZ->AddDevice(%wZ) failed with status 0x%x\n",
+                &DriverObject->DriverName,
+                &DeviceNode->InstancePath,
+                Status);
+        IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED);
+        DeviceNode->Problem = CM_PROB_FAILED_ADD;
+        return Status;
+    }
 
-      /* There can be only one system power device */
-      if (!SystemPowerDeviceNodeCreated)
-      {
-         PopSystemPowerDeviceNode = DeviceNode;
-         ObReferenceObject(PopSystemPowerDeviceNode->PhysicalDeviceObject);
-         SystemPowerDeviceNodeCreated = TRUE;
-      }
-   }
+    Fdo = IoGetAttachedDeviceReference(DeviceNode->PhysicalDeviceObject);
 
-   ObDereferenceObject(Fdo);
+    /* Check if we have a ACPI device (needed for power management) */
+    if (Fdo->DeviceType == FILE_DEVICE_ACPI)
+    {
+        static BOOLEAN SystemPowerDeviceNodeCreated = FALSE;
 
-   IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED);
+        /* There can be only one system power device */
+        if (!SystemPowerDeviceNodeCreated)
+        {
+            PopSystemPowerDeviceNode = DeviceNode;
+            ObReferenceObject(PopSystemPowerDeviceNode->PhysicalDeviceObject);
+            SystemPowerDeviceNodeCreated = TRUE;
+        }
+    }
 
-   return STATUS_SUCCESS;
-}
+    ObDereferenceObject(Fdo);
 
-static
-NTSTATUS
-NTAPI
-IopSendEject(IN PDEVICE_OBJECT DeviceObject)
-{
-    IO_STACK_LOCATION Stack;
-    PVOID Dummy;
-    
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_EJECT;
-    
-    return IopSynchronousCall(DeviceObject, &Stack, &Dummy);
-}
+    IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED);
 
-static
-VOID
-NTAPI
-IopSendSurpriseRemoval(IN PDEVICE_OBJECT DeviceObject)
-{
-    IO_STACK_LOCATION Stack;
-    PVOID Dummy;
-    
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_SURPRISE_REMOVAL;
-    
-    /* Drivers should never fail a IRP_MN_SURPRISE_REMOVAL request */
-    IopSynchronousCall(DeviceObject, &Stack, &Dummy);
+    return STATUS_SUCCESS;
 }
 
-static
 NTSTATUS
-NTAPI
-IopQueryRemoveDevice(IN PDEVICE_OBJECT DeviceObject)
+IopGetSystemPowerDeviceObject(PDEVICE_OBJECT *DeviceObject)
 {
-    PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject);
-    IO_STACK_LOCATION Stack;
-    PVOID Dummy;
-    NTSTATUS Status;
-    
-    ASSERT(DeviceNode);
-    
-    IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVE_PENDING,
-                              &DeviceNode->InstancePath);
-    
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_QUERY_REMOVE_DEVICE;
-
-    Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy);
-
-    IopNotifyPlugPlayNotification(DeviceObject,
-                                  EventCategoryTargetDeviceChange,
-                                  &GUID_TARGET_DEVICE_QUERY_REMOVE,
-                                  NULL,
-                                  NULL);
-    
-    if (!NT_SUCCESS(Status))
+    KIRQL OldIrql;
+
+    if (PopSystemPowerDeviceNode)
     {
-        DPRINT1("Removal vetoed by %wZ\n", &DeviceNode->InstancePath);
-        IopQueueTargetDeviceEvent(&GUID_DEVICE_REMOVAL_VETOED,
-                                  &DeviceNode->InstancePath);
-    }
+        KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
+        *DeviceObject = PopSystemPowerDeviceNode->PhysicalDeviceObject;
+        KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
 
-    return Status;
-}
+        return STATUS_SUCCESS;
+    }
 
-static
-NTSTATUS
-NTAPI
-IopQueryStopDevice(IN PDEVICE_OBJECT DeviceObject)
-{
-    IO_STACK_LOCATION Stack;
-    PVOID Dummy;
-    
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_QUERY_STOP_DEVICE;
-    
-    return IopSynchronousCall(DeviceObject, &Stack, &Dummy);
+    return STATUS_UNSUCCESSFUL;
 }
 
-static
-VOID
+USHORT
 NTAPI
-IopSendRemoveDevice(IN PDEVICE_OBJECT DeviceObject)
+IopGetBusTypeGuidIndex(LPGUID BusTypeGuid)
 {
-    IO_STACK_LOCATION Stack;
-    PVOID Dummy;
+    USHORT i = 0, FoundIndex = 0xFFFF;
+    ULONG NewSize;
+    PVOID NewList;
 
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_REMOVE_DEVICE;
+    /* Acquire the lock */
+    ExAcquireFastMutex(&PnpBusTypeGuidList->Lock);
 
-    /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */
-    IopSynchronousCall(DeviceObject, &Stack, &Dummy);
+    /* Loop all entries */
+    while (i < PnpBusTypeGuidList->GuidCount)
+    {
+         /* Try to find a match */
+         if (RtlCompareMemory(BusTypeGuid,
+                              &PnpBusTypeGuidList->Guids[i],
+                              sizeof(GUID)) == sizeof(GUID))
+         {
+              /* Found it */
+              FoundIndex = i;
+              goto Quickie;
+         }
+         i++;
+    }
 
-    IopNotifyPlugPlayNotification(DeviceObject,
-                                  EventCategoryTargetDeviceChange,
-                                  &GUID_TARGET_DEVICE_REMOVE_COMPLETE,
-                                  NULL,
-                                  NULL);
-}
+    /* Check if we have to grow the list */
+    if (PnpBusTypeGuidList->GuidCount)
+    {
+        /* Calculate the new size */
+        NewSize = sizeof(IO_BUS_TYPE_GUID_LIST) +
+                 (sizeof(GUID) * PnpBusTypeGuidList->GuidCount);
 
-static
-VOID
-NTAPI
-IopCancelRemoveDevice(IN PDEVICE_OBJECT DeviceObject)
-{
-    IO_STACK_LOCATION Stack;
-    PVOID Dummy;
-    
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_CANCEL_REMOVE_DEVICE;
-    
-    /* Drivers should never fail a IRP_MN_CANCEL_REMOVE_DEVICE request */
-    IopSynchronousCall(DeviceObject, &Stack, &Dummy);
-    
-    IopNotifyPlugPlayNotification(DeviceObject,
-                                  EventCategoryTargetDeviceChange,
-                                  &GUID_TARGET_DEVICE_REMOVE_CANCELLED,
-                                  NULL,
-                                  NULL);
-}
+        /* Allocate the new copy */
+        NewList = ExAllocatePool(PagedPool, NewSize);
 
-static
-VOID
-NTAPI
-IopSendStopDevice(IN PDEVICE_OBJECT DeviceObject)
-{
-    IO_STACK_LOCATION Stack;
-    PVOID Dummy;
-    
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_STOP_DEVICE;
-    
-    /* Drivers should never fail a IRP_MN_STOP_DEVICE request */
-    IopSynchronousCall(DeviceObject, &Stack, &Dummy);
-}
+        if (!NewList)
+        {
+            /* Fail */
+            ExFreePool(PnpBusTypeGuidList);
+            goto Quickie;
+        }
 
-VOID
-NTAPI
-IopStartDevice2(IN PDEVICE_OBJECT DeviceObject)
-{
-    IO_STACK_LOCATION Stack;
-    PDEVICE_NODE DeviceNode;
-    NTSTATUS Status;
-    PVOID Dummy;
-    DEVICE_CAPABILITIES DeviceCapabilities;
-    
-    /* Get the device node */
-    DeviceNode = IopGetDeviceNode(DeviceObject);
-    
-    ASSERT(!(DeviceNode->Flags & DNF_DISABLED));
-
-    /* Build the I/O stack location */
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_START_DEVICE;
-    
-    Stack.Parameters.StartDevice.AllocatedResources =
-         DeviceNode->ResourceList;
-    Stack.Parameters.StartDevice.AllocatedResourcesTranslated =
-         DeviceNode->ResourceListTranslated;
-
-    /* Do the call */
-    Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy);
-    if (!NT_SUCCESS(Status))
-    {
-        /* Send an IRP_MN_REMOVE_DEVICE request */
-        IopRemoveDevice(DeviceNode);
+        /* Now copy them, decrease the size too */
+        NewSize -= sizeof(GUID);
+        RtlCopyMemory(NewList, PnpBusTypeGuidList, NewSize);
 
-        /* Set the appropriate flag */
-        DeviceNode->Flags |= DNF_START_FAILED;
-        DeviceNode->Problem = CM_PROB_FAILED_START;
+        /* Free the old list */
+        ExFreePool(PnpBusTypeGuidList);
 
-        DPRINT1("Warning: PnP Start failed (%wZ) [Status: 0x%x]\n", &DeviceNode->InstancePath, Status);
-        return;
+        /* Use the new buffer */
+        PnpBusTypeGuidList = NewList;
     }
-    
-    DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack (after start)\n");
 
-    Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status);
-    }
+    /* Copy the new GUID */
+    RtlCopyMemory(&PnpBusTypeGuidList->Guids[PnpBusTypeGuidList->GuidCount],
+                  BusTypeGuid,
+                  sizeof(GUID));
 
-    /* Invalidate device state so IRP_MN_QUERY_PNP_DEVICE_STATE is sent */
-    IoInvalidateDeviceState(DeviceObject);
-    
-    /* Otherwise, mark us as started */
-    DeviceNode->Flags |= DNF_STARTED;
-    DeviceNode->Flags &= ~DNF_STOPPED;
+    /* The new entry is the index */
+    FoundIndex = (USHORT)PnpBusTypeGuidList->GuidCount;
+    PnpBusTypeGuidList->GuidCount++;
 
-    /* We now need enumeration */
-    DeviceNode->Flags |= DNF_NEED_ENUMERATION_ONLY;
+Quickie:
+    ExReleaseFastMutex(&PnpBusTypeGuidList->Lock);
+    return FoundIndex;
 }
 
 NTSTATUS
 NTAPI
-IopStartAndEnumerateDevice(IN PDEVICE_NODE DeviceNode)
+IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject,
+                   IN PIO_STACK_LOCATION IoStackLocation,
+                   OUT PVOID *Information)
 {
-    PDEVICE_OBJECT DeviceObject;
+    PIRP Irp;
+    PIO_STACK_LOCATION IrpStack;
+    IO_STATUS_BLOCK IoStatusBlock;
+    KEVENT Event;
     NTSTATUS Status;
+    PDEVICE_OBJECT TopDeviceObject;
     PAGED_CODE();
-    
-    /* Sanity check */
-    ASSERT((DeviceNode->Flags & DNF_ADDED));
-    ASSERT((DeviceNode->Flags & (DNF_RESOURCE_ASSIGNED |
-                                 DNF_RESOURCE_REPORTED |
-                                 DNF_NO_RESOURCE_REQUIRED)));
-           
-    /* Get the device object */
-    DeviceObject = DeviceNode->PhysicalDeviceObject;
-    
-    /* Check if we're not started yet */
-    if (!(DeviceNode->Flags & DNF_STARTED))
-    {
-        /* Start us */
-        IopStartDevice2(DeviceObject);
-    }
-    
-    /* Do we need to query IDs? This happens in the case of manual reporting */
-#if 0
-    if (DeviceNode->Flags & DNF_NEED_QUERY_IDS)
-    {
-        DPRINT1("Warning: Device node has DNF_NEED_QUERY_IDS\n");
-        /* And that case shouldn't happen yet */
-        ASSERT(FALSE);
-    }
-#endif
-    
-    /* Make sure we're started, and check if we need enumeration */
-    if ((DeviceNode->Flags & DNF_STARTED) &&
-        (DeviceNode->Flags & DNF_NEED_ENUMERATION_ONLY))
-    {
-        /* Enumerate us */
-        IoSynchronousInvalidateDeviceRelations(DeviceObject, BusRelations);
-        Status = STATUS_SUCCESS;
-    }
-    else
-    {
-        /* Nothing to do */
-        Status = STATUS_SUCCESS;
-    }
-    
-    /* Return */
-    return Status;
-}
-
-NTSTATUS
-IopStopDevice(
-   PDEVICE_NODE DeviceNode)
-{
-   NTSTATUS Status;
-
-   DPRINT("Stopping device: %wZ\n", &DeviceNode->InstancePath);
-
-   Status = IopQueryStopDevice(DeviceNode->PhysicalDeviceObject);
-   if (NT_SUCCESS(Status))
-   {
-       IopSendStopDevice(DeviceNode->PhysicalDeviceObject);
 
-       DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING);
-       DeviceNode->Flags |= DNF_STOPPED;
+    /* Call the top of the device stack */
+    TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject);
 
-       return STATUS_SUCCESS;
-   }
+    /* Allocate an IRP */
+    Irp = IoAllocateIrp(TopDeviceObject->StackSize, FALSE);
+    if (!Irp) return STATUS_INSUFFICIENT_RESOURCES;
 
-   return Status;
-}
+    /* Initialize to failure */
+    Irp->IoStatus.Status = IoStatusBlock.Status = STATUS_NOT_SUPPORTED;
+    Irp->IoStatus.Information = IoStatusBlock.Information = 0;
 
-NTSTATUS
-IopStartDevice(
-   PDEVICE_NODE DeviceNode)
-{
-   NTSTATUS Status;
-   HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE;
-   UNICODE_STRING KeyName;
-   OBJECT_ATTRIBUTES ObjectAttributes;
+    /* Special case for IRP_MN_FILTER_RESOURCE_REQUIREMENTS */
+    if ((IoStackLocation->MajorFunction == IRP_MJ_PNP) &&
+        (IoStackLocation->MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS))
+    {
+        /* Copy the resource requirements list into the IOSB */
+        Irp->IoStatus.Information =
+        IoStatusBlock.Information = (ULONG_PTR)IoStackLocation->Parameters.FilterResourceRequirements.IoResourceRequirementList;
+    }
 
-   if (DeviceNode->Flags & DNF_DISABLED)
-       return STATUS_SUCCESS;
+    /* Initialize the event */
+    KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
 
-   Status = IopAssignDeviceResources(DeviceNode);
-   if (!NT_SUCCESS(Status))
-       goto ByeBye;
+    /* Set them up */
+    Irp->UserIosb = &IoStatusBlock;
+    Irp->UserEvent = &Event;
 
-   /* New PnP ABI */
-   IopStartAndEnumerateDevice(DeviceNode);
+    /* Queue the IRP */
+    Irp->Tail.Overlay.Thread = PsGetCurrentThread();
+    IoQueueThreadIrp(Irp);
 
-   /* FIX: Should be done in new device instance code */
-   Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle);
-   if (!NT_SUCCESS(Status))
-       goto ByeBye;
+    /* Copy-in the stack */
+    IrpStack = IoGetNextIrpStackLocation(Irp);
+    *IrpStack = *IoStackLocation;
 
-   /* FIX: Should be done in IoXxxPrepareDriverLoading */
-   // {
-   RtlInitUnicodeString(&KeyName, L"Control");
-   InitializeObjectAttributes(&ObjectAttributes,
-                              &KeyName,
-                              OBJ_CASE_INSENSITIVE,
-                              InstanceHandle,
+    /* Call the driver */
+    Status = IoCallDriver(TopDeviceObject, Irp);
+    if (Status == STATUS_PENDING)
+    {
+        /* Wait for it */
+        KeWaitForSingleObject(&Event,
+                              Executive,
+                              KernelMode,
+                              FALSE,
                               NULL);
-   Status = ZwCreateKey(&ControlHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL);
-   if (!NT_SUCCESS(Status))
-       goto ByeBye;
-
-   RtlInitUnicodeString(&KeyName, L"ActiveService");
-   Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length);
-   // }
-
-ByeBye:
-   if (ControlHandle != INVALID_HANDLE_VALUE)
-       ZwClose(ControlHandle);
+        Status = IoStatusBlock.Status;
+    }
 
-   if (InstanceHandle != INVALID_HANDLE_VALUE)
-       ZwClose(InstanceHandle);
+    /* Remove the reference */
+    ObDereferenceObject(TopDeviceObject);
 
-   return Status;
+    /* Return the information */
+    *Information = (PVOID)IoStatusBlock.Information;
+    return Status;
 }
 
 NTSTATUS
 NTAPI
-IopQueryDeviceCapabilities(PDEVICE_NODE DeviceNode,
-                           PDEVICE_CAPABILITIES DeviceCaps)
-{
-   IO_STATUS_BLOCK StatusBlock;
-   IO_STACK_LOCATION Stack;
-   NTSTATUS Status;
-   HANDLE InstanceKey;
-   UNICODE_STRING ValueName;
-
-   /* Set up the Header */
-   RtlZeroMemory(DeviceCaps, sizeof(DEVICE_CAPABILITIES));
-   DeviceCaps->Size = sizeof(DEVICE_CAPABILITIES);
-   DeviceCaps->Version = 1;
-   DeviceCaps->Address = -1;
-   DeviceCaps->UINumber = -1;
-
-   /* Set up the Stack */
-   RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-   Stack.Parameters.DeviceCapabilities.Capabilities = DeviceCaps;
-
-   /* Send the IRP */
-   Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
-                              &StatusBlock,
-                              IRP_MN_QUERY_CAPABILITIES,
-                              &Stack);
-   if (!NT_SUCCESS(Status))
-   {
-       DPRINT1("IRP_MN_QUERY_CAPABILITIES failed with status 0x%x\n", Status);
-       return Status;
-   }
-
-   DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCaps->Version + sizeof(DeviceCaps->Version));
-
-   if (DeviceCaps->NoDisplayInUI)
-       DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI;
-   else
-       DeviceNode->UserFlags &= ~DNUF_DONT_SHOW_IN_UI;
-
-   Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey);
-   if (NT_SUCCESS(Status))
-   {
-      /* Set 'Capabilities' value */
-      RtlInitUnicodeString(&ValueName, L"Capabilities");
-      Status = ZwSetValueKey(InstanceKey,
-                             &ValueName,
-                             0,
-                             REG_DWORD,
-                             (PVOID)&DeviceNode->CapabilityFlags,
-                             sizeof(ULONG));
-
-      /* Set 'UINumber' value */
-      if (DeviceCaps->UINumber != MAXULONG)
-      {
-         RtlInitUnicodeString(&ValueName, L"UINumber");
-         Status = ZwSetValueKey(InstanceKey,
-                                &ValueName,
-                                0,
-                                REG_DWORD,
-                                &DeviceCaps->UINumber,
-                                sizeof(ULONG));
-      }
-   }
-
-   return Status;
-}
-
-static VOID NTAPI
-IopAsynchronousInvalidateDeviceRelations(
-    IN PDEVICE_OBJECT DeviceObject,
-    IN PVOID InvalidateContext)
-{
-    PINVALIDATE_DEVICE_RELATION_DATA Data = InvalidateContext;
-
-    IoSynchronousInvalidateDeviceRelations(
-        Data->DeviceObject,
-        Data->Type);
-
-    ObDereferenceObject(Data->DeviceObject);
-    IoFreeWorkItem(Data->WorkItem);
-    ExFreePool(Data);
-}
-
-NTSTATUS
-IopGetSystemPowerDeviceObject(PDEVICE_OBJECT *DeviceObject)
+IopInitiatePnpIrp(IN PDEVICE_OBJECT DeviceObject,
+                  IN OUT PIO_STATUS_BLOCK IoStatusBlock,
+                  IN UCHAR MinorFunction,
+                  IN PIO_STACK_LOCATION Stack OPTIONAL)
 {
-   KIRQL OldIrql;
-
-   if (PopSystemPowerDeviceNode)
-   {
-      KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-      *DeviceObject = PopSystemPowerDeviceNode->PhysicalDeviceObject;
-      KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
+    IO_STACK_LOCATION IoStackLocation;
 
-      return STATUS_SUCCESS;
-   }
+    /* Fill out the stack information */
+    RtlZeroMemory(&IoStackLocation, sizeof(IO_STACK_LOCATION));
+    IoStackLocation.MajorFunction = IRP_MJ_PNP;
+    IoStackLocation.MinorFunction = MinorFunction;
+    if (Stack)
+    {
+        /* Copy the rest */
+        RtlCopyMemory(&IoStackLocation.Parameters,
+                      &Stack->Parameters,
+                      sizeof(Stack->Parameters));
+    }
 
-   return STATUS_UNSUCCESSFUL;
+    /* Do the PnP call */
+    IoStatusBlock->Status = IopSynchronousCall(DeviceObject,
+                                               &IoStackLocation,
+                                               (PVOID)&IoStatusBlock->Information);
+    return IoStatusBlock->Status;
 }
 
-USHORT
-NTAPI
-IopGetBusTypeGuidIndex(LPGUID BusTypeGuid)
-{
-   USHORT i = 0, FoundIndex = 0xFFFF;
-   ULONG NewSize;
-   PVOID NewList;
-
-   /* Acquire the lock */
-   ExAcquireFastMutex(&PnpBusTypeGuidList->Lock);
-
-   /* Loop all entries */
-   while (i < PnpBusTypeGuidList->GuidCount)
-   {
-       /* Try to find a match */
-       if (RtlCompareMemory(BusTypeGuid,
-                            &PnpBusTypeGuidList->Guids[i],
-                            sizeof(GUID)) == sizeof(GUID))
-       {
-           /* Found it */
-           FoundIndex = i;
-           goto Quickie;
-       }
-       i++;
-   }
-
-   /* Check if we have to grow the list */
-   if (PnpBusTypeGuidList->GuidCount)
-   {
-       /* Calculate the new size */
-       NewSize = sizeof(IO_BUS_TYPE_GUID_LIST) +
-                (sizeof(GUID) * PnpBusTypeGuidList->GuidCount);
-
-       /* Allocate the new copy */
-       NewList = ExAllocatePool(PagedPool, NewSize);
-
-       if (!NewList) {
-       /* Fail */
-       ExFreePool(PnpBusTypeGuidList);
-       goto Quickie;
-       }
-
-       /* Now copy them, decrease the size too */
-       NewSize -= sizeof(GUID);
-       RtlCopyMemory(NewList, PnpBusTypeGuidList, NewSize);
-
-       /* Free the old list */
-       ExFreePool(PnpBusTypeGuidList);
-
-       /* Use the new buffer */
-       PnpBusTypeGuidList = NewList;
-   }
-
-   /* Copy the new GUID */
-   RtlCopyMemory(&PnpBusTypeGuidList->Guids[PnpBusTypeGuidList->GuidCount],
-                 BusTypeGuid,
-                 sizeof(GUID));
-
-   /* The new entry is the index */
-   FoundIndex = (USHORT)PnpBusTypeGuidList->GuidCount;
-   PnpBusTypeGuidList->GuidCount++;
-
-Quickie:
-   ExReleaseFastMutex(&PnpBusTypeGuidList->Lock);
-   return FoundIndex;
-}
-
-/*
- * DESCRIPTION
- *     Creates a device node
- *
- * ARGUMENTS
- *   ParentNode           = Pointer to parent device node
- *   PhysicalDeviceObject = Pointer to PDO for device object. Pass NULL
- *                          to have the root device node create one
- *                          (eg. for legacy drivers)
- *   DeviceNode           = Pointer to storage for created device node
- *
- * RETURN VALUE
- *     Status
- */
-NTSTATUS
-IopCreateDeviceNode(PDEVICE_NODE ParentNode,
-                    PDEVICE_OBJECT PhysicalDeviceObject,
-                    PUNICODE_STRING ServiceName,
-                    PDEVICE_NODE *DeviceNode)
-{
-   PDEVICE_NODE Node;
-   NTSTATUS Status;
-   KIRQL OldIrql;
-   UNICODE_STRING FullServiceName;
-   UNICODE_STRING LegacyPrefix = RTL_CONSTANT_STRING(L"LEGACY_");
-   UNICODE_STRING UnknownDeviceName = RTL_CONSTANT_STRING(L"UNKNOWN");
-   UNICODE_STRING KeyName, ClassName;
-   PUNICODE_STRING ServiceName1;
-   ULONG LegacyValue;
-   UNICODE_STRING ClassGUID;
-   HANDLE InstanceHandle;
-
-   DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n",
-      ParentNode, PhysicalDeviceObject, ServiceName);
-
-   Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE));
-   if (!Node)
-   {
-      return STATUS_INSUFFICIENT_RESOURCES;
-   }
-
-   RtlZeroMemory(Node, sizeof(DEVICE_NODE));
-
-   if (!ServiceName)
-       ServiceName1 = &UnknownDeviceName;
-   else
-       ServiceName1 = ServiceName;
-
-   if (!PhysicalDeviceObject)
-   {
-      FullServiceName.MaximumLength = LegacyPrefix.Length + ServiceName1->Length;
-      FullServiceName.Length = 0;
-      FullServiceName.Buffer = ExAllocatePool(PagedPool, FullServiceName.MaximumLength);
-      if (!FullServiceName.Buffer)
-      {
-          ExFreePool(Node);
-          return STATUS_INSUFFICIENT_RESOURCES;
-      }
-
-      RtlAppendUnicodeStringToString(&FullServiceName, &LegacyPrefix);
-      RtlAppendUnicodeStringToString(&FullServiceName, ServiceName1);
-
-      Status = PnpRootCreateDevice(&FullServiceName, NULL, &PhysicalDeviceObject, &Node->InstancePath);
-      if (!NT_SUCCESS(Status))
-      {
-         DPRINT1("PnpRootCreateDevice() failed with status 0x%08X\n", Status);
-         ExFreePool(Node);
-         return Status;
-      }
-
-      /* Create the device key for legacy drivers */
-      Status = IopCreateDeviceKeyPath(&Node->InstancePath, REG_OPTION_VOLATILE, &InstanceHandle);
-      if (!NT_SUCCESS(Status))
-      {
-          ZwClose(InstanceHandle);
-          ExFreePool(Node);
-          ExFreePool(FullServiceName.Buffer);
-          return Status;
-      }
-
-      Node->ServiceName.Buffer = ExAllocatePool(PagedPool, ServiceName1->Length);
-      if (!Node->ServiceName.Buffer)
-      {
-          ZwClose(InstanceHandle);
-          ExFreePool(Node);
-          ExFreePool(FullServiceName.Buffer);
-          return Status;
-      }
-
-      Node->ServiceName.MaximumLength = ServiceName1->Length;
-      Node->ServiceName.Length = 0;
-
-      RtlAppendUnicodeStringToString(&Node->ServiceName, ServiceName1);
-
-      if (ServiceName)
-      {
-          RtlInitUnicodeString(&KeyName, L"Service");
-          Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ServiceName->Buffer, ServiceName->Length);
-      }
-
-      if (NT_SUCCESS(Status))
-      {
-          RtlInitUnicodeString(&KeyName, L"Legacy");
-
-          LegacyValue = 1;
-          Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_DWORD, &LegacyValue, sizeof(LegacyValue));
-          if (NT_SUCCESS(Status))
-          {
-              RtlInitUnicodeString(&KeyName, L"Class");
-
-              RtlInitUnicodeString(&ClassName, L"LegacyDriver\0");
-              Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassName.Buffer, ClassName.Length + sizeof(UNICODE_NULL));
-              if (NT_SUCCESS(Status))
-              {
-                  RtlInitUnicodeString(&KeyName, L"ClassGUID");
-
-                  RtlInitUnicodeString(&ClassGUID, L"{8ECC055D-047F-11D1-A537-0000F8753ED1}\0");
-                  Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassGUID.Buffer, ClassGUID.Length + sizeof(UNICODE_NULL));
-                  if (NT_SUCCESS(Status))
-                  {
-                      RtlInitUnicodeString(&KeyName, L"DeviceDesc");
-
-                      Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ServiceName1->Buffer, ServiceName1->Length + sizeof(UNICODE_NULL));
-                  }
-              }
-          }
-      }
-
-      ZwClose(InstanceHandle);
-      ExFreePool(FullServiceName.Buffer);
-
-      if (!NT_SUCCESS(Status))
-      {
-          ExFreePool(Node);
-          return Status;
-      }
-
-      IopDeviceNodeSetFlag(Node, DNF_LEGACY_DRIVER);
-      IopDeviceNodeSetFlag(Node, DNF_PROCESSED);
-      IopDeviceNodeSetFlag(Node, DNF_ADDED);
-      IopDeviceNodeSetFlag(Node, DNF_STARTED);
-   }
-
-   Node->PhysicalDeviceObject = PhysicalDeviceObject;
-
-   ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode = Node;
-
-    if (ParentNode)
-    {
-        KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-        Node->Parent = ParentNode;
-        Node->Sibling = NULL;
-        if (ParentNode->LastChild == NULL)
-        {
-            ParentNode->Child = Node;
-            ParentNode->LastChild = Node;
-        }
-        else
-        {
-            ParentNode->LastChild->Sibling = Node;
-            ParentNode->LastChild = Node;
-        }
-        KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-        Node->Level = ParentNode->Level + 1;
-    }
-
-    PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
-
-   *DeviceNode = Node;
-
-   return STATUS_SUCCESS;
-}
-
-NTSTATUS
-IopFreeDeviceNode(PDEVICE_NODE DeviceNode)
-{
-   KIRQL OldIrql;
-   PDEVICE_NODE PrevSibling = NULL;
-
-   /* All children must be deleted before a parent is deleted */
-   ASSERT(!DeviceNode->Child);
-   ASSERT(DeviceNode->PhysicalDeviceObject);
-
-   KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-
-    /* Get previous sibling */
-    if (DeviceNode->Parent && DeviceNode->Parent->Child != DeviceNode)
-    {
-        PrevSibling = DeviceNode->Parent->Child;
-        while (PrevSibling->Sibling != DeviceNode)
-            PrevSibling = PrevSibling->Sibling;
-    }
-
-    /* Unlink from parent if it exists */
-    if (DeviceNode->Parent)
-    {
-        if (DeviceNode->Parent->LastChild == DeviceNode)
-        {
-            DeviceNode->Parent->LastChild = PrevSibling;
-            if (PrevSibling)
-                PrevSibling->Sibling = NULL;
-        }
-        if (DeviceNode->Parent->Child == DeviceNode)
-            DeviceNode->Parent->Child = DeviceNode->Sibling;
-    }
-
-    /* Unlink from sibling list */
-    if (PrevSibling)
-        PrevSibling->Sibling = DeviceNode->Sibling;
-
-   KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-
-   RtlFreeUnicodeString(&DeviceNode->InstancePath);
-
-   RtlFreeUnicodeString(&DeviceNode->ServiceName);
-
-   if (DeviceNode->ResourceList)
-   {
-      ExFreePool(DeviceNode->ResourceList);
-   }
-
-   if (DeviceNode->ResourceListTranslated)
-   {
-      ExFreePool(DeviceNode->ResourceListTranslated);
-   }
-
-   if (DeviceNode->ResourceRequirements)
-   {
-      ExFreePool(DeviceNode->ResourceRequirements);
-   }
-
-   if (DeviceNode->BootResources)
-   {
-      ExFreePool(DeviceNode->BootResources);
-   }
-
-   ExFreePool(DeviceNode);
-
-   return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject,
-                   IN PIO_STACK_LOCATION IoStackLocation,
-                   OUT PVOID *Information)
-{
-    PIRP Irp;
-    PIO_STACK_LOCATION IrpStack;
-    IO_STATUS_BLOCK IoStatusBlock;
-    KEVENT Event;
-    NTSTATUS Status;
-    PDEVICE_OBJECT TopDeviceObject;
-    PAGED_CODE();
-    
-    /* Call the top of the device stack */
-    TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject);
-    
-    /* Allocate an IRP */
-    Irp = IoAllocateIrp(TopDeviceObject->StackSize, FALSE);
-    if (!Irp) return STATUS_INSUFFICIENT_RESOURCES;
-    
-    /* Initialize to failure */
-    Irp->IoStatus.Status = IoStatusBlock.Status = STATUS_NOT_SUPPORTED;
-    Irp->IoStatus.Information = IoStatusBlock.Information = 0;
-    
-    /* Special case for IRP_MN_FILTER_RESOURCE_REQUIREMENTS */
-    if (IoStackLocation->MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS)
-    {
-        /* Copy the resource requirements list into the IOSB */
-        Irp->IoStatus.Information =
-        IoStatusBlock.Information = (ULONG_PTR)IoStackLocation->Parameters.FilterResourceRequirements.IoResourceRequirementList;
-    }
-    
-    /* Initialize the event */
-    KeInitializeEvent(&Event, SynchronizationEvent, FALSE);
-    
-    /* Set them up */
-    Irp->UserIosb = &IoStatusBlock;
-    Irp->UserEvent = &Event;
-    
-    /* Queue the IRP */
-    Irp->Tail.Overlay.Thread = PsGetCurrentThread();
-    IoQueueThreadIrp(Irp);
-    
-    /* Copy-in the stack */
-    IrpStack = IoGetNextIrpStackLocation(Irp);
-    *IrpStack = *IoStackLocation;
-    
-    /* Call the driver */
-    Status = IoCallDriver(TopDeviceObject, Irp);
-    if (Status == STATUS_PENDING)
-    {
-        /* Wait for it */
-        KeWaitForSingleObject(&Event,
-                              Executive,
-                              KernelMode,
-                              FALSE,
-                              NULL);
-        Status = IoStatusBlock.Status;
-    }
-
-    /* Remove the reference */
-    ObDereferenceObject(TopDeviceObject);
-
-    /* Return the information */
-    *Information = (PVOID)IoStatusBlock.Information;
-    return Status;
-}
-
-NTSTATUS
-NTAPI
-IopInitiatePnpIrp(IN PDEVICE_OBJECT DeviceObject,
-                  IN OUT PIO_STATUS_BLOCK IoStatusBlock,
-                  IN UCHAR MinorFunction,
-                  IN PIO_STACK_LOCATION Stack OPTIONAL)
-{
-    IO_STACK_LOCATION IoStackLocation;
-    
-    /* Fill out the stack information */
-    RtlZeroMemory(&IoStackLocation, sizeof(IO_STACK_LOCATION));
-    IoStackLocation.MajorFunction = IRP_MJ_PNP;
-    IoStackLocation.MinorFunction = MinorFunction;
-    if (Stack)
-    {
-        /* Copy the rest */
-        RtlCopyMemory(&IoStackLocation.Parameters,
-                      &Stack->Parameters,
-                      sizeof(Stack->Parameters));
-    }
-    
-    /* Do the PnP call */
-    IoStatusBlock->Status = IopSynchronousCall(DeviceObject,
-                                               &IoStackLocation,
-                                               (PVOID)&IoStatusBlock->Information);
-    return IoStatusBlock->Status;
-}
-
-NTSTATUS
-IopTraverseDeviceTreeNode(PDEVICETREE_TRAVERSE_CONTEXT Context)
-{
-   PDEVICE_NODE ParentDeviceNode;
-   PDEVICE_NODE ChildDeviceNode;
-   NTSTATUS Status;
-
-   /* Copy context data so we don't overwrite it in subsequent calls to this function */
-   ParentDeviceNode = Context->DeviceNode;
-
-   /* Call the action routine */
-   Status = (Context->Action)(ParentDeviceNode, Context->Context);
-   if (!NT_SUCCESS(Status))
-   {
-      return Status;
-   }
-
-   /* Traversal of all children nodes */
-   for (ChildDeviceNode = ParentDeviceNode->Child;
-        ChildDeviceNode != NULL;
-        ChildDeviceNode = ChildDeviceNode->Sibling)
-   {
-      /* Pass the current device node to the action routine */
-      Context->DeviceNode = ChildDeviceNode;
-
-      Status = IopTraverseDeviceTreeNode(Context);
-      if (!NT_SUCCESS(Status))
-      {
-         return Status;
-      }
-   }
-
-   return Status;
-}
-
-
-NTSTATUS
-IopTraverseDeviceTree(PDEVICETREE_TRAVERSE_CONTEXT Context)
-{
-   NTSTATUS Status;
-
-   DPRINT("Context 0x%p\n", Context);
-
-   DPRINT("IopTraverseDeviceTree(DeviceNode 0x%p  FirstDeviceNode 0x%p  Action %p  Context 0x%p)\n",
-      Context->DeviceNode, Context->FirstDeviceNode, Context->Action, Context->Context);
-
-   /* Start from the specified device node */
-   Context->DeviceNode = Context->FirstDeviceNode;
-
-   /* Recursively traverse the device tree */
-   Status = IopTraverseDeviceTreeNode(Context);
-   if (Status == STATUS_UNSUCCESSFUL)
-   {
-      /* The action routine just wanted to terminate the traversal with status
-      code STATUS_SUCCESS */
-      Status = STATUS_SUCCESS;
-   }
-
-   return Status;
-}
-
-
 /*
  * IopCreateDeviceKeyPath
  *
@@ -1409,17 +666,13 @@ IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
     HANDLE hParent = NULL, hKey;
     OBJECT_ATTRIBUTES ObjectAttributes;
     UNICODE_STRING KeyName;
-    LPCWSTR Current, Last;
+    PCWSTR Current, Last;
     USHORT Length;
     NTSTATUS Status;
 
     /* Assume failure */
     *Handle = NULL;
 
-    /* Create a volatile device tree in 1st stage so we have a clean slate
-     * for enumeration using the correct HAL (chosen in 1st stage setup) */
-    if (ExpInTextModeSetup) CreateOptions |= REG_OPTION_VOLATILE;
-
     /* Open root key for device instances */
     Status = IopOpenRegistryKeyEx(&hParent, NULL, &EnumU, KEY_CREATE_SUB_KEY);
     if (!NT_SUCCESS(Status))
@@ -1434,7 +687,7 @@ IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
     /* Go up to the end of the string */
     while (Current <= Last)
     {
-        if (Current != Last && *Current != '\\')
+        if (Current != Last && *Current != L'\\')
         {
             /* Not the end of the string and not a separator */
             Current++;
@@ -1449,7 +702,7 @@ IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
         /* Open key */
         InitializeObjectAttributes(&ObjectAttributes,
                                    &KeyName,
-                                   OBJ_CASE_INSENSITIVE,
+                                   OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
                                    hParent,
                                    NULL);
         Status = ZwCreateKey(&hKey,
@@ -1482,7 +735,7 @@ IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
         /* Start with this new parent key */
         hParent = hKey;
         Current++;
-        KeyName.Buffer = (LPWSTR)Current;
+        KeyName.Buffer = (PWSTR)Current;
     }
 
     return STATUS_UNSUCCESSFUL;
@@ -1492,1204 +745,283 @@ NTSTATUS
 IopSetDeviceInstanceData(HANDLE InstanceKey,
                          PDEVICE_NODE DeviceNode)
 {
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   UNICODE_STRING KeyName;
-   HANDLE LogConfKey;
-   ULONG ResCount;
-   ULONG ResultLength;
-   NTSTATUS Status;
-   HANDLE ControlHandle;
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    UNICODE_STRING KeyName;
+    HANDLE LogConfKey, ControlKey, DeviceParamsKey;
+    ULONG ResCount;
+    ULONG ResultLength;
+    NTSTATUS Status;
 
-   DPRINT("IopSetDeviceInstanceData() called\n");
+    DPRINT("IopSetDeviceInstanceData() called\n");
 
-   /* Create the 'LogConf' key */
-   RtlInitUnicodeString(&KeyName, L"LogConf");
-   InitializeObjectAttributes(&ObjectAttributes,
-                              &KeyName,
-                              OBJ_CASE_INSENSITIVE,
-                              InstanceKey,
-                              NULL);
-   Status = ZwCreateKey(&LogConfKey,
-                        KEY_ALL_ACCESS,
-                        &ObjectAttributes,
-                        0,
-                        NULL,
-                        REG_OPTION_VOLATILE,
-                        NULL);
-   if (NT_SUCCESS(Status))
-   {
-      /* Set 'BootConfig' value */
-      if (DeviceNode->BootResources != NULL)
-      {
-         ResCount = DeviceNode->BootResources->Count;
-         if (ResCount != 0)
-         {
-            RtlInitUnicodeString(&KeyName, L"BootConfig");
+    /* Create the 'LogConf' key */
+    RtlInitUnicodeString(&KeyName, L"LogConf");
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &KeyName,
+                               OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
+                               InstanceKey,
+                               NULL);
+    Status = ZwCreateKey(&LogConfKey,
+                         KEY_ALL_ACCESS,
+                         &ObjectAttributes,
+                         0,
+                         NULL,
+                         // FIXME? In r53694 it was silently turned from non-volatile into this,
+                         // without any extra warning. Is this still needed??
+                         REG_OPTION_VOLATILE,
+                         NULL);
+    if (NT_SUCCESS(Status))
+    {
+        /* Set 'BootConfig' value */
+        if (DeviceNode->BootResources != NULL)
+        {
+            ResCount = DeviceNode->BootResources->Count;
+            if (ResCount != 0)
+            {
+                RtlInitUnicodeString(&KeyName, L"BootConfig");
+                Status = ZwSetValueKey(LogConfKey,
+                                       &KeyName,
+                                       0,
+                                       REG_RESOURCE_LIST,
+                                       DeviceNode->BootResources,
+                                       PnpDetermineResourceListSize(DeviceNode->BootResources));
+            }
+        }
+
+        /* Set 'BasicConfigVector' value */
+        if (DeviceNode->ResourceRequirements != NULL &&
+            DeviceNode->ResourceRequirements->ListSize != 0)
+        {
+            RtlInitUnicodeString(&KeyName, L"BasicConfigVector");
             Status = ZwSetValueKey(LogConfKey,
                                    &KeyName,
                                    0,
-                                   REG_RESOURCE_LIST,
-                                   DeviceNode->BootResources,
-                                   PnpDetermineResourceListSize(DeviceNode->BootResources));
-         }
-      }
+                                   REG_RESOURCE_REQUIREMENTS_LIST,
+                                   DeviceNode->ResourceRequirements,
+                                   DeviceNode->ResourceRequirements->ListSize);
+        }
 
-      /* Set 'BasicConfigVector' value */
-      if (DeviceNode->ResourceRequirements != NULL &&
-         DeviceNode->ResourceRequirements->ListSize != 0)
-      {
-         RtlInitUnicodeString(&KeyName, L"BasicConfigVector");
-         Status = ZwSetValueKey(LogConfKey,
-                                &KeyName,
-                                0,
-                                REG_RESOURCE_REQUIREMENTS_LIST,
-                                DeviceNode->ResourceRequirements,
-                                DeviceNode->ResourceRequirements->ListSize);
-      }
-
-      ZwClose(LogConfKey);
-   }
-
-   /* Set the 'ConfigFlags' value */
-   RtlInitUnicodeString(&KeyName, L"ConfigFlags");
-   Status = ZwQueryValueKey(InstanceKey,
-                            &KeyName,
-                            KeyValueBasicInformation,
-                            NULL,
-                            0,
-                            &ResultLength);
-  if (Status == STATUS_OBJECT_NAME_NOT_FOUND)
-  {
-    /* Write the default value */
-    ULONG DefaultConfigFlags = 0;
-    Status = ZwSetValueKey(InstanceKey,
-                           &KeyName,
-                           0,
-                           REG_DWORD,
-                           &DefaultConfigFlags,
-                           sizeof(DefaultConfigFlags));
-  }
-
-   /* Create the 'Control' key */
-   RtlInitUnicodeString(&KeyName, L"Control");
-   InitializeObjectAttributes(&ObjectAttributes,
-                              &KeyName,
-                              OBJ_CASE_INSENSITIVE,
-                              InstanceKey,
-                              NULL);
-   Status = ZwCreateKey(&ControlHandle, 0, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL);
-
-   if (NT_SUCCESS(Status))
-       ZwClose(ControlHandle);
-
-  DPRINT("IopSetDeviceInstanceData() done\n");
-
-  return Status;
-}
-
-/*
- * IopGetParentIdPrefix
- *
- * Retrieve (or create) a string which identifies a device.
- *
- * Parameters
- *    DeviceNode
- *        Pointer to device node.
- *    ParentIdPrefix
- *        Pointer to the string where is returned the parent node identifier
- *
- * Remarks
- *     If the return code is STATUS_SUCCESS, the ParentIdPrefix string is
- *     valid and its Buffer field is NULL-terminated. The caller needs to
- *     to free the string with RtlFreeUnicodeString when it is no longer
- *     needed.
- */
-
-NTSTATUS
-IopGetParentIdPrefix(PDEVICE_NODE DeviceNode,
-                     PUNICODE_STRING ParentIdPrefix)
-{
-   ULONG KeyNameBufferLength;
-   PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL;
-   UNICODE_STRING KeyName = {0, 0, NULL};
-   UNICODE_STRING KeyValue;
-   UNICODE_STRING ValueName;
-   HANDLE hKey = NULL;
-   ULONG crc32;
-   NTSTATUS Status;
-
-   /* HACK: As long as some devices have a NULL device
-    * instance path, the following test is required :(
-    */
-   if (DeviceNode->Parent->InstancePath.Length == 0)
-   {
-      DPRINT1("Parent of %wZ has NULL Instance path, please report!\n",
-          &DeviceNode->InstancePath);
-      return STATUS_UNSUCCESSFUL;
-   }
-
-   /* 1. Try to retrieve ParentIdPrefix from registry */
-   KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR);
-   ParentIdPrefixInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR));
-   if (!ParentIdPrefixInformation)
-   {
-       return STATUS_INSUFFICIENT_RESOURCES;
-   }
-
-   KeyName.Buffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length);
-   if (!KeyName.Buffer)
-   {
-       Status = STATUS_INSUFFICIENT_RESOURCES;
-       goto cleanup;
-   }
-   KeyName.Length = 0;
-   KeyName.MaximumLength = (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length;
-
-   RtlAppendUnicodeToString(&KeyName, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\");
-   RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->Parent->InstancePath);
-
-   Status = IopOpenRegistryKeyEx(&hKey, NULL, &KeyName, KEY_QUERY_VALUE | KEY_SET_VALUE);
-   if (!NT_SUCCESS(Status))
-      goto cleanup;
-   RtlInitUnicodeString(&ValueName, L"ParentIdPrefix");
-   Status = ZwQueryValueKey(
-      hKey, &ValueName,
-      KeyValuePartialInformation, ParentIdPrefixInformation,
-      KeyNameBufferLength, &KeyNameBufferLength);
-   if (NT_SUCCESS(Status))
-   {
-      if (ParentIdPrefixInformation->Type != REG_SZ)
-         Status = STATUS_UNSUCCESSFUL;
-      else
-      {
-         KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength;
-         KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
-      }
-      goto cleanup;
-   }
-   if (Status != STATUS_OBJECT_NAME_NOT_FOUND)
-   {
-      KeyValue.Length = KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength;
-      KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
-      goto cleanup;
-   }
-
-   /* 2. Create the ParentIdPrefix value */
-   crc32 = RtlComputeCrc32(0,
-                           (PUCHAR)DeviceNode->Parent->InstancePath.Buffer,
-                           DeviceNode->Parent->InstancePath.Length);
-
-   swprintf((PWSTR)ParentIdPrefixInformation->Data, L"%lx&%lx", DeviceNode->Parent->Level, crc32);
-   RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation->Data);
-
-   /* 3. Try to write the ParentIdPrefix to registry */
-   Status = ZwSetValueKey(hKey,
-                          &ValueName,
-                          0,
-                          REG_SZ,
-                          (PVOID)KeyValue.Buffer,
-                          ((ULONG)wcslen(KeyValue.Buffer) + 1) * sizeof(WCHAR));
-
-cleanup:
-   if (NT_SUCCESS(Status))
-   {
-      /* Duplicate the string to return it */
-      Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix);
-   }
-   ExFreePool(ParentIdPrefixInformation);
-   RtlFreeUnicodeString(&KeyName);
-   if (hKey != NULL)
-      ZwClose(hKey);
-   return Status;
-}
-
-NTSTATUS
-IopQueryHardwareIds(PDEVICE_NODE DeviceNode,
-                    HANDLE InstanceKey)
-{
-   IO_STACK_LOCATION Stack;
-   IO_STATUS_BLOCK IoStatusBlock;
-   PWSTR Ptr;
-   UNICODE_STRING ValueName;
-   NTSTATUS Status;
-   ULONG Length, TotalLength;
-
-   DPRINT("Sending IRP_MN_QUERY_ID.BusQueryHardwareIDs to device stack\n");
-
-   RtlZeroMemory(&Stack, sizeof(Stack));
-   Stack.Parameters.QueryId.IdType = BusQueryHardwareIDs;
-   Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
-                              &IoStatusBlock,
-                              IRP_MN_QUERY_ID,
-                              &Stack);
-   if (NT_SUCCESS(Status))
-   {
-      /*
-       * FIXME: Check for valid characters, if there is invalid characters
-       * then bugcheck.
-       */
-      TotalLength = 0;
-      Ptr = (PWSTR)IoStatusBlock.Information;
-      DPRINT("Hardware IDs:\n");
-      while (*Ptr)
-      {
-         DPRINT("  %S\n", Ptr);
-         Length = (ULONG)wcslen(Ptr) + 1;
-
-         Ptr += Length;
-         TotalLength += Length;
-      }
-      DPRINT("TotalLength: %hu\n", TotalLength);
-      DPRINT("\n");
-
-      RtlInitUnicodeString(&ValueName, L"HardwareID");
-      Status = ZwSetValueKey(InstanceKey,
-                 &ValueName,
-                 0,
-                 REG_MULTI_SZ,
-                 (PVOID)IoStatusBlock.Information,
-                 (TotalLength + 1) * sizeof(WCHAR));
-      if (!NT_SUCCESS(Status))
-      {
-         DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status);
-      }
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
-   }
-
-   return Status;
-}
-
-NTSTATUS
-IopQueryCompatibleIds(PDEVICE_NODE DeviceNode,
-                      HANDLE InstanceKey)
-{
-   IO_STACK_LOCATION Stack;
-   IO_STATUS_BLOCK IoStatusBlock;
-   PWSTR Ptr;
-   UNICODE_STRING ValueName;
-   NTSTATUS Status;
-   ULONG Length, TotalLength;
-
-   DPRINT("Sending IRP_MN_QUERY_ID.BusQueryCompatibleIDs to device stack\n");
-
-   RtlZeroMemory(&Stack, sizeof(Stack));
-   Stack.Parameters.QueryId.IdType = BusQueryCompatibleIDs;
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_QUERY_ID,
-      &Stack);
-   if (NT_SUCCESS(Status) && IoStatusBlock.Information)
-   {
-      /*
-      * FIXME: Check for valid characters, if there is invalid characters
-      * then bugcheck.
-      */
-      TotalLength = 0;
-      Ptr = (PWSTR)IoStatusBlock.Information;
-      DPRINT("Compatible IDs:\n");
-      while (*Ptr)
-      {
-         DPRINT("  %S\n", Ptr);
-         Length = (ULONG)wcslen(Ptr) + 1;
-
-         Ptr += Length;
-         TotalLength += Length;
-      }
-      DPRINT("TotalLength: %hu\n", TotalLength);
-      DPRINT("\n");
-
-      RtlInitUnicodeString(&ValueName, L"CompatibleIDs");
-      Status = ZwSetValueKey(InstanceKey,
-         &ValueName,
-         0,
-         REG_MULTI_SZ,
-         (PVOID)IoStatusBlock.Information,
-         (TotalLength + 1) * sizeof(WCHAR));
-      if (!NT_SUCCESS(Status))
-      {
-         DPRINT1("ZwSetValueKey() failed (Status %lx) or no Compatible ID returned\n", Status);
-      }
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
-   }
-
-   return Status;
-}
-
-
-/*
- * IopActionInterrogateDeviceStack
- *
- * Retrieve information for all (direct) child nodes of a parent node.
- *
- * Parameters
- *    DeviceNode
- *       Pointer to device node.
- *    Context
- *       Pointer to parent node to retrieve child node information for.
- *
- * Remarks
- *    Any errors that occur are logged instead so that all child services have a chance
- *    of being interrogated.
- */
-
-NTSTATUS
-IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
-                                PVOID Context)
-{
-   IO_STATUS_BLOCK IoStatusBlock;
-   PDEVICE_NODE ParentDeviceNode;
-   WCHAR InstancePath[MAX_PATH];
-   IO_STACK_LOCATION Stack;
-   NTSTATUS Status;
-   ULONG RequiredLength;
-   LCID LocaleId;
-   HANDLE InstanceKey = NULL;
-   UNICODE_STRING ValueName;
-   UNICODE_STRING ParentIdPrefix = { 0, 0, NULL };
-   UNICODE_STRING InstancePathU;
-   DEVICE_CAPABILITIES DeviceCapabilities;
-   PDEVICE_OBJECT OldDeviceObject;
-
-   DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context);
-   DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject);
-
-   ParentDeviceNode = (PDEVICE_NODE)Context;
-
-   /*
-    * We are called for the parent too, but we don't need to do special
-    * handling for this node
-    */
-
-   if (DeviceNode == ParentDeviceNode)
-   {
-      DPRINT("Success\n");
-      return STATUS_SUCCESS;
-   }
-
-   /*
-    * Make sure this device node is a direct child of the parent device node
-    * that is given as an argument
-    */
-
-   if (DeviceNode->Parent != ParentDeviceNode)
-   {
-      DPRINT("Skipping 2+ level child\n");
-      return STATUS_SUCCESS;
-   }
-
-   /* Skip processing if it was already completed before */
-   if (DeviceNode->Flags & DNF_PROCESSED)
-   {
-       /* Nothing to do */
-       return STATUS_SUCCESS;
-   }
-
-   /* Get Locale ID */
-   Status = ZwQueryDefaultLocale(FALSE, &LocaleId);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("ZwQueryDefaultLocale() failed with status 0x%lx\n", Status);
-      return Status;
-   }
-
-   /*
-    * FIXME: For critical errors, cleanup and disable device, but always
-    * return STATUS_SUCCESS.
-    */
-
-   DPRINT("Sending IRP_MN_QUERY_ID.BusQueryDeviceID to device stack\n");
-
-   Stack.Parameters.QueryId.IdType = BusQueryDeviceID;
-   Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
-                              &IoStatusBlock,
-                              IRP_MN_QUERY_ID,
-                              &Stack);
-   if (NT_SUCCESS(Status))
-   {
-      /* Copy the device id string */
-      wcscpy(InstancePath, (PWSTR)IoStatusBlock.Information);
-
-      /*
-       * FIXME: Check for valid characters, if there is invalid characters
-       * then bugcheck.
-       */
-   }
-   else
-   {
-      DPRINT1("IopInitiatePnpIrp() failed (Status %x)\n", Status);
-
-      /* We have to return success otherwise we abort the traverse operation */
-      return STATUS_SUCCESS;
-   }
-
-   DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack (after enumeration)\n");
-
-   Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status);
-
-      /* We have to return success otherwise we abort the traverse operation */
-      return STATUS_SUCCESS;
-   }
-
-   /* This bit is only check after enumeration */
-   if (DeviceCapabilities.HardwareDisabled)
-   {
-       /* FIXME: Cleanup device */
-       DeviceNode->Flags |= DNF_DISABLED;
-       return STATUS_SUCCESS;
-   }
-   else
-       DeviceNode->Flags &= ~DNF_DISABLED;
-
-   if (!DeviceCapabilities.UniqueID)
-   {
-      /* Device has not a unique ID. We need to prepend parent bus unique identifier */
-      DPRINT("Instance ID is not unique\n");
-      Status = IopGetParentIdPrefix(DeviceNode, &ParentIdPrefix);
-      if (!NT_SUCCESS(Status))
-      {
-         DPRINT1("IopGetParentIdPrefix() failed (Status 0x%08lx)\n", Status);
-
-         /* We have to return success otherwise we abort the traverse operation */
-         return STATUS_SUCCESS;
-      }
-   }
-
-   DPRINT("Sending IRP_MN_QUERY_ID.BusQueryInstanceID to device stack\n");
-
-   Stack.Parameters.QueryId.IdType = BusQueryInstanceID;
-   Status = IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
-                              &IoStatusBlock,
-                              IRP_MN_QUERY_ID,
-                              &Stack);
-   if (NT_SUCCESS(Status))
-   {
-      /* Append the instance id string */
-      wcscat(InstancePath, L"\\");
-      if (ParentIdPrefix.Length > 0)
-      {
-         /* Add information from parent bus device to InstancePath */
-         wcscat(InstancePath, ParentIdPrefix.Buffer);
-         if (IoStatusBlock.Information && *(PWSTR)IoStatusBlock.Information)
-            wcscat(InstancePath, L"&");
-      }
-      if (IoStatusBlock.Information)
-         wcscat(InstancePath, (PWSTR)IoStatusBlock.Information);
-
-      /*
-       * FIXME: Check for valid characters, if there is invalid characters
-       * then bugcheck
-       */
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
-   }
-   RtlFreeUnicodeString(&ParentIdPrefix);
-
-   if (!RtlCreateUnicodeString(&InstancePathU, InstancePath))
-   {
-      DPRINT("No resources\n");
-      /* FIXME: Cleanup and disable device */
-   }
-
-   /* Verify that this is not a duplicate */
-   OldDeviceObject = IopGetDeviceObjectFromDeviceInstance(&InstancePathU);
-   if (OldDeviceObject != NULL)
-   {
-       PDEVICE_NODE OldDeviceNode = IopGetDeviceNode(OldDeviceObject);
-
-       DPRINT1("Duplicate device instance '%wZ'\n", &InstancePathU);
-       DPRINT1("Current instance parent: '%wZ'\n", &DeviceNode->Parent->InstancePath);
-       DPRINT1("Old instance parent: '%wZ'\n", &OldDeviceNode->Parent->InstancePath);
-
-       KeBugCheckEx(PNP_DETECTED_FATAL_ERROR,
-                    0x01,
-                    (ULONG_PTR)DeviceNode->PhysicalDeviceObject,
-                    (ULONG_PTR)OldDeviceObject,
-                    0);
-   }
-
-   DeviceNode->InstancePath = InstancePathU;
-
-   DPRINT("InstancePath is %S\n", DeviceNode->InstancePath.Buffer);
-
-   /*
-    * Create registry key for the instance id, if it doesn't exist yet
-    */
-   Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("Failed to create the instance key! (Status %lx)\n", Status);
-
-      /* We have to return success otherwise we abort the traverse operation */
-      return STATUS_SUCCESS;
-   }
-
-   IopQueryHardwareIds(DeviceNode, InstanceKey);
-
-   IopQueryCompatibleIds(DeviceNode, InstanceKey);
-
-   DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextDescription to device stack\n");
-
-   Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription;
-   Stack.Parameters.QueryDeviceText.LocaleId = LocaleId;
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_QUERY_DEVICE_TEXT,
-      &Stack);
-   /* This key is mandatory, so even if the Irp fails, we still write it */
-   RtlInitUnicodeString(&ValueName, L"DeviceDesc");
-   if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND)
-   {
-      if (NT_SUCCESS(Status) &&
-         IoStatusBlock.Information &&
-         (*(PWSTR)IoStatusBlock.Information != 0))
-      {
-         /* This key is overriden when a driver is installed. Don't write the
-          * new description if another one already exists */
-         Status = ZwSetValueKey(InstanceKey,
-                                &ValueName,
-                                0,
-                                REG_SZ,
-                                (PVOID)IoStatusBlock.Information,
-                                ((ULONG)wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR));
-      }
-      else
-      {
-         UNICODE_STRING DeviceDesc = RTL_CONSTANT_STRING(L"Unknown device");
-         DPRINT("Driver didn't return DeviceDesc (Status 0x%08lx), so place unknown device there\n", Status);
-
-         Status = ZwSetValueKey(InstanceKey,
-            &ValueName,
-            0,
-            REG_SZ,
-            DeviceDesc.Buffer,
-            DeviceDesc.MaximumLength);
-
-         if (!NT_SUCCESS(Status))
-         {
-            DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status);
-         }
-
-      }
-   }
-
-   DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocation to device stack\n");
-
-   Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextLocationInformation;
-   Stack.Parameters.QueryDeviceText.LocaleId = LocaleId;
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_QUERY_DEVICE_TEXT,
-      &Stack);
-   if (NT_SUCCESS(Status) && IoStatusBlock.Information)
-   {
-      DPRINT("LocationInformation: %S\n", (PWSTR)IoStatusBlock.Information);
-      RtlInitUnicodeString(&ValueName, L"LocationInformation");
-      Status = ZwSetValueKey(InstanceKey,
-         &ValueName,
-         0,
-         REG_SZ,
-         (PVOID)IoStatusBlock.Information,
-         ((ULONG)wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR));
-      if (!NT_SUCCESS(Status))
-      {
-         DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status);
-      }
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status);
-   }
-
-   DPRINT("Sending IRP_MN_QUERY_BUS_INFORMATION to device stack\n");
-
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_QUERY_BUS_INFORMATION,
-      NULL);
-   if (NT_SUCCESS(Status) && IoStatusBlock.Information)
-   {
-      PPNP_BUS_INFORMATION BusInformation =
-         (PPNP_BUS_INFORMATION)IoStatusBlock.Information;
-
-      DeviceNode->ChildBusNumber = BusInformation->BusNumber;
-      DeviceNode->ChildInterfaceType = BusInformation->LegacyBusType;
-      DeviceNode->ChildBusTypeIndex = IopGetBusTypeGuidIndex(&BusInformation->BusTypeGuid);
-      ExFreePool(BusInformation);
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status);
-
-      DeviceNode->ChildBusNumber = 0xFFFFFFF0;
-      DeviceNode->ChildInterfaceType = InterfaceTypeUndefined;
-      DeviceNode->ChildBusTypeIndex = -1;
-   }
-
-   DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n");
-
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_QUERY_RESOURCES,
-      NULL);
-   if (NT_SUCCESS(Status) && IoStatusBlock.Information)
-   {
-      DeviceNode->BootResources =
-         (PCM_RESOURCE_LIST)IoStatusBlock.Information;
-      IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG);
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status);
-      DeviceNode->BootResources = NULL;
-   }
-
-   DPRINT("Sending IRP_MN_QUERY_RESOURCE_REQUIREMENTS to device stack\n");
-
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_QUERY_RESOURCE_REQUIREMENTS,
-      NULL);
-   if (NT_SUCCESS(Status))
-   {
-      DeviceNode->ResourceRequirements =
-         (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information;
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %08lx)\n", Status);
-      DeviceNode->ResourceRequirements = NULL;
-   }
-
-   if (InstanceKey != NULL)
-   {
-      IopSetDeviceInstanceData(InstanceKey, DeviceNode);
-   }
-
-   ZwClose(InstanceKey);
-
-   IopDeviceNodeSetFlag(DeviceNode, DNF_PROCESSED);
-
-   if (!IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER))
-   {
-      /* Report the device to the user-mode pnp manager */
-      IopQueueTargetDeviceEvent(&GUID_DEVICE_ENUMERATED,
-                                &DeviceNode->InstancePath);
-   }
-
-   return STATUS_SUCCESS;
-}
-
-static
-VOID
-IopHandleDeviceRemoval(
-    IN PDEVICE_NODE DeviceNode,
-    IN PDEVICE_RELATIONS DeviceRelations)
-{
-    PDEVICE_NODE Child = DeviceNode->Child, NextChild;
-    ULONG i;
-    BOOLEAN Found;
-
-    if (DeviceNode == IopRootDeviceNode)
-        return;
-
-    while (Child != NULL)
-    {
-        NextChild = Child->Sibling;
-        Found = FALSE;
-
-        for (i = 0; DeviceRelations && i < DeviceRelations->Count; i++)
-        {
-            if (IopGetDeviceNode(DeviceRelations->Objects[i]) == Child)
-            {
-                Found = TRUE;
-                break;
-            }
-        }
-
-        if (!Found && !(Child->Flags & DNF_WILL_BE_REMOVED))
-        {
-            /* Send removal IRPs to all of its children */
-            IopPrepareDeviceForRemoval(Child->PhysicalDeviceObject, TRUE);
-
-            /* Send the surprise removal IRP */
-            IopSendSurpriseRemoval(Child->PhysicalDeviceObject);
-
-            /* Tell the user-mode PnP manager that a device was removed */
-            IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL,
-                                      &Child->InstancePath);
-
-            /* Send the remove device IRP */
-            IopSendRemoveDevice(Child->PhysicalDeviceObject);
-        }
-
-        Child = NextChild;
-    }
-}
-
-NTSTATUS
-IopEnumerateDevice(
-    IN PDEVICE_OBJECT DeviceObject)
-{
-    PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject);
-    DEVICETREE_TRAVERSE_CONTEXT Context;
-    PDEVICE_RELATIONS DeviceRelations;
-    PDEVICE_OBJECT ChildDeviceObject;
-    IO_STATUS_BLOCK IoStatusBlock;
-    PDEVICE_NODE ChildDeviceNode;
-    IO_STACK_LOCATION Stack;
-    NTSTATUS Status;
-    ULONG i;
-
-    DPRINT("DeviceObject 0x%p\n", DeviceObject);
-
-    if (DeviceNode->Flags & DNF_NEED_ENUMERATION_ONLY)
-    {
-        DeviceNode->Flags &= ~DNF_NEED_ENUMERATION_ONLY;
-
-        DPRINT("Sending GUID_DEVICE_ARRIVAL\n");
-        IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL,
-                                  &DeviceNode->InstancePath);
-    }
-
-    DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n");
-
-    Stack.Parameters.QueryDeviceRelations.Type = BusRelations;
-
-    Status = IopInitiatePnpIrp(
-        DeviceObject,
-        &IoStatusBlock,
-        IRP_MN_QUERY_DEVICE_RELATIONS,
-        &Stack);
-    if (!NT_SUCCESS(Status) || Status == STATUS_PENDING)
-    {
-        DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status);
-        return Status;
-    }
-
-    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)
-    {
-        /* We're all done */
-        DPRINT("No PDOs\n");
-        return STATUS_SUCCESS;
-    }
-
-    DPRINT("Got %u PDOs\n", DeviceRelations->Count);
-
-    /*
-     * Create device nodes for all discovered devices
-     */
-    for (i = 0; i < DeviceRelations->Count; i++)
-    {
-        ChildDeviceObject = DeviceRelations->Objects[i];
-        ASSERT((ChildDeviceObject->Flags & DO_DEVICE_INITIALIZING) == 0);
-
-        ChildDeviceNode = IopGetDeviceNode(ChildDeviceObject);
-        if (!ChildDeviceNode)
-        {
-            /* One doesn't exist, create it */
-            Status = IopCreateDeviceNode(
-                DeviceNode,
-                ChildDeviceObject,
-                NULL,
-                &ChildDeviceNode);
-            if (NT_SUCCESS(Status))
-            {
-                /* Mark the node as enumerated */
-                ChildDeviceNode->Flags |= DNF_ENUMERATED;
-
-                /* Mark the DO as bus enumerated */
-                ChildDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE;
-            }
-            else
-            {
-                /* Ignore this DO */
-                DPRINT1("IopCreateDeviceNode() failed with status 0x%08x. Skipping PDO %u\n", Status, i);
-                ObDereferenceObject(ChildDeviceObject);
-            }
-        }
-        else
-        {
-            /* Mark it as enumerated */
-            ChildDeviceNode->Flags |= DNF_ENUMERATED;
-            ObDereferenceObject(ChildDeviceObject);
-        }
+        ZwClose(LogConfKey);
     }
-    ExFreePool(DeviceRelations);
 
-    /*
-     * Retrieve information about all discovered children from the bus driver
-     */
-    IopInitDeviceTreeTraverseContext(
-        &Context,
-        DeviceNode,
-        IopActionInterrogateDeviceStack,
-        DeviceNode);
-
-    Status = IopTraverseDeviceTree(&Context);
-    if (!NT_SUCCESS(Status))
+    /* Set the 'ConfigFlags' value */
+    RtlInitUnicodeString(&KeyName, L"ConfigFlags");
+    Status = ZwQueryValueKey(InstanceKey,
+                             &KeyName,
+                             KeyValueBasicInformation,
+                             NULL,
+                             0,
+                             &ResultLength);
+    if (Status == STATUS_OBJECT_NAME_NOT_FOUND)
     {
-        DPRINT("IopTraverseDeviceTree() failed with status 0x%08lx\n", Status);
-        return Status;
+        /* Write the default value */
+        ULONG DefaultConfigFlags = 0;
+        Status = ZwSetValueKey(InstanceKey,
+                               &KeyName,
+                               0,
+                               REG_DWORD,
+                               &DefaultConfigFlags,
+                               sizeof(DefaultConfigFlags));
     }
 
-    /*
-     * Retrieve configuration from the registry for discovered children
-     */
-    IopInitDeviceTreeTraverseContext(
-        &Context,
-        DeviceNode,
-        IopActionConfigureChildServices,
-        DeviceNode);
+    /* Create the 'Control' key */
+    RtlInitUnicodeString(&KeyName, L"Control");
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &KeyName,
+                               OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
+                               InstanceKey,
+                               NULL);
+    Status = ZwCreateKey(&ControlKey,
+                         0,
+                         &ObjectAttributes,
+                         0,
+                         NULL,
+                         REG_OPTION_VOLATILE,
+                         NULL);
+    if (NT_SUCCESS(Status))
+        ZwClose(ControlKey);
 
-    Status = IopTraverseDeviceTree(&Context);
-    if (!NT_SUCCESS(Status))
+    /* Create the 'Device Parameters' key and set the 'FirmwareIdentified' value for all ACPI-enumerated devices */
+    if (_wcsnicmp(DeviceNode->InstancePath.Buffer, L"ACPI\\", 5) == 0)
     {
-        DPRINT("IopTraverseDeviceTree() failed with status 0x%08lx\n", Status);
-        return Status;
-    }
-
-    /*
-     * Initialize services for discovered children.
-     */
-    Status = IopInitializePnpServices(DeviceNode);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT("IopInitializePnpServices() failed with status 0x%08lx\n", Status);
-        return Status;
-    }
-
-    DPRINT("IopEnumerateDevice() finished\n");
-    return STATUS_SUCCESS;
-}
-
-
-/*
- * IopActionConfigureChildServices
- *
- * Retrieve configuration for all (direct) child nodes of a parent node.
- *
- * Parameters
- *    DeviceNode
- *       Pointer to device node.
- *    Context
- *       Pointer to parent node to retrieve child node configuration for.
- *
- * Remarks
- *    Any errors that occur are logged instead so that all child services have a chance of beeing
- *    configured.
- */
-
-NTSTATUS
-IopActionConfigureChildServices(PDEVICE_NODE DeviceNode,
-                                PVOID Context)
-{
-   RTL_QUERY_REGISTRY_TABLE QueryTable[3];
-   PDEVICE_NODE ParentDeviceNode;
-   PUNICODE_STRING Service;
-   UNICODE_STRING ClassGUID;
-   NTSTATUS Status;
-   DEVICE_CAPABILITIES DeviceCaps;
-
-   DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context);
-
-   ParentDeviceNode = (PDEVICE_NODE)Context;
-
-   /*
-    * We are called for the parent too, but we don't need to do special
-    * handling for this node
-    */
-   if (DeviceNode == ParentDeviceNode)
-   {
-      DPRINT("Success\n");
-      return STATUS_SUCCESS;
-   }
-
-   /*
-    * Make sure this device node is a direct child of the parent device node
-    * that is given as an argument
-    */
-
-   if (DeviceNode->Parent != ParentDeviceNode)
-   {
-      DPRINT("Skipping 2+ level child\n");
-      return STATUS_SUCCESS;
-   }
-
-   if (!(DeviceNode->Flags & DNF_PROCESSED))
-   {
-       DPRINT1("Child not ready to be configured\n");
-       return STATUS_SUCCESS;
-   }
-
-   if (!(DeviceNode->Flags & (DNF_DISABLED | DNF_STARTED | DNF_ADDED)))
-   {
-      WCHAR RegKeyBuffer[MAX_PATH];
-      UNICODE_STRING RegKey;
-
-      /* Install the service for this if it's in the CDDB */
-      IopInstallCriticalDevice(DeviceNode);
-
-      RegKey.Length = 0;
-      RegKey.MaximumLength = sizeof(RegKeyBuffer);
-      RegKey.Buffer = RegKeyBuffer;
-
-      /*
-       * Retrieve configuration from Enum key
-       */
-
-      Service = &DeviceNode->ServiceName;
-
-      RtlZeroMemory(QueryTable, sizeof(QueryTable));
-      RtlInitUnicodeString(Service, NULL);
-      RtlInitUnicodeString(&ClassGUID, NULL);
-
-      QueryTable[0].Name = L"Service";
-      QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
-      QueryTable[0].EntryContext = Service;
-
-      QueryTable[1].Name = L"ClassGUID";
-      QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT;
-      QueryTable[1].EntryContext = &ClassGUID;
-      QueryTable[1].DefaultType = REG_SZ;
-      QueryTable[1].DefaultData = L"";
-      QueryTable[1].DefaultLength = 0;
-
-      RtlAppendUnicodeToString(&RegKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\");
-      RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath);
-
-      Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE,
-         RegKey.Buffer, QueryTable, NULL, NULL);
-
-      if (!NT_SUCCESS(Status))
-      {
-         /* FIXME: Log the error */
-         DPRINT("Could not retrieve configuration for device %wZ (Status 0x%08x)\n",
-            &DeviceNode->InstancePath, Status);
-         IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED);
-         return STATUS_SUCCESS;
-      }
-
-      if (Service->Buffer == NULL)
-      {
-         if (NT_SUCCESS(IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps)) &&
-             DeviceCaps.RawDeviceOK)
-         {
-            DPRINT("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName);
-
-            DeviceNode->ServiceName.Length = 0;
-            DeviceNode->ServiceName.MaximumLength = 0;
-            DeviceNode->ServiceName.Buffer = NULL;
-         }
-         else if (ClassGUID.Length != 0)
-         {
-            /* Device has a ClassGUID value, but no Service value.
-             * Suppose it is using the NULL driver, so state the
-             * device is started */
-            DPRINT("%wZ is using NULL driver\n", &DeviceNode->InstancePath);
-            IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
-         }
-         else
-         {
-            DeviceNode->Problem = CM_PROB_FAILED_INSTALL;
-            IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED);
-         }
-         return STATUS_SUCCESS;
-      }
-
-      DPRINT("Got Service %S\n", Service->Buffer);
-   }
-
-   return STATUS_SUCCESS;
-}
-
-/*
- * IopActionInitChildServices
- *
- * Initialize the service for all (direct) child nodes of a parent node
- *
- * Parameters
- *    DeviceNode
- *       Pointer to device node.
- *    Context
- *       Pointer to parent node to initialize child node services for.
- *
- * Remarks
- *    If the driver image for a service is not loaded and initialized
- *    it is done here too. Any errors that occur are logged instead so
- *    that all child services have a chance of being initialized.
- */
-
-NTSTATUS
-IopActionInitChildServices(PDEVICE_NODE DeviceNode,
-                           PVOID Context)
-{
-   PDEVICE_NODE ParentDeviceNode;
-   NTSTATUS Status;
-   BOOLEAN BootDrivers = !PnpSystemInit;
-
-   DPRINT("IopActionInitChildServices(%p, %p)\n", DeviceNode, Context);
-
-   ParentDeviceNode = (PDEVICE_NODE)Context;
-
-   /*
-    * We are called for the parent too, but we don't need to do special
-    * handling for this node
-    */
-   if (DeviceNode == ParentDeviceNode)
-   {
-      DPRINT("Success\n");
-      return STATUS_SUCCESS;
-   }
-
-   /*
-    * We don't want to check for a direct child because
-    * this function is called during boot to reinitialize
-    * devices with drivers that couldn't load yet due to
-    * stage 0 limitations (ie can't load from disk yet).
-    */
-
-   if (!(DeviceNode->Flags & DNF_PROCESSED))
-   {
-       DPRINT1("Child not ready to be added\n");
-       return STATUS_SUCCESS;
-   }
-
-   if (IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED) ||
-       IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) ||
-       IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED))
-       return STATUS_SUCCESS;
-
-   if (DeviceNode->ServiceName.Buffer == NULL)
-   {
-      /* We don't need to worry about loading the driver because we're
-       * being driven in raw mode so our parent must be loaded to get here */
-      Status = IopInitializeDevice(DeviceNode, NULL);
-      if (NT_SUCCESS(Status))
-      {
-          Status = IopStartDevice(DeviceNode);
-          if (!NT_SUCCESS(Status))
-          {
-              DPRINT1("IopStartDevice(%wZ) failed with status 0x%08x\n",
-                      &DeviceNode->InstancePath, Status);
-          }
-      }
-   }
-   else
-   {
-      PLDR_DATA_TABLE_ENTRY ModuleObject;
-      PDRIVER_OBJECT DriverObject;
-
-      /* Get existing DriverObject pointer (in case the driver has
-         already been loaded and initialized) */
-      Status = IopGetDriverObject(
-          &DriverObject,
-          &DeviceNode->ServiceName,
-          FALSE);
-
-      if (!NT_SUCCESS(Status))
-      {
-         /* Driver is not initialized, try to load it */
-         Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject);
-
-         if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED)
-         {
-            /* Initialize the driver */
-            Status = IopInitializeDriverModule(DeviceNode, ModuleObject,
-                  &DeviceNode->ServiceName, FALSE, &DriverObject);
-            if (!NT_SUCCESS(Status)) DeviceNode->Problem = CM_PROB_FAILED_DRIVER_ENTRY;
-         }
-         else if (Status == STATUS_DRIVER_UNABLE_TO_LOAD)
-         {
-            DPRINT1("Service '%wZ' is disabled\n", &DeviceNode->ServiceName);
-            DeviceNode->Problem = CM_PROB_DISABLED_SERVICE;
-         }
-         else
-         {
-            DPRINT("IopLoadServiceModule(%wZ) failed with status 0x%08x\n",
-                    &DeviceNode->ServiceName, Status);
-            if (!BootDrivers) DeviceNode->Problem = CM_PROB_DRIVER_FAILED_LOAD;
-         }
-      }
+        RtlInitUnicodeString(&KeyName, L"Device Parameters");
+        InitializeObjectAttributes(&ObjectAttributes,
+                                   &KeyName,
+                                   OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
+                                   InstanceKey,
+                                   NULL);
+        Status = ZwCreateKey(&DeviceParamsKey,
+                             0,
+                             &ObjectAttributes,
+                             0,
+                             NULL,
+                             REG_OPTION_NON_VOLATILE,
+                             NULL);
+        if (NT_SUCCESS(Status))
+        {
+            ULONG FirmwareIdentified = 1;
+            RtlInitUnicodeString(&KeyName, L"FirmwareIdentified");
+            Status = ZwSetValueKey(DeviceParamsKey,
+                                   &KeyName,
+                                   0,
+                                   REG_DWORD,
+                                   &FirmwareIdentified,
+                                   sizeof(FirmwareIdentified));
 
-      /* Driver is loaded and initialized at this point */
-      if (NT_SUCCESS(Status))
-      {
-          /* Initialize the device, including all filters */
-          Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject);
+            ZwClose(DeviceParamsKey);
+        }
+    }
 
-          /* Remove the extra reference */
-          ObDereferenceObject(DriverObject);
-      }
-      else
-      {
-         /*
-          * Don't disable when trying to load only boot drivers
-          */
-         if (!BootDrivers)
-         {
-            IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED);
-         }
-      }
-   }
+    DPRINT("IopSetDeviceInstanceData() done\n");
 
-   return STATUS_SUCCESS;
+    return Status;
 }
 
 /*
- * IopInitializePnpServices
+ * IopGetParentIdPrefix
  *
- * Initialize services for discovered children
+ * Retrieve (or create) a string which identifies a device.
  *
  * Parameters
  *    DeviceNode
- *       Top device node to start initializing services.
+ *        Pointer to device node.
+ *    ParentIdPrefix
+ *        Pointer to the string where is returned the parent node identifier
  *
- * Return Value
- *    Status
+ * Remarks
+ *     If the return code is STATUS_SUCCESS, the ParentIdPrefix string is
+ *     valid and its Buffer field is NULL-terminated. The caller needs to
+ *     to free the string with RtlFreeUnicodeString when it is no longer
+ *     needed.
  */
+
 NTSTATUS
-IopInitializePnpServices(IN PDEVICE_NODE DeviceNode)
+IopGetParentIdPrefix(PDEVICE_NODE DeviceNode,
+                     PUNICODE_STRING ParentIdPrefix)
 {
-   DEVICETREE_TRAVERSE_CONTEXT Context;
+    const UNICODE_STRING EnumKeyPath = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\");
+    ULONG KeyNameBufferLength;
+    PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL;
+    UNICODE_STRING KeyName = {0, 0, NULL};
+    UNICODE_STRING KeyValue;
+    UNICODE_STRING ValueName;
+    HANDLE hKey = NULL;
+    ULONG crc32;
+    NTSTATUS Status;
+
+    /* HACK: As long as some devices have a NULL device
+     * instance path, the following test is required :(
+     */
+    if (DeviceNode->Parent->InstancePath.Length == 0)
+    {
+        DPRINT1("Parent of %wZ has NULL Instance path, please report!\n",
+                &DeviceNode->InstancePath);
+        return STATUS_UNSUCCESSFUL;
+    }
+
+    /* 1. Try to retrieve ParentIdPrefix from registry */
+    KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data) + sizeof(L"12345678&12345678");
+    ParentIdPrefixInformation = ExAllocatePoolWithTag(PagedPool,
+                                                      KeyNameBufferLength + sizeof(UNICODE_NULL),
+                                                      TAG_IO);
+    if (!ParentIdPrefixInformation)
+    {
+        return STATUS_INSUFFICIENT_RESOURCES;
+    }
+
+    KeyName.Length = 0;
+    KeyName.MaximumLength = EnumKeyPath.Length +
+                            DeviceNode->Parent->InstancePath.Length +
+                            sizeof(UNICODE_NULL);
+    KeyName.Buffer = ExAllocatePoolWithTag(PagedPool,
+                                           KeyName.MaximumLength,
+                                           TAG_IO);
+    if (!KeyName.Buffer)
+    {
+        Status = STATUS_INSUFFICIENT_RESOURCES;
+        goto cleanup;
+    }
+
+    RtlCopyUnicodeString(&KeyName, &EnumKeyPath);
+    RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->Parent->InstancePath);
+
+    Status = IopOpenRegistryKeyEx(&hKey, NULL, &KeyName, KEY_QUERY_VALUE | KEY_SET_VALUE);
+    if (!NT_SUCCESS(Status))
+    {
+        goto cleanup;
+    }
+    RtlInitUnicodeString(&ValueName, L"ParentIdPrefix");
+    Status = ZwQueryValueKey(hKey,
+                             &ValueName,
+                             KeyValuePartialInformation,
+                             ParentIdPrefixInformation,
+                             KeyNameBufferLength,
+                             &KeyNameBufferLength);
+    if (NT_SUCCESS(Status))
+    {
+        if (ParentIdPrefixInformation->Type != REG_SZ)
+        {
+            Status = STATUS_UNSUCCESSFUL;
+        }
+        else
+        {
+            KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength;
+            KeyValue.Length = KeyValue.MaximumLength - sizeof(UNICODE_NULL);
+            KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
+            ASSERT(KeyValue.Buffer[KeyValue.Length / sizeof(WCHAR)] == UNICODE_NULL);
+        }
+        goto cleanup;
+    }
+    if (Status != STATUS_OBJECT_NAME_NOT_FOUND)
+    {
+        /* FIXME how do we get here and why is ParentIdPrefixInformation valid? */
+        KeyValue.MaximumLength = (USHORT)ParentIdPrefixInformation->DataLength;
+        KeyValue.Length = KeyValue.MaximumLength - sizeof(UNICODE_NULL);
+        KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
+        ASSERT(KeyValue.Buffer[KeyValue.Length / sizeof(WCHAR)] == UNICODE_NULL);
+        goto cleanup;
+    }
 
-   DPRINT("IopInitializePnpServices(%p)\n", DeviceNode);
+    /* 2. Create the ParentIdPrefix value */
+    crc32 = RtlComputeCrc32(0,
+                            (PUCHAR)DeviceNode->Parent->InstancePath.Buffer,
+                            DeviceNode->Parent->InstancePath.Length);
 
-   IopInitDeviceTreeTraverseContext(
-      &Context,
-      DeviceNode,
-      IopActionInitChildServices,
-      DeviceNode);
+    RtlStringCbPrintfW((PWSTR)ParentIdPrefixInformation,
+                       KeyNameBufferLength,
+                       L"%lx&%lx",
+                       DeviceNode->Parent->Level,
+                       crc32);
+    RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation);
+
+    /* 3. Try to write the ParentIdPrefix to registry */
+    Status = ZwSetValueKey(hKey,
+                           &ValueName,
+                           0,
+                           REG_SZ,
+                           KeyValue.Buffer,
+                           ((ULONG)wcslen(KeyValue.Buffer) + 1) * sizeof(WCHAR));
 
-   return IopTraverseDeviceTree(&Context);
+cleanup:
+    if (NT_SUCCESS(Status))
+    {
+        /* Duplicate the string to return it */
+        Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE,
+                                           &KeyValue,
+                                           ParentIdPrefix);
+    }
+    ExFreePoolWithTag(ParentIdPrefixInformation, TAG_IO);
+    RtlFreeUnicodeString(&KeyName);
+    if (hKey != NULL)
+    {
+        ZwClose(hKey);
+    }
+    return Status;
 }
 
-static NTSTATUS INIT_FUNCTION
+static
+INIT_FUNCTION
+NTSTATUS
 IopEnumerateDetectedDevices(
    IN HANDLE hBaseKey,
    IN PUNICODE_STRING RelativePath OPTIONAL,
@@ -3007,7 +1339,7 @@ IopEnumerateDetectedDevices(
          &ObjectAttributes,
          0,
          NULL,
-         ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0,
+         REG_OPTION_NON_VOLATILE,
          NULL);
       if (!NT_SUCCESS(Status))
       {
@@ -3023,7 +1355,7 @@ IopEnumerateDetectedDevices(
          &ObjectAttributes,
          0,
          NULL,
-         ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0,
+         REG_OPTION_NON_VOLATILE,
          NULL);
       ZwClose(hLevel1Key);
       if (!NT_SUCCESS(Status))
@@ -3120,105 +1452,107 @@ cleanup:
    return Status;
 }
 
-static BOOLEAN INIT_FUNCTION
+static
+INIT_FUNCTION
+BOOLEAN
 IopIsFirmwareMapperDisabled(VOID)
 {
-   UNICODE_STRING KeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CURRENTCONTROLSET\\Control\\Pnp");
-   UNICODE_STRING KeyNameU = RTL_CONSTANT_STRING(L"DisableFirmwareMapper");
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   HANDLE hPnpKey;
-   PKEY_VALUE_PARTIAL_INFORMATION KeyInformation;
-   ULONG DesiredLength, Length;
-   ULONG KeyValue = 0;
-   NTSTATUS Status;
+    UNICODE_STRING KeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CURRENTCONTROLSET\\Control\\Pnp");
+    UNICODE_STRING KeyNameU = RTL_CONSTANT_STRING(L"DisableFirmwareMapper");
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    HANDLE hPnpKey;
+    PKEY_VALUE_PARTIAL_INFORMATION KeyInformation;
+    ULONG DesiredLength, Length;
+    ULONG KeyValue = 0;
+    NTSTATUS Status;
 
-   InitializeObjectAttributes(&ObjectAttributes, &KeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL);
-   Status = ZwOpenKey(&hPnpKey, KEY_QUERY_VALUE, &ObjectAttributes);
-   if (NT_SUCCESS(Status))
-   {
-       Status = ZwQueryValueKey(hPnpKey,
-                                &KeyNameU,
-                                KeyValuePartialInformation,
-                                NULL,
-                                0,
-                                &DesiredLength);
-       if ((Status == STATUS_BUFFER_TOO_SMALL) ||
-           (Status == STATUS_BUFFER_OVERFLOW))
-       {
-           Length = DesiredLength;
-           KeyInformation = ExAllocatePool(PagedPool, Length);
-           if (KeyInformation)
-           {
-               Status = ZwQueryValueKey(hPnpKey,
-                                        &KeyNameU,
-                                        KeyValuePartialInformation,
-                                        KeyInformation,
-                                        Length,
-                                        &DesiredLength);
-               if (NT_SUCCESS(Status) && KeyInformation->DataLength == sizeof(ULONG))
-               {
-                   KeyValue = (ULONG)(*KeyInformation->Data);
-               }
-               else
-               {
-                   DPRINT1("ZwQueryValueKey(%wZ%wZ) failed\n", &KeyPathU, &KeyNameU);
-               }
+    InitializeObjectAttributes(&ObjectAttributes, &KeyPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL);
+    Status = ZwOpenKey(&hPnpKey, KEY_QUERY_VALUE, &ObjectAttributes);
+    if (NT_SUCCESS(Status))
+    {
+        Status = ZwQueryValueKey(hPnpKey,
+                                 &KeyNameU,
+                                 KeyValuePartialInformation,
+                                 NULL,
+                                 0,
+                                 &DesiredLength);
+        if ((Status == STATUS_BUFFER_TOO_SMALL) ||
+            (Status == STATUS_BUFFER_OVERFLOW))
+        {
+            Length = DesiredLength;
+            KeyInformation = ExAllocatePool(PagedPool, Length);
+            if (KeyInformation)
+            {
+                Status = ZwQueryValueKey(hPnpKey,
+                                         &KeyNameU,
+                                         KeyValuePartialInformation,
+                                         KeyInformation,
+                                         Length,
+                                         &DesiredLength);
+                if (NT_SUCCESS(Status) && KeyInformation->DataLength == sizeof(ULONG))
+                {
+                    KeyValue = (ULONG)(*KeyInformation->Data);
+                }
+                else
+                {
+                    DPRINT1("ZwQueryValueKey(%wZ%wZ) failed\n", &KeyPathU, &KeyNameU);
+                }
 
-               ExFreePool(KeyInformation);
-           }
-           else
-           {
-               DPRINT1("Failed to allocate memory for registry query\n");
-           }
-       }
-       else
-       {
-           DPRINT1("ZwQueryValueKey(%wZ%wZ) failed with status 0x%08lx\n", &KeyPathU, &KeyNameU, Status);
-       }
-
-       ZwClose(hPnpKey);
-   }
-   else
-   {
-       DPRINT1("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyPathU, Status);
-   }
+                ExFreePool(KeyInformation);
+            }
+            else
+            {
+                DPRINT1("Failed to allocate memory for registry query\n");
+            }
+        }
+        else
+        {
+            DPRINT1("ZwQueryValueKey(%wZ%wZ) failed with status 0x%08lx\n", &KeyPathU, &KeyNameU, Status);
+        }
+
+        ZwClose(hPnpKey);
+    }
+    else
+    {
+        DPRINT1("ZwOpenKey(%wZ) failed with status 0x%08lx\n", &KeyPathU, Status);
+    }
 
-   DPRINT1("Firmware mapper is %s\n", KeyValue != 0 ? "disabled" : "enabled");
+    DPRINT("Firmware mapper is %s\n", KeyValue != 0 ? "disabled" : "enabled");
 
-   return (KeyValue != 0) ? TRUE : FALSE;
+    return (KeyValue != 0) ? TRUE : FALSE;
 }
 
+INIT_FUNCTION
 NTSTATUS
 NTAPI
-INIT_FUNCTION
 IopUpdateRootKey(VOID)
 {
-   UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum");
-   UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"Root");
-   UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter");
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   HANDLE hEnum, hRoot;
-   NTSTATUS Status;
+    UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum");
+    UNICODE_STRING RootPathU = RTL_CONSTANT_STRING(L"Root");
+    UNICODE_STRING MultiKeyPathU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION\\System\\MultifunctionAdapter");
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    HANDLE hEnum, hRoot;
+    NTSTATUS Status;
 
-   InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL);
-   Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status);
-      return Status;
-   }
+    InitializeObjectAttributes(&ObjectAttributes, &EnumU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, NULL, NULL);
+    Status = ZwCreateKey(&hEnum, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("ZwCreateKey() failed with status 0x%08lx\n", Status);
+        return Status;
+    }
 
-   InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hEnum, NULL);
-   Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, 0, NULL);
-   ZwClose(hEnum);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status);
-      return Status;
-   }
+    InitializeObjectAttributes(&ObjectAttributes, &RootPathU, OBJ_KERNEL_HANDLE | OBJ_CASE_INSENSITIVE, hEnum, NULL);
+    Status = ZwCreateKey(&hRoot, KEY_CREATE_SUB_KEY, &ObjectAttributes, 0, NULL, REG_OPTION_NON_VOLATILE, NULL);
+    ZwClose(hEnum);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("ZwOpenKey() failed with status 0x%08lx\n", Status);
+        return Status;
+    }
 
-   if (!IopIsFirmwareMapperDisabled())
-   {
+    if (!IopIsFirmwareMapperDisabled())
+    {
         Status = IopOpenRegistryKeyEx(&hEnum, NULL, &MultiKeyPathU, KEY_ENUMERATE_SUB_KEYS);
         if (!NT_SUCCESS(Status))
         {
@@ -3235,16 +1569,16 @@ IopUpdateRootKey(VOID)
             NULL,
             0);
         ZwClose(hEnum);
-   }
-   else
-   {
+    }
+    else
+    {
         /* Enumeration is disabled */
         Status = STATUS_SUCCESS;
-   }
+    }
 
-   ZwClose(hRoot);
+    ZwClose(hRoot);
 
-   return Status;
+    return Status;
 }
 
 NTSTATUS
@@ -3290,11 +1624,11 @@ IopCreateRegistryKeyEx(OUT PHANDLE Handle,
     UNICODE_STRING KeyString;
     NTSTATUS Status = STATUS_SUCCESS;
     PAGED_CODE();
-    
+
     /* P1 is start, pp is end */
     p1 = KeyName->Buffer;
     pp = (PVOID)((ULONG_PTR)p1 + KeyName->Length);
-    
+
     /* Create the target key */
     InitializeObjectAttributes(&ObjectAttributes,
                                KeyName,
@@ -3315,31 +1649,31 @@ IopCreateRegistryKeyEx(OUT PHANDLE Handle,
         /* Target key failed, so we'll need to create its parent. Setup array */
         HandleArray[0] = NULL;
         HandleArray[1] = RootHandle;
-        
+
         /* Keep recursing for each missing parent */
         while (Recursing)
         {
             /* And if we're deep enough, close the last handle */
             if (NestedCloseLevel > 1) ZwClose(HandleArray[RootHandleIndex]);
+
             /* We're setup to ping-pong between the two handle array entries */
             RootHandleIndex = i;
             i = (i + 1) & 1;
-            
+
             /* Clear the one we're attempting to open now */
             HandleArray[i] = NULL;
-            
+
             /* Process the parent key name */
             for (p = p1; ((p < pp) && (*p != OBJ_NAME_PATH_SEPARATOR)); p++);
             Length = (USHORT)(p - p1) * sizeof(WCHAR);
-            
+
             /* Is there a parent name? */
             if (Length)
             {
                 /* Build the unicode string for it */
                 KeyString.Buffer = p1;
                 KeyString.Length = KeyString.MaximumLength = Length;
-                
+
                 /* Now try opening the parent */
                 InitializeObjectAttributes(&ObjectAttributes,
                                            &KeyString,
@@ -3372,7 +1706,7 @@ IopCreateRegistryKeyEx(OUT PHANDLE Handle,
                 Recursing = FALSE;
                 continue;
             }
-            
+
             /* Now see if there's more parents to create */
             p1 = p + 1;
             if ((p == pp) || (p1 == pp))
@@ -3381,11 +1715,11 @@ IopCreateRegistryKeyEx(OUT PHANDLE Handle,
                 Recursing = FALSE;
             }
         }
-        
+
         /* Outer loop check for handle nesting that requires closing the top handle */
         if (NestedCloseLevel > 1) ZwClose(HandleArray[RootHandleIndex]);
     }
-    
+
     /* Check if we broke out of the loop due to success */
     if (NT_SUCCESS(Status))
     {
@@ -3393,7 +1727,7 @@ IopCreateRegistryKeyEx(OUT PHANDLE Handle,
         *Handle = HandleArray[i];
         if (Disposition) *Disposition = KeyDisposition;
     }
-    
+
     /* Return the success state */
     return Status;
 }
@@ -3530,49 +1864,6 @@ PpInitSystem(VOID)
     }
 }
 
-LONG IopNumberDeviceNodes;
-
-PDEVICE_NODE
-NTAPI
-PipAllocateDeviceNode(IN PDEVICE_OBJECT PhysicalDeviceObject)
-{
-    PDEVICE_NODE DeviceNode;
-    PAGED_CODE();
-    
-    /* Allocate it */
-    DeviceNode = ExAllocatePoolWithTag(NonPagedPool, sizeof(DEVICE_NODE), 'donD');
-    if (!DeviceNode) return DeviceNode;
-    
-    /* Statistics */
-    InterlockedIncrement(&IopNumberDeviceNodes);
-    
-    /* Set it up */
-    RtlZeroMemory(DeviceNode, sizeof(DEVICE_NODE));
-    DeviceNode->InterfaceType = InterfaceTypeUndefined;
-    DeviceNode->BusNumber = -1;
-    DeviceNode->ChildInterfaceType = InterfaceTypeUndefined;
-    DeviceNode->ChildBusNumber = -1;
-    DeviceNode->ChildBusTypeIndex = -1;
-//    KeInitializeEvent(&DeviceNode->EnumerationMutex, SynchronizationEvent, TRUE);
-    InitializeListHead(&DeviceNode->DeviceArbiterList);
-    InitializeListHead(&DeviceNode->DeviceTranslatorList);
-    InitializeListHead(&DeviceNode->TargetDeviceNotify);
-    InitializeListHead(&DeviceNode->DockInfo.ListEntry);
-    InitializeListHead(&DeviceNode->PendedSetInterfaceState);
-    
-    /* Check if there is a PDO */
-    if (PhysicalDeviceObject)
-    {
-        /* Link it and remove the init flag */
-        DeviceNode->PhysicalDeviceObject = PhysicalDeviceObject;
-        ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode = DeviceNode;
-        PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
-    }
-    
-    /* Return the node */
-    return DeviceNode;
-}
-
 /* PUBLIC FUNCTIONS **********************************************************/
 
 NTSTATUS
@@ -3584,7 +1875,7 @@ PnpBusTypeGuidGet(IN USHORT Index,
 
     /* Acquire the lock */
     ExAcquireFastMutex(&PnpBusTypeGuidList->Lock);
-    
+
     /* Validate size */
     if (Index < PnpBusTypeGuidList->GuidCount)
     {
@@ -3596,7 +1887,7 @@ PnpBusTypeGuidGet(IN USHORT Index,
         /* Failure path */
         Status = STATUS_OBJECT_NAME_NOT_FOUND;
     }
-    
+
     /* Release lock and return status */
     ExReleaseFastMutex(&PnpBusTypeGuidList->Lock);
     return Status;
@@ -3613,14 +1904,14 @@ PnpDeviceObjectToDeviceInstance(IN PDEVICE_OBJECT DeviceObject,
     PDEVICE_NODE DeviceNode;
     UNICODE_STRING KeyName = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CURRENTCONTROLSET\\ENUM");
     PAGED_CODE();
-   
+
     /* Open the enum key */
     Status = IopOpenRegistryKeyEx(&KeyHandle,
                                   NULL,
                                   &KeyName,
                                   KEY_READ);
     if (!NT_SUCCESS(Status)) return Status;
-    
+
     /* Make sure we have an instance path */
     DeviceNode = IopGetDeviceNode(DeviceObject);
     if ((DeviceNode) && (DeviceNode->InstancePath.Length))
@@ -3636,7 +1927,7 @@ PnpDeviceObjectToDeviceInstance(IN PDEVICE_OBJECT DeviceObject,
         /* Fail */
         Status = STATUS_INVALID_DEVICE_REQUEST;
     }
-    
+
     /* Close the handle and return status */
     ZwClose(KeyHandle);
     return Status;
@@ -3649,13 +1940,13 @@ PnpDetermineResourceListSize(IN PCM_RESOURCE_LIST ResourceList)
     ULONG FinalSize, PartialSize, EntrySize, i, j;
     PCM_FULL_RESOURCE_DESCRIPTOR FullDescriptor;
     PCM_PARTIAL_RESOURCE_DESCRIPTOR PartialDescriptor;
-    
+
     /* If we don't have one, that's easy */
     if (!ResourceList) return 0;
-    
+
     /* Start with the minimum size possible */
     FinalSize = FIELD_OFFSET(CM_RESOURCE_LIST, List);
-    
+
     /* Loop each full descriptor */
     FullDescriptor = ResourceList->List;
     for (i = 0; i < ResourceList->Count; i++)
@@ -3663,35 +1954,35 @@ PnpDetermineResourceListSize(IN PCM_RESOURCE_LIST ResourceList)
         /* Start with the minimum size possible */
         PartialSize = FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList) +
         FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors);
-        
+
         /* Loop each partial descriptor */
         PartialDescriptor = FullDescriptor->PartialResourceList.PartialDescriptors;
         for (j = 0; j < FullDescriptor->PartialResourceList.Count; j++)
         {
             /* Start with the minimum size possible */
             EntrySize = sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-            
+
             /* Check if there is extra data */
             if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific)
             {
                 /* Add that data */
                 EntrySize += PartialDescriptor->u.DeviceSpecificData.DataSize;
             }
-            
+
             /* The size of partial descriptors is bigger */
             PartialSize += EntrySize;
-            
+
             /* Go to the next partial descriptor */
             PartialDescriptor = (PVOID)((ULONG_PTR)PartialDescriptor + EntrySize);
         }
-        
+
         /* The size of full descriptors is bigger */
         FinalSize += PartialSize;
-        
+
         /* Go to the next full descriptor */
         FullDescriptor = (PVOID)((ULONG_PTR)FullDescriptor + PartialSize);
     }
-    
+
     /* Return the final size */
     return FinalSize;
 }
@@ -3804,6 +2095,7 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
     GUID BusTypeGuid;
     POBJECT_NAME_INFORMATION ObjectNameInfo = NULL;
     BOOLEAN NullTerminate = FALSE;
+    DEVICE_REMOVAL_POLICY Policy;
 
     DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty);
 
@@ -3824,34 +2116,34 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
 
             /* This is the format of the returned data */
             PIP_RETURN_DATA(sizeof(GUID), &BusTypeGuid);
-            
+
         case DevicePropertyLegacyBusType:
-        
+
             /* Validate correct interface type */
             if (DeviceNode->ChildInterfaceType == InterfaceTypeUndefined)
                 return STATUS_OBJECT_NAME_NOT_FOUND;
 
             /* This is the format of the returned data */
             PIP_RETURN_DATA(sizeof(INTERFACE_TYPE), &DeviceNode->ChildInterfaceType);
-            
+
         case DevicePropertyBusNumber:
-        
+
             /* Validate correct bus number */
             if ((DeviceNode->ChildBusNumber & 0x80000000) == 0x80000000)
                 return STATUS_OBJECT_NAME_NOT_FOUND;
-            
+
             /* This is the format of the returned data */
             PIP_RETURN_DATA(sizeof(ULONG), &DeviceNode->ChildBusNumber);
-            
+
         case DevicePropertyEnumeratorName:
 
             /* Get the instance path */
             DeviceInstanceName = DeviceNode->InstancePath.Buffer;
-            
+
             /* Sanity checks */
             ASSERT((BufferLength & 1) == 0);
             ASSERT(DeviceInstanceName != NULL);
-            
+
             /* Get the name from the path */
             EnumeratorNameEnd = wcschr(DeviceInstanceName, OBJ_NAME_PATH_SEPARATOR);
             ASSERT(EnumeratorNameEnd);
@@ -3862,7 +2154,7 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
             /* This is the format of the returned data */
             PIP_RETURN_DATA((ULONG)(EnumeratorNameEnd - DeviceInstanceName) * sizeof(WCHAR),
                             DeviceInstanceName);
-            
+
         case DevicePropertyAddress:
 
             /* Query the device caps */
@@ -3872,9 +2164,9 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
 
             /* This is the format of the returned data */
             PIP_RETURN_DATA(sizeof(ULONG), &DeviceCaps.Address);
-           
+
         case DevicePropertyBootConfigurationTranslated:
-        
+
             /* Validate we have resources */
             if (!DeviceNode->BootResources)
 //            if (!DeviceNode->BootResourcesTranslated) // FIXFIX: Need this field
@@ -3883,21 +2175,21 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
                 *ResultLength = 0;
                 return STATUS_SUCCESS;
             }
-            
+
             /* This is the format of the returned data */
             PIP_RETURN_DATA(PnpDetermineResourceListSize(DeviceNode->BootResources), // FIXFIX: Should use BootResourcesTranslated
                             DeviceNode->BootResources); // FIXFIX: Should use BootResourcesTranslated
 
         case DevicePropertyPhysicalDeviceObjectName:
-            
+
             /* Sanity check for Unicode-sized string */
             ASSERT((BufferLength & 1) == 0);
-            
+
             /* Allocate name buffer */
             Length = BufferLength + sizeof(OBJECT_NAME_INFORMATION);
             ObjectNameInfo = ExAllocatePool(PagedPool, Length);
             if (!ObjectNameInfo) return STATUS_INSUFFICIENT_RESOURCES;
-        
+
             /* Query the PDO name */
             Status = ObQueryNameString(DeviceObject,
                                        ObjectNameInfo,
@@ -3919,7 +2211,12 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
             /* Let the caller know how big the name is */
             *ResultLength -= sizeof(OBJECT_NAME_INFORMATION);
             break;
-        
+
+        case DevicePropertyRemovalPolicy:
+
+            Policy = DeviceNode->RemovalPolicy;
+            PIP_RETURN_DATA(sizeof(Policy), &Policy);
+
         /* Handle the registry-based properties */
         case DevicePropertyUINumber:
             PIP_REGISTRY_DATA(REGSTR_VAL_UI_NUMBER, REG_DWORD);
@@ -3946,10 +2243,10 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
         case DevicePropertyContainerID:
             //PIP_REGISTRY_DATA(REGSTR_VAL_CONTAINERID, REG_SZ); // Win7
             PIP_UNIMPLEMENTED();
-        case DevicePropertyRemovalPolicy:
-            PIP_UNIMPLEMENTED();
+            break;
         case DevicePropertyInstallState:
-            PIP_UNIMPLEMENTED();
+            PIP_REGISTRY_DATA(REGSTR_VAL_CONFIGFLAGS, REG_DWORD);
+            break;
         case DevicePropertyResourceRequirements:
             PIP_UNIMPLEMENTED();
         case DevicePropertyAllocatedResources:
@@ -3957,13 +2254,13 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
         default:
             return STATUS_INVALID_PARAMETER_2;
     }
-    
+
     /* Having a registry value name implies registry data */
     if (ValueName)
     {
         /* We know up-front how much data to expect */
         *ResultLength = BufferLength;
-        
+
         /* Go get the data, use the LogConf subkey if necessary */
         Status = PiGetDeviceRegistryProperty(DeviceObject,
                                              ValueType,
@@ -3972,153 +2269,37 @@ IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
                                               DevicePropertyBootConfiguration) ?
                                              L"LogConf":  NULL,
                                              PropertyBuffer,
-                                             ResultLength);
-    }
-    else if (NT_SUCCESS(Status))
-    {
-        /* We know up-front how much data to expect, check the caller's buffer */
-        *ResultLength = ReturnLength + (NullTerminate ? sizeof(UNICODE_NULL) : 0);
-        if (*ResultLength <= BufferLength)
-        {
-            /* Buffer is all good, copy the data */
-            RtlCopyMemory(PropertyBuffer, Data, ReturnLength);
-
-            /* Check if we need to NULL-terminate the string */
-            if (NullTerminate)
-            {
-                /* Terminate the string */
-                ((PWCHAR)PropertyBuffer)[ReturnLength / sizeof(WCHAR)] = UNICODE_NULL;
-            }
-        
-            /* This is the success path */
-            Status = STATUS_SUCCESS;
-        }
-        else
-        {
-            /* Failure path */
-            Status = STATUS_BUFFER_TOO_SMALL;
-        }
-    }
-    
-    /* Free any allocation we may have made, and return the status code */
-    if (ObjectNameInfo) ExFreePool(ObjectNameInfo);
-    return Status;
-}
-
-/*
- * @implemented
- */
-VOID
-NTAPI
-IoInvalidateDeviceState(IN PDEVICE_OBJECT PhysicalDeviceObject)
-{
-    PDEVICE_NODE DeviceNode = IopGetDeviceNode(PhysicalDeviceObject);
-    IO_STACK_LOCATION Stack;
-    ULONG PnPFlags;
-    NTSTATUS Status;
-    IO_STATUS_BLOCK IoStatusBlock;
-    
-    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
-    Stack.MajorFunction = IRP_MJ_PNP;
-    Stack.MinorFunction = IRP_MN_QUERY_PNP_DEVICE_STATE;
-    
-    Status = IopSynchronousCall(PhysicalDeviceObject, &Stack, (PVOID*)&PnPFlags);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("IRP_MN_QUERY_PNP_DEVICE_STATE failed with status 0x%x\n", Status);
-        return;
-    }
-
-    if (PnPFlags & PNP_DEVICE_NOT_DISABLEABLE)
-        DeviceNode->UserFlags |= DNUF_NOT_DISABLEABLE;
-    else
-        DeviceNode->UserFlags &= ~DNUF_NOT_DISABLEABLE;
-
-    if (PnPFlags & PNP_DEVICE_DONT_DISPLAY_IN_UI)
-        DeviceNode->UserFlags |= DNUF_DONT_SHOW_IN_UI;
-    else
-        DeviceNode->UserFlags &= ~DNUF_DONT_SHOW_IN_UI;
-
-    if ((PnPFlags & PNP_DEVICE_REMOVED) ||
-        ((PnPFlags & PNP_DEVICE_FAILED) && !(PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED)))
-    {
-        /* Flag it if it's failed */
-        if (PnPFlags & PNP_DEVICE_FAILED) DeviceNode->Problem = CM_PROB_FAILED_POST_START;
-
-        /* Send removal IRPs to all of its children */
-        IopPrepareDeviceForRemoval(PhysicalDeviceObject, TRUE);
-
-        /* Send surprise removal */
-        IopSendSurpriseRemoval(PhysicalDeviceObject);
-        
-        /* Tell the user-mode PnP manager that a device was removed */
-        IopQueueTargetDeviceEvent(&GUID_DEVICE_SURPRISE_REMOVAL,
-                                  &DeviceNode->InstancePath);
-        
-        IopSendRemoveDevice(PhysicalDeviceObject);
+                                             ResultLength);
     }
-    else if ((PnPFlags & PNP_DEVICE_FAILED) && (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED))
+    else if (NT_SUCCESS(Status))
     {
-        /* Stop for resource rebalance */
-        Status = IopStopDevice(DeviceNode);
-        if (!NT_SUCCESS(Status))
+        /* We know up-front how much data to expect, check the caller's buffer */
+        *ResultLength = ReturnLength + (NullTerminate ? sizeof(UNICODE_NULL) : 0);
+        if (*ResultLength <= BufferLength)
         {
-            DPRINT1("Failed to stop device for rebalancing\n");
+            /* Buffer is all good, copy the data */
+            RtlCopyMemory(PropertyBuffer, Data, ReturnLength);
 
-            /* Stop failed so don't rebalance */
-            PnPFlags &= ~PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED;
-        }
-    }
-    
-    /* Resource rebalance */
-    if (PnPFlags & PNP_DEVICE_RESOURCE_REQUIREMENTS_CHANGED)
-    {
-        DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n");
-    
-        Status = IopInitiatePnpIrp(PhysicalDeviceObject,
-                                   &IoStatusBlock,
-                                   IRP_MN_QUERY_RESOURCES,
-                                   NULL);
-        if (NT_SUCCESS(Status) && IoStatusBlock.Information)
-        {
-            DeviceNode->BootResources =
-            (PCM_RESOURCE_LIST)IoStatusBlock.Information;
-            IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG);
-        }
-        else
-        {
-            DPRINT("IopInitiatePnpIrp() failed (Status %x) or IoStatusBlock.Information=NULL\n", Status);
-            DeviceNode->BootResources = NULL;
-        }
-    
-        DPRINT("Sending IRP_MN_QUERY_RESOURCE_REQUIREMENTS to device stack\n");
-    
-        Status = IopInitiatePnpIrp(PhysicalDeviceObject,
-                                   &IoStatusBlock,
-                                   IRP_MN_QUERY_RESOURCE_REQUIREMENTS,
-                                   NULL);
-        if (NT_SUCCESS(Status))
-        {
-            DeviceNode->ResourceRequirements =
-            (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information;
+            /* Check if we need to NULL-terminate the string */
+            if (NullTerminate)
+            {
+                /* Terminate the string */
+                ((PWCHAR)PropertyBuffer)[ReturnLength / sizeof(WCHAR)] = UNICODE_NULL;
+            }
+
+            /* This is the success path */
+            Status = STATUS_SUCCESS;
         }
         else
         {
-            DPRINT("IopInitiatePnpIrp() failed (Status %08lx)\n", Status);
-            DeviceNode->ResourceRequirements = NULL;
-        }
-        
-        /* IRP_MN_FILTER_RESOURCE_REQUIREMENTS is called indirectly by IopStartDevice */
-        if (IopStartDevice(DeviceNode) != STATUS_SUCCESS)
-        {
-            DPRINT1("Restart after resource rebalance failed\n");
-
-            DeviceNode->Flags &= ~(DNF_STARTED | DNF_START_REQUEST_PENDING);
-            DeviceNode->Flags |= DNF_START_FAILED;
-
-            IopRemoveDevice(DeviceNode);
+            /* Failure path */
+            Status = STATUS_BUFFER_TOO_SMALL;
         }
     }
+
+    /* Free any allocation we may have made, and return the status code */
+    if (ObjectNameInfo) ExFreePool(ObjectNameInfo);
+    return Status;
 }
 
 /**
@@ -4143,516 +2324,147 @@ IoOpenDeviceRegistryKey(IN PDEVICE_OBJECT DeviceObject,
                         IN ACCESS_MASK DesiredAccess,
                         OUT PHANDLE DevInstRegKey)
 {
-   static WCHAR RootKeyName[] =
-      L"\\Registry\\Machine\\System\\CurrentControlSet\\";
-   static WCHAR ProfileKeyName[] =
-      L"Hardware Profiles\\Current\\System\\CurrentControlSet\\";
-   static WCHAR ClassKeyName[] = L"Control\\Class\\";
-   static WCHAR EnumKeyName[] = L"Enum\\";
-   static WCHAR DeviceParametersKeyName[] = L"Device Parameters";
-   ULONG KeyNameLength;
-   LPWSTR KeyNameBuffer;
-   UNICODE_STRING KeyName;
-   ULONG DriverKeyLength;
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   PDEVICE_NODE DeviceNode = NULL;
-   NTSTATUS Status;
-
-   DPRINT("IoOpenDeviceRegistryKey() called\n");
-
-   if ((DevInstKeyType & (PLUGPLAY_REGKEY_DEVICE | PLUGPLAY_REGKEY_DRIVER)) == 0)
-   {
-       DPRINT1("IoOpenDeviceRegistryKey(): got wrong params, exiting... \n");
-       return STATUS_INVALID_PARAMETER;
-   }
-
-   if (!IopIsValidPhysicalDeviceObject(DeviceObject))
-       return STATUS_INVALID_DEVICE_REQUEST;
-   DeviceNode = IopGetDeviceNode(DeviceObject);
-
-   /*
-    * Calculate the length of the base key name. This is the full
-    * name for driver key or the name excluding "Device Parameters"
-    * subkey for device key.
-    */
-
-   KeyNameLength = sizeof(RootKeyName);
-   if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE)
-      KeyNameLength += sizeof(ProfileKeyName) - sizeof(UNICODE_NULL);
-   if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER)
-   {
-      KeyNameLength += sizeof(ClassKeyName) - sizeof(UNICODE_NULL);
-      Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName,
-                                   0, NULL, &DriverKeyLength);
-      if (Status != STATUS_BUFFER_TOO_SMALL)
-         return Status;
-      KeyNameLength += DriverKeyLength;
-   }
-   else
-   {
-      KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) +
-                       DeviceNode->InstancePath.Length;
-   }
-
-   /*
-    * Now allocate the buffer for the key name...
-    */
-
-   KeyNameBuffer = ExAllocatePool(PagedPool, KeyNameLength);
-   if (KeyNameBuffer == NULL)
-      return STATUS_INSUFFICIENT_RESOURCES;
-
-   KeyName.Length = 0;
-   KeyName.MaximumLength = (USHORT)KeyNameLength;
-   KeyName.Buffer = KeyNameBuffer;
-
-   /*
-    * ...and build the key name.
-    */
-
-   KeyName.Length += sizeof(RootKeyName) - sizeof(UNICODE_NULL);
-   RtlCopyMemory(KeyNameBuffer, RootKeyName, KeyName.Length);
-
-   if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE)
-      RtlAppendUnicodeToString(&KeyName, ProfileKeyName);
-
-   if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER)
-   {
-      RtlAppendUnicodeToString(&KeyName, ClassKeyName);
-      Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName,
-                                   DriverKeyLength, KeyNameBuffer +
-                                   (KeyName.Length / sizeof(WCHAR)),
-                                   &DriverKeyLength);
-      if (!NT_SUCCESS(Status))
-      {
-         DPRINT1("Call to IoGetDeviceProperty() failed with Status 0x%08lx\n", Status);
-         ExFreePool(KeyNameBuffer);
-         return Status;
-      }
-      KeyName.Length += (USHORT)DriverKeyLength - sizeof(UNICODE_NULL);
-   }
-   else
-   {
-      RtlAppendUnicodeToString(&KeyName, EnumKeyName);
-      Status = RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->InstancePath);
-      if (DeviceNode->InstancePath.Length == 0)
-      {
-         ExFreePool(KeyNameBuffer);
-         return Status;
-      }
-   }
-
-   /*
-    * Open the base key.
-    */
-   Status = IopOpenRegistryKeyEx(DevInstRegKey, NULL, &KeyName, DesiredAccess);
-   if (!NT_SUCCESS(Status))
-   {
-      DPRINT1("IoOpenDeviceRegistryKey(%wZ): Base key doesn't exist, exiting... (Status 0x%08lx)\n", &KeyName, Status);
-      ExFreePool(KeyNameBuffer);
-      return Status;
-   }
-   ExFreePool(KeyNameBuffer);
-
-   /*
-    * For driver key we're done now.
-    */
-
-   if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER)
-      return Status;
-
-   /*
-    * Let's go further. For device key we must open "Device Parameters"
-    * subkey and create it if it doesn't exist yet.
-    */
-
-   RtlInitUnicodeString(&KeyName, DeviceParametersKeyName);
-   InitializeObjectAttributes(&ObjectAttributes, &KeyName,
-                              OBJ_CASE_INSENSITIVE, *DevInstRegKey, NULL);
-   Status = ZwCreateKey(DevInstRegKey, DesiredAccess, &ObjectAttributes,
-                        0, NULL, ExpInTextModeSetup ? REG_OPTION_VOLATILE : 0, NULL);
-   ZwClose(ObjectAttributes.RootDirectory);
+    static WCHAR RootKeyName[] =
+        L"\\Registry\\Machine\\System\\CurrentControlSet\\";
+    static WCHAR ProfileKeyName[] =
+        L"Hardware Profiles\\Current\\System\\CurrentControlSet\\";
+    static WCHAR ClassKeyName[] = L"Control\\Class\\";
+    static WCHAR EnumKeyName[] = L"Enum\\";
+    static WCHAR DeviceParametersKeyName[] = L"Device Parameters";
+    ULONG KeyNameLength;
+    PWSTR KeyNameBuffer;
+    UNICODE_STRING KeyName;
+    ULONG DriverKeyLength;
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    PDEVICE_NODE DeviceNode = NULL;
+    NTSTATUS Status;
 
-   return Status;
-}
+    DPRINT("IoOpenDeviceRegistryKey() called\n");
 
-static
-NTSTATUS
-IopQueryRemoveChildDevices(PDEVICE_NODE ParentDeviceNode, BOOLEAN Force)
-{
-    PDEVICE_NODE ChildDeviceNode, NextDeviceNode, FailedRemoveDevice;
-    NTSTATUS Status;
-    KIRQL OldIrql;
-    
-    KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-    ChildDeviceNode = ParentDeviceNode->Child;
-    while (ChildDeviceNode != NULL)
-    {
-        NextDeviceNode = ChildDeviceNode->Sibling;
-        KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-        
-        Status = IopPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject, Force);
-        if (!NT_SUCCESS(Status))
-        {
-            FailedRemoveDevice = ChildDeviceNode;
-            goto cleanup;
-        }
-        
-        KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-        ChildDeviceNode = NextDeviceNode;
-    }
-    KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-    
-    return STATUS_SUCCESS;
-    
-cleanup:
-    KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-    ChildDeviceNode = ParentDeviceNode->Child;
-    while (ChildDeviceNode != NULL)
+    if ((DevInstKeyType & (PLUGPLAY_REGKEY_DEVICE | PLUGPLAY_REGKEY_DRIVER)) == 0)
     {
-        NextDeviceNode = ChildDeviceNode->Sibling;
-        KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-        
-        IopCancelPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject);
-        
-        /* IRP_MN_CANCEL_REMOVE_DEVICE is also sent to the device
-         * that failed the IRP_MN_QUERY_REMOVE_DEVICE request */
-        if (ChildDeviceNode == FailedRemoveDevice)
-            return Status;
-        
-        ChildDeviceNode = NextDeviceNode;
-        
-        KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
+        DPRINT1("IoOpenDeviceRegistryKey(): got wrong params, exiting... \n");
+        return STATUS_INVALID_PARAMETER;
     }
-    KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-    
-    return Status;
-}
 
-static
-VOID
-IopSendRemoveChildDevices(PDEVICE_NODE ParentDeviceNode)
-{
-    PDEVICE_NODE ChildDeviceNode, NextDeviceNode;
-    KIRQL OldIrql;
-    
-    KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-    ChildDeviceNode = ParentDeviceNode->Child;
-    while (ChildDeviceNode != NULL)
-    {
-        NextDeviceNode = ChildDeviceNode->Sibling;
-        KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-        
-        IopSendRemoveDevice(ChildDeviceNode->PhysicalDeviceObject);
-        
-        ChildDeviceNode = NextDeviceNode;
-        
-        KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-    }
-    KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-}
+    if (!IopIsValidPhysicalDeviceObject(DeviceObject))
+        return STATUS_INVALID_DEVICE_REQUEST;
+    DeviceNode = IopGetDeviceNode(DeviceObject);
 
-static
-VOID
-IopCancelRemoveChildDevices(PDEVICE_NODE ParentDeviceNode)
-{
-    PDEVICE_NODE ChildDeviceNode, NextDeviceNode;
-    KIRQL OldIrql;
-    
-    KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-    ChildDeviceNode = ParentDeviceNode->Child;
-    while (ChildDeviceNode != NULL)
-    {
-        NextDeviceNode = ChildDeviceNode->Sibling;
-        KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-        
-        IopCancelPrepareDeviceForRemoval(ChildDeviceNode->PhysicalDeviceObject);
-        
-        ChildDeviceNode = NextDeviceNode;
-        
-        KeAcquireSpinLock(&IopDeviceTreeLock, &OldIrql);
-    }
-    KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
-}
+    /*
+     * Calculate the length of the base key name. This is the full
+     * name for driver key or the name excluding "Device Parameters"
+     * subkey for device key.
+     */
 
-static
-NTSTATUS
-IopQueryRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations, BOOLEAN Force)
-{
-    /* This function DOES NOT dereference the device objects on SUCCESS
-     * but it DOES dereference device objects on FAILURE */
-    
-    ULONG i, j;
-    NTSTATUS Status;
-    
-    for (i = 0; i < DeviceRelations->Count; i++)
-    {
-        Status = IopPrepareDeviceForRemoval(DeviceRelations->Objects[i], Force);
-        if (!NT_SUCCESS(Status))
-        {
-            j = i;
-            goto cleanup;
-        }
-    }
-    
-    return STATUS_SUCCESS;
-    
-cleanup:
-    /* IRP_MN_CANCEL_REMOVE_DEVICE is also sent to the device
-     * that failed the IRP_MN_QUERY_REMOVE_DEVICE request */
-    for (i = 0; i <= j; i++)
+    KeyNameLength = sizeof(RootKeyName);
+    if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE)
+        KeyNameLength += sizeof(ProfileKeyName) - sizeof(UNICODE_NULL);
+    if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER)
     {
-        IopCancelPrepareDeviceForRemoval(DeviceRelations->Objects[i]);
-        ObDereferenceObject(DeviceRelations->Objects[i]);
-        DeviceRelations->Objects[i] = NULL;
+        KeyNameLength += sizeof(ClassKeyName) - sizeof(UNICODE_NULL);
+        Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName,
+                                     0, NULL, &DriverKeyLength);
+        if (Status != STATUS_BUFFER_TOO_SMALL)
+            return Status;
+        KeyNameLength += DriverKeyLength;
     }
-    for (; i < DeviceRelations->Count; i++)
+    else
     {
-        ObDereferenceObject(DeviceRelations->Objects[i]);
-        DeviceRelations->Objects[i] = NULL;
+        KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) +
+                         DeviceNode->InstancePath.Length;
     }
-    ExFreePool(DeviceRelations);
-    
-    return Status;
-}
 
-static
-VOID
-IopSendRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations)
-{
-    /* This function DOES dereference the device objects in all cases */
-    
-    ULONG i;
-    
-    for (i = 0; i < DeviceRelations->Count; i++)
-    {
-        IopSendRemoveDevice(DeviceRelations->Objects[i]);
-        ObDereferenceObject(DeviceRelations->Objects[i]);
-        DeviceRelations->Objects[i] = NULL;
-    }
-    
-    ExFreePool(DeviceRelations);
-}
+    /*
+     * Now allocate the buffer for the key name...
+     */
 
-static
-VOID
-IopCancelRemoveDeviceRelations(PDEVICE_RELATIONS DeviceRelations)
-{
-    /* This function DOES dereference the device objects in all cases */
-    
-    ULONG i;
-    
-    for (i = 0; i < DeviceRelations->Count; i++)
-    {
-        IopCancelPrepareDeviceForRemoval(DeviceRelations->Objects[i]);
-        ObDereferenceObject(DeviceRelations->Objects[i]);
-        DeviceRelations->Objects[i] = NULL;
-    }
-    
-    ExFreePool(DeviceRelations);
-}
+    KeyNameBuffer = ExAllocatePool(PagedPool, KeyNameLength);
+    if (KeyNameBuffer == NULL)
+        return STATUS_INSUFFICIENT_RESOURCES;
 
-VOID
-IopCancelPrepareDeviceForRemoval(PDEVICE_OBJECT DeviceObject)
-{
-    IO_STACK_LOCATION Stack;
-    IO_STATUS_BLOCK IoStatusBlock;
-    PDEVICE_RELATIONS DeviceRelations;
-    NTSTATUS Status;
-    
-    IopCancelRemoveDevice(DeviceObject);
-    
-    Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations;
-    
-    Status = IopInitiatePnpIrp(DeviceObject,
-                               &IoStatusBlock,
-                               IRP_MN_QUERY_DEVICE_RELATIONS,
-                               &Stack);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status);
-        DeviceRelations = NULL;
-    }
-    else
-    {
-        DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information;
-    }
-    
-    if (DeviceRelations)
-        IopCancelRemoveDeviceRelations(DeviceRelations);
-}
+    KeyName.Length = 0;
+    KeyName.MaximumLength = (USHORT)KeyNameLength;
+    KeyName.Buffer = KeyNameBuffer;
 
-NTSTATUS
-IopPrepareDeviceForRemoval(IN PDEVICE_OBJECT DeviceObject, BOOLEAN Force)
-{
-    PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject);
-    IO_STACK_LOCATION Stack;
-    IO_STATUS_BLOCK IoStatusBlock;
-    PDEVICE_RELATIONS DeviceRelations;
-    NTSTATUS Status;
+    /*
+     * ...and build the key name.
+     */
 
-    if ((DeviceNode->UserFlags & DNUF_NOT_DISABLEABLE) && !Force)
-    {
-        DPRINT1("Removal not allowed for %wZ\n", &DeviceNode->InstancePath);
-        return STATUS_UNSUCCESSFUL;
-    }
-    
-    if (!Force && IopQueryRemoveDevice(DeviceObject) != STATUS_SUCCESS)
-    {
-        DPRINT1("Removal vetoed by failing the query remove request\n");
-        
-        IopCancelRemoveDevice(DeviceObject);
-        
-        return STATUS_UNSUCCESSFUL;
-    }
-    
-    Stack.Parameters.QueryDeviceRelations.Type = RemovalRelations;
+    KeyName.Length += sizeof(RootKeyName) - sizeof(UNICODE_NULL);
+    RtlCopyMemory(KeyNameBuffer, RootKeyName, KeyName.Length);
 
-    Status = IopInitiatePnpIrp(DeviceObject,
-                               &IoStatusBlock,
-                               IRP_MN_QUERY_DEVICE_RELATIONS,
-                               &Stack);
-    if (!NT_SUCCESS(Status))
+    if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE)
+        RtlAppendUnicodeToString(&KeyName, ProfileKeyName);
+
+    if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER)
     {
-        DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status);
-        DeviceRelations = NULL;
+        RtlAppendUnicodeToString(&KeyName, ClassKeyName);
+        Status = IoGetDeviceProperty(DeviceObject, DevicePropertyDriverKeyName,
+                                     DriverKeyLength, KeyNameBuffer +
+                                     (KeyName.Length / sizeof(WCHAR)),
+                                     &DriverKeyLength);
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT1("Call to IoGetDeviceProperty() failed with Status 0x%08lx\n", Status);
+            ExFreePool(KeyNameBuffer);
+            return Status;
+        }
+        KeyName.Length += (USHORT)DriverKeyLength - sizeof(UNICODE_NULL);
     }
     else
     {
-        DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information;
-    }
-
-    if (DeviceRelations)
-    {
-        Status = IopQueryRemoveDeviceRelations(DeviceRelations, Force);
-        if (!NT_SUCCESS(Status))
+        RtlAppendUnicodeToString(&KeyName, EnumKeyName);
+        Status = RtlAppendUnicodeStringToString(&KeyName, &DeviceNode->InstancePath);
+        if (DeviceNode->InstancePath.Length == 0)
+        {
+            ExFreePool(KeyNameBuffer);
             return Status;
+        }
     }
 
-    Status = IopQueryRemoveChildDevices(DeviceNode, Force);
+    /*
+     * Open the base key.
+     */
+    Status = IopOpenRegistryKeyEx(DevInstRegKey, NULL, &KeyName, DesiredAccess);
     if (!NT_SUCCESS(Status))
     {
-        if (DeviceRelations)
-            IopCancelRemoveDeviceRelations(DeviceRelations);
+        DPRINT1("IoOpenDeviceRegistryKey(%wZ): Base key doesn't exist, exiting... (Status 0x%08lx)\n", &KeyName, Status);
+        ExFreePool(KeyNameBuffer);
         return Status;
     }
+    ExFreePool(KeyNameBuffer);
 
-    DeviceNode->Flags |= DNF_WILL_BE_REMOVED;
-    DeviceNode->Problem = CM_PROB_WILL_BE_REMOVED;
-    if (DeviceRelations)
-        IopSendRemoveDeviceRelations(DeviceRelations);
-    IopSendRemoveChildDevices(DeviceNode);
-    
-    return STATUS_SUCCESS;
-}
+    /*
+     * For driver key we're done now.
+     */
 
-NTSTATUS
-IopRemoveDevice(PDEVICE_NODE DeviceNode)
-{
-    NTSTATUS Status;
+    if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER)
+        return Status;
 
-    DPRINT("Removing device: %wZ\n", &DeviceNode->InstancePath);
+    /*
+     * Let's go further. For device key we must open "Device Parameters"
+     * subkey and create it if it doesn't exist yet.
+     */
 
-    Status = IopPrepareDeviceForRemoval(DeviceNode->PhysicalDeviceObject, FALSE);
-    if (NT_SUCCESS(Status))
-    {
-        IopSendRemoveDevice(DeviceNode->PhysicalDeviceObject);
-        IopQueueTargetDeviceEvent(&GUID_DEVICE_SAFE_REMOVAL,
-                                  &DeviceNode->InstancePath);
-        return STATUS_SUCCESS;
-    }
+    RtlInitUnicodeString(&KeyName, DeviceParametersKeyName);
+    InitializeObjectAttributes(&ObjectAttributes,
+                               &KeyName,
+                               OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
+                               *DevInstRegKey,
+                               NULL);
+    Status = ZwCreateKey(DevInstRegKey,
+                         DesiredAccess,
+                         &ObjectAttributes,
+                         0,
+                         NULL,
+                         REG_OPTION_NON_VOLATILE,
+                         NULL);
+    ZwClose(ObjectAttributes.RootDirectory);
 
     return Status;
 }
 
-/*
- * @implemented
- */
-VOID
-NTAPI
-IoRequestDeviceEject(IN PDEVICE_OBJECT PhysicalDeviceObject)
-{
-    PDEVICE_NODE DeviceNode = IopGetDeviceNode(PhysicalDeviceObject);
-    PDEVICE_RELATIONS DeviceRelations;
-    IO_STATUS_BLOCK IoStatusBlock;
-    IO_STACK_LOCATION Stack;
-    DEVICE_CAPABILITIES Capabilities;
-    NTSTATUS Status;
-    
-    IopQueueTargetDeviceEvent(&GUID_DEVICE_KERNEL_INITIATED_EJECT,
-                              &DeviceNode->InstancePath);
-    
-    if (IopQueryDeviceCapabilities(DeviceNode, &Capabilities) != STATUS_SUCCESS)
-    {
-        goto cleanup;
-    }
-    
-    Stack.Parameters.QueryDeviceRelations.Type = EjectionRelations;
-    
-    Status = IopInitiatePnpIrp(PhysicalDeviceObject,
-                               &IoStatusBlock,
-                               IRP_MN_QUERY_DEVICE_RELATIONS,
-                               &Stack);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT("IopInitiatePnpIrp() failed with status 0x%08lx\n", Status);
-        DeviceRelations = NULL;
-    }
-    else
-    {
-        DeviceRelations = (PDEVICE_RELATIONS)IoStatusBlock.Information;
-    }
-    
-    if (DeviceRelations)
-    {
-        Status = IopQueryRemoveDeviceRelations(DeviceRelations, FALSE);
-        if (!NT_SUCCESS(Status))
-            goto cleanup;
-    }
-    
-    Status = IopQueryRemoveChildDevices(DeviceNode, FALSE);
-    if (!NT_SUCCESS(Status))
-    {
-        if (DeviceRelations)
-            IopCancelRemoveDeviceRelations(DeviceRelations);
-        goto cleanup;
-    }
-    
-    if (IopPrepareDeviceForRemoval(PhysicalDeviceObject, FALSE) != STATUS_SUCCESS)
-    {
-        if (DeviceRelations)
-            IopCancelRemoveDeviceRelations(DeviceRelations);
-        IopCancelRemoveChildDevices(DeviceNode);
-        goto cleanup;
-    }
-    
-    if (DeviceRelations)
-        IopSendRemoveDeviceRelations(DeviceRelations);
-    IopSendRemoveChildDevices(DeviceNode);
-
-    DeviceNode->Problem = CM_PROB_HELD_FOR_EJECT;
-    if (Capabilities.EjectSupported)
-    {
-        if (IopSendEject(PhysicalDeviceObject) != STATUS_SUCCESS)
-        {
-            goto cleanup;
-        }
-    }
-    else
-    {
-        DeviceNode->Flags |= DNF_DISABLED;
-    }
-    
-    IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT,
-                              &DeviceNode->InstancePath);
-    
-    return;
-    
-cleanup:
-    IopQueueTargetDeviceEvent(&GUID_DEVICE_EJECT_VETOED,
-                              &DeviceNode->InstancePath);
-}
-
 /*
  * @implemented
  */
@@ -4662,29 +2474,13 @@ IoInvalidateDeviceRelations(
     IN PDEVICE_OBJECT DeviceObject,
     IN DEVICE_RELATION_TYPE Type)
 {
-    PIO_WORKITEM WorkItem;
-    PINVALIDATE_DEVICE_RELATION_DATA Data;
-
-    Data = ExAllocatePool(NonPagedPool, sizeof(INVALIDATE_DEVICE_RELATION_DATA));
-    if (!Data)
-        return;
-    WorkItem = IoAllocateWorkItem(DeviceObject);
-    if (!WorkItem)
-    {
-        ExFreePool(Data);
-        return;
-    }
+    DEVICE_ACTION_DATA ActionData;
 
-    ObReferenceObject(DeviceObject);
-    Data->DeviceObject = DeviceObject;
-    Data->Type = Type;
-    Data->WorkItem = WorkItem;
+    ActionData.DeviceObject = DeviceObject;
+    ActionData.Action = DeviceActionInvalidateDeviceRelations;
+    ActionData.InvalidateDeviceRelations.Type = Type;
 
-    IoQueueWorkItem(
-        WorkItem,
-        IopAsynchronousInvalidateDeviceRelations,
-        DelayedWorkQueue,
-        Data);
+    IopQueueDeviceAction(&ActionData);
 }
 
 /*
@@ -4697,7 +2493,7 @@ IoSynchronousInvalidateDeviceRelations(
     IN DEVICE_RELATION_TYPE Type)
 {
     PAGED_CODE();
+
     switch (Type)
     {
         case BusRelations: