user32: Partially revert 499c26ce66ec6cbbb3569c69ca95c9dfac01d39f

Dmitry Timoshkov dmitry at codeweavers.com
Tue Aug 26 06:43:54 CDT 2008


Hello,

this patch should fix the regression reported in the bug 13229, and this
part of the patch really has nothing to do with an idea the patch aimed
to achieve.

Changelog:
    user32: Partially revert 499c26ce66ec6cbbb3569c69ca95c9dfac01d39f.
---
 dlls/user32/mdi.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c
index 0594b55..fe70b80 100644
--- a/dlls/user32/mdi.c
+++ b/dlls/user32/mdi.c
@@ -1257,7 +1257,7 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
         return 0;
 
       case WM_SIZE:
-        if( ci->hwndChildMaximized )
+        if( ci->hwndActiveChild && IsZoomed(ci->hwndActiveChild) )
 	{
 	    RECT	rect;
 
@@ -1265,10 +1265,9 @@ static LRESULT MDIClientWndProc_common( HWND hwnd, UINT message,
 	    rect.top = 0;
 	    rect.right = LOWORD(lParam);
 	    rect.bottom = HIWORD(lParam);
-
-	    AdjustWindowRectEx( &rect, GetWindowLongA(ci->hwndChildMaximized, GWL_STYLE),
-                               0, GetWindowLongA(ci->hwndChildMaximized, GWL_EXSTYLE) );
-	    MoveWindow( ci->hwndChildMaximized, rect.left, rect.top,
+	    AdjustWindowRectEx(&rect, GetWindowLongA(ci->hwndActiveChild, GWL_STYLE),
+                               0, GetWindowLongA(ci->hwndActiveChild, GWL_EXSTYLE) );
+	    MoveWindow(ci->hwndActiveChild, rect.left, rect.top,
 			 rect.right - rect.left, rect.bottom - rect.top, 1);
 	}
 	else
-- 
1.6.0.1






More information about the wine-patches mailing list