[PATCH v2 08/11] mciqtz32: Correct initial video window dimensions.

[Akihiro Sagawa]

From: Akihiro Sagawa

Manual test shows minimal width of video window comes from SM_CXMIN.

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

diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c
index cd86fbf0062..3092090250a 100644
--- a/dlls/mciqtz32/mciqtz.c
+++ b/dlls/mciqtz32/mciqtz.c
@@ -170,7 +170,7 @@ static BOOL MCIQTZ_CreateWindow(WINE_MCIQTZ* wma, DWORD dwFlags, LPMCI_DGV_OPEN_
 {
     HWND parent = NULL;
     DWORD style = (WS_OVERLAPPEDWINDOW | WS_CLIPCHILDREN) & ~WS_MAXIMIZEBOX;
-    LONG width, height;
+    LONG width, height, min_width;
     RECT rc;
     HRESULT hr;

@@ -183,9 +183,13 @@ static BOOL MCIQTZ_CreateWindow(WINE_MCIQTZ* wma, DWORD dwFlags, LPMCI_DGV_OPEN_
     else if (FAILED(hr))
         return FALSE;

-    /* FIXME: Use video size here */
-    width = 640;
-    height = 480;
+    /* Native always assumes an overlapped window
+       when calculating default video window size. */
+    SetRect(&rc, 0, 0, width, height);
+    AdjustWindowRect(&rc, WS_OVERLAPPEDWINDOW, FALSE);
+    min_width = GetSystemMetrics(SM_CXMIN);
+    width = max(rc.right - rc.left, min_width);
+    height = rc.bottom - rc.top;

wma->window = CreateWindowW(MCIQTZ_CLASS, lpParms->lpstrElementName, style,
                                 CW_USEDEFAULT, CW_USEDEFAULT,
diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c
index 7c50a405daf..d42b5945ac7 100644
--- a/dlls/winmm/tests/mci.c
+++ b/dlls/winmm/tests/mci.c
@@ -1597,7 +1597,7 @@ static void test_video_window(void)

GetWindowRect(video_window, &win_rc);
         OffsetRect(&rc, win_rc.left, win_rc.top);
-        todo_wine ok(EqualRect(&rc, &win_rc), "window rectangle doesn't match, expected %s, got %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&win_rc));
+        ok(EqualRect(&rc, &win_rc), "window rectangle doesn't match, expected %s, got %s\n", wine_dbgstr_rect(&rc), wine_dbgstr_rect(&win_rc));

err = mciSendCommandW(wDeviceID, MCI_WHERE, MCI_DGV_WHERE_WINDOW, (DWORD_PTR)&parm);
         ok(!err,"mciCommand where window returned %s\n", dbg_mcierr(err));