- Send the WM_ACTIVATE message with WA_INACTIVE when deactivating window to the window being deactivated (ie. revert last w3seek's change).
- Send the deactivation messages *before* setting the active window for message queue.

reactos/subsys/win32k/ntuser

diff -u -r1.25 -r1.26
--- focus.c	24 Nov 2004 00:11:06 -0000	1.25
+++ focus.c	25 Nov 2004 22:18:59 -0000	1.26
@@ -16,7 +16,7 @@

  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *

- * $Id: focus.c,v 1.25 2004/11/24 00:11:06 weiden Exp $

+ * $Id: focus.c,v 1.26 2004/11/25 22:18:59 navaraf Exp $

  */
 
 #include <w32k.h>

@@ -53,7 +53,7 @@

    if (hWndPrev)
    {
       IntPostOrSendMessage(hWndPrev, WM_NCACTIVATE, FALSE, 0);

-      IntPostOrSendMessage(hWnd, WM_ACTIVATE,

+      IntPostOrSendMessage(hWndPrev, WM_ACTIVATE,

          MAKEWPARAM(WA_INACTIVE, NtUserGetWindowLong(hWndPrev, GWL_STYLE, FALSE) & WS_MINIMIZE),
          (LPARAM)hWnd);
    }

@@ -174,6 +174,9 @@

 
    /* FIXME: Call hooks. */
 

+   IntSendDeactivateMessages(hWndPrev, hWnd);
+   IntSendKillFocusMessages(hWndFocusPrev, hWndFocus);
+

    IntSetFocusMessageQueue(Window->MessageQueue);
    IntLockMessageQueue(Window->MessageQueue);
    if (Window->MessageQueue)

@@ -188,12 +191,11 @@

    }
    IntUnLockMessageQueue(FocusWindow->MessageQueue);
 

-   IntSendDeactivateMessages(hWndPrev, hWnd);
-   IntSendKillFocusMessages(hWndFocusPrev, hWndFocus);

    if (PrevForegroundQueue != Window->MessageQueue)
    {
       /* FIXME: Send WM_ACTIVATEAPP to all thread windows. */
    }

+

    IntSendSetFocusMessages(hWndFocusPrev, hWndFocus);
    IntSendActivateMessages(hWndPrev, hWnd, MouseActivate);