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

mshtml: Moved script mode out of get_script_host to allow exec_script calls in Gecko script mode.

This commit is contained in:
Jacek Caban 2011-07-23 12:51:06 +02:00 committed by Alexandre Julliard
parent 402c875699
commit ddf46bbe9f
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/mshtml/script.c
View File

@ -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;