[PATCH v5 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 952015e4c9f..ee130b078d5 100644
--- a/dlls/mciqtz32/mciqtz.c
+++ b/dlls/mciqtz32/mciqtz.c
@@ -1010,6 +1010,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 18dfdf1f74b..a529b3080d2 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -1695,7 +1695,7 @@ static void test_video_window(void)
         err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm);
         ok(!err, "Got %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.\n");
+        ok(IsWindowVisible(video_window), "Video window should be shown.\n");

err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm);
         ok(!err, "Got %s.\n", dbg_mcierr(err));