diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c
index dd5cbb2df5b..8effb8727ae 100644
--- a/dlls/mshtml/htmlstyle.c
+++ b/dlls/mshtml/htmlstyle.c
@@ -57,6 +57,8 @@ static const WCHAR attrFontStyle[] =
{'f','o','n','t','-','s','t','y','l','e',0};
static const WCHAR attrFontWeight[] =
{'f','o','n','t','-','w','e','i','g','h','t',0};
+static const WCHAR attrHeight[] =
+ {'h','e','i','g','h','t',0};
static const WCHAR attrLeft[] =
{'l','e','f','t',0};
static const WCHAR attrMargin[] =
@@ -91,6 +93,7 @@ static const LPCWSTR style_strings[] = {
attrFontSize,
attrFontStyle,
attrFontWeight,
+ attrHeight,
attrLeft,
attrMargin,
attrMarginLeft,
@@ -1329,15 +1332,35 @@ static HRESULT WINAPI HTMLStyle_get_width(IHTMLStyle *iface, VARIANT *p)
static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
- FIXME("(%p)->(v%d)\n", This, V_VT(&v));
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
+
+ switch(V_VT(&v)) {
+ case VT_BSTR:
+ return set_style_attr(This, STYLEID_HEIGHT, V_BSTR(&v), 0);
+ default:
+ FIXME("unimplemented vt %d\n", V_VT(&v));
+ return E_NOTIMPL;
+ }
+
+ return S_OK;
}
static HRESULT WINAPI HTMLStyle_get_height(IHTMLStyle *iface, VARIANT *p)
{
HTMLStyle *This = HTMLSTYLE_THIS(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+ BSTR ret;
+ HRESULT hres;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ hres = get_style_attr(This, STYLEID_HEIGHT, &ret);
+ if(FAILED(hres))
+ return hres;
+
+ V_VT(p) = VT_BSTR;
+ V_BSTR(p) = ret;
+ return S_OK;
}
static HRESULT WINAPI HTMLStyle_put_styleFloat(IHTMLStyle *iface, BSTR v)
diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h
index 4a7e1214236..65ec99d2cf2 100644
--- a/dlls/mshtml/htmlstyle.h
+++ b/dlls/mshtml/htmlstyle.h
@@ -43,6 +43,7 @@ typedef enum {
STYLEID_FONT_SIZE,
STYLEID_FONT_STYLE,
STYLEID_FONT_WEIGHT,
+ STYLEID_HEIGHT,
STYLEID_LEFT,
STYLEID_MARGIN,
STYLEID_MARGIN_LEFT,
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index bb4e7efaccc..94a508e4a42 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -2138,6 +2138,26 @@ static void test_default_style(IHTMLStyle *style)
ok(!strcmp_wa(V_BSTR(&v), "3px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v)));
VariantClear(&v);
+ V_VT(&v) = VT_EMPTY;
+ hres = IHTMLStyle_get_height(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));
+ ok(!V_BSTR(&v), "V_BSTR(v) != NULL\n");
+ VariantClear(&v);
+
+ V_VT(&v) = VT_BSTR;
+ V_BSTR(&v) = a2bstr("64px");
+ hres = IHTMLStyle_put_height(style, v);
+ ok(hres == S_OK, "put_height failed: %08x\n", hres);
+ VariantClear(&v);
+
+ V_VT(&v) = VT_EMPTY;
+ hres = IHTMLStyle_get_height(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));
+ ok(!strcmp_wa(V_BSTR(&v), "64px"), "V_BSTR(v) = %s\n", dbgstr_w(V_BSTR(&v)));
+ VariantClear(&v);
+
str = (void*)0xdeadbeef;
hres = IHTMLStyle_get_cursor(style, &str);
ok(hres == S_OK, "get_cursor failed: %08x\n", hres);