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
6e292a74
Commit
6e292a74
authored
Apr 22, 2021
by
Jacek Caban
Committed by
Alexandre Julliard
Apr 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Introduce ES6 JavaScript mode and use it in IE11 compat mode.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
08c6114f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
jscript.h
dlls/jscript/jscript.h
+2
-1
script.c
dlls/mshtml/script.c
+4
-1
No files found.
dlls/jscript/jscript.h
View file @
6e292a74
...
...
@@ -42,9 +42,10 @@
#define SCRIPTLANGUAGEVERSION_HTML 0x400
/*
* This is Wine jscript extension for ES5 compatible mode. Allowed only in HTML mode.
* This is Wine jscript extension for ES5
and ES6
compatible mode. Allowed only in HTML mode.
*/
#define SCRIPTLANGUAGEVERSION_ES5 0x102
#define SCRIPTLANGUAGEVERSION_ES6 0x103
typedef
struct
_jsval_t
jsval_t
;
typedef
struct
_jsstr_t
jsstr_t
;
...
...
dlls/mshtml/script.c
View file @
6e292a74
...
...
@@ -66,6 +66,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
/* See jscript.h in jscript.dll. */
#define SCRIPTLANGUAGEVERSION_HTML 0x400
#define SCRIPTLANGUAGEVERSION_ES5 0x102
#define SCRIPTLANGUAGEVERSION_ES6 0x103
struct
ScriptHost
{
IActiveScriptSite
IActiveScriptSite_iface
;
...
...
@@ -154,7 +155,9 @@ static BOOL init_script_engine(ScriptHost *script_host)
compat_mode
=
lock_document_mode
(
script_host
->
window
->
doc
);
script_mode
=
compat_mode
<
COMPAT_MODE_IE8
?
SCRIPTLANGUAGEVERSION_5_7
:
SCRIPTLANGUAGEVERSION_5_8
;
if
(
IsEqualGUID
(
&
script_host
->
guid
,
&
CLSID_JScript
))
{
if
(
compat_mode
>=
COMPAT_MODE_IE9
)
if
(
compat_mode
>=
COMPAT_MODE_IE11
)
script_mode
=
SCRIPTLANGUAGEVERSION_ES6
;
else
if
(
compat_mode
>=
COMPAT_MODE_IE9
)
script_mode
=
SCRIPTLANGUAGEVERSION_ES5
;
script_mode
|=
SCRIPTLANGUAGEVERSION_HTML
;
}
...
...
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