From 1f5d24518ec145a70ae99c39fadd8f55b7bee7cc Mon Sep 17 00:00:00 2001 From: David Quintana Date: Fri, 16 May 2014 11:14:04 +0000 Subject: [PATCH] [WIN32k/NTUSER] * Make the conditions actually check what was intended. svn path=/branches/shell-experiments/; revision=63313 --- win32ss/user/ntuser/focus.c | 6 +++--- win32ss/user/ntuser/window.c | 6 +++--- win32ss/user/ntuser/winpos.c | 8 ++++---- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/win32ss/user/ntuser/focus.c b/win32ss/user/ntuser/focus.c index 145314a9d96..bba66ed34e1 100644 --- a/win32ss/user/ntuser/focus.c +++ b/win32ss/user/ntuser/focus.c @@ -240,9 +240,9 @@ co_IntSendActivateMessages(PWND WindowPrev, PWND Window, BOOL MouseActivate, BOO (LPARAM)(WindowPrev ? UserHMGetHandle(WindowPrev) : 0)); if (Window->spwndParent == UserGetDesktopWindow() && - ((Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW)) || - (Window->ExStyle & WS_EX_APPWINDOW))) + 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); diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index 79a307dc2c1..b98f607fe06 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -2429,9 +2429,9 @@ co_UserCreateWindowEx(CREATESTRUCTW* Cs, /* Notify the shell that a new window was created */ if (Window->spwndParent == UserGetDesktopWindow() && - ((Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW)) || - (Window->ExStyle & WS_EX_APPWINDOW))) + Window->spwndOwner == NULL && + (!(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW))) { co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)hWnd, 0); } diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index f8248b48228..62e9708df3b 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1881,10 +1881,10 @@ co_WinPosSetWindowPos( } else if (WinPos.flags & SWP_SHOWWINDOW) { - if (Window->spwndParent == UserGetDesktopWindow() && - ((Window->spwndOwner == NULL && - !(Window->ExStyle & WS_EX_TOOLWINDOW)) || - (Window->ExStyle & WS_EX_APPWINDOW))) + if (Window->spwndParent == UserGetDesktopWindow() && + Window->spwndOwner == NULL && + (!(Window->ExStyle & WS_EX_TOOLWINDOW) || + (Window->ExStyle & WS_EX_APPWINDOW))) co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); Window->style |= WS_VISIBLE; //IntSetStyle( Window, WS_VISIBLE, 0 );