6660258: Java application stops Windows logout/shutdown (regression in 1.5.0_14)

Reviewed-by: anthony, art, uta
This commit is contained in:
Dmitry Cherepanov 2010-01-20 01:33:49 +03:00
parent b5f77a0513
commit 90bf9a073f
2 changed files with 7 additions and 1 deletions

View File

@ -378,7 +378,9 @@ LRESULT CALLBACK AwtComponent::WndProc(HWND hWnd, UINT message,
TRY;
AwtComponent * self = AwtComponent::GetComponentImpl(hWnd);
if (self == NULL || self->GetHWnd() != hWnd) {
if (self == NULL || self->GetHWnd() != hWnd ||
message == WM_UNDOCUMENTED_CLIENTSHUTDOWN) // handle log-off gracefully
{
return ComCtl32Util::GetInstance().DefWindowProc(NULL, hWnd, message, wParam, lParam);
} else {
return self->WindowProc(message, wParam, lParam);

View File

@ -253,4 +253,8 @@ enum {
#define WM_UNDOCUMENTED_CLICKMENUBAR 0x0313
#endif
#ifndef WM_UNDOCUMENTED_CLIENTSHUTDOWN
#define WM_UNDOCUMENTED_CLIENTSHUTDOWN 0x003b
#endif
#endif // AWTMSG_H