[PATCH v2 09/11] mciqtz32: Reset the video size when changing video destination.

[Akihiro Sagawa]

From: Akihiro Sagawa

Signed-off-by: Akihiro Sagawa 
---
 dlls/mciqtz32/mciqtz.c | 14 +++++++++++---
 dlls/winmm/tests/mci.c |  4 ++--
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c
index 3092090250a..6e6d2d6cdf4 100644
--- a/dlls/mciqtz32/mciqtz.c
+++ b/dlls/mciqtz32/mciqtz.c
@@ -998,9 +998,17 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS
     if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) {
         HWND hwnd = lpParms->hWnd ? lpParms->hWnd : wma->window;
         TRACE("Setting hWnd to %p\n", lpParms->hWnd);
-        IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)hwnd);
-        IVideoWindow_put_Owner(wma->vidwin, (OAHWND)hwnd);
-        wma->parent = hwnd;
+        if (wma->parent != hwnd)
+        {
+            LONG width, height;
+            IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)hwnd);
+            IVideoWindow_put_Owner(wma->vidwin, (OAHWND)hwnd);
+
+            IBasicVideo_GetVideoSize(wma->vidbasic, &width, &height);
+            IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height);
+
+            wma->parent = hwnd;
+        }
     }
     if (dwFlags & MCI_DGV_WINDOW_STATE) {
         TRACE("Setting nCmdShow to %d\n", lpParms->nCmdShow);
diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c
index d42b5945ac7..8e2dff39668 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -1639,7 +1639,7 @@ static void test_video_window(void)
         /* destination size is reset to the source video size */
         err = mciSendCommandW(wDeviceID, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm);
         ok(!err,"mciCommand where destination returned %s\n", dbg_mcierr(err));
-        todo_wine ok(EqualRect(&parm.where.rc, &src_rc), "got %s, expected %s\n", wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&src_rc));
+        ok(EqualRect(&parm.where.rc, &src_rc), "got %s, expected %s\n", wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&src_rc));

/* destination size isn't reset unless the destination window is changed */
         SetRect(&rc, 0, 0, src_rc.right * 2, src_rc.bottom / 2);
@@ -1672,7 +1672,7 @@ static void test_video_window(void)

err = mciSendCommandW(wDeviceID, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm);
         ok(!err,"mciCommand where destination returned %s\n", dbg_mcierr(err));
-        todo_wine ok(EqualRect(&parm.where.rc, &src_rc), "got %s, expected %s\n", wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&src_rc));
+        ok(EqualRect(&parm.where.rc, &src_rc), "got %s, expected %s\n", wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&src_rc));

err = mciSendCommandW(wDeviceID, MCI_CLOSE, 0, 0);
         ok(!err,"mciCommand close returned %s\n", dbg_mcierr(err));