February 2013 - Wine-commits

Dmitry Timoshkov : gdi32: ExcludeClipRect should update actual clipping region for a EMF DC.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 88b9ae1ec2d1930b8453f6d7f74f654228bdf353 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b9ae1ec2d1930b8453f6d7f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 14 13:38:31 2013 +0800 gdi32: ExcludeClipRect should update actual clipping region for a EMF DC. --- dlls/gdi32/enhmfdrv/dc.c | 6 +++++- dlls/gdi32/tests/metafile.c | 4 +--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/dc.c b/dlls/gdi32/enhmfdrv/dc.c index 8a06ad4..3af7ef4 100644 --- a/dlls/gdi32/enhmfdrv/dc.c +++ b/dlls/gdi32/enhmfdrv/dc.c @@ -157,14 +157,18 @@ INT EMFDRV_SetArcDirection(PHYSDEV dev, INT arcDirection) INT EMFDRV_ExcludeClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) { + PHYSDEV next = GET_NEXT_PHYSDEV( dev, pExcludeClipRect ); EMREXCLUDECLIPRECT emr; + BOOL ret; + emr.emr.iType = EMR_EXCLUDECLIPRECT; emr.emr.nSize = sizeof(emr); emr.rclClip.left = left; emr.rclClip.top = top; emr.rclClip.right = right; emr.rclClip.bottom = bottom; - return EMFDRV_WriteRecord( dev, &emr.emr ); + ret = EMFDRV_WriteRecord( dev, &emr.emr ); + return ret ? next->funcs->pExcludeClipRect( next, left, top, right, bottom ) : ERROR; } INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom) diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 86fa373..53ec7ac 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -2530,7 +2530,6 @@ static void test_emf_clipping(void) SetRect(&rc_sclip, 0, 0, 100, 50); ret = ExcludeClipRect(hdc, 0, 50, 100, 100); -todo_wine ok(ret == SIMPLEREGION || broken(ret == COMPLEXREGION) /* XP */, "got %d\n", ret); if (ret == COMPLEXREGION) { @@ -2543,10 +2542,9 @@ todo_wine SetRect(&rc_res, -1, -1, -1, -1); ret = GetClipBox(hdc, &rc_res); ok(ret == SIMPLEREGION, "got %d\n", ret); -todo_wine ok(EqualRect(&rc_res, &rc_sclip), "expected (%d,%d)-(%d,%d), got (%d,%d)-(%d,%d)\n", - rc.left, rc.top, rc.right, rc.bottom, + rc_sclip.left, rc_sclip.top, rc_sclip.right, rc_sclip.bottom, rc_res.left, rc_res.top, rc_res.right, rc_res.bottom); hemf = CloseEnhMetaFile(hdc);

1 0

Nozomi Kodama : d3dx9: Use const instead of CONST.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 5038a7d915be75b7d0788e2c1125b922772d5363 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5038a7d915be75b7d0788e2c1… Author: Nozomi Kodama <nozomi.kodama(a)yahoo.com> Date: Wed Feb 13 06:57:14 2013 -1000 d3dx9: Use const instead of CONST. --- dlls/d3dx9_36/math.c | 170 +++++++++++----------- dlls/d3dx9_36/tests/math.c | 8 +- include/d3dx9math.h | 331 +++++++++++++++++++++++--------------------- 3 files changed, 259 insertions(+), 250 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5038a7d915be75b7d0788…

1 0

Austin English : wininet: Add a stub for LoadUrlCacheContent.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 3b7c3f61bd4607131623ed17f248765f3e67e4d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b7c3f61bd4607131623ed17f… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Feb 13 12:27:34 2013 -0800 wininet: Add a stub for LoadUrlCacheContent. --- dlls/wininet/urlcache.c | 9 +++++++++ dlls/wininet/wininet.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index afccda8..578473d 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -4491,3 +4491,12 @@ void free_urlcache(void) URLCacheContainers_DeleteAll(); } + +/*********************************************************************** + * LoadUrlCacheContent (WININET.@) + */ +BOOL WINAPI LoadUrlCacheContent(void) +{ + FIXME("stub!\n"); + return FALSE; +} diff --git a/dlls/wininet/wininet.spec b/dlls/wininet/wininet.spec index 5e21a40..3c4bf5a 100644 --- a/dlls/wininet/wininet.spec +++ b/dlls/wininet/wininet.spec @@ -215,7 +215,7 @@ @ stdcall IsHostInProxyBypassList(long str long) @ stdcall IsUrlCacheEntryExpiredA(str long ptr) @ stdcall IsUrlCacheEntryExpiredW(wstr long ptr) -@ stub LoadUrlCacheContent +@ stdcall LoadUrlCacheContent() @ stub ParseX509EncodedCertificateForListBoxEntry @ stdcall PrivacyGetZonePreferenceW(long long ptr ptr ptr) @ stdcall PrivacySetZonePreferenceW(long long long wstr)

1 0

Huw Davies : riched20: The run width is always passed so we don' t need to calculate it again.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 941775e3116bce57be5f1f7f48270a472dd82128 URL: http://source.winehq.org/git/wine.git/?a=commit;h=941775e3116bce57be5f1f7f4… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:13 2013 +0000 riched20: The run width is always passed so we don't need to calculate it again. --- dlls/riched20/paint.c | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 57b1893..1f8c7c4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -223,7 +223,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, HGDIOBJ hOldFont; COLORREF rgbOld; int yOffset = 0, yTwipsOffset = 0; - SIZE sz; COLORREF rgb; HPEN hPen = NULL, hOldPen = NULL; BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 @@ -255,13 +254,9 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, else rgb = s->fmt.crTextColor; - /* Determine the area that is selected in the run. */ - GetTextExtentPoint32W(hDC, szText, nChars, &sz); - /* Treat width as an optional parameter. We can get the width from the - * text extent of the string if it isn't specified. */ - if (!width) width = sz.cx; if (bHighlightedText) { + SIZE sz; if (nSelFrom <= 0) { nSelFrom = 0;

1 0

Huw Davies : riched20: Pass the run to the text drawing routine.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 82c8e567fb45eec60afe994a62776f41bdeb6d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=82c8e567fb45eec60afe994a6… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:14 2013 +0000 riched20: Pass the run to the text drawing routine. --- dlls/riched20/paint.c | 53 ++++++++++++++++++++++++------------------------- 1 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 1f8c7c4..d29d185 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -215,9 +215,8 @@ static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, } } -static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, - int nChars, ME_Style *s, int width, - int nSelFrom, int nSelTo, int ymin, int cy) +static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, + int nChars, int nSelFrom, int nSelTo, int ymin, int cy) { HDC hDC = c->hDC; HGDIOBJ hOldFont; @@ -233,26 +232,26 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, * by the font extends to the end of the tab. Tabs are always stored as * a single character run, so we can handle this case separately, since * otherwise lpDx would need to specify the lengths of each character. */ - if (width && nChars == 1) - lpDx = &width; /* Make sure underline for tab extends across tab space */ + if (run->nWidth && nChars == 1) + lpDx = &run->nWidth; /* Make sure underline for tab extends across tab space */ - hOldFont = ME_SelectStyleFont(c, s); - if ((s->fmt.dwMask & s->fmt.dwEffects) & CFM_OFFSET) { - yTwipsOffset = s->fmt.yOffset; + hOldFont = ME_SelectStyleFont(c, run->style); + if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & CFM_OFFSET) { + yTwipsOffset = run->style->fmt.yOffset; } - if ((s->fmt.dwMask & s->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { - if (s->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = s->fmt.yHeight/3; - if (s->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -s->fmt.yHeight/12; + if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { + if (run->style->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = run->style->fmt.yHeight/3; + if (run->style->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -run->style->fmt.yHeight/12; } if (yTwipsOffset) yOffset = ME_twips2pointsY(c, yTwipsOffset); - if ((s->fmt.dwMask & CFM_LINK) && (s->fmt.dwEffects & CFE_LINK)) + if ((run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK)) rgb = RGB(0,0,255); - else if ((s->fmt.dwMask & CFM_COLOR) && (s->fmt.dwEffects & CFE_AUTOCOLOR)) + else if ((run->style->fmt.dwMask & CFM_COLOR) && (run->style->fmt.dwEffects & CFE_AUTOCOLOR)) rgb = ITextHost_TxGetSysColor(c->editor->texthost, COLOR_WINDOWTEXT); else - rgb = s->fmt.crTextColor; + rgb = run->style->fmt.crTextColor; if (bHighlightedText) { @@ -269,7 +268,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (nSelTo >= nChars) { nSelTo = nChars; - xSelEnd = x + width; + xSelEnd = x + run->nWidth; } else { @@ -279,9 +278,9 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, } /* Choose the pen type for underlining the text. */ - if (s->fmt.dwMask & CFM_UNDERLINETYPE) + if (run->style->fmt.dwMask & CFM_UNDERLINETYPE) { - switch (s->fmt.bUnderlineType) + switch (run->style->fmt.bUnderlineType) { case CFU_UNDERLINE: case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ @@ -292,7 +291,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, hPen = CreatePen(PS_DOT, 1, rgb); break; default: - FIXME("Unknown underline type (%u)\n", s->fmt.bUnderlineType); + FIXME("Unknown underline type (%u)\n", run->style->fmt.bUnderlineType); /* fall through */ case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ case CFU_UNDERLINENONE: @@ -332,13 +331,13 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (hPen) LineTo(hDC, xSelEnd, y - yOffset + 1); SetBkColor(hDC, rgbBackOld); - if (xSelEnd < x + width) + if (xSelEnd < x + run->nWidth) { SetTextColor(hDC, rgb); ExtTextOutW(hDC, xSelEnd, y-yOffset, 0, NULL, szText+nSelTo, nChars-nSelTo, NULL); if (hPen) - LineTo(hDC, x + width, y - yOffset + 1); + LineTo(hDC, x + run->nWidth, y - yOffset + 1); } } else @@ -349,7 +348,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, if (hPen) { MoveToEx(hDC, x, y - yOffset + 1, NULL); - LineTo(hDC, x + width, y - yOffset + 1); + LineTo(hDC, x + run->nWidth, y - yOffset + 1); } if (bHighlightedText) /* v1.0 inverts the selection */ @@ -364,7 +363,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, int x, int y, LPCWSTR szText, DeleteObject(hPen); } SetTextColor(hDC, rgbOld); - ME_UnselectStyleFont(c, s, hOldFont); + ME_UnselectStyleFont(c, run->style, hOldFont); } static void ME_DebugWrite(HDC hDC, const POINT *pt, LPCWSTR szText) { @@ -407,7 +406,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa { /* wszSpace is used instead of the tab character because otherwise * an unwanted symbol can be inserted instead. */ - ME_DrawTextWithStyle(c, x, y, wszSpace, 1, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, wszSpace, 1, nSelFrom-runofs, nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); @@ -421,16 +420,16 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa if (c->editor->cPasswordMask) { ME_String *szMasked = ME_MakeStringR(c->editor->cPasswordMask, run->len); - ME_DrawTextWithStyle(c, x, y, - szMasked->szData, szMasked->nLen, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, + szMasked->szData, szMasked->nLen, nSelFrom-runofs,nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight); ME_DestroyString(szMasked); } else - ME_DrawTextWithStyle(c, x, y, - get_text( run, 0 ), run->len, run->style, run->nWidth, + ME_DrawTextWithStyle(c, run, x, y, + get_text( run, 0 ), run->len, nSelFrom-runofs,nSelTo-runofs, c->pt.y + para->pt.y + start->member.row.pt.y, start->member.row.nHeight);

1 0

Huw Davies : riched20: Move underline pen creation to a helper function.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: c2c5121d193bcd8122f67d1c9961d4208b611cd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2c5121d193bcd8122f67d1c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:15 2013 +0000 riched20: Move underline pen creation to a helper function. --- dlls/riched20/paint.c | 55 +++++++++++++++++++++++++----------------------- 1 files changed, 29 insertions(+), 26 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d29d185..d7792d4 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -166,6 +166,33 @@ int ME_twips2pointsY(const ME_Context *c, int y) return y * c->dpi.cy * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; } +static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) +{ + *pen = NULL; + /* Choose the pen type for underlining the text. */ + if (style->fmt.dwMask & CFM_UNDERLINETYPE) + { + switch (style->fmt.bUnderlineType) + { + case CFU_UNDERLINE: + case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ + case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ + *pen = CreatePen( PS_SOLID, 1, color ); + break; + case CFU_UNDERLINEDOTTED: + *pen = CreatePen( PS_DOT, 1, color ); + break; + default: + FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType ); + /* fall through */ + case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ + case CFU_UNDERLINENONE: + break; + } + } + return; +} + static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, int nChars, ME_Style *s, int width, int nSelFrom, int nSelTo, int ymin, int cy) @@ -277,32 +304,8 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS } } - /* Choose the pen type for underlining the text. */ - if (run->style->fmt.dwMask & CFM_UNDERLINETYPE) - { - switch (run->style->fmt.bUnderlineType) - { - case CFU_UNDERLINE: - case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ - case CFU_UNDERLINEDOUBLE: /* native seems to map it to simple underline (MSDN) */ - hPen = CreatePen(PS_SOLID, 1, rgb); - break; - case CFU_UNDERLINEDOTTED: - hPen = CreatePen(PS_DOT, 1, rgb); - break; - default: - FIXME("Unknown underline type (%u)\n", run->style->fmt.bUnderlineType); - /* fall through */ - case CFU_CF1UNDERLINE: /* this type is supported in the font, do nothing */ - case CFU_UNDERLINENONE: - hPen = NULL; - break; - } - if (hPen) - { - hOldPen = SelectObject(hDC, hPen); - } - } + get_underline_pen( run->style, rgb, &hPen ); + if (hPen) hOldPen = SelectObject( hDC, hPen ); rgbOld = SetTextColor(hDC, rgb); if (bHighlightedText && !c->editor->bEmulateVersion10)

1 0

Huw Davies : riched20: Move y offset calculation to a helper function.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 681a9e1de65b8dd6736fabdaa90bed8af72d046d URL: http://source.winehq.org/git/wine.git/?a=commit;h=681a9e1de65b8dd6736fabdaa… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:16 2013 +0000 riched20: Move y offset calculation to a helper function. --- dlls/riched20/paint.c | 31 +++++++++++++++++++++---------- 1 files changed, 21 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index d7792d4..cd5a427 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -166,6 +166,25 @@ int ME_twips2pointsY(const ME_Context *c, int y) return y * c->dpi.cy * c->editor->nZoomNumerator / 1440 / c->editor->nZoomDenominator; } + +static int calc_y_offset( const ME_Context *c, ME_Style *style ) +{ + int offs = 0, twips = 0; + + if ((style->fmt.dwMask & style->fmt.dwEffects) & CFM_OFFSET) + twips = style->fmt.yOffset; + + if ((style->fmt.dwMask & style->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) + { + if (style->fmt.dwEffects & CFE_SUPERSCRIPT) twips = style->fmt.yHeight/3; + if (style->fmt.dwEffects & CFE_SUBSCRIPT) twips = -style->fmt.yHeight/12; + } + + if (twips) offs = ME_twips2pointsY( c, twips ); + + return offs; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -248,7 +267,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS HDC hDC = c->hDC; HGDIOBJ hOldFont; COLORREF rgbOld; - int yOffset = 0, yTwipsOffset = 0; + int yOffset = 0; COLORREF rgb; HPEN hPen = NULL, hOldPen = NULL; BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 @@ -263,15 +282,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS lpDx = &run->nWidth; /* Make sure underline for tab extends across tab space */ hOldFont = ME_SelectStyleFont(c, run->style); - if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & CFM_OFFSET) { - yTwipsOffset = run->style->fmt.yOffset; - } - if ((run->style->fmt.dwMask & run->style->fmt.dwEffects) & (CFM_SUPERSCRIPT | CFM_SUBSCRIPT)) { - if (run->style->fmt.dwEffects & CFE_SUPERSCRIPT) yTwipsOffset = run->style->fmt.yHeight/3; - if (run->style->fmt.dwEffects & CFE_SUBSCRIPT) yTwipsOffset = -run->style->fmt.yHeight/12; - } - if (yTwipsOffset) - yOffset = ME_twips2pointsY(c, yTwipsOffset); + yOffset = calc_y_offset( c, run->style ); if ((run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK)) rgb = RGB(0,0,255);

1 0

Huw Davies : riched20: Move text color determination to a helper function.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 4178de89ef584d4ddc13605400dea05ac1159219 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4178de89ef584d4ddc1360540… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:17 2013 +0000 riched20: Move text color determination to a helper function. --- dlls/riched20/paint.c | 26 ++++++++++++++++++-------- 1 files changed, 18 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index cd5a427..65c6e9e 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -185,6 +185,22 @@ static int calc_y_offset( const ME_Context *c, ME_Style *style ) return offs; } +static COLORREF get_text_color( ME_Context *c, ME_Style *style, BOOL highlight ) +{ + COLORREF color; + + if (highlight) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHTTEXT ); + else if ((style->fmt.dwMask & CFM_LINK) && (style->fmt.dwEffects & CFE_LINK)) + color = RGB(0,0,255); + else if ((style->fmt.dwMask & CFM_COLOR) && (style->fmt.dwEffects & CFE_AUTOCOLOR)) + color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_WINDOWTEXT ); + else + color = style->fmt.crTextColor; + + return color; +} + static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) { *pen = NULL; @@ -284,12 +300,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS hOldFont = ME_SelectStyleFont(c, run->style); yOffset = calc_y_offset( c, run->style ); - if ((run->style->fmt.dwMask & CFM_LINK) && (run->style->fmt.dwEffects & CFE_LINK)) - rgb = RGB(0,0,255); - else if ((run->style->fmt.dwMask & CFM_COLOR) && (run->style->fmt.dwEffects & CFE_AUTOCOLOR)) - rgb = ITextHost_TxGetSysColor(c->editor->texthost, COLOR_WINDOWTEXT); - else - rgb = run->style->fmt.crTextColor; + rgb = get_text_color( c, run->style, FALSE ); if (bHighlightedText) { @@ -336,8 +347,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS dim.bottom = ymin + cy; dim.left = xSelStart; dim.right = xSelEnd; - SetTextColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, - COLOR_HIGHLIGHTTEXT)); + SetTextColor( hDC, get_text_color( c, run->style, TRUE ) ); rgbBackOld = SetBkColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, COLOR_HIGHLIGHT)); ExtTextOutW(hDC, xSelStart, y-yOffset, ETO_OPAQUE, &dim,

1 0

Huw Davies : riched20: Move the white space painting operations to a common function.
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 4cbe94f42ad6b4fd14133cbdc7a4eeb24c7b2f51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cbe94f42ad6b4fd14133cbdc… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:18 2013 +0000 riched20: Move the white space painting operations to a common function. --- dlls/riched20/paint.c | 127 ++++++++++++++++++++++++++++--------------------- 1 files changed, 72 insertions(+), 55 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 65c6e9e..b822f6c 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -228,55 +228,74 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) return; } -static void ME_HighlightSpace(ME_Context *c, int x, int y, LPCWSTR szText, - int nChars, ME_Style *s, int width, - int nSelFrom, int nSelTo, int ymin, int cy) +/********************************************************************* + * draw_space + * + * Draw the end-of-paragraph or tab space. + * + * If actually_draw is TRUE then ensure any underline is drawn. + */ +static void draw_space( ME_Context *c, ME_Run *run, int x, int y, + BOOL selected, BOOL actually_draw, int ymin, int cy ) { - HDC hDC = c->hDC; - HGDIOBJ hOldFont = NULL; - SIZE sz; - int selWidth; - /* Only highlight if there is a selection in the run and when - * EM_HIDESELECTION is not being used to hide the selection. */ - if (nSelFrom >= nChars || nSelTo < 0 || nSelFrom >= nSelTo - || c->editor->bHideSelection) - return; - hOldFont = ME_SelectStyleFont(c, s); - if (width <= 0) - { - GetTextExtentPoint32W(hDC, szText, nChars, &sz); - width = sz.cx; - } - if (nSelFrom < 0) nSelFrom = 0; - if (nSelTo > nChars) nSelTo = nChars; - GetTextExtentPoint32W(hDC, szText, nSelFrom, &sz); - x += sz.cx; - if (nSelTo != nChars) - { - GetTextExtentPoint32W(hDC, szText+nSelFrom, nSelTo-nSelFrom, &sz); - selWidth = sz.cx; - } else { - selWidth = width - sz.cx; - } - ME_UnselectStyleFont(c, s, hOldFont); - - if (c->editor->bEmulateVersion10) - PatBlt(hDC, x, ymin, selWidth, cy, DSTINVERT); - else - { + HDC hdc = c->hDC; + BOOL old_style_selected = FALSE; RECT rect; - HBRUSH hBrush; - rect.left = x; - rect.top = ymin; - rect.right = x + selWidth; - rect.bottom = ymin + cy; - hBrush = CreateSolidBrush(ITextHost_TxGetSysColor(c->editor->texthost, - COLOR_HIGHLIGHT)); - FillRect(hDC, &rect, hBrush); - DeleteObject(hBrush); - } + COLORREF back_color = 0; + + SetRect( &rect, x, ymin, x + run->nWidth, ymin + cy ); + + if (c->editor->bHideSelection) selected = FALSE; + if (c->editor->bEmulateVersion10) + { + old_style_selected = selected; + selected = FALSE; + } + + if (selected) + back_color = ITextHost_TxGetSysColor( c->editor->texthost, COLOR_HIGHLIGHT ); + + if (actually_draw) + { + COLORREF text_color = get_text_color( c, run->style, selected ); + COLORREF old_text, old_back; + HFONT old_font = NULL; + HPEN pen = NULL; + int y_offset = calc_y_offset( c, run->style ); + static const WCHAR space[1] = {' '}; + + old_font = ME_SelectStyleFont( c, run->style ); + old_text = SetTextColor( hdc, text_color ); + if (selected) old_back = SetBkColor( hdc, back_color ); + + ExtTextOutW( hdc, x, y - y_offset, selected ? ETO_OPAQUE : 0, &rect, space, 1, &run->nWidth ); + + if (selected) SetBkColor( hdc, old_back ); + SetTextColor( hdc, old_text ); + ME_UnselectStyleFont( c, run->style, old_font ); + + get_underline_pen( run->style, text_color, &pen ); + if (pen) + { + HPEN old_pen = SelectObject( hdc, pen ); + MoveToEx( hdc, x, y - y_offset + 1, NULL ); + LineTo( hdc, x + run->nWidth, y - y_offset + 1 ); + SelectObject( hdc, old_pen ); + DeleteObject( pen ); + } + } + else if (selected) + { + HBRUSH brush = CreateSolidBrush( back_color ); + FillRect( hdc, &rect, brush ); + DeleteObject( brush ); + } + + if (old_style_selected) + PatBlt( hdc, x, ymin, run->nWidth, cy, DSTINVERT ); } + static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWSTR szText, int nChars, int nSelFrom, int nSelTo, int ymin, int cy) { @@ -406,7 +425,6 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa ME_DisplayItem *start; int runofs = run->nCharOfs+para->nCharOfs; int nSelFrom, nSelTo; - const WCHAR wszSpace[] = {' ', 0}; if (run->nFlags & MERF_HIDDEN) return; @@ -419,21 +437,20 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa { if (runofs >= nSelFrom && runofs < nSelTo) { - ME_HighlightSpace(c, x, y, wszSpace, 1, run->style, 0, 0, 1, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + draw_space( c, run, x, y, TRUE, FALSE, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight ); } return; } if (run->nFlags & (MERF_TAB | MERF_ENDCELL)) { - /* wszSpace is used instead of the tab character because otherwise - * an unwanted symbol can be inserted instead. */ - ME_DrawTextWithStyle(c, run, x, y, wszSpace, 1, - nSelFrom-runofs, nSelTo-runofs, - c->pt.y + para->pt.y + start->member.row.pt.y, - start->member.row.nHeight); + BOOL selected = runofs >= nSelFrom && runofs < nSelTo; + + draw_space( c, run, x, y, selected, TRUE, + c->pt.y + para->pt.y + start->member.row.pt.y, + start->member.row.nHeight ); return; }

1 0

Huw Davies : riched20: Remove the special case tab handling now that we handle that in draw_space .
by Alexandre Julliard 14 Feb '13

14 Feb '13

Module: wine Branch: master Commit: 530c546a3feb6a99c8c0462f5ff00b01bc185dc1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=530c546a3feb6a99c8c0462f5… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Feb 14 14:16:19 2013 +0000 riched20: Remove the special case tab handling now that we handle that in draw_space. --- dlls/riched20/paint.c | 11 ++--------- 1 files changed, 2 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index b822f6c..8bc7385 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -308,13 +308,6 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS BOOL bHighlightedText = (nSelFrom < nChars && nSelTo >= 0 && nSelFrom < nSelTo && !c->editor->bHideSelection); int xSelStart = x, xSelEnd = x; - int *lpDx = NULL; - /* lpDx is only needed for tabs to make sure the underline done automatically - * by the font extends to the end of the tab. Tabs are always stored as - * a single character run, so we can handle this case separately, since - * otherwise lpDx would need to specify the lengths of each character. */ - if (run->nWidth && nChars == 1) - lpDx = &run->nWidth; /* Make sure underline for tab extends across tab space */ hOldFont = ME_SelectStyleFont(c, run->style); yOffset = calc_y_offset( c, run->style ); @@ -370,7 +363,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS rgbBackOld = SetBkColor(hDC, ITextHost_TxGetSysColor(c->editor->texthost, COLOR_HIGHLIGHT)); ExtTextOutW(hDC, xSelStart, y-yOffset, ETO_OPAQUE, &dim, - szText+nSelFrom, nSelTo-nSelFrom, lpDx); + szText+nSelFrom, nSelTo-nSelFrom, NULL); if (hPen) LineTo(hDC, xSelEnd, y - yOffset + 1); SetBkColor(hDC, rgbBackOld); @@ -385,7 +378,7 @@ static void ME_DrawTextWithStyle(ME_Context *c, ME_Run *run, int x, int y, LPCWS } else { - ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, lpDx); + ExtTextOutW(hDC, x, y-yOffset, 0, NULL, szText, nChars, NULL); /* FIXME: should use textmetrics info for Descent info */ if (hPen)

1 0