Jacek Caban : mshtml: Use ActiveScript for JavaScript in about protocol documents.

[Alexandre Julliard]

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

Author: Jacek Caban 
Date:   Wed Sep  9 21:32:11 2009 +0200

mshtml: Use ActiveScript for JavaScript in about protocol documents.

---

dlls/mshtml/persist.c   |    5 ++++-
 dlls/mshtml/tests/dom.c |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c
index 875a4e8..e9fc9c6 100644
--- a/dlls/mshtml/persist.c
+++ b/dlls/mshtml/persist.c
@@ -42,7 +42,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(mshtml);
 static BOOL use_gecko_script(LPCWSTR url)
 {
     static const WCHAR fileW[] = {'f','i','l','e',':'};
-    return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR));
+    static const WCHAR aboutW[] = {'a','b','o','u','t',':'};
+
+    return strncmpiW(fileW, url, sizeof(fileW)/sizeof(WCHAR))
+        && strncmpiW(aboutW, url, sizeof(aboutW)/sizeof(WCHAR));
 }

void set_current_mon(HTMLDocument *This, IMoniker *mon)
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 49f5ab1..b9a3ff8 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -4755,8 +4755,8 @@ static void test_elems(IHTMLDocument2 *doc)
             DISPID pid = -1;
             BSTR str = a2bstr("Testing");
             hres = IDispatchEx_GetDispID(dispex, str, 1, &pid);
-            todo_wine ok(hres == S_OK, "GetDispID failed: %08x\n", hres);
-            todo_wine ok(pid != -1, "pid == -1\n");
+            ok(hres == S_OK, "GetDispID failed: %08x\n", hres);
+            ok(pid != -1, "pid == -1\n");
             SysFreeString(str);
             IDispatchEx_Release(dispex);
         }