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
77b24d25
Commit
77b24d25
authored
Jun 09, 2020
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 09, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use proper compat mode in IHTMLWindow7::getComputedStyle.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
276accf5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
+6
-5
htmlstyle.c
dlls/mshtml/htmlstyle.c
+2
-2
htmlstyle.h
dlls/mshtml/htmlstyle.h
+1
-1
htmlwindow.c
dlls/mshtml/htmlwindow.c
+2
-2
documentmode.js
dlls/mshtml/tests/documentmode.js
+1
-0
No files found.
dlls/mshtml/htmlstyle.c
View file @
77b24d25
...
...
@@ -10331,14 +10331,14 @@ static dispex_static_data_t HTMLW3CComputedStyle_dispex = {
CSSStyle_init_dispex_info
};
HRESULT
create_computed_style
(
nsIDOMCSSStyleDeclaration
*
nsstyle
,
IHTMLCSSStyleDeclaration
**
p
)
HRESULT
create_computed_style
(
nsIDOMCSSStyleDeclaration
*
nsstyle
,
compat_mode_t
compat_mode
,
IHTMLCSSStyleDeclaration
**
p
)
{
CSSStyle
*
style
;
if
(
!
(
style
=
heap_alloc_zero
(
sizeof
(
*
style
))))
return
E_OUTOFMEMORY
;
init_css_style
(
style
,
nsstyle
,
NULL
,
&
HTMLW3CComputedStyle_dispex
,
COMPAT_MODE_IE11
);
init_css_style
(
style
,
nsstyle
,
NULL
,
&
HTMLW3CComputedStyle_dispex
,
compat_mode
);
*
p
=
&
style
->
IHTMLCSSStyleDeclaration_iface
;
return
S_OK
;
}
...
...
dlls/mshtml/htmlstyle.h
View file @
77b24d25
...
...
@@ -149,7 +149,7 @@ typedef enum {
}
styleid_t
;
HRESULT
HTMLStyle_Create
(
HTMLElement
*
,
HTMLStyle
**
)
DECLSPEC_HIDDEN
;
HRESULT
create_computed_style
(
nsIDOMCSSStyleDeclaration
*
,
IHTMLCSSStyleDeclaration
**
)
DECLSPEC_HIDDEN
;
HRESULT
create_computed_style
(
nsIDOMCSSStyleDeclaration
*
,
compat_mode_t
,
IHTMLCSSStyleDeclaration
**
)
DECLSPEC_HIDDEN
;
void
init_css_style
(
CSSStyle
*
,
nsIDOMCSSStyleDeclaration
*
,
style_qi_t
,
dispex_static_data_t
*
,
compat_mode_t
)
DECLSPEC_HIDDEN
;
...
...
dlls/mshtml/htmlwindow.c
View file @
77b24d25
...
...
@@ -2332,7 +2332,7 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM
TRACE
(
"(%p)->(%p %s %p)
\n
"
,
This
,
node
,
debugstr_w
(
pseudo_elt
),
p
);
if
(
!
This
->
outer_window
)
if
(
!
This
->
outer_window
||
!
This
->
inner_window
)
return
E_UNEXPECTED
;
hres
=
IHTMLDOMNode_QueryInterface
(
node
,
&
IID_IHTMLElement
,
(
void
**
)
&
elem
);
...
...
@@ -2356,7 +2356,7 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM
return
E_FAIL
;
}
hres
=
create_computed_style
(
nsstyle
,
p
);
hres
=
create_computed_style
(
nsstyle
,
dispex_compat_mode
(
&
This
->
inner_window
->
event_target
.
dispex
),
p
);
nsIDOMCSSStyleDeclaration_Release
(
nsstyle
);
return
hres
;
}
...
...
dlls/mshtml/tests/documentmode.js
View file @
77b24d25
...
...
@@ -184,6 +184,7 @@ function test_style_props() {
test_exposed
(
"setProperty"
,
v
>=
9
);
test_exposed
(
"removeProperty"
,
v
>=
9
);
test_exposed
(
"background-clip"
,
v
>=
9
);
test_exposed
(
"transform"
,
v
>=
10
);
}
next_test
();
...
...
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