Jacek Caban : vbscript: Added remaining week day constants implementations.

Alexandre Julliard julliard at winehq.org
Fri Oct 21 11:02:01 CDT 2011


Module: wine
Branch: master
Commit: d0740365ffa8edc04b839bc75e24cfcab35f7f8b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d0740365ffa8edc04b839bc75e24cfcab35f7f8b

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Oct 21 12:42:48 2011 +0200

vbscript: Added remaining week day constants implementations.

---

 dlls/vbscript/global.c      |   24 ++++++++++++------------
 dlls/vbscript/tests/api.vbs |   12 ++++++++++++
 2 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index d3c4c0c..e3c7161 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -913,38 +913,38 @@ static HRESULT Global_vbSunday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt,
 
 static HRESULT Global_vbMonday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+    return return_short(res, 2);
 }
 
 static HRESULT Global_vbTuesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+    return return_short(res, 3);
 }
 
 static HRESULT Global_vbWednesday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+    return return_short(res, 4);
 }
 
 static HRESULT Global_vbThursday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+    return return_short(res, 5);
 }
 
 static HRESULT Global_vbFriday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+    return return_short(res, 6);
 }
 
 static HRESULT Global_vbSaturday(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
 {
-    FIXME("\n");
-    return E_NOTIMPL;
+    TRACE("\n");
+    return return_short(res, 7);
 }
 
 static HRESULT Global_vbFirstJan1(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 c201bea..ae1e73b 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -25,6 +25,18 @@ End Class
 
 Call ok(vbSunday = 1, "vbSunday = " & vbSunday)
 Call ok(getVT(vbSunday) = "VT_I2", "getVT(vbSunday) = " & getVT(vbSunday))
+Call ok(vbMonday = 2, "vbMonday = " & vbMonday)
+Call ok(getVT(vbMonday) = "VT_I2", "getVT(vbMonday) = " & getVT(vbMonday))
+Call ok(vbTuesday = 3, "vbTuesday = " & vbTuesday)
+Call ok(getVT(vbTuesday) = "VT_I2", "getVT(vbTuesday) = " & getVT(vbTuesday))
+Call ok(vbWednesday = 4, "vbWednesday = " & vbWednesday)
+Call ok(getVT(vbWednesday) = "VT_I2", "getVT(vbWednesday) = " & getVT(vbWednesday))
+Call ok(vbThursday = 5, "vbThursday = " & vbThursday)
+Call ok(getVT(vbThursday) = "VT_I2", "getVT(vbThursday) = " & getVT(vbThursday))
+Call ok(vbFriday = 6, "vbFriday = " & vbFriday)
+Call ok(getVT(vbFriday) = "VT_I2", "getVT(vbFriday) = " & getVT(vbFriday))
+Call ok(vbSaturday = 7, "vbSaturday = " & vbSaturday)
+Call ok(getVT(vbSaturday) = "VT_I2", "getVT(vbSaturday) = " & getVT(vbSaturday))
 
 Call ok(isObject(new EmptyClass), "isObject(new EmptyClass) is not true?")
 Set x = new EmptyClass




More information about the wine-cvs mailing list