# HG changeset patch
# User bae
# Date 1396530594 -14400
# Node ID 1bacdebef58f5250340abefb2976afcf4a8d5db5
# Parent  f79b0c33fa99a20d50b1755a6dac52ce740f768f
8019990: IM candidate window appears on the South-East corner of the display.
Reviewed-by: bagiras, serb

diff -r f79b0c33fa99 -r 1bacdebef58f src/windows/native/sun/windows/awt_Component.cpp
--- a/src/windows/native/sun/windows/awt_Component.cpp	Tue May 06 22:15:25 2014 -0700
+++ b/src/windows/native/sun/windows/awt_Component.cpp	Thu Apr 03 17:09:54 2014 +0400
@@ -1719,9 +1719,11 @@
       case WM_IME_SETCONTEXT:
           // lParam is passed as pointer and it can be modified.
           mr = WmImeSetContext(static_cast<BOOL>(wParam), &lParam);
+          CallProxyDefWindowProc(message, wParam, lParam, retValue, mr);
           break;
       case WM_IME_NOTIFY:
           mr = WmImeNotify(wParam, lParam);
+          CallProxyDefWindowProc(message, wParam, lParam, retValue, mr);
           break;
       case WM_IME_STARTCOMPOSITION:
           mr = WmImeStartComposition();
@@ -4066,7 +4068,7 @@
 {
     if (mr != mrConsume)  {
         HWND proxy = GetProxyFocusOwner();
-        if (proxy != NULL) {
+        if (proxy != NULL && ::IsWindowEnabled(proxy)) {
             retVal = ComCtl32Util::GetInstance().DefWindowProc(NULL, proxy, message, wParam, lParam);
             mr = mrConsume;
         }
diff -r f79b0c33fa99 -r 1bacdebef58f src/windows/native/sun/windows/awt_Frame.cpp
--- a/src/windows/native/sun/windows/awt_Frame.cpp	Tue May 06 22:15:25 2014 -0700
+++ b/src/windows/native/sun/windows/awt_Frame.cpp	Thu Apr 03 17:09:54 2014 +0400
@@ -319,6 +319,8 @@
         case WM_IME_STARTCOMPOSITION:
         case WM_IME_ENDCOMPOSITION:
         case WM_IME_COMPOSITION:
+        case WM_IME_SETCONTEXT:
+        case WM_IME_NOTIFY:
         case WM_IME_CONTROL:
         case WM_IME_COMPOSITIONFULL:
         case WM_IME_SELECT:
diff -r f79b0c33fa99 -r 1bacdebef58f test/java/awt/Frame/7024749/bug7024749.java
--- a/test/java/awt/Frame/7024749/bug7024749.java	Tue May 06 22:15:25 2014 -0700
+++ b/test/java/awt/Frame/7024749/bug7024749.java	Thu Apr 03 17:09:54 2014 +0400
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @bug 7024749 7184326
+ * @bug 7024749 7184326 8019990
  * @summary JDK7 b131---a crash in: Java_sun_awt_windows_ThemeReader_isGetThemeTransitionDurationDefined+0x75
  * @library ../../regtesthelpers
  * @build Util