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

mshtml: Use helpers in IHTMLStyle::paddingLeft implementation.

This commit is contained in:
Jacek Caban 2012-01-26 14:34:22 +01:00 committed by Alexandre Julliard
parent 9fc673f48e
commit dec3a9c7b0
2 changed files with 5 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dlls/mshtml/htmlstyle.c
View File

@ -1611,39 +1611,18 @@ static HRESULT WINAPI HTMLStyle_put_paddingLeft(IHTMLStyle *iface, VARIANT v)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
TRACE("(%p)->(vt=%d)\n", This, V_VT(&v));
TRACE("(%p)->(v%d)\n", This, V_VT(&v));
switch(V_VT(&v)) {
case VT_I4: {
WCHAR buf[14];
wsprintfW(buf, px_formatW, V_I4(&v));
return set_style_attr(This, STYLEID_PADDING_LEFT, buf, 0);
}
case VT_BSTR:
return set_style_attr(This, STYLEID_PADDING_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_PADDING_LEFT, &v, ATTR_FIX_PX);
}
static HRESULT WINAPI HTMLStyle_get_paddingLeft(IHTMLStyle *iface, VARIANT *p)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
BSTR ret;
HRESULT hres;
TRACE("(%p)->(%p)\n", This, p);
hres = get_style_attr(This, STYLEID_PADDING_LEFT, &ret);
if(FAILED(hres))
return hres;
V_VT(p) = VT_BSTR;
V_BSTR(p) = ret;
return S_OK;
return get_nsstyle_attr_var(This->nsstyle, STYLEID_PADDING_LEFT, p, 0);
}
static HRESULT WINAPI HTMLStyle_put_padding(IHTMLStyle *iface, BSTR v)

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

@ -1289,6 +1289,8 @@ static void test_body_style(IHTMLStyle *style)
/* PaddingLeft */
hres = IHTMLStyle_get_paddingLeft(style, &vDefault);
ok(hres == S_OK, "get_paddingLeft: %08x\n", hres);
ok(V_VT(&vDefault) == VT_BSTR, "V_VT(v) = %d\n", V_VT(&vDefault));
ok(!strcmp_wa(V_BSTR(&vDefault), "1px"), "V_BSTR(v) = %s\n", wine_dbgstr_w(V_BSTR(&vDefault)));
V_VT(&v) = VT_BSTR;
V_BSTR(&v) = a2bstr("10");