[ros-diffs] [hpoussin] 18326: Fix Hardware IDs and Compatible IDs returned for PCI devices

Fix Hardware IDs and Compatible IDs returned for PCI devices
Modified: trunk/reactos/drivers/bus/pci/pci.c
  _____

Modified: trunk/reactos/drivers/bus/pci/pci.c
--- trunk/reactos/drivers/bus/pci/pci.c	2005-10-08 12:18:07 UTC (rev
18325)
+++ trunk/reactos/drivers/bus/pci/pci.c	2005-10-08 12:24:39 UTC (rev
18326)
@@ -288,6 +288,23 @@

Device->PciConfig.u.type0.SubVendorID);
   Index++;

+  Index += swprintf(&Buffer[Index],
+           L"PCI\VEN_%04X&DEV_%04X&CC_%02X%02X%02X",
+           Device->PciConfig.VendorID,
+           Device->PciConfig.DeviceID,
+           Device->PciConfig.BaseClass,
+           Device->PciConfig.SubClass,
+           Device->PciConfig.ProgIf);
+  Index++;
+
+  Index += swprintf(&Buffer[Index],
+           L"PCI\VEN_%04X&DEV_%04X&CC_%02X%02X",
+           Device->PciConfig.VendorID,
+           Device->PciConfig.DeviceID,
+           Device->PciConfig.BaseClass,
+           Device->PciConfig.SubClass);
+  Index++;
+
   Buffer[Index] = UNICODE_NULL;

Length = (Index + 1) * sizeof(WCHAR);
@@ -315,32 +332,19 @@

Index = 0;
   Index += swprintf(&Buffer[Index],
-           L"PCI\VEN_%04X&DEV_%04X&REV_%02X&CC_%02X%02X",
+           L"PCI\VEN_%04X&DEV_%04X&REV_%02X",
            Device->PciConfig.VendorID,
            Device->PciConfig.DeviceID,
-           Device->PciConfig.RevisionID,
-           Device->PciConfig.BaseClass,
-           Device->PciConfig.SubClass);
+           Device->PciConfig.RevisionID);
   Index++;

Index += swprintf(&Buffer[Index],
-           L"PCI\VEN_%04X&DEV_%04X&CC_%02X%02X%02X",
+           L"PCI\VEN_%04X&DEV_%04X",
            Device->PciConfig.VendorID,
-           Device->PciConfig.DeviceID,
-           Device->PciConfig.BaseClass,
-           Device->PciConfig.SubClass,
-           Device->PciConfig.ProgIf);
+           Device->PciConfig.DeviceID);
   Index++;

Index += swprintf(&Buffer[Index],
-           L"PCI\VEN_%04X&DEV_%04X&CC_%02X%02X",
-           Device->PciConfig.VendorID,
-           Device->PciConfig.DeviceID,
-           Device->PciConfig.BaseClass,
-           Device->PciConfig.SubClass);
-  Index++;
-
-  Index += swprintf(&Buffer[Index],
            L"PCI\VEN_%04X&CC_%02X%02X%02X",
            Device->PciConfig.VendorID,
            Device->PciConfig.BaseClass,