[dquintana] 63306: [WIN32K/NTUSER] * Apply the same filter to HSHELL_WINDOWACTIVATED, that I used for _WINDOWCREATED.

Author: dquintana
Date: Thu May 15 18:07:41 2014
New Revision: 63306

URL: http://svn.reactos.org/svn/reactos?rev=63306&view=rev
Log:
[WIN32K/NTUSER]
* Apply the same filter to HSHELL_WINDOWACTIVATED, that I used for _WINDOWCREATED.

Modified:
    branches/shell-experiments/win32ss/user/ntuser/focus.c

Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c
URL:
http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/…
==============================================================================
--- branches/shell-experiments/win32ss/user/ntuser/focus.c	[iso-8859-1] (original)
+++ branches/shell-experiments/win32ss/user/ntuser/focus.c	[iso-8859-1] Thu May 15
18:07:41 2014
@@ -239,10 +239,17 @@
                                MAKEWPARAM(MouseActivate ? WA_CLICKACTIVE : WA_ACTIVE,
Window->style & WS_MINIMIZE),
                               (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0));
 
-      if (!Window->spwndOwner && !IntGetParent(Window))
+      if (Window->spwndParent == UserGetDesktopWindow() &&
+          Window->spwndOwner == NULL &&
+          !(Window->ExStyle & WS_EX_TOOLWINDOW) ||
+          (Window->ExStyle & WS_EX_APPWINDOW))
       {
          // FIXME lParam; The value is TRUE if the window is in full-screen mode, or
FALSE otherwise.
          co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, (WPARAM) UserHMGetHandle(Window),
FALSE);
+      }
+      else
+      {
+          co_IntShellHookNotify(HSHELL_WINDOWACTIVATED, 0, FALSE);
       }
 
       Window->state &= ~WNDS_NONCPAINT;