From 781fb4a55e4cebf52b810d01c510f5aa44da191f Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Mon, 27 Feb 2023 12:33:45 +0900
Subject: [PATCH] [IMM32] Fix ImmGetCompositionStringA/W (#5105)

Fix some typos in Imm32GetCompStrA/W. CORE-11700
---
 dll/win32/imm32/compstr.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/dll/win32/imm32/compstr.c b/dll/win32/imm32/compstr.c
index 5486397f3f4..5b1c153d0f4 100644
--- a/dll/win32/imm32/compstr.c
+++ b/dll/win32/imm32/compstr.c
@@ -289,15 +289,15 @@ Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex,
             case GCS_COMPREADATTR:
                 dwBufLen = Imm32CompAttrWideToAnsi(CS_Attr(pCS, CompReadAttr),
                                                    CS_Size(pCS, CompReadAttr),
-                                                   CS_StrW(pCS, CompStr),
-                                                   CS_SizeW(pCS, CompStr),
+                                                   CS_StrW(pCS, CompReadStr),
+                                                   CS_SizeW(pCS, CompReadStr),
                                                    lpBuf, dwBufLen, uCodePage);
                 break;
 
             case GCS_COMPREADCLAUSE:
                 dwBufLen = Imm32CompClauseWideToAnsi(CS_Clause(pCS, CompReadClause),
                                                      CS_Size(pCS, CompReadClause),
-                                                     CS_StrW(pCS, CompStr),
+                                                     CS_StrW(pCS, CompReadStr),
                                                      lpBuf, dwBufLen, uCodePage);
                 break;
 
@@ -339,7 +339,7 @@ Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex,
             case GCS_RESULTREADCLAUSE:
                 dwBufLen = Imm32CompClauseWideToAnsi(CS_Clause(pCS, ResultReadClause),
                                                      CS_Size(pCS, ResultReadClause),
-                                                     CS_StrW(pCS, CompStr),
+                                                     CS_StrW(pCS, ResultReadStr),
                                                      lpBuf, dwBufLen, uCodePage);
                 break;
 
@@ -352,7 +352,7 @@ Imm32GetCompStrA(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex,
             case GCS_RESULTCLAUSE:
                 dwBufLen = Imm32CompClauseWideToAnsi(CS_Clause(pCS, ResultClause),
                                                      CS_Size(pCS, ResultClause),
-                                                     CS_StrW(pCS, CompStr),
+                                                     CS_StrW(pCS, ResultStr),
                                                      lpBuf, dwBufLen, uCodePage);
                 break;
 
@@ -383,14 +383,15 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex,
             case GCS_COMPREADATTR:
                 dwBufLen = Imm32CompAttrAnsiToWide(CS_Attr(pCS, CompReadAttr),
                                                    CS_Size(pCS, CompReadAttr),
-                                                   CS_StrA(pCS, CompStr), CS_SizeA(pCS, CompStr),
+                                                   CS_StrA(pCS, CompReadStr),
+                                                   CS_SizeA(pCS, CompReadStr),
                                                    lpBuf, dwBufLen, uCodePage);
                 break;
 
             case GCS_COMPREADCLAUSE:
                 dwBufLen = Imm32CompClauseAnsiToWide(CS_Clause(pCS, CompReadClause),
                                                      CS_Size(pCS, CompReadClause),
-                                                     CS_StrA(pCS, CompStr),
+                                                     CS_StrA(pCS, CompReadStr),
                                                      lpBuf, dwBufLen, uCodePage);
                 break;
 
@@ -431,7 +432,7 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex,
             case GCS_RESULTREADCLAUSE:
                 dwBufLen = Imm32CompClauseAnsiToWide(CS_Clause(pCS, ResultReadClause),
                                                      CS_Size(pCS, ResultReadClause),
-                                                     CS_StrA(pCS, CompStr),
+                                                     CS_StrA(pCS, ResultReadStr),
                                                      lpBuf, dwBufLen, uCodePage);
                 break;
 
@@ -444,7 +445,7 @@ Imm32GetCompStrW(HIMC hIMC, const COMPOSITIONSTRING *pCS, DWORD dwIndex,
             case GCS_RESULTCLAUSE:
                 dwBufLen = Imm32CompClauseAnsiToWide(CS_Clause(pCS, ResultClause),
                                                      CS_Size(pCS, ResultClause),
-                                                     CS_StrA(pCS, CompStr),
+                                                     CS_StrA(pCS, ResultStr),
                                                      lpBuf, dwBufLen, uCodePage);
                 break;