[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
This commit is contained in:
Hermès Bélusca-Maïto 2016-06-05 14:29:28 +00:00
parent 1cfa76b438
commit 94b20ff164

View file

@ -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()