infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-03 04:30:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

7082294: nsk/regression/b4265661 crashes on windows

Browse Source 
Reviewed-by: art, anthony
This commit is contained in:
Oleg Pekhovskiy 2012-10-25 19:50:30 +04:00
parent 6036ad08e5
commit bf6c304c44
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jdk/src/windows/native/sun/windows/awt_Font.cpp
View File

@ -150,6 +150,7 @@ AwtFont::AwtFont(int num, JNIEnv *env, jobject javaFont)
AwtFont::~AwtFont()
{
delete[] m_hFont;
}
void AwtFont::Dispose() {
@ -160,11 +161,12 @@ void AwtFont::Dispose() {
/* NOTE: delete of windows HFONT happens in FontCache::Remove
only when the final reference to the font is disposed */
} else if (font != NULL) {
// if font was not in cache, its not shared and we delete it now
VERIFY(::DeleteObject(font));
// if font was not in cache, its not shared and we delete it now
DASSERT(::GetObjectType(font) == OBJ_FONT);
VERIFY(::DeleteObject(font));
}
m_hFont[i] = NULL;
}
delete[] m_hFont;
AwtObject::Dispose();
}

3
jdk/src/windows/native/sun/windows/awt_Toolkit.cpp
View File

@ -534,7 +534,6 @@ BOOL AwtToolkit::Dispose() {
D3DInitializer::GetInstance().Clean();
AwtObjectList::Cleanup();
AwtFont::Cleanup();
awt_dnd_uninitialize();
awt_clipboard_uninitialize((JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2));
@ -554,6 +553,8 @@ BOOL AwtToolkit::Dispose() {
::DispatchMessage(&msg);
}
AwtFont::Cleanup();
HWND toolkitHWndToDestroy = tk.m_toolkitHWnd;
tk.m_toolkitHWnd = 0;
VERIFY(::DestroyWindow(toolkitHWndToDestroy) != NULL);