Jacek Caban : jscript: Removed no longer needed caller argument of disp_call function.
Alexandre Julliard
julliard at winehq.org
Fri Mar 9 12:34:19 CST 2012
Module: wine
Branch: master
Commit: e0ae18260e66026e9591ff8d43742008c206e52e
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0ae18260e66026e9591ff8d43742008c206e52e
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Mar 8 14:28:33 2012 +0100
jscript: Removed no longer needed caller argument of disp_call function.
---
dlls/jscript/dispex.c | 12 +++++-------
dlls/jscript/engine.c | 6 +++---
dlls/jscript/jscript.h | 4 ++--
dlls/jscript/jsutils.c | 4 ++--
4 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 4ffb378..07c4cb7 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -368,7 +368,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t
if(FAILED(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) {
heap_free(new_dp.rgvarg);
@@ -991,8 +991,7 @@ HRESULT jsdisp_call_value(jsdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT
return hres;
}
-HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv,
- jsexcept_t *ei, IServiceProvider *caller)
+HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei)
{
dispex_prop_t *prop;
@@ -1004,7 +1003,7 @@ HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIA
if(!prop)
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,
@@ -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);
}
-HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv,
- jsexcept_t *ei, IServiceProvider *caller)
+HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei)
{
jsdisp_t *jsdisp;
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);
if(jsdisp) {
- hres = jsdisp_call(jsdisp, id, flags, dp, retv, ei, caller);
+ hres = jsdisp_call(jsdisp, id, flags, dp, retv, ei);
jsdisp_release(jsdisp);
return hres;
}
diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c
index 0ae142a..b96c55f 100644
--- a/dlls/jscript/engine.c
+++ b/dlls/jscript/engine.c
@@ -990,7 +990,7 @@ static HRESULT interp_new(exec_ctx_t *ctx)
jsstack_to_dp(ctx, arg, &dp);
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))
return hres;
@@ -1015,7 +1015,7 @@ static HRESULT interp_call(exec_ctx_t *ctx)
jsstack_to_dp(ctx, argn, &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))
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);
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))
return hres;
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index 9248f23..ed2402d 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -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_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(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 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;
diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c
index ba9f780..33540d7 100644
--- a/dlls/jscript/jsutils.c
+++ b/dlls/jscript/jsutils.c
@@ -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);
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)) {
WARN("call error - forwarding exception\n");
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);
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)) {
WARN("call error - forwarding exception\n");
jsdisp_release(jsdisp);
More information about the wine-cvs
mailing list