Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_paddingRight.

[Alexandre Julliard]

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

Author: Alistair Leslie-Hughes 
Date:   Mon Sep 14 21:13:12 2009 +1000

mshtml: Implement IHTMLCurrentStyle_get_paddingRight.

---

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 74cb3e2..6d28495 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -350,8 +350,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_paddingTop(IHTMLCurrentStyle *iface,
 static HRESULT WINAPI HTMLCurrentStyle_get_paddingRight(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_RIGHT, p, 0);
 }

static HRESULT WINAPI HTMLCurrentStyle_get_paddingBottom(IHTMLCurrentStyle *iface, VARIANT *p)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 5d4647f..8da9c21 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -117,6 +117,8 @@ static const WCHAR attrOverflow[] =
     {'o','v','e','r','f','l','o','w',0};
 static const WCHAR attrPaddingLeft[] =
     {'p','a','d','d','i','n','g','-','l','e','f','t',0};
+static const WCHAR attrPaddingRight[] =
+    {'p','a','d','d','i','n','g','-','r','i','g','h','t',0};
 static const WCHAR attrPaddingTop[] =
     {'p','a','d','d','i','n','g','-','t','o','p',0};
 static const WCHAR attrPosition[] =
@@ -185,6 +187,7 @@ static const struct{
     {attrMinHeight,            DISPID_IHTMLSTYLE4_MINHEIGHT},
     {attrOverflow,             DISPID_IHTMLSTYLE_OVERFLOW},
     {attrPaddingLeft,          DISPID_IHTMLSTYLE_PADDINGLEFT},
+    {attrPaddingRight,         DISPID_IHTMLSTYLE_PADDINGRIGHT},
     {attrPaddingTop,           DISPID_IHTMLSTYLE_PADDINGTOP},
     {attrPosition,             DISPID_IHTMLSTYLE2_POSITION},
     {attrTextAlign,            DISPID_IHTMLSTYLE_TEXTALIGN},
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index 7fe5f5e..3a77667 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -76,6 +76,7 @@ typedef enum {
     STYLEID_MIN_HEIGHT,
     STYLEID_OVERFLOW,
     STYLEID_PADDING_LEFT,
+    STYLEID_PADDING_RIGHT,
     STYLEID_PADDING_TOP,
     STYLEID_POSITION,
     STYLEID_TEXT_ALIGN,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 04da7ec..2d646e8 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2761,6 +2761,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
     ok(hres == S_OK, "get_paddingTop failed: %08x\n", hres);
     ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
     VariantClear(&v);
+
+    hres = IHTMLCurrentStyle_get_paddingRight(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)