[ros-diffs] [hpoussin] 18309: - Fill Level field in DEVICE_NODE structure

- Fill Level field in DEVICE_NODE structure
- Full support of ParentIdPrefix value in registry
- Implement IRP_MJ_PNP/IRP_MN_QUERY_CAPABILITIES for PDOs enumerated by
Root bus
- Add a temporary hack in pci driver as long as Plug and Play is not
ready

=> This would allow to have two identical devices plugged on different
buses (for example, two USB mices plugged on different hubs)
Modified: trunk/reactos/bootdata/hivesys.inf
Modified: trunk/reactos/drivers/bus/pci/pci.c
Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c
Modified: trunk/reactos/ntoskrnl/io/pnproot.c
  _____  

Modified: trunk/reactos/bootdata/hivesys.inf
--- trunk/reactos/bootdata/hivesys.inf	2005-10-07 02:28:42 UTC (rev
18308)
+++ trunk/reactos/bootdata/hivesys.inf	2005-10-07 13:09:23 UTC (rev
18309)
@@ -592,6 +592,7 @@

 
HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Service",0x00000000,
"Pci"
 
HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","Class",0x00000000,"C
omputer"
 
HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ClassGUID",0x0000000
0,"{4D36E966-E325-11CE-BFC1-08002BE10318}"
+HKLM,"SYSTEM\CurrentControlSet\Enum\Root\PCI\0000","ParentIdPrefix",0x0
000000,"0000"
 
 ;USB UHCI Driver
 
HKLM,"SYSTEM\CurrentControlSet\Services\usbuhci","Type",0x00010001,0x000
00001
  _____  

Modified: trunk/reactos/drivers/bus/pci/pci.c
--- trunk/reactos/drivers/bus/pci/pci.c	2005-10-07 02:28:42 UTC (rev
18308)
+++ trunk/reactos/drivers/bus/pci/pci.c	2005-10-07 13:09:23 UTC (rev
18309)
@@ -258,7 +258,7 @@

        return RtlCreateUnicodeString(InstanceID, L"0001");
   }
   else
-	return RtlCreateUnicodeString(InstanceID, L"0000");
+	return RtlCreateUnicodeString(InstanceID, L"");
 }
 
 
  _____  

Modified: trunk/reactos/ntoskrnl/io/pnpmgr.c
--- trunk/reactos/ntoskrnl/io/pnpmgr.c	2005-10-07 02:28:42 UTC (rev
18308)
+++ trunk/reactos/ntoskrnl/io/pnpmgr.c	2005-10-07 13:09:23 UTC (rev
18309)
@@ -5,6 +5,7 @@

  * PURPOSE:         Initializes the PnP manager
  *
  * PROGRAMMERS:     Casper S. Hornstrup (chorns(a)users.sourceforge.net)
+ *                  HervÚ Poussineau (hpoussin(a)reactos.org)
  */
 
 /* INCLUDES
******************************************************************/
@@ -24,6 +25,79 @@
 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
@@ -632,6 +706,7 @@
 	}
       ParentNode->Child = Node;
       KeReleaseSpinLock(&IopDeviceTreeLock, OldIrql);
+      Node->Level = ParentNode->Level + 1;
     }
 
   *DeviceNode = Node;
@@ -1259,6 +1334,115 @@
 
 
 /*
+ * 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;
+      goto cleanup;
+   }
+   if (Status != STATUS_OBJECT_NAME_NOT_FOUND)
+      goto cleanup;
+
+   /* 2. Create the ParentIdPrefix value */
+   currentByte = (PBYTE)DeviceNode->Parent;
+   for (i = 0; i < sizeof(DEVICE_NODE); i++, currentByte++)
+      crc32 = (crc32 >> 8) ^ crc32Table[*currentByte ^ (crc32 & 0xff)];
+   crc32 = ~crc32;
+   KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
+   swprintf(KeyValue.Buffer, L"%lx&%lx", DeviceNode->Parent->Level,
crc32);
+
+   /* 3. Try to write the ParentIdPrefix to registry */
+   RtlInitUnicodeString(&KeyValue, KeyValue.Buffer);
+   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 */
+      KeyValue.Length = KeyValue.MaximumLength =
ParentIdPrefixInformation->DataLength;
+      KeyValue.Buffer = (PWSTR)ParentIdPrefixInformation->Data;
+      Status =
RtlDuplicateUnicodeString(RTL_DUPLICATE_UNICODE_STRING_NULL_TERMINATE,
&KeyValue, ParentIdPrefix);
+   }
+   ExFreePool(ParentIdPrefixInformation);
+   ExFreePool(KeyNameBuffer);
+   if (hKey != INVALID_HANDLE_VALUE)
+      ZwClose(hKey);
+   return Status;
+}
+
+
+/*
  * IopActionInterrogateDeviceStack
  *
  * Retrieve information for all (direct) child nodes of a parent node.
@@ -1293,8 +1477,8 @@
    USHORT TotalLength;
    HANDLE InstanceKey = NULL;
    UNICODE_STRING ValueName;
+   UNICODE_STRING ParentIdPrefix = { 0 };
    DEVICE_CAPABILITIES DeviceCapabilities;
-   PKEY_VALUE_PARTIAL_INFORMATION ParentPrefixIdInformation = NULL;
 
    DPRINT("IopActionInterrogateDeviceStack(%p, %p)\n", DeviceNode,
Context);
    DPRINT("PDO 0x%p\n", DeviceNode->PhysicalDeviceObject);
@@ -1366,52 +1550,10 @@
    {
       /* Device has not a unique ID. We need to prepend parent bus
unique identifier */
       DPRINT("Instance ID is not unique\n");
-      if (DeviceNode->Parent->InstancePath.Length > 0)
+      Status = IopGetParentIdPrefix(DeviceNode, &ParentIdPrefix);
+      if (!NT_SUCCESS(Status))
       {
-         /* Parent device node exists */
-         HANDLE hKey;
-         OBJECT_ATTRIBUTES ObjectAttributes;
-         UNICODE_STRING KeyName;
-         ULONG KeyNameBufferLength;
-         PWSTR KeyNameBuffer = NULL;
-
-         KeyNameBufferLength =
FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]) + MAX_PATH *
sizeof(WCHAR);
-         ParentPrefixIdInformation = ExAllocatePool(PagedPool,
KeyNameBufferLength + sizeof(WCHAR));
-         KeyNameBuffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR))
+ DeviceNode->Parent->InstancePath.Length);
-         if (ParentPrefixIdInformation && KeyNameBuffer)
-         {
-            /* Memory is allocated, let's try to read registry settings
*/
-            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_READ, &ObjectAttributes);
-            if (NT_SUCCESS(Status))
-            {
-               RtlInitUnicodeString(&ValueName, L"ParentIdPrefix");
-               Status = ZwQueryValueKey(
-                  hKey, &ValueName,
-                  KeyValuePartialInformation,
ParentPrefixIdInformation,
-                  KeyNameBufferLength, &KeyNameBufferLength);
-               if (NT_SUCCESS(Status))
-               {
-                  /* NULL-terminate the string, as we have allocated
enough place for it */
-
((PWSTR)ParentPrefixIdInformation->Data)[ParentPrefixIdInformation->Data
Length / sizeof(WCHAR)] = 0;
-               }
-               else
-               {
-                  ExFreePool(ParentPrefixIdInformation);
-                  ParentPrefixIdInformation = NULL;
-               }
-               ZwClose(hKey);
-            }
-            else
-            {
-               ExFreePool(ParentPrefixIdInformation);
-               ParentPrefixIdInformation = NULL;
-            }
-         }
-         ExFreePool(KeyNameBuffer);
+         DPRINT("IopGetParentIdPrefix() failed (Status 0x%08lx)\n",
Status);
       }
    }
 
@@ -1427,10 +1569,10 @@
    {
       /* Append the instance id string */
       wcscat(InstancePath, L"\\");
-      if (ParentPrefixIdInformation && ParentPrefixIdInformation->Type
== REG_SZ)
+      if (ParentIdPrefix.Length > 0)
       {
          /* Add information from parent bus device to InstancePath */
-         wcscat(InstancePath, (PWSTR)ParentPrefixIdInformation->Data);
+         wcscat(InstancePath, ParentIdPrefix.Buffer);
          if (*(PWSTR)IoStatusBlock.Information)
             wcscat(InstancePath, L"&");
       }
@@ -1445,7 +1587,7 @@
    {
       DPRINT("IopInitiatePnpIrp() failed (Status %x)\n", Status);
    }
-   ExFreePool(ParentPrefixIdInformation);
+   RtlFreeUnicodeString(&ParentIdPrefix);
 
    if (!RtlCreateUnicodeString(&DeviceNode->InstancePath,
InstancePath))
    {
  _____  

Modified: trunk/reactos/ntoskrnl/io/pnproot.c
--- trunk/reactos/ntoskrnl/io/pnproot.c	2005-10-07 02:28:42 UTC (rev
18308)
+++ trunk/reactos/ntoskrnl/io/pnproot.c	2005-10-07 13:09:23 UTC (rev
18309)
@@ -1,5 +1,4 @@

-/* $Id$
- *
+/*
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/io/pnproot.c
@@ -309,6 +308,30 @@
 }
 
 
+static NTSTATUS
+PnpRootPdoQueryCapabilities(
+  IN PDEVICE_OBJECT DeviceObject,
+  IN PIRP Irp,
+  PIO_STACK_LOCATION IrpSp)
+{
+  PPNPROOT_FDO_DEVICE_EXTENSION DeviceExtension;
+  PDEVICE_CAPABILITIES DeviceCapabilities;
+
+  DPRINT("Called\n");
+
+  DeviceExtension =
(PPNPROOT_FDO_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
+  DeviceCapabilities =
IrpSp->Parameters.DeviceCapabilities.Capabilities;
+
+  if (DeviceCapabilities->Version != 1)
+    return STATUS_UNSUCCESSFUL;
+
+  DeviceCapabilities->UniqueID = TRUE;
+  /* FIXME: Fill other fields */
+
+  return STATUS_SUCCESS;
+}
+
+
 /*
  * FUNCTION: Handle Plug and Play IRPs for the child device
  * ARGUMENTS:
@@ -353,6 +376,10 @@
     Status = PdoQueryResources(DeviceObject, Irp, IrpSp);
     break;
 
+  case IRP_MN_QUERY_CAPABILITIES:
+    Status = PnpRootPdoQueryCapabilities(DeviceObject, Irp, IrpSp);
+    break;
+
   case IRP_MN_START_DEVICE:
   case IRP_MN_QUERY_STOP_DEVICE:
   case IRP_MN_CANCEL_STOP_DEVICE: