From c0a40fbfe83ed2654892beebb92c7addad634842 Mon Sep 17 00:00:00 2001 From: David Quintana Date: Thu, 15 May 2014 18:07:41 +0000 Subject: [PATCH] [WIN32K/NTUSER] * Apply the same filter to HSHELL_WINDOWACTIVATED, that I used for _WINDOWCREATED. svn path=/branches/shell-experiments/; revision=63306 --- win32ss/user/ntuser/focus.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index bf1a32d259d..badaab90f43 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -239,11 +239,18 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO 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;