riched20: Don't use logfont-style underlining for links.

Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

riched20: Don't use logfont-style underlining for links.
ff8fba38 · Huw Davies · Alexandre Julliard · b834a984 · ff8fba38
Commit ff8fba38 authored Feb 19, 2018 by Huw Davies Committed by Alexandre Julliard Feb 19, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

style.c dlls/riched20/style.c +2 -1

No files found.
--- a/dlls/riched20/style.c
+++ b/dlls/riched20/style.c
@@ -306,7 +306,8 @@ ME_LogFontFromStyle(ME_Context* c, LOGFONTW *lf, const ME_Style *s)
    lf->lfWeight = s->fmt.wWeight;
  if (s->fmt.dwEffects & s->fmt.dwMask & CFM_ITALIC)
    lf->lfItalic = 1;
-  if ((s->fmt.dwEffects & s->fmt.dwMask & (CFM_UNDERLINE | CFE_LINK)) &&
+  if ((s->fmt.dwEffects & s->fmt.dwMask & CFM_UNDERLINE) &&
+      !(s->fmt.dwEffects & CFE_LINK) &&
      s->fmt.bUnderlineType == CFU_CF1UNDERLINE)
    lf->lfUnderline = 1;
  if (s->fmt.dwEffects & s->fmt.dwMask & CFM_STRIKEOUT)