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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ff8fba389dc2e69cac1dd6d18b73065eb1477e10
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ff8fba389dc2e69cac1dd6d18b73065eb1477e10

Author: Huw Davies <huw at codeweavers.com>
Date:   Mon Feb 19 09:36:00 2018 +0000

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

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

---

 dlls/riched20/style.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dlls/riched20/style.c b/dlls/riched20/style.c
index 48d57e8..0b85d69 100644
--- 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)