Jacek Caban : jscript: Added JScriptEncode object tests.

Alexandre Julliard julliard at winehq.org
Mon Mar 26 12:29:30 CDT 2012


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Mar 26 11:42:13 2012 +0200

jscript: Added JScriptEncode object tests.

---

 dlls/jscript/tests/jscript.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/dlls/jscript/tests/jscript.c b/dlls/jscript/tests/jscript.c
index c453971..0ffb2a5 100644
--- a/dlls/jscript/tests/jscript.c
+++ b/dlls/jscript/tests/jscript.c
@@ -31,6 +31,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
 
 static const CLSID CLSID_JScript =
     {0xf414c260,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}};
+static const CLSID CLSID_JScriptEncode =
+    {0xf414c262,0x6ac0,0x11cf,{0xb6,0xd1,0x00,0xaa,0x00,0xbb,0xbb,0x58}};
 
 #define DEFINE_EXPECT(func) \
     static BOOL expect_ ## func = FALSE, called_ ## func = FALSE
@@ -66,6 +68,8 @@ DEFINE_EXPECT(OnStateChange_INITIALIZED);
 DEFINE_EXPECT(OnEnterScript);
 DEFINE_EXPECT(OnLeaveScript);
 
+static const CLSID *engine_clsid = &CLSID_JScript;
+
 static BSTR a2bstr(const char *str)
 {
     BSTR ret;
@@ -409,7 +413,7 @@ static IActiveScript *create_jscript(void)
     IActiveScript *ret;
     HRESULT hres;
 
-    hres = CoCreateInstance(&CLSID_JScript, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
+    hres = CoCreateInstance(engine_clsid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER,
             &IID_IActiveScript, (void**)&ret);
     ok(hres == S_OK, "CoCreateInstance failed: %08x\n", hres);
 
@@ -662,10 +666,15 @@ START_TEST(jscript)
     CoInitialize(NULL);
 
     if(check_jscript()) {
+        trace("Testing JScript object...\n");
         test_jscript();
         test_jscript2();
         test_jscript_uninitializing();
         test_aggregation();
+
+        trace("Testing JScriptEncode object...\n");
+        engine_clsid = &CLSID_JScriptEncode;
+        test_jscript();
     }else {
         win_skip("Broken engine, probably too old\n");
     }




More information about the wine-cvs mailing list