[PATCH 0/1] MR324: vbscript: Use return_null in more places.
Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/324
From: Robert Wilhelm <robert.wilhelm(a)gmx.net> Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 9bc9349dd55..4b5dee6ebc3 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -848,9 +848,7 @@ static HRESULT Global_Hex(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA n = (WORD)V_I2(arg); break; case VT_NULL: - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); default: hres = to_int(arg, &ret); if(FAILED(hres)) @@ -889,9 +887,7 @@ static HRESULT Global_Oct(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VA n = (WORD)V_I2(arg); break; case VT_NULL: - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); default: hres = to_int(arg, &ret); if(FAILED(hres)) @@ -1430,9 +1426,7 @@ static HRESULT Global_LCase(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); if(V_VT(arg) == VT_NULL) { - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); } hres = to_string(arg, &str); @@ -1461,9 +1455,7 @@ static HRESULT Global_UCase(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, TRACE("%s\n", debugstr_variant(arg)); if(V_VT(arg) == VT_NULL) { - if(res) - V_VT(res) = VT_NULL; - return S_OK; + return return_null(res); } hres = to_string(arg, &str); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/324
This merge request was approved by Jacek Caban. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/324
participants (3)
-
Jacek Caban (@jacek) -
Robert Wilhelm -
Robert Wilhelm (@sloper42)