[PATCH 2/3] riched20: Don't invalidate while inside TxDraw().

[Huw Davies]

Signed-off-by: Huw Davies 
---
 dlls/riched20/editor.h | 2 +-
 dlls/riched20/txtsrv.c | 2 +-
 dlls/riched20/wrap.c   | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h
index 929e10a3179..bf713880f8f 100644
--- a/dlls/riched20/editor.h
+++ b/dlls/riched20/editor.h
@@ -202,7 +202,7 @@ void ME_DestroyContext(ME_Context *c) DECLSPEC_HIDDEN;
 BOOL ME_WrapMarkedParagraphs(ME_TextEditor *editor) DECLSPEC_HIDDEN;
 void para_range_invalidate( ME_TextEditor *editor, ME_Paragraph *start_para, ME_Paragraph *last_para ) DECLSPEC_HIDDEN;
 void ME_SendRequestResize(ME_TextEditor *editor, BOOL force) DECLSPEC_HIDDEN;
-BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc ) DECLSPEC_HIDDEN;
+BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate ) DECLSPEC_HIDDEN;

/* para.c */
 void editor_get_selection_paras(ME_TextEditor *editor, ME_Paragraph **para, ME_Paragraph **para_end ) DECLSPEC_HIDDEN;
diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c
index 6ef7b7ef029..79ade0f6117 100644
--- a/dlls/riched20/txtsrv.c
+++ b/dlls/riched20/txtsrv.c
@@ -192,7 +192,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall fnTextSrv_TxDraw( ITextServices *iface, DWORD
     if (rewrap)
     {
         editor_mark_rewrap_all( services->editor );
-        wrap_marked_paras_dc( services->editor, dc );
+        wrap_marked_paras_dc( services->editor, dc, FALSE );
     }
     editor_draw( services->editor, dc, update );

diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c
index 468b267ceae..9456d54d815 100644
--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -1020,7 +1020,7 @@ static void adjust_para_y( ME_Paragraph *para, ME_Context *c, struct repaint_ran
     }
 }

-BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc )
+BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc, BOOL invalidate )
 {
   ME_Paragraph *para, *next;
   struct wine_rb_entry *entry, *next_entry = NULL;
@@ -1086,7 +1086,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc )

ME_DestroyContext(&c);

-  if (repaint.start || editor->nTotalLength < editor->nLastTotalLength)
+  if (invalidate && (repaint.start || editor->nTotalLength < editor->nLastTotalLength))
     para_range_invalidate( editor, repaint.start, repaint.end);
   return !!repaint.start;
 }
@@ -1094,7 +1094,7 @@ BOOL wrap_marked_paras_dc( ME_TextEditor *editor, HDC hdc )
 BOOL ME_WrapMarkedParagraphs( ME_TextEditor *editor )
 {
     HDC hdc = ITextHost_TxGetDC( editor->texthost );
-    BOOL ret = wrap_marked_paras_dc( editor, hdc );
+    BOOL ret = wrap_marked_paras_dc( editor, hdc, TRUE );
     ITextHost_TxReleaseDC( editor->texthost, hdc );
     return ret;
 }

[Marvin]

Hi,

While running your changed tests, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=87688

Your paranoid android.

=== debiant2 (build log) ===

Task: WineTest did not produce the win32 report

=== debiant2 (build log) ===

Task: Could not create the wow32 wineprefix: Failed to disable the crash dialogs: 
Task: WineTest did not produce the 0 report