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

mshtml: Added IHTMLStyle::marginBottom property implementation.

oldstable
Jacek Caban 2012-01-26 14:33:24 +01:00 committed by Alexandre Julliard
parent 1ea6529007
commit 737dba7ae3
2 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/mshtml/htmlstyle.c
View File

@ -1504,15 +1504,19 @@ static HRESULT WINAPI HTMLStyle_get_marginRight(IHTMLStyle *iface, VARIANT *p)
static HRESULT WINAPI HTMLStyle_put_marginBottom(IHTMLStyle *iface, VARIANT v)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
FIXME("(%p)->(v%d)\n", This, V_VT(&v));
return E_NOTIMPL;
TRACE("(%p)->(v%d)\n", This, V_VT(&v));
return set_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_BOTTOM, &v, ATTR_FIX_PX);
}
static HRESULT WINAPI HTMLStyle_get_marginBottom(IHTMLStyle *iface, VARIANT *p)
{
HTMLStyle *This = impl_from_IHTMLStyle(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return get_nsstyle_attr_var(This->nsstyle, STYLEID_MARGIN_BOTTOM, p, 0);
}
static HRESULT WINAPI HTMLStyle_put_marginLeft(IHTMLStyle *iface, VARIANT v)

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

@ -381,6 +381,23 @@ static void test_body_style(IHTMLStyle *style)
ok(V_VT(&v) == VT_BSTR, "V_VT(marginRight) = %d\n", V_VT(&v));
ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginRight) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
V_VT(&v) = VT_NULL;
hres = IHTMLStyle_get_marginBottom(style, &v);
ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v));
ok(!V_BSTR(&v), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
V_VT(&v) = VT_I4;
V_I4(&v) = 6;
hres = IHTMLStyle_put_marginBottom(style, v);
ok(hres == S_OK, "put_marginBottom failed: %08x\n", hres);
V_VT(&v) = VT_NULL;
hres = IHTMLStyle_get_marginBottom(style, &v);
ok(hres == S_OK, "get_marginBottom failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR, "V_VT(marginBottom) = %d\n", V_VT(&v));
ok(!strcmp_wa(V_BSTR(&v), "6px"), "V_BSTR(marginBottom) = %s\n", wine_dbgstr_w(V_BSTR(&v)));
V_VT(&v) = VT_NULL;
hres = IHTMLStyle_get_marginLeft(style, &v);
ok(hres == S_OK, "get_marginLeft failed: %08x\n", hres);