[ros-diffs] [cgutman] 53461: [ACPI] - Skip fixed feature buttons when reporting resources - Terminate the hardware ID list with 2 NULL characters

[cgutman at svn.reactos.org]

Author: cgutman
Date: Fri Aug 26 23:46:32 2011
New Revision: 53461

URL: http://svn.reactos.org/svn/reactos?rev=53461&view=rev
Log:
[ACPI]
- Skip fixed feature buttons when reporting resources
- Terminate the hardware ID list with 2 NULL characters

Modified:
    trunk/reactos/drivers/bus/acpi/acpienum.c
    trunk/reactos/drivers/bus/acpi/buspdo.c

Modified: trunk/reactos/drivers/bus/acpi/acpienum.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/acpienum.c?rev=53461&r1=53460&r2=53461&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/acpienum.c [iso-8859-1] Fri Aug 26 23:46:32 2011
@@ -92,7 +92,7 @@
 							L"*%hs",
 							Device->pnp.hardware_id);
 		index++;
-		temp[index] = UNICODE_NULL;
+		temp[++index] = UNICODE_NULL;
 
 		pdoData->HardwareIDs  = ExAllocatePool(NonPagedPool, index*sizeof(WCHAR));
 

Modified: trunk/reactos/drivers/bus/acpi/buspdo.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/acpi/buspdo.c?rev=53461&r1=53460&r2=53461&view=diff
==============================================================================
--- trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] (original)
+++ trunk/reactos/drivers/bus/acpi/buspdo.c [iso-8859-1] Fri Aug 26 23:46:32 2011
@@ -656,6 +656,11 @@
 	ULONG i;
 	ULONGLONG BusNumber;
 
+    if (!DeviceData->AcpiHandle)
+    {
+        return Irp->IoStatus.Status;
+    }
+
     /* A bus number resource is not included in the list of current resources
      * for the root PCI bus so we manually query one here and if we find it
      * we create a resource list and add a bus number descriptor to it */
@@ -1103,6 +1108,10 @@
 
     PAGED_CODE ();
 
+    if (!DeviceData->AcpiHandle)
+    {
+        return Irp->IoStatus.Status;
+    }
 
     /* Get current resources */
     while (TRUE)