From 07be020a48ca9cab5dd7b9d110d550453075538e Mon Sep 17 00:00:00 2001 From: Jacek Caban Date: Mon, 12 Mar 2012 12:13:10 +0100 Subject: [PATCH] jscript: Removed no longer needed caller argument from jsdisp_call_value. --- dlls/jscript/array.c | 9 ++++----- dlls/jscript/dispex.c | 5 ++--- dlls/jscript/global.c | 2 +- dlls/jscript/jscript.h | 2 +- dlls/jscript/string.c | 6 +++--- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index f99fe016e8d..51fd94d9b8c 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -648,8 +648,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA return S_OK; } -static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, VARIANT *v1, VARIANT *v2, jsexcept_t *ei, - IServiceProvider *caller, INT *cmp) +static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, VARIANT *v1, VARIANT *v2, jsexcept_t *ei, INT *cmp) { HRESULT hres; @@ -662,7 +661,7 @@ static HRESULT sort_cmp(script_ctx_t *ctx, jsdisp_t *cmp_func, VARIANT *v1, VARI args[0] = *v2; args[1] = *v1; - hres = jsdisp_call_value(cmp_func, DISPATCH_METHOD, &dp, &res, ei, caller); + hres = jsdisp_call_value(cmp_func, DISPATCH_METHOD, &dp, &res, ei); if(FAILED(hres)) return hres; @@ -786,7 +785,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR sorttab[i] = vtab+i; for(i=0; i < length/2; i++) { - hres = sort_cmp(ctx, cmp_func, sorttab[2*i+1], sorttab[2*i], ei, caller, &cmp); + hres = sort_cmp(ctx, cmp_func, sorttab[2*i+1], sorttab[2*i], ei, &cmp); if(FAILED(hres)) break; @@ -811,7 +810,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR memcpy(tmpbuf, sorttab+i, k*sizeof(VARIANT*)); while(a < k && b < bend) { - hres = sort_cmp(ctx, cmp_func, tmpbuf[a], sorttab[i+k+b], ei, caller, &cmp); + hres = sort_cmp(ctx, cmp_func, tmpbuf[a], sorttab[i+k+b], ei, &cmp); if(FAILED(hres)) break; diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 5ce98e762a0..f94e41d2878 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -979,14 +979,13 @@ HRESULT jsdisp_get_id(jsdisp_t *jsdisp, const WCHAR *name, DWORD flags, DISPID * return DISP_E_UNKNOWNNAME; } -HRESULT jsdisp_call_value(jsdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, - jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_call_value(jsdisp_t *jsthis, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei) { vdisp_t vdisp; HRESULT hres; set_jsdisp(&vdisp, jsthis); - hres = jsthis->builtin_info->value_prop.invoke(jsthis->ctx, &vdisp, flags, dp, retv, ei, caller); + hres = jsthis->builtin_info->value_prop.invoke(jsthis->ctx, &vdisp, flags, dp, retv, ei, NULL); vdisp_release(&vdisp); return hres; } diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index c196e884f97..c8e740ec96b 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -117,7 +117,7 @@ static HRESULT constructor_call(jsdisp_t *constr, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *sp) { if(flags != DISPATCH_PROPERTYGET) - return jsdisp_call_value(constr, flags, dp, retv, ei, sp); + return jsdisp_call_value(constr, flags, dp, retv, ei); jsdisp_addref(constr); var_set_jsdisp(retv, constr); diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index cdb8eb6b80a..ee8999c4e65 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -207,7 +207,7 @@ HRESULT init_dispex(jsdisp_t*,script_ctx_t*,const builtin_info_t*,jsdisp_t*) DEC 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*) 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*) 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*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9c947a11380..44450e4f3ad 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -711,7 +711,7 @@ static HRESULT strbuf_append(strbuf_t *buf, const WCHAR *str, DWORD len) } static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, const WCHAR *str, match_result_t *match, - match_result_t *parens, DWORD parens_cnt, BSTR *ret, jsexcept_t *ei, IServiceProvider *caller) + match_result_t *parens, DWORD parens_cnt, BSTR *ret, jsexcept_t *ei) { DISPPARAMS dp = {NULL, NULL, 0, 0}; VARIANTARG *args, *arg; @@ -755,7 +755,7 @@ static HRESULT rep_call(script_ctx_t *ctx, jsdisp_t *func, const WCHAR *str, mat } if(SUCCEEDED(hres)) - hres = jsdisp_call_value(func, DISPATCH_METHOD, &dp, &var, ei, caller); + hres = jsdisp_call_value(func, DISPATCH_METHOD, &dp, &var, ei); for(i=0; i < parens_cnt+3; i++) { if(i != parens_cnt+1) @@ -884,7 +884,7 @@ static HRESULT String_replace(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI if(rep_func) { BSTR cstr; - hres = rep_call(ctx, rep_func, str, &match, parens, parens_cnt, &cstr, ei, caller); + hres = rep_call(ctx, rep_func, str, &match, parens, parens_cnt, &cstr, ei); if(FAILED(hres)) break;