Jacek Caban : jscript: Removed no longer needed caller argument from jsdisp_call_name.
Alexandre Julliard
julliard at winehq.org
Mon Mar 12 11:59:59 CDT 2012
Module: wine
Branch: master
Commit: a80dd7cb79967706cdb8a9b0276d7063a15e99ab
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a80dd7cb79967706cdb8a9b0276d7063a15e99ab
Author: Jacek Caban <jacek at codeweavers.com>
Date: Mon Mar 12 12:13:25 2012 +0100
jscript: Removed no longer needed caller argument from jsdisp_call_name.
---
dlls/jscript/dispex.c | 4 ++--
dlls/jscript/jscript.h | 2 +-
dlls/jscript/object.c | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index f94e41d..ddd149f 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -1006,7 +1006,7 @@ HRESULT jsdisp_call(jsdisp_t *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIA
}
HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARAMS *dp, VARIANT *retv,
- jsexcept_t *ei, IServiceProvider *caller)
+ jsexcept_t *ei)
{
dispex_prop_t *prop;
HRESULT hres;
@@ -1019,7 +1019,7 @@ HRESULT jsdisp_call_name(jsdisp_t *disp, const WCHAR *name, WORD flags, DISPPARA
if(retv)
V_VT(retv) = VT_EMPTY;
- 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 disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei)
diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h
index ee8999c..1a30b3f 100644
--- a/dlls/jscript/jscript.h
+++ b/dlls/jscript/jscript.h
@@ -209,7 +209,7 @@ HRESULT init_dispex_from_constr(jsdisp_t*,script_ctx_t*,const builtin_info_t*,js
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*) 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*) DECLSPEC_HIDDEN;
HRESULT disp_propget(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c
index c1137c1..8c64122 100644
--- a/dlls/jscript/object.c
+++ b/dlls/jscript/object.c
@@ -90,7 +90,7 @@ static HRESULT Object_toLocaleString(script_ctx_t *ctx, vdisp_t *jsthis, WORD fl
return E_FAIL;
}
- return jsdisp_call_name(jsthis->u.jsdisp, toStringW, DISPATCH_METHOD, ¶ms, retv, ei, sp);
+ return jsdisp_call_name(jsthis->u.jsdisp, toStringW, DISPATCH_METHOD, ¶ms, retv, ei);
}
static HRESULT Object_valueOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp,
More information about the wine-cvs
mailing list