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

mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
feature/deterministic
Jacek Caban 2020-06-05 18:29:11 +02:00 committed by Alexandre Julliard
parent 4b29a69b1b
commit ed1a4087e8
3 changed files with 26 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

@ -801,6 +801,10 @@ static const style_tbl_entry_t style_tbl[] = {
L"transform",
DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM
},
{
L"transition",
DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION
},
{
vertical_alignW,
DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN,
@ -9725,15 +9729,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transitionDelay(IHTMLCSSStyle
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%s)\n", This, debugstr_w(v));
return E_NOTIMPL;
TRACE("(%p)->(%s)\n", This, debugstr_w(v));
return set_style_property(This, STYLEID_TRANSITION, v);
}
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_transition(IHTMLCSSStyleDeclaration2 *iface, BSTR *p)
{
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p);
return E_NOTIMPL;
TRACE("(%p)->(%p)\n", This, p);
return get_style_property(This, STYLEID_TRANSITION, p);
}
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_fontFeatureSettings(IHTMLCSSStyleDeclaration2 *iface, BSTR v)

1
dlls/mshtml/htmlstyle.h
View File

@ -128,6 +128,7 @@ typedef enum {
STYLEID_TEXT_TRANSFORM,
STYLEID_TOP,
STYLEID_TRANSFORM,
STYLEID_TRANSITION,
STYLEID_VERTICAL_ALIGN,
STYLEID_VISIBILITY,
STYLEID_WHITE_SPACE,

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

@ -872,6 +872,23 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
ok(hres == S_OK, "get_animationName failed: %08x\n", hres);
ok(!lstrcmpW(str, L"none"), "animationName = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str);
ok(hres == S_OK, "get_transition failed: %08x\n", hres);
ok(!str, "transition = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
str = SysAllocString(L"marigin-right 1s ease-out");
hres = IHTMLCSSStyleDeclaration2_put_transition(css_style, str);
ok(hres == S_OK, "put_transition failed: %08x\n", hres);
SysFreeString(str);
str = NULL;
hres = IHTMLCSSStyleDeclaration2_get_transition(css_style, &str);
ok(hres == S_OK, "get_transition failed: %08x\n", hres);
ok(!wcsncmp(str, L"marigin-right 1s", wcslen(L"marigin-right 1s")), "transition = %s\n", wine_dbgstr_w(str));
SysFreeString(str);
}
static void test_body_style(IHTMLStyle *style)