From: Akihiro Sagawa sagawa.aki@gmail.com
--- dlls/mciqtz32/mciqtz.c | 3 +++ dlls/winmm/tests/mci.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 5b4365615d1..71567aad497 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -1005,6 +1005,9 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS IBasicVideo_GetVideoSize(wma->vidbasic, &width, &height); IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height);
+ if (wma->parent == wma->window) + ShowWindow(wma->window, SW_HIDE); + wma->parent = hwnd; } if (dwFlags & MCI_DGV_WINDOW_STATE) { diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index a0ff0428bad..7a4a1e1939b 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1634,7 +1634,7 @@ static void test_video_window(void)
style = GetWindowLongW(video_window, GWL_STYLE); expected = testcase[i].expected_style; - todo_wine ok(style == expected, "video hwnd %p: expected %#lx, got %#lx\n", video_window, expected, style); + ok(style == expected, "video hwnd %p: expected %#lx, got %#lx\n", video_window, expected, style);
/* destination size is reset to the source video size */ err = mciSendCommandW(wDeviceID, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); @@ -1661,14 +1661,14 @@ static void test_video_window(void) ok(!err,"mciCommand play returned %s\n", dbg_mcierr(err)); ok(IsWindowVisible(main_window), "main window should be shown\n"); ok(IsWindow(video_window), "video window should exist\n"); - todo_wine ok(!IsWindowVisible(video_window), "video window should be hidden\n"); + ok(!IsWindowVisible(video_window), "video window should be hidden\n");
/* video window is reset to the default window, which is visible again */ parm.win.hWnd = NULL; err = mciSendCommandW(wDeviceID, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); ok(!err,"mciCommand window handle returned %s\n", dbg_mcierr(err)); ok(IsWindowVisible(main_window), "main window should be shown\n"); - ok(IsWindowVisible(video_window), "video window should be shown, again\n"); + todo_wine ok(IsWindowVisible(video_window), "video window should be shown, again\n");
err = mciSendCommandW(wDeviceID, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); ok(!err,"mciCommand where destination returned %s\n", dbg_mcierr(err));