[ros-diffs] [gvg] 18680: Merge from trunk:

Merge from trunk:
Use MaxPos instead of MaxTrackingPos when "restoring" a window which was
previously maximized. Fixes bug 925.
Modified:
branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c
  _____  

Modified:
branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c
--- branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c
2005-10-22 15:11:55 UTC (rev 18679)
+++ branches/ros-branch-0_2_8/reactos/subsys/win32k/ntuser/winpos.c
2005-10-22 15:19:01 UTC (rev 18680)
@@ -374,8 +374,8 @@

                   Window->Style &= ~WS_MINIMIZE;
                   if (Window->Flags & WINDOWOBJECT_RESTOREMAX)
                   {
-                     co_WinPosGetMinMaxInfo(Window, NULL,
-                                            &InternalPos->MaxPos, NULL,
&Size);
+                     co_WinPosGetMinMaxInfo(Window, &Size,
+                                            &InternalPos->MaxPos, NULL,
NULL);
                      Window->Style |= WS_MAXIMIZE;
                      IntGdiSetRect(NewPos, InternalPos->MaxPos.x,
                                    InternalPos->MaxPos.y, Size.x,
Size.y);
@@ -1359,7 +1359,6 @@
 
       case SW_SHOWMAXIMIZED:
          {
-//__asm__("int $3\n");
             Swp |= SWP_SHOWWINDOW;
             if (!(Window->Style & WS_MAXIMIZE))
             {