imm32: Detach hMsgBuf when sending messages in ImmGenerateMessage.

The issues is that if a message being sent in ImmGenerateMessage gets turned around and sent into an IME that in response to that message calls ImmGenerateMessage, the hMsgBuf still has the old message in it and it ends up getting processed in a loop again and again. Signed-off-by: Aric Stewart <aric@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

imm32: Detach hMsgBuf when sending messages in ImmGenerateMessage.
e7f725ec · Aric Stewart · Alexandre Julliard · f253e6cf · e7f725ec
Commit e7f725ec authored Feb 12, 2016 by Aric Stewart Committed by Alexandre Julliard Feb 15, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 6 deletions

imm.c dlls/imm32/imm.c +14 -6

No files found.
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -2893,15 +2893,23 @@ BOOL WINAPI ImmGenerateMessage(HIMC hIMC)
    if (data->IMC.dwNumMsgBuf > 0)
    {
        LPTRANSMSG lpTransMsg;
-        DWORD i;
+        HIMCC hMsgBuf;
+        DWORD i, dwNumMsgBuf;

-        lpTransMsg = ImmLockIMCC(data->IMC.hMsgBuf);
-        for (i = 0; i < data->IMC.dwNumMsgBuf; i++)
-            ImmInternalSendIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam);
-
-        ImmUnlockIMCC(data->IMC.hMsgBuf);
+        /* We are going to detach our hMsgBuff so that if processing messages
+           generates new messages they go into a new buffer */
+        hMsgBuf = data->IMC.hMsgBuf;
+        dwNumMsgBuf = data->IMC.dwNumMsgBuf;

+        data->IMC.hMsgBuf = ImmCreateIMCC(0);
        data->IMC.dwNumMsgBuf = 0;
+
+        lpTransMsg = ImmLockIMCC(hMsgBuf);
+        for (i = 0; i < dwNumMsgBuf; i++)
+            ImmInternalSendIMEMessage(data, lpTransMsg[i].message, lpTransMsg[i].wParam, lpTransMsg[i].lParam);
+
+        ImmUnlockIMCC(hMsgBuf);
+        ImmDestroyIMCC(hMsgBuf);
    }

    return TRUE;