Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
ddf46bbe
Commit
ddf46bbe
authored
Jul 23, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Jul 24, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Moved script mode out of get_script_host to allow exec_script calls in Gecko script mode.
parent
402c8756
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
5 deletions
+10
-5
script.c
dlls/mshtml/script.c
+10
-5
No files found.
dlls/mshtml/script.c
View file @
ddf46bbe
...
...
@@ -795,11 +795,6 @@ static ScriptHost *get_script_host(HTMLWindow *window, const GUID *guid)
{
ScriptHost
*
iter
;
if
(
IsEqualGUID
(
&
CLSID_JScript
,
guid
)
&&
window
->
scriptmode
!=
SCRIPTMODE_ACTIVESCRIPT
)
{
TRACE
(
"Ignoring JScript
\n
"
);
return
NULL
;
}
LIST_FOR_EACH_ENTRY
(
iter
,
&
window
->
script_hosts
,
ScriptHost
,
entry
)
{
if
(
IsEqualGUID
(
guid
,
&
iter
->
guid
))
return
iter
;
...
...
@@ -818,6 +813,11 @@ void doc_insert_script(HTMLWindow *window, nsIDOMHTMLScriptElement *nsscript)
return
;
}
if
(
IsEqualGUID
(
&
CLSID_JScript
,
&
guid
)
&&
window
->
scriptmode
!=
SCRIPTMODE_ACTIVESCRIPT
)
{
TRACE
(
"Ignoring JScript
\n
"
);
return
;
}
script_host
=
get_script_host
(
window
,
&
guid
);
if
(
!
script_host
)
return
;
...
...
@@ -859,6 +859,11 @@ IDispatch *script_parse_event(HTMLWindow *window, LPCWSTR text)
ptr
=
text
;
}
if
(
IsEqualGUID
(
&
CLSID_JScript
,
&
guid
)
&&
window
->
scriptmode
!=
SCRIPTMODE_ACTIVESCRIPT
)
{
TRACE
(
"Ignoring JScript
\n
"
);
return
NULL
;
}
script_host
=
get_script_host
(
window
,
&
guid
);
if
(
!
script_host
||
!
script_host
->
parse_proc
)
return
NULL
;
...
...
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