marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

winmm: Reset dwUser in mixerGetLineInfo. 

Signed-off-by: Andrew Eikum <aeikum@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
oldstable
Andrew Eikum 2016-02-10 12:33:23 -06:00 committed by Alexandre Julliard
parent 8a7e7ec6a1
commit 992e3c5dc8
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -438,11 +438,13 @@ static void mixer_test_deviceA(int device)
mixerlineA.cbStruct = sizeof(mixerlineA);
mixerlineA.dwDestination=d;
mixerlineA.dwUser = (ULONG_PTR)0xdeadbeef;
rc = mixerGetLineInfoA(mix, &mixerlineA, MIXER_GETLINEINFOF_DESTINATION);
ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER,
"mixerGetLineInfoA(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc));
ok(mixerlineA.dwUser == 0, "dwUser was not reset\n");
if (rc==MMSYSERR_NODRIVER)
trace(" No Driver\n");
else if (rc==MMSYSERR_NOERROR) {
@ -822,11 +824,13 @@ static void mixer_test_deviceW(int device)
mixerlineW.cbStruct = sizeof(mixerlineW);
mixerlineW.dwDestination=d;
mixerlineW.dwUser = (ULONG_PTR)0xdeadbeef;
rc = mixerGetLineInfoW(mix, &mixerlineW, MIXER_GETLINEINFOF_DESTINATION);
ok(rc==MMSYSERR_NOERROR||rc==MMSYSERR_NODRIVER,
"mixerGetLineInfoW(MIXER_GETLINEINFOF_DESTINATION): "
"MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc));
ok(mixerlineW.dwUser == 0, "dwUser was not reset\n");
if (rc==MMSYSERR_NODRIVER)
trace(" No Driver\n");
else if (rc==MMSYSERR_NOERROR && winetest_interactive) {

2
dlls/winmm/waveform.c
View File

@ -4287,6 +4287,8 @@ UINT WINAPI mixerGetLineInfoW(HMIXEROBJ hmix, LPMIXERLINEW lpmliW, DWORD fdwInfo
if(!mmdevice)
return MMSYSERR_INVALHANDLE;
lpmliW->dwUser = 0;
switch(fdwInfo & MIXER_GETLINEINFOF_QUERYMASK){
case MIXER_GETLINEINFOF_DESTINATION:
return WINMM_GetDestinationLineInfo(mmdevice, mmdev_index, lpmliW,