Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-11-18 21:13:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[BDASUP]

Browse source 
- Register an empty filter descriptor as pins, nodes, connections will be added later dynamically
- Fixes the duplicate input / output pins visible with graphedt
- Add the filter automation table to the object bag so it gets deleted when filter factory is destroyed

svn path=/trunk/; revision=46642
This commit is contained in:
Johannes Anderwald 2010-04-01 17:18:13 +00:00
parent 59ba9ccd77
commit c44cdc2405
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
reactos/drivers/multimedia/bdasup/bdasup.c
View file

@ -275,6 +275,14 @@ BdaCreateFilterFactoryEx(
/* copy filter descriptor template */
RtlMoveMemory(FilterDescriptor, pFilterDescriptor, sizeof(KSFILTER_DESCRIPTOR));
/* erase pin / nodes / connections from filter descriptor */
FilterDescriptor->PinDescriptorsCount = 0;
FilterDescriptor->PinDescriptors = NULL;
FilterDescriptor->NodeDescriptorsCount = 0;
FilterDescriptor->NodeDescriptors = NULL;
FilterDescriptor->ConnectionsCount = 0;
FilterDescriptor->Connections = NULL;
/* merge the automation tables */
Status = KsMergeAutomationTables((PKSAUTOMATION_TABLE*)&FilterDescriptor->AutomationTable, (PKSAUTOMATION_TABLE)pFilterDescriptor->AutomationTable, &FilterAutomationTable, NULL);
@ -301,17 +309,21 @@ BdaCreateFilterFactoryEx(
/* check for success */
if (NT_SUCCESS(Status))
{
/* add the item to filter object bag */
Status = KsAddItemToObjectBag(FilterFactory->Bag, FilterInstance, FreeFilterInstance);
if (!NT_SUCCESS(Status))
if (FilterDescriptor->AutomationTable != &FilterAutomationTable)
{
/* destroy filter instance */
DPRINT1("KsAddItemToObjectBag failed with %lx\n", Status);
FreeItem(FilterDescriptor);
FreeItem(FilterInstance);
KsDeleteFilterFactory(FilterFactory);
return Status;
/* add the item to filter object bag */
KsAddItemToObjectBag(FilterFactory->Bag, (PVOID)FilterDescriptor->AutomationTable, FreeFilterInstance);
}
else
{
/* make sure the automation table is not-read only */
Status = _KsEdit(FilterFactory->Bag, (PVOID*)&FilterDescriptor->AutomationTable, sizeof(KSAUTOMATION_TABLE), sizeof(KSAUTOMATION_TABLE), 0);
/* sanity check */
ASSERT(Status == STATUS_SUCCESS);
/* add to object bag */
KsAddItemToObjectBag(FilterFactory->Bag, (PVOID)FilterDescriptor->AutomationTable, FreeFilterInstance);
}
/* initialize filter instance entry */
@ -338,7 +350,7 @@ BdaCreateFilterFactoryEx(
{
/* failed to create filter factory */
FreeItem(FilterInstance);
DPRINT1("KsCreateFilterFactory failed with %lx\n", Status);
FreeItem(FilterDescriptor);
}
/* done */