[PATCH v6 04/11] winex11: Use an IME UI message to get cursor pos.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/imm32/ime.c              | 21 +++++++++++++++++++++
 dlls/imm32/imm_private.h      |  1 +
 dlls/winex11.drv/dllmain.c    |  1 -
 dlls/winex11.drv/ime.c        | 20 --------------------
 dlls/winex11.drv/unixlib.h    |  1 -
 dlls/winex11.drv/x11drv_dll.h |  1 -
 dlls/winex11.drv/xim.c        |  7 ++++++-
 include/ntuser.h              |  1 +
 8 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index 35edcfe7f46..86834546a58 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -242,6 +242,25 @@ static void ime_ui_start_composition( HIMC himc, HWND hwnd )
     ImmUnlockIMC( himc );
 }

+static UINT ime_get_cursor_pos( HIMC himc )
+{
+    COMPOSITIONSTRING *string;
+    INPUTCONTEXT *ctx;
+    UINT pos = 0;
+
+    TRACE( "himc %p\n", himc );
+
+    if (!(ctx = ImmLockIMC( himc ))) return 0;
+    if ((string = ImmLockIMCC( ctx->hCompStr )))
+    {
+        pos = string->dwCursorPos;
+        ImmUnlockIMCC( ctx->hCompStr );
+    }
+    ImmUnlockIMC( himc );
+
+    return pos;
+}
+
 static LRESULT WINAPI ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam )
 {
     HIMC himc = (HIMC)GetWindowLongPtrW( hwnd, IMMGWL_IMC );
@@ -294,6 +313,8 @@ static LRESULT WINAPI ime_ui_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LP

case WM_WINE_IME_SET_OPEN_STATUS:
         return ImmSetOpenStatus( himc, wparam );
+    case WM_WINE_IME_GET_CURSOR_POS:
+        return ime_get_cursor_pos( himc );
     }

return DefWindowProcW( hwnd, msg, wparam, lparam );
diff --git a/dlls/imm32/imm_private.h b/dlls/imm32/imm_private.h
index eccfd223ac3..4a3afce09ba 100644
--- a/dlls/imm32/imm_private.h
+++ b/dlls/imm32/imm_private.h
@@ -62,6 +62,7 @@ static const char *debugstr_wm_ime( UINT msg )
     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";
+    case WM_WINE_IME_GET_CURSOR_POS: return "WM_WINE_IME_GET_CURSOR_POS";
     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 54093d36b6e..a3375e60957 100644
--- a/dlls/winex11.drv/dllmain.c
+++ b/dlls/winex11.drv/dllmain.c
@@ -30,7 +30,6 @@ static const callback_func callback_funcs[] =
 {
     x11drv_dnd_drop_event,
     x11drv_dnd_leave_event,
-    x11drv_ime_get_cursor_pos,
     x11drv_ime_set_composition_status,
     x11drv_ime_set_cursor_pos,
     x11drv_ime_update_association,
diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index 72ada45f774..b92c13ff08a 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -786,26 +786,6 @@ NTSTATUS x11drv_ime_set_composition_status( UINT open )
     return 0;
 }

-NTSTATUS x11drv_ime_get_cursor_pos( UINT arg )
-{
-    LPINPUTCONTEXT lpIMC;
-    INT rc = 0;
-    LPCOMPOSITIONSTRING compstr;
-
-    if (!hSelectedFrom)
-        return rc;
-
-    lpIMC = LockRealIMC(FROM_X11);
-    if (lpIMC)
-    {
-        compstr = ImmLockIMCC(lpIMC->hCompStr);
-        rc = compstr->dwCursorPos;
-        ImmUnlockIMCC(lpIMC->hCompStr);
-    }
-    UnlockRealIMC(FROM_X11);
-    return rc;
-}
-
 NTSTATUS x11drv_ime_set_cursor_pos( UINT pos )
 {
     LPINPUTCONTEXT lpIMC;
diff --git a/dlls/winex11.drv/unixlib.h b/dlls/winex11.drv/unixlib.h
index ed5dbac6535..332c4e4b3fa 100644
--- a/dlls/winex11.drv/unixlib.h
+++ b/dlls/winex11.drv/unixlib.h
@@ -96,7 +96,6 @@ enum client_callback
 {
     client_dnd_drop_event,
     client_dnd_leave_event,
-    client_ime_get_cursor_pos,
     client_ime_set_composition_status,
     client_ime_set_cursor_pos,
     client_ime_update_association,
diff --git a/dlls/winex11.drv/x11drv_dll.h b/dlls/winex11.drv/x11drv_dll.h
index 80fe9ab2a3d..2cc27abd362 100644
--- a/dlls/winex11.drv/x11drv_dll.h
+++ b/dlls/winex11.drv/x11drv_dll.h
@@ -36,7 +36,6 @@ extern NTSTATUS WINAPI x11drv_systray_change_owner( void *params, ULONG size ) D

extern NTSTATUS x11drv_dnd_drop_event( UINT arg ) DECLSPEC_HIDDEN;
 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_update_association( UINT arg ) DECLSPEC_HIDDEN;
diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index db5a3a5a74b..072cf49457a 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -230,8 +230,13 @@ static int xic_preedit_caret( XIC xic, XPointer user, XPointer arg )
     TRACE( "xic %p, hwnd %p, arg %p\n", xic, hwnd, arg );

if (!params) return 0;
+    if (!(hwnd = get_builtin_ime_ui( hwnd )))
+    {
+        WARN( "No builtin IME UI, ignoring event.\n" );
+        return 0;
+    }

-    pos = x11drv_client_call( client_ime_get_cursor_pos, 0 );
+    pos = send_message( hwnd, WM_WINE_IME_GET_CURSOR_POS, 0, 0 );
     switch (params->direction)
     {
     case XIMForwardChar:
diff --git a/include/ntuser.h b/include/ntuser.h
index 7038ad86d98..fed74155c4a 100644
--- a/include/ntuser.h
+++ b/include/ntuser.h
@@ -493,6 +493,7 @@ enum wine_internal_message

/* builtin IME UI messages */
 #define WM_WINE_IME_SET_OPEN_STATUS  (WM_USER + 0)
+#define WM_WINE_IME_GET_CURSOR_POS   (WM_USER + 1)

/* internal IME private */
 typedef struct ime_private