[PATCH 1/1] imm32: When IME composition is done, send WM_IME_COMPOSITION for the composition text before sending it for the result text

[Masahito S]

From: Masahito S

---
 dlls/imm32/ime.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/imm32/ime.c b/dlls/imm32/ime.c
index fa8e94acb21..d58733ab210 100644
--- a/dlls/imm32/ime.c
+++ b/dlls/imm32/ime.c
@@ -557,14 +557,6 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs,
         TRANSMSG status_msg = {.message = ime_set_composition_status( himc, !!compstr->dwCompStrOffset )};
         if (status_msg.message) msgs->TransMsg[count++] = status_msg;

-        if (compstr->dwResultStrLen)
-        {
-            const WCHAR *result = (WCHAR *)((BYTE *)compstr + compstr->dwResultStrOffset);
-            TRANSMSG msg = {.message = WM_IME_COMPOSITION, .wParam = result[0], .lParam = GCS_RESULTSTR};
-            if (compstr->dwResultClauseOffset) msg.lParam |= GCS_RESULTCLAUSE;
-            msgs->TransMsg[count++] = msg;
-        }
-
         if (compstr->dwCompStrLen)
         {
             const WCHAR *comp = (WCHAR *)((BYTE *)compstr + compstr->dwCompStrOffset);
@@ -574,6 +566,14 @@ UINT WINAPI ImeToAsciiEx( UINT vkey, UINT vsc, BYTE *state, TRANSMSGLIST *msgs,
             else msg.lParam |= CS_INSERTCHAR|CS_NOMOVECARET;
             msgs->TransMsg[count++] = msg;
         }
+
+        if (compstr->dwResultStrLen)
+        {
+            const WCHAR *result = (WCHAR *)((BYTE *)compstr + compstr->dwResultStrOffset);
+            TRANSMSG msg = {.message = WM_IME_COMPOSITION, .wParam = result[0], .lParam = GCS_RESULTSTR};
+            if (compstr->dwResultClauseOffset) msg.lParam |= GCS_RESULTCLAUSE;
+            msgs->TransMsg[count++] = msg;
+        }
     }

ImmUnlockIMCC( ctx->hCompStr );