Jacek Caban : vbscript: Use simplified constant implementation for more constants.
Alexandre Julliard
julliard at winehq.org
Fri Dec 7 11:06:43 CST 2012
Module: wine
Branch: master
Commit: d10d989feddd5dfc8ffac7d9e5cf8ff357c0a3b9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d10d989feddd5dfc8ffac7d9e5cf8ff357c0a3b9
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Dec 7 13:00:35 2012 +0100
vbscript: Use simplified constant implementation for more constants.
---
dlls/vbscript/global.c | 56 ++++++------------------------------------------
1 files changed, 7 insertions(+), 49 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 420a5a5..cba4edc 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -1638,48 +1638,6 @@ static HRESULT Global_vbSystemModal(vbdisp_t *This, VARIANT *arg, unsigned args_
return E_NOTIMPL;
}
-static HRESULT Global_vbOK(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- TRACE("\n");
- return return_short(res, IDOK);
-}
-
-static HRESULT Global_vbCancel(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- TRACE("\n");
- return return_short(res, IDCANCEL);
-}
-
-static HRESULT Global_vbAbort(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- TRACE("\n");
- return return_short(res, IDABORT);
-}
-
-static HRESULT Global_vbRetry(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- TRACE("\n");
- return return_short(res, IDRETRY);
-}
-
-static HRESULT Global_vbIgnore(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- TRACE("\n");
- return return_short(res, IDIGNORE);
-}
-
-static HRESULT Global_vbYes(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- TRACE("\n");
- return return_short(res, IDYES);
-}
-
-static HRESULT Global_vbNo(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
-{
- TRACE("\n");
- return return_short(res, IDNO);
-}
-
static HRESULT Global_vbTrue(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
{
FIXME("\n");
@@ -1907,13 +1865,13 @@ static const builtin_prop_t global_props[] = {
{DISPID_GLOBAL_VBDEFAULTBUTTON4, Global_vbDefaultButton4, BP_GET},
{DISPID_GLOBAL_VBAPPLICATIONMODAL, Global_vbApplicationModal, BP_GET},
{DISPID_GLOBAL_VBSYSTEMMODAL, Global_vbSystemModal, BP_GET},
- {DISPID_GLOBAL_VBOK, Global_vbOK, BP_GET},
- {DISPID_GLOBAL_VBCANCEL, Global_vbCancel, BP_GET},
- {DISPID_GLOBAL_VBABORT, Global_vbAbort, BP_GET},
- {DISPID_GLOBAL_VBRETRY, Global_vbRetry, BP_GET},
- {DISPID_GLOBAL_VBIGNORE, Global_vbIgnore, BP_GET},
- {DISPID_GLOBAL_VBYES, Global_vbYes, BP_GET},
- {DISPID_GLOBAL_VBNO, Global_vbNo, BP_GET},
+ {DISPID_GLOBAL_VBOK, NULL, BP_GET, IDOK},
+ {DISPID_GLOBAL_VBCANCEL, NULL, BP_GET, IDCANCEL},
+ {DISPID_GLOBAL_VBABORT, NULL, BP_GET, IDABORT},
+ {DISPID_GLOBAL_VBRETRY, NULL, BP_GET, IDRETRY},
+ {DISPID_GLOBAL_VBIGNORE, NULL, BP_GET, IDIGNORE},
+ {DISPID_GLOBAL_VBYES, NULL, BP_GET, IDYES},
+ {DISPID_GLOBAL_VBNO, NULL, BP_GET, IDNO},
{DISPID_GLOBAL_VBEMPTY, NULL, BP_GET, VT_EMPTY},
{DISPID_GLOBAL_VBNULL, NULL, BP_GET, VT_NULL},
{DISPID_GLOBAL_VBINTEGER, NULL, BP_GET, VT_I2},
More information about the wine-cvs
mailing list