Module: wine Branch: master Commit: 7a768ff1a96d82ccc3b73e7de86b7c7e13beab09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a768ff1a96d82ccc3b73e7de8...
Author: Shuai Meng mengshuaicalendr@gmail.com Date: Sat Aug 9 00:52:28 2014 +0800
vbscript: Implemented ScriptEngineMinorVersion.
---
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 b0f7b72..933ec08 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1686,8 +1686,16 @@ static HRESULT Global_ScriptEngineMajorVersion(vbdisp_t *This, VARIANT *arg, uns
static HRESULT Global_ScriptEngineMinorVersion(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_MINOR_VERSION; + } + + return S_OK; }
static HRESULT Global_ScriptEngineBuildVersion(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 f821706..c52422f 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -991,4 +991,6 @@ Call ok(getVT(ScriptEngineBuildVersion) = "VT_I4", "getVT(ScriptEngineBuildVersi
Call ok(getVT(ScriptEngineMajorVersion) = "VT_I4", "getVT(ScriptEngineMajorVersion) = " & getVT(ScriptEngineMajorVersion))
+Call ok(getVT(ScriptEngineMinorVersion) = "VT_I4", "getVT(ScriptEngineMinorVersion) = " & getVT(ScriptEngineMinorVersion)) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index 639e104..d21e80a 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -464,3 +464,4 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
#define VBSCRIPT_BUILD_VERSION 16978 #define VBSCRIPT_MAJOR_VERSION 5 +#define VBSCRIPT_MINOR_VERSION 8