Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:33:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Remove dead code

Browse source 
- Reuse free audio handle index

svn path=/trunk/; revision=41726
This commit is contained in:
Johannes Anderwald 2009-07-01 15:00:12 +00:00
parent f6ef04567a
commit 67c08d9b00
1 changed files with 7 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

27
reactos/drivers/wdm/audio/legacy/wdmaud/control.c
View file

@ -184,24 +184,7 @@ WdmAudControlOpen(
return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0); return SetIrpIoStatus(Irp, STATUS_NO_MEMORY, 0);
} }
InstanceInfo->Property.Set = KSPROPSETID_Sysaudio;
InstanceInfo->Property.Id = KSPROPERTY_SYSAUDIO_INSTANCE_INFO;
InstanceInfo->Property.Flags = KSPROPERTY_TYPE_SET;
InstanceInfo->Flags = 0;
InstanceInfo->DeviceNumber = FilterId;
DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension; DeviceExtension = (PWDMAUD_DEVICE_EXTENSION)DeviceObject->DeviceExtension;
Status = KsSynchronousIoControlDevice(DeviceExtension->FileObject, KernelMode, IOCTL_KS_PROPERTY, (PVOID)InstanceInfo, sizeof(SYSAUDIO_INSTANCE_INFO), NULL, 0, &BytesReturned);
if (!NT_SUCCESS(Status))
{
/* failed to acquire audio device */
DPRINT1("KsSynchronousIoControlDevice failed with %x\n", Status);
ExFreePool(InstanceInfo);
return SetIrpIoStatus(Irp, Status, 0);
}
if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE || if (DeviceInfo->DeviceType == WAVE_IN_DEVICE_TYPE ||
DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE || DeviceInfo->DeviceType == MIDI_IN_DEVICE_TYPE ||
DeviceInfo->DeviceType == MIXER_DEVICE_TYPE) DeviceInfo->DeviceType == MIXER_DEVICE_TYPE)
@ -261,13 +244,17 @@ WdmAudControlOpen(
for(Index = 0; Index < ClientInfo->NumPins; Index++) for(Index = 0; Index < ClientInfo->NumPins; Index++)
{ {
if (ClientInfo->hPins[Index].Handle == PinHandle) if (ClientInfo->hPins[Index].Handle == NULL)
{ {
/* the pin handle has been re-used */ /* re-use a free index */
ClientInfo->hPins[Index].Handle = PinHandle;
ClientInfo->hPins[Index].FilterId = FilterId;
ClientInfo->hPins[Index].PinId = PinId;
ClientInfo->hPins[Index].Type = DeviceInfo->DeviceType;
DeviceInfo->hDevice = PinHandle; DeviceInfo->hDevice = PinHandle;
return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO));
} }
} }
Handels = ExAllocatePool(NonPagedPool, sizeof(WDMAUD_HANDLE) * (ClientInfo->NumPins+1)); Handels = ExAllocatePool(NonPagedPool, sizeof(WDMAUD_HANDLE) * (ClientInfo->NumPins+1));