Rémi Bernon : winex11: Early return control flow in xic_preedit_caret.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d84f8dccf0b0e62bfba257db3bf2eed72f2bff0f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/d84f8dccf0b0e62bfba257db3bf2eed...

Author: Rémi Bernon 
Date:   Sun Apr  2 10:21:22 2023 +0200

winex11: Early return control flow in xic_preedit_caret.

---

dlls/winex11.drv/xim.c | 67 +++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 34 deletions(-)

diff --git a/dlls/winex11.drv/xim.c b/dlls/winex11.drv/xim.c
index 219e5b18974..0251677eef9 100644
--- a/dlls/winex11.drv/xim.c
+++ b/dlls/winex11.drv/xim.c
@@ -215,46 +215,45 @@ static int xic_preedit_draw( XIC xic, XPointer user, XPointer arg )

static int xic_preedit_caret( XIC xic, XPointer user, XPointer arg )
 {
-    XIMPreeditCaretCallbackStruct *P_C = (void *)arg;
+    XIMPreeditCaretCallbackStruct *params = (void *)arg;
     HWND hwnd = (HWND)user;
+    int pos;

TRACE( "xic %p, hwnd %p, arg %p\n", xic, hwnd, arg );

-    if (P_C)
+    if (!params) return 0;
+
+    pos = x11drv_client_call( client_ime_get_cursor_pos, 0 );
+    switch (params->direction)
     {
-        int pos = x11drv_client_call( client_ime_get_cursor_pos, 0 );
-        TRACE("pos: %d\n", pos);
-        switch(P_C->direction)
-        {
-            case XIMForwardChar:
-            case XIMForwardWord:
-                pos++;
-                break;
-            case XIMBackwardChar:
-            case XIMBackwardWord:
-                pos--;
-                break;
-            case XIMLineStart:
-                pos = 0;
-                break;
-            case XIMAbsolutePosition:
-                pos = P_C->position;
-                break;
-            case XIMDontChange:
-                P_C->position = pos;
-                return 0;
-            case XIMCaretUp:
-            case XIMCaretDown:
-            case XIMPreviousLine:
-            case XIMNextLine:
-            case XIMLineEnd:
-                FIXME("Not implemented\n");
-                break;
-        }
-        x11drv_client_call( client_ime_set_cursor_pos, pos );
-        P_C->position = pos;
+    case XIMForwardChar:
+    case XIMForwardWord:
+        pos++;
+        break;
+    case XIMBackwardChar:
+    case XIMBackwardWord:
+        pos--;
+        break;
+    case XIMLineStart:
+        pos = 0;
+        break;
+    case XIMAbsolutePosition:
+        pos = params->position;
+        break;
+    case XIMDontChange:
+        params->position = pos;
+        return 0;
+    case XIMCaretUp:
+    case XIMCaretDown:
+    case XIMPreviousLine:
+    case XIMNextLine:
+    case XIMLineEnd:
+        FIXME( "Not implemented\n" );
+        break;
     }
-    TRACE("Finished\n");
+    x11drv_client_call( client_ime_set_cursor_pos, pos );
+    params->position = pos;
+
     return 0;
 }