From 2c27378a2113b19b67a801c32e7e1e6541d16e93 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Mon, 26 Dec 2022 01:44:17 +0100 Subject: [PATCH] [0.4.13][NTUSER] Fix zombie window created by CTRL+ALT+DEL (#4935) CORE-18258 Based on patch by I_Kill_Bugs. Fixes the regression which was introduced to master by 0.4.15-dev-1126-g 58b0558f94abee52ce1c261063d4f4b884e96310 fix picked from 0.4.15-dev-5532-g ca9ded7af8b21ec0b5b4e600f05a6a8b13e555a2 --- 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 a4e345cbe27..0557b902937 100644 --- a/win32ss/user/ntuser/winpos.c +++ b/win32ss/user/ntuser/winpos.c @@ -1918,9 +1918,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 );