Detect devices using the NULL driver, and set the STARTED flag
[reactos.git] / reactos / ntoskrnl / io / pnpmgr.c
index 749534e..064eb7f 100644 (file)
@@ -1,18 +1,16 @@
-/* $Id: pnpmgr.c,v 1.52 2004/11/19 21:31:02 navaraf Exp $
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS kernel
+ * FILE:            ntoskrnl/io/pnpmgr.c
+ * PURPOSE:         Initializes the PnP manager
  *
- * COPYRIGHT:      See COPYING in the top level directory
- * PROJECT:        ReactOS kernel
- * FILE:           ntoskrnl/io/pnpmgr/pnpmgr.c
- * PURPOSE:        Initializes the PnP manager
- * PROGRAMMER:     Casper S. Hornstrup (chorns@users.sourceforge.net)
- * UPDATE HISTORY:
- *  16/04/2001 CSH Created
+ * PROGRAMMERS:     Casper S. Hornstrup (chorns@users.sourceforge.net)
+ *                  HervĂ© Poussineau (hpoussin@reactos.org)
  */
 
 /* INCLUDES ******************************************************************/
 
 #include <ntoskrnl.h>
-#include <ole32/guiddef.h>
 
 #define NDEBUG
 #include <internal/debug.h>
@@ -25,11 +23,118 @@ KSPIN_LOCK IopDeviceTreeLock;
 /* DATA **********************************************************************/
 
 PDRIVER_OBJECT IopRootDriverObject;
+PIO_BUS_TYPE_GUID_LIST IopBusTypeGuidList = NULL;
+
+// Static CRC table
+ULONG crc32Table[256] =
+{
+       0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA,
+       0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
+       0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
+       0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
+       0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,
+       0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
+       0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC,
+       0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
+       0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
+       0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
+       0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940,
+       0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
+       0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116,
+       0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
+       0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
+       0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
+
+       0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A,
+       0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
+       0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818,
+       0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
+       0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
+       0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
+       0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C,
+       0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
+       0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,
+       0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
+       0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
+       0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
+       0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086,
+       0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
+       0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4,
+       0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
+
+       0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
+       0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
+       0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,
+       0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
+       0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE,
+       0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
+       0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
+       0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
+       0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252,
+       0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
+       0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60,
+       0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
+       0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
+       0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
+       0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04,
+       0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
+
+       0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A,
+       0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
+       0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
+       0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
+       0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E,
+       0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
+       0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,
+       0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
+       0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
+       0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
+       0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0,
+       0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
+       0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6,
+       0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
+       0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
+       0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D,
+};
+
 
 /* FUNCTIONS *****************************************************************/
 
+PDEVICE_NODE FASTCALL
+IopGetDeviceNode(
+  PDEVICE_OBJECT DeviceObject)
+{
+  return ((PEXTENDED_DEVOBJ_EXTENSION)DeviceObject->DeviceObjectExtension)->DeviceNode;
+}
+
+NTSTATUS
+STDCALL
+IopQueryDeviceCapabilities(PDEVICE_NODE DeviceNode,
+                           PDEVICE_CAPABILITIES DeviceCaps)
+{
+    IO_STATUS_BLOCK StatusBlock;
+    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.Parameters.DeviceCapabilities.Capabilities = DeviceCaps;
+
+    /* Send the IRP */
+    return IopInitiatePnpIrp(DeviceNode->PhysicalDeviceObject,
+                             &StatusBlock,
+                             IRP_MN_QUERY_CAPABILITIES,
+                             &Stack);
+}
+
 /*
- * @unimplemented
+ * @implemented
  */
 VOID
 STDCALL
@@ -37,14 +142,7 @@ IoInvalidateDeviceRelations(
   IN PDEVICE_OBJECT DeviceObject,
   IN DEVICE_RELATION_TYPE Type)
 {
-  CHECKPOINT1;
-}
-
-PDEVICE_NODE FASTCALL
-IopGetDeviceNode(
-  PDEVICE_OBJECT DeviceObject)
-{
-  return DeviceObject->DeviceObjectExtension->DeviceNode;
+  IopInvalidateDeviceRelations(IopGetDeviceNode(DeviceObject), Type);
 }
 
 /*
@@ -60,11 +158,13 @@ IoGetDeviceProperty(
   OUT PULONG ResultLength)
 {
   PDEVICE_NODE DeviceNode = IopGetDeviceNode(DeviceObject);
+  DEVICE_CAPABILITIES DeviceCaps;
   ULONG Length;
-  PVOID Data;
+  PVOID Data = NULL;
   PWSTR Ptr;
+  NTSTATUS Status;
 
-  DPRINT("IoGetDeviceProperty(%x %d)\n", DeviceObject, DeviceProperty);
+  DPRINT("IoGetDeviceProperty(0x%p %d)\n", DeviceObject, DeviceProperty);
 
   if (DeviceNode == NULL)
     return STATUS_INVALID_DEVICE_REQUEST;
@@ -78,23 +178,30 @@ IoGetDeviceProperty(
 
     /* Complete, untested */
     case DevicePropertyBusTypeGuid:
-      *ResultLength = 39 * sizeof(WCHAR);
-      if (BufferLength < (39 * sizeof(WCHAR)))
-        return STATUS_BUFFER_TOO_SMALL;
-      swprintf((PWSTR)PropertyBuffer,
-        L"{%08lX-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
-        DeviceNode->BusTypeGuid.Data1,
-        DeviceNode->BusTypeGuid.Data2,
-        DeviceNode->BusTypeGuid.Data3,
-        DeviceNode->BusTypeGuid.Data4[0],
-        DeviceNode->BusTypeGuid.Data4[1],
-        DeviceNode->BusTypeGuid.Data4[2],
-        DeviceNode->BusTypeGuid.Data4[3],
-        DeviceNode->BusTypeGuid.Data4[4],
-        DeviceNode->BusTypeGuid.Data4[5],
-        DeviceNode->BusTypeGuid.Data4[6],
-        DeviceNode->BusTypeGuid.Data4[7]);
-      return STATUS_SUCCESS;
+        /* Sanity check */
+        if ((DeviceNode->ChildBusTypeIndex != 0xFFFF) && 
+            (DeviceNode->ChildBusTypeIndex < IopBusTypeGuidList->GuidCount))
+        {
+            /* Return the GUID */
+            *ResultLength = sizeof(GUID);
+
+            /* Check if the buffer given was large enough */
+            if (BufferLength < *ResultLength)
+            {
+                return STATUS_BUFFER_TOO_SMALL;
+            }
+
+            /* Copy the GUID */
+            RtlCopyMemory(PropertyBuffer, 
+                          &(IopBusTypeGuidList->Guids[DeviceNode->ChildBusTypeIndex]),
+                          sizeof(GUID));
+            return STATUS_SUCCESS;
+        }
+        else
+        {
+            return STATUS_OBJECT_NAME_NOT_FOUND;
+        }
+        break;
 
     case DevicePropertyLegacyBusType:
       Length = sizeof(INTERFACE_TYPE);
@@ -102,9 +209,29 @@ IoGetDeviceProperty(
       break;
 
     case DevicePropertyAddress:
-      Length = sizeof(ULONG);
-      Data = &DeviceNode->Address;
-      break;
+
+        /* Query the device caps */
+        Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCaps);
+        if (NT_SUCCESS(Status) && (DeviceCaps.Address != -1))
+        {
+            /* Return length */
+            *ResultLength = sizeof(ULONG);
+
+            /* Check if the buffer given was large enough */
+            if (BufferLength < *ResultLength)
+            {
+                return STATUS_BUFFER_TOO_SMALL;
+            }
+
+            /* Return address */
+            *(PULONG)PropertyBuffer = DeviceCaps.Address;
+            return STATUS_SUCCESS;
+        }
+        else
+        {
+            return STATUS_OBJECT_NAME_NOT_FOUND;
+        }
+        break;
 
 //    case DevicePropertyUINumber:
 //      if (DeviceNode->CapabilityFlags == NULL)
@@ -160,8 +287,8 @@ IoGetDeviceProperty(
 
         KeyNameBuffer = ExAllocatePool(PagedPool,
           (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length);
-       
-       DPRINT("KeyNameBuffer: %x, value %S\n", 
+
+       DPRINT("KeyNameBuffer: 0x%p, value %S\n",
                KeyNameBuffer, RegistryPropertyName);
 
         if (KeyNameBuffer == NULL)
@@ -195,13 +322,13 @@ IoGetDeviceProperty(
         *ResultLength = ValueInformation->DataLength;
         ZwClose(KeyHandle);
 
-        if (ValueInformation->DataLength > BufferLength)
-          Status = STATUS_BUFFER_TOO_SMALL;
-
         if (!NT_SUCCESS(Status))
         {
           ExFreePool(ValueInformation);
-          return Status;
+          if (Status == STATUS_BUFFER_OVERFLOW)
+            return STATUS_BUFFER_TOO_SMALL;
+          else
+            return Status;
         }
 
         /* FIXME: Verify the value (NULL-terminated, correct format). */
@@ -237,15 +364,19 @@ IoGetDeviceProperty(
       if (Ptr != NULL)
       {
        Length = (ULONG)((ULONG_PTR)Ptr - (ULONG_PTR)DeviceNode->InstancePath.Buffer) + sizeof(WCHAR);
+       Data = DeviceNode->InstancePath.Buffer;
       }
       else
       {
        Length = 0;
        Data = NULL;
       }
+      break;
 
     case DevicePropertyPhysicalDeviceObjectName:
-      return STATUS_NOT_IMPLEMENTED;
+      Length = DeviceNode->InstancePath.Length + sizeof(WCHAR);
+      Data = DeviceNode->InstancePath.Buffer;
+      break;
 
     default:
       return STATUS_INVALID_PARAMETER_2;
@@ -257,7 +388,8 @@ IoGetDeviceProperty(
   RtlCopyMemory(PropertyBuffer, Data, Length);
 
   /* Terminate the string */
-  if (DeviceProperty == DevicePropertyEnumeratorName)
+  if (DeviceProperty == DevicePropertyEnumeratorName
+    || DeviceProperty == DevicePropertyPhysicalDeviceObjectName)
   {
     Ptr = (PWSTR)PropertyBuffer;
     Ptr[(Length / sizeof(WCHAR)) - 1] = 0;
@@ -284,7 +416,7 @@ IoInvalidateDeviceState(
  * @param DeviceObject   Device to get the registry key for.
  * @param DevInstKeyType Type of the key to return.
  * @param DesiredAccess  Access mask (eg. KEY_READ | KEY_WRITE).
- * @param DevInstRegKey  Handle to the opened registry key on 
+ * @param DevInstRegKey  Handle to the opened registry key on
  *                       successful return.
  *
  * @return Status.
@@ -305,7 +437,7 @@ IoOpenDeviceRegistryKey(
       L"Hardware Profiles\\Current\\System\\CurrentControlSet\\";
    static WCHAR ClassKeyName[] = L"Control\\Class\\";
    static WCHAR EnumKeyName[] = L"Enum\\";
-   static WCHAR DeviceParametersKeyName[] = L"Device Parameters\\";
+   static WCHAR DeviceParametersKeyName[] = L"Device Parameters";
    ULONG KeyNameLength;
    LPWSTR KeyNameBuffer;
    UNICODE_STRING KeyName;
@@ -363,7 +495,7 @@ IoOpenDeviceRegistryKey(
 
    if (DevInstKeyType & PLUGPLAY_REGKEY_CURRENT_HWPROFILE)
       RtlAppendUnicodeToString(&KeyName, ProfileKeyName);
-  
+
    if (DevInstKeyType & PLUGPLAY_REGKEY_DRIVER)
    {
       RtlAppendUnicodeToString(&KeyName, ClassKeyName);
@@ -434,38 +566,6 @@ IoRequestDeviceEject(
 }
 
 
-BOOLEAN
-IopCreateUnicodeString(
-  PUNICODE_STRING      Destination,
-  PWSTR Source,
-  POOL_TYPE PoolType)
-{
-  ULONG Length;
-
-  if (!Source)
-  {
-    RtlInitUnicodeString(Destination, NULL);
-    return TRUE;
-  }
-
-  Length = (wcslen(Source) + 1) * sizeof(WCHAR);
-
-  Destination->Buffer = ExAllocatePool(PoolType, Length);
-
-  if (Destination->Buffer == NULL)
-  {
-    return FALSE;
-  }
-
-  RtlCopyMemory(Destination->Buffer, Source, Length);
-
-  Destination->MaximumLength = Length;
-
-  Destination->Length = Length - sizeof(WCHAR);
-
-  return TRUE;
-}
-
 NTSTATUS
 IopGetSystemPowerDeviceObject(PDEVICE_OBJECT *DeviceObject)
 {
@@ -483,7 +583,68 @@ IopGetSystemPowerDeviceObject(PDEVICE_OBJECT *DeviceObject)
   return STATUS_UNSUCCESSFUL;
 }
 
-/**********************************************************************
+USHORT
+STDCALL
+IopGetBusTypeGuidIndex(LPGUID BusTypeGuid)
+{
+    USHORT i = 0, FoundIndex = 0xFFFF;
+    ULONG NewSize;
+    PVOID NewList;
+    
+    /* Acquire the lock */
+    ExAcquireFastMutex(&IopBusTypeGuidList->Lock);
+
+    /* Loop all entries */
+    while (i < IopBusTypeGuidList->GuidCount)
+    {
+        /* Try to find a match */
+        if (RtlCompareMemory(BusTypeGuid,
+                             &IopBusTypeGuidList->Guids[i],
+                             sizeof(GUID)))
+        {
+            /* Found it */
+            FoundIndex = i;
+            goto Quickie;
+        }
+        i++;
+    }
+
+    /* Check if we have to grow the list */
+    if (IopBusTypeGuidList->GuidCount)
+    {
+        /* Calculate the new size */
+        NewSize = sizeof(IO_BUS_TYPE_GUID_LIST) +
+                 (sizeof(GUID) * IopBusTypeGuidList->GuidCount);
+
+        /* Allocate the new copy */
+        NewList = ExAllocatePool(PagedPool, NewSize);
+
+        /* Now copy them, decrease the size too */
+        NewSize -= sizeof(GUID);
+        RtlCopyMemory(NewList, IopBusTypeGuidList, NewSize);
+
+        /* Free the old list */
+        ExFreePool(IopBusTypeGuidList);
+
+        /* Use the new buffer */
+        IopBusTypeGuidList = NewList;
+    }
+
+    /* Copy the new GUID */
+    RtlCopyMemory(&IopBusTypeGuidList->Guids[IopBusTypeGuidList->GuidCount],
+                  BusTypeGuid,
+                  sizeof(GUID));
+
+    /* The new entry is the index */
+    FoundIndex = IopBusTypeGuidList->GuidCount;
+    IopBusTypeGuidList->GuidCount++;
+
+Quickie:
+    ExReleaseFastMutex(&IopBusTypeGuidList->Lock);
+    return FoundIndex;
+}
+
+/*
  * DESCRIPTION
  *     Creates a device node
  *
@@ -506,10 +667,10 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
   NTSTATUS Status;
   KIRQL OldIrql;
 
-  DPRINT("ParentNode %x PhysicalDeviceObject %x\n",
+  DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p\n",
     ParentNode, PhysicalDeviceObject);
 
-  Node = (PDEVICE_NODE)ExAllocatePool(PagedPool, sizeof(DEVICE_NODE));
+  Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE));
   if (!Node)
     {
       return STATUS_INSUFFICIENT_RESOURCES;
@@ -533,7 +694,7 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
 
   Node->PhysicalDeviceObject = PhysicalDeviceObject;
 
-  PhysicalDeviceObject->DeviceObjectExtension->DeviceNode = Node;
+  ((PEXTENDED_DEVOBJ_EXTENSION)PhysicalDeviceObject->DeviceObjectExtension)->DeviceNode = Node;
 
   if (ParentNode)
     {
@@ -546,6 +707,7 @@ IopCreateDeviceNode(PDEVICE_NODE ParentNode,
        }
       ParentNode->Child = Node;
       KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
+      Node->Level = ParentNode->Level + 1;
     }
 
   *DeviceNode = Node;
@@ -724,9 +886,9 @@ IopTraverseDeviceTree(
 {
   NTSTATUS Status;
 
-  DPRINT("Context %x\n", Context);
+  DPRINT("Context 0x%p\n", Context);
 
-  DPRINT("IopTraverseDeviceTree(DeviceNode %x  FirstDeviceNode %x  Action %x  Context %x)\n",
+  DPRINT("IopTraverseDeviceTree(DeviceNode 0x%p  FirstDeviceNode 0x%p  Action %x  Context 0x%p)\n",
     Context->DeviceNode, Context->FirstDeviceNode, Context->Action, Context->Context);
 
   /* Start from the specified device node */
@@ -765,16 +927,15 @@ IopCreateDeviceKeyPath(PWSTR Path,
     }
 
   wcsncpy (KeyBuffer, Path, MAX_PATH-1);
-  RtlInitUnicodeString (&KeyName, KeyBuffer);
 
   /* Skip \\Registry\\ */
-  Current = KeyName.Buffer;
-  Current = wcschr (Current, '\\') + 1;
-  Current = wcschr (Current, '\\') + 1;
+  Current = KeyBuffer;
+  Current = wcschr (Current, L'\\') + 1;
+  Current = wcschr (Current, L'\\') + 1;
 
   while (TRUE)
     {
-      Next = wcschr (Current, '\\');
+      Next = wcschr (Current, L'\\');
       if (Next == NULL)
        {
          /* The end */
@@ -784,6 +945,7 @@ IopCreateDeviceKeyPath(PWSTR Path,
          *Next = 0;
        }
 
+      RtlInitUnicodeString (&KeyName, KeyBuffer);
       InitializeObjectAttributes (&ObjectAttributes,
                                  &KeyName,
                                  OBJ_CASE_INSENSITIVE,
@@ -792,7 +954,7 @@ IopCreateDeviceKeyPath(PWSTR Path,
 
       DPRINT("Create '%S'\n", KeyName.Buffer);
 
-      Status = NtCreateKey (&KeyHandle,
+      Status = ZwCreateKey (&KeyHandle,
                            KEY_ALL_ACCESS,
                            &ObjectAttributes,
                            0,
@@ -801,7 +963,7 @@ IopCreateDeviceKeyPath(PWSTR Path,
                            NULL);
       if (!NT_SUCCESS (Status))
        {
-         DPRINT ("NtCreateKey() failed with status %x\n", Status);
+         DPRINT ("ZwCreateKey() failed with status %x\n", Status);
          return Status;
        }
 
@@ -812,7 +974,7 @@ IopCreateDeviceKeyPath(PWSTR Path,
        }
       else
        {
-         NtClose (KeyHandle);
+         ZwClose (KeyHandle);
          *Next = L'\\';
        }
 
@@ -844,7 +1006,7 @@ IopSetDeviceInstanceData(HANDLE InstanceKey,
                             OBJ_CASE_INSENSITIVE,
                             InstanceKey,
                             NULL);
-  Status = NtCreateKey(&LogConfKey,
+  Status = ZwCreateKey(&LogConfKey,
                       KEY_ALL_ACCESS,
                       &ObjectAttributes,
                       0,
@@ -863,7 +1025,7 @@ IopSetDeviceInstanceData(HANDLE InstanceKey,
 
        RtlInitUnicodeString(&KeyName,
                             L"BootConfig");
-       Status = NtSetValueKey(LogConfKey,
+       Status = ZwSetValueKey(LogConfKey,
                               &KeyName,
                               0,
                               REG_RESOURCE_LIST,
@@ -878,16 +1040,51 @@ IopSetDeviceInstanceData(HANDLE InstanceKey,
     {
       RtlInitUnicodeString(&KeyName,
                           L"BasicConfigVector");
-      Status = NtSetValueKey(LogConfKey,
+      Status = ZwSetValueKey(LogConfKey,
                             &KeyName,
                             0,
                             REG_RESOURCE_REQUIREMENTS_LIST,
-                            &DeviceNode->ResourceRequirements,
+                            DeviceNode->ResourceRequirements,
                             DeviceNode->ResourceRequirements->ListSize);
     }
 
-    NtClose(LogConfKey);
+    ZwClose(LogConfKey);
+  }
+
+#if 0
+  if (DeviceNode->PhysicalDeviceObject != NULL)
+  {
+    /* Create the 'Control' key */
+    RtlInitUnicodeString(&KeyName,
+                        L"Control");
+    InitializeObjectAttributes(&ObjectAttributes,
+                              &KeyName,
+                              OBJ_CASE_INSENSITIVE | OBJ_OPENIF,
+                              InstanceKey,
+                              NULL);
+    Status = ZwCreateKey(&LogConfKey,
+                        KEY_ALL_ACCESS,
+                        &ObjectAttributes,
+                        0,
+                        NULL,
+                        REG_OPTION_VOLATILE,
+                        NULL);
+    if (NT_SUCCESS(Status))
+    {
+      ULONG Reference = (ULONG)DeviceNode->PhysicalDeviceObject;
+      RtlInitUnicodeString(&KeyName,
+                          L"DeviceReference");
+      Status = ZwSetValueKey(LogConfKey,
+                            &KeyName,
+                            0,
+                            REG_DWORD,
+                            &Reference,
+                            sizeof(PVOID));
+
+      ZwClose(LogConfKey);
+    }
   }
+#endif
 
   DPRINT("IopSetDeviceInstanceData() done\n");
 
@@ -895,6 +1092,363 @@ IopSetDeviceInstanceData(HANDLE InstanceKey,
 }
 
 
+NTSTATUS
+IopAssignDeviceResources(
+   PDEVICE_NODE DeviceNode)
+{
+   PIO_RESOURCE_LIST ResourceList;
+   PIO_RESOURCE_DESCRIPTOR ResourceDescriptor;
+   PCM_PARTIAL_RESOURCE_DESCRIPTOR DescriptorRaw, DescriptorTranslated;
+   ULONG NumberOfResources = 0;
+   ULONG i;
+   NTSTATUS Status;
+
+   /* Fill DeviceNode->ResourceList and DeviceNode->ResourceListTranslated;
+    * by using DeviceNode->ResourceRequirements */
+
+   if (!DeviceNode->ResourceRequirements
+      || DeviceNode->ResourceRequirements->AlternativeLists == 0)
+   {
+      DeviceNode->ResourceList = DeviceNode->ResourceListTranslated = NULL;
+      return STATUS_SUCCESS;
+   }
+
+   /* FIXME: that's here that PnP arbiter should go */
+   /* Actually, simply use resource list #0 as assigned resource list */
+   ResourceList = &DeviceNode->ResourceRequirements->List[0];
+   if (ResourceList->Version != 1 || ResourceList->Revision != 1)
+   {
+      Status = STATUS_REVISION_MISMATCH;
+      goto ByeBye;
+   }
+
+   DeviceNode->ResourceList = ExAllocatePool(PagedPool,
+      sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
+   if (!DeviceNode->ResourceList)
+   {
+      Status = STATUS_INSUFFICIENT_RESOURCES;
+      goto ByeBye;
+   }
+
+   DeviceNode->ResourceListTranslated = ExAllocatePool(PagedPool,
+      sizeof(CM_RESOURCE_LIST) + ResourceList->Count * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR));
+   if (!DeviceNode->ResourceListTranslated)
+   {
+      Status = STATUS_INSUFFICIENT_RESOURCES;
+      goto ByeBye;
+   }
+
+   DeviceNode->ResourceList->Count = 1;
+   DeviceNode->ResourceList->List[0].InterfaceType = DeviceNode->ResourceRequirements->InterfaceType;
+   DeviceNode->ResourceList->List[0].BusNumber = DeviceNode->ResourceRequirements->BusNumber;
+   DeviceNode->ResourceList->List[0].PartialResourceList.Version = 1;
+   DeviceNode->ResourceList->List[0].PartialResourceList.Revision = 1;
+
+   DeviceNode->ResourceListTranslated->Count = 1;
+   DeviceNode->ResourceListTranslated->List[0].InterfaceType = DeviceNode->ResourceRequirements->InterfaceType;
+   DeviceNode->ResourceListTranslated->List[0].BusNumber = DeviceNode->ResourceRequirements->BusNumber;
+   DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Version = 1;
+   DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Revision = 1;
+
+   for (i = 0; i < ResourceList->Count; i++)
+   {
+      ResourceDescriptor = &ResourceList->Descriptors[i];
+
+      if (ResourceDescriptor->Option == 0 || ResourceDescriptor->Option == IO_RESOURCE_PREFERRED)
+      {
+         DescriptorRaw = &DeviceNode->ResourceList->List[0].PartialResourceList.PartialDescriptors[NumberOfResources];
+         DescriptorTranslated = &DeviceNode->ResourceListTranslated->List[0].PartialResourceList.PartialDescriptors[NumberOfResources];
+         NumberOfResources++;
+
+         /* Copy ResourceDescriptor to DescriptorRaw and DescriptorTranslated */
+         DescriptorRaw->Type = DescriptorTranslated->Type = ResourceDescriptor->Type;
+         DescriptorRaw->ShareDisposition = DescriptorTranslated->ShareDisposition = ResourceDescriptor->ShareDisposition;
+         DescriptorRaw->Flags = DescriptorTranslated->Flags = ResourceDescriptor->Flags;
+         switch (ResourceDescriptor->Type)
+         {
+            case CmResourceTypePort:
+            {
+               ULONG AddressSpace = 0; /* IO space */
+               DescriptorRaw->u.Port.Start = ResourceDescriptor->u.Port.MinimumAddress;
+               DescriptorRaw->u.Port.Length = DescriptorTranslated->u.Port.Length
+                  = ResourceDescriptor->u.Port.Length;
+               if (!HalTranslateBusAddress(
+                  DeviceNode->ResourceRequirements->InterfaceType,
+                  DeviceNode->ResourceRequirements->BusNumber,
+                  DescriptorRaw->u.Port.Start,
+                  &AddressSpace,
+                  &DescriptorTranslated->u.Port.Start))
+               {
+                  Status = STATUS_UNSUCCESSFUL;
+                  goto ByeBye;
+               }
+               break;
+            }
+            case CmResourceTypeInterrupt:
+            {
+               INTERFACE_TYPE BusType;
+               ULONG SlotNumber;
+               ULONG ret;
+               UCHAR Irq;
+
+               DescriptorRaw->u.Interrupt.Level = 0;
+               DescriptorRaw->u.Interrupt.Vector = ResourceDescriptor->u.Interrupt.MinimumVector;
+               /* FIXME: HACK: if we have a PCI device, we try
+                * to keep the IRQ assigned by the BIOS */
+               if (NT_SUCCESS(IoGetDeviceProperty(
+                  DeviceNode->PhysicalDeviceObject,
+                  DevicePropertyLegacyBusType,
+                  sizeof(INTERFACE_TYPE),
+                  &BusType,
+                  &ret)) && BusType == PCIBus)
+               {
+                  /* We have a PCI bus */
+                  if (NT_SUCCESS(IoGetDeviceProperty(
+                     DeviceNode->PhysicalDeviceObject,
+                     DevicePropertyAddress,
+                     sizeof(ULONG),
+                     &SlotNumber,
+                     &ret)) && SlotNumber > 0)
+                  {
+                     /* We have a good slot number */
+                     ret = HalGetBusDataByOffset(PCIConfiguration,
+                        DeviceNode->ResourceRequirements->BusNumber,
+                        SlotNumber,
+                        &Irq,
+                        0x3c /* PCI_INTERRUPT_LINE */,
+                        sizeof(UCHAR));
+                     if (ret != 0 && ret != 2
+                        && ResourceDescriptor->u.Interrupt.MinimumVector <= Irq
+                        && ResourceDescriptor->u.Interrupt.MaximumVector >= Irq)
+                     {
+                        /* The device already has an assigned IRQ */
+                        DescriptorRaw->u.Interrupt.Vector = Irq;
+                     }
+                     else
+                     {
+                         DPRINT1("Trying to assign IRQ 0x%lx to %wZ\n",
+                            DescriptorRaw->u.Interrupt.Vector,
+                            &DeviceNode->InstancePath);
+                         Irq = (UCHAR)DescriptorRaw->u.Interrupt.Vector;
+                         ret = HalSetBusDataByOffset(PCIConfiguration,
+                            DeviceNode->ResourceRequirements->BusNumber,
+                            SlotNumber,
+                            &Irq,
+                            0x3c /* PCI_INTERRUPT_LINE */,
+                            sizeof(UCHAR));
+                         if (ret == 0 || ret == 2)
+                            KEBUGCHECK(0);
+                     }
+                  }
+               }
+
+               DescriptorTranslated->u.Interrupt.Level = 0;
+               DescriptorTranslated->u.Interrupt.Vector = HalGetInterruptVector(
+                  DeviceNode->ResourceRequirements->InterfaceType,
+                  DeviceNode->ResourceRequirements->BusNumber,
+                  DescriptorRaw->u.Interrupt.Level,
+                  DescriptorRaw->u.Interrupt.Vector,
+                  (PKIRQL)&DescriptorTranslated->u.Interrupt.Level,
+                  &DescriptorRaw->u.Interrupt.Affinity);
+               DescriptorTranslated->u.Interrupt.Affinity = DescriptorRaw->u.Interrupt.Affinity;
+               break;
+            }
+            case CmResourceTypeMemory:
+            {
+               ULONG AddressSpace = 1; /* Memory space */
+               DescriptorRaw->u.Memory.Start = ResourceDescriptor->u.Memory.MinimumAddress;
+               DescriptorRaw->u.Memory.Length = DescriptorTranslated->u.Memory.Length
+                  = ResourceDescriptor->u.Memory.Length;
+               if (!HalTranslateBusAddress(
+                  DeviceNode->ResourceRequirements->InterfaceType,
+                  DeviceNode->ResourceRequirements->BusNumber,
+                  DescriptorRaw->u.Memory.Start,
+                  &AddressSpace,
+                  &DescriptorTranslated->u.Memory.Start))
+               {
+                  Status = STATUS_UNSUCCESSFUL;
+                  goto ByeBye;
+               }
+               break;
+            }
+            case CmResourceTypeDma:
+            {
+               DescriptorRaw->u.Dma.Channel = DescriptorTranslated->u.Dma.Channel
+                  = ResourceDescriptor->u.Dma.MinimumChannel;
+               DescriptorRaw->u.Dma.Port = DescriptorTranslated->u.Dma.Port
+                  = 0; /* FIXME */
+               DescriptorRaw->u.Dma.Reserved1 = DescriptorTranslated->u.Dma.Reserved1
+                  = 0;
+               break;
+            }
+            case CmResourceTypeBusNumber:
+            {
+               DescriptorRaw->u.BusNumber.Start = DescriptorTranslated->u.BusNumber.Start
+                  = ResourceDescriptor->u.BusNumber.MinBusNumber;
+               DescriptorRaw->u.BusNumber.Length = DescriptorTranslated->u.BusNumber.Length
+                  = ResourceDescriptor->u.BusNumber.Length;
+               DescriptorRaw->u.BusNumber.Reserved = DescriptorTranslated->u.BusNumber.Reserved
+                  = ResourceDescriptor->u.BusNumber.Reserved;
+               break;
+            }
+            /*CmResourceTypeDevicePrivate:
+            case CmResourceTypePcCardConfig:
+            case CmResourceTypeMfCardConfig:
+            {
+               RtlCopyMemory(
+                  &DescriptorRaw->u.DevicePrivate,
+                  &ResourceDescriptor->u.DevicePrivate,
+                  sizeof(ResourceDescriptor->u.DevicePrivate));
+               RtlCopyMemory(
+                  &DescriptorTranslated->u.DevicePrivate,
+                  &ResourceDescriptor->u.DevicePrivate,
+                  sizeof(ResourceDescriptor->u.DevicePrivate));
+               break;
+            }*/
+            default:
+               DPRINT1("IopAssignDeviceResources(): unknown resource descriptor type 0x%x\n", ResourceDescriptor->Type);
+               NumberOfResources--;
+         }
+      }
+
+   }
+
+   DeviceNode->ResourceList->List[0].PartialResourceList.Count = NumberOfResources;
+   DeviceNode->ResourceListTranslated->List[0].PartialResourceList.Count = NumberOfResources;
+
+   return STATUS_SUCCESS;
+
+ByeBye:
+   if (DeviceNode->ResourceList)
+   {
+      ExFreePool(DeviceNode->ResourceList);
+      DeviceNode->ResourceList = NULL;
+   }
+   if (DeviceNode->ResourceListTranslated)
+   {
+      ExFreePool(DeviceNode->ResourceListTranslated);
+      DeviceNode->ResourceListTranslated = NULL;
+   }
+
+   return Status;
+}
+
+
+/*
+ * IopGetParentIdPrefix
+ *
+ * Retrieve (or create) a string which identifies a device.
+ *
+ * Parameters
+ *    DeviceNode
+ *        Pointer to device node.
+ *    ParentIdPrefix
+ *        Pointer to the string where is returned the parent node identifier
+ *
+ * Remarks
+ *     If the return code is STATUS_SUCCESS, the ParentIdPrefix string is
+ *     valid and its Buffer field is NULL-terminated. The caller needs to
+ *     to free the string with RtlFreeUnicodeString when it is no longer
+ *     needed.
+ */
+
+NTSTATUS
+IopGetParentIdPrefix(
+   PDEVICE_NODE DeviceNode,
+   PUNICODE_STRING ParentIdPrefix)
+{
+   ULONG KeyNameBufferLength;
+   PWSTR KeyNameBuffer = NULL;
+   PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL;
+   UNICODE_STRING KeyName;
+   UNICODE_STRING KeyValue;
+   UNICODE_STRING ValueName;
+   OBJECT_ATTRIBUTES ObjectAttributes;
+   HANDLE hKey = INVALID_HANDLE_VALUE;
+   PBYTE currentByte;
+   ULONG crc32 = 0;
+   ULONG i;
+   NTSTATUS Status;
+
+   /* HACK: As long as some devices have a NULL device
+    * instance path, the following test is required :(
+    */
+   if (DeviceNode->Parent->InstancePath.Length == 0)
+      return STATUS_UNSUCCESSFUL;
+
+   /* 1. Try to retrieve ParentIdPrefix from registry */
+   KeyNameBufferLength = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH * sizeof(WCHAR);
+   ParentIdPrefixInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR));
+   if (!ParentIdPrefixInformation)
+   {
+       Status = STATUS_INSUFFICIENT_RESOURCES;
+       goto cleanup;
+   }
+   KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length);
+   if (!KeyNameBuffer)
+   {
+       Status = STATUS_INSUFFICIENT_RESOURCES;
+       goto cleanup;
+   }
+   wcscpy(KeyNameBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\");
+   wcscat(KeyNameBuffer, DeviceNode->Parent->InstancePath.Buffer);
+   RtlInitUnicodeString(&KeyName, KeyNameBuffer);
+   InitializeObjectAttributes(&ObjectAttributes, &KeyName, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, NULL, NULL);
+   Status = ZwOpenKey(&hKey, KEY_QUERY_VALUE | KEY_SET_VALUE, &ObjectAttributes);
+   if (!NT_SUCCESS(Status))
+       goto cleanup;
+   RtlInitUnicodeString(&ValueName, L"ParentIdPrefix");
+   Status = ZwQueryValueKey(
+      hKey, &ValueName,
+      KeyValuePartialInformation, ParentIdPrefixInformation,
+      KeyNameBufferLength, &KeyNameBufferLength);
+   if (NT_SUCCESS(Status))
+   {
+      if (ParentIdPrefixInformation->Type != REG_SZ)
+         Status = STATUS_UNSUCCESSFUL;
+      else
+      {
+         KeyValue.Length = KeyValue.MaximumLength = ParentIdPrefixInformation->DataLength;
+         KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
+      }
+      goto cleanup;
+   }
+   if (Status != STATUS_OBJECT_NAME_NOT_FOUND)
+   {
+      KeyValue.Length = KeyValue.MaximumLength = ParentIdPrefixInformation->DataLength;
+      KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
+      goto cleanup;
+   }
+
+   /* 2. Create the ParentIdPrefix value */
+   currentByte = (PBYTE)DeviceNode->Parent->InstancePath.Buffer;
+   for (i = 0; i < DeviceNode->Parent->InstancePath.Length; i++, currentByte++)
+      crc32 = (crc32 >> 8) ^ crc32Table[*currentByte ^ (crc32 & 0xff)];
+   crc32 = ~crc32;
+   swprintf((PWSTR)ParentIdPrefixInformation->Data, L"%lx&%lx", DeviceNode->Parent->Level, crc32);
+   RtlInitUnicodeString(&KeyValue, (PWSTR)ParentIdPrefixInformation->Data);
+
+   /* 3. Try to write the ParentIdPrefix to registry */
+   Status = ZwSetValueKey(
+      hKey, &ValueName,
+      0, REG_SZ,
+      (PVOID)KeyValue.Buffer,
+      (wcslen(KeyValue.Buffer) + 1) * sizeof(WCHAR));
+
+cleanup:
+   if (NT_SUCCESS(Status))
+   {
+      /* Duplicate the string to return it */
+      Status = RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE, &KeyValue, ParentIdPrefix);
+   }
+   ExFreePool(ParentIdPrefixInformation);
+   ExFreePool(KeyNameBuffer);
+   if (hKey != INVALID_HANDLE_VALUE)
+      ZwClose(hKey);
+   return Status;
+}
+
+
 /*
  * IopActionInterrogateDeviceStack
  *
@@ -928,12 +1482,15 @@ IopActionInterrogateDeviceStack(
    PWSTR Ptr;
    USHORT Length;
    USHORT TotalLength;
+   ULONG RequiredLength;
+   LCID LocaleId;
    HANDLE InstanceKey = NULL;
    UNICODE_STRING ValueName;
+   UNICODE_STRING ParentIdPrefix = { 0 };
    DEVICE_CAPABILITIES DeviceCapabilities;
 
    DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode, Context);
-   DPRINT("PDO %x\n", DeviceNode->PhysicalDeviceObject);
+   DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject);
 
    ParentDeviceNode = (PDEVICE_NODE)Context;
 
@@ -960,6 +1517,14 @@ IopActionInterrogateDeviceStack(
       return STATUS_UNSUCCESSFUL;
    }
 
+   /* Get Locale ID */
+   Status = ZwQueryDefaultLocale(FALSE, &LocaleId);
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("ZwQueryDefaultLocale() failed with status 0x%lx\n", Status);
+      return Status;
+   }
+
    /*
     * FIXME: For critical errors, cleanup and disable device, but always
     * return STATUS_SUCCESS.
@@ -988,6 +1553,27 @@ IopActionInterrogateDeviceStack(
       DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
    }
 
+   DPRINT("Sending IRP_MN_QUERY_CAPABILITIES to device stack\n");
+
+   Status = IopQueryDeviceCapabilities(DeviceNode, &DeviceCapabilities);
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("IopInitiatePnpIrp() failed (Status 0x%08lx)\n", Status);
+   }
+
+   DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCapabilities + 4);
+
+   if (!DeviceCapabilities.UniqueID)
+   {
+      /* Device has not a unique ID. We need to prepend parent bus unique identifier */
+      DPRINT("Instance ID is not unique\n");
+      Status = IopGetParentIdPrefix(DeviceNode, &ParentIdPrefix);
+      if (!NT_SUCCESS(Status))
+      {
+         DPRINT("IopGetParentIdPrefix() failed (Status 0x%08lx)\n", Status);
+      }
+   }
+
    DPRINT("Sending IRP_MN_QUERY_ID.BusQueryInstanceID to device stack\n");
 
    Stack.Parameters.QueryId.IdType = BusQueryInstanceID;
@@ -1000,6 +1586,13 @@ IopActionInterrogateDeviceStack(
    {
       /* Append the instance id string */
       wcscat(InstancePath, L"\\");
+      if (ParentIdPrefix.Length > 0)
+      {
+         /* Add information from parent bus device to InstancePath */
+         wcscat(InstancePath, ParentIdPrefix.Buffer);
+         if (*(PWSTR)IoStatusBlock.Information)
+            wcscat(InstancePath, L"&");
+      }
       wcscat(InstancePath, (PWSTR)IoStatusBlock.Information);
 
       /*
@@ -1011,37 +1604,9 @@ IopActionInterrogateDeviceStack(
    {
       DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
    }
+   RtlFreeUnicodeString(&ParentIdPrefix);
 
-   RtlZeroMemory(&DeviceCapabilities, sizeof(DEVICE_CAPABILITIES));
-   DeviceCapabilities.Size = sizeof(DEVICE_CAPABILITIES);
-   DeviceCapabilities.Version = 1;
-   DeviceCapabilities.Address = -1;
-   DeviceCapabilities.UINumber = -1;
-
-   Stack.Parameters.DeviceCapabilities.Capabilities = &DeviceCapabilities;
-   Status = IopInitiatePnpIrp(
-      DeviceNode->PhysicalDeviceObject,
-      &IoStatusBlock,
-      IRP_MN_QUERY_CAPABILITIES,
-      &Stack);
-   if (NT_SUCCESS(Status))
-   {
-   }
-   else
-   {
-      DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
-   }
-
-   DeviceNode->CapabilityFlags = *(PULONG)((ULONG_PTR)&DeviceCapabilities + 4);
-   DeviceNode->Address = DeviceCapabilities.Address;
-
-   if (!DeviceCapabilities.UniqueID)
-   {
-      DPRINT("Instance ID is not unique\n");
-      /* FIXME: Add information from parent bus driver to InstancePath */
-   }
-
-   if (!IopCreateUnicodeString(&DeviceNode->InstancePath, InstancePath, PagedPool))
+   if (!RtlCreateUnicodeString(&DeviceNode->InstancePath, InstancePath))
    {
       DPRINT("No resources\n");
       /* FIXME: Cleanup and disable device */
@@ -1070,7 +1635,7 @@ IopActionInterrogateDeviceStack(
       /* Set 'Capabilities' value */
       RtlInitUnicodeString(&ValueName,
                           L"Capabilities");
-      Status = NtSetValueKey(InstanceKey,
+      Status = ZwSetValueKey(InstanceKey,
                             &ValueName,
                             0,
                             REG_DWORD,
@@ -1082,7 +1647,7 @@ IopActionInterrogateDeviceStack(
       {
          RtlInitUnicodeString(&ValueName,
                              L"UINumber");
-         Status = NtSetValueKey(InstanceKey,
+         Status = ZwSetValueKey(InstanceKey,
                                &ValueName,
                                0,
                                REG_DWORD,
@@ -1121,7 +1686,7 @@ IopActionInterrogateDeviceStack(
 
       RtlInitUnicodeString(&ValueName,
                           L"HardwareID");
-      Status = NtSetValueKey(InstanceKey,
+      Status = ZwSetValueKey(InstanceKey,
                             &ValueName,
                             0,
                             REG_MULTI_SZ,
@@ -1129,7 +1694,7 @@ IopActionInterrogateDeviceStack(
                             (TotalLength + 1) * sizeof(WCHAR));
       if (!NT_SUCCESS(Status))
        {
-          DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);
+          DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status);
        }
    }
    else
@@ -1167,7 +1732,7 @@ IopActionInterrogateDeviceStack(
 
       RtlInitUnicodeString(&ValueName,
                           L"CompatibleIDs");
-      Status = NtSetValueKey(InstanceKey,
+      Status = ZwSetValueKey(InstanceKey,
                             &ValueName,
                             0,
                             REG_MULTI_SZ,
@@ -1175,7 +1740,7 @@ IopActionInterrogateDeviceStack(
                             (TotalLength + 1) * sizeof(WCHAR));
       if (!NT_SUCCESS(Status))
        {
-          DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);
+          DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status);
        }
    }
    else
@@ -1187,7 +1752,7 @@ IopActionInterrogateDeviceStack(
    DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextDescription to device stack\n");
 
    Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextDescription;
-   Stack.Parameters.QueryDeviceText.LocaleId = 0; /* FIXME */
+   Stack.Parameters.QueryDeviceText.LocaleId = LocaleId;
    Status = IopInitiatePnpIrp(
       DeviceNode->PhysicalDeviceObject,
       &IoStatusBlock,
@@ -1195,18 +1760,22 @@ IopActionInterrogateDeviceStack(
       &Stack);
    if (NT_SUCCESS(Status))
    {
-      RtlInitUnicodeString(&ValueName,
-                          L"DeviceDesc");
-      Status = NtSetValueKey(InstanceKey,
-                            &ValueName,
-                            0,
-                            REG_SZ,
-                            (PVOID)IoStatusBlock.Information,
-                            (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR));
+      RtlInitUnicodeString(&ValueName, L"DeviceDesc");
+      if (ZwQueryValueKey(InstanceKey, &ValueName, KeyValueBasicInformation, NULL, 0, &RequiredLength) == STATUS_OBJECT_NAME_NOT_FOUND)
+      {
+         /* This key is overriden when a driver is installed. Don't write the
+          * new description if another one already exists */
+         Status = ZwSetValueKey(InstanceKey,
+                                &ValueName,
+                                0,
+                                REG_SZ,
+                                (PVOID)IoStatusBlock.Information,
+                                (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR));
+      }
       if (!NT_SUCCESS(Status))
-       {
-          DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);
-       }
+      {
+         DPRINT1("ZwSetValueKey() failed (Status 0x%lx)\n", Status);
+     }
    }
    else
    {
@@ -1216,7 +1785,7 @@ IopActionInterrogateDeviceStack(
    DPRINT("Sending IRP_MN_QUERY_DEVICE_TEXT.DeviceTextLocation to device stack\n");
 
    Stack.Parameters.QueryDeviceText.DeviceTextType = DeviceTextLocationInformation;
-   Stack.Parameters.QueryDeviceText.LocaleId = 0; // FIXME
+   Stack.Parameters.QueryDeviceText.LocaleId = LocaleId;
    Status = IopInitiatePnpIrp(
       DeviceNode->PhysicalDeviceObject,
       &IoStatusBlock,
@@ -1227,7 +1796,7 @@ IopActionInterrogateDeviceStack(
       DPRINT("LocationInformation: %S\n", (PWSTR)IoStatusBlock.Information);
       RtlInitUnicodeString(&ValueName,
                           L"LocationInformation");
-      Status = NtSetValueKey(InstanceKey,
+      Status = ZwSetValueKey(InstanceKey,
                             &ValueName,
                             0,
                             REG_SZ,
@@ -1235,7 +1804,7 @@ IopActionInterrogateDeviceStack(
                             (wcslen((PWSTR)IoStatusBlock.Information) + 1) * sizeof(WCHAR));
       if (!NT_SUCCESS(Status))
        {
-          DPRINT1("NtSetValueKey() failed (Status %lx)\n", Status);
+          DPRINT1("ZwSetValueKey() failed (Status %lx)\n", Status);
        }
    }
    else
@@ -1257,20 +1826,16 @@ IopActionInterrogateDeviceStack(
 
       DeviceNode->ChildBusNumber = BusInformation->BusNumber;
       DeviceNode->ChildInterfaceType = BusInformation->LegacyBusType;
-      memcpy(&DeviceNode->BusTypeGuid,
-             &BusInformation->BusTypeGuid,
-             sizeof(GUID));
+      DeviceNode->ChildBusTypeIndex = IopGetBusTypeGuidIndex(&BusInformation->BusTypeGuid);
       ExFreePool(BusInformation);
    }
    else
    {
       DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
 
-      DeviceNode->ChildBusNumber = -1;
-      DeviceNode->ChildInterfaceType = -1;
-      memset(&DeviceNode->BusTypeGuid,
-             0,
-             sizeof(GUID));
+      DeviceNode->ChildBusNumber = 0xFFFFFFF0;
+      DeviceNode->ChildInterfaceType = InterfaceTypeUndefined;
+      DeviceNode->ChildBusTypeIndex = -1;
    }
 
    DPRINT("Sending IRP_MN_QUERY_RESOURCES to device stack\n");
@@ -1316,10 +1881,20 @@ IopActionInterrogateDeviceStack(
       IopSetDeviceInstanceData(InstanceKey, DeviceNode);
    }
 
-   NtClose(InstanceKey);
+   ZwClose(InstanceKey);
+
+   Status = IopAssignDeviceResources(DeviceNode);
+   if (!NT_SUCCESS(Status))
+   {
+      DPRINT("IopAssignDeviceResources() failed (Status %x)\n", Status);
+   }
 
    DeviceNode->Flags |= DNF_PROCESSED;
 
+   /* Report the device to the user-mode pnp manager */
+   IopQueueTargetDeviceEvent(&GUID_DEVICE_ARRIVAL,
+                             &DeviceNode->InstancePath);
+
    return STATUS_SUCCESS;
 }
 
@@ -1347,9 +1922,11 @@ IopActionConfigureChildServices(
   PDEVICE_NODE DeviceNode,
   PVOID Context)
 {
-   RTL_QUERY_REGISTRY_TABLE QueryTable[2];
+   RTL_QUERY_REGISTRY_TABLE QueryTable[3];
    PDEVICE_NODE ParentDeviceNode;
    PUNICODE_STRING Service;
+   UNICODE_STRING ClassGUID;
+   UNICODE_STRING NullString = RTL_CONSTANT_STRING(L"");
    NTSTATUS Status;
 
    DPRINT("IopActionConfigureChildServices(%p, %p)\n", DeviceNode, Context);
@@ -1379,6 +1956,13 @@ IopActionConfigureChildServices(
 
    if (!IopDeviceNodeHasFlag(DeviceNode, DNF_DISABLED))
    {
+      WCHAR RegKeyBuffer[MAX_PATH];
+      UNICODE_STRING RegKey;
+
+      RegKey.Length = 0;
+      RegKey.MaximumLength = sizeof(RegKeyBuffer);
+      RegKey.Buffer = RegKeyBuffer;
+
       /*
        * Retrieve configuration from Enum key
        */
@@ -1387,13 +1971,24 @@ IopActionConfigureChildServices(
 
       RtlZeroMemory(QueryTable, sizeof(QueryTable));
       RtlInitUnicodeString(Service, NULL);
+      RtlInitUnicodeString(&ClassGUID, NULL);
 
       QueryTable[0].Name = L"Service";
       QueryTable[0].Flags = RTL_QUERY_REGISTRY_DIRECT;
       QueryTable[0].EntryContext = Service;
 
-      Status = RtlQueryRegistryValues(RTL_REGISTRY_ENUM,
-         DeviceNode->InstancePath.Buffer, QueryTable, NULL, NULL);
+      QueryTable[1].Name = L"ClassGUID";
+      QueryTable[1].Flags = RTL_QUERY_REGISTRY_DIRECT;
+      QueryTable[1].EntryContext = &ClassGUID;
+      QueryTable[1].DefaultType = REG_SZ;
+      QueryTable[1].DefaultData = &NullString;
+      QueryTable[1].DefaultLength = 0;
+
+      RtlAppendUnicodeToString(&RegKey, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\");
+      RtlAppendUnicodeStringToString(&RegKey, &DeviceNode->InstancePath);
+
+      Status = RtlQueryRegistryValues(RTL_REGISTRY_ABSOLUTE,
+         RegKey.Buffer, QueryTable, NULL, NULL);
 
       if (!NT_SUCCESS(Status))
       {
@@ -1408,6 +2003,15 @@ IopActionConfigureChildServices(
       if (Service->Buffer == NULL)
       {
          IopDeviceNodeSetFlag(DeviceNode, DNF_DISABLED);
+
+         if (ClassGUID.Length != 0)
+         {
+            /* Device has a ClassGUID value, but no Service value.
+             * Suppose it is using the NULL driver, so state the
+             * device is started */
+            DPRINT("%wZ is using NULL driver\n", &DeviceNode->InstancePath);
+            IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
+         }
          return STATUS_SUCCESS;
       }
 
@@ -1482,13 +2086,23 @@ IopActionInitChildServices(
        !IopDeviceNodeHasFlag(DeviceNode, DNF_ADDED) &&
        !IopDeviceNodeHasFlag(DeviceNode, DNF_STARTED))
    {
-      PMODULE_OBJECT ModuleObject;
+      PLDR_DATA_TABLE_ENTRY ModuleObject;
       PDRIVER_OBJECT DriverObject;
 
       Status = IopLoadServiceModule(&DeviceNode->ServiceName, &ModuleObject);
-      if (NT_SUCCESS(Status))
+      if (NT_SUCCESS(Status) || Status == STATUS_IMAGE_ALREADY_LOADED)
       {
-         Status = IopInitializeDriverModule(DeviceNode, ModuleObject, FALSE, &DriverObject);
+         if (Status != STATUS_IMAGE_ALREADY_LOADED)
+            Status = IopInitializeDriverModule(DeviceNode, ModuleObject,
+               &DeviceNode->ServiceName, FALSE, &DriverObject);
+         else
+         {
+            /* get existing DriverObject pointer */
+            Status = IopGetDriverObject(
+               &DriverObject,
+               &DeviceNode->ServiceName,
+               FALSE);
+         }
          if (NT_SUCCESS(Status))
          {
             /* Attach lower level filter drivers. */
@@ -1497,9 +2111,11 @@ IopActionInitChildServices(
             Status = IopInitializeDevice(DeviceNode, DriverObject);
             if (NT_SUCCESS(Status))
             {
-               IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
                /* Attach upper level filter drivers. */
                IopAttachFilterDrivers(DeviceNode, FALSE);
+               IopDeviceNodeSetFlag(DeviceNode, DNF_STARTED);
+
+               Status = IopStartDevice(DeviceNode);
             }
          }
       }
@@ -1548,7 +2164,6 @@ IopActionInitAllServices(
  * parent node. This function just calls IopActionInitChildServices with
  * BootDrivers = TRUE.
  */
-
 NTSTATUS
 IopActionInitBootServices(
    PDEVICE_NODE DeviceNode,
@@ -1573,7 +2188,6 @@ IopActionInitBootServices(
  * Return Value
  *    Status
  */
-
 NTSTATUS
 IopInitializePnpServices(
    IN PDEVICE_NODE DeviceNode,
@@ -1590,7 +2204,8 @@ IopInitializePnpServices(
          DeviceNode,
          IopActionInitBootServices,
          DeviceNode);
-   } else
+   }
+   else
    {
       IopInitDeviceTreeTraverseContext(
          &Context,
@@ -1620,7 +2235,7 @@ IopInvalidateDeviceRelations(
    NTSTATUS Status;
    ULONG i;
 
-   DPRINT("DeviceNode %x\n", DeviceNode);
+   DPRINT("DeviceNode 0x%p\n", DeviceNode);
 
    DPRINT("Sending IRP_MN_QUERY_DEVICE_RELATIONS to device stack\n");
 
@@ -1722,17 +2337,20 @@ IopInvalidateDeviceRelations(
       NULL,
       NULL);
 
-   Status = NtOpenFile(
+   Status = ZwOpenFile(
       &Handle,
       FILE_ALL_ACCESS,
       &ObjectAttributes,
       &IoStatusBlock,
       0,
       0);
-   BootDrivers = NT_SUCCESS(Status) ? FALSE : TRUE;
-
-   NtClose(Handle);
+   if(NT_SUCCESS(Status))
+   {
+     BootDrivers = FALSE;
+     ZwClose(Handle);
+   }
+   else
+     BootDrivers = TRUE;
 
    /*
     * Initialize services for discovered children. Only boot drivers will
@@ -1750,6 +2368,38 @@ IopInvalidateDeviceRelations(
 }
 
 
+static NTSTATUS INIT_FUNCTION
+IopSetRootDeviceInstanceData(PDEVICE_NODE DeviceNode)
+{
+#if 0
+    PWSTR KeyBuffer;
+    HANDLE InstanceKey = NULL;
+    NTSTATUS Status;
+
+    /* Create registry key for the instance id, if it doesn't exist yet */
+    KeyBuffer = ExAllocatePool(PagedPool,
+                               (49 * sizeof(WCHAR)) + DeviceNode->InstancePath.Length);
+    wcscpy(KeyBuffer, L"\\Registry\\Machine\\System\\CurrentControlSet\\Enum\\");
+    wcscat(KeyBuffer, DeviceNode->InstancePath.Buffer);
+    Status = IopCreateDeviceKeyPath(KeyBuffer,
+                                    &InstanceKey);
+    ExFreePool(KeyBuffer);
+    if (!NT_SUCCESS(Status))
+    {
+        DPRINT1("Failed to create the instance key! (Status %lx)\n", Status);
+        return Status;
+    }
+
+    /* FIXME: Set 'ConfigFlags' value */
+
+    ZwClose(InstanceKey);
+
+    return Status;
+#endif
+    return STATUS_SUCCESS;
+}
+
+
 VOID INIT_FUNCTION
 PnpInit(VOID)
 {
@@ -1760,11 +2410,24 @@ PnpInit(VOID)
 
    KeInitializeSpinLock(&IopDeviceTreeLock);
 
+   /* Initialize the Bus Type GUID List */
+   IopBusTypeGuidList = ExAllocatePool(PagedPool, sizeof(IO_BUS_TYPE_GUID_LIST));
+   RtlZeroMemory(IopBusTypeGuidList, sizeof(IO_BUS_TYPE_GUID_LIST));
+   ExInitializeFastMutex(&IopBusTypeGuidList->Lock);
+
+   /* Initialize PnP-Event notification support */
+   Status = IopInitPlugPlayEvents();
+   if (!NT_SUCCESS(Status))
+   {
+      CPRINT("IopInitPlugPlayEvents() failed\n");
+      KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
+   }
+
    /*
     * Create root device node
     */
 
-   Status = IopCreateDriverObject(&IopRootDriverObject, NULL, FALSE, NULL, 0);
+   Status = IopCreateDriverObject(&IopRootDriverObject, NULL, 0, FALSE, NULL, 0);
    if (!NT_SUCCESS(Status))
    {
       CPRINT("IoCreateDriverObject() failed\n");
@@ -1786,6 +2449,17 @@ PnpInit(VOID)
       KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
    }
 
+   if (!RtlCreateUnicodeString(&IopRootDeviceNode->InstancePath,
+       L"HTREE\\ROOT\\0"))
+   {
+     CPRINT("Failed to create the instance path!\n");
+     KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, STATUS_UNSUCCESSFUL, 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);
    IopRootDriverObject->DriverExtension->AddDevice(
@@ -1793,4 +2467,19 @@ PnpInit(VOID)
       IopRootDeviceNode->PhysicalDeviceObject);
 }
 
+
+VOID INIT_FUNCTION
+PnpInit2(VOID)
+{
+    NTSTATUS Status;
+
+    /* Set root device instance data */
+    Status = IopSetRootDeviceInstanceData(IopRootDeviceNode);
+    if (!NT_SUCCESS(Status))
+    {
+        CPRINT("Failed to set instance data\n");
+        KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0);
+    }
+}
+
 /* EOF */