Skip to content

W
wine-winehq
Commit 992e3c5d authored by Andrew Eikum's avatar Andrew Eikum Committed by Alexandre Julliard
Browse files
Options

winmm: Reset dwUser in mixerGetLineInfo.

Signed-off-by: 's avatarAndrew Eikum <aeikum@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 8a7e7ec6
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
dlls/winmm/tests/mixer.c
View file @ 992e3c5d
......@@ -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) {
......
dlls/winmm/waveform.c
View file @ 992e3c5d
......@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment