ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Use set_nsstyle_attr_var in IHTMLStyle::put_height implementation.

This commit is contained in:
Jacek Caban 2011-11-12 14:32:31 +01:00 committed by Alexandre Julliard
parent 4222ccf1cf
commit 6f9e67e0b4
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/mshtml/htmlstyle.c
View File

@ -2069,15 +2069,7 @@ static HRESULT WINAPI HTMLStyle_put_height(IHTMLStyle *iface, VARIANT v)
TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));
switch(V_VT(&v)) { return set_nsstyle_attr_var(This->nsstyle, STYLEID_HEIGHT, &v, ATTR_FIX_PX);
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) static HRESULT WINAPI HTMLStyle_get_height(IHTMLStyle *iface, VARIANT *p)

14
dlls/mshtml/tests/style.c
View File

@ -872,11 +872,23 @@ static void test_body_style(IHTMLStyle *style)
"expected 4.0 or 4.9 (IE8) got %f\n", f); "expected 4.0 or 4.9 (IE8) got %f\n", f);
V_VT(&v) = VT_BSTR; V_VT(&v) = VT_BSTR;
V_BSTR(&v) = a2bstr("64px"); V_BSTR(&v) = a2bstr("70px");
hres = IHTMLStyle_put_height(style, v); hres = IHTMLStyle_put_height(style, v);
ok(hres == S_OK, "put_height failed: %08x\n", hres); ok(hres == S_OK, "put_height failed: %08x\n", hres);
VariantClear(&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(!strcmp_wa(V_BSTR(&v), "70px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
VariantClear(&v);
V_VT(&v) = VT_I4;
V_I4(&v) = 64;
hres = IHTMLStyle_put_height(style, v);
ok(hres == S_OK, "put_height failed: %08x\n", hres);
V_VT(&v) = VT_EMPTY; V_VT(&v) = VT_EMPTY;
hres = IHTMLStyle_get_height(style, &v); hres = IHTMLStyle_get_height(style, &v);
ok(hres == S_OK, "get_height failed: %08x\n", hres); ok(hres == S_OK, "get_height failed: %08x\n", hres);