Michał Ziętek : wscript: Implemented Host_get_Version.

Alexandre Julliard julliard at winehq.org
Tue Jun 28 17:25:18 CDT 2011


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

Author: Michał Ziętek <smierc.w.wenecji at gmail.com>
Date:   Tue Jun 28 13:38:56 2011 +0200

wscript: Implemented Host_get_Version.

---

 programs/wscript/host.c       |    8 ++++++--
 programs/wscript/tests/run.js |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/programs/wscript/host.c b/programs/wscript/host.c
index 3021656..f6dfaa0 100644
--- a/programs/wscript/host.c
+++ b/programs/wscript/host.c
@@ -30,6 +30,7 @@
 #include <wine/debug.h>
 
 static const WCHAR wshNameW[] = {'W','i','n','d','o','w','s',' ','S','c','r','i','p','t',' ','H','o','s','t',0};
+static const WCHAR wshVersionW[] = {'5','.','8'};
 
 WINE_DEFAULT_DEBUG_CHANNEL(wscript);
 
@@ -159,8 +160,11 @@ static HRESULT WINAPI Host_get_Arguments(IHost *iface, IArguments2 **out_Argumen
 
 static HRESULT WINAPI Host_get_Version(IHost *iface, BSTR *out_Version)
 {
-    WINE_FIXME("(%p)\n", out_Version);
-    return E_NOTIMPL;
+    WINE_TRACE("(%p)\n", out_Version);
+
+    if(!(*out_Version = SysAllocString(wshVersionW)))
+	return E_OUTOFMEMORY;
+    return S_OK;
 }
 
 static HRESULT WINAPI Host_get_BuildVersion(IHost *iface, int *out_Build)
diff --git a/programs/wscript/tests/run.js b/programs/wscript/tests/run.js
index 84d7789..8b43ce7 100644
--- a/programs/wscript/tests/run.js
+++ b/programs/wscript/tests/run.js
@@ -26,5 +26,6 @@ ok(typeof(WScript) === "object", "typeof(WScript) = " + typeof(WScript));
 ok(typeof(WSH) === "object", "typeof(WSH) = " + typeof(WSH));
 ok(WScript === WSH, "WScript !== WSH");
 ok(WScript.Name === "Windows Script Host", "WScript.Name = " + WScript.Name);
+ok(typeof(WScript.Version) === "string", "typeof(WScript.Version) = " + typeof(WScript.Version));
 
 winetest.reportSuccess();




More information about the wine-cvs mailing list