Jacek Caban : mshtml: Use jscript. dll for JavaScript for all zones except untrusted.

Alexandre Julliard julliard at winehq.org
Tue Mar 27 12:48:07 CDT 2012


Module: wine
Branch: master
Commit: 6c6744f80066f0aa46939a2d4c0af9c34f932e8b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6c6744f80066f0aa46939a2d4c0af9c34f932e8b

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Mar 27 13:40:01 2012 +0200

mshtml: Use jscript.dll for JavaScript for all zones except untrusted.

---

 dlls/mshtml/persist.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 2e69902..667a2f6 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -56,7 +56,7 @@ typedef struct {
 
 static BOOL use_gecko_script(HTMLWindow *window)
 {
-    DWORD zone, scheme;
+    DWORD zone;
     HRESULT hres;
 
     hres = IInternetSecurityManager_MapUrlToZone(window->secmgr, window->url, &zone, 0);
@@ -66,11 +66,7 @@ static BOOL use_gecko_script(HTMLWindow *window)
     }
 
     TRACE("zone %d\n", zone);
-    if(zone == URLZONE_LOCAL_MACHINE || zone == URLZONE_TRUSTED || !window->uri)
-        return FALSE;
-
-    hres = IUri_GetScheme(window->uri, &scheme);
-    return FAILED(hres) || scheme != URL_SCHEME_ABOUT;
+    return zone == URLZONE_UNTRUSTED;
 }
 
 static void notify_travellog_update(HTMLDocumentObj *doc)




More information about the wine-cvs mailing list