[ros-diffs] [jimtabor] 72102: [NtUser] - Fix regression from r66350. See CORE-11324 for more details.

Author: jimtabor
Date: Wed Aug  3 17:41:22 2016
New Revision: 72102

URL: http://svn.reactos.org/svn/reactos?rev=72102&view=rev
Log:
[NtUser]
- Fix regression from r66350. See CORE-11324 for more details.

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] Wed Aug  3 17:41:22 2016
@@ -1759,7 +1759,7 @@
    RECTL CopyRect;
    PWND Ancestor;
    BOOL bPointerInWindow;
-   PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
+   //PTHREADINFO pti = PsGetCurrentThreadWin32Thread();
 
    ASSERT_REFS_CO(Window);
 
@@ -2126,6 +2126,7 @@
       {
          co_IntSendMessageNoWait(WinPos.hwnd, WM_CHILDACTIVATE, 0, 0);
       }
+#if 0 ////// Break see CORE-11324
       /*   Do not allow setting if already active.
            Fix A : wine msg test_SetParent:WmSetParentSeq_2:25 msg!
            Recursion broke the tests.
@@ -2142,6 +2143,16 @@
             co_IntSetForegroundWindow(Window);
          }
       }
+#else //////
+      else
+      {
+         //ERR("SetWindowPos Set FG Window!\n");
+         if (Window->state & WNDS_BEINGACTIVATED) // Inside SAW?
+            co_IntSetActiveWindow(Window, FALSE, TRUE, FALSE); // Fixes Api
AttachThreadInput tests.
+         else
+            co_IntSetForegroundWindow(Window); // Fixes SW_HIDE issues. Wine win
test_SetActiveWindow & test_SetForegroundWindow.
+      }
+#endif
    }
 
    // Fix wine msg test_SetFocus, prevents sending WM_WINDOWPOSCHANGED.
@@ -2449,7 +2460,8 @@
         ((Cmd == SW_SHOW) || (Cmd == SW_NORMAL)))
    {
       ERR("WinPosShowWindow Set active\n");
-      UserSetActiveWindow(Wnd);
+      //UserSetActiveWindow(Wnd);
+      co_IntSetForegroundWindow(Wnd); // HACK
       Swp |= SWP_NOACTIVATE | SWP_NOZORDER;
    }
 #endif