Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-25 15:39:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Quit building a useless IO_RESOURCE_REQUIREMENTS_LIST (and leaking memory) in response to IRP_MN_QUERY_RESOURCES

Browse source 
- Actually store the IO_RESOURCE_REQUIREMENTS_LIST in Irp->IoStatus.Information in response to IRP_MN_QUERY_RESOURCE_REQUIREMENTS so the PnP manager can use it (and fixes another memory leak)

svn path=/trunk/; revision=46073
This commit is contained in:
Cameron Gutman 2010-03-10 21:11:23 +00:00
parent da63b1ca50
commit ae6e63592d
1 changed files with 2 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

50
reactos/drivers/bus/acpi/buspdo.c
View file

@ -595,10 +595,6 @@ Bus_PDO_QueryResources(
ULONG ResourceListSize; ULONG ResourceListSize;
ULONG i; ULONG i;
ULONG RequirementsListSize;
PIO_RESOURCE_REQUIREMENTS_LIST RequirementsList;
PIO_RESOURCE_DESCRIPTOR RequirementDescriptor;
/* Get current resources */ /* Get current resources */
Buffer.Length = 0; Buffer.Length = 0;
@ -672,24 +668,6 @@ Bus_PDO_QueryResources(
ResourceList->List[0].PartialResourceList.Count = NumberOfResources; ResourceList->List[0].PartialResourceList.Count = NumberOfResources;
ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors; ResourceDescriptor = ResourceList->List[0].PartialResourceList.PartialDescriptors;
RequirementsListSize = sizeof(IO_RESOURCE_REQUIREMENTS_LIST) + sizeof(IO_RESOURCE_DESCRIPTOR) * (NumberOfResources - 1);
RequirementsList = (PIO_RESOURCE_REQUIREMENTS_LIST)ExAllocatePool(PagedPool, RequirementsListSize);
if (!RequirementsList)
{
ExFreePool(ResourceList);
return STATUS_SUCCESS;
}
RequirementsList->ListSize = RequirementsListSize;
RequirementsList->InterfaceType = Internal;
RequirementsList->BusNumber = 0;
RequirementsList->SlotNumber = 0; /* Not used by WDM drivers */
RequirementsList->AlternativeLists = 1;
RequirementsList->List[0].Version = 1;
RequirementsList->List[0].Revision = 1;
RequirementsList->List[0].Count = NumberOfResources;
RequirementDescriptor = RequirementsList->List[0].Descriptors;
/* Fill resources list structure */ /* Fill resources list structure */
Done = FALSE; Done = FALSE;
while (!Done) while (!Done)
@ -711,15 +689,7 @@ Bus_PDO_QueryResources(
ResourceDescriptor->u.Interrupt.Vector = 0; ResourceDescriptor->u.Interrupt.Vector = 0;
ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1); ResourceDescriptor->u.Interrupt.Affinity = (KAFFINITY)(-1);
RequirementDescriptor->Option = 0; /* Required */
RequirementDescriptor->Type = ResourceDescriptor->Type;
RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition;
RequirementDescriptor->Flags = ResourceDescriptor->Flags;
RequirementDescriptor->u.Interrupt.MinimumVector = RequirementDescriptor->u.Interrupt.MaximumVector
= irq_data->Interrupts[i];
ResourceDescriptor++; ResourceDescriptor++;
RequirementDescriptor++;
} }
break; break;
} }
@ -746,15 +716,7 @@ Bus_PDO_QueryResources(
} }
ResourceDescriptor->u.Dma.Channel = dma_data->Channels[i]; ResourceDescriptor->u.Dma.Channel = dma_data->Channels[i];
RequirementDescriptor->Option = 0; /* Required */
RequirementDescriptor->Type = ResourceDescriptor->Type;
RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition;
RequirementDescriptor->Flags = ResourceDescriptor->Flags;
RequirementDescriptor->u.Dma.MinimumChannel = RequirementDescriptor->u.Dma.MaximumChannel
= ResourceDescriptor->u.Dma.Channel;
ResourceDescriptor++; ResourceDescriptor++;
RequirementDescriptor++;
} }
break; break;
} }
@ -772,17 +734,7 @@ Bus_PDO_QueryResources(
ResourceDescriptor->u.Port.Start.u.LowPart = io_data->Minimum; ResourceDescriptor->u.Port.Start.u.LowPart = io_data->Minimum;
ResourceDescriptor->u.Port.Length = io_data->AddressLength; ResourceDescriptor->u.Port.Length = io_data->AddressLength;
RequirementDescriptor->Option = 0; /* Required */
RequirementDescriptor->Type = ResourceDescriptor->Type;
RequirementDescriptor->ShareDisposition = ResourceDescriptor->ShareDisposition;
RequirementDescriptor->Flags = ResourceDescriptor->Flags;
RequirementDescriptor->u.Port.Length = ResourceDescriptor->u.Port.Length;
RequirementDescriptor->u.Port.Alignment = 1; /* Start address is specified, so it doesn't matter */
RequirementDescriptor->u.Port.MinimumAddress = RequirementDescriptor->u.Port.MaximumAddress
= ResourceDescriptor->u.Port.Start;
ResourceDescriptor++; ResourceDescriptor++;
RequirementDescriptor++;
break; break;
} }
case ACPI_RESOURCE_TYPE_END_TAG: case ACPI_RESOURCE_TYPE_END_TAG:
@ -983,6 +935,8 @@ Bus_PDO_QueryResourceRequirements(
} }
ExFreePool(Buffer.Pointer); ExFreePool(Buffer.Pointer);
Irp->IoStatus.Information = (ULONG_PTR)RequirementsList;
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }