Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-05 01:10:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MMIXER]

Browse source 
- Merge 50674 to trunk:
- Allocate memory for the logical pin array
- Use the correct counter variable for logical pin array
- Found by msvc
See issue #6143 for more details.

svn path=/trunk/; revision=51455
This commit is contained in:
Johannes Anderwald 2011-04-25 20:34:41 +00:00
parent d3561afa95
commit 2e7e8bb0f6
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/lib/drivers/sound/mmixer/sup.c
View file

@ -544,6 +544,14 @@ MMixerSetGetMuxControlDetails(
ASSERT(MixerData->Topology); ASSERT(MixerData->Topology);
ASSERT(MixerData->MixerInfo == MixerInfo); ASSERT(MixerData->MixerInfo == MixerInfo);
/* now allocate logical pin array */
Status = MMixerAllocateTopologyNodeArray(MixerContext, MixerData->Topology, &LogicalNodes);
if (Status != MM_STATUS_SUCCESS)
{
/* no memory */
return MM_STATUS_NO_MEMORY;
}
/* get logical pin nodes */ /* get logical pin nodes */
MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes); MMixerGetConnectedFromLogicalTopologyPins(MixerData->Topology, MixerControl->NodeID, &LogicalNodesCount, LogicalNodes);
@ -552,7 +560,7 @@ MMixerSetGetMuxControlDetails(
ASSERT(LogicalNodesCount == MixerControl->Control.Metrics.dwReserved[0]); ASSERT(LogicalNodesCount == MixerControl->Control.Metrics.dwReserved[0]);
Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails; Values = (LPMIXERCONTROLDETAILS_BOOLEAN)MixerControlDetails->paDetails;
for(Index = 0; Index < ConnectedNodesCount; Index++) for(Index = 0; Index < LogicalNodesCount; Index++)
{ {
/* getting logical pin offset */ /* getting logical pin offset */
MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset); MMixerGetLowestLogicalTopologyPinOffsetFromArray(LogicalNodesCount, LogicalNodes, &CurLogicalPinOffset);