Nikolay Sivov : riched20: Implement GetUnderline().

Alexandre Julliard julliard at wine.codeweavers.com
Wed May 20 10:04:12 CDT 2015


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed May 20 10:30:06 2015 +0300

riched20: Implement GetUnderline().

---

 dlls/riched20/richole.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c
index 95a92fe..8fecc8c 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -220,6 +220,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te
     {
     case FONT_BOLD:
     case FONT_ITALIC:
+    case FONT_UNDERLINE:
         return left->l == right->l;
     case FONT_SIZE:
        return left->f == right->f;
@@ -235,6 +236,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo
     {
     case FONT_BOLD:
     case FONT_ITALIC:
+    case FONT_UNDERLINE:
         v->l = tomUndefined;
         return;
     case FONT_SIZE:
@@ -273,6 +275,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos,
     case FONT_SIZE:
         value->f = fmt.yHeight;
         break;
+    case FONT_UNDERLINE:
+        value->l = fmt.dwEffects & CFE_UNDERLINE ? tomTrue : tomFalse;
+        break;
     default:
         FIXME("unhandled font property %d\n", propid);
         return E_FAIL;
@@ -2101,8 +2106,8 @@ static HRESULT WINAPI TextFont_SetSuperscript(ITextFont *iface, LONG value)
 static HRESULT WINAPI TextFont_GetUnderline(ITextFont *iface, LONG *value)
 {
     ITextFontImpl *This = impl_from_ITextFont(iface);
-    FIXME("(%p)->(%p): stub\n", This, value);
-    return E_NOTIMPL;
+    TRACE("(%p)->(%p)\n", This, value);
+    return get_textfont_propl(This->range, FONT_UNDERLINE, value);
 }
 
 static HRESULT WINAPI TextFont_SetUnderline(ITextFont *iface, LONG value)




More information about the wine-cvs mailing list