commit 1f7a8d6a5ed7cbbcba15328c70c54d499a751888
author Eric Pouech <pouech-eric@wanadoo.fr> Mon Jun 27 09:45:26 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jun 27 09:45:26 2005 +0000
tree 0cd97671cf8e94e93f4f9ba2819105482611ddc2
parent 0ccfb0ca8cabb2e676b34e806be3ea89b31e5d10

Fixed window size computation for non child windows.

dlls/winmm/mciavi/wnd.c

diff --git a/dlls/winmm/mciavi/wnd.c b/dlls/winmm/mciavi/wnd.c
index 639f057..ee25016 100644
--- a/dlls/winmm/mciavi/wnd.c
+++ b/dlls/winmm/mciavi/wnd.c
@@ -116,7 +116,6 @@
     static const WCHAR captionW[] = {'W','i','n','e',' ','M','C','I','-','A','V','I',' ','p','l','a','y','e','r',0};
     HWND	hParent = 0;
     DWORD	dwStyle = WS_OVERLAPPEDWINDOW;
-    int		p = CW_USEDEFAULT;
     RECT        rc;
 
     /* what should be done ? */
@@ -124,13 +123,17 @@
 
     if (dwFlags & MCI_DGV_OPEN_PARENT)	hParent = lpOpenParms->hWndParent;
     if (dwFlags & MCI_DGV_OPEN_WS)	dwStyle = lpOpenParms->dwStyle;
-    if (dwStyle & WS_CHILD)		p = 0;
 
-    rc.left = p;
-    rc.top = p;
+    rc.left = rc.top = 0;
     rc.right = (wma->hic ? wma->outbih : wma->inbih)->biWidth;
     rc.bottom = (wma->hic ? wma->outbih : wma->inbih)->biHeight;
     AdjustWindowRect(&rc, dwStyle, FALSE);
+    if (!(dwStyle & (WS_CHILD|WS_POPUP))) /* overlapped window ? */
+    {
+        rc.right -= rc.left;
+        rc.bottom -= rc.top;
+        rc.left = rc.top = CW_USEDEFAULT;
+    }
 
     wma->hWnd = CreateWindowW(mciaviW, captionW,
                               dwStyle, rc.left, rc.top,