Commit 08c15246 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

riched20: Return the underline pen as the return value.

parent ff8fba38
...@@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight ) ...@@ -216,9 +216,8 @@ static COLORREF get_back_color( ME_Context *c, ME_Style *style, BOOL highlight )
return color; 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. */ /* Choose the pen type for underlining the text. */
if (style->fmt.dwEffects & CFE_UNDERLINE) if (style->fmt.dwEffects & CFE_UNDERLINE)
{ {
...@@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) ...@@ -227,11 +226,9 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen )
case CFU_UNDERLINE: case CFU_UNDERLINE:
case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */ case CFU_UNDERLINEWORD: /* native seems to map it to simple underline (MSDN) */
case CFU_UNDERLINEDOUBLE: /* 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 ); return CreatePen( PS_SOLID, 1, color );
break;
case CFU_UNDERLINEDOTTED: case CFU_UNDERLINEDOTTED:
*pen = CreatePen( PS_DOT, 1, color ); return CreatePen( PS_DOT, 1, color );
break;
default: default:
FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType ); FIXME( "Unknown underline type (%u)\n", style->fmt.bUnderlineType );
/* fall through */ /* fall through */
...@@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen ) ...@@ -240,14 +237,14 @@ static void get_underline_pen( ME_Style *style, COLORREF color, HPEN *pen )
break; break;
} }
} }
return; return NULL;
} }
static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color ) static void draw_underline( ME_Context *c, ME_Run *run, int x, int y, COLORREF color )
{ {
HPEN pen; HPEN pen;
get_underline_pen( run->style, color, &pen ); pen = get_underline_pen( run->style, color );
if (pen) if (pen)
{ {
HPEN old_pen = SelectObject( c->hDC, pen ); HPEN old_pen = SelectObject( c->hDC, pen );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment