stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6792023: Print suspends on Windows 2000 Pro since 6u12 b01

Browse Source 
Reviewed-by: art, anthony
This commit is contained in:
Dmitry Cherepanov 2009-02-17 14:30:52 +03:00
parent 0d79cc7529
commit e05fd5d6f5
4 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/windows/native/sun/windows/awt_FileDialog.cpp
View File

@ -101,7 +101,8 @@ LRESULT CALLBACK FileDialogWndProc(HWND hWnd, UINT message,
}
}
return ComCtl32Util::GetInstance().DefWindowProc(NULL, hWnd, message, wParam, lParam);
WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(hWnd, NativeDialogWndProcProp));
return ComCtl32Util::GetInstance().DefWindowProc(lpfnWndProc, hWnd, message, wParam, lParam);
}
static UINT_PTR CALLBACK
@ -135,16 +136,19 @@ FileDialogHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
}
// subclass dialog's parent to receive additional messages
ComCtl32Util::GetInstance().SubclassHWND(parent,
FileDialogWndProc);
WNDPROC lpfnWndProc = ComCtl32Util::GetInstance().SubclassHWND(parent,
FileDialogWndProc);
::SetProp(parent, NativeDialogWndProcProp, reinterpret_cast<HANDLE>(lpfnWndProc));
break;
}
case WM_DESTROY: {
WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(parent, NativeDialogWndProcProp));
ComCtl32Util::GetInstance().UnsubclassHWND(parent,
FileDialogWndProc,
NULL);
lpfnWndProc);
::RemoveProp(parent, ModalDialogPeerProp);
::RemoveProp(parent, NativeDialogWndProcProp);
break;
}
case WM_NOTIFY: {

12
jdk/src/windows/native/sun/windows/awt_PrintDialog.cpp
View File

@ -65,7 +65,8 @@ LRESULT CALLBACK PrintDialogWndProc(HWND hWnd, UINT message,
}
}
return ComCtl32Util::GetInstance().DefWindowProc(NULL, hWnd, message, wParam, lParam);
WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(hWnd, NativeDialogWndProcProp));
return ComCtl32Util::GetInstance().DefWindowProc(lpfnWndProc, hWnd, message, wParam, lParam);
}
static UINT_PTR CALLBACK
@ -99,16 +100,19 @@ PrintDialogHookProc(HWND hdlg, UINT uiMsg, WPARAM wParam, LPARAM lParam)
}
// subclass dialog's parent to receive additional messages
ComCtl32Util::GetInstance().SubclassHWND(hdlg,
PrintDialogWndProc);
WNDPROC lpfnWndProc = ComCtl32Util::GetInstance().SubclassHWND(hdlg,
PrintDialogWndProc);
::SetProp(hdlg, NativeDialogWndProcProp, reinterpret_cast<HANDLE>(lpfnWndProc));
break;
}
case WM_DESTROY: {
WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(hdlg, NativeDialogWndProcProp));
ComCtl32Util::GetInstance().UnsubclassHWND(hdlg,
PrintDialogWndProc,
NULL);
lpfnWndProc);
::RemoveProp(hdlg, ModalDialogPeerProp);
::RemoveProp(hdlg, NativeDialogWndProcProp);
break;
}
}

12
jdk/src/windows/native/sun/windows/awt_PrintJob.cpp
View File

@ -2885,7 +2885,8 @@ LRESULT CALLBACK PageDialogWndProc(HWND hWnd, UINT message,
}
}
return ComCtl32Util::GetInstance().DefWindowProc(NULL, hWnd, message, wParam, lParam);
WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(hWnd, NativeDialogWndProcProp));
return ComCtl32Util::GetInstance().DefWindowProc(lpfnWndProc, hWnd, message, wParam, lParam);
}
/**
@ -2919,16 +2920,19 @@ static UINT CALLBACK pageDlgHook(HWND hDlg, UINT msg,
}
// subclass dialog's parent to receive additional messages
ComCtl32Util::GetInstance().SubclassHWND(hDlg,
PageDialogWndProc);
WNDPROC lpfnWndProc = ComCtl32Util::GetInstance().SubclassHWND(hDlg,
PageDialogWndProc);
::SetProp(hDlg, NativeDialogWndProcProp, reinterpret_cast<HANDLE>(lpfnWndProc));
break;
}
case WM_DESTROY: {
WNDPROC lpfnWndProc = (WNDPROC)(::GetProp(hDlg, NativeDialogWndProcProp));
ComCtl32Util::GetInstance().UnsubclassHWND(hDlg,
PageDialogWndProc,
NULL);
lpfnWndProc);
::RemoveProp(hDlg, ModalDialogPeerProp);
::RemoveProp(hDlg, NativeDialogWndProcProp);
break;
}
}

1
jdk/src/windows/native/sun/windows/awt_Window.h
View File

@ -34,6 +34,7 @@
// property name tagging windows disabled by modality
static LPCTSTR ModalBlockerProp = TEXT("SunAwtModalBlockerProp");
static LPCTSTR ModalDialogPeerProp = TEXT("SunAwtModalDialogPeerProp");
static LPCTSTR NativeDialogWndProcProp = TEXT("SunAwtNativeDialogWndProcProp");
#ifndef WH_MOUSE_LL
#define WH_MOUSE_LL 14