Huw Davies : riched20: Don't call update_caret() from the host.

[Alexandre Julliard]

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

Author: Huw Davies <huw at codeweavers.com>
Date:   Wed Mar 24 09:08:29 2021 +0000

riched20: Don't call update_caret() from the host.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/riched20/editor.c  | 1 -
 dlls/riched20/paint.c   | 1 +
 dlls/riched20/txthost.c | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index 293ac0bad5a..4f66220d230 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -1795,7 +1795,6 @@ static LRESULT ME_StreamIn(ME_TextEditor *editor, DWORD format, EDITSTREAM *stre
   if (!(format & SFF_SELECTION)) {
     ME_ClearTempStyle(editor);
   }
-  update_caret(editor);
   ME_SendSelChange(editor);
   ME_SendRequestResize(editor, FALSE);
 
diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index 4be76e441d0..0addf7d5656 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -131,6 +131,7 @@ void ME_UpdateRepaint(ME_TextEditor *editor, BOOL update_now)
   /* Ensure that the cursor is visible */
   editor_ensure_visible( editor, &editor->pCursors[0] );
 
+  update_caret( editor );
   ITextHost_TxViewChange(editor->texthost, update_now);
 
   ME_SendSelChange(editor);
diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c
index ab13879c664..9e384d0c503 100644
--- a/dlls/riched20/txthost.c
+++ b/dlls/riched20/txthost.c
@@ -1186,7 +1186,6 @@ static LRESULT RichEditWndProc_common( HWND hwnd, UINT msg, WPARAM wparam,
         PAINTSTRUCT ps;
         HBRUSH brush = CreateSolidBrush( ITextHost_TxGetSysColor( &host->ITextHost_iface, COLOR_WINDOW ) );
 
-        update_caret( editor );
         hdc = BeginPaint( editor->hWnd, &ps );
         if (!editor->bEmulateVersion10 || (editor->nEventMask & ENM_UPDATE))
             ME_SendOldNotify( editor, EN_UPDATE );