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

- When enumerating controls, cControls *tells* the number of controls not *cConnections*. Fix a crash in XP sndvol32

Browse source 
- Clear the entire struct, not just part of it
- WdmAudMixerCapabilities just provides the index of a device, not its handle. Fixes displaying of duplicate mixer name in sndvol32
- Verify that a mixer line exists

svn path=/trunk/; revision=43335
This commit is contained in:
Johannes Anderwald 2009-10-08 07:25:26 +00:00
parent 60a2ad65bb
commit e7e971167b
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
reactos/drivers/wdm/audio/legacy/wdmaud/mixer.c
View file

@ -92,7 +92,7 @@ GetMixerControlById(
{ {
MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry); MixerLineSrc = (LPMIXERLINE_EXT)CONTAINING_RECORD(Entry, MIXERLINE_EXT, Entry);
for(Index = 0; Index < MixerLineSrc->Line.cConnections; Index++) for(Index = 0; Index < MixerLineSrc->Line.cControls; Index++)
{ {
if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID) if (MixerLineSrc->LineControls[Index].dwControlID == dwControlID)
{ {
@ -1530,7 +1530,7 @@ InitializeMixer(
} }
/* initialize mixer destination line */ /* initialize mixer destination line */
RtlZeroMemory(DestinationLine, sizeof(MIXERLINEW)); RtlZeroMemory(DestinationLine, sizeof(MIXERLINE_EXT));
DestinationLine->Line.cbStruct = sizeof(MIXERLINEW); DestinationLine->Line.cbStruct = sizeof(MIXERLINEW);
DestinationLine->Line.dwSource = MAXULONG; DestinationLine->Line.dwSource = MAXULONG;
DestinationLine->Line.dwLineID = DESTINATION_LINE; DestinationLine->Line.dwLineID = DESTINATION_LINE;
@ -1702,14 +1702,14 @@ WdmAudMixerCapabilities(
IN PWDMAUD_CLIENT ClientInfo, IN PWDMAUD_CLIENT ClientInfo,
IN PWDMAUD_DEVICE_EXTENSION DeviceExtension) IN PWDMAUD_DEVICE_EXTENSION DeviceExtension)
{ {
if ((ULONG)DeviceInfo->hDevice >= DeviceExtension->MixerInfoCount) if ((ULONG)DeviceInfo->DeviceIndex >= DeviceExtension->MixerInfoCount)
{ {
/* invalid parameter */ /* invalid parameter */
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
} }
/* copy cached mixer caps */ /* copy cached mixer caps */
RtlMoveMemory(&DeviceInfo->u.MixCaps, &DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice].MixCaps, sizeof(MIXERCAPSW)); RtlMoveMemory(&DeviceInfo->u.MixCaps, &DeviceExtension->MixerInfo[(ULONG)DeviceInfo->DeviceIndex].MixCaps, sizeof(MIXERCAPSW));
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@ -1842,7 +1842,11 @@ WdmAudGetLineInfo(
} }
MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID); MixerLineSrc = GetSourceMixerLineByLineId(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixLine.dwLineID);
ASSERT(MixerLineSrc); if (!MixerLineSrc)
{
DPRINT1("Failed to find Line with id %u\n", DeviceInfo->u.MixLine.dwLineID);
return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0);
}
/* copy cached data */ /* copy cached data */
RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW)); RtlCopyMemory(&DeviceInfo->u.MixLine, &MixerLineSrc->Line, sizeof(MIXERLINEW));
@ -1938,7 +1942,7 @@ WdmAudGetLineControls(
/* invalid parameter */ /* invalid parameter */
return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0);
} }
DPRINT1("MixerId %u ControlId %u\n",(ULONG)DeviceInfo->hDevice, DeviceInfo->u.MixControls.dwControlID);
Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL); Status = GetMixerControlById(&DeviceExtension->MixerInfo[(ULONG)DeviceInfo->hDevice], DeviceInfo->u.MixControls.dwControlID, NULL, &MixerControl, NULL);
if (NT_SUCCESS(Status)) if (NT_SUCCESS(Status))
{ {
@ -1947,7 +1951,6 @@ WdmAudGetLineControls(
return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO)); return SetIrpIoStatus(Irp, Status, sizeof(WDMAUD_DEVICE_INFO));
} }
UNIMPLEMENTED; UNIMPLEMENTED;
//DbgBreakPoint(); //DbgBreakPoint();
return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0); return SetIrpIoStatus(Irp, STATUS_NOT_IMPLEMENTED, 0);