Dmitry Timoshkov : user32: Partially revert 499c26ce66ec6cbbb3569c69ca95c9dfac01d39f.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5307a75c42aeff1b5f286fe3d9bd877a2306ab5f
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=5307a75c42aeff1b5f286fe3d9bd877a2306ab5f

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Tue Aug 26 20:43:54 2008 +0900

user32: Partially revert 499c26ce66ec6cbbb3569c69ca95c9dfac01d39f.

This part of the patch really has nothing to do with an idea the patch
aimed to achieve.

---

 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