Nikolay Sivov : riched20: Implement GetForeColor().

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


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

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

riched20: Implement GetForeColor().

---

 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 8fecc8c..9f8bc17 100644
--- a/dlls/riched20/richole.c
+++ b/dlls/riched20/richole.c
@@ -219,6 +219,7 @@ static inline BOOL is_equal_textfont_prop_value(enum textfont_prop_id propid, te
     switch (propid)
     {
     case FONT_BOLD:
+    case FONT_FORECOLOR:
     case FONT_ITALIC:
     case FONT_UNDERLINE:
         return left->l == right->l;
@@ -235,6 +236,7 @@ static inline void init_textfont_prop_value(enum textfont_prop_id propid, textfo
     switch (propid)
     {
     case FONT_BOLD:
+    case FONT_FORECOLOR:
     case FONT_ITALIC:
     case FONT_UNDERLINE:
         v->l = tomUndefined;
@@ -269,6 +271,9 @@ static HRESULT get_textfont_prop_for_pos(const IRichEditOleImpl *reole, int pos,
     case FONT_BOLD:
         value->l = fmt.dwEffects & CFE_BOLD ? tomTrue : tomFalse;
         break;
+    case FONT_FORECOLOR:
+        value->l = fmt.dwEffects & CFE_AUTOCOLOR ? GetSysColor(COLOR_WINDOWTEXT) : fmt.crTextColor;
+        break;
     case FONT_ITALIC:
         value->l = fmt.dwEffects & CFE_ITALIC ? tomTrue : tomFalse;
         break;
@@ -1868,8 +1873,8 @@ static HRESULT WINAPI TextFont_SetEmboss(ITextFont *iface, LONG value)
 static HRESULT WINAPI TextFont_GetForeColor(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_FORECOLOR, value);
 }
 
 static HRESULT WINAPI TextFont_SetForeColor(ITextFont *iface, LONG value)




More information about the wine-cvs mailing list