riched20: ME_CheckCharOffsets() calls should only be done when tracing.

Signed-off-by: Sergio Gómez Del Real <sdelreal@codeweavers.com> Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: ME_CheckCharOffsets() calls should only be done when tracing.
14984a16 · Sergio Gómez Del Real · Alexandre Julliard · a60965a1 · 14984a16 · 14984a16
Commit 14984a16 authored Nov 29, 2018 by Sergio Gómez Del Real Committed by Alexandre Julliard Nov 29, 2018
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

run.c dlls/riched20/run.c +3 -1

wrap.c dlls/riched20/wrap.c +0 -3

No files found.
--- a/dlls/riched20/run.c
+++ b/dlls/riched20/run.c
@@ -103,6 +103,9 @@ void ME_CheckCharOffsets(ME_TextEditor *editor)
  ME_DisplayItem *p = editor->pBuffer->pFirst;
  int ofs = 0, ofsp = 0;

+  if (!TRACE_ON(richedit_check))
+    return;
+
  TRACE_(richedit_check)("Checking begin\n");
  if(TRACE_ON(richedit_lists))
  {
@@ -238,7 +241,6 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p)
  ME_Remove(pNext);
  ME_DestroyDisplayItem(pNext);
  ME_UpdateRunFlags(editor, &p->member.run);
-  if(TRACE_ON(richedit_check))
  ME_CheckCharOffsets(editor);
 }


--- a/dlls/riched20/wrap.c
+++ b/dlls/riched20/wrap.c
@@ -23,7 +23,6 @@
 #include "editor.h"

 WINE_DEFAULT_DEBUG_CHANNEL(richedit);
-WINE_DECLARE_DEBUG_CHANNEL(richedit_check);

 /*
 * Unsolved problems:
@@ -140,7 +139,6 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite
  ME_Cursor cursor = {wc->pPara, item, nVChar};

  assert(item->member.run.nCharOfs != -1);
-  if(TRACE_ON(richedit_check))
  ME_CheckCharOffsets(editor);

  run = &item->member.run;
@@ -160,7 +158,6 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite
  run2->pt.x = run->pt.x+run->nWidth;
  run2->pt.y = run->pt.y;

-  if(TRACE_ON(richedit_check))
  ME_CheckCharOffsets(editor);

  TRACE("After split: %s(%d, %d), %s(%d, %d)\n",