[PATCH 2/3] riched20: Return the underline pen as the return value.
Huw Davies
huw at codeweavers.com
Mon Feb 19 03:36:01 CST 2018
Signed-off-by: Huw Davies <huw at codeweavers.com>
---
dlls/riched20/paint.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c
index b4b6697165..d3b908a7f3 100644
--- a/dlls/riched20/paint.c
+++ b/dlls/riched20/paint.c
@@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight )
return color;
}
-static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen )
+static HPEN get_underline_pen( ME_Style *style, COLORREF color )
{
- *pen = NULL;
/* Choose the pen type for underlining the text. */
if (style->fmt.dwEffects & CFE_UNDERLINE)
{
@@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen )
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;
+ return CreatePen( PS_SOLID, 1, color );
case CFU_UNDERLINEDOTTED:
- *pen = CreatePen( PS_DOT, 1, color );
- break;
+ return CreatePen( PS_DOT, 1, color );
default:
FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType );
/* fall through */
@@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen )
break;
}
}
- return;
+ return NULL;
}
static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color )
{
HPEN pen;
- get_underline_pen( run->style, color, &pen );
+ pen = get_underline_pen( run->style, color );
if (pen)
{
HPEN old_pen = SelectObject( c->hDC, pen );
--
2.12.0
More information about the wine-devel
mailing list