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

mshtml: Added IHTMLCSSStyleDeclaration::styleFloat property implementation. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-09-10 17:27:46 +02:00 committed by Alexandre Julliard
parent b34362f2d9
commit 9d22dc476f
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/mshtml/htmlstyle.c
View File

@ -5567,15 +5567,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration_get_height(IHTMLCSSStyleDeclaratio
static HRESULT WINAPI HTMLCSSStyleDeclaration_put_styleFloat(IHTMLCSSStyleDeclaration *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration_put_styleFloat(IHTMLCSSStyleDeclaration *iface, BSTR v)
{ {
HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v)); TRACE("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL; return set_style_property(This, STYLEID_FLOAT, v);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration_get_styleFloat(IHTMLCSSStyleDeclaration *iface, BSTR *p) static HRESULT WINAPI HTMLCSSStyleDeclaration_get_styleFloat(IHTMLCSSStyleDeclaration *iface, BSTR *p)
{ {
HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface); HTMLStyle *This = impl_from_IHTMLCSSStyleDeclaration(iface);
FIXME("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return get_style_property(This, STYLEID_FLOAT, p);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration_put_clear(IHTMLCSSStyleDeclaration *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration_put_clear(IHTMLCSSStyleDeclaration *iface, BSTR v)

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

@ -2897,6 +2897,12 @@ static void test_body_style(IHTMLStyle *style)
str = NULL; str = NULL;
hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str); hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str);
ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres);
ok(!strcmp_wa(str, "left"), "cssFloat = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration_get_styleFloat(css_style, &str);
ok(hres == S_OK, "get_styleFloat failed: %08x\n", hres);
ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str)); ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str));
SysFreeString(str); SysFreeString(str);
@ -2910,6 +2916,17 @@ static void test_body_style(IHTMLStyle *style)
ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres); ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres);
ok(!strcmp_wa(str, "right"), "styleFloat = %s\n", wine_dbgstr_w(str)); ok(!strcmp_wa(str, "right"), "styleFloat = %s\n", wine_dbgstr_w(str));
SysFreeString(str); SysFreeString(str);
str = a2bstr("left");
hres = IHTMLCSSStyleDeclaration_put_styleFloat(css_style, str);
ok(hres == S_OK, "put_styleFloat failed: %08x\n", hres);
SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration_get_cssFloat(css_style, &str);
ok(hres == S_OK, "get_cssFloat failed: %08x\n", hres);
ok(!strcmp_wa(str, "left"), "styleFloat = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
} }
hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2); hres = IHTMLStyle_QueryInterface(style, &IID_IHTMLStyle2, (void**)&style2);