archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-22 20:14:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
jdk/src/windows/native/sun/windows/awt_Component.cpp
View file

@ -378,7 +378,9 @@ LRESULT CALLBACK AwtComponent::WndProc(HWND hWnd, UINT message,
TRY; TRY;
AwtComponent * self = AwtComponent::GetComponentImpl(hWnd); 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); return ComCtl32Util::GetInstance().DefWindowProc(NULL, hWnd, message, wParam, lParam);
} else { } else {
return self->WindowProc(message, wParam, lParam); return self->WindowProc(message, wParam, lParam);

4
jdk/src/windows/native/sun/windows/awtmsg.h
View file

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