Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_paddingBottom.
Alexandre Julliard
julliard at winehq.org
Tue Sep 15 17:47:49 CDT 2009
Module: wine
Branch: master
Commit: 7f3cb81686813f8b7c190fe06db682cf06d0aae2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f3cb81686813f8b7c190fe06db682cf06d0aae2
Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Mon Sep 14 21:15:31 2009 +1000
mshtml: Implement IHTMLCurrentStyle_get_paddingBottom.
---
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 6d28495..cc17ec9 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -357,8 +357,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_paddingRight(IHTMLCurrentStyle *iface
static HRESULT WINAPI HTMLCurrentStyle_get_paddingBottom(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_PADDING_BOTTOM, p, 0);
}
static HRESULT WINAPI HTMLCurrentStyle_get_textAlign(IHTMLCurrentStyle *iface, BSTR *p)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 8da9c21..698dff1 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -115,6 +115,8 @@ static const WCHAR attrMinHeight[] =
{'m','i','n','-','h','e','i','g','h','t',0};
static const WCHAR attrOverflow[] =
{'o','v','e','r','f','l','o','w',0};
+static const WCHAR attrPaddingBottom[] =
+ {'p','a','d','d','i','n','g','-','b','o','t','t','o','m',0};
static const WCHAR attrPaddingLeft[] =
{'p','a','d','d','i','n','g','-','l','e','f','t',0};
static const WCHAR attrPaddingRight[] =
@@ -186,6 +188,7 @@ static const struct{
{attrMarginRight, DISPID_IHTMLSTYLE_MARGINRIGHT},
{attrMinHeight, DISPID_IHTMLSTYLE4_MINHEIGHT},
{attrOverflow, DISPID_IHTMLSTYLE_OVERFLOW},
+ {attrPaddingBottom, DISPID_IHTMLSTYLE_PADDINGBOTTOM},
{attrPaddingLeft, DISPID_IHTMLSTYLE_PADDINGLEFT},
{attrPaddingRight, DISPID_IHTMLSTYLE_PADDINGRIGHT},
{attrPaddingTop, DISPID_IHTMLSTYLE_PADDINGTOP},
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index 3a77667..03ee72a 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -75,6 +75,7 @@ typedef enum {
STYLEID_MARGIN_RIGHT,
STYLEID_MIN_HEIGHT,
STYLEID_OVERFLOW,
+ STYLEID_PADDING_BOTTOM,
STYLEID_PADDING_LEFT,
STYLEID_PADDING_RIGHT,
STYLEID_PADDING_TOP,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 2d646e8..37790f5 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2766,6 +2766,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
ok(hres == S_OK, "get_paddingRight failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
VariantClear(&v);
+
+ hres = IHTMLCurrentStyle_get_paddingBottom(current_style, &v);
+ ok(hres == S_OK, "get_paddingRight 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