6723941: Crash in sun.awt.windows.WToolkit.eventLoop()

Reviewed-by: art, ant

6723941: Crash in sun.awt.windows.WToolkit.eventLoop()
Reviewed-by: art, ant
0887d327 · dcherepanov · d636b8c0 · 0887d327
隐藏空白更改
内联并排

Showing with 2 addition and 1 deletion

src/windows/native/sun/windows/awt_Frame.cpp src/windows/native/sun/windows/awt_Frame.cpp +2 -1

未找到文件。
--- a/src/windows/native/sun/windows/awt_Frame.cpp
+++ b/src/windows/native/sun/windows/awt_Frame.cpp
@@ -321,7 +321,8 @@ LRESULT CALLBACK AwtFrame::ProxyWindowProc(HWND hwnd, UINT message,
        AwtComponent::GetComponentImpl(::GetParent(hwnd));

    if (!parent || parent->GetProxyFocusOwner() != hwnd ||
-        message == AwtComponent::WmAwtIsComponent)
+        message == AwtComponent::WmAwtIsComponent ||
+        message == WM_GETOBJECT)
    {
        return ComCtl32Util::GetInstance().DefWindowProc(NULL, hwnd, message, wParam, lParam);
    }