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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 67ddc3146cb847e3161567a870230bba13d9c3f5
URL:    https://gitlab.winehq.org/wine/wine/-/commit/67ddc3146cb847e3161567a870230bb...

Author: Rémi Bernon 
Date:   Fri Apr  7 21:43:27 2023 +0200

imm32: Use INPUTCONTEXT directly in ImmGetConversionStatus.

---

dlls/imm32/imm.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index c99feb65a45..b2dc58a95ab 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1844,20 +1844,16 @@ DWORD WINAPI ImmGetConversionListW( HKL hkl, HIMC himc, const WCHAR *srcW, CANDI
 /***********************************************************************
  *		ImmGetConversionStatus (IMM32.@)
  */
-BOOL WINAPI ImmGetConversionStatus(
-  HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence)
+BOOL WINAPI ImmGetConversionStatus( HIMC himc, DWORD *conversion, DWORD *sentence )
 {
-    struct imc *data = get_imc_data( hIMC );
+    INPUTCONTEXT *ctx;

-    TRACE("%p %p %p\n", hIMC, lpfdwConversion, lpfdwSentence);
+    TRACE( "himc %p, conversion %p, sentence %p\n", himc, conversion, sentence );

-    if (!data)
-        return FALSE;
-
-    if (lpfdwConversion)
-        *lpfdwConversion = data->IMC.fdwConversion;
-    if (lpfdwSentence)
-        *lpfdwSentence = data->IMC.fdwSentence;
+    if (!(ctx = ImmLockIMC( himc ))) return FALSE;
+    if (conversion) *conversion = ctx->fdwConversion;
+    if (sentence) *sentence = ctx->fdwSentence;
+    ImmUnlockIMC( himc );

return TRUE;
 }