Eric Pouech : richedit: In RTF reader, set both bold and weight attributes, so that we don't care about priority between the two.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 6e02f5db4bcde283b488dcee86d570e360804596
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6e02f5db4bcde283b488dcee86...

Author: Eric Pouech <eric.pouech(a)orange.fr>
Date:   Sun Mar 16 21:47:32 2008 +0100

richedit: In RTF reader, set both bold and weight attributes, so that we don't care about priority between the two.

---

 dlls/riched20/editor.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c
index dac289a..0ad55ea 100644
--- a/dlls/riched20/editor.c
+++ b/dlls/riched20/editor.c
@@ -340,8 +340,9 @@ static void ME_RTFCharAttrHook(RTF_Info *info)
       fmt.bUnderlineType = CFU_UNDERLINENONE;
       break;
     case rtfBold:
-      fmt.dwMask = CFM_BOLD;
-      fmt.dwEffects = info->rtfParam ? fmt.dwMask : 0;
+      fmt.dwMask = CFM_BOLD | CFM_WEIGHT;
+      fmt.dwEffects = info->rtfParam ? CFE_BOLD : 0;
+      fmt.wWeight = info->rtfParam ? FW_BOLD : FW_NORMAL;
       break;
     case rtfItalic:
       fmt.dwMask = CFM_ITALIC;