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

mshtml: Implement IHTMLCSSStyleDeclaration2::animation property. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2021-01-27 19:36:38 +01:00 committed by Alexandre Julliard
parent 44d58d35d1
commit ee611b198d
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/mshtml/htmlstyle.c
View File

@ -120,6 +120,12 @@ typedef struct {
} style_tbl_entry_t; } style_tbl_entry_t;
static const style_tbl_entry_t style_tbl[] = { static const style_tbl_entry_t style_tbl[] = {
{
L"animation",
DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATION,
DISPID_UNKNOWN,
ATTR_COMPAT_IE10
},
{ {
L"animation-name", L"animation-name",
DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME, DISPID_IHTMLCSSSTYLEDECLARATION2_ANIMATIONNAME,
@ -9689,15 +9695,15 @@ static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animationIterationCount(IHTML
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR v)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(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_ANIMATION, v);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR *p) static HRESULT WINAPI HTMLCSSStyleDeclaration2_get_animation(IHTMLCSSStyleDeclaration2 *iface, BSTR *p)
{ {
CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface); CSSStyle *This = impl_from_IHTMLCSSStyleDeclaration2(iface);
FIXME("(%p)->(%p)\n", This, p); TRACE("(%p)->(%p)\n", This, p);
return E_NOTIMPL; return get_style_property(This, STYLEID_ANIMATION, p);
} }
static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animationFillMode(IHTMLCSSStyleDeclaration2 *iface, BSTR v) static HRESULT WINAPI HTMLCSSStyleDeclaration2_put_animationFillMode(IHTMLCSSStyleDeclaration2 *iface, BSTR v)

1
dlls/mshtml/htmlstyle.h
View File

@ -44,6 +44,7 @@ struct HTMLStyle {
/* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */ /* NOTE: Make sure to keep in sync with style_tbl in htmlstyle.c */
typedef enum { typedef enum {
STYLEID_ANIMATION,
STYLEID_ANIMATION_NAME, STYLEID_ANIMATION_NAME,
STYLEID_BACKGROUND, STYLEID_BACKGROUND,
STYLEID_BACKGROUND_ATTACHMENT, STYLEID_BACKGROUND_ATTACHMENT,

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

@ -1106,6 +1106,36 @@ static void test_css_style_declaration2(IHTMLCSSStyleDeclaration2 *css_style)
ok(hres == S_OK, "get_perspective failed: %08x\n", hres); ok(hres == S_OK, "get_perspective failed: %08x\n", hres);
ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"100px"), "perspective = %s\n", wine_dbgstr_variant(&v)); ok(V_VT(&v) == VT_BSTR && V_BSTR(&v) && !lstrcmpW(V_BSTR(&v), L"100px"), "perspective = %s\n", wine_dbgstr_variant(&v));
VariantClear(&v); VariantClear(&v);
/* animation property */
hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL);
ok(hres == S_OK, "put_animation failed: %08x\n", hres);
str = (void*)0xdeadbeef;
hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str);
ok(hres == S_OK, "get_animation failed: %08x\n", hres);
ok(!str, "animation = %s\n", wine_dbgstr_w(str));
str = SysAllocString(L"test");
hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, str);
ok(hres == S_OK, "put_animation failed: %08x\n", hres);
SysFreeString(str);
str = (void*)0xdeadbeef;
hres = IHTMLCSSStyleDeclaration2_get_animation(css_style, &str);
ok(hres == S_OK, "get_animation failed: %08x\n", hres);
todo_wine
ok(!lstrcmpW(str, L"test"), "animation = %s\n", wine_dbgstr_w(str));
str = (void*)0xdeadbeef;
hres = IHTMLCSSStyleDeclaration2_get_animationName(css_style, &str);
ok(hres == S_OK, "get_animationName failed: %08x\n", hres);
ok(!lstrcmpW(str, L"test"), "animationName = %s\n", wine_dbgstr_w(str));
str = SysAllocString(L"test");
hres = IHTMLCSSStyleDeclaration2_put_animation(css_style, NULL);
ok(hres == S_OK, "put_animation failed: %08x\n", hres);
SysFreeString(str);
} }
static void test_body_style(IHTMLStyle *style) static void test_body_style(IHTMLStyle *style)