winmm: mixerOpen should return success with NULL dwCallback and CALLBACK_WINDOW flag.

This commit is contained in:
Andrew Nguyen 2008-12-21 01:48:40 -06:00 committed by Alexandre Julliard
parent 64cf306292
commit 0135bf8a0c
2 changed files with 1 additions and 2 deletions

View File

@ -1035,7 +1035,6 @@ static void test_mixerOpen()
/* Test mixerOpen with a NULL dwCallback and CALLBACK_WINDOW flag. */ /* Test mixerOpen with a NULL dwCallback and CALLBACK_WINDOW flag. */
rc = mixerOpen(&mix, d, 0, 0, CALLBACK_WINDOW); rc = mixerOpen(&mix, d, 0, 0, CALLBACK_WINDOW);
todo_wine
ok(rc == MMSYSERR_NOERROR, ok(rc == MMSYSERR_NOERROR,
"mixerOpen: MMSYSERR_NOERROR expected, got %s\n", "mixerOpen: MMSYSERR_NOERROR expected, got %s\n",
mmsys_error(rc)); mmsys_error(rc));

View File

@ -355,7 +355,7 @@ UINT MIXER_Open(LPHMIXER lphMix, UINT uDeviceID, DWORD_PTR dwCallback,
case CALLBACK_WINDOW: case CALLBACK_WINDOW:
mod.dwInstance = dwCallback; mod.dwInstance = dwCallback;
if (!IsWindow((HWND)dwCallback)) if (dwCallback && !IsWindow((HWND)dwCallback))
return MMSYSERR_INVALPARAM; return MMSYSERR_INVALPARAM;
break; break;
} }