[PATCH 0/3] MR2817: winemac: Move the remaining IME functions to imm32.

[Rémi Bernon]

And drop the ime_query_char_rect driver user callback. I couldn't find a way to trigger it, and I believe that with https://gitlab.winehq.org/wine/wine/-/merge_requests/2743 drawing the IME string on the PE side it would be unnecessary for the host to display the string as well.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2817

[PATCH 1/3] winemac: Return the caret position in query_ime_char_rect.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

And drop the ime_query_char_rect driver user callback.
---
 dlls/winemac.drv/dllmain.c    |   1 -
 dlls/winemac.drv/event.c      |  22 +++--
 dlls/winemac.drv/ime.c        | 146 ----------------------------------
 dlls/winemac.drv/macdrv_dll.h |   2 -
 dlls/winemac.drv/unixlib.h    |  19 -----
 5 files changed, 9 insertions(+), 181 deletions(-)

diff --git a/dlls/winemac.drv/dllmain.c b/dlls/winemac.drv/dllmain.c
index 265d6e46d5c..b20f8d71dc9 100644
--- a/dlls/winemac.drv/dllmain.c
+++ b/dlls/winemac.drv/dllmain.c
@@ -374,7 +374,6 @@ static const kernel_callback kernel_callbacks[] =
     macdrv_dnd_query_drag,
     macdrv_dnd_query_drop,
     macdrv_dnd_query_exited,
-    macdrv_ime_query_char_rect,
 };
 
 C_ASSERT(NtUserDriverCallbackFirst + ARRAYSIZE(kernel_callbacks) == client_func_last);
diff --git a/dlls/winemac.drv/event.c b/dlls/winemac.drv/event.c
index 1565cd9cbdd..11f5dd3314c 100644
--- a/dlls/winemac.drv/event.c
+++ b/dlls/winemac.drv/event.c
@@ -401,25 +401,21 @@ BOOL query_ime_char_rect(macdrv_query* query)
     HWND hwnd = macdrv_get_window_hwnd(query->window);
     void *himc = query->ime_char_rect.himc;
     CFRange *range = &query->ime_char_rect.range;
-    CGRect *rect = &query->ime_char_rect.rect;
-    struct ime_query_char_rect_result result = { .location = 0 };
-    struct ime_query_char_rect_params params;
-    BOOL ret;
+    GUITHREADINFO info = {.cbSize = sizeof(info)};
+    BOOL ret = FALSE;
 
     TRACE_(imm)("win %p/%p himc %p range %ld-%ld\n", hwnd, query->window, himc, range->location,
                 range->length);
 
-    params.hwnd = HandleToUlong(hwnd);
-    params.himc = (UINT_PTR)himc;
-    params.result = (UINT_PTR)&result;
-    params.location = range->location;
-    params.length = range->length;
-    ret = macdrv_client_func(client_func_ime_query_char_rect, ¶ms, sizeof(params));
-    *range = CFRangeMake(result.location, result.length);
-    *rect = cgrect_from_rect(result.rect);
+    if (NtUserGetGUIThreadInfo(0, &info))
+    {
+        NtUserMapWindowPoints(info.hwndCaret, 0, (POINT*)&info.rcCaret, 2);
+        if (range->length && info.rcCaret.left == info.rcCaret.right) info.rcCaret.right++;
+        query->ime_char_rect.rect = cgrect_from_rect(info.rcCaret);
+    }
 
     TRACE_(imm)(" -> %s range %ld-%ld rect %s\n", ret ? "TRUE" : "FALSE", range->location,
-                range->length, wine_dbgstr_cgrect(*rect));
+                range->length, wine_dbgstr_cgrect(query->ime_char_rect.rect));
 
     return ret;
 }
diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index 9249b722909..58761470dee 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -46,47 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(imm);
 static HIMC *hSelectedFrom = NULL;
 static INT  hSelectedCount = 0;
 
-static WCHAR *input_context_get_comp_str( INPUTCONTEXT *ctx, BOOL result, UINT *length )
-{
-    COMPOSITIONSTRING *string;
-    WCHAR *text = NULL;
-    UINT len, off;
-
-    if (!(string = ImmLockIMCC( ctx->hCompStr ))) return NULL;
-    len = result ? string->dwResultStrLen : string->dwCompStrLen;
-    off = result ? string->dwResultStrOffset : string->dwCompStrOffset;
-
-    if (len && off && (text = malloc( (len + 1) * sizeof(WCHAR) )))
-    {
-        memcpy( text, (BYTE *)string + off, len * sizeof(WCHAR) );
-        text[len] = 0;
-        *length = len;
-    }
-
-    ImmUnlockIMCC( ctx->hCompStr );
-    return text;
-}
-
-static HWND input_context_get_ui_hwnd( INPUTCONTEXT *ctx )
-{
-    struct ime_private *priv;
-    HWND hwnd;
-    if (!(priv = ImmLockIMCC( ctx->hPrivate ))) return NULL;
-    hwnd = priv->hwndDefault;
-    ImmUnlockIMCC( ctx->hPrivate );
-    return hwnd;
-}
-
-static HFONT input_context_select_ui_font( INPUTCONTEXT *ctx, HDC hdc )
-{
-    struct ime_private *priv;
-    HFONT font = NULL;
-    if (!(priv = ImmLockIMCC( ctx->hPrivate ))) return NULL;
-    if (priv->textfont) font = SelectObject( hdc, priv->textfont );
-    ImmUnlockIMCC( ctx->hPrivate );
-    return font;
-}
-
 static HIMC RealIMC(HIMC hIMC)
 {
     if (hIMC == FROM_MACDRV)
@@ -217,108 +176,3 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
     return TRUE;
 }
 
-/* Interfaces to other parts of the Mac driver */
-
-/**************************************************************************
- *              macdrv_ime_query_char_rect
- */
-NTSTATUS WINAPI macdrv_ime_query_char_rect(void *arg, ULONG size)
-{
-    struct ime_query_char_rect_params *params = arg;
-    struct ime_query_char_rect_result *result = param_ptr(params->result);
-    void *himc = param_ptr(params->himc);
-    IMECHARPOSITION charpos;
-    BOOL ret = FALSE;
-
-    result->location = params->location;
-    result->length = params->length;
-
-    if (!himc) himc = RealIMC(FROM_MACDRV);
-
-    charpos.dwSize = sizeof(charpos);
-    charpos.dwCharPos = params->location;
-    if (ImmRequestMessageW(himc, IMR_QUERYCHARPOSITION, (ULONG_PTR)&charpos))
-    {
-        int i;
-
-        SetRect(&result->rect, charpos.pt.x, charpos.pt.y, 0, charpos.pt.y + charpos.cLineHeight);
-
-        /* iterate over rest of length to extend rect */
-        for (i = 1; i < params->length; i++)
-        {
-            charpos.dwSize = sizeof(charpos);
-            charpos.dwCharPos = params->location + i;
-            if (!ImmRequestMessageW(himc, IMR_QUERYCHARPOSITION, (ULONG_PTR)&charpos) ||
-                charpos.pt.y != result->rect.top)
-            {
-                result->length = i;
-                break;
-            }
-
-            result->rect.right = charpos.pt.x;
-        }
-
-        ret = TRUE;
-    }
-
-    if (!ret)
-    {
-        LPINPUTCONTEXT ic = ImmLockIMC(himc);
-
-        if (ic)
-        {
-            WCHAR *str;
-            HWND hwnd;
-            UINT len;
-
-            if ((hwnd = input_context_get_ui_hwnd( ic )) && IsWindowVisible( hwnd ) &&
-                (str = input_context_get_comp_str( ic, FALSE, &len )))
-            {
-                HDC dc = GetDC( hwnd );
-                HFONT font = input_context_select_ui_font( ic, dc );
-                SIZE size;
-
-                if (result->location > len) result->location = len;
-                if (result->location + result->length > len) result->length = len - result->location;
-
-                GetTextExtentPoint32W( dc, str, result->location, &size );
-                charpos.rcDocument.left = size.cx;
-                charpos.rcDocument.top = 0;
-                GetTextExtentPoint32W( dc, str, result->location + result->length, &size );
-                charpos.rcDocument.right = size.cx;
-                charpos.rcDocument.bottom = size.cy;
-
-                if (ic->cfCompForm.dwStyle == CFS_DEFAULT)
-                    OffsetRect(&charpos.rcDocument, 10, 10);
-
-                LPtoDP(dc, (POINT*)&charpos.rcDocument, 2);
-                MapWindowPoints( hwnd, 0, (POINT *)&charpos.rcDocument, 2 );
-                result->rect = charpos.rcDocument;
-                ret = TRUE;
-
-                if (font) SelectObject( dc, font );
-                ReleaseDC( hwnd, dc );
-                free( str );
-            }
-        }
-
-        ImmUnlockIMC(himc);
-    }
-
-    if (!ret)
-    {
-        GUITHREADINFO gti;
-        gti.cbSize = sizeof(gti);
-        if (GetGUIThreadInfo(0, >i))
-        {
-            MapWindowPoints(gti.hwndCaret, 0, (POINT*)>i.rcCaret, 2);
-            result->rect = gti.rcCaret;
-            ret = TRUE;
-        }
-    }
-
-    if (ret && result->length && result->rect.left == result->rect.right)
-        result->rect.right++;
-
-    return ret;
-}
diff --git a/dlls/winemac.drv/macdrv_dll.h b/dlls/winemac.drv/macdrv_dll.h
index 8f13b6b69aa..1bbc7dfc7d6 100644
--- a/dlls/winemac.drv/macdrv_dll.h
+++ b/dlls/winemac.drv/macdrv_dll.h
@@ -31,8 +31,6 @@ extern NTSTATUS WINAPI macdrv_dnd_query_drag(void *arg, ULONG size) DECLSPEC_HID
 extern NTSTATUS WINAPI macdrv_dnd_query_drop(void *arg, ULONG size) DECLSPEC_HIDDEN;
 extern NTSTATUS WINAPI macdrv_dnd_query_exited(void *arg, ULONG size) DECLSPEC_HIDDEN;
 
-extern NTSTATUS WINAPI macdrv_ime_query_char_rect(void *params, ULONG size) DECLSPEC_HIDDEN;
-
 extern HMODULE macdrv_module DECLSPEC_HIDDEN;
 
 #endif /* __WINE_MACDRV_DLL_H */
diff --git a/dlls/winemac.drv/unixlib.h b/dlls/winemac.drv/unixlib.h
index 337caa6def2..61f4f44fb75 100644
--- a/dlls/winemac.drv/unixlib.h
+++ b/dlls/winemac.drv/unixlib.h
@@ -91,7 +91,6 @@ enum macdrv_client_funcs
     client_func_dnd_query_drag,
     client_func_dnd_query_drop,
     client_func_dnd_query_exited,
-    client_func_ime_query_char_rect,
     client_func_last
 };
 
@@ -149,24 +148,6 @@ struct dnd_query_exited_params
     UINT32 hwnd;
 };
 
-/* macdrv_ime_query_char_rect result */
-struct ime_query_char_rect_result
-{
-    RECT rect;
-    UINT32 location;
-    UINT32 length;
-};
-
-/* macdrv_ime_query_char_rect params */
-struct ime_query_char_rect_params
-{
-    UINT32 hwnd;
-    UINT32 location;
-    UINT32 himc;
-    UINT64 result; /* FIXME: Use NtCallbackReturn instead */
-    UINT32 length;
-};
-
 static inline void *param_ptr(UINT64 param)
 {
     return (void *)(UINT_PTR)param;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2817

[PATCH 2/3] winemac: Remove now unnecessary selected HIMC tracking code.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/winemac.drv/ime.c | 92 ++++--------------------------------------
 1 file changed, 7 insertions(+), 85 deletions(-)

diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index 58761470dee..a0d3325906e 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -41,51 +41,12 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(imm);
 
-#define FROM_MACDRV ((HIMC)0xcafe1337)
-
-static HIMC *hSelectedFrom = NULL;
-static INT  hSelectedCount = 0;
-
-static HIMC RealIMC(HIMC hIMC)
-{
-    if (hIMC == FROM_MACDRV)
-    {
-        INT i;
-        HWND wnd = GetFocus();
-        HIMC winHimc = ImmGetContext(wnd);
-        for (i = 0; i < hSelectedCount; i++)
-            if (winHimc == hSelectedFrom[i])
-                return winHimc;
-        return NULL;
-    }
-    else
-        return hIMC;
-}
-
-static LPINPUTCONTEXT LockRealIMC(HIMC hIMC)
-{
-    HIMC real_imc = RealIMC(hIMC);
-    if (real_imc)
-        return ImmLockIMC(real_imc);
-    else
-        return NULL;
-}
-
-static BOOL UnlockRealIMC(HIMC hIMC)
-{
-    HIMC real_imc = RealIMC(hIMC);
-    if (real_imc)
-        return ImmUnlockIMC(real_imc);
-    else
-        return FALSE;
-}
-
 static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     LPINPUTCONTEXT lpIMC;
     LPTRANSMSG lpTransMsg;
 
-    lpIMC = LockRealIMC(hIMC);
+    lpIMC = ImmLockIMC(hIMC);
     if (lpIMC == NULL)
         return;
 
@@ -105,34 +66,8 @@ static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, LPARAM lParam
     ImmUnlockIMCC(lpIMC->hMsgBuf);
     lpIMC->dwNumMsgBuf++;
 
-    ImmGenerateMessage(RealIMC(hIMC));
-    UnlockRealIMC(hIMC);
-}
-
-static BOOL IME_RemoveFromSelected(HIMC hIMC)
-{
-    int i;
-    for (i = 0; i < hSelectedCount; i++)
-    {
-        if (hSelectedFrom[i] == hIMC)
-        {
-            if (i < hSelectedCount - 1)
-                memmove(&hSelectedFrom[i], &hSelectedFrom[i + 1], (hSelectedCount - i - 1) * sizeof(HIMC));
-            hSelectedCount--;
-            return TRUE;
-        }
-    }
-    return FALSE;
-}
-
-static void IME_AddToSelected(HIMC hIMC)
-{
-    hSelectedCount++;
-    if (hSelectedFrom)
-        hSelectedFrom = HeapReAlloc(GetProcessHeap(), 0, hSelectedFrom, hSelectedCount * sizeof(HIMC));
-    else
-        hSelectedFrom = HeapAlloc(GetProcessHeap(), 0, sizeof(HIMC));
-    hSelectedFrom[hSelectedCount - 1] = hIMC;
+    ImmGenerateMessage(hIMC);
+    ImmUnlockIMC(hIMC);
 }
 
 BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
@@ -140,23 +75,10 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
     LPINPUTCONTEXT lpIMC;
     TRACE("%p %s\n", hIMC, fSelect ? "TRUE" : "FALSE");
 
-    if (hIMC == FROM_MACDRV)
-    {
-        ERR("ImeSelect should never be called from Cocoa\n");
-        return FALSE;
-    }
-
-    if (!hIMC)
-        return TRUE;
-
-    /* not selected */
-    if (!fSelect)
-        return IME_RemoveFromSelected(hIMC);
-
-    IME_AddToSelected(hIMC);
+    if (!hIMC || !fSelect) return TRUE;
 
     /* Initialize our structures */
-    lpIMC = LockRealIMC(hIMC);
+    lpIMC = ImmLockIMC(hIMC);
     if (lpIMC != NULL)
     {
         LPIMEPRIVATE myPrivate;
@@ -164,13 +86,13 @@ BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
         if (myPrivate->bInComposition)
             GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0);
         if (myPrivate->bInternalState)
-            ImmSetOpenStatus(RealIMC(FROM_MACDRV), FALSE);
+            ImmSetOpenStatus( hIMC, FALSE );
         myPrivate->bInComposition = FALSE;
         myPrivate->bInternalState = FALSE;
         myPrivate->textfont = NULL;
         myPrivate->hwndDefault = NULL;
         ImmUnlockIMCC(lpIMC->hPrivate);
-        UnlockRealIMC(hIMC);
+        ImmUnlockIMC(hIMC);
     }
 
     return TRUE;
-- 
GitLab


https://gitlab.winehq.org/wine/wine/-/merge_requests/2817

[PATCH 3/3] winemac: Use the default IME implementation for ImeSelect.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

---
 dlls/imm32/ime.c                  |  18 +++++-
 dlls/winemac.drv/Makefile.in      |   1 -
 dlls/winemac.drv/ime.c            | 100 ------------------------------
 dlls/winemac.drv/winemac.drv.spec |   3 -
 4 files changed, 17 insertions(+), 105 deletions(-)
 delete mode 100644 dlls/winemac.drv/ime.c

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index c615e3406c9..b11e496d0ac 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -428,7 +428,23 @@ BOOL WINAPI ImeDestroy( UINT force )
 
 BOOL WINAPI ImeSelect( HIMC himc, BOOL select )
 {
-    FIXME( "himc %p, select %d semi-stub!\n", himc, select );
+    struct ime_private *priv;
+    INPUTCONTEXT *ctx;
+
+    TRACE( "himc %p, select %u\n", himc, select );
+
+    if (!himc || !select) return TRUE;
+    if (!(ctx = ImmLockIMC( himc ))) return FALSE;
+
+    ImmSetOpenStatus( himc, FALSE );
+
+    if ((priv = ImmLockIMCC( ctx->hPrivate )))
+    {
+        memset( priv, 0, sizeof(*priv) );
+        ImmUnlockIMCC( ctx->hPrivate );
+    }
+
+    ImmUnlockIMC( himc );
     return TRUE;
 }
 
diff --git a/dlls/winemac.drv/Makefile.in b/dlls/winemac.drv/Makefile.in
index 9735890b221..7228dfbac4f 100644
--- a/dlls/winemac.drv/Makefile.in
+++ b/dlls/winemac.drv/Makefile.in
@@ -12,7 +12,6 @@ C_SRCS = \
 	event.c \
 	gdi.c \
 	image.c \
-	ime.c \
 	keyboard.c \
 	macdrv_main.c \
 	mouse.c \
diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
deleted file mode 100644
index a0d3325906e..00000000000
--- a/dlls/winemac.drv/ime.c
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * The IME for interfacing with Mac input methods
- *
- * Copyright 2008, 2013 CodeWeavers, Aric Stewart
- * Copyright 2013 Ken Thomases for CodeWeavers Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-/*
- * Notes:
- *  The normal flow for IMM/IME Processing is as follows.
- * 1) The Keyboard Driver generates key messages which are first passed to
- *    the IMM and then to IME via ImeProcessKey. If the IME returns 0  then
- *    it does not want the key and the keyboard driver then generates the
- *    WM_KEYUP/WM_KEYDOWN messages.  However if the IME is going to process the
- *    key it returns non-zero.
- * 2) If the IME is going to process the key then the IMM calls ImeToAsciiEx to
- *    process the key.  the IME modifies the HIMC structure to reflect the
- *    current state and generates any messages it needs the IMM to process.
- * 3) IMM checks the messages and send them to the application in question. From
- *    here the IMM level deals with if the application is IME aware or not.
- */
-
-#include "macdrv_dll.h"
-#include "imm.h"
-#include "immdev.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(imm);
-
-static void GenerateIMEMessage(HIMC hIMC, UINT msg, WPARAM wParam, LPARAM lParam)
-{
-    LPINPUTCONTEXT lpIMC;
-    LPTRANSMSG lpTransMsg;
-
-    lpIMC = ImmLockIMC(hIMC);
-    if (lpIMC == NULL)
-        return;
-
-    lpIMC->hMsgBuf = ImmReSizeIMCC(lpIMC->hMsgBuf, (lpIMC->dwNumMsgBuf + 1) * sizeof(TRANSMSG));
-    if (!lpIMC->hMsgBuf)
-        return;
-
-    lpTransMsg = ImmLockIMCC(lpIMC->hMsgBuf);
-    if (!lpTransMsg)
-        return;
-
-    lpTransMsg += lpIMC->dwNumMsgBuf;
-    lpTransMsg->message = msg;
-    lpTransMsg->wParam = wParam;
-    lpTransMsg->lParam = lParam;
-
-    ImmUnlockIMCC(lpIMC->hMsgBuf);
-    lpIMC->dwNumMsgBuf++;
-
-    ImmGenerateMessage(hIMC);
-    ImmUnlockIMC(hIMC);
-}
-
-BOOL WINAPI ImeSelect(HIMC hIMC, BOOL fSelect)
-{
-    LPINPUTCONTEXT lpIMC;
-    TRACE("%p %s\n", hIMC, fSelect ? "TRUE" : "FALSE");
-
-    if (!hIMC || !fSelect) return TRUE;
-
-    /* Initialize our structures */
-    lpIMC = ImmLockIMC(hIMC);
-    if (lpIMC != NULL)
-    {
-        LPIMEPRIVATE myPrivate;
-        myPrivate = ImmLockIMCC(lpIMC->hPrivate);
-        if (myPrivate->bInComposition)
-            GenerateIMEMessage(hIMC, WM_IME_ENDCOMPOSITION, 0, 0);
-        if (myPrivate->bInternalState)
-            ImmSetOpenStatus( hIMC, FALSE );
-        myPrivate->bInComposition = FALSE;
-        myPrivate->bInternalState = FALSE;
-        myPrivate->textfont = NULL;
-        myPrivate->hwndDefault = NULL;
-        ImmUnlockIMCC(lpIMC->hPrivate);
-        ImmUnlockIMC(hIMC);
-    }
-
-    return TRUE;
-}
-
diff --git a/dlls/winemac.drv/winemac.drv.spec b/dlls/winemac.drv/winemac.drv.spec
index 68bebc794aa..5f086f5c4e5 100644
--- a/dlls/winemac.drv/winemac.drv.spec
+++ b/dlls/winemac.drv/winemac.drv.spec
@@ -1,5 +1,2 @@
 # System tray
 @ cdecl wine_notify_icon(long ptr)
-
-# IME
-@ stdcall ImeSelect(long long)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/2817

[PATCH 0/3] MR2817: winemac: Move the remaining IME functions to imm32. - approved

[Huw Davies (＠huw)]

This merge request was approved by Huw Davies.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2817