Huw Davies : riched20: Pass a run ptr to the run drawing function.
Alexandre Julliard
julliard at winehq.org
Mon Oct 19 15:54:06 CDT 2020
Module: wine
Branch: master
Commit: 87c4d217edd14969f556949f5709c5fb7e3137e5
URL: https://source.winehq.org/git/wine.git/?a=commit;h=87c4d217edd14969f556949f5709c5fb7e3137e5
Author: Huw Davies <huw at codeweavers.com>
Date: Mon Oct 19 12:21:18 2020 +0100
riched20: Pass a run ptr to the run drawing function.
Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/riched20/paint.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index 7ac7d83c9a9..5a0432a9eed 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -440,17 +440,16 @@ static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) {
SetTextColor(hDC, color);
}
-static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Paragraph *para)
+static void ME_DrawRun( ME_Context *c, int x, int y, ME_Run *run, ME_Paragraph *para )
{
- ME_Run *run = &rundi->member.run;
ME_DisplayItem *start;
int runofs = run->nCharOfs+para->nCharOfs;
int nSelFrom, nSelTo;
-
+
if (run->nFlags & MERF_HIDDEN)
return;
- start = ME_FindItemBack(rundi, diStartRow);
+ start = ME_FindItemBack( run_get_di( run ), diStartRow );
ME_GetSelectionOfs(c->editor, &nSelFrom, &nSelTo);
/* Draw selected end-of-paragraph mark */
@@ -1003,8 +1002,8 @@ static void ME_DrawParagraph(ME_Context *c, ME_DisplayItem *paragraph)
FrameRect(c->hDC, &rc, GetSysColorBrush(COLOR_GRAYTEXT));
}
if (visible)
- ME_DrawRun(c, c->pt.x + run->pt.x,
- c->pt.y + para->pt.y + run->pt.y + baseline, p, para);
+ ME_DrawRun( c, c->pt.x + run->pt.x,
+ c->pt.y + para->pt.y + run->pt.y + baseline, run, para );
if (me_debug)
{
static const WCHAR wszRunDebug[] = {'[','%','d',':','%','x',']',' ','%','l','s',0};
More information about the wine-cvs
mailing list