Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_bottom.

[Alexandre Julliard]

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

Author: Alistair Leslie-Hughes 
Date:   Wed Sep 16 15:56:16 2009 +1000

mshtml: Implement IHTMLCurrentStyle_get_bottom.

---

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 d6edc3a..89f8ab8 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -600,8 +600,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_right(IHTMLCurrentStyle *iface, VARIA
 static HRESULT WINAPI HTMLCurrentStyle_get_bottom(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_BOTTOM, p, 0);
 }

static HRESULT WINAPI HTMLCurrentStyle_get_imeMode(IHTMLCurrentStyle *iface, BSTR *p)
diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index 56a38d8..4d3d9b1 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -81,6 +81,8 @@ static const WCHAR attrBorderTopWidth[] =
     {'b','o','r','d','e','r','-','t','o','p','-','w','i','d','t','h',0};
 static const WCHAR attrBorderWidth[] =
     {'b','o','r','d','e','r','-','w','i','d','t','h',0};
+static const WCHAR attrBottom[] =
+    {'b','o','t','t','o','m',0};
 static const WCHAR attrColor[] =
     {'c','o','l','o','r',0};
 static const WCHAR attrCursor[] =
@@ -177,6 +179,7 @@ static const struct{
     {attrBorderTopStyle,       DISPID_IHTMLSTYLE_BORDERTOPSTYLE},
     {attrBorderTopWidth,       DISPID_IHTMLSTYLE_BORDERTOPWIDTH},
     {attrBorderWidth,          DISPID_IHTMLSTYLE_BORDERWIDTH},
+    {attrBottom,               DISPID_IHTMLSTYLE2_BOTTOM},
     {attrColor,                DISPID_IHTMLSTYLE_COLOR},
     {attrCursor,               DISPID_IHTMLSTYLE_CURSOR},
     {attrDisplay,              DISPID_IHTMLSTYLE_DISPLAY},
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index fccda1b..dbe2970 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -58,6 +58,7 @@ typedef enum {
     STYLEID_BORDER_TOP_STYLE,
     STYLEID_BORDER_TOP_WIDTH,
     STYLEID_BORDER_WIDTH,
+    STYLEID_BOTTOM,
     STYLEID_COLOR,
     STYLEID_CURSOR,
     STYLEID_DISPLAY,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index abefe20..b69705d 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2791,6 +2791,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
     ok(hres == S_OK, "get_Right failed: %08x\n", hres);
     ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
     VariantClear(&v);
+
+    hres = IHTMLCurrentStyle_get_bottom(current_style, &v);
+    ok(hres == S_OK, "get_bottom 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)