[WIN32k/NTUSER]

* Make the conditions actually check what was intended.

svn path=/branches/shell-experiments/; revision=63313
This commit is contained in:
David Quintana 2014-05-16 11:14:04 +00:00
parent 2caa76f93d
commit 1f5d24518e
3 changed files with 10 additions and 10 deletions

View file

@ -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);

View file

@ -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);
}

View file

@ -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 );