Shuai Meng : vbscript: Implemented ScriptEngine.

Alexandre Julliard julliard at wine.codeweavers.com
Fri Aug 8 15:27:05 CDT 2014


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

Author: Shuai Meng <mengshuaicalendr at gmail.com>
Date:   Sat Aug  9 00:47:46 2014 +0800

vbscript: Implemented ScriptEngine.

---

 dlls/vbscript/global.c      | 7 +++++--
 dlls/vbscript/tests/api.vbs | 3 +++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index dc41db5..8f1a4b9 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1663,8 +1663,11 @@ static HRESULT Global_LoadPicture(vbdisp_t *This, VARIANT *arg, unsigned args_cn
 
 static HRESULT Global_ScriptEngine(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("%s\n", debugstr_variant(arg));
+
+    assert(args_cnt == 0);
+
+    return return_string(res, vbscriptW);
 }
 
 static HRESULT Global_ScriptEngineMajorVersion(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs
index fbf252a..77c6852 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -984,4 +984,7 @@ End Sub
 Call testAbsError("strings", 13, 13)
 Call testAbsError(-4, 0, 0)
 
+Call ok(ScriptEngine = "VBScript", "Is scriptengine not VBScript?")
+Call ok(getVT(ScriptEngine) = "VT_BSTR", "getVT(ScriptEngine) = " & getVT(ScriptEngine))
+
 Call reportSuccess()




More information about the wine-cvs mailing list