6852429: IME should call ImmIsUIMessage() or DefWindowProc() when it receives WM_IME_SETCONTEX
Reviewed-by: peytoia
--- a/jdk/src/windows/native/sun/windows/awt_Component.cpp Tue Jun 30 09:38:16 2009 +0900
+++ b/jdk/src/windows/native/sun/windows/awt_Component.cpp Tue Jun 30 17:12:32 2009 -0700
@@ -3739,11 +3739,12 @@
MsgRouting AwtComponent::WmImeSetContext(BOOL fSet, LPARAM *lplParam)
{
- // This message causes native status window shown even it is disabled. So don't
- // let DefWindowProc process this message if this IMC is disabled.
+ // If the Windows input context is disabled, do not let Windows
+ // display any UIs.
HIMC hIMC = ImmGetContext();
if (hIMC == NULL) {
- return mrConsume;
+ *lplParam = 0;
+ return mrDoDefault;
}
if (fSet) {