- Skip fixed feature buttons when reporting resources
- Terminate the hardware ID list with 2 NULL characters

svn path=/trunk/; revision=53461
This commit is contained in:
Cameron Gutman 2011-08-26 23:46:32 +00:00
parent cb83086870
commit b0c146ed0c
2 changed files with 10 additions and 1 deletions

View file

@ -92,7 +92,7 @@ Bus_PlugInDevice (
L"*%hs", L"*%hs",
Device->pnp.hardware_id); Device->pnp.hardware_id);
index++; index++;
temp[index] = UNICODE_NULL; temp[++index] = UNICODE_NULL;
pdoData->HardwareIDs = ExAllocatePool(NonPagedPool, index*sizeof(WCHAR)); pdoData->HardwareIDs = ExAllocatePool(NonPagedPool, index*sizeof(WCHAR));

View file

@ -656,6 +656,11 @@ Bus_PDO_QueryResources(
ULONG i; ULONG i;
ULONGLONG BusNumber; ULONGLONG BusNumber;
if (!DeviceData->AcpiHandle)
{
return Irp->IoStatus.Status;
}
/* A bus number resource is not included in the list of current resources /* 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 * 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 */ * we create a resource list and add a bus number descriptor to it */
@ -1103,6 +1108,10 @@ Bus_PDO_QueryResourceRequirements(
PAGED_CODE (); PAGED_CODE ();
if (!DeviceData->AcpiHandle)
{
return Irp->IoStatus.Status;
}
/* Get current resources */ /* Get current resources */
while (TRUE) while (TRUE)