Sergio Gómez Del Rea =?UTF-8?Q?l=20?=: riched20: ME_CheckCharOffsets() calls should only be done when tracing.
Alexandre Julliard
julliard at winehq.org
Thu Nov 29 15:33:01 CST 2018
Module: wine
Branch: master
Commit: 14984a169a7f744489742d5f457709a941efb93e
URL: https://source.winehq.org/git/wine.git/?a=commit;h=14984a169a7f744489742d5f457709a941efb93e
Author: Sergio Gómez Del Real <sdelreal at codeweavers.com>
Date: Thu Nov 29 08:44:55 2018 -0500
riched20: ME_CheckCharOffsets() calls should only be done when tracing.
Signed-off-by: Sergio Gómez Del Real <sdelreal at codeweavers.com>
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
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 76f509c..2cdd3d8 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 c344494..a66137d 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,
More information about the wine-cvs
mailing list