[WIN32SS][NTUSER] Improve HSHELL_WINDOWCREATED condition (#3697)

Modify the condition of generating HSHELL_WINDOWCREATED, especially on WS_CHILD window style. CORE-15669
This commit is contained in:
Katayama Hirofumi MZ 2021-05-31 13:08:06 +09:00 committed by GitHub
parent 7b970c67a8
commit 32b0cf6fc6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1904,7 +1904,16 @@ co_WinPosSetWindowPos(
}
else if (WinPos.flags & SWP_SHOWWINDOW)
{
if ((Window->ExStyle & WS_EX_APPWINDOW) ||
if (Window->style & WS_CHILD)
{
if ((Window->style & WS_POPUP) && (Window->ExStyle & WS_EX_APPWINDOW))
{
co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0);
if (!(WinPos.flags & SWP_NOACTIVATE))
UpdateShellHook(Window);
}
}
else if ((Window->ExStyle & WS_EX_APPWINDOW) ||
(!(Window->ExStyle & WS_EX_TOOLWINDOW) && !Window->spwndOwner &&
(!Window->spwndParent || UserIsDesktopWindow(Window->spwndParent))))
{