From: Shuai Meng Subject: [PATCH 2/2] vbscript: Implemented Time(try 3) Message-Id: <53FB5F7B.5020604@gmail.com> Date: Tue, 26 Aug 2014 00:08:27 +0800 Change log: handled return value for VarDateFromUdateEx; inited wDayOfYear part of ud. --- dlls/vbscript/global.c | 16 ++++++++++++++-- dlls/vbscript/tests/api.vbs | 1 + 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index c512729..311c892 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1418,8 +1418,20 @@ static HRESULT Global_Date(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI static HRESULT Global_Time(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME lt; + UDATE ud; + DATE time; + HRESULT hres; + + TRACE("\n"); + + GetLocalTime(<); + ud.st = lt; + ud.wDayOfYear = 0; + hres = VarDateFromUdateEx(&ud, 0, VAR_TIMEVALUEONLY, &time); + if(FAILED(hres)) + return hres; + return return_date(res, time); } static HRESULT Global_Day(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 ab87717..d688e17 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1238,5 +1238,6 @@ Call ok(Approch(Log(CByte(2)), 0.6931), "Log(CByte(2)) = " & Log(CByte(2))) Call ok(getVT(Log(CByte(2))) = "VT_R8", "getVT(Log(CByte(2))) = " & getVT(Log(CByte(2)))) Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date)) +Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time)) Call reportSuccess()