Author: dquintana Date: Fri May 16 11:14:04 2014 New Revision: 63313
URL: http://svn.reactos.org/svn/reactos?rev=63313&view=rev Log: [WIN32k/NTUSER] * Make the conditions actually check what was intended.
Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c branches/shell-experiments/win32ss/user/ntuser/window.c branches/shell-experiments/win32ss/user/ntuser/winpos.c
Modified: branches/shell-experiments/win32ss/user/ntuser/focus.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/n... ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/focus.c [iso-8859-1] Fri May 16 11:14:04 2014 @@ -240,9 +240,9 @@ (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);
Modified: branches/shell-experiments/win32ss/user/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/n... ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/window.c [iso-8859-1] Fri May 16 11:14:04 2014 @@ -2429,9 +2429,9 @@
/* 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); }
Modified: branches/shell-experiments/win32ss/user/ntuser/winpos.c URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/win32ss/user/n... ============================================================================== --- branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] (original) +++ branches/shell-experiments/win32ss/user/ntuser/winpos.c [iso-8859-1] Fri May 16 11:14:04 2014 @@ -1881,10 +1881,10 @@ } 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 );