[NTOSKRNL]
[reactos.git] / reactos / ntoskrnl / io / pnpmgr / pnpmgr.c
index 5d6c133..06f1405 100644 (file)
@@ -29,8 +29,7 @@ extern BOOLEAN PnpSystemInit;
 /* DATA **********************************************************************/
 
 PDRIVER_OBJECT IopRootDriverObject;
-FAST_MUTEX IopBusTypeGuidListLock;
-PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList = NULL;
+PIO_BUS_TYPE_GUID_LIST PnpBusTypeGuidList = NULL;
 
 #if defined (ALLOC_PRAGMA)
 #pragma alloc_text(INIT, PnpInit)
@@ -45,24 +44,10 @@ typedef struct _INVALIDATE_DEVICE_RELATION_DATA
 } INVALIDATE_DEVICE_RELATION_DATA, *PINVALIDATE_DEVICE_RELATION_DATA;
 
 /* FUNCTIONS *****************************************************************/
-
-NTSTATUS
-IopAssignDeviceResources(
-   IN PDEVICE_NODE DeviceNode,
-   OUT ULONG *pRequiredSize);
-
-NTSTATUS
-IopTranslateDeviceResources(
-   IN PDEVICE_NODE DeviceNode,
-   IN ULONG RequiredSize);
-
-NTSTATUS
-IopUpdateResourceMapForPnPDevice(
-   IN PDEVICE_NODE DeviceNode);
-
 NTSTATUS
 NTAPI
 IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
+                       IN ULONG CreateOptions,
                        OUT PHANDLE Handle);
 
 PDEVICE_NODE
@@ -81,19 +66,20 @@ IopInitializeDevice(PDEVICE_NODE DeviceNode,
    NTSTATUS Status;
 
    if (!DriverObject->DriverExtension->AddDevice)
+   {
+      DeviceNode->Flags |= DNF_LEGACY_DRIVER;
+   }
+
+   if (DeviceNode->Flags & DNF_LEGACY_DRIVER)
+   {
+      DeviceNode->Flags |= DNF_ADDED + DNF_STARTED;
       return STATUS_SUCCESS;
+   }
 
    /* This is a Plug and Play driver */
    DPRINT("Plug and Play driver found\n");
    ASSERT(DeviceNode->PhysicalDeviceObject);
 
-   /* Check if this plug-and-play driver is used as a legacy one for this device node */
-   if (IopDeviceNodeHasFlag(DeviceNode, DNF_LEGACY_DRIVER))
-   {
-      IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED);
-      return STATUS_SUCCESS;
-   }
-
    DPRINT("Calling %wZ->AddDevice(%wZ)\n",
       &DriverObject->DriverName,
       &DeviceNode->InstancePath);
@@ -133,100 +119,161 @@ IopInitializeDevice(PDEVICE_NODE DeviceNode,
    ObDereferenceObject(Fdo);
 
    IopDeviceNodeSetFlag(DeviceNode, DNF_ADDED);
-   IopDeviceNodeSetFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY);
 
    return STATUS_SUCCESS;
 }
 
+VOID
+NTAPI
+IopSendRemoveDevice(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_REMOVE_DEVICE;
+
+    /* Drivers should never fail a IRP_MN_REMOVE_DEVICE request */
+    IopSynchronousCall(DeviceObject, &Stack, &Dummy);
+}
+
+VOID
+NTAPI
+IopStartDevice2(IN PDEVICE_OBJECT DeviceObject)
+{
+    IO_STACK_LOCATION Stack;
+    PDEVICE_NODE DeviceNode;
+    NTSTATUS Status;
+    PVOID Dummy;
+    
+    /* Get the device node */
+    DeviceNode = IopGetDeviceNode(DeviceObject);
+    
+    /* Build the I/O stack locaiton */
+    RtlZeroMemory(&Stack, sizeof(IO_STACK_LOCATION));
+    Stack.MajorFunction = IRP_MJ_PNP;
+    Stack.MinorFunction = IRP_MN_START_DEVICE;
+    
+    /* Check if we didn't already report the resources */
+    if (!(DeviceNode->Flags & DNF_RESOURCE_REPORTED))
+    {
+        /* Report them */
+        Stack.Parameters.StartDevice.AllocatedResources =
+            DeviceNode->ResourceList;
+        Stack.Parameters.StartDevice.AllocatedResourcesTranslated =
+            DeviceNode->ResourceListTranslated;
+    }
+    
+    /* I don't think we set this flag yet */
+    ASSERT(!(DeviceNode->Flags & DNF_STOPPED));
+    
+    /* Do the call */
+    Status = IopSynchronousCall(DeviceObject, &Stack, &Dummy);
+    if (!NT_SUCCESS(Status))
+    {
+        /* Send an IRP_MN_REMOVE_DEVICE request */
+        IopSendRemoveDevice(DeviceObject);
+
+        /* Set the appropriate flag */
+        DeviceNode->Flags |= DNF_START_FAILED;
+
+        DPRINT1("Warning: PnP Start failed (%wZ)\n", &DeviceNode->InstancePath);
+        return;
+    }
+    
+    /* Otherwise, mark us as started */
+    DeviceNode->Flags |= DNF_STARTED;
+
+    /* We now need enumeration */
+    DeviceNode->Flags |= DNF_NEED_ENUMERATION_ONLY;
+}
+
+NTSTATUS
+NTAPI
+IopStartAndEnumerateDevice(IN PDEVICE_NODE DeviceNode)
+{
+    PDEVICE_OBJECT DeviceObject;
+    NTSTATUS Status;
+    PAGED_CODE();
+    
+    /* Sanity check */
+    ASSERT((DeviceNode->Flags & DNF_ADDED));
+    ASSERT((DeviceNode->Flags & (DNF_RESOURCE_ASSIGNED |
+                                 DNF_RESOURCE_REPORTED |
+                                 DNF_NO_RESOURCE_REQUIRED)));
+    ASSERT((!(DeviceNode->Flags & (DNF_HAS_PROBLEM |
+                                   DNF_STARTED |
+                                   DNF_START_REQUEST_PENDING))));
+           
+    /* 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);
+        IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY);
+        Status = STATUS_SUCCESS;
+    }
+    else
+    {
+        /* Nothing to do */
+        Status = STATUS_SUCCESS;
+    }
+    
+    /* Return */
+    return Status;
+}
+
 NTSTATUS
 IopStartDevice(
    PDEVICE_NODE DeviceNode)
 {
-   IO_STATUS_BLOCK IoStatusBlock;
-   IO_STACK_LOCATION Stack;
-   ULONG RequiredLength;
    NTSTATUS Status;
-   HANDLE InstanceHandle, ControlHandle;
+   HANDLE InstanceHandle = INVALID_HANDLE_VALUE, ControlHandle = INVALID_HANDLE_VALUE;
    UNICODE_STRING KeyName;
    OBJECT_ATTRIBUTES ObjectAttributes;
 
-   IopDeviceNodeSetFlag(DeviceNode, DNF_ASSIGNING_RESOURCES);
-   DPRINT("Sending IRP_MN_FILTER_RESOURCE_REQUIREMENTS to device stack\n");
-   Stack.Parameters.FilterResourceRequirements.IoResourceRequirementList = DeviceNode->ResourceRequirements;
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_FILTER_RESOURCE_REQUIREMENTS,
-      &Stack);
-   if (!NT_SUCCESS(Status) && Status != STATUS_NOT_SUPPORTED)
-   {
-      DPRINT("IopInitiatePnpIrp(IRP_MN_FILTER_RESOURCE_REQUIREMENTS) failed\n");
-      return Status;
-   }
-   DeviceNode->ResourceRequirements = (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information;
-
-   Status = IopAssignDeviceResources(DeviceNode, &RequiredLength);
-   if (NT_SUCCESS(Status))
-   {
-      Status = IopTranslateDeviceResources(DeviceNode, RequiredLength);
-      if (NT_SUCCESS(Status))
-      {
-         Status = IopUpdateResourceMapForPnPDevice(DeviceNode);
-         if (!NT_SUCCESS(Status))
-         {
-             DPRINT("IopUpdateResourceMap() failed (Status 0x%08lx)\n", Status);
-         }
-      }
-      else
-      {
-         DPRINT("IopTranslateDeviceResources() failed (Status 0x%08lx)\n", Status);
-      }
-   }
-   else
+   if (DeviceNode->Flags & (DNF_STARTED | DNF_START_REQUEST_PENDING))
    {
-      DPRINT("IopAssignDeviceResources() failed (Status 0x%08lx)\n", Status);
+       /* Nothing to do here */
+       return STATUS_SUCCESS;
    }
-   IopDeviceNodeClearFlag(DeviceNode, DNF_ASSIGNING_RESOURCES);
-
-   DPRINT("Sending IRP_MN_START_DEVICE to driver\n");
-   Stack.Parameters.StartDevice.AllocatedResources = DeviceNode->ResourceList;
-   Stack.Parameters.StartDevice.AllocatedResourcesTranslated = DeviceNode->ResourceListTranslated;
-
-   /*
-    * Windows NT Drivers receive IRP_MN_START_DEVICE in a critical region and
-    * actually _depend_ on this!. This is because NT will lock the Device Node
-    * with an ERESOURCE, which of course requires APCs to be disabled.
-    */
-   KeEnterCriticalRegion();
-
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_START_DEVICE,
-      &Stack);
-
-   KeLeaveCriticalRegion();
 
+   Status = IopAssignDeviceResources(DeviceNode);
    if (!NT_SUCCESS(Status))
-   {
-      DPRINT("IopInitiatePnpIrp() failed\n");
-   }
-   else
-   {
-      if (IopDeviceNodeHasFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY))
-      {
-         DPRINT("Device needs enumeration, invalidating bus relations\n");
-         /* Invalidate device relations synchronously
-            (otherwise there will be dirty read of DeviceNode) */
-         IopEnumerateDevice(DeviceNode->PhysicalDeviceObject);
-         IopDeviceNodeClearFlag(DeviceNode, DNF_NEED_ENUMERATION_ONLY);
-      }
-   }
+       goto ByeBye;
 
-   Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceHandle);
+   /* New PnP ABI */
+   IopStartAndEnumerateDevice(DeviceNode);
+
+   /* FIX: Should be done in new device instance code */
+   Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceHandle);
    if (!NT_SUCCESS(Status))
-       return Status;
+       goto ByeBye;
 
+   /* FIX: Should be done in IoXxxPrepareDriverLoading */
+   // {
    RtlInitUnicodeString(&KeyName, L"Control");
    InitializeObjectAttributes(&ObjectAttributes,
                               &KeyName,
@@ -235,19 +282,18 @@ IopStartDevice(
                               NULL);
    Status = ZwCreateKey(&ControlHandle, KEY_SET_VALUE, &ObjectAttributes, 0, NULL, REG_OPTION_VOLATILE, NULL);
    if (!NT_SUCCESS(Status))
-   {
-       ZwClose(InstanceHandle);
-       return Status;
-   }
+       goto ByeBye;
 
    RtlInitUnicodeString(&KeyName, L"ActiveService");
    Status = ZwSetValueKey(ControlHandle, &KeyName, 0, REG_SZ, DeviceNode->ServiceName.Buffer, DeviceNode->ServiceName.Length);
+   // }
 
-   if (NT_SUCCESS(Status))
-       IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
+ByeBye:
+   if (ControlHandle != INVALID_HANDLE_VALUE)
+       ZwClose(ControlHandle);
 
-   ZwClose(ControlHandle);
-   ZwClose(InstanceHandle);
+   if (InstanceHandle != INVALID_HANDLE_VALUE)
+       ZwClose(InstanceHandle);
 
    return Status;
 }
@@ -320,14 +366,14 @@ IopGetBusTypeGuidIndex(LPGUID BusTypeGuid)
    PVOID NewList;
 
    /* Acquire the lock */
-   ExAcquireFastMutex(&IopBusTypeGuidListLock);
+   ExAcquireFastMutex(&PnpBusTypeGuidList->Lock);
 
    /* Loop all entries */
-   while (i < IopBusTypeGuidList->GuidCount)
+   while (i < PnpBusTypeGuidList->GuidCount)
    {
        /* Try to find a match */
        if (RtlCompareMemory(BusTypeGuid,
-                            &IopBusTypeGuidList->Guids[i],
+                            &PnpBusTypeGuidList->Guids[i],
                             sizeof(GUID)) == sizeof(GUID))
        {
            /* Found it */
@@ -338,43 +384,43 @@ IopGetBusTypeGuidIndex(LPGUID BusTypeGuid)
    }
 
    /* Check if we have to grow the list */
-   if (IopBusTypeGuidList->GuidCount)
+   if (PnpBusTypeGuidList->GuidCount)
    {
        /* Calculate the new size */
        NewSize = sizeof(IO_BUS_TYPE_GUID_LIST) +
-                (sizeof(GUID) * IopBusTypeGuidList->GuidCount);
+                (sizeof(GUID) * PnpBusTypeGuidList->GuidCount);
 
        /* Allocate the new copy */
        NewList = ExAllocatePool(PagedPool, NewSize);
 
        if (!NewList) {
           /* Fail */
-          ExFreePool(IopBusTypeGuidList);
+          ExFreePool(PnpBusTypeGuidList);
           goto Quickie;
        }
 
        /* Now copy them, decrease the size too */
        NewSize -= sizeof(GUID);
-       RtlCopyMemory(NewList, IopBusTypeGuidList, NewSize);
+       RtlCopyMemory(NewList, PnpBusTypeGuidList, NewSize);
 
        /* Free the old list */
-       ExFreePool(IopBusTypeGuidList);
+       ExFreePool(PnpBusTypeGuidList);
 
        /* Use the new buffer */
-       IopBusTypeGuidList = NewList;
+       PnpBusTypeGuidList = NewList;
    }
 
    /* Copy the new GUID */
-   RtlCopyMemory(&IopBusTypeGuidList->Guids[IopBusTypeGuidList->GuidCount],
+   RtlCopyMemory(&PnpBusTypeGuidList->Guids[PnpBusTypeGuidList->GuidCount],
                  BusTypeGuid,
                  sizeof(GUID));
 
    /* The new entry is the index */
-   FoundIndex = (USHORT)IopBusTypeGuidList->GuidCount;
-   IopBusTypeGuidList->GuidCount++;
+   FoundIndex = (USHORT)PnpBusTypeGuidList->GuidCount;
+   PnpBusTypeGuidList->GuidCount++;
 
 Quickie:
-   ExReleaseFastMutex(&IopBusTypeGuidListLock);
+   ExReleaseFastMutex(&PnpBusTypeGuidList->Lock);
    return FoundIndex;
 }
 
@@ -404,7 +450,13 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
    UNICODE_STRING FullServiceName;
    UNICODE_STRING LegacyPrefix = RTL_CONSTANT_STRING(L"LEGACY_");
    UNICODE_STRING UnknownDeviceName = RTL_CONSTANT_STRING(L"UNKNOWN");
-   HANDLE TempHandle;
+   UNICODE_STRING KeyName, ClassName;
+   PUNICODE_STRING ServiceName1;
+   ULONG LegacyValue;
+#if 0
+   UNICODE_STRING ClassGUID;
+#endif
+   HANDLE InstanceHandle;
 
    DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n",
       ParentNode, PhysicalDeviceObject, ServiceName);
@@ -418,11 +470,13 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
    RtlZeroMemory(Node, sizeof(DEVICE_NODE));
 
    if (!ServiceName)
-       ServiceName = &UnknownDeviceName;
+       ServiceName1 = &UnknownDeviceName;
+   else
+       ServiceName1 = ServiceName;
 
    if (!PhysicalDeviceObject)
    {
-      FullServiceName.MaximumLength = LegacyPrefix.Length + ServiceName->Length;
+      FullServiceName.MaximumLength = LegacyPrefix.Length + ServiceName1->Length;
       FullServiceName.Length = 0;
       FullServiceName.Buffer = ExAllocatePool(PagedPool, FullServiceName.MaximumLength);
       if (!FullServiceName.Buffer)
@@ -432,7 +486,7 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
       }
 
       RtlAppendUnicodeStringToString(&FullServiceName, &LegacyPrefix);
-      RtlAppendUnicodeStringToString(&FullServiceName, ServiceName);
+      RtlAppendUnicodeStringToString(&FullServiceName, ServiceName1);
 
       Status = PnpRootCreateDevice(&FullServiceName, &PhysicalDeviceObject, &Node->InstancePath);
       if (!NT_SUCCESS(Status))
@@ -443,15 +497,71 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
       }
 
       /* Create the device key for legacy drivers */
-      Status = IopCreateDeviceKeyPath(&Node->InstancePath, &TempHandle);
+      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))
-          ZwClose(TempHandle);
+      {
+          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");
+              Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassName.Buffer, ClassName.Length);
+#if 0
+              if (NT_SUCCESS(Status))
+              {
+                  RtlInitUnicodeString(&KeyName, L"ClassGUID");
+
+                  RtlInitUnicodeString(&ClassGUID, L"{8ECC055D-047F-11D1-A537-0000F8753ED1}");
+                  Status = ZwSetValueKey(InstanceHandle, &KeyName, 0, REG_SZ, ClassGUID.Buffer, ClassGUID.Length);
+              }
+#endif
+          }
+      }
 
+      ZwClose(InstanceHandle);
       ExFreePool(FullServiceName.Buffer);
 
-      /* This is for drivers passed on the command line to ntoskrnl.exe */
-      IopDeviceNodeSetFlag(Node, DNF_STARTED);
+      if (!NT_SUCCESS(Status))
+      {
+          ExFreePool(Node);
+          return Status;
+      }
+
       IopDeviceNodeSetFlag(Node, DNF_LEGACY_DRIVER);
+      IopDeviceNodeSetFlag(Node, DNF_ADDED);
+      IopDeviceNodeSetFlag(Node, DNF_STARTED);
    }
 
    Node->PhysicalDeviceObject = PhysicalDeviceObject;
@@ -549,69 +659,90 @@ IopFreeDeviceNode(PDEVICE_NODE DeviceNode)
 }
 
 NTSTATUS
-IopInitiatePnpIrp(PDEVICE_OBJECT DeviceObject,
-                  PIO_STATUS_BLOCK IoStatusBlock,
-                  ULONG MinorFunction,
-                  PIO_STACK_LOCATION Stack OPTIONAL)
+NTAPI
+IopSynchronousCall(IN PDEVICE_OBJECT DeviceObject,
+                   IN PIO_STACK_LOCATION IoStackLocation,
+                   OUT PVOID *Information)
 {
-   PDEVICE_OBJECT TopDeviceObject;
-   PIO_STACK_LOCATION IrpSp;
-   NTSTATUS Status;
-   KEVENT Event;
-   PIRP Irp;
-
-   /* Always call the top of the device stack */
-   TopDeviceObject = IoGetAttachedDeviceReference(DeviceObject);
-
-   KeInitializeEvent(
-      &Event,
-      NotificationEvent,
-      FALSE);
-
-   Irp = IoBuildSynchronousFsdRequest(
-      IRP_MJ_PNP,
-      TopDeviceObject,
-      NULL,
-      0,
-      NULL,
-      &Event,
-      IoStatusBlock);
-
-   /* PNP IRPs are initialized with a status code of STATUS_NOT_SUPPORTED */
-   Irp->IoStatus.Status = STATUS_NOT_SUPPORTED;
-   Irp->IoStatus.Information = 0;
-
-   if (MinorFunction == IRP_MN_FILTER_RESOURCE_REQUIREMENTS)
-   {
-      Irp->IoStatus.Information = (ULONG_PTR)Stack->Parameters.FilterResourceRequirements.IoResourceRequirementList;
-   }
-
-   IrpSp = IoGetNextIrpStackLocation(Irp);
-   IrpSp->MinorFunction = (UCHAR)MinorFunction;
-
-   if (Stack)
-   {
-      RtlCopyMemory(&IrpSp->Parameters,
-                    &Stack->Parameters,
-                    sizeof(Stack->Parameters));
-   }
-
-   Status = IoCallDriver(TopDeviceObject, Irp);
-   if (Status == STATUS_PENDING)
-   {
-      KeWaitForSingleObject(&Event,
-                            Executive,
-                            KernelMode,
-                            FALSE,
-                            NULL);
-      Status = IoStatusBlock->Status;
-   }
-
-   ObDereferenceObject(TopDeviceObject);
-
-   return Status;
+    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;
+    
+    /* 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;
+    }
+    
+    /* Return the information */
+    *Information = (PVOID)IoStatusBlock.Information;
+    return Status;
 }
 
+NTSTATUS
+NTAPI
+IopInitiatePnpIrp(IN PDEVICE_OBJECT DeviceObject,
+                  IN OUT PIO_STATUS_BLOCK IoStatusBlock,
+                  IN ULONG 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)
@@ -687,1211 +818,193 @@ IopTraverseDeviceTree(PDEVICETREE_TRAVERSE_CONTEXT Context)
  *        Handle to the newly created key
  *
  * Remarks
- *     This method can create nested trees, so parent of RegistryPath can
- *     be not existant, and will be created if needed.
- */
-NTSTATUS
-NTAPI
-IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
-                       OUT PHANDLE Handle)
-{
-    UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT);
-    HANDLE hParent = NULL, hKey;
-    OBJECT_ATTRIBUTES ObjectAttributes;
-    UNICODE_STRING KeyName;
-    LPCWSTR Current, Last;
-    ULONG dwLength;
-    NTSTATUS Status;
-
-    /* Assume failure */
-    *Handle = NULL;
-
-    /* Open root key for device instances */
-    Status = IopOpenRegistryKeyEx(&hParent, NULL, &EnumU, KEY_CREATE_SUB_KEY);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("ZwOpenKey('%wZ') failed with status 0x%08lx\n", &EnumU, Status);
-        return Status;
-    }
-
-    Current = KeyName.Buffer = RegistryPath->Buffer;
-    Last = &RegistryPath->Buffer[RegistryPath->Length / sizeof(WCHAR)];
-
-    /* Go up to the end of the string */
-    while (Current <= Last)
-    {
-        if (Current != Last && *Current != '\\')
-        {
-            /* Not the end of the string and not a separator */
-            Current++;
-            continue;
-        }
-
-        /* Prepare relative key name */
-        dwLength = (ULONG_PTR)Current - (ULONG_PTR)KeyName.Buffer;
-        KeyName.MaximumLength = KeyName.Length = dwLength;
-        DPRINT("Create '%wZ'\n", &KeyName);
-
-        /* Open key */
-        InitializeObjectAttributes(&ObjectAttributes,
-                                   &KeyName,
-                                   OBJ_CASE_INSENSITIVE,
-                                   hParent,
-                                   NULL);
-        Status = ZwCreateKey(&hKey,
-                             Current == Last ? KEY_ALL_ACCESS : KEY_CREATE_SUB_KEY,
-                             &ObjectAttributes,
-                             0,
-                             NULL,
-                             0,
-                             NULL);
-
-        /* Close parent key handle, we don't need it anymore */
-        if (hParent)
-            ZwClose(hParent);
-
-        /* Key opening/creating failed? */
-        if (!NT_SUCCESS(Status))
-        {
-            DPRINT1("ZwCreateKey('%wZ') failed with status 0x%08lx\n", &KeyName, Status);
-            return Status;
-        }
-
-        /* Check if it is the end of the string */
-        if (Current == Last)
-        {
-            /* Yes, return success */
-            *Handle = hKey;
-            return STATUS_SUCCESS;
-        }
-
-        /* Start with this new parent key */
-        hParent = hKey;
-        Current++;
-        KeyName.Buffer = (LPWSTR)Current;
-    }
-
-    return STATUS_UNSUCCESSFUL;
-}
-
-NTSTATUS
-IopUpdateResourceMap(IN PDEVICE_NODE DeviceNode, PWCHAR Level1Key, PWCHAR Level2Key)
-{
-  NTSTATUS Status;
-  ULONG Disposition;
-  HANDLE PnpMgrLevel1, PnpMgrLevel2, ResourceMapKey;
-  UNICODE_STRING KeyName;
-  OBJECT_ATTRIBUTES ObjectAttributes;
-
-  RtlInitUnicodeString(&KeyName,
-                      L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP");
-  InitializeObjectAttributes(&ObjectAttributes,
-                            &KeyName,
-                            OBJ_CASE_INSENSITIVE | OBJ_OPENIF,
-                            0,
-                            NULL);
-  Status = ZwCreateKey(&ResourceMapKey,
-                      KEY_ALL_ACCESS,
-                      &ObjectAttributes,
-                      0,
-                      NULL,
-                      REG_OPTION_VOLATILE,
-                      &Disposition);
-  if (!NT_SUCCESS(Status))
-      return Status;
-
-  RtlInitUnicodeString(&KeyName, Level1Key);
-  InitializeObjectAttributes(&ObjectAttributes,
-                            &KeyName,
-                            OBJ_CASE_INSENSITIVE | OBJ_OPENIF,
-                            ResourceMapKey,
-                            NULL);
-  Status = ZwCreateKey(&PnpMgrLevel1,
-                       KEY_ALL_ACCESS,
-                       &ObjectAttributes,
-                       0,
-                       NULL,
-                       REG_OPTION_VOLATILE,
-                       &Disposition);
-  ZwClose(ResourceMapKey);
-  if (!NT_SUCCESS(Status))
-      return Status;
-
-  RtlInitUnicodeString(&KeyName, Level2Key);
-  InitializeObjectAttributes(&ObjectAttributes,
-                            &KeyName,
-                            OBJ_CASE_INSENSITIVE | OBJ_OPENIF,
-                            PnpMgrLevel1,
-                            NULL);
-  Status = ZwCreateKey(&PnpMgrLevel2,
-                       KEY_ALL_ACCESS,
-                       &ObjectAttributes,
-                       0,
-                       NULL,
-                       REG_OPTION_VOLATILE,
-                       &Disposition);
-  ZwClose(PnpMgrLevel1);
-  if (!NT_SUCCESS(Status))
-      return Status;
-
-  if (DeviceNode->ResourceList)
-  {
-      WCHAR NameBuff[256];
-      UNICODE_STRING NameU;
-      UNICODE_STRING Suffix;
-      ULONG OldLength;
-
-      ASSERT(DeviceNode->ResourceListTranslated);
-
-      NameU.Buffer = NameBuff;
-      NameU.Length = 0;
-      NameU.MaximumLength = 256 * sizeof(WCHAR);
-
-      Status = IoGetDeviceProperty(DeviceNode->PhysicalDeviceObject,
-                                   DevicePropertyPhysicalDeviceObjectName,
-                                   NameU.MaximumLength,
-                                   NameU.Buffer,
-                                   &OldLength);
-      ASSERT(Status == STATUS_SUCCESS);
-
-      NameU.Length = (USHORT)OldLength;
-
-      RtlInitUnicodeString(&Suffix, L".Raw");
-      RtlAppendUnicodeStringToString(&NameU, &Suffix);
-
-      Status = ZwSetValueKey(PnpMgrLevel2,
-                             &NameU,
-                             0,
-                             REG_RESOURCE_LIST,
-                             DeviceNode->ResourceList,
-                             CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceList));
-      if (!NT_SUCCESS(Status))
-      {
-          ZwClose(PnpMgrLevel2);
-          return Status;
-      }
-
-      /* "Remove" the suffix by setting the length back to what it used to be */
-      NameU.Length = (USHORT)OldLength;
-
-      RtlInitUnicodeString(&Suffix, L".Translated");
-      RtlAppendUnicodeStringToString(&NameU, &Suffix);
-
-      Status = ZwSetValueKey(PnpMgrLevel2,
-                             &NameU,
-                             0,
-                             REG_RESOURCE_LIST,
-                             DeviceNode->ResourceListTranslated,
-                             CM_RESOURCE_LIST_SIZE(DeviceNode->ResourceListTranslated));
-      ZwClose(PnpMgrLevel2);
-      if (!NT_SUCCESS(Status))
-          return Status;
-  }
-  else
-  {
-      ZwClose(PnpMgrLevel2);
-  }
-
-  IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_ASSIGNED);
-
-  return STATUS_SUCCESS;
-}
-
-NTSTATUS
-IopUpdateResourceMapForPnPDevice(IN PDEVICE_NODE DeviceNode)
-{
-  return IopUpdateResourceMap(DeviceNode, L"PnP Manager", L"PnpManager");
-}
-
-NTSTATUS
-IopSetDeviceInstanceData(HANDLE InstanceKey,
-                         PDEVICE_NODE DeviceNode)
-{
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   UNICODE_STRING KeyName;
-   HANDLE LogConfKey;
-   ULONG ResCount;
-   ULONG ListSize, ResultLength;
-   NTSTATUS Status;
-   HANDLE ControlHandle;
-
-   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,
-                        0,
-                        NULL);
-   if (NT_SUCCESS(Status))
-   {
-      /* Set 'BootConfig' value */
-      if (DeviceNode->BootResources != NULL)
-      {
-         ResCount = DeviceNode->BootResources->Count;
-         if (ResCount != 0)
-         {
-            ListSize = CM_RESOURCE_LIST_SIZE(DeviceNode->BootResources);
-
-            RtlInitUnicodeString(&KeyName, L"BootConfig");
-            Status = ZwSetValueKey(LogConfKey,
-                                   &KeyName,
-                                   0,
-                                   REG_RESOURCE_LIST,
-                                   DeviceNode->BootResources,
-                                   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;
-}
-
-BOOLEAN
-IopCheckResourceDescriptor(
-   IN PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc,
-   IN PCM_RESOURCE_LIST ResourceList,
-   IN BOOLEAN Silent,
-   OUT OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor)
-{
-   ULONG i, ii;
-   BOOLEAN Result = FALSE;
-
-   if (ResDesc->ShareDisposition == CmResourceShareShared)
-       return FALSE;
-
-   for (i = 0; i < ResourceList->Count; i++)
-   {
-      PCM_PARTIAL_RESOURCE_LIST ResList = &ResourceList->List[i].PartialResourceList;
-      for (ii = 0; ii < ResList->Count; ii++)
-      {
-         PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc2 = &ResList->PartialDescriptors[ii];
-
-         /* We don't care about shared resources */
-         if (ResDesc->ShareDisposition == CmResourceShareShared &&
-             ResDesc2->ShareDisposition == CmResourceShareShared)
-             continue;
-
-         /* Make sure we're comparing the same types */
-         if (ResDesc->Type != ResDesc2->Type)
-             continue;
-
-         switch (ResDesc->Type)
-         {
-             case CmResourceTypeMemory:
-                 if ((ResDesc->u.Memory.Start.QuadPart < ResDesc2->u.Memory.Start.QuadPart &&
-                      ResDesc->u.Memory.Start.QuadPart + ResDesc->u.Memory.Length >
-                      ResDesc2->u.Memory.Start.QuadPart) || (ResDesc2->u.Memory.Start.QuadPart <
-                      ResDesc->u.Memory.Start.QuadPart && ResDesc2->u.Memory.Start.QuadPart +
-                      ResDesc2->u.Memory.Length > ResDesc->u.Memory.Start.QuadPart))
-                 {
-                      if (!Silent)
-                      {
-                          DPRINT1("Resource conflict: Memory (0x%x to 0x%x vs. 0x%x to 0x%x)\n",
-                                  ResDesc->u.Memory.Start.QuadPart, ResDesc->u.Memory.Start.QuadPart +
-                                  ResDesc->u.Memory.Length, ResDesc2->u.Memory.Start.QuadPart,
-                                  ResDesc2->u.Memory.Start.QuadPart + ResDesc2->u.Memory.Length);
-                      }
-
-                      Result = TRUE;
-
-                      goto ByeBye;
-                 }
-                 break;
-
-             case CmResourceTypePort:
-                 if ((ResDesc->u.Port.Start.QuadPart < ResDesc2->u.Port.Start.QuadPart &&
-                      ResDesc->u.Port.Start.QuadPart + ResDesc->u.Port.Length >
-                      ResDesc2->u.Port.Start.QuadPart) || (ResDesc2->u.Port.Start.QuadPart <
-                      ResDesc->u.Port.Start.QuadPart && ResDesc2->u.Port.Start.QuadPart +
-                      ResDesc2->u.Port.Length > ResDesc->u.Port.Start.QuadPart))
-                 {
-                      if (!Silent)
-                      {
-                          DPRINT1("Resource conflict: Port (0x%x to 0x%x vs. 0x%x to 0x%x)\n",
-                                  ResDesc->u.Port.Start.QuadPart, ResDesc->u.Port.Start.QuadPart +
-                                  ResDesc->u.Port.Length, ResDesc2->u.Port.Start.QuadPart,
-                                  ResDesc2->u.Port.Start.QuadPart + ResDesc2->u.Port.Length);
-                      }
-
-                      Result = TRUE;
-
-                      goto ByeBye;
-                 }
-                 break;
-
-             case CmResourceTypeInterrupt:
-                 if (ResDesc->u.Interrupt.Vector == ResDesc2->u.Interrupt.Vector)
-                 {
-                      if (!Silent)
-                      {
-                          DPRINT1("Resource conflict: IRQ (0x%x 0x%x vs. 0x%x 0x%x)\n",
-                                  ResDesc->u.Interrupt.Vector, ResDesc->u.Interrupt.Level,
-                                  ResDesc2->u.Interrupt.Vector, ResDesc2->u.Interrupt.Level);
-                      }
-
-                      Result = TRUE;
-
-                      goto ByeBye;
-                 }
-                 break;
-
-             case CmResourceTypeBusNumber:
-                 if ((ResDesc->u.BusNumber.Start < ResDesc2->u.BusNumber.Start &&
-                      ResDesc->u.BusNumber.Start + ResDesc->u.BusNumber.Length >
-                      ResDesc2->u.BusNumber.Start) || (ResDesc2->u.BusNumber.Start <
-                      ResDesc->u.BusNumber.Start && ResDesc2->u.BusNumber.Start +
-                      ResDesc2->u.BusNumber.Length > ResDesc->u.BusNumber.Start))
-                 {
-                      if (!Silent)
-                      {
-                          DPRINT1("Resource conflict: Bus number (0x%x to 0x%x vs. 0x%x to 0x%x)\n",
-                                  ResDesc->u.BusNumber.Start, ResDesc->u.BusNumber.Start +
-                                  ResDesc->u.BusNumber.Length, ResDesc2->u.BusNumber.Start,
-                                  ResDesc2->u.BusNumber.Start + ResDesc2->u.BusNumber.Length);
-                      }
-
-                      Result = TRUE;
-
-                      goto ByeBye;
-                 }
-                 break;
-
-             case CmResourceTypeDma:
-                 if (ResDesc->u.Dma.Channel == ResDesc2->u.Dma.Channel)
-                 {
-                     if (!Silent)
-                     {
-                         DPRINT1("Resource conflict: Dma (0x%x 0x%x vs. 0x%x 0x%x)\n",
-                                 ResDesc->u.Dma.Channel, ResDesc->u.Dma.Port,
-                                 ResDesc2->u.Dma.Channel, ResDesc2->u.Dma.Port);
-                     }
-
-                     Result = TRUE;
-
-                     goto ByeBye;
-                 }
-                 break;
-         }
-      }
-   }
-
-ByeBye:
-
-   if (Result && ConflictingDescriptor)
-   {
-       RtlCopyMemory(ConflictingDescriptor,
-                     ResDesc,
-                     sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
-   }
-
-   return Result;
-}
-
-
-BOOLEAN
-IopCheckForResourceConflict(
-   IN PCM_RESOURCE_LIST ResourceList1,
-   IN PCM_RESOURCE_LIST ResourceList2,
-   IN BOOLEAN Silent,
-   OUT OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor)
-{
-   ULONG i, ii;
-   BOOLEAN Result = FALSE;
-
-   for (i = 0; i < ResourceList1->Count; i++)
-   {
-      PCM_PARTIAL_RESOURCE_LIST ResList = &ResourceList1->List[i].PartialResourceList;
-      for (ii = 0; ii < ResList->Count; ii++)
-      {
-         PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc = &ResList->PartialDescriptors[ii];
-
-         Result = IopCheckResourceDescriptor(ResDesc,
-                                             ResourceList2,
-                                             Silent,
-                                             ConflictingDescriptor);
-         if (Result) goto ByeBye;
-      }
-   }
-
-        
-ByeBye:
-
-   return Result;
-}
-
-NTSTATUS
-IopDetectResourceConflict(
-   IN PCM_RESOURCE_LIST ResourceList,
-   IN BOOLEAN Silent,
-   OUT OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor)
-{
-   OBJECT_ATTRIBUTES ObjectAttributes;
-   UNICODE_STRING KeyName;
-   HANDLE ResourceMapKey = INVALID_HANDLE_VALUE, ChildKey2 = INVALID_HANDLE_VALUE, ChildKey3 = INVALID_HANDLE_VALUE;
-   ULONG KeyInformationLength, RequiredLength, KeyValueInformationLength, KeyNameInformationLength;
-   PKEY_BASIC_INFORMATION KeyInformation;
-   PKEY_VALUE_PARTIAL_INFORMATION KeyValueInformation;
-   PKEY_VALUE_BASIC_INFORMATION KeyNameInformation;
-   ULONG ChildKeyIndex1 = 0, ChildKeyIndex2 = 0, ChildKeyIndex3 = 0;
-   NTSTATUS Status;
-
-   RtlInitUnicodeString(&KeyName, L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP");
-   InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE, 0, NULL);
-   Status = ZwOpenKey(&ResourceMapKey, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &ObjectAttributes);
-   if (!NT_SUCCESS(Status))
-   {
-      /* The key is missing which means we are the first device */
-      return STATUS_SUCCESS;
-   }
-
-   while (TRUE)
-   {
-      Status = ZwEnumerateKey(ResourceMapKey,
-                              ChildKeyIndex1,
-                              KeyBasicInformation,
-                              NULL,
-                              0,
-                              &RequiredLength);
-      if (Status == STATUS_NO_MORE_ENTRIES)
-          break;
-      else if (Status == STATUS_BUFFER_OVERFLOW || Status == STATUS_BUFFER_TOO_SMALL)
-      {
-          KeyInformationLength = RequiredLength;
-          KeyInformation = ExAllocatePool(PagedPool, KeyInformationLength);
-          if (!KeyInformation)
-          {
-              Status = STATUS_INSUFFICIENT_RESOURCES;
-              goto cleanup;
-          }
-
-          Status = ZwEnumerateKey(ResourceMapKey, 
-                                  ChildKeyIndex1,
-                                  KeyBasicInformation,
-                                  KeyInformation,
-                                  KeyInformationLength,
-                                  &RequiredLength);
-      }
-      else
-         goto cleanup;
-      ChildKeyIndex1++;
-      if (!NT_SUCCESS(Status))
-          goto cleanup;
-
-      KeyName.Buffer = KeyInformation->Name;
-      KeyName.MaximumLength = KeyName.Length = KeyInformation->NameLength;
-      InitializeObjectAttributes(&ObjectAttributes,
-                                 &KeyName,
-                                 OBJ_CASE_INSENSITIVE,
-                                 ResourceMapKey,
-                                 NULL);
-      Status = ZwOpenKey(&ChildKey2, KEY_ENUMERATE_SUB_KEYS | KEY_QUERY_VALUE, &ObjectAttributes);
-      ExFreePool(KeyInformation);
-      if (!NT_SUCCESS(Status))
-          goto cleanup;
-
-      while (TRUE)
-      {
-          Status = ZwEnumerateKey(ChildKey2, 
-                                  ChildKeyIndex2,
-                                  KeyBasicInformation,
-                                  NULL,
-                                  0,
-                                  &RequiredLength);
-          if (Status == STATUS_NO_MORE_ENTRIES)
-              break;
-          else if (Status == STATUS_BUFFER_TOO_SMALL)
-          {
-              KeyInformationLength = RequiredLength;
-              KeyInformation = ExAllocatePool(PagedPool, KeyInformationLength);
-              if (!KeyInformation)
-              {
-                  Status = STATUS_INSUFFICIENT_RESOURCES;
-                  goto cleanup;
-              }
-
-              Status = ZwEnumerateKey(ChildKey2,
-                                      ChildKeyIndex2,
-                                      KeyBasicInformation,
-                                      KeyInformation,
-                                      KeyInformationLength,
-                                      &RequiredLength);
-          }
-          else
-              goto cleanup;
-          ChildKeyIndex2++;
-          if (!NT_SUCCESS(Status))
-              goto cleanup;
-
-          KeyName.Buffer = KeyInformation->Name;
-          KeyName.MaximumLength = KeyName.Length = KeyInformation->NameLength;
-          InitializeObjectAttributes(&ObjectAttributes,
-                                     &KeyName,
-                                     OBJ_CASE_INSENSITIVE,
-                                     ChildKey2,
-                                     NULL);
-          Status = ZwOpenKey(&ChildKey3, KEY_QUERY_VALUE, &ObjectAttributes);
-          ExFreePool(KeyInformation);
-          if (!NT_SUCCESS(Status))
-              goto cleanup;
-
-          while (TRUE)
-          {
-              Status = ZwEnumerateValueKey(ChildKey3,
-                                           ChildKeyIndex3,
-                                           KeyValuePartialInformation,
-                                           NULL,
-                                           0,
-                                           &RequiredLength);
-              if (Status == STATUS_NO_MORE_ENTRIES)
-                  break;
-              else if (Status == STATUS_BUFFER_TOO_SMALL)
-              {
-                  KeyValueInformationLength = RequiredLength;
-                  KeyValueInformation = ExAllocatePool(PagedPool, KeyValueInformationLength);
-                  if (!KeyValueInformation)
-                  {
-                      Status = STATUS_INSUFFICIENT_RESOURCES;
-                      goto cleanup;
-                  }
-
-                  Status = ZwEnumerateValueKey(ChildKey3,
-                                               ChildKeyIndex3,
-                                               KeyValuePartialInformation,
-                                               KeyValueInformation,
-                                               KeyValueInformationLength,
-                                               &RequiredLength);
-              }
-              else
-                  goto cleanup;
-              if (!NT_SUCCESS(Status))
-                  goto cleanup;
-
-              Status = ZwEnumerateValueKey(ChildKey3,
-                                           ChildKeyIndex3,
-                                           KeyValueBasicInformation,
-                                           NULL,
-                                           0,
-                                           &RequiredLength);
-              if (Status == STATUS_BUFFER_TOO_SMALL)
-              {
-                  KeyNameInformationLength = RequiredLength;
-                  KeyNameInformation = ExAllocatePool(PagedPool, KeyNameInformationLength + sizeof(WCHAR));
-                  if (!KeyNameInformation)
-                  {
-                      Status = STATUS_INSUFFICIENT_RESOURCES;
-                      goto cleanup;
-                  }
-
-                  Status = ZwEnumerateValueKey(ChildKey3,
-                                               ChildKeyIndex3,
-                                               KeyValueBasicInformation,
-                                               KeyNameInformation,
-                                               KeyNameInformationLength,
-                                               &RequiredLength);
-              }
-              else
-                  goto cleanup;
-
-              ChildKeyIndex3++;
-
-              if (!NT_SUCCESS(Status))
-                  goto cleanup;
-
-              KeyNameInformation->Name[KeyNameInformation->NameLength / sizeof(WCHAR)] = UNICODE_NULL;
-
-              /* Skip translated entries */
-              if (wcsstr(KeyNameInformation->Name, L".Translated"))
-              {
-                  ExFreePool(KeyNameInformation);
-                  continue;
-              }
-
-              ExFreePool(KeyNameInformation);
-
-              if (IopCheckForResourceConflict(ResourceList,
-                                              (PCM_RESOURCE_LIST)KeyValueInformation->Data,
-                                              Silent,
-                                              ConflictingDescriptor))
-              {
-                  ExFreePool(KeyValueInformation);
-                  Status = STATUS_CONFLICTING_ADDRESSES;
-                  goto cleanup;
-              }
-
-              ExFreePool(KeyValueInformation);
-          }
-      }
-   }
-
-cleanup:
-   if (ResourceMapKey != INVALID_HANDLE_VALUE)
-       ZwClose(ResourceMapKey);
-   if (ChildKey2 != INVALID_HANDLE_VALUE)
-       ZwClose(ChildKey2);
-   if (ChildKey3 != INVALID_HANDLE_VALUE)
-       ZwClose(ChildKey3);
-
-   if (Status == STATUS_NO_MORE_ENTRIES)
-       Status = STATUS_SUCCESS;
-
-   return Status;
-}
-
-BOOLEAN
-IopCheckDescriptorForConflict(PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc, OPTIONAL PCM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDescriptor)
-{
-   CM_RESOURCE_LIST CmList;
-   NTSTATUS Status;
-
-   CmList.Count = 1;
-   CmList.List[0].InterfaceType = InterfaceTypeUndefined;
-   CmList.List[0].BusNumber = 0;
-   CmList.List[0].PartialResourceList.Version = 1;
-   CmList.List[0].PartialResourceList.Revision = 1;
-   CmList.List[0].PartialResourceList.Count = 1;
-   CmList.List[0].PartialResourceList.PartialDescriptors[0] = *CmDesc;
-
-   Status = IopDetectResourceConflict(&CmList, TRUE, ConflictingDescriptor);
-   if (Status == STATUS_CONFLICTING_ADDRESSES)
-       return TRUE;
-
-   return FALSE;
-}
-
-BOOLEAN
-IopFindBusNumberResource(
-   IN PIO_RESOURCE_DESCRIPTOR IoDesc,
-   OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc)
-{
-   ULONG Start;
-   CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc;
-
-   ASSERT(IoDesc->Type == CmDesc->Type);
-   ASSERT(IoDesc->Type == CmResourceTypeBusNumber);
-
-   for (Start = IoDesc->u.BusNumber.MinBusNumber;
-        Start < IoDesc->u.BusNumber.MaxBusNumber;
-        Start++)
-   {
-        CmDesc->u.BusNumber.Length = IoDesc->u.BusNumber.Length;
-        CmDesc->u.BusNumber.Start = Start;
-
-        if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc))
-        {
-            Start += ConflictingDesc.u.BusNumber.Start + ConflictingDesc.u.BusNumber.Length;
-        }
-        else
-        {
-            return TRUE;
-        }
-   }
-
-   return FALSE;
-}
-
-BOOLEAN
-IopFindMemoryResource(
-   IN PIO_RESOURCE_DESCRIPTOR IoDesc,
-   OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc)
-{
-   ULONGLONG Start;
-   CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc;
-
-   ASSERT(IoDesc->Type == CmDesc->Type);
-   ASSERT(IoDesc->Type == CmResourceTypeMemory);
-
-   for (Start = IoDesc->u.Memory.MinimumAddress.QuadPart;
-        Start < IoDesc->u.Memory.MaximumAddress.QuadPart;
-        Start++)
-   {
-        CmDesc->u.Memory.Length = IoDesc->u.Memory.Length;
-        CmDesc->u.Memory.Start.QuadPart = Start;
-
-        if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc))
-        {
-            Start += ConflictingDesc.u.Memory.Start.QuadPart + ConflictingDesc.u.Memory.Length;
-        }
-        else
-        {
-            return TRUE;
-        }
-   }
-
-   return FALSE;
-}
-
-BOOLEAN
-IopFindPortResource(
-   IN PIO_RESOURCE_DESCRIPTOR IoDesc,
-   OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc)
-{
-   ULONGLONG Start;
-   CM_PARTIAL_RESOURCE_DESCRIPTOR ConflictingDesc;
-
-   ASSERT(IoDesc->Type == CmDesc->Type);
-   ASSERT(IoDesc->Type == CmResourceTypePort);
-
-   for (Start = IoDesc->u.Port.MinimumAddress.QuadPart;
-        Start < IoDesc->u.Port.MaximumAddress.QuadPart;
-        Start++)
-   {
-        CmDesc->u.Port.Length = IoDesc->u.Port.Length;
-        CmDesc->u.Port.Start.QuadPart = Start;
-
-        if (IopCheckDescriptorForConflict(CmDesc, &ConflictingDesc))
-        {
-            Start += ConflictingDesc.u.Port.Start.QuadPart + ConflictingDesc.u.Port.Length;
-        }
-        else
-        {
-            return TRUE;
-        }
-   }
-
-   return FALSE;
-}
-
-BOOLEAN
-IopFindDmaResource(
-   IN PIO_RESOURCE_DESCRIPTOR IoDesc,
-   OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc)
-{
-   ULONG Channel;
-
-   ASSERT(IoDesc->Type == CmDesc->Type);
-   ASSERT(IoDesc->Type == CmResourceTypeDma);
-
-   for (Channel = IoDesc->u.Dma.MinimumChannel;
-        Channel < IoDesc->u.Dma.MaximumChannel;
-        Channel++)
-   {
-        CmDesc->u.Dma.Channel = Channel;
-        CmDesc->u.Dma.Port = 0;
-
-        if (!IopCheckDescriptorForConflict(CmDesc, NULL))
-            return TRUE;
-   }
-
-   return FALSE;
-}
-
-BOOLEAN
-IopFindInterruptResource(
-   IN PIO_RESOURCE_DESCRIPTOR IoDesc,
-   OUT PCM_PARTIAL_RESOURCE_DESCRIPTOR CmDesc)
-{
-   ULONG Vector;
-
-   ASSERT(IoDesc->Type == CmDesc->Type);
-   ASSERT(IoDesc->Type == CmResourceTypeInterrupt);
-
-   for (Vector = IoDesc->u.Interrupt.MinimumVector;
-        Vector < IoDesc->u.Interrupt.MaximumVector;
-        Vector++)
-   {
-        CmDesc->u.Interrupt.Vector = Vector;
-        CmDesc->u.Interrupt.Level = Vector;
-        CmDesc->u.Interrupt.Affinity = (KAFFINITY)-1;
-
-        if (!IopCheckDescriptorForConflict(CmDesc, NULL))
-            return TRUE;
-   }
-
-   return FALSE;
-}
-
+ *     This method can create nested trees, so parent of RegistryPath can
+ *     be not existant, and will be created if needed.
+ */
 NTSTATUS
-IopCreateResourceListFromRequirements(
-   IN PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList,
-   OUT PCM_RESOURCE_LIST *ResourceList)
+NTAPI
+IopCreateDeviceKeyPath(IN PCUNICODE_STRING RegistryPath,
+                       IN ULONG CreateOptions,
+                       OUT PHANDLE Handle)
 {
-   ULONG i, ii, Size;
-   PCM_PARTIAL_RESOURCE_DESCRIPTOR ResDesc;
-
-   Size = FIELD_OFFSET(CM_RESOURCE_LIST, List);
-   for (i = 0; i < RequirementsList->AlternativeLists; i++)
-   {
-      PIO_RESOURCE_LIST ResList = &RequirementsList->List[i];
-      Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors)
-            + ResList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-   }
-
-   *ResourceList = ExAllocatePool(PagedPool, Size);
-   if (!*ResourceList)
-       return STATUS_INSUFFICIENT_RESOURCES;
-
-   (*ResourceList)->Count = 1;
-   (*ResourceList)->List[0].BusNumber = RequirementsList->BusNumber;
-   (*ResourceList)->List[0].InterfaceType = RequirementsList->InterfaceType;
-   (*ResourceList)->List[0].PartialResourceList.Version = 1;
-   (*ResourceList)->List[0].PartialResourceList.Revision = 1;
-   (*ResourceList)->List[0].PartialResourceList.Count = 0;
-
-   ResDesc = &(*ResourceList)->List[0].PartialResourceList.PartialDescriptors[0];
+    UNICODE_STRING EnumU = RTL_CONSTANT_STRING(ENUM_ROOT);
+    HANDLE hParent = NULL, hKey;
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    UNICODE_STRING KeyName;
+    LPCWSTR Current, Last;
+    ULONG dwLength;
+    NTSTATUS Status;
 
-   for (i = 0; i < RequirementsList->AlternativeLists; i++)
-   {
-      PIO_RESOURCE_LIST ResList = &RequirementsList->List[i];
-      for (ii = 0; ii < ResList->Count; ii++)
-      {
-         PIO_RESOURCE_DESCRIPTOR ReqDesc = &ResList->Descriptors[ii];
+    /* Assume failure */
+    *Handle = NULL;
 
-         /* FIXME: Handle alternate ranges */
-         if (ReqDesc->Option == IO_RESOURCE_ALTERNATIVE)
-             continue;
+    /* Open root key for device instances */
+    Status = IopOpenRegistryKeyEx(&hParent, NULL, &EnumU, KEY_CREATE_SUB_KEY);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("ZwOpenKey('%wZ') failed with status 0x%08lx\n", &EnumU, Status);
+        return Status;
+    }
 
-         ResDesc->Type = ReqDesc->Type;
-         ResDesc->Flags = ReqDesc->Flags;
-         ResDesc->ShareDisposition = ReqDesc->ShareDisposition;
+    Current = KeyName.Buffer = RegistryPath->Buffer;
+    Last = &RegistryPath->Buffer[RegistryPath->Length / sizeof(WCHAR)];
 
-         switch (ReqDesc->Type)
-         {
-            case CmResourceTypeInterrupt:
-              if (!IopFindInterruptResource(ReqDesc, ResDesc))
-              {
-                  DPRINT1("Failed to find an available interrupt resource (0x%x to 0x%x)\n",
-                           ReqDesc->u.Interrupt.MinimumVector, ReqDesc->u.Interrupt.MaximumVector);
-
-                  if (ReqDesc->Option == 0)
-                  {
-                      ExFreePool(*ResourceList);
-                      return STATUS_CONFLICTING_ADDRESSES;
-                  }
-              }
-              break;
+    /* Go up to the end of the string */
+    while (Current <= Last)
+    {
+        if (Current != Last && *Current != '\\')
+        {
+            /* Not the end of the string and not a separator */
+            Current++;
+            continue;
+        }
 
-            case CmResourceTypePort:
-              if (!IopFindPortResource(ReqDesc, ResDesc))
-              {
-                  DPRINT1("Failed to find an available port resource (0x%x to 0x%x length: 0x%x)\n",
-                          ReqDesc->u.Port.MinimumAddress.QuadPart, ReqDesc->u.Port.MaximumAddress.QuadPart,
-                          ReqDesc->u.Port.Length);
-
-                  if (ReqDesc->Option == 0)
-                  {
-                      ExFreePool(*ResourceList);
-                      return STATUS_CONFLICTING_ADDRESSES;
-                  }
-              }
-              break;
+        /* Prepare relative key name */
+        dwLength = (ULONG_PTR)Current - (ULONG_PTR)KeyName.Buffer;
+        KeyName.MaximumLength = KeyName.Length = dwLength;
+        DPRINT("Create '%wZ'\n", &KeyName);
 
-            case CmResourceTypeMemory:
-              if (!IopFindMemoryResource(ReqDesc, ResDesc))
-              {
-                  DPRINT1("Failed to find an available memory resource (0x%x to 0x%x length: 0x%x)\n",
-                          ReqDesc->u.Memory.MinimumAddress.QuadPart, ReqDesc->u.Memory.MaximumAddress.QuadPart,
-                          ReqDesc->u.Memory.Length);
-
-                  if (ReqDesc->Option == 0)
-                  {
-                      ExFreePool(*ResourceList);
-                      return STATUS_CONFLICTING_ADDRESSES;
-                  }
-              }
-              break;
+        /* Open key */
+        InitializeObjectAttributes(&ObjectAttributes,
+                                   &KeyName,
+                                   OBJ_CASE_INSENSITIVE,
+                                   hParent,
+                                   NULL);
+        Status = ZwCreateKey(&hKey,
+                             Current == Last ? KEY_ALL_ACCESS : KEY_CREATE_SUB_KEY,
+                             &ObjectAttributes,
+                             0,
+                             NULL,
+                             CreateOptions,
+                             NULL);
 
-            case CmResourceTypeBusNumber:
-              if (!IopFindBusNumberResource(ReqDesc, ResDesc))
-              {
-                  DPRINT1("Failed to find an available bus number resource (0x%x to 0x%x length: 0x%x)\n",
-                          ReqDesc->u.BusNumber.MinBusNumber, ReqDesc->u.BusNumber.MaxBusNumber,
-                          ReqDesc->u.BusNumber.Length);
-
-                  if (ReqDesc->Option == 0)
-                  {
-                      ExFreePool(*ResourceList);
-                      return STATUS_CONFLICTING_ADDRESSES;
-                  }
-              }
-              break;
+        /* Close parent key handle, we don't need it anymore */
+        if (hParent)
+            ZwClose(hParent);
 
-            case CmResourceTypeDma:
-              if (!IopFindDmaResource(ReqDesc, ResDesc))
-              {
-                  DPRINT1("Failed to find an available dma resource (0x%x to 0x%x)\n",
-                          ReqDesc->u.Dma.MinimumChannel, ReqDesc->u.Dma.MaximumChannel);
-
-                  if (ReqDesc->Option == 0)
-                  {
-                      ExFreePool(*ResourceList);
-                      return STATUS_CONFLICTING_ADDRESSES;
-                  }
-              }
-              break;
+        /* Key opening/creating failed? */
+        if (!NT_SUCCESS(Status))
+        {
+            DPRINT1("ZwCreateKey('%wZ') failed with status 0x%08lx\n", &KeyName, Status);
+            return Status;
+        }
 
-            default:
-              DPRINT1("Unsupported resource type: %x\n", ReqDesc->Type);
-              break;
-         }
+        /* Check if it is the end of the string */
+        if (Current == Last)
+        {
+            /* Yes, return success */
+            *Handle = hKey;
+            return STATUS_SUCCESS;
+        }
 
-         (*ResourceList)->List[0].PartialResourceList.Count++;
-         ResDesc++;
-      }
-   }
+        /* Start with this new parent key */
+        hParent = hKey;
+        Current++;
+        KeyName.Buffer = (LPWSTR)Current;
+    }
 
-   return STATUS_SUCCESS;
+    return STATUS_UNSUCCESSFUL;
 }
 
 NTSTATUS
-IopAssignDeviceResources(
-   IN PDEVICE_NODE DeviceNode,
-   OUT ULONG *pRequiredSize)
+IopSetDeviceInstanceData(HANDLE InstanceKey,
+                         PDEVICE_NODE DeviceNode)
 {
-   PCM_PARTIAL_RESOURCE_LIST pPartialResourceList;
-   ULONG Size;
-   ULONG i;
-   ULONG j;
+   OBJECT_ATTRIBUTES ObjectAttributes;
+   UNICODE_STRING KeyName;
+   HANDLE LogConfKey;
+   ULONG ResCount;
+   ULONG ResultLength;
    NTSTATUS Status;
+   HANDLE ControlHandle;
 
-   if (!DeviceNode->BootResources && !DeviceNode->ResourceRequirements)
-   {
-      /* No resource needed for this device */
-      DeviceNode->ResourceList = NULL;
-      *pRequiredSize = 0;
-      return STATUS_SUCCESS;
-   }
-
-   /* Fill DeviceNode->ResourceList
-    * FIXME: the PnP arbiter should go there!
-    * Actually, use the BootResources if provided, else the resource requirements
-    */
+   DPRINT("IopSetDeviceInstanceData() called\n");
 
-   if (DeviceNode->BootResources)
+   /* 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,
+                        0,
+                        NULL);
+   if (NT_SUCCESS(Status))
    {
-      /* Browse the boot resources to know if we have some custom structures */
-      Size = FIELD_OFFSET(CM_RESOURCE_LIST, List);
-      for (i = 0; i < DeviceNode->BootResources->Count; i++)
+      /* Set 'BootConfig' value */
+      if (DeviceNode->BootResources != NULL)
       {
-         pPartialResourceList = &DeviceNode->BootResources->List[i].PartialResourceList;
-         Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors)
-            + pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-         for (j = 0; j < pPartialResourceList->Count; j++)
+         ResCount = DeviceNode->BootResources->Count;
+         if (ResCount != 0)
          {
-            if (pPartialResourceList->PartialDescriptors[j].Type == CmResourceTypeDeviceSpecific)
-               Size += pPartialResourceList->PartialDescriptors[j].u.DeviceSpecificData.DataSize;
+            RtlInitUnicodeString(&KeyName, L"BootConfig");
+            Status = ZwSetValueKey(LogConfKey,
+                                   &KeyName,
+                                   0,
+                                   REG_RESOURCE_LIST,
+                                   DeviceNode->BootResources,
+                                   PnpDetermineResourceListSize(DeviceNode->BootResources));
          }
       }
 
-      DeviceNode->ResourceList = ExAllocatePool(PagedPool, Size);
-      if (!DeviceNode->ResourceList)
-      {
-         Status = STATUS_NO_MEMORY;
-         goto ByeBye;
-      }
-      RtlCopyMemory(DeviceNode->ResourceList, DeviceNode->BootResources, Size);
-
-      Status = IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL);
-      if (NT_SUCCESS(Status) || !DeviceNode->ResourceRequirements)
-      {
-          if (!NT_SUCCESS(Status) && !DeviceNode->ResourceRequirements)
-          {
-              DPRINT1("Using conflicting boot resources because no requirements were supplied!\n");
-          }
-
-          *pRequiredSize = Size;
-          return STATUS_SUCCESS;
-      }
-      else
+      /* Set 'BasicConfigVector' value */
+      if (DeviceNode->ResourceRequirements != NULL &&
+         DeviceNode->ResourceRequirements->ListSize != 0)
       {
-          DPRINT1("Boot resources for %wZ cause a resource conflict!\n", &DeviceNode->InstancePath);
-          ExFreePool(DeviceNode->ResourceList);
+         RtlInitUnicodeString(&KeyName, L"BasicConfigVector");
+         Status = ZwSetValueKey(LogConfKey,
+                                &KeyName,
+                                0,
+                                REG_RESOURCE_REQUIREMENTS_LIST,
+                                DeviceNode->ResourceRequirements,
+                                DeviceNode->ResourceRequirements->ListSize);
       }
-   }
-
-   Status = IopCreateResourceListFromRequirements(DeviceNode->ResourceRequirements,
-                                                  &DeviceNode->ResourceList);
-   if (!NT_SUCCESS(Status))
-       goto ByeBye;
-
-   Size = FIELD_OFFSET(CM_RESOURCE_LIST, List);
-   for (i = 0; i < DeviceNode->ResourceList->Count; i++)
-   {
-      pPartialResourceList = &DeviceNode->ResourceList->List[i].PartialResourceList;
-      Size += FIELD_OFFSET(CM_FULL_RESOURCE_DESCRIPTOR, PartialResourceList.PartialDescriptors)
-          + pPartialResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
-   }
-
-   Status = IopDetectResourceConflict(DeviceNode->ResourceList, FALSE, NULL);
-   if (!NT_SUCCESS(Status))
-       goto ByeBye;
-
-   *pRequiredSize = Size;
-   return STATUS_SUCCESS;
 
-ByeBye:
-   if (DeviceNode->ResourceList)
-   {
-      ExFreePool(DeviceNode->ResourceList);
-      DeviceNode->ResourceList = NULL;
+      ZwClose(LogConfKey);
    }
-   *pRequiredSize = 0;
-   return Status;
-}
-
-
-NTSTATUS
-IopTranslateDeviceResources(
-   IN PDEVICE_NODE DeviceNode,
-   IN ULONG RequiredSize)
-{
-   PCM_PARTIAL_RESOURCE_LIST pPartialResourceList;
-   PCM_PARTIAL_RESOURCE_DESCRIPTOR DescriptorRaw, DescriptorTranslated;
-   ULONG i, j;
-   NTSTATUS Status;
 
-   if (!DeviceNode->ResourceList)
-   {
-      DeviceNode->ResourceListTranslated = NULL;
-      return STATUS_SUCCESS;
-   }
+   /* 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));
+  }
 
-   /* That's easy to translate a resource list. Just copy the
-    * untranslated one and change few fields in the copy
-    */
-   DeviceNode->ResourceListTranslated = ExAllocatePool(PagedPool, RequiredSize);
-   if (!DeviceNode->ResourceListTranslated)
-   {
-      Status =STATUS_NO_MEMORY;
-      goto cleanup;
-   }
-   RtlCopyMemory(DeviceNode->ResourceListTranslated, DeviceNode->ResourceList, RequiredSize);
+   /* 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);
 
-   for (i = 0; i < DeviceNode->ResourceList->Count; i++)
-   {
-      pPartialResourceList = &DeviceNode->ResourceList->List[i].PartialResourceList;
-      for (j = 0; j < pPartialResourceList->Count; j++)
-      {
-         DescriptorRaw = &pPartialResourceList->PartialDescriptors[j];
-         DescriptorTranslated = &DeviceNode->ResourceListTranslated->List[i].PartialResourceList.PartialDescriptors[j];
-         switch (DescriptorRaw->Type)
-         {
-            case CmResourceTypePort:
-            {
-               ULONG AddressSpace = 1; /* IO space */
-               if (!HalTranslateBusAddress(
-                  DeviceNode->ResourceList->List[i].InterfaceType,
-                  DeviceNode->ResourceList->List[i].BusNumber,
-                  DescriptorRaw->u.Port.Start,
-                  &AddressSpace,
-                  &DescriptorTranslated->u.Port.Start))
-               {
-                  Status = STATUS_UNSUCCESSFUL;
-                  goto cleanup;
-               }
-               break;
-            }
-            case CmResourceTypeInterrupt:
-            {
-               DescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector(
-                  DeviceNode->ResourceList->List[i].InterfaceType,
-                  DeviceNode->ResourceList->List[i].BusNumber,
-                  DescriptorRaw->u.Interrupt.Level,
-                  DescriptorRaw->u.Interrupt.Vector,
-                  (PKIRQL)&DescriptorTranslated->u.Interrupt.Level,
-                  &DescriptorRaw->u.Interrupt.Affinity);
-               break;
-            }
-            case CmResourceTypeMemory:
-            {
-               ULONG AddressSpace = 0; /* Memory space */
-               if (!HalTranslateBusAddress(
-                  DeviceNode->ResourceList->List[i].InterfaceType,
-                  DeviceNode->ResourceList->List[i].BusNumber,
-                  DescriptorRaw->u.Memory.Start,
-                  &AddressSpace,
-                  &DescriptorTranslated->u.Memory.Start))
-               {
-                  Status = STATUS_UNSUCCESSFUL;
-                  goto cleanup;
-               }
-            }
+   if (NT_SUCCESS(Status))
+       ZwClose(ControlHandle);
 
-            case CmResourceTypeDma:
-            case CmResourceTypeBusNumber:
-            case CmResourceTypeDeviceSpecific:
-               /* Nothing to do */
-               break;
-            default:
-               DPRINT1("Unknown resource descriptor type 0x%x\n", DescriptorRaw->Type);
-               Status = STATUS_NOT_IMPLEMENTED;
-               goto cleanup;
-         }
-      }
-   }
-   return STATUS_SUCCESS;
+  DPRINT("IopSetDeviceInstanceData() done\n");
 
-cleanup:
-   /* Yes! Also delete ResourceList because ResourceList and
-    * ResourceListTranslated should be a pair! */
-   ExFreePool(DeviceNode->ResourceList);
-   DeviceNode->ResourceList = NULL;
-   if (DeviceNode->ResourceListTranslated)
-   {
-      ExFreePool(DeviceNode->ResourceListTranslated);
-      DeviceNode->ResourceList = NULL;
-   }
-   return Status;
+  return Status;
 }
 
-
 /*
  * IopGetParentIdPrefix
  *
@@ -2176,7 +1289,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
    /*
     * Create registry key for the instance id, if it doesn't exist yet
     */
-   Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, &InstanceKey);
+   Status = IopCreateDeviceKeyPath(&DeviceNode->InstancePath, 0, &InstanceKey);
    if (!NT_SUCCESS(Status))
    {
       DPRINT1("Failed to create the instance key! (Status %lx)\n", Status);
@@ -2406,7 +1519,7 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
    {
       DeviceNode->BootResources =
          (PCM_RESOURCE_LIST)IoStatusBlock.Information;
-      DeviceNode->Flags |= DNF_HAS_BOOT_CONFIG;
+      IopDeviceNodeSetFlag(DeviceNode, DNF_HAS_BOOT_CONFIG);
    }
    else
    {
@@ -2425,10 +1538,6 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
    {
       DeviceNode->ResourceRequirements =
          (PIO_RESOURCE_REQUIREMENTS_LIST)IoStatusBlock.Information;
-      if (IoStatusBlock.Information)
-         IopDeviceNodeSetFlag(DeviceNode, DNF_RESOURCE_REPORTED);
-      else
-         IopDeviceNodeSetFlag(DeviceNode, DNF_NO_RESOURCE_REQUIRED);
    }
    else
    {
@@ -2436,7 +1545,6 @@ IopActionInterrogateDeviceStack(PDEVICE_NODE DeviceNode,
       DeviceNode->ResourceRequirements = NULL;
    }
 
-
    if (InstanceKey != NULL)
    {
       IopSetDeviceInstanceData(InstanceKey, DeviceNode);
@@ -2700,14 +1808,8 @@ IopActionConfigureChildServices(PDEVICE_NODE DeviceNode,
             DPRINT1("%wZ is using parent bus driver (%wZ)\n", &DeviceNode->InstancePath, &ParentDeviceNode->ServiceName);
 
             DeviceNode->ServiceName.Length = 0;
-            DeviceNode->ServiceName.MaximumLength = ParentDeviceNode->ServiceName.MaximumLength;
-            DeviceNode->ServiceName.Buffer = ExAllocatePool(PagedPool, DeviceNode->ServiceName.MaximumLength);
-            if (!DeviceNode->ServiceName.Buffer)
-                return STATUS_SUCCESS;
-
-            RtlCopyUnicodeString(&DeviceNode->ServiceName, &ParentDeviceNode->ServiceName);
-
-            IopDeviceNodeSetFlag(DeviceNode, DNF_LEGACY_DRIVER);
+            DeviceNode->ServiceName.MaximumLength = 0;
+            DeviceNode->ServiceName.Buffer = NULL;
          }
          else if (ClassGUID.Length != 0)
          {
@@ -2785,11 +1887,24 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode,
       DPRINT("Stop\n");
       return STATUS_UNSUCCESSFUL;
    }
-#endif
-
-   if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED) &&
-       !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) &&
-       !IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED))
+#endif
+   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 = 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;
@@ -2832,24 +1947,8 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode,
       /* Driver is loaded and initialized at this point */
       if (NT_SUCCESS(Status))
       {
-         /* Attach lower level filter drivers. */
-         IopAttachFilterDrivers(DeviceNode, TRUE);
-         /* Initialize the function driver for the device node */
-         Status = IopInitializeDevice(DeviceNode, DriverObject);
-
-         if (NT_SUCCESS(Status))
-         {
-            /* Attach upper level filter drivers. */
-            IopAttachFilterDrivers(DeviceNode, FALSE);
-            IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
-
-            Status = IopStartDevice(DeviceNode);
-         }
-         else
-         {
-            DPRINT1("IopInitializeDevice(%wZ) failed with status 0x%08x\n",
-                    &DeviceNode->InstancePath, Status);
-         }
+          /* Initialize the device, including all filters */
+          Status = PipCallDriverAddDevice(DeviceNode, FALSE, DriverObject);
       }
       else
       {
@@ -2866,11 +1965,6 @@ IopActionInitChildServices(PDEVICE_NODE DeviceNode,
          }
       }
    }
-   else
-   {
-      DPRINT("Device %wZ is disabled or already initialized\n",
-         &DeviceNode->InstancePath);
-   }
 
    return STATUS_SUCCESS;
 }
@@ -3067,7 +2161,7 @@ IopEnumerateDetectedDevices(
             BootResourcesLength = pValueInformation->DataLength;
          else
             BootResourcesLength = ParentBootResourcesLength
-               + pValueInformation->DataLength
+            + pValueInformation->DataLength
                - Header;
          BootResources = ExAllocatePool(PagedPool, BootResourcesLength);
          if (!BootResources)
@@ -3499,7 +2593,8 @@ cleanup:
 #endif
 }
 
-static NTSTATUS INIT_FUNCTION
+NTSTATUS
+NTAPI
 IopUpdateRootKey(VOID)
 {
    UNICODE_STRING EnumU = RTL_CONSTANT_STRING(L"\\Registry\\Machine\\SYSTEM\\CurrentControlSet\\Enum");
@@ -3606,6 +2701,131 @@ IopOpenRegistryKeyEx(PHANDLE KeyHandle,
     return Status;
 }
 
+NTSTATUS
+NTAPI
+IopCreateRegistryKeyEx(OUT PHANDLE Handle,
+                       IN HANDLE RootHandle OPTIONAL,
+                       IN PUNICODE_STRING KeyName,
+                       IN ACCESS_MASK DesiredAccess,
+                       IN ULONG CreateOptions,
+                       OUT PULONG Disposition OPTIONAL)
+{
+    OBJECT_ATTRIBUTES ObjectAttributes;
+    ULONG KeyDisposition, RootHandleIndex = 0, i = 1, NestedCloseLevel = 0, Length;
+    HANDLE HandleArray[2];
+    BOOLEAN Recursing = TRUE;
+    PWCHAR pp, p, p1;
+    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,
+                               OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
+                               RootHandle,
+                               NULL);
+    Status = ZwCreateKey(&HandleArray[i],
+                         DesiredAccess,
+                         &ObjectAttributes,
+                         0,
+                         NULL,
+                         CreateOptions,
+                         &KeyDisposition);
+
+    /* Now we check if this failed */
+    if ((Status == STATUS_OBJECT_NAME_NOT_FOUND) && (RootHandle))
+    {
+        /* 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 = (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,
+                                           OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE,
+                                           HandleArray[RootHandleIndex],
+                                           NULL);
+                Status = ZwCreateKey(&HandleArray[i],
+                                     DesiredAccess,
+                                     &ObjectAttributes,
+                                     0,
+                                     NULL,
+                                     CreateOptions,
+                                     &KeyDisposition);
+                if (NT_SUCCESS(Status))
+                {
+                    /* It worked, we have one more handle */
+                    NestedCloseLevel++;
+                }
+                else
+                {
+                    /* Parent key creation failed, abandon loop */
+                    Recursing = FALSE;
+                    continue;
+                }
+            }
+            else
+            {
+                /* We don't have a parent name, probably corrupted key name */
+                Status = STATUS_INVALID_PARAMETER;
+                Recursing = FALSE;
+                continue;
+            }
+            
+            /* Now see if there's more parents to create */
+            p1 = p + 1;
+            if ((p == pp) || (p1 == pp))
+            {
+                /* We're done, hopefully successfully, so stop */
+                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))
+    {
+        /* Return the target handle (we closed all the parent ones) and disposition */
+        *Handle = HandleArray[i];
+        if (Disposition) *Disposition = KeyDisposition;
+    }
+    
+    /* Return the success state */
+    return Status;
+}
+
 NTSTATUS
 NTAPI
 IopGetRegistryValue(IN HANDLE Handle,
@@ -3651,95 +2871,6 @@ IopGetRegistryValue(IN HANDLE Handle,
     return STATUS_SUCCESS;
 }
 
-static NTSTATUS INIT_FUNCTION
-NTAPI
-PnpDriverInitializeEmpty(IN struct _DRIVER_OBJECT *DriverObject, IN PUNICODE_STRING RegistryPath)
-{
-   return STATUS_SUCCESS;
-}
-
-VOID INIT_FUNCTION
-PnpInit(VOID)
-{
-    PDEVICE_OBJECT Pdo;
-    NTSTATUS Status;
-
-    DPRINT("PnpInit()\n");
-
-    KeInitializeSpinLock(&IopDeviceTreeLock);
-       ExInitializeFastMutex(&IopBusTypeGuidListLock);
-       
-    /* Initialize the Bus Type GUID List */
-    IopBusTypeGuidList = ExAllocatePool(NonPagedPool, sizeof(IO_BUS_TYPE_GUID_LIST));
-    if (!IopBusTypeGuidList) {
-       DPRINT1("ExAllocatePool() failed\n");
-       KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0);
-    }
-
-    RtlZeroMemory(IopBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST));
-    ExInitializeFastMutex(&IopBusTypeGuidList->Lock);
-
-    /* Initialize PnP-Event notification support */
-    Status = IopInitPlugPlayEvents();
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("IopInitPlugPlayEvents() failed\n");
-        KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
-    }
-
-    /*
-    * Create root device node
-    */
-
-    Status = IopCreateDriver(NULL, PnpDriverInitializeEmpty, NULL, 0, 0, &IopRootDriverObject);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("IoCreateDriverObject() failed\n");
-        KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
-    }
-
-    Status = IoCreateDevice(IopRootDriverObject, 0, NULL, FILE_DEVICE_CONTROLLER,
-        0, FALSE, &Pdo);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("IoCreateDevice() failed\n");
-        KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
-    }
-
-    Status = IopCreateDeviceNode(NULL, Pdo, NULL, &IopRootDeviceNode);
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("Insufficient resources\n");
-        KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
-    }
-
-    if (!RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath,
-        L"HTREE\\ROOT\\0"))
-    {
-        DPRINT1("Failed to create the instance path!\n");
-        KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, STATUS_NO_MEMORY, 0, 0, 0);
-    }
-
-    /* Report the device to the user-mode pnp manager */
-    IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL,
-        &IopRootDeviceNode->InstancePath);
-
-    IopRootDeviceNode->PhysicalDeviceObject->Flags |= DO_BUS_ENUMERATED_DEVICE;
-    PnpRootDriverEntry(IopRootDriverObject, NULL);
-    IopRootDeviceNode->PhysicalDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING;
-    IopRootDriverObject->DriverExtension->AddDevice(
-        IopRootDriverObject,
-        IopRootDeviceNode->PhysicalDeviceObject);
-
-    /* Move information about devices detected by Freeloader to SYSTEM\CurrentControlSet\Root\ */
-    Status = IopUpdateRootKey();
-    if (!NT_SUCCESS(Status))
-    {
-        DPRINT1("IopUpdateRootKey() failed\n");
-        KeBugCheckEx(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
-    }
-}
-
 RTL_GENERIC_COMPARE_RESULTS
 NTAPI
 PiCompareInstancePath(IN PRTL_AVL_TABLE Table,
@@ -3827,296 +2958,498 @@ 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 **********************************************************/
 
-/*
- * @implemented
- */
 NTSTATUS
 NTAPI
-IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
-                    IN DEVICE_REGISTRY_PROPERTY DeviceProperty,
-                    IN ULONG BufferLength,
-                    OUT PVOID PropertyBuffer,
-                    OUT PULONG ResultLength)
+PnpBusTypeGuidGet(IN USHORT Index,
+                  IN LPGUID BusTypeGuid)
 {
-    PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject);
-    DEVICE_CAPABILITIES DeviceCaps;
-    ULONG Length;
-    PVOID Data = NULL;
-    PWSTR Ptr;
-    NTSTATUS Status;
-    POBJECT_NAME_INFORMATION ObjectNameInfo = NULL;
-    ULONG RequiredLength, ObjectNameInfoLength;
+    NTSTATUS Status = STATUS_SUCCESS;
 
-    DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty);
+    /* Acquire the lock */
+    ExAcquireFastMutex(&PnpBusTypeGuidList->Lock);
+    
+    /* Validate size */
+    if (Index < PnpBusTypeGuidList->GuidCount)
+    {
+        /* Copy the data */
+        RtlCopyMemory(BusTypeGuid, &PnpBusTypeGuidList->Guids[Index], sizeof(GUID));
+    }
+    else
+    {
+        /* Failure path */
+        Status = STATUS_OBJECT_NAME_NOT_FOUND;
+    }
+    
+    /* Release lock and return status */
+    ExReleaseFastMutex(&PnpBusTypeGuidList->Lock);
+    return Index;
+}
 
-    *ResultLength = 0;
+NTSTATUS
+NTAPI
+PpIrpQueryCapabilities(IN PDEVICE_OBJECT DeviceObject,
+                       OUT PDEVICE_CAPABILITIES DeviceCaps)
+{
+    PAGED_CODE();
+    PVOID Dummy;
+    IO_STACK_LOCATION Stack;
+    
+    /* 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.MajorFunction = IRP_MJ_PNP;
+    Stack.MinorFunction = IRP_MN_QUERY_CAPABILITIES;
+    Stack.Parameters.DeviceCapabilities.Capabilities = DeviceCaps;
+    
+    /* Send the IRP */
+    return IopSynchronousCall(DeviceObject, &Stack, &Dummy);
+}
 
-    if (DeviceNode == NULL)
-        return STATUS_INVALID_DEVICE_REQUEST;
+NTSTATUS
+NTAPI
+PnpDeviceObjectToDeviceInstance(IN PDEVICE_OBJECT DeviceObject,
+                                IN PHANDLE DeviceInstanceHandle,
+                                IN ACCESS_MASK DesiredAccess)
+{
+    NTSTATUS Status;
+    HANDLE KeyHandle;
+    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))
+    {
+        /* Get the instance key */
+        Status = IopOpenRegistryKeyEx(DeviceInstanceHandle,
+                                      KeyHandle,
+                                      &DeviceNode->InstancePath,
+                                      DesiredAccess);
+    }
+    else
+    {
+        /* Fail */
+        Status = STATUS_INVALID_DEVICE_REQUEST;
+    }
+    
+    /* Close the handle and return status */
+    ZwClose(KeyHandle);
+    return Status;
+}
 
-    switch (DeviceProperty)
+ULONG
+NTAPI
+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++)
     {
-    case DevicePropertyBusNumber:
-        Length = sizeof(ULONG);
-        Data = &DeviceNode->ChildBusNumber;
-        break;
-
-        /* Complete, untested */
-    case DevicePropertyBusTypeGuid:
-        /* Sanity check */
-        if ((DeviceNode->ChildBusTypeIndex != 0xFFFF) &&
-            (DeviceNode->ChildBusTypeIndex < IopBusTypeGuidList->GuidCount))
+        /* 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++)
         {
-            /* Return the GUID */
-            *ResultLength = sizeof(GUID);
-
-            /* Check if the buffer given was large enough */
-            if (BufferLength < *ResultLength)
+            /* Start with the minimum size possible */
+            EntrySize = sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR);
+            
+            /* Check if there is extra data */
+            if (PartialDescriptor->Type == CmResourceTypeDeviceSpecific)
             {
-                return STATUS_BUFFER_TOO_SMALL;
+                /* Add that data */
+                EntrySize += PartialDescriptor->u.DeviceSpecificData.DataSize;
             }
-
-            /* Copy the GUID */
-            RtlCopyMemory(PropertyBuffer,
-                &(IopBusTypeGuidList->Guids[DeviceNode->ChildBusTypeIndex]),
-                sizeof(GUID));
-            return STATUS_SUCCESS;
+            
+            /* The size of partial descriptors is bigger */
+            PartialSize += EntrySize;
+            
+            /* Go to the next partial descriptor */
+            PartialDescriptor = (PVOID)((ULONG_PTR)PartialDescriptor + EntrySize);
         }
-        else
-        {
-            return STATUS_OBJECT_NAME_NOT_FOUND;
-        }
-        break;
+        
+        /* 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;
+}
 
-    case DevicePropertyLegacyBusType:
-        Length = sizeof(INTERFACE_TYPE);
-        Data = &DeviceNode->ChildInterfaceType;
-        break;
+NTSTATUS
+NTAPI
+PiGetDeviceRegistryProperty(IN PDEVICE_OBJECT DeviceObject,
+                            IN ULONG ValueType,
+                            IN PWSTR ValueName,
+                            IN PWSTR KeyName,
+                            OUT PVOID Buffer,
+                            IN PULONG BufferLength)
+{
+    NTSTATUS Status;
+    HANDLE KeyHandle, SubHandle;
+    UNICODE_STRING KeyString;
+    PKEY_VALUE_FULL_INFORMATION KeyValueInfo = NULL;
+    ULONG Length;
+    PAGED_CODE();
 
-    case DevicePropertyAddress:
-        /* Query the device caps */
-        Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps);
-        if (NT_SUCCESS(Status) && (DeviceCaps.Address != MAXULONG))
+    /* Find the instance key */
+    Status = PnpDeviceObjectToDeviceInstance(DeviceObject, &KeyHandle, KEY_READ);
+    if (NT_SUCCESS(Status))
+    {
+        /* Check for name given by caller */
+        if (KeyName)
         {
-            /* Return length */
-            *ResultLength = sizeof(ULONG);
-
-            /* Check if the buffer given was large enough */
-            if (BufferLength < *ResultLength)
+            /* Open this key */
+            RtlInitUnicodeString(&KeyString, KeyName);
+            Status = IopOpenRegistryKeyEx(&SubHandle,
+                                          KeyHandle,
+                                          &KeyString,
+                                          KEY_READ);
+            if (NT_SUCCESS(Status))
             {
-                return STATUS_BUFFER_TOO_SMALL;
+                /* And use this handle instead */
+                ZwClose(KeyHandle);
+                KeyHandle = SubHandle;
             }
-
-            /* Return address */
-            *(PULONG)PropertyBuffer = DeviceCaps.Address;
-            return STATUS_SUCCESS;
         }
-        else
+
+        /* Check if sub-key handle succeeded (or no-op if no key name given) */
+        if (NT_SUCCESS(Status))
         {
-            return STATUS_OBJECT_NAME_NOT_FOUND;
+            /* Now get the size of the property */
+            Status = IopGetRegistryValue(KeyHandle,
+                                         ValueName,
+                                         &KeyValueInfo);
         }
-        break;
-
-//    case DevicePropertyUINumber:
-//      if (DeviceNode->CapabilityFlags == NULL)
-//         return STATUS_INVALID_DEVICE_REQUEST;
-//      Length = sizeof(ULONG);
-//      Data = &DeviceNode->CapabilityFlags->UINumber;
-//      break;
-
-    case DevicePropertyClassName:
-    case DevicePropertyClassGuid:
-    case DevicePropertyDriverKeyName:
-    case DevicePropertyManufacturer:
-    case DevicePropertyFriendlyName:
-    case DevicePropertyHardwareID:
-    case DevicePropertyCompatibleIDs:
-    case DevicePropertyDeviceDescription:
-    case DevicePropertyLocationInformation:
-    case DevicePropertyUINumber:
-        {
-            LPCWSTR RegistryPropertyName;
-            UNICODE_STRING EnumRoot = RTL_CONSTANT_STRING(ENUM_ROOT);
-            UNICODE_STRING ValueName;
-            KEY_VALUE_PARTIAL_INFORMATION *ValueInformation;
-            ULONG ValueInformationLength;
-            HANDLE KeyHandle, EnumRootHandle;
-            NTSTATUS Status;
-
-            switch (DeviceProperty)
-            {
-            case DevicePropertyClassName:
-                RegistryPropertyName = L"Class"; break;
-            case DevicePropertyClassGuid:
-                RegistryPropertyName = L"ClassGuid"; break;
-            case DevicePropertyDriverKeyName:
-                RegistryPropertyName = L"Driver"; break;
-            case DevicePropertyManufacturer:
-                RegistryPropertyName = L"Mfg"; break;
-            case DevicePropertyFriendlyName:
-                RegistryPropertyName = L"FriendlyName"; break;
-            case DevicePropertyHardwareID:
-                RegistryPropertyName = L"HardwareID"; break;
-            case DevicePropertyCompatibleIDs:
-                RegistryPropertyName = L"CompatibleIDs"; break;
-            case DevicePropertyDeviceDescription:
-                RegistryPropertyName = L"DeviceDesc"; break;
-            case DevicePropertyLocationInformation:
-                RegistryPropertyName = L"LocationInformation"; break;
-            case DevicePropertyUINumber:
-                RegistryPropertyName = L"UINumber"; break;
-            default:
-                /* Should not happen */
-                ASSERT(FALSE);
-                return STATUS_UNSUCCESSFUL;
-            }
 
-            DPRINT("Registry property %S\n", RegistryPropertyName);
-
-            /* Open Enum key */
-            Status = IopOpenRegistryKeyEx(&EnumRootHandle, NULL,
-                &EnumRoot, KEY_READ);
-            if (!NT_SUCCESS(Status))
-            {
-                DPRINT1("Error opening ENUM_ROOT, Status=0x%08x\n", Status);
-                return Status;
-            }
+        /* Close the key */
+        ZwClose(KeyHandle);
+    }
 
-            /* Open instance key */
-            Status = IopOpenRegistryKeyEx(&KeyHandle, EnumRootHandle,
-                &DeviceNode->InstancePath, KEY_READ);
-            if (!NT_SUCCESS(Status))
-            {
-                DPRINT1("Error opening InstancePath, Status=0x%08x\n", Status);
-                ZwClose(EnumRootHandle);
-                return Status;
-            }
+    /* Fail if any of the registry operations failed */
+    if (!NT_SUCCESS(Status)) return Status;
 
-            /* Allocate buffer to read as much data as required by the caller */
-            ValueInformationLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION,
-                Data[0]) + BufferLength;
-            ValueInformation = ExAllocatePool(PagedPool, ValueInformationLength);
-            if (!ValueInformation)
-            {
-                ZwClose(KeyHandle);
-                return STATUS_INSUFFICIENT_RESOURCES;
-            }
+    /* Check how much data we have to copy */
+    Length = KeyValueInfo->DataLength;
+    if (*BufferLength >= Length)
+    {
+        /* Check for a match in the value type */
+        if (KeyValueInfo->Type == ValueType)
+        {
+            /* Copy the data */
+            RtlCopyMemory(Buffer,
+                          (PVOID)((ULONG_PTR)KeyValueInfo +
+                          KeyValueInfo->DataOffset),
+                          Length);
+        }
+        else
+        {
+            /* Invalid registry property type, fail */
+           Status = STATUS_INVALID_PARAMETER_2;
+        }
+    }
+    else
+    {
+        /* Buffer is too small to hold data */
+        Status = STATUS_BUFFER_TOO_SMALL;
+    }
 
-            /* Read the value */
-            RtlInitUnicodeString(&ValueName, RegistryPropertyName);
-            Status = ZwQueryValueKey(KeyHandle, &ValueName,
-                KeyValuePartialInformation, ValueInformation,
-                ValueInformationLength,
-                &ValueInformationLength);
-            ZwClose(KeyHandle);
+    /* Return the required buffer length, free the buffer, and return status */
+    *BufferLength = Length;
+    ExFreePool(KeyValueInfo);
+    return Status;
+}
 
-            /* Return data */
-            *ResultLength = ValueInformation->DataLength;
+#define PIP_RETURN_DATA(x, y)   {ReturnLength = x; Data = y; Status = STATUS_SUCCESS; break;}
+#define PIP_REGISTRY_DATA(x, y) {ValueName = x; ValueType = y; break;}
+#define PIP_UNIMPLEMENTED()     {UNIMPLEMENTED; while(TRUE); break;}
 
-            if (!NT_SUCCESS(Status))
-            {
-                ExFreePool(ValueInformation);
-                if (Status == STATUS_BUFFER_OVERFLOW)
-                    return STATUS_BUFFER_TOO_SMALL;
-                DPRINT1("Problem: Status=0x%08x, ResultLength = %d\n", Status, *ResultLength);
-                return Status;
-            }
+/*
+ * @implemented
+ */
+NTSTATUS
+NTAPI
+IoGetDeviceProperty(IN PDEVICE_OBJECT DeviceObject,
+                    IN DEVICE_REGISTRY_PROPERTY DeviceProperty,
+                    IN ULONG BufferLength,
+                    OUT PVOID PropertyBuffer,
+                    OUT PULONG ResultLength)
+{
+    PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject);
+    DEVICE_CAPABILITIES DeviceCaps;
+    ULONG ReturnLength = 0, Length = 0, ValueType;
+    PWCHAR ValueName = NULL, EnumeratorNameEnd, DeviceInstanceName;
+    PVOID Data = NULL;
+    NTSTATUS Status = STATUS_BUFFER_TOO_SMALL;
+    GUID BusTypeGuid;
+    POBJECT_NAME_INFORMATION ObjectNameInfo = NULL;
+    DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty);
 
-            /* FIXME: Verify the value (NULL-terminated, correct format). */
-            RtlCopyMemory(PropertyBuffer, ValueInformation->Data,
-                ValueInformation->DataLength);
-            ExFreePool(ValueInformation);
+    /* Assume failure */
+    *ResultLength = 0;
 
-            return STATUS_SUCCESS;
-        }
+    /* Only PDOs can call this */
+    if (!DeviceNode) return STATUS_INVALID_DEVICE_REQUEST;
 
-    case DevicePropertyBootConfiguration:
-        Length = 0;
-        if (DeviceNode->BootResources->Count != 0)
-        {
-            Length = CM_RESOURCE_LIST_SIZE(DeviceNode->BootResources);
-        }
-        Data = DeviceNode->BootResources;
-        break;
+    /* Handle all properties */
+    switch (DeviceProperty)
+    {
+        case DevicePropertyBusTypeGuid:
 
-        /* FIXME: use a translated boot configuration instead */
-    case DevicePropertyBootConfigurationTranslated:
-        Length = 0;
-        if (DeviceNode->BootResources->Count != 0)
-        {
-            Length = CM_RESOURCE_LIST_SIZE(DeviceNode->BootResources);
-        }
-        Data = DeviceNode->BootResources;
-        break;
-
-    case DevicePropertyEnumeratorName:
-        /* A buffer overflow can't happen here, since InstancePath
-        * always contains the enumerator name followed by \\ */
-        Ptr = wcschr(DeviceNode->InstancePath.Buffer, L'\\');
-        ASSERT(Ptr);
-        Length = (Ptr - DeviceNode->InstancePath.Buffer) * sizeof(WCHAR);
-        Data = DeviceNode->InstancePath.Buffer;
-        break;
-
-    case DevicePropertyPhysicalDeviceObjectName:
-        Status = ObQueryNameString(DeviceNode->PhysicalDeviceObject,
-                                   NULL,
-                                   0,
-                                   &RequiredLength);
-        if (Status == STATUS_SUCCESS)
-        {
-            Length = 0;
-            Data = L"";
-        }
-        else if (Status == STATUS_INFO_LENGTH_MISMATCH)
-        {
-            ObjectNameInfoLength = RequiredLength;
-            ObjectNameInfo = ExAllocatePool(PagedPool, ObjectNameInfoLength);
-            if (!ObjectNameInfo)
-                return STATUS_INSUFFICIENT_RESOURCES;
+            /* Get the GUID from the internal cache */        
+            Status = PnpBusTypeGuidGet(DeviceNode->ChildBusTypeIndex, &BusTypeGuid);
+            if (!NT_SUCCESS(Status)) return Status;
 
-            Status = ObQueryNameString(DeviceNode->PhysicalDeviceObject,
+            /* 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);
+            
+            /* This is the format of the returned data */
+            PIP_RETURN_DATA((EnumeratorNameEnd - DeviceInstanceName) * 2,
+                            &DeviceNode->ChildBusNumber);
+            
+        case DevicePropertyAddress:
+
+            /* Query the device caps */
+            Status = PpIrpQueryCapabilities(DeviceObject, &DeviceCaps);
+            if (!NT_SUCCESS(Status) || (DeviceCaps.Address == MAXULONG))
+                return STATUS_OBJECT_NAME_NOT_FOUND;
+
+            /* 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
+            {
+                /* No resources will still fake success, but with 0 bytes */
+                *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,
-                                       ObjectNameInfoLength,
-                                       &RequiredLength);
-            if (NT_SUCCESS(Status))
+                                       Length,
+                                       ResultLength);
+            if (Status == STATUS_INFO_LENGTH_MISMATCH)
             {
-                Length = ObjectNameInfo->Name.Length;
-                Data = ObjectNameInfo->Name.Buffer;
+                /* It's up to the caller to try again */
+                Status = STATUS_BUFFER_TOO_SMALL;
             }
-            else
-                return Status;
-        }
-        else
-            return Status;
-        break;
-
-    default:
-        return STATUS_INVALID_PARAMETER_2;
+            
+            /* Return if successful */
+            if (NT_SUCCESS(Status)) PIP_RETURN_DATA(ObjectNameInfo->Name.Length,
+                                                    ObjectNameInfo->Name.Buffer);
+
+            /* Let the caller know how big the name is */
+            *ResultLength -= sizeof(OBJECT_NAME_INFORMATION);
+            break;
+        
+        /* Handle the registry-based properties */
+        case DevicePropertyUINumber:
+            PIP_REGISTRY_DATA(REGSTR_VAL_UI_NUMBER, REG_DWORD);
+        case DevicePropertyLocationInformation:
+            PIP_REGISTRY_DATA(REGSTR_VAL_LOCATION_INFORMATION, REG_SZ);
+        case DevicePropertyDeviceDescription:
+            PIP_REGISTRY_DATA(REGSTR_VAL_DEVDESC, REG_SZ);
+        case DevicePropertyHardwareID:
+            PIP_REGISTRY_DATA(REGSTR_VAL_HARDWAREID, REG_MULTI_SZ);
+        case DevicePropertyCompatibleIDs:
+            PIP_REGISTRY_DATA(REGSTR_VAL_COMPATIBLEIDS, REG_MULTI_SZ);
+        case DevicePropertyBootConfiguration:
+            PIP_REGISTRY_DATA(REGSTR_VAL_BOOTCONFIG, REG_RESOURCE_LIST);
+        case DevicePropertyClassName:
+            PIP_REGISTRY_DATA(REGSTR_VAL_CLASS, REG_SZ);
+        case DevicePropertyClassGuid:
+            PIP_REGISTRY_DATA(REGSTR_VAL_CLASSGUID, REG_SZ);
+        case DevicePropertyDriverKeyName:
+            PIP_REGISTRY_DATA(REGSTR_VAL_DRIVER, REG_SZ);
+        case DevicePropertyManufacturer:
+            PIP_REGISTRY_DATA(REGSTR_VAL_MFG, REG_SZ);
+        case DevicePropertyFriendlyName:
+            PIP_REGISTRY_DATA(REGSTR_VAL_FRIENDLYNAME, REG_SZ);
+        case DevicePropertyContainerID:
+            //PIP_REGISTRY_DATA(REGSTR_VAL_CONTAINERID, REG_SZ); // Win7
+            PIP_UNIMPLEMENTED();
+        case DevicePropertyRemovalPolicy:
+            PIP_UNIMPLEMENTED();
+        case DevicePropertyInstallState:
+            PIP_UNIMPLEMENTED();        
+        case DevicePropertyResourceRequirements:
+            PIP_UNIMPLEMENTED();        
+        case DevicePropertyAllocatedResources:
+            PIP_UNIMPLEMENTED();        
+        default:
+            return STATUS_INVALID_PARAMETER_2;
     }
-
-    /* Prepare returned values */
-    *ResultLength = Length;
-    if (BufferLength < Length)
+    
+    /* 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,
+                                             ValueName,
+                                             (DeviceProperty ==
+                                              DevicePropertyBootConfiguration) ?
+                                             L"LogConf":  NULL,
+                                             PropertyBuffer,
+                                             ResultLength);
+    }
+    else if (NT_SUCCESS(Status))
     {
-        if (ObjectNameInfo != NULL)
-            ExFreePool(ObjectNameInfo);
+        /* We know up-front how much data to expect, check the caller's buffer */
+        *ResultLength = ReturnLength;
+        if (ReturnLength <= BufferLength)
+        {
+            /* Buffer is all good, copy the data */
+            RtlCopyMemory(PropertyBuffer, Data, ReturnLength);
 
-        return STATUS_BUFFER_TOO_SMALL;
+            /* Check for properties that require a null-terminated string */
+            if ((DeviceProperty == DevicePropertyEnumeratorName) ||
+                (DeviceProperty == DevicePropertyPhysicalDeviceObjectName))
+            {
+                /* 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;
+        }
     }
-    RtlCopyMemory(PropertyBuffer, Data, Length);
-
-    /* NULL terminate the string (if required) */
-    if (DeviceProperty == DevicePropertyEnumeratorName ||
-        DeviceProperty == DevicePropertyPhysicalDeviceObjectName)
-        ((LPWSTR)PropertyBuffer)[Length / sizeof(WCHAR)] = UNICODE_NULL;
-
-    if (ObjectNameInfo != NULL)
-        ExFreePool(ObjectNameInfo);
-
-    return STATUS_SUCCESS;
+    
+    /* Free any allocation we may have made, and return the status code */
+    if (ObjectNameInfo) ExFreePool(ObjectNameInfo);
+    return Status;
 }
 
 /*
@@ -4195,6 +3528,8 @@ IoOpenDeviceRegistryKey(IN PDEVICE_OBJECT DeviceObject,
    else
    {
       DeviceNode = IopGetDeviceNode(DeviceObject);
+      if (!DeviceNode)
+          return STATUS_INVALID_DEVICE_REQUEST;
       KeyNameLength += sizeof(EnumKeyName) - sizeof(UNICODE_NULL) +
                        DeviceNode->InstancePath.Length;
    }