Dylan Smith : richedit: Commit undo items after modifications in WM_IME_COMPOSITION.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e809bc887d48700bfa8985b806eef674b35ac6f2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e809bc887d48700bfa8985b806eef674b35ac6f2

Author: Dylan Smith <dylan.ah.smith at gmail.com>
Date:   Mon May 24 01:04:53 2010 -0400

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.

---

 dlls/riched20/editor.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 7764614..e93db65 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -4256,7 +4256,6 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
     ME_Style *style = ME_GetInsertStyle(editor, 0);
     hIMC = ITextHost_TxImmGetContext(editor->texthost);
     ME_DeleteSelection(editor);
-    ME_CommitUndo(editor);
     ME_SaveTempStyle(editor);
     if (lParam & GCS_RESULTSTR)
     {
@@ -4286,6 +4285,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam,
                         editor->imeStartIndex + dwBufLen/sizeof(WCHAR));
     }
     ME_ReleaseStyle(style);
+    ME_CommitUndo(editor);
     ME_UpdateRepaint(editor);
     return 0;
   }