Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-17 00:03:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PORTCLS]

Browse source 
- Merge from the audio branch
- Fix node property handler
- Take advantage of IPinCount interface

svn path=/trunk/; revision=49974
This commit is contained in:
Johannes Anderwald 2010-12-07 17:23:09 +00:00
parent d6f6afee98
commit ee4f08ad85
2 changed files with 57 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
reactos/drivers/wdm/audio/backpln/portcls/propertyhandler.cpp
View file

@ -14,10 +14,13 @@ HandlePropertyInstances(
IN PKSIDENTIFIER Request,
IN OUT PVOID Data,
IN PSUBDEVICE_DESCRIPTOR Descriptor,
IN BOOL Global)
IN BOOL Global,
IN ISubdevice *SubDevice)
{
KSPIN_CINSTANCES * Instances;
KSP_PIN * Pin = (KSP_PIN*)Request;
ULONG FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible;
NTSTATUS Status;
if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount)
{
@ -28,12 +31,31 @@ HandlePropertyInstances(
Instances = (KSPIN_CINSTANCES*)Data;
if (Global)
Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxGlobalInstanceCount;
else
Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxFilterInstanceCount;
// check if the miniport supports the IPinCount interface
Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible);
Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount;
if (NT_SUCCESS(Status))
{
if (Global)
{
Instances->PossibleCount = GlobalPossible;
Instances->CurrentCount = GlobalCurrent;
}
else
{
Instances->PossibleCount = FilterPossible;
Instances->CurrentCount = FilterCurrent;
}
}
else
{
if (Global)
Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxGlobalInstanceCount;
else
Instances->PossibleCount = Descriptor->Factory.Instances[Pin->PinId].MaxFilterInstanceCount;
Instances->CurrentCount = Descriptor->Factory.Instances[Pin->PinId].CurrentPinInstanceCount;
}
IoStatus->Information = sizeof(KSPIN_CINSTANCES);
IoStatus->Status = STATUS_SUCCESS;
@ -45,10 +67,13 @@ HandleNecessaryPropertyInstances(
IN PIO_STATUS_BLOCK IoStatus,
IN PKSIDENTIFIER Request,
IN OUT PVOID Data,
IN PSUBDEVICE_DESCRIPTOR Descriptor)
IN PSUBDEVICE_DESCRIPTOR Descriptor,
IN ISubdevice *SubDevice)
{
PULONG Result;
KSP_PIN * Pin = (KSP_PIN*)Request;
ULONG FilterNecessary, FilterCurrent, FilterPossible, GlobalCurrent, GlobalPossible;
NTSTATUS Status;
if (Pin->PinId >= Descriptor->Factory.PinDescriptorCount)
{
@ -58,7 +83,19 @@ HandleNecessaryPropertyInstances(
}
Result = (PULONG)Data;
*Result = Descriptor->Factory.Instances[Pin->PinId].MinFilterInstanceCount;
// check if the miniport supports the IPinCount interface
Status = SubDevice->PinCount(Pin->PinId, &FilterNecessary, &FilterCurrent, &FilterPossible, &GlobalCurrent, &GlobalPossible);
if (NT_SUCCESS(Status))
{
*Result = FilterNecessary;
}
else
{
*Result = Descriptor->Factory.Instances[Pin->PinId].MinFilterInstanceCount;
}
IoStatus->Information = sizeof(ULONG);
IoStatus->Status = STATUS_SUCCESS;
@ -236,13 +273,13 @@ PinPropertyHandler(
Status = KsPinPropertyHandler(Irp, Request, Data, Descriptor->Factory.PinDescriptorCount, Descriptor->Factory.KsPinDescriptor);
break;
case KSPROPERTY_PIN_GLOBALCINSTANCES:
Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, TRUE);
Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, TRUE, SubDevice);
break;
case KSPROPERTY_PIN_CINSTANCES:
Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, FALSE);
Status = HandlePropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, FALSE, SubDevice);
break;
case KSPROPERTY_PIN_NECESSARYINSTANCES:
Status = HandleNecessaryPropertyInstances(&Irp->IoStatus, Request, Data, Descriptor);
Status = HandleNecessaryPropertyInstances(&Irp->IoStatus, Request, Data, Descriptor, SubDevice);
break;
case KSPROPERTY_PIN_DATAINTERSECTION:

20
reactos/drivers/wdm/audio/backpln/portcls/undoc.cpp
View file

@ -165,7 +165,7 @@ PropertyItemDispatch(
// get instance / value size
InstanceSize = IoStack->Parameters.DeviceIoControl.InputBufferLength;
Instance = Data;
Instance = Request;
ValueSize = IoStack->Parameters.DeviceIoControl.OutputBufferLength;
// initialize property request
@ -273,17 +273,15 @@ PropertyItemDispatch(
if (PropertyRequest->PropertyItem && PropertyRequest->PropertyItem->Handler)
{
// now call the handler
UNICODE_STRING GuidBuffer;
RtlStringFromGUID(Property->Set, &GuidBuffer);
DPRINT1("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p\n",
PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize,
PropertyRequest->PropertyItem->Handler, PropertyRequest);
#if 0
//UNICODE_STRING GuidBuffer;
//RtlStringFromGUID(Property->Set, &GuidBuffer);
//DPRINT("Calling Node %lu MajorTarget %p MinorTarget %p PropertySet %S PropertyId %lu PropertyFlags %lx InstanceSize %lu ValueSize %lu Handler %p PropertyRequest %p PropertyItemFlags %lx PropertyItemId %lu\n",
// PropertyRequest->Node, PropertyRequest->MajorTarget, PropertyRequest->MinorTarget, GuidBuffer.Buffer, Property->Id, Property->Flags, PropertyRequest->InstanceSize, PropertyRequest->ValueSize,
// PropertyRequest->PropertyItem->Handler, PropertyRequest, PropertyRequest->PropertyItem->Flags, PropertyRequest->PropertyItem->Id);
Status = PropertyRequest->PropertyItem->Handler(PropertyRequest);
#else
Status = STATUS_NOT_FOUND;
#endif
Irp->IoStatus.Information = PropertyRequest->ValueSize;
//DPRINT("Status %lx ValueSize %lu Information %lu\n", Status, PropertyRequest->ValueSize, Irp->IoStatus.Information);
Irp->IoStatus.Information = PropertyRequest->ValueSize;
if (Status != STATUS_PENDING)
{