ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winmm: Fixed mixerGetControlDetails with null paDetails.

Browse Source
This commit is contained in:
Qian Hong 2013-10-25 05:41:53 +08:00 committed by Alexandre Julliard
parent 5e81bad239
commit 78b2fd8399
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dlls/winmm/tests/mixer.c
View File

@ -197,10 +197,17 @@ static void mixer_test_controlA(HMIXER mix, LPMIXERCONTROLA control)
details.dwControlID = control->dwControlID; details.dwControlID = control->dwControlID;
details.cChannels = 1; details.cChannels = 1;
U(details).cMultipleItems = 0; U(details).cMultipleItems = 0;
details.paDetails = &value;
details.cbDetails = sizeof(value); details.cbDetails = sizeof(value);
/* test NULL paDetails */
details.paDetails = NULL;
rc=mixerGetControlDetails((HMIXEROBJ)mix,&details,MIXER_GETCONTROLDETAILSF_VALUE);
ok(rc==MMSYSERR_INVALPARAM,
"mixerGetDevCapsA: MMSYSERR_INVALPARAM expected, got %s\n",
mmsys_error(rc));
/* read the current control value */ /* read the current control value */
details.paDetails = &value;
rc=mixerGetControlDetails((HMIXEROBJ)mix,&details,MIXER_GETCONTROLDETAILSF_VALUE); rc=mixerGetControlDetails((HMIXEROBJ)mix,&details,MIXER_GETCONTROLDETAILSF_VALUE);
ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): " ok(rc==MMSYSERR_NOERROR,"mixerGetControlDetails(MIXER_GETCONTROLDETAILSF_VALUE): "
"MMSYSERR_NOERROR expected, got %s\n", "MMSYSERR_NOERROR expected, got %s\n",

2
dlls/winmm/waveform.c
View File

@ -3849,7 +3849,7 @@ UINT WINAPI mixerGetControlDetailsW(HMIXEROBJ hmix, LPMIXERCONTROLDETAILS lpmcdW
if(FAILED(hr)) if(FAILED(hr))
return MMSYSERR_NODRIVER; return MMSYSERR_NODRIVER;
if(!lpmcdW) if(!lpmcdW || !lpmcdW->paDetails)
return MMSYSERR_INVALPARAM; return MMSYSERR_INVALPARAM;
TRACE("dwControlID: %u\n", lpmcdW->dwControlID); TRACE("dwControlID: %u\n", lpmcdW->dwControlID);