Commit e809bc88 authored by Dylan Smith's avatar Dylan Smith Committed by Alexandre Julliard

richedit: Commit undo items after modifications in WM_IME_COMPOSITION.

ME_InsertTextFromCursor could previously follow the ME_CommitUndo call leaving uncommitted changes which would cause improper grouping of commits, or an assertion failure.
parent fb7d6b78
...@@ -4256,7 +4256,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ...@@ -4256,7 +4256,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
ME_Style *style = ME_GetInsertStyle(editor, 0); ME_Style *style = ME_GetInsertStyle(editor, 0);
hIMC = ITextHost_TxImmGetContext(editor->texthost); hIMC = ITextHost_TxImmGetContext(editor->texthost);
ME_DeleteSelection(editor); ME_DeleteSelection(editor);
ME_CommitUndo(editor);
ME_SaveTempStyle(editor); ME_SaveTempStyle(editor);
if (lParam & GCS_RESULTSTR) if (lParam & GCS_RESULTSTR)
{ {
...@@ -4286,6 +4285,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, ...@@ -4286,6 +4285,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
editor->imeStartIndex + dwBufLen/sizeof(WCHAR)); editor->imeStartIndex + dwBufLen/sizeof(WCHAR));
} }
ME_ReleaseStyle(style); ME_ReleaseStyle(style);
ME_CommitUndo(editor);
ME_UpdateRepaint(editor); ME_UpdateRepaint(editor);
return 0; return 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment