Skip to content
Browse files
8261231: Windows IME was disabled after DnD operation
Backport-of: d6d5d9bf2f1a3343af6cf30a9d06a1f1b5f764ad
  • Loading branch information
Yuri Nesterenko committed Apr 5, 2021
1 parent 5bfa154 commit 0f9626c842dc33adb2ffaf090ccb209db6c06cea
Showing with 4 additions and 2 deletions.
  1. +4 −2 src/java.desktop/windows/native/libawt/windows/awt_Toolkit.cpp
@@ -3216,10 +3216,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);
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 0f9626c


This comment has been minimized.

Copy link

@openjdk-notifier openjdk-notifier bot commented on 0f9626c Apr 5, 2021

Please sign in to comment.