Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
ed1a4087
Commit
ed1a4087
authored
Jun 05, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 05, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Add IHTMLCSSStyleDeclaration2::transition property implementation.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4b29a69b
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
4 deletions
+26
-4
htmlstyle.c
dlls/mshtml/htmlstyle.c
+8
-4
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-0
style.c
dlls/mshtml/tests/style.c
+17
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
ed1a4087
...
...
@@ -802,6 +802,10 @@ static const style_tbl_entry_t style_tbl[] = {
DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSFORM
},
{
L"transition"
,
DISPID_IHTMLCSSSTYLEDECLARATION2_TRANSITION
},
{
vertical_alignW
,
DISPID_IHTMLCSSSTYLEDECLARATION_VERTICALALIGN
,
DISPID_A_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
);
FIXM
E
(
"(%p)->(%s)
\n
"
,
This
,
debugstr_w
(
v
));
return
E_NOTIMPL
;
TRAC
E
(
"(%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
);
FIXM
E
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
E_NOTIMPL
;
TRAC
E
(
"(%p)->(%p)
\n
"
,
This
,
p
);
return
get_style_property
(
This
,
STYLEID_TRANSITION
,
p
)
;
}
static
HRESULT
WINAPI
HTMLCSSStyleDeclaration2_put_fontFeatureSettings
(
IHTMLCSSStyleDeclaration2
*
iface
,
BSTR
v
)
...
...
dlls/mshtml/htmlstyle.h
View file @
ed1a4087
...
...
@@ -128,6 +128,7 @@ typedef enum {
STYLEID_TEXT_TRANSFORM
,
STYLEID_TOP
,
STYLEID_TRANSFORM
,
STYLEID_TRANSITION
,
STYLEID_VERTICAL_ALIGN
,
STYLEID_VISIBILITY
,
STYLEID_WHITE_SPACE
,
...
...
dlls/mshtml/tests/style.c
View file @
ed1a4087
...
...
@@ -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
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment