From 94b20ff16449fcffe466e0e82376fb5ef2b1cafb 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:29:28 +0000 Subject: [PATCH] [EXPLORER]: Also, sending direct WM_CLOSE messages to the traybar should not close it but instead popup the shutdown dialog. Addendum to r71533. CORE-4351 CORE-8864 svn path=/trunk/; revision=71535 --- reactos/base/shell/explorer/traywnd.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/reactos/base/shell/explorer/traywnd.cpp b/reactos/base/shell/explorer/traywnd.cpp index eba1c29092a..6ed2901f3fc 100644 --- a/reactos/base/shell/explorer/traywnd.cpp +++ b/reactos/base/shell/explorer/traywnd.cpp @@ -2610,9 +2610,10 @@ HandleTrayContextMenu: LRESULT OnDoExitWindows(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL& bHandled) { - /* + /* * TWM_DOEXITWINDOWS is send by the CDesktopBrowser to us - * to show the shutdown dialog. + * to show the shutdown dialog. Also a WM_CLOSE message sent + * by apps should show the dialog. */ return DoExitWindows(); } @@ -2868,6 +2869,7 @@ HandleTrayContextMenu: MESSAGE_HANDLER(WM_APP_TRAYDESTROY, OnAppTrayDestroy) MESSAGE_HANDLER(TWM_OPENSTARTMENU, OnOpenStartMenu) MESSAGE_HANDLER(TWM_DOEXITWINDOWS, OnDoExitWindows) + MESSAGE_HANDLER(WM_CLOSE, OnDoExitWindows) MESSAGE_HANDLER(WM_HOTKEY, OnHotkey) ALT_MSG_MAP(1) END_MSG_MAP()