[PATCH 1/1] vbscript: Use return_bool in more places.
Jacek Caban
wine at gitlab.winehq.org
Tue Jun 7 12:00:26 CDT 2022
From: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
---
dlls/vbscript/global.c | 25 ++++---------------------
1 file changed, 4 insertions(+), 21 deletions(-)
diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c
index 731a062dea2..9bc9349dd55 100644
--- a/dlls/vbscript/global.c
+++ b/dlls/vbscript/global.c
@@ -937,11 +937,7 @@ static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt,
{
TRACE("%s\n", debugstr_variant(arg));
- if(res) {
- V_VT(res) = VT_BOOL;
- V_BOOL(res) = V_VT(arg) == VT_DATE ? VARIANT_TRUE : VARIANT_FALSE;
- }
- return S_OK;
+ return return_bool(res, V_VT(arg) == VT_DATE);
}
static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
@@ -949,12 +945,7 @@ static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt
TRACE("(%s)\n", debugstr_variant(arg));
assert(args_cnt == 1);
-
- if(res) {
- V_VT(res) = VT_BOOL;
- V_BOOL(res) = V_VT(arg) == VT_EMPTY ? VARIANT_TRUE : VARIANT_FALSE;
- }
- return S_OK;
+ return return_bool(res, V_VT(arg) == VT_EMPTY);
}
static HRESULT Global_IsNull(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
@@ -963,11 +954,7 @@ static HRESULT Global_IsNull(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt,
assert(args_cnt == 1);
- if(res) {
- V_VT(res) = VT_BOOL;
- V_BOOL(res) = V_VT(arg) == VT_NULL ? VARIANT_TRUE : VARIANT_FALSE;
- }
- return S_OK;
+ return return_bool(res, V_VT(arg) == VT_NULL);
}
static HRESULT Global_IsNumeric(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
@@ -999,11 +986,7 @@ static HRESULT Global_IsObject(BuiltinDisp *This, VARIANT *arg, unsigned args_cn
assert(args_cnt == 1);
- if(res) {
- V_VT(res) = VT_BOOL;
- V_BOOL(res) = V_VT(arg) == VT_DISPATCH ? VARIANT_TRUE : VARIANT_FALSE;
- }
- return S_OK;
+ return return_bool(res, V_VT(arg) == VT_DISPATCH);
}
static HRESULT Global_Atn(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res)
--
GitLab
https://gitlab.winehq.org/wine/wine/-/merge_requests/200
More information about the wine-devel
mailing list