[jimtabor] 58528: [Win32k] - Fix window activation bug. Patch by Giannis Adamopoulos. See CORE-6889.

Author: jimtabor
Date: Sat Mar 16 21:35:48 2013
New Revision: 58528

URL: http://svn.reactos.org/svn/reactos?rev=58528&view=rev
Log:
[Win32k]
- Fix window activation bug. Patch by Giannis Adamopoulos. See CORE-6889.

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] Sat Mar 16 21:35:48 2013
@@ -2218,11 +2218,15 @@
 
    if ((Cmd == SW_HIDE) || (Cmd == SW_MINIMIZE))
    {
-      if ( ( Wnd->spwndParent == UserGetDesktopWindow() &&
!ActivateOtherWindowMin(Wnd) ) ||
-           // and Rule #1.
-           ( Wnd == pti->MessageQueue->spwndActive && pti->MessageQueue
== IntGetFocusMessageQueue() ) )
-      {
-         co_WinPosActivateOtherWindow(Wnd);
+      if ( Wnd == pti->MessageQueue->spwndActive && pti->MessageQueue ==
IntGetFocusMessageQueue()  )
+      {
+          if ( Wnd->spwndParent == UserGetDesktopWindow())
+          {
+              if(!ActivateOtherWindowMin(Wnd))
+                co_WinPosActivateOtherWindow(Wnd);
+          }
+          else
+              co_WinPosActivateOtherWindow(Wnd);
       }
 
       /* Revert focus to parent */