[PATCH 3/7] winemac: Assume IME UI window always has a valid HIMC.

[Rémi Bernon]

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

---
 dlls/winemac.drv/ime.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/dlls/winemac.drv/ime.c b/dlls/winemac.drv/ime.c
index 83a46e39a4d..91a330dc7b7 100644
--- a/dlls/winemac.drv/ime.c
+++ b/dlls/winemac.drv/ime.c
@@ -497,7 +497,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable)
     LPCOMPOSITIONSTRING compstr;
     LPINPUTCONTEXT lpIMC;
 
-    lpIMC = LockRealIMC(hIMC);
+    lpIMC = ImmLockIMC(hIMC);
     if (lpIMC == NULL)
         return;
 
@@ -516,7 +516,7 @@ static void UpdateDataInDefaultIMEWindow(HIMC hIMC, HWND hwnd, BOOL showable)
     if (compstr != NULL)
         ImmUnlockIMCC(lpIMC->hCompStr);
 
-    UnlockRealIMC(hIMC);
+    ImmUnlockIMC(hIMC);
 }
 
 BOOL WINAPI ImeDestroy(UINT uForce)
@@ -944,7 +944,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd)
     INT offX = 0, offY = 0;
     LPINPUTCONTEXT lpIMC;
 
-    lpIMC = LockRealIMC(hIMC);
+    lpIMC = ImmLockIMC(hIMC);
     if (lpIMC == NULL)
         return;
 
@@ -1059,7 +1059,7 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd)
     ImmUnlockIMCC(lpIMC->hCompStr);
 
     EndPaint(hwnd, &ps);
-    UnlockRealIMC(hIMC);
+    ImmUnlockIMC(hIMC);
 }
 
 static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam)
@@ -1073,14 +1073,14 @@ static void DefaultIMEStartComposition(HIMC hIMC, HWND hwnd)
 {
     LPINPUTCONTEXT lpIMC;
 
-    lpIMC = LockRealIMC(hIMC);
+    lpIMC = ImmLockIMC(hIMC);
     if (lpIMC == NULL)
         return;
 
     TRACE("IME message WM_IME_STARTCOMPOSITION\n");
     lpIMC->hWnd = GetFocus();
     ShowWindow(hwnd, SW_SHOWNOACTIVATE);
-    UnlockRealIMC(hIMC);
+    ImmUnlockIMC(hIMC);
 }
 
 static LRESULT ImeHandleNotify(HIMC hIMC, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
@@ -1149,8 +1149,6 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
      */
 
     hIMC = (HIMC)GetWindowLongPtrW(hwnd, IMMGWL_IMC);
-    if (!hIMC)
-        hIMC = RealIMC(FROM_MACDRV);
 
     /* if we have no hIMC there are many messages we cannot process */
     if (hIMC == NULL)
@@ -1179,14 +1177,14 @@ static LRESULT WINAPI IME_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 
             SetWindowTextA(hwnd, "Wine Ime Active");
 
-            lpIMC = LockRealIMC(hIMC);
+            lpIMC = ImmLockIMC(hIMC);
             if (lpIMC)
             {
                 myPrivate = ImmLockIMCC(lpIMC->hPrivate);
                 myPrivate->hwndDefault = hwnd;
                 ImmUnlockIMCC(lpIMC->hPrivate);
             }
-            UnlockRealIMC(hIMC);
+            ImmUnlockIMC(hIMC);
 
             return TRUE;
         }
-- 
GitLab


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