Module: wine Branch: master Commit: d359793173b006ba1fb99f6d64c07f4991006227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d359793173b006ba1fb99f6d6...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Sep 30 20:20:01 2019 +0200
vbscript: Add Minute function implementation.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index bd6596a928..c23a9cf990 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -1659,8 +1659,13 @@ static HRESULT Global_Hour(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARI
static HRESULT Global_Minute(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + SYSTEMTIME st; + HRESULT hres; + + TRACE("(%s)\n", debugstr_variant(arg)); + + hres = to_system_time(arg, &st); + return FAILED(hres) ? hres : return_short(res, st.wMinute); }
static HRESULT Global_Second(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 38dbe68bcb..640fe63cae 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -1451,6 +1451,9 @@ Call ok(Year(2) = 1900, "Year(2) = " & Year(2)) Call ok(getVT(Hour(now)) = "VT_I2", "getVT(Hour(now)) = " & getVT(Hour(now))) Call ok(Hour(2) = 0, "Hour(2) = " & Hour(2)) Call ok(Hour(2.75) = 18, "Hour(2) = " & Hour(2.75)) +Call ok(getVT(Minute(now)) = "VT_I2", "getVT(Minute(now)) = " & getVT(Minute(now))) +Call ok(Minute(2) = 0, "Minute(2) = " & Minute(2)) +Call ok(Minute(2.02083) = 30, "Minute(2.02083) = " & Minute(2.02083))
Sub testRGBError(arg1, arg2, arg3, error_num) on error resume next