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

mshtml: Use proper helpers to implement IHTMLSyle::fontSize property.

This commit is contained in:
Jacek Caban 2012-03-30 14:13:49 +02:00 committed by Alexandre Julliard
parent 35c84cddcc
commit 75dd422c2a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/mshtml/htmlstyle.c
View File

@ -853,14 +853,7 @@ static HRESULT WINAPI HTMLStyle_put_fontSize(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_FONT_SIZE, &v, ATTR_FIX_PX);
case VT_BSTR:
return set_style_attr(This, STYLEID_FONT_SIZE, V_BSTR(&v), 0);
default:
FIXME("not supported vt %d\n", V_VT(&v));
}
return S_OK;
} }
static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p) static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p)
@ -869,8 +862,7 @@ static HRESULT WINAPI HTMLStyle_get_fontSize(IHTMLStyle *iface, VARIANT *p)
TRACE("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
V_VT(p) = VT_BSTR; return get_nsstyle_attr_var(This->nsstyle, STYLEID_FONT_SIZE, p, 0);
return get_style_attr(This, STYLEID_FONT_SIZE, &V_BSTR(p));
} }
static HRESULT WINAPI HTMLStyle_put_font(IHTMLStyle *iface, BSTR v) static HRESULT WINAPI HTMLStyle_put_font(IHTMLStyle *iface, BSTR v)

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

@ -555,6 +555,17 @@ static void test_body_style(IHTMLStyle *style)
ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v)); ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v));
ok(!V_BSTR(&v), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v))); ok(!V_BSTR(&v), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
V_VT(&v) = VT_I4;
V_I4(&v) = 12;
hres = IHTMLStyle_put_fontSize(style, v);
ok(hres == S_OK, "put_fontSize failed: %08x\n", hres);
V_VT(&v) = VT_NULL;
hres = IHTMLStyle_get_fontSize(style, &v);
ok(hres == S_OK, "get_fontSize failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(fontSize) = %d\n", V_VT(&v));
ok(!strcmp_wa(V_BSTR(&v), "12px"), "V_BSTR(fontSize) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
V_VT(&v) = VT_NULL; V_VT(&v) = VT_NULL;
hres = IHTMLStyle_get_color(style, &v); hres = IHTMLStyle_get_color(style, &v);
ok(hres == S_OK, "get_color failed: %08x\n", hres); ok(hres == S_OK, "get_color failed: %08x\n", hres);