[PATCH v7 01/12] winex11: Use an internal WM_IME_NOTIFY wparam to set open status.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/imm32/ime.c              | 19 ++++++++++++++++---
 dlls/winex11.drv/dllmain.c    |  1 -
 dlls/winex11.drv/ime.c        |  9 ---------
 dlls/winex11.drv/unixlib.h    |  1 -
 dlls/winex11.drv/x11drv_dll.h |  1 -
 dlls/winex11.drv/xim.c        |  6 ++----
 include/ntuser.h              |  3 +++
 7 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index 3c4550c3cd9..4f0832238c0 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -40,6 +40,7 @@ static const char *debugstr_imn( WPARAM wparam )
     case IMN_SETCOMPOSITIONWINDOW: return "IMN_SETCOMPOSITIONWINDOW";
     case IMN_GUIDELINE: return "IMN_GUIDELINE";
     case IMN_SETSTATUSWINDOWPOS: return "IMN_SETSTATUSWINDOWPOS";
+    case IMN_WINE_SET_OPEN_STATUS: return "IMN_WINE_SET_OPEN_STATUS";
     default: return wine_dbg_sprintf( "%#Ix", wparam );
     }
 }
@@ -242,6 +243,20 @@ static void ime_ui_start_composition( HIMC himc, HWND hwnd )
     ImmUnlockIMC( himc );
 }

+static LRESULT ime_ui_notify( HIMC himc, HWND hwnd, WPARAM wparam, LPARAM lparam )
+{
+    TRACE( "himc %p, hwnd %p, wparam %s, lparam %#Ix\n", hwnd, himc, debugstr_imn(wparam), lparam );
+
+    switch (wparam)
+    {
+    case IMN_WINE_SET_OPEN_STATUS:
+        return ImmSetOpenStatus( himc, lparam );
+    default:
+        FIXME( "himc %p, hwnd %p, wparam %s, lparam %#Ix stub!\n", hwnd, himc, debugstr_imn(wparam), lparam );
+        return 0;
+    }
+}
+
 static LRESULT WINAPI ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
 {
     HIMC himc = (HIMC)GetWindowLongPtrW( hwnd, IMMGWL_IMC );
@@ -284,9 +299,7 @@ static LRESULT WINAPI ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LP
         ShowWindow( hwnd, SW_HIDE );
         break;
     case WM_IME_NOTIFY:
-        FIXME( "hwnd %p, himc %p, msg %s, wparam %s, lparam %#Ix stub!\n", hwnd, himc,
-               debugstr_wm_ime(msg), debugstr_imn(wparam), lparam );
-        return 0;
+        return ime_ui_notify( himc, hwnd, wparam, lparam );
     case WM_IME_CONTROL:
         FIXME( "hwnd %p, himc %p, msg %s, wparam %s, lparam %#Ix stub!\n", hwnd, himc,
                debugstr_wm_ime(msg), debugstr_imc(wparam), lparam );
diff --git a/dlls/winex11.drv/dllmain.c b/dlls/winex11.drv/dllmain.c
index 500a4a6bc44..54093d36b6e 100644
--- a/dlls/winex11.drv/dllmain.c
+++ b/dlls/winex11.drv/dllmain.c
@@ -33,7 +33,6 @@ static const callback_func callback_funcs[] =
     x11drv_ime_get_cursor_pos,
     x11drv_ime_set_composition_status,
     x11drv_ime_set_cursor_pos,
-    x11drv_ime_set_open_status,
     x11drv_ime_update_association,
 };

diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index 55485bfbfcf..72ada45f774 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -755,15 +755,6 @@ BOOL WINAPI ImeSetCompositionString(HIMC hIMC, DWORD dwIndex, LPCVOID lpComp,

/* Interfaces to XIM and other parts of winex11drv */

-NTSTATUS x11drv_ime_set_open_status( UINT open )
-{
-    HIMC imc;
-
-    imc = RealIMC(FROM_X11);
-    ImmSetOpenStatus(imc, open);
-    return 0;
-}
-
 NTSTATUS x11drv_ime_set_composition_status( UINT open )
 {
     HIMC imc;
diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h
index 7dc1d9f0ca7..ed5dbac6535 100644
--- a/dlls/winex11.drv/unixlib.h
+++ b/dlls/winex11.drv/unixlib.h
@@ -99,7 +99,6 @@ enum client_callback
     client_ime_get_cursor_pos,
     client_ime_set_composition_status,
     client_ime_set_cursor_pos,
-    client_ime_set_open_status,
     client_ime_update_association,
     client_funcs_count
 };
diff --git a/dlls/winex11.drv/x11drv_dll.h b/dlls/winex11.drv/x11drv_dll.h
index 047bb430d39..80fe9ab2a3d 100644
--- a/dlls/winex11.drv/x11drv_dll.h
+++ b/dlls/winex11.drv/x11drv_dll.h
@@ -39,7 +39,6 @@ extern NTSTATUS x11drv_dnd_leave_event( UINT arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS x11drv_ime_get_cursor_pos( UINT arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS x11drv_ime_set_composition_status( UINT arg ) DECLSPEC_HIDDEN;
 extern NTSTATUS x11drv_ime_set_cursor_pos( UINT pos ) DECLSPEC_HIDDEN;
-extern NTSTATUS x11drv_ime_set_open_status( UINT open ) DECLSPEC_HIDDEN;
 extern NTSTATUS x11drv_ime_update_association( UINT arg ) DECLSPEC_HIDDEN;

extern LRESULT WINAPI foreign_window_proc( HWND hwnd, UINT msg, WPARAM wparam,
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 3601cb8c680..bdb1594799e 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -119,12 +119,10 @@ static BOOL xic_preedit_state_notify( XIC xic, XPointer user, XPointer arg )
     switch (state)
     {
     case XIMPreeditEnable:
-        x11drv_client_call( client_ime_set_open_status, TRUE );
+        send_message( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_OPEN_STATUS, TRUE );
         break;
     case XIMPreeditDisable:
-        x11drv_client_call( client_ime_set_open_status, FALSE );
-        break;
-    default:
+        send_message( hwnd, WM_IME_NOTIFY, IMN_WINE_SET_OPEN_STATUS, FALSE );
         break;
     }

diff --git a/include/ntuser.h b/include/ntuser.h
index 3d43eb476e4..14551227539 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -490,6 +490,9 @@ enum wine_internal_message
 #define IME_INTERNAL_HKL_ACTIVATE    0x19
 #define IME_INTERNAL_HKL_DEACTIVATE  0x20

+/* internal WM_IME_NOTIFY wparams, not compatible with Windows */
+#define IMN_WINE_SET_OPEN_STATUS  0x000f
+
 /* internal IME private */
 typedef struct ime_private
 {