[PATCH v2 2/9] winex11: Use an IME UI message to set open status.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/imm32/ime.c              |  3 +++
 dlls/imm32/imm_private.h      |  1 +
 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        | 25 +++++++++++++++++--------
 include/ntuser.h              |  3 +++
 8 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index 3c4550c3cd9..35edcfe7f46 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -291,6 +291,9 @@ static LRESULT WINAPI ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LP
         FIXME( "hwnd %p, himc %p, msg %s, wparam %s, lparam %#Ix stub!\n", hwnd, himc,
                debugstr_wm_ime(msg), debugstr_imc(wparam), lparam );
         return 1;
+
+    case WM_WINE_IME_SET_OPEN_STATUS:
+        return ImmSetOpenStatus( himc, wparam );
     }

return DefWindowProcW( hwnd, msg, wparam, lparam );
diff --git a/dlls/imm32/imm_private.h b/dlls/imm32/imm_private.h
index 8a957494ce9..eccfd223ac3 100644
--- a/dlls/imm32/imm_private.h
+++ b/dlls/imm32/imm_private.h
@@ -61,6 +61,7 @@ static const char *debugstr_wm_ime( UINT msg )
     case WM_IME_REQUEST: return "WM_IME_REQUEST";
     case WM_IME_KEYDOWN: return "WM_IME_KEYDOWN";
     case WM_IME_KEYUP: return "WM_IME_KEYUP";
+    case WM_WINE_IME_SET_OPEN_STATUS: return "WM_WINE_IME_SET_OPEN_STATUS";
     default:
         if (msg == WM_MSIME_SERVICE) return "WM_MSIME_SERVICE";
         else if (msg == WM_MSIME_RECONVERTOPTIONS) return "WM_MSIME_RECONVERTOPTIONS";
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 b7f5f696ba5..f4c75d653cf 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -72,6 +72,21 @@ static const char *debugstr_xim_style( XIMStyle style )
     return wine_dbg_sprintf( "%s", buffer );
 }

+/* sends a message to the IME UI window */
+static LRESULT send_ime_ui_message( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
+{
+    static const WCHAR WINE_IME_UI_CLASS[] = {'W','i','n','e',' ','I','M','E',0};
+    WCHAR buffer[64];
+    UNICODE_STRING name = {.Buffer = buffer, .MaximumLength = sizeof(buffer)};
+    HIMC himc;
+
+    if (!(himc = NtUserGetWindowInputContext( hwnd ))) return 0;
+    if (!(hwnd = (HWND)NtUserQueryInputContext( himc, NtUserInputContextUIHwnd ))) return 0;
+    if (!NtUserGetClassName( hwnd, 0, &name ) || wcscmp( buffer, WINE_IME_UI_CLASS )) return 0;
+
+    return send_message( hwnd, msg, wparam, lparam );
+}
+
 static void X11DRV_ImmSetInternalString(UINT offset, UINT selLength, LPWSTR lpComp, UINT len)
 {
     /* Composition strings are edited in chunks */
@@ -130,14 +145,8 @@ 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 );
-        break;
-    case XIMPreeditDisable:
-        x11drv_client_call( client_ime_set_open_status, FALSE );
-        break;
-    default:
-        break;
+    case XIMPreeditEnable: send_ime_ui_message( hwnd, WM_WINE_IME_SET_OPEN_STATUS, TRUE, 0 ); break;
+    case XIMPreeditDisable: send_ime_ui_message( hwnd, WM_WINE_IME_SET_OPEN_STATUS, FALSE, 0 ); break;
     }

return TRUE;
diff --git a/include/ntuser.h b/include/ntuser.h
index 7356c6096e9..f54a0eb902a 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -491,6 +491,9 @@ enum wine_internal_message
 #define IME_INTERNAL_HKL_ACTIVATE    0x19
 #define IME_INTERNAL_HKL_DEACTIVATE  0x20

+/* default IME UI messages */
+#define WM_WINE_IME_SET_OPEN_STATUS  (WM_USER + 0)
+
 /* internal IME private */
 typedef struct ime_private
 {