marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mshtml: Use set_nsstyle_attr_var helper in IHTMLStyle::put_marginLeft implementation.

oldstable
Jacek Caban 2012-01-26 14:33:38 +01:00 committed by Alexandre Julliard
parent 737dba7ae3
commit 7d18377ba4
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dlls/mshtml/htmlstyle.c
View File

@ -1523,26 +1523,9 @@ static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
switch(V_VT(&v)) {
case VT_NULL:
TRACE("(%p)->(NULL)\n", This);
return set_style_attr(This, STYLEID_MARGIN_LEFT, emptyW, 0);
case VT_I4: {
WCHAR buf[14];
TRACE("(%p)->(v%d)\n", This, V_VT(&v));
TRACE("(%p)->(%d)\n", This, V_I4(&v));
wsprintfW(buf, px_formatW, V_I4(&v));
return set_style_attr(This, STYLEID_MARGIN_LEFT, buf, 0);
}
case VT_BSTR:
TRACE("(%p)->(%s)\n", This, debugstr_w(V_BSTR(&v)));
return set_style_attr(This, STYLEID_MARGIN_LEFT, V_BSTR(&v), 0);
default:
FIXME("Unsupported vt=%d\n", V_VT(&v));
}
return E_NOTIMPL;
return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_LEFT, &v, ATTR_FIX_PX);
}
static HRESULT WINAPI HTMLStyle_put_margin(IHTMLStyle *iface, BSTR v)

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

@ -404,6 +404,17 @@ static void test_body_style(IHTMLStyle *style)
ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v));
ok(!V_BSTR(&v), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
V_VT(&v) = VT_I4;
V_I4(&v) = 6;
hres = IHTMLStyle_put_marginLeft(style, v);
ok(hres == S_OK, "put_marginLeft failed: %08x\n", hres);
V_VT(&v) = VT_NULL;
hres = IHTMLStyle_get_marginLeft(style, &v);
ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(marginLeft) = %d\n", V_VT(&v));
ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginLeft) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
str = (void*)0xdeadbeef;
hres = IHTMLStyle_get_fontFamily(style, &str);
ok(hres == S_OK, "get_fontFamily failed: %08x\n", hres);