Jacek Caban : vbscript: Added support for more constants.
Alexandre Julliard
julliard at winehq.org
Tue Jan 15 13:46:17 CST 2013
Module: wine
Branch: master
Commit: a71443a8840be9e80b4778815ead3170fa7a5168
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a71443a8840be9e80b4778815ead3170fa7a5168
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Jan 14 17:42:48 2013 +0100
vbscript: Added support for more constants.
---
dlls/vbscript/global.c | 56 +++++-------------------------------------
dlls/vbscript/tests/api.vbs | 7 +++++
2 files changed, 14 insertions(+), 49 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 5b28e8a..6886ff7 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1548,48 +1548,6 @@ static HRESULT Global_GetRef(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VA
return E_NOTIMPL;
}
-static HRESULT Global_vbUseSystem(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- FIXME("\n");
- return E_NOTIMPL;
-}
-
-static HRESULT Global_vbUseSystemDayOfWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- FIXME("\n");
- return E_NOTIMPL;
-}
-
-static HRESULT Global_vbFirstJan1(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- FIXME("\n");
- return E_NOTIMPL;
-}
-
-static HRESULT Global_vbFirstFourDays(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- FIXME("\n");
- return E_NOTIMPL;
-}
-
-static HRESULT Global_vbFirstFullWeek(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- FIXME("\n");
- return E_NOTIMPL;
-}
-
-static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- FIXME("\n");
- return E_NOTIMPL;
-}
-
-static HRESULT Global_vbFalse(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- FIXME("\n");
- return E_NOTIMPL;
-}
-
static HRESULT Global_vbUseDefault(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
{
FIXME("\n");
@@ -1777,8 +1735,8 @@ static HRESULT Global_vbMsgBoxRtlReading(vbdisp_t *This, VARIANT *arg, unsigned
}
static const builtin_prop_t global_props[] = {
- {DISPID_GLOBAL_VBUSESYSTEM, Global_vbUseSystem, BP_GET},
- {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, Global_vbUseSystemDayOfWeek, BP_GET},
+ {DISPID_GLOBAL_VBUSESYSTEM, NULL, BP_GET, 0},
+ {DISPID_GLOBAL_USESYSTEMDAYOFWEEK, NULL, BP_GET, 0},
{DISPID_GLOBAL_VBSUNDAY, NULL, BP_GET, 1},
{DISPID_GLOBAL_VBMONDAY, NULL, BP_GET, 2},
{DISPID_GLOBAL_VBTUESDAY, NULL, BP_GET, 3},
@@ -1786,9 +1744,9 @@ static const builtin_prop_t global_props[] = {
{DISPID_GLOBAL_VBTHURSDAY, NULL, BP_GET, 5},
{DISPID_GLOBAL_VBFRIDAY, NULL, BP_GET, 6},
{DISPID_GLOBAL_VBSATURDAY, NULL, BP_GET, 7},
- {DISPID_GLOBAL_VBFIRSTJAN1, Global_vbFirstJan1, BP_GET},
- {DISPID_GLOBAL_VBFIRSTFOURDAYS, Global_vbFirstFourDays, BP_GET},
- {DISPID_GLOBAL_VBFIRSTFULLWEEK, Global_vbFirstFullWeek, BP_GET},
+ {DISPID_GLOBAL_VBFIRSTJAN1, NULL, BP_GET, 1},
+ {DISPID_GLOBAL_VBFIRSTFOURDAYS, NULL, BP_GET, 2},
+ {DISPID_GLOBAL_VBFIRSTFULLWEEK, NULL, BP_GET, 3},
{DISPID_GLOBAL_VBOKONLY, NULL, BP_GET, MB_OK},
{DISPID_GLOBAL_VBOKCANCEL, NULL, BP_GET, MB_OKCANCEL},
{DISPID_GLOBAL_VBABORTRETRYIGNORE, NULL, BP_GET, MB_ABORTRETRYIGNORE},
@@ -1829,8 +1787,8 @@ static const builtin_prop_t global_props[] = {
{DISPID_GLOBAL_VBDECIMAL, NULL, BP_GET, VT_DECIMAL},
{DISPID_GLOBAL_VBBYTE, NULL, BP_GET, VT_UI1},
{DISPID_GLOBAL_VBARRAY, NULL, BP_GET, VT_ARRAY},
- {DISPID_GLOBAL_VBTRUE, Global_vbTrue, BP_GET},
- {DISPID_GLOBAL_VBFALSE, Global_vbFalse, BP_GET},
+ {DISPID_GLOBAL_VBTRUE, NULL, BP_GET, VARIANT_TRUE},
+ {DISPID_GLOBAL_VBFALSE, NULL, BP_GET, VARIANT_FALSE},
{DISPID_GLOBAL_VBUSEDEFAULT, Global_vbUseDefault, BP_GET},
{DISPID_GLOBAL_VBBINARYCOMPARE, Global_vbBinaryCompare, BP_GET},
{DISPID_GLOBAL_VBTEXTCOMPARE, Global_vbTextCompare, BP_GET},
diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs
index 4f8c544..966b256 100644
--- a/dlls/vbscript/tests/api.vbs
+++ b/dlls/vbscript/tests/api.vbs
@@ -69,6 +69,13 @@ TestConstant "vbDefaultButton3", vbDefaultButton3, 512
TestConstant "vbDefaultButton4", vbDefaultButton4, 768
TestConstant "vbApplicationModal", vbApplicationModal, 0
TestConstant "vbSystemModal", vbSystemModal, 4096
+TestConstant "vbUseSystem", vbUseSystem, 0
+TestConstant "vbUseSystemDayOfWeek", vbUseSystemDayOfWeek, 0
+TestConstant "vbFirstJan1", vbFirstJan1, 1
+TestConstant "vbFirstFourDays", vbFirstFourDays, 2
+TestConstant "vbFirstFullWeek", vbFirstFullWeek, 3
+TestConstant "vbTrue", vbTrue, -1
+TestConstant "vbFalse", vbFalse, 0
Sub TestCStr(arg, exval)
dim x
More information about the wine-cvs
mailing list