ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Directly return error code instead of using throw_reference_error. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2020-01-31 17:23:05 +01:00 committed by Alexandre Julliard
parent b67c957f39
commit c372e79e25
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/jscript/engine.c
View File

@ -898,7 +898,7 @@ static HRESULT interp_throw_ref(script_ctx_t *ctx)
TRACE("%08x\n", arg); TRACE("%08x\n", arg);
return throw_reference_error(ctx, arg, NULL); return arg;
} }
static HRESULT interp_throw_type(script_ctx_t *ctx) static HRESULT interp_throw_type(script_ctx_t *ctx)
@ -1161,7 +1161,7 @@ static HRESULT interp_refval(script_ctx_t *ctx)
TRACE("\n"); TRACE("\n");
if(!stack_topn_exprval(ctx, 0, &ref)) if(!stack_topn_exprval(ctx, 0, &ref))
return throw_reference_error(ctx, JS_E_ILLEGAL_ASSIGN, NULL); return JS_E_ILLEGAL_ASSIGN;
hres = exprval_propget(ctx, &ref, &v); hres = exprval_propget(ctx, &ref, &v);
if(FAILED(hres)) if(FAILED(hres))
@ -2527,7 +2527,7 @@ static HRESULT interp_assign(script_ctx_t *ctx)
if(!stack_pop_exprval(ctx, &ref)) { if(!stack_pop_exprval(ctx, &ref)) {
jsval_release(v); jsval_release(v);
return throw_reference_error(ctx, JS_E_ILLEGAL_ASSIGN, NULL); return JS_E_ILLEGAL_ASSIGN;
} }
hres = exprval_propput(ctx, &ref, v); hres = exprval_propput(ctx, &ref, v);
@ -2551,7 +2551,7 @@ static HRESULT interp_assign_call(script_ctx_t *ctx)
TRACE("%u\n", argc); TRACE("%u\n", argc);
if(!stack_topn_exprval(ctx, argc+1, &ref)) if(!stack_topn_exprval(ctx, argc+1, &ref))
return throw_reference_error(ctx, JS_E_ILLEGAL_ASSIGN, NULL); return JS_E_ILLEGAL_ASSIGN;
hres = exprval_call(ctx, &ref, DISPATCH_PROPERTYPUT, argc+1, stack_args(ctx, argc+1), NULL); hres = exprval_call(ctx, &ref, DISPATCH_PROPERTYPUT, argc+1, stack_args(ctx, argc+1), NULL);
if(FAILED(hres)) if(FAILED(hres))

5
dlls/jscript/error.c
View File

@ -435,11 +435,6 @@ static HRESULT throw_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str, j
return error; return error;
} }
HRESULT throw_reference_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str)
{
return throw_error(ctx, error, str, ctx->reference_error_constr);
}
HRESULT throw_regexp_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str) HRESULT throw_regexp_error(script_ctx_t *ctx, HRESULT error, const WCHAR *str)
{ {
return throw_error(ctx, error, str, ctx->regexp_error_constr); return throw_error(ctx, error, str, ctx->regexp_error_constr);

1
dlls/jscript/jscript.h
View File

@ -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; struct _function_code_t *Function_get_code(jsdisp_t*) DECLSPEC_HIDDEN;
#define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value} #define DEFAULT_FUNCTION_VALUE {NULL, Function_value,0, Function_get_value}
HRESULT throw_reference_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;
HRESULT throw_regexp_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; 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_syntax_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;
HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN; HRESULT throw_type_error(script_ctx_t*,HRESULT,const WCHAR*) DECLSPEC_HIDDEN;