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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 01677af42ae683d3b86e68e3a7cc71b1d68844ed
URL:    https://gitlab.winehq.org/wine/wine/-/commit/01677af42ae683d3b86e68e3a7cc71b...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Sat Apr  8 12:02:21 2023 +0200

imm32: Use INPUTCONTEXT directly in ImmGetCandidateWindow.

---

 dlls/imm32/imm.c         | 24 ++++++++++--------------
 dlls/imm32/tests/imm32.c | 14 +++++++-------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index aa63be82e4b..62b95eba77a 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -1390,25 +1390,21 @@ done:
 /***********************************************************************
  *		ImmGetCandidateWindow (IMM32.@)
  */
-BOOL WINAPI ImmGetCandidateWindow(
-  HIMC hIMC, DWORD dwIndex, LPCANDIDATEFORM lpCandidate)
+BOOL WINAPI ImmGetCandidateWindow( HIMC himc, DWORD index, CANDIDATEFORM *candidate )
 {
-    struct imc *data = get_imc_data( hIMC );
-
-    TRACE("%p, %ld, %p\n", hIMC, dwIndex, lpCandidate);
-
-    if (!data || !lpCandidate)
-        return FALSE;
+    INPUTCONTEXT *ctx;
+    BOOL ret = TRUE;
 
-    if (dwIndex >= ARRAY_SIZE(data->IMC.cfCandForm))
-        return FALSE;
+    TRACE( "himc %p, index %lu, candidate %p\n", himc, index, candidate );
 
-    if (data->IMC.cfCandForm[dwIndex].dwIndex != dwIndex)
-        return FALSE;
+    if (!candidate) return FALSE;
 
-    *lpCandidate = data->IMC.cfCandForm[dwIndex];
+    if (!(ctx = ImmLockIMC( himc ))) return FALSE;
+    if (ctx->cfCandForm[index].dwIndex == -1) ret = FALSE;
+    else *candidate = ctx->cfCandForm[index];
+    ImmUnlockIMC( himc );
 
-    return TRUE;
+    return ret;
 }
 
 /***********************************************************************
diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c
index cf6c521e52f..a623cabef7b 100644
--- a/dlls/imm32/tests/imm32.c
+++ b/dlls/imm32/tests/imm32.c
@@ -5653,21 +5653,21 @@ static void test_ImmGetCandidateWindow(void)
     ok_eq( 0xcdcdcdcd, cand_form.dwIndex, UINT, "%u" );
     ok_ret( 0, ImmGetCandidateWindow( default_himc, 3, &cand_form ) );
     ok_eq( 0xcdcdcdcd, cand_form.dwIndex, UINT, "%u" );
-    todo_wine ok_ret( 1, ImmGetCandidateWindow( default_himc, 4, &cand_form ) );
+    ok_ret( 1, ImmGetCandidateWindow( default_himc, 4, &cand_form ) );
     ok_seq( empty_sequence );
 
     ok_ret( 0, ImmGetCandidateWindow( himc, 0, &cand_form ) );
     ok_seq( empty_sequence );
 
-    todo_wine ok_seq( empty_sequence );
+    ok_seq( empty_sequence );
     ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() );
     ctx->cfCandForm[0] = expect_form;
 
-    todo_wine ok_ret( 1, ImmGetCandidateWindow( himc, 0, &cand_form ) );
-    todo_wine check_candidate_form( &cand_form, &expect_form );
+    ok_ret( 1, ImmGetCandidateWindow( himc, 0, &cand_form ) );
+    check_candidate_form( &cand_form, &expect_form );
     ok_seq( empty_sequence );
 
-    todo_wine ok_seq( empty_sequence );
+    ok_seq( empty_sequence );
     ok( !!ctx, "ImmLockIMC failed, error %lu\n", GetLastError() );
     ctx->cfCandForm[0].dwIndex = -1;
 
@@ -6481,8 +6481,8 @@ static void test_ImmSetCandidateWindow(void)
     memset( &cand_form, 0xcd, sizeof(cand_form) );
     ok_ret( 0, ImmGetCandidateWindow( himc, 0, &cand_form ) );
     ok_eq( 0xcdcdcdcd, cand_form.dwStyle, UINT, "%#x" );
-    todo_wine ok_ret( 1, ImmGetCandidateWindow( himc, 1, &cand_form ) );
-    todo_wine check_candidate_form( &cand_form, &expect_form );
+    ok_ret( 1, ImmGetCandidateWindow( himc, 1, &cand_form ) );
+    check_candidate_form( &cand_form, &expect_form );
     ok_ret( 1, ImmGetCandidateWindow( himc, 2, &cand_form ) );
     check_candidate_form( &cand_form, &expect_form );
     ok_seq( empty_sequence );