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

jscript: Removed no longer needed caller argument of disp_call function.

This commit is contained in:
Jacek Caban 2012-03-08 14:28:33 +01:00 committed by Alexandre Julliard
parent dfb59c6049
commit e0ae18260e
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/jscript/dispex.c
View File

@ -368,7 +368,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
hres = disp_call(This->ctx, V_DISPATCH(&prop->u.var), DISPID_VALUE, flags, &new_dp, retv, ei, caller); hres = disp_call(This->ctx, V_DISPATCH(&prop->u.var), DISPID_VALUE, flags, &new_dp, retv, ei);
if(new_dp.rgvarg != dp->rgvarg) { if(new_dp.rgvarg != dp->rgvarg) {
heap_free(new_dp.rgvarg); heap_free(new_dp.rgvarg);
@ -991,8 +991,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT
return hres; return hres;
} }
HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei)
jsexcept_t *ei, IServiceProvider *caller)
{ {
dispex_prop_t *prop; dispex_prop_t *prop;
@ -1004,7 +1003,7 @@ HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIA
if(!prop) if(!prop)
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
return invoke_prop_func(disp, disp, prop, flags, dp, retv, ei, caller); return invoke_prop_func(disp, disp, prop, flags, dp, retv, ei, NULL);
} }
HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARAMS *dp, VARIANT *retv, HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARAMS *dp, VARIANT *retv,
@ -1024,8 +1023,7 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARA
return invoke_prop_func(disp, disp, prop, flags, dp, retv, ei, caller); return invoke_prop_func(disp, disp, prop, flags, dp, retv, ei, caller);
} }
HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei)
jsexcept_t *ei, IServiceProvider *caller)
{ {
jsdisp_t *jsdisp; jsdisp_t *jsdisp;
IDispatchEx *dispex; IDispatchEx *dispex;
@ -1033,7 +1031,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS
jsdisp = iface_to_jsdisp((IUnknown*)disp); jsdisp = iface_to_jsdisp((IUnknown*)disp);
if(jsdisp) { if(jsdisp) {
hres = jsdisp_call(jsdisp, id, flags, dp, retv, ei, caller); hres = jsdisp_call(jsdisp, id, flags, dp, retv, ei);
jsdisp_release(jsdisp); jsdisp_release(jsdisp);
return hres; return hres;
} }

6
dlls/jscript/engine.c
View File

@ -990,7 +990,7 @@ static HRESULT interp_new(exec_ctx_t *ctx)
jsstack_to_dp(ctx, arg, &dp); jsstack_to_dp(ctx, arg, &dp);
hres = disp_call(ctx->parser->script, V_DISPATCH(constr), DISPID_VALUE, hres = disp_call(ctx->parser->script, V_DISPATCH(constr), DISPID_VALUE,
DISPATCH_CONSTRUCT, &dp, &v, ctx->ei, NULL/*FIXME*/); DISPATCH_CONSTRUCT, &dp, &v, ctx->ei);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
@ -1015,7 +1015,7 @@ static HRESULT interp_call(exec_ctx_t *ctx)
jsstack_to_dp(ctx, argn, &dp); jsstack_to_dp(ctx, argn, &dp);
hres = disp_call(ctx->parser->script, V_DISPATCH(objv), DISPID_VALUE, DISPATCH_METHOD, &dp, hres = disp_call(ctx->parser->script, V_DISPATCH(objv), DISPID_VALUE, DISPATCH_METHOD, &dp,
do_ret ? &v : NULL, ctx->ei, NULL/*FIXME*/); do_ret ? &v : NULL, ctx->ei);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
@ -1042,7 +1042,7 @@ static HRESULT interp_call_member(exec_ctx_t *ctx)
return throw_type_error(ctx->parser->script, ctx->ei, id, NULL); return throw_type_error(ctx->parser->script, ctx->ei, id, NULL);
jsstack_to_dp(ctx, argn, &dp); jsstack_to_dp(ctx, argn, &dp);
hres = disp_call(ctx->parser->script, obj, id, DISPATCH_METHOD, &dp, do_ret ? &v : NULL, ctx->ei, NULL/*FIXME*/); hres = disp_call(ctx->parser->script, obj, id, DISPATCH_METHOD, &dp, do_ret ? &v : NULL, ctx->ei);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;

4
dlls/jscript/jscript.h
View File

@ -206,9 +206,9 @@ HRESULT create_dispex(script_ctx_t*,const builtin_info_t*,jsdisp_t*,jsdisp_t**)
HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN;
HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN; HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DECLSPEC_HIDDEN;
HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT disp_call(script_ctx_t*,IDispatch*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_value(jsdisp_t*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_call_name(jsdisp_t*,const WCHAR*,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;

4
dlls/jscript/jsutils.c
View File

@ -221,7 +221,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? toStringW : valueOfW, 0, &id); hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? toStringW : valueOfW, 0, &id);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("call error - forwarding exception\n"); WARN("call error - forwarding exception\n");
jsdisp_release(jsdisp); jsdisp_release(jsdisp);
@ -237,7 +237,7 @@ HRESULT to_primitive(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret
hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? valueOfW : toStringW, 0, &id); hres = jsdisp_get_id(jsdisp, hint == HINT_STRING ? valueOfW : toStringW, 0, &id);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei, NULL /*FIXME*/); hres = jsdisp_call(jsdisp, id, DISPATCH_METHOD, &dp, ret, ei);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("call error - forwarding exception\n"); WARN("call error - forwarding exception\n");
jsdisp_release(jsdisp); jsdisp_release(jsdisp);