[PATCH v4 10/10] mciqtz32: Show the default video window when switching from another one.

[Akihiro Sagawa]

From: Akihiro Sagawa

Signed-off-by: Akihiro Sagawa 
---
 dlls/mciqtz32/mciqtz.c | 2 ++
 dlls/winmm/tests/mci.c | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c
index 667d0eb2770..9a0c4b68e18 100644
--- a/dlls/mciqtz32/mciqtz.c
+++ b/dlls/mciqtz32/mciqtz.c
@@ -1009,6 +1009,8 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS

if (wma->parent == wma->window)
                 ShowWindow(wma->window, SW_HIDE);
+            else if (hwnd == wma->window)
+                ShowWindow(wma->window, SW_SHOW);

wma->parent = hwnd;
         }
diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c
index 88135284de8..46bc912c672 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -1672,7 +1672,7 @@ static void test_video_window(void)
         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");
-        todo_wine ok(IsWindowVisible(video_window), "video window should be shown, again\n");
+        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));