Commit 04dc2812 authored by Akihiro Sagawa's avatar Akihiro Sagawa Committed by Alexandre Julliard

mciqtz32: Don't stretch video destination for a popup or child window.

parent e28c2caa
...@@ -211,9 +211,14 @@ static bool create_window(WINE_MCIQTZ *wma, DWORD flags, const MCI_DGV_OPEN_PARM ...@@ -211,9 +211,14 @@ static bool create_window(WINE_MCIQTZ *wma, DWORD flags, const MCI_DGV_OPEN_PARM
IVideoWindow_put_Owner(wma->vidwin, (OAHWND)wma->window); IVideoWindow_put_Owner(wma->vidwin, (OAHWND)wma->window);
IVideoWindow_put_WindowStyle(wma->vidwin, WS_CHILD); /* reset window style */ IVideoWindow_put_WindowStyle(wma->vidwin, WS_CHILD); /* reset window style */
GetClientRect(wma->window, &rc); if (style & (WS_POPUP | WS_CHILD))
width = rc.right; IBasicVideo_GetVideoSize(wma->vidbasic, &width, &height);
height = rc.bottom; else
{
GetClientRect(wma->window, &rc);
width = rc.right;
height = rc.bottom;
}
IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height); IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height);
IVideoWindow_put_Visible(wma->vidwin, OATRUE); IVideoWindow_put_Visible(wma->vidwin, OATRUE);
......
...@@ -1603,9 +1603,8 @@ static void test_video_window(void) ...@@ -1603,9 +1603,8 @@ static void test_video_window(void)
* in particular if the video width is less than SM_CXMIN. */ * in particular if the video width is less than SM_CXMIN. */
GetClientRect(video_window, &rc); GetClientRect(video_window, &rc);
todo_wine_if (style & (WS_POPUP | WS_CHILD)) ok(EqualRect(&parm.where.rc, &rc), "Got destination rect %s, expected %s.\n",
ok(EqualRect(&parm.where.rc, &rc), "Got destination rect %s, expected %s.\n", wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc));
wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc));
/* Test the default video window size. */ /* Test the default video window size. */
rc = src_rc; rc = src_rc;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment