Module: wine Branch: master Commit: f3f0972ddb0ead5435fc6bd7c779f76790a54792 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3f0972ddb0ead5435fc6bd7c7...
Author: Shuai Meng mengshuaicalendr@gmail.com Date: Sat Aug 9 00:49:05 2014 +0800
vbscript: Inplemented ScriptEngineBuildVersion.
---
dlls/vbscript/global.c | 12 ++++++++++-- dlls/vbscript/tests/api.vbs | 2 ++ dlls/vbscript/vbscript.h | 2 ++ 3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 8f1a4b9..2aae380 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1684,8 +1684,16 @@ static HRESULT Global_ScriptEngineMinorVersion(vbdisp_t *This, VARIANT *arg, uns
static HRESULT Global_ScriptEngineBuildVersion(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_BUILD_VERSION; + } + + return S_OK; }
static HRESULT Global_FormatNumber(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 77c6852..73a1c2d 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -987,4 +987,6 @@ Call testAbsError(-4, 0, 0) Call ok(ScriptEngine = "VBScript", "Is scriptengine not VBScript?") Call ok(getVT(ScriptEngine) = "VT_BSTR", "getVT(ScriptEngine) = " & getVT(ScriptEngine))
+Call ok(getVT(ScriptEngineBuildVersion) = "VT_I4", "getVT(ScriptEngineBuildVersion) = " & getVT(ScriptEngineBuildVersion)) + Call reportSuccess() diff --git a/dlls/vbscript/vbscript.h b/dlls/vbscript/vbscript.h index ab1257f..547ffab 100644 --- a/dlls/vbscript/vbscript.h +++ b/dlls/vbscript/vbscript.h @@ -461,3 +461,5 @@ static inline LPWSTR heap_strdupW(LPCWSTR str)
return ret; } + +#define VBSCRIPT_BUILD_VERSION 16978