[jimtabor] 56658: [Win32k] - Fix the remaining wine Win test_SetFocus to does.

Author: jimtabor
Date: Fri May 25 19:52:24 2012
New Revision: 56658

URL: http://svn.reactos.org/svn/reactos?rev=56658&view=rev
Log:
[Win32k]
- Fix the remaining wine Win test_SetFocus to does.

Modified:
    trunk/reactos/win32ss/user/ntuser/winpos.c

Modified: trunk/reactos/win32ss/user/ntuser/winpos.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/winpos....
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri May 25 19:52:24 2012
@@ -1711,7 +1711,7 @@
       }
    }

-   if (!(WinPos.flags & SWP_NOACTIVATE))//(SWP_NOACTIVATE|SWP_HIDEWINDOW)))
+   if (!(WinPos.flags & (SWP_NOACTIVATE|SWP_HIDEWINDOW)))
    {
       if ((Window->style & (WS_CHILD | WS_POPUP)) == WS_CHILD)
       {
@@ -1848,6 +1848,15 @@
             Swp |= SWP_NOACTIVATE;
             if (!(style & WS_MINIMIZE))
             {
+               // Fix wine Win test_SetFocus todo #1 & #2,
+               if (Cmd == SW_SHOWMINIMIZED)
+               {
+                  if ((style & (WS_CHILD | WS_POPUP)) == WS_CHILD)
+                     co_UserSetFocus(Wnd->spwndParent);
+                  else
+                     co_UserSetFocus(0);
+               }
+
                Swp |= co_WinPosMinMaximize(Wnd, SW_MINIMIZE, &NewPos) |
                       SWP_FRAMECHANGED;
             }
@@ -1965,7 +1974,7 @@
       {
          Parent = Wnd->spwndParent;
          if (Wnd->spwndParent == UserGetDesktopWindow()) Parent = 0;
-            co_UserSetFocus(Parent);
+         co_UserSetFocus(Parent);
       }
    }

@@ -1978,8 +1987,12 @@
    }

/* if previous state was minimized Windows sets focus to the window */
-   if (style & WS_MINIMIZE) co_UserSetFocus(Wnd);
-
+   if (style & WS_MINIMIZE)
+   {
+      co_UserSetFocus(Wnd);
+      // Fix wine Win test_SetFocus todo #3,
+      if (!(style & WS_CHILD)) co_IntSendMessageNoWait(UserHMGetHandle(Wnd), WM_ACTIVATE, WA_ACTIVE, 0);
+   }
    return(WasVisible);
 }