Module: wine Branch: master Commit: 1d487027a0410262f09af195fbc69792291771ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d487027a0410262f09af195f...
Author: Jacek Caban jacek@codeweavers.com Date: Fri Jan 31 17:22:54 2020 +0100
jscript: Directly return error code instead of using throw_generic_error.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/jscript/activex.c | 2 +- dlls/jscript/error.c | 5 ----- dlls/jscript/jscript.h | 2 -- 3 files changed, 1 insertion(+), 8 deletions(-)
diff --git a/dlls/jscript/activex.c b/dlls/jscript/activex.c index 1c2631cc77..9c8c681b5e 100644 --- a/dlls/jscript/activex.c +++ b/dlls/jscript/activex.c @@ -172,7 +172,7 @@ static HRESULT ActiveXObject_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag obj = create_activex_object(ctx, progid); jsstr_release(progid_str); if(!obj) - return throw_generic_error(ctx, JS_E_CANNOT_CREATE_OBJ, NULL); + return JS_E_CANNOT_CREATE_OBJ;
hres = IUnknown_QueryInterface(obj, &IID_IDispatch, (void**)&disp); IUnknown_Release(obj); diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 7b35e16600..e52310d473 100644 --- a/dlls/jscript/error.c +++ b/dlls/jscript/error.c @@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j return error; }
-HRESULT throw_generic_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) -{ - return throw_error(ctx, error, str, ctx->error_constr); -} - HRESULT throw_range_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) { return throw_error(ctx, error, str, ctx->range_error_constr); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 93c6f92bae..05dcfd01a1 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -312,8 +312,6 @@ HRESULT Function_get_value(script_ctx_t*,jsdisp_t*,jsval_t*) DECLSPEC_HIDDEN; struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN; #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value}
-HRESULT throw_eval_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; -HRESULT throw_generic_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_range_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_reference_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_regexp_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;