Jacek Caban : vbscript: Added Now() implementation.
Alexandre Julliard
julliard at winehq.org
Fri Sep 28 11:39:03 CDT 2012
Module: wine
Branch: master
Commit: 9554e44e470012a2b9d370b9903a41226624cb59
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9554e44e470012a2b9d370b9903a41226624cb59
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Sep 28 11:49:30 2012 +0200
vbscript: Added Now() implementation.
---
dlls/vbscript/global.c | 19 +++++++++++++++++--
dlls/vbscript/tests/api.vbs | 2 ++
dlls/vbscript/tests/run.c | 2 ++
3 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index bf423b4..9fb6a4d 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -130,6 +130,15 @@ static inline HRESULT return_null(VARIANT *res)
return S_OK;
}
+static inline HRESULT return_date(VARIANT *res, double date)
+{
+ if(res) {
+ V_VT(res) = VT_DATE;
+ V_DATE(res) = date;
+ }
+ return S_OK;
+}
+
static HRESULT to_int(VARIANT *v, int *ret)
{
switch(V_VT(v)) {
@@ -967,8 +976,14 @@ static HRESULT Global_Sgn(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA
static HRESULT Global_Now(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
{
- FIXME("\n");
- return E_NOTIMPL;
+ SYSTEMTIME lt;
+ double date;
+
+ TRACE("\n");
+
+ GetLocalTime(<);
+ SystemTimeToVariantTime(<, &date);
+ return return_date(res, date);
}
static HRESULT Global_Date(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 78e4a8b..97ca5e0 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -232,4 +232,6 @@ if isEnglishLang then
Call ok(MonthName(12, true) = "Dec", "MonthName(12, true) = " & MonthName(12, true))
end if
+Call ok(getVT(Now()) = "VT_DATE", "getVT(Now()) = " & getVT(Now()))
+
Call reportSuccess()
diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index 3f68717..8c541bd 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -173,6 +173,8 @@ static const char *vt2a(VARIANT *v)
return "VT_I4";
case VT_R8:
return "VT_R8";
+ case VT_DATE:
+ return "VT_DATE";
case VT_BSTR:
return "VT_BSTR";
case VT_DISPATCH:
More information about the wine-cvs
mailing list