Rémi Bernon : winex11: Pass INPUTCONTEXT pointer to UpdateDefaultIMEWindow.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b869270bef99e6f2f881c102a56e4576bdcf1304
URL:    https://gitlab.winehq.org/wine/wine/-/commit/b869270bef99e6f2f881c102a56e457...

Author: Rémi Bernon 
Date:   Sat Apr  1 18:58:50 2023 +0200

winex11: Pass INPUTCONTEXT pointer to UpdateDefaultIMEWindow.

---

dlls/winex11.drv/ime.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dlls/winex11.drv/ime.c b/dlls/winex11.drv/ime.c
index c494aaed2be..8c7dac56251 100644
--- a/dlls/winex11.drv/ime.c
+++ b/dlls/winex11.drv/ime.c
@@ -1104,14 +1104,9 @@ static void PaintDefaultIMEWnd(HIMC hIMC, HWND hwnd)
     ImmUnlockIMC(hIMC);
 }

-static void UpdateDefaultIMEWindow(HIMC hIMC, HWND hwnd)
+static void UpdateDefaultIMEWindow(INPUTCONTEXT *lpIMC, HWND hwnd)
 {
     LPCOMPOSITIONSTRING compstr;
-    LPINPUTCONTEXT lpIMC;
-
-    lpIMC = ImmLockIMC(hIMC);
-    if (lpIMC == NULL)
-        return;

if (lpIMC->hCompStr)
         compstr = ImmLockIMCC(lpIMC->hCompStr);
@@ -1130,20 +1125,25 @@ static void UpdateDefaultIMEWindow(HIMC hIMC, HWND hwnd)
         ImmUnlockIMCC(lpIMC->hCompStr);

lpIMC->hWnd = GetFocus();
-    ImmUnlockIMC(hIMC);
 }

static void DefaultIMEComposition(HIMC hIMC, HWND hwnd, LPARAM lParam)
 {
+    INPUTCONTEXT *ctx;
     TRACE("IME message WM_IME_COMPOSITION 0x%Ix\n", lParam);
-    if (!(lParam & GCS_RESULTSTR))
-        UpdateDefaultIMEWindow(hIMC, hwnd);
+    if (lParam & GCS_RESULTSTR) return;
+    if (!(ctx = ImmLockIMC( hIMC ))) return;
+    UpdateDefaultIMEWindow( ctx, hwnd );
+    ImmUnlockIMC(hIMC);
 }

static void DefaultIMEStartComposition(HIMC hIMC, HWND hwnd )
 {
+    INPUTCONTEXT *ctx;
     TRACE("IME message WM_IME_STARTCOMPOSITION\n");
-    UpdateDefaultIMEWindow(hIMC, hwnd);
+    if (!(ctx = ImmLockIMC( hIMC ))) return;
+    UpdateDefaultIMEWindow( ctx, hwnd );
+    ImmUnlockIMC(hIMC);
 }

static LRESULT ImeHandleNotify(HIMC hIMC, HWND hwnd, UINT msg, WPARAM wParam,