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

[MMIXER]

Browse source 
- Handle failure of device enumeration
- Add sanity check

svn path=/trunk/; revision=47715
This commit is contained in:
Johannes Anderwald 2010-06-09 16:51:16 +00:00
parent 1bb04a5142
commit a7e58af961
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/lib/drivers/sound/mmixer/controls.c
View file

@ -385,6 +385,8 @@ MMixerAddMixerSourceLine(
SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid; SrcLine->Line.Target.wPid = MixerInfo->MixCaps.wPid;
SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion; SrcLine->Line.Target.vDriverVersion = MixerInfo->MixCaps.vDriverVersion;
InitializeListHead(&SrcLine->LineControlsExtraData); InitializeListHead(&SrcLine->LineControlsExtraData);
ASSERT(MixerInfo->MixCaps.szPname[MAXPNAMELEN-1] == L'\0');
wcscpy(SrcLine->Line.Target.szPname, MixerInfo->MixCaps.szPname); wcscpy(SrcLine->Line.Target.szPname, MixerInfo->MixCaps.szPname);
} }

7
reactos/lib/drivers/sound/mmixer/mixer.c
View file

@ -472,6 +472,13 @@ MMixerInitialize(
// enumeration has finished // enumeration has finished
break; break;
} }
else
{
DPRINT1("Failed to enumerate device %lu\n", DeviceIndex);
// TODO cleanup
return Status;
}
} }
else else
{ {