Skip to content
Permalink
Browse files
8261231: Windows IME was disabled after DnD operation
Backport-of: d6d5d9bf2f1a3343af6cf30a9d06a1f1b5f764ad
  • Loading branch information
Dmitry Markov committed Feb 16, 2021
1 parent cc3417d commit ac08d3f08f8571c94d12f13b80185e56dc83da0a
Showing with 4 additions and 2 deletions.
  1. +4 −2 src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
@@ -3215,10 +3215,12 @@ LRESULT AwtToolkit::InvokeInputMethodFunction(UINT msg, WPARAM wParam, LPARAM lP
* function once the DND is active; otherwise a hang is possible since DND may wait for
* the IME completion.
*/
CriticalSection::Lock lock(m_inputMethodLock);
if (isInDoDragDropLoop) {
return SendMessage(msg, wParam, lParam);
SendMessage(msg, wParam, lParam);
::ResetEvent(m_inputMethodWaitEvent);
return m_inputMethodData;
} else {
CriticalSection::Lock lock(m_inputMethodLock);
if (PostMessage(msg, wParam, lParam)) {
::WaitForSingleObject(m_inputMethodWaitEvent, INFINITE);
return m_inputMethodData;

1 comment on commit ac08d3f

@openjdk-notifier

This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on ac08d3f Feb 16, 2021

Please sign in to comment.