winemac.drv: Use NI_COMPOSITIONSTR/CPS_CANCEL when composition string is empty.

This sends the expected WM_IME_ENDCOMPOSITION message. Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac.drv: Use NI_COMPOSITIONSTR/CPS_CANCEL when composition string is empty.
6d05fae6 · Aric Stewart · Alexandre Julliard · e33ce7c5 · 6d05fae6
Commit 6d05fae6 authored May 24, 2019 by Aric Stewart Committed by Alexandre Julliard May 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 15 deletions

ime.c dlls/winemac.drv/ime.c +17 -15

No files found.
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -901,6 +901,7 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, 
    DWORD flags = 0;
    WCHAR wParam  = 0;
    LPIMEPRIVATE myPrivate;
+    BOOL sendMessage = TRUE;
    TRACE("(%p, %d, %p, %d):\n", hIMC, dwIndex, lpComp, dwCompLen);
@@ -943,28 +944,29 @@ static BOOL IME_SetCompositionString(void* hIMC, DWORD dwIndex, LPCVOID lpComp, 
            wParam = ((const WCHAR*)lpComp)[0];
            flags |= GCS_COMPCLAUSE | GCS_COMPATTR | GCS_DELTASTART;
+            if (cursor_valid)
+            {
+                LPCOMPOSITIONSTRING compstr;
+                compstr = ImmLockIMCC(lpIMC->hCompStr);
+                compstr->dwCursorPos = cursor_pos;
+                ImmUnlockIMCC(lpIMC->hCompStr);
+                flags |= GCS_CURSORPOS;
+            }
        }
        else
        {
-            newCompStr = updateCompStr(lpIMC->hCompStr, NULL, 0, &flags);
+            NotifyIME(hIMC, NI_COMPOSITIONSTR, CPS_CANCEL, 0);
-            ImmDestroyIMCC(lpIMC->hCompStr);
+            sendMessage = FALSE;
-            lpIMC->hCompStr = newCompStr;
-        }
-        if (cursor_valid)
-        {
-            LPCOMPOSITIONSTRING compstr;
-            compstr = ImmLockIMCC(lpIMC->hCompStr);
-            compstr->dwCursorPos = cursor_pos;
-            ImmUnlockIMCC(lpIMC->hCompStr);
-            flags |= GCS_CURSORPOS;
        }
    }
-    GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, wParam, flags);
+    if (sendMessage) {
-    ImmUnlockIMCC(lpIMC->hPrivate);
+        GenerateIMEMessage(hIMC, WM_IME_COMPOSITION, wParam, flags);
-    UnlockRealIMC(hIMC);
+        ImmUnlockIMCC(lpIMC->hPrivate);
+        UnlockRealIMC(hIMC);
+    }
    return TRUE;
 }