Rémi Bernon : imm32: Use INPUTCONTEXT directly in ImmGetStatusWindowPos.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 9a4b9a3ae5c9b283ca33171afb90fd94ee3bb33b
URL:    https://gitlab.winehq.org/wine/wine/-/commit/9a4b9a3ae5c9b283ca33171afb90fd9...

Author: Rémi Bernon 
Date:   Sat Apr  8 11:59:38 2023 +0200

imm32: Use INPUTCONTEXT directly in ImmGetStatusWindowPos.

---

dlls/imm32/imm.c         | 16 ++++++++--------
 dlls/imm32/tests/imm32.c |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index b88ca86c15c..8ff3a99324a 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2092,18 +2092,18 @@ UINT WINAPI ImmGetRegisterWordStyleW( HKL hkl, UINT count, STYLEBUFW *styleW )
 /***********************************************************************
  *		ImmGetStatusWindowPos (IMM32.@)
  */
-BOOL WINAPI ImmGetStatusWindowPos(HIMC hIMC, LPPOINT lpptPos)
+BOOL WINAPI ImmGetStatusWindowPos( HIMC himc, POINT *pos )
 {
-    struct imc *data = get_imc_data( hIMC );
-
-    TRACE("(%p, %p)\n", hIMC, lpptPos);
+    INPUTCONTEXT *ctx;
+    BOOL ret;

-    if (!data || !lpptPos)
-        return FALSE;
+    TRACE( "himc %p, pos %p\n", himc, pos );

-    *lpptPos = data->IMC.ptStatusWndPos;
+    if (!(ctx = ImmLockIMC( himc ))) return FALSE;
+    if ((ret = !!(ctx->fdwInit & INIT_STATUSWNDPOS))) *pos = ctx->ptStatusWndPos;
+    ImmUnlockIMC( himc );

-    return TRUE;
+    return ret;
 }

/***********************************************************************
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index cc09d5d969d..0dda2217979 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -6220,9 +6220,9 @@ static void test_ImmSetStatusWindowPos(void)
     ctx->ptStatusWndPos.x = 0xdeadbeef;
     ctx->ptStatusWndPos.y = 0xfeedcafe;
     ctx->fdwInit = ~INIT_STATUSWNDPOS;
-    todo_wine ok_ret( 0, ImmGetStatusWindowPos( himc, &pos ) );
-    todo_wine ok_eq( 0xcdcdcdcd, pos.x, UINT, "%u" );
-    todo_wine ok_eq( 0xcdcdcdcd, pos.y, UINT, "%u" );
+    ok_ret( 0, ImmGetStatusWindowPos( himc, &pos ) );
+    ok_eq( 0xcdcdcdcd, pos.x, UINT, "%u" );
+    ok_eq( 0xcdcdcdcd, pos.y, UINT, "%u" );
     ctx->fdwInit = INIT_STATUSWNDPOS;
     ok_ret( 1, ImmGetStatusWindowPos( himc, &pos ) );
     ok_eq( 0xdeadbeef, pos.x, UINT, "%u" );