From 119d9c8f0bdb6a24fd58744aa899f6dec51b4fea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sun, 5 Jun 2016 14:10:14 +0000 Subject: [PATCH] [SHELL32]: In some rare cases, pressing Alt-F4 in ReactOS when the desktop was on focus, just removed the desktop icons. The underlying "progman" window was indeed killed. Sending a WM_CLOSE message to it should not close it directly, but instead prompt the user with the Shutdown dialog. Tests on Windows show that it's indeed the case. This fix completes r65557. CORE-4351 CORE-8864 svn path=/trunk/; revision=71533 --- reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp b/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp index 4a8330c2c3d..c0a0157ef89 100644 --- a/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp +++ b/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp @@ -536,6 +536,9 @@ LRESULT CALLBACK CDesktopBrowser::ProgmanWindowProc(IN HWND hwnd, IN UINT uMsg, break; } + case WM_CLOSE: + return pThis->_NotifyTray(TWM_DOEXITWINDOWS, 0, 0); + case WM_EXPLORER_OPEN_NEW_WINDOW: TRACE("Proxy Desktop message 1035 received.\n"); SHOnCWMCommandLine((HANDLE)lParam);