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

List:       wine-devel
Subject:    [PATCH 2/6] vbscript: Add Month function implementation.
From:       Jacek Caban <jacek () codeweavers ! com>
Date:       2019-09-30 18:19:38
Message-ID: 8df0a174-310d-a356-07df-00f8fd61e4e0 () 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 | 4 +++-
  2 files changed, 10 insertions(+), 3 deletions(-)



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

diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 5287e27f67..ecb9147941 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1620,8 +1620,13 @@ static HRESULT Global_Day(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIA
 
 static HRESULT Global_Month(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.wMonth);
 }
 
 static HRESULT Global_Weekday(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 9378df752a..41f7ce2132 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -1443,7 +1443,9 @@ Call ok(getVT(Date) = "VT_DATE", "getVT(Date) = " & getVT(Date))
 Call ok(getVT(Time) = "VT_DATE", "getVT(Time) = " & getVT(Time))
 
 Call ok(getVT(Day(now)) = "VT_I2", "getVT(Day(now)) = " & getVT(Day(now)))
-Call ok(Day(2) = 1, "Day(time) = " & Day(2))
+Call ok(Day(2) = 1, "Day(2) = " & Day(2))
+Call ok(getVT(Month(now)) = "VT_I2", "getVT(Month(now)) = " & getVT(Month(now)))
+Call ok(Month(2) = 1, "Month(2) = " & Month(2))
 
 Sub testRGBError(arg1, arg2, arg3, error_num)
     on error resume next



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