Commit d35c4422 authored by Alistair Leslie-Hughes's avatar Alistair Leslie-Hughes Committed by Alexandre Julliard

mshtml: Implement IHTMLCurrentStyle_get_lineHeight.

parent 6867de07
...@@ -410,8 +410,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_letterSpacing(IHTMLCurrentStyle *ifac ...@@ -410,8 +410,8 @@ static HRESULT WINAPI HTMLCurrentStyle_get_letterSpacing(IHTMLCurrentStyle *ifac
static HRESULT WINAPI HTMLCurrentStyle_get_lineHeight(IHTMLCurrentStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLCurrentStyle_get_lineHeight(IHTMLCurrentStyle *iface, VARIANT *p)
{ {
HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface); HTMLCurrentStyle *This = HTMLCURSTYLE_THIS(iface);
FIXME("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return get_nsstyle_attr_var(This->nsstyle, STYLEID_LINE_HEIGHT, p, 0);
} }
static HRESULT WINAPI HTMLCurrentStyle_get_textIndent(IHTMLCurrentStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLCurrentStyle_get_textIndent(IHTMLCurrentStyle *iface, VARIANT *p)
......
...@@ -107,6 +107,8 @@ static const WCHAR attrLeft[] = ...@@ -107,6 +107,8 @@ static const WCHAR attrLeft[] =
{'l','e','f','t',0}; {'l','e','f','t',0};
static const WCHAR attrLetterSpacing[] = static const WCHAR attrLetterSpacing[] =
{'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0}; {'l','e','t','t','e','r','-','s','p','a','c','i','n','g',0};
static const WCHAR attrLineHeight[] =
{'l','i','n','e','-','h','e','i','g','h','t',0};
static const WCHAR attrMargin[] = static const WCHAR attrMargin[] =
{'m','a','r','g','i','n',0}; {'m','a','r','g','i','n',0};
static const WCHAR attrMarginBottom[] = static const WCHAR attrMarginBottom[] =
...@@ -192,6 +194,7 @@ static const struct{ ...@@ -192,6 +194,7 @@ static const struct{
{attrHeight, DISPID_IHTMLSTYLE_HEIGHT}, {attrHeight, DISPID_IHTMLSTYLE_HEIGHT},
{attrLeft, DISPID_IHTMLSTYLE_LEFT}, {attrLeft, DISPID_IHTMLSTYLE_LEFT},
{attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING}, {attrLetterSpacing, DISPID_IHTMLSTYLE_LETTERSPACING},
{attrLineHeight, DISPID_IHTMLSTYLE_LINEHEIGHT},
{attrMargin, DISPID_IHTMLSTYLE_MARGIN}, {attrMargin, DISPID_IHTMLSTYLE_MARGIN},
{attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM}, {attrMarginBottom, DISPID_IHTMLSTYLE_MARGINBOTTOM},
{attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT}, {attrMarginLeft, DISPID_IHTMLSTYLE_MARGINLEFT},
......
...@@ -71,6 +71,7 @@ typedef enum { ...@@ -71,6 +71,7 @@ typedef enum {
STYLEID_HEIGHT, STYLEID_HEIGHT,
STYLEID_LEFT, STYLEID_LEFT,
STYLEID_LETTER_SPACING, STYLEID_LETTER_SPACING,
STYLEID_LINE_HEIGHT,
STYLEID_MARGIN, STYLEID_MARGIN,
STYLEID_MARGIN_BOTTOM, STYLEID_MARGIN_BOTTOM,
STYLEID_MARGIN_LEFT, STYLEID_MARGIN_LEFT,
......
...@@ -2821,6 +2821,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style) ...@@ -2821,6 +2821,11 @@ static void test_current_style(IHTMLCurrentStyle *current_style)
ok(hres == S_OK, "get_bottom failed: %08x\n", hres); ok(hres == S_OK, "get_bottom failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v)); ok(V_VT(&v) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&v));
VariantClear(&v); VariantClear(&v);
hres = IHTMLCurrentStyle_get_lineHeight(current_style, &v);
ok(hres == S_OK, "get_lineHeight 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) static void test_style2(IHTMLStyle2 *style2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment