From ca9ded7af8b21ec0b5b4e600f05a6a8b13e555a2 Mon Sep 17 00:00:00 2001 From: Thamatip Chitpong Date: Thu, 22 Dec 2022 07:38:53 +0700 Subject: [PATCH] [NTUSER] Fix zombie window created by CTRL+ALT+DEL (#4935) Based on patch by I_Kill_Bugs. CORE-18258 See also commit 58b0558f9. --- win32ss/user/ntuser/winpos.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/win32ss/user/ntuser/winpos.c b/win32ss/user/ntuser/winpos.c index 3dc4491fa09..79e29730f1e 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1945,9 +1945,12 @@ co_WinPosSetWindowPos( (!(Window->ExStyle & WS_EX_TOOLWINDOW) && !Window->spwndOwner && (!Window->spwndParent || UserIsDesktopWindow(Window->spwndParent)))) { - co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); - if (!(WinPos.flags & SWP_NOACTIVATE)) - UpdateShellHook(Window); + if (!UserIsDesktopWindow(Window)) + { + co_IntShellHookNotify(HSHELL_WINDOWCREATED, (WPARAM)Window->head.h, 0); + if (!(WinPos.flags & SWP_NOACTIVATE)) + UpdateShellHook(Window); + } } Window->style |= WS_VISIBLE; //IntSetStyle( Window, WS_VISIBLE, 0 );