From 0167f4a7dd08b288a89973df5bb9e92e5ae03cc7 Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Fri, 31 Jan 2020 17:23:10 +0100 Subject: [PATCH] jscript: Directly return error code instead of using throw_regexp_error. Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- dlls/jscript/error.c | 5 ----- dlls/jscript/jscript.h | 1 - dlls/jscript/jsregexp.c | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/dlls/jscript/error.c b/dlls/jscript/error.c index 8a49c973dcd..084e8ce9532 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_regexp_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) -{ - return throw_error(ctx, error, str, ctx->regexp_error_constr); -} - HRESULT throw_syntax_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) { return throw_error(ctx, error, str, ctx->syntax_error_constr); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index 678c02acf6b..cf5870f8a1d 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -312,7 +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_regexp_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_syntax_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_uri_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsregexp.c b/dlls/jscript/jsregexp.c index 9a6ad0e37ed..fc9255e1a18 100644 --- a/dlls/jscript/jsregexp.c +++ b/dlls/jscript/jsregexp.c @@ -935,7 +935,7 @@ static HRESULT RegExpConstr_value(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(is_class(jsdisp, JSCLASS_REGEXP)) { if(argc > 1 && !is_undefined(argv[1])) { jsdisp_release(jsdisp); - return throw_regexp_error(ctx, JS_E_REGEXP_SYNTAX, NULL); + return JS_E_REGEXP_SYNTAX; } if(r)