From 14984a169a7f744489742d5f457709a941efb93e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sergio=20G=C3=B3mez=20Del=20Real?= Date: Thu, 29 Nov 2018 08:44:55 -0500 Subject: [PATCH] riched20: ME_CheckCharOffsets() calls should only be done when tracing. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Gómez Del Real Signed-off-by: Huw Davies Signed-off-by: Alexandre Julliard --- dlls/riched20/run.c | 6 ++++-- dlls/riched20/wrap.c | 7 ++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 76f509c5eae..2cdd3d804a5 100644 --- 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,8 +241,7 @@ 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); + ME_CheckCharOffsets(editor); } /****************************************************************************** diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index c3444943f0b..a66137d42c9 100644 --- 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,8 +139,7 @@ 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); + ME_CheckCharOffsets(editor); run = &item->member.run; @@ -160,8 +158,7 @@ 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); + ME_CheckCharOffsets(editor); TRACE("After split: %s(%d, %d), %s(%d, %d)\n", debugstr_run( run ), run->pt.x, run->pt.y, -- 2.11.4.GIT