From: Bernhard Kölbl <bkoelbl@codeweavers.com> --- dlls/msvfw32/mciwnd.c | 21 ++++++++++++++++++--- dlls/msvfw32/tests/mciwnd.c | 2 +- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/dlls/msvfw32/mciwnd.c b/dlls/msvfw32/mciwnd.c index 5ab9b698e13..cdf52b3490d 100644 --- a/dlls/msvfw32/mciwnd.c +++ b/dlls/msvfw32/mciwnd.c @@ -551,9 +551,11 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa case MCIWNDM_OPENW: { RECT rc; + BOOL has_window; HCURSOR hCursor; MCI_OPEN_PARMSW mci_open; MCI_GETDEVCAPS_PARMS mci_devcaps; + MCI_DGV_WINDOW_PARMSW mci_window; WCHAR aliasW[64]; WCHAR drv_name[MAX_PATH]; static const WCHAR formatW[] = {'%','d',0}; @@ -626,16 +628,29 @@ static LRESULT WINAPI MCIWndProc(HWND hWnd, UINT wMsg, WPARAM wParam, LPARAM lPa mwi->dev_type = mci_devcaps.dwReturn; + mci_window.nCmdShow = -1; + mwi->lasterror = mciSendCommandW(mwi->mci, MCI_WINDOW, MCI_DGV_WINDOW_STATE, (DWORD_PTR)&mci_window); + + if (mwi->lasterror == MCIERR_NO_WINDOW) + { + has_window = 0; + mwi->lasterror = 0; + } + else if (mwi->lasterror) + { + MCIWND_notify_error(mwi); + goto end_of_mci_open; + } + else has_window = 1; + drv_name[0] = 0; SendMessageW(hWnd, MCIWNDM_GETDEVICEW, 256, (LPARAM)drv_name); if (drv_name[0] && GetPrivateProfileStringW(mci32W, drv_name, NULL, drv_name, MAX_PATH, system_iniW)) mwi->hdrv = OpenDriver(drv_name, NULL, 0); - if (mwi->dev_type == MCI_DEVTYPE_DIGITAL_VIDEO) + if (mwi->dev_type == MCI_DEVTYPE_DIGITAL_VIDEO && has_window) { - MCI_DGV_WINDOW_PARMSW mci_window; - mci_window.hWnd = hWnd; mwi->lasterror = mciSendCommandW(mwi->mci, MCI_WINDOW, MCI_DGV_WINDOW_HWND, diff --git a/dlls/msvfw32/tests/mciwnd.c b/dlls/msvfw32/tests/mciwnd.c index cb03e2112d9..bc7f609c97f 100644 --- a/dlls/msvfw32/tests/mciwnd.c +++ b/dlls/msvfw32/tests/mciwnd.c @@ -420,7 +420,7 @@ static void test_audio_playback(void) ok(!!parent, "failed to create mci window\n"); error = SendMessageW(mci_wnd, MCIWNDM_OPENW, 0, (DWORD_PTR)test_file); - todo_wine ok(!error, "failed to set playback source, error %lu\n", error); + ok(!error, "failed to set playback source, error %lu\n", error); pump_messages(); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9704