8252470: java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java fails on Windows
Reviewed-by: serb, prr
diff --git a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
index d896137..7a7148d 100644
--- a/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
+++ b/src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
@@ -3211,10 +3211,20 @@
* instead of SendMessage().
*/
LRESULT AwtToolkit::InvokeInputMethodFunction(UINT msg, WPARAM wParam, LPARAM lParam) {
- CriticalSection::Lock lock(m_inputMethodLock);
- if (PostMessage(msg, wParam, lParam)) {
- ::WaitForSingleObject(m_inputMethodWaitEvent, INFINITE);
- return m_inputMethodData;
+ /*
+ * DND runs on the main thread. So it is necessary to use SendMessage() to call an IME
+ * function once the DND is active; otherwise a hang is possible since DND may wait for
+ * the IME completion.
+ */
+ if (isInDoDragDropLoop) {
+ return SendMessage(msg, wParam, lParam);
+ } else {
+ CriticalSection::Lock lock(m_inputMethodLock);
+ if (PostMessage(msg, wParam, lParam)) {
+ ::WaitForSingleObject(m_inputMethodWaitEvent, INFINITE);
+ return m_inputMethodData;
+ }
+ return 0;
}
- return 0;
}
+
diff --git a/test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java b/test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java
index 171f813..33d666b 100644
--- a/test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java
+++ b/test/jdk/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2020, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -24,6 +24,7 @@
/**
* @test
* @summary JVM crash if the frame is disposed in DropTargetListener
+ * @bug 8252470
* @key headful
* @author Petr Pchelko
* @library ../../regtesthelpers
