[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH 5/6] vbscript: Add Minute function implementation.
From:       Jacek Caban <jacek () codeweavers ! com>
Date:       2019-09-30 18:20:01
Message-ID: e87a2a39-abb0-1ed4-4c84-9dc5990c0e05 () codeweavers ! com
[Download RAW message or body]

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
---
  dlls/vbscript/global.c      | 9 +++++++--
  dlls/vbscript/tests/api.vbs | 3 +++
  2 files changed, 10 insertions(+), 2 deletions(-)



["0005-vbscript-Add-Minute-function-implementation.txt" (text/x-patch)]

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



[prev in list] [next in list] [prev in thread] [next in thread]