Shuai Meng : vbscript: Implemented ScriptEngineMajorVersion.

[Alexandre Julliard]

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

Author: Shuai Meng 
Date:   Sat Aug  9 00:49:52 2014 +0800

vbscript: Implemented ScriptEngineMajorVersion.

---

dlls/vbscript/global.c      | 12 ++++++++++--
 dlls/vbscript/tests/api.vbs |  2 ++
 dlls/vbscript/vbscript.h    |  1 +
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 2aae380..b0f7b72 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1672,8 +1672,16 @@ static HRESULT Global_ScriptEngine(vbdisp_t *This, VARIANT *arg, unsigned args_c

static HRESULT Global_ScriptEngineMajorVersion(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);
+
+    if(res) {
+        V_VT(res) = VT_I4;
+        V_I4(res) = VBSCRIPT_MAJOR_VERSION;
+    }
+
+    return S_OK;
 }

static HRESULT Global_ScriptEngineMinorVersion(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 73a1c2d..f821706 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -989,4 +989,6 @@ Call ok(getVT(ScriptEngine) = "VT_BSTR", "getVT(ScriptEngine) = " & getVT(Script

Call ok(getVT(ScriptEngineBuildVersion) = "VT_I4", "getVT(ScriptEngineBuildVersion) = " & getVT(ScriptEngineBuildVersion))

+Call ok(getVT(ScriptEngineMajorVersion) = "VT_I4", "getVT(ScriptEngineMajorVersion) = " & getVT(ScriptEngineMajorVersion))
+
 Call reportSuccess()
diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h
index 547ffab..639e104 100644
--- a/dlls/vbscript/vbscript.h
+++ b/dlls/vbscript/vbscript.h
@@ -463,3 +463,4 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
 }

#define VBSCRIPT_BUILD_VERSION 16978
+#define VBSCRIPT_MAJOR_VERSION 5