Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_borderLeftColor.
Alexandre Julliard
julliard at winehq.org
Tue Sep 15 17:47:32 CDT 2009
Module: wine
Branch: master
Commit: 144cf8d61355c54b8ac6a762f7d295419c4fa900
URL: http://source.winehq.org/git/wine.git/?a=commit;h=144cf8d61355c54b8ac6a762f7d295419c4fa900
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Mon Sep 14 20:41:22 2009 +1000
mshtml: Implement IHTMLCurrentStyle_get_borderLeftColor.
---
dlls/mshtml/htmlcurstyle.c | 4 ++--
dlls/mshtml/htmlstyle.c | 3 +++
dlls/mshtml/htmlstyle.h | 1 +
dlls/mshtml/tests/dom.c | 5 +++++
4 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c
index d622239..19eb36e 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -224,8 +224,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_backgroundRepeat(IHTMLCurrentStyle *i
static HRESULT WINAPI HTMLCurrentStyle_get_borderLeftColor(IHTMLCurrentStyle *iface, VARIANT *p)
{
HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ TRACE("(%p)->(%p)\n", This, p);
+ return get_nsstyle_attr_var(This->nsstyle, STYLEID_BORDER_LEFT_COLOR, p, 0);
}
static HRESULT WINAPI HTMLCurrentStyle_get_borderTopColor(IHTMLCurrentStyle *iface, VARIANT *p)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index c2cfa43..aadcd65 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -57,6 +57,8 @@ static const WCHAR attrBorderColor[] =
{'b','o','r','d','e','r','-','c','o','l','o','r',0};
static const WCHAR attrBorderLeft[] =
{'b','o','r','d','e','r','-','l','e','f','t',0};
+static const WCHAR attrBorderLeftColor[] =
+ {'b','o','r','d','e','r','-','l','e','f','t','-','c','o','l','o','r',0};
static const WCHAR attrBorderLeftStyle[] =
{'b','o','r','d','e','r','-','l','e','f','t','-','s','t','y','l','e',0};
static const WCHAR attrBorderLeftWidth[] =
@@ -145,6 +147,7 @@ static const struct{
{attrBorderBottomWidth, DISPID_IHTMLSTYLE_BORDERBOTTOMWIDTH},
{attrBorderColor, DISPID_IHTMLSTYLE_BORDERCOLOR},
{attrBorderLeft, DISPID_IHTMLSTYLE_BORDERLEFT},
+ {attrBorderLeftColor, DISPID_IHTMLSTYLE_BORDERLEFTCOLOR},
{attrBorderLeftStyle, DISPID_IHTMLSTYLE_BORDERLEFTSTYLE},
{attrBorderLeftWidth, DISPID_IHTMLSTYLE_BORDERLEFTWIDTH},
{attrBorderRightStyle, DISPID_IHTMLSTYLE_BORDERRIGHTSTYLE},
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index b691804..c3df238 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -46,6 +46,7 @@ typedef enum {
STYLEID_BORDER_BOTTOM_WIDTH,
STYLEID_BORDER_COLOR,
STYLEID_BORDER_LEFT,
+ STYLEID_BORDER_LEFT_COLOR,
STYLEID_BORDER_LEFT_STYLE,
STYLEID_BORDER_LEFT_WIDTH,
STYLEID_BORDER_RIGHT_STYLE,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index bdf859f..ea38b40 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2736,6 +2736,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
ok(hres == S_OK, "get_backgroundColor failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
VariantClear(&v);
+
+ hres = IHTMLCurrentStyle_get_borderLeftColor(current_style, &v);
+ ok(hres == S_OK, "get_borderLeftColor failed: %08x\n", hres);
+ ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
+ VariantClear(&v);
}
static void test_style2(IHTMLStyle2 *style2)
More information about the wine-cvs
mailing list