Alistair Leslie-Hughes : mshtml: Implement IHTMLCurrentStyle_get_height.

[Alexandre Julliard]

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

Author: Alistair Leslie-Hughes 
Date:   Sun Feb 22 12:49:14 2009 +1100

mshtml: Implement IHTMLCurrentStyle_get_height.

---

dlls/mshtml/htmlcurstyle.c |    4 ++--
 dlls/mshtml/tests/dom.c    |    5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c
index 83fc68e..82dc512 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -328,8 +328,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_width(IHTMLCurrentStyle *iface, VARIA
 static HRESULT WINAPI HTMLCurrentStyle_get_height(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_HEIGHT, p, 0);
 }

static HRESULT WINAPI HTMLCurrentStyle_get_paddingLeft(IHTMLCurrentStyle *iface, VARIANT *p)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 20aea5e..242a001 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2465,6 +2465,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
     ok(hres == S_OK, "get_width failed: %08x\n", hres);
     ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
     VariantClear(&v);
+
+    hres = IHTMLCurrentStyle_get_height(current_style, &v);
+    ok(hres == S_OK, "get_height 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)