diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 9d3da6f4a62..0591154491c 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -175,7 +175,7 @@ static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, if(FAILED(hres)) return hres; - hres = jsdisp_propput_idx(array, *len+i, &var, ei, caller); + hres = jsdisp_propput_idx(array, *len+i, &var, ei); VariantClear(&var); if(FAILED(hres)) return hres; @@ -203,7 +203,7 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_ V_VT(&var) = VT_DISPATCH; V_DISPATCH(&var) = obj; - return jsdisp_propput_idx(array, (*len)++, &var, ei, caller); + return jsdisp_propput_idx(array, (*len)++, &var, ei); } static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISPPARAMS *dp, @@ -229,7 +229,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(V_VT(arg) == VT_DISPATCH) hres = concat_obj(ret, V_DISPATCH(arg), &len, ei, caller); else - hres = jsdisp_propput_idx(ret, len++, arg, ei, caller); + hres = jsdisp_propput_idx(ret, len++, arg, ei); if(FAILED(hres)) break; } @@ -443,7 +443,7 @@ static HRESULT Array_push(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR n = arg_cnt(dp); for(i=0; i < n; i++) { - hres = jsdisp_propput_idx(jsthis, length+i, get_arg(dp, i), ei, sp); + hres = jsdisp_propput_idx(jsthis, length+i, get_arg(dp, i), ei); if(FAILED(hres)) return hres; } @@ -489,7 +489,7 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP if(hres1 == DISP_E_UNKNOWNNAME) hres1 = jsdisp_delete_idx(jsthis, l); else - hres1 = jsdisp_propput_idx(jsthis, l, &v1, ei, sp); + hres1 = jsdisp_propput_idx(jsthis, l, &v1, ei); if(FAILED(hres1)) { VariantClear(&v1); @@ -500,7 +500,7 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP if(hres2 == DISP_E_UNKNOWNNAME) hres2 = jsdisp_delete_idx(jsthis, k); else - hres2 = jsdisp_propput_idx(jsthis, k, &v2, ei, sp); + hres2 = jsdisp_propput_idx(jsthis, k, &v2, ei); if(FAILED(hres2)) { VariantClear(&v2); @@ -554,7 +554,7 @@ static HRESULT Array_shift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i-1); else if(SUCCEEDED(hres)) - hres = jsdisp_propput_idx(jsthis, i-1, &v, ei, caller); + hres = jsdisp_propput_idx(jsthis, i-1, &v, ei); } if(SUCCEEDED(hres)) { @@ -630,7 +630,7 @@ static HRESULT Array_slice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPA continue; if(SUCCEEDED(hres)) { - hres = jsdisp_propput_idx(arr, idx-start, &v, ei, sp); + hres = jsdisp_propput_idx(arr, idx-start, &v, ei); VariantClear(&v); } @@ -836,7 +836,7 @@ static HRESULT Array_sort(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPAR } for(i=0; SUCCEEDED(hres) && i < length; i++) - hres = jsdisp_propput_idx(jsthis, i, sorttab[i], ei, caller); + hres = jsdisp_propput_idx(jsthis, i, sorttab[i], ei); } if(vtab) { @@ -915,7 +915,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP if(hres == DISP_E_UNKNOWNNAME) hres = S_OK; else if(SUCCEEDED(hres)) - hres = jsdisp_propput_idx(ret_array, i, &v, ei, caller); + hres = jsdisp_propput_idx(ret_array, i, &v, ei); } if(SUCCEEDED(hres)) { @@ -932,7 +932,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args); else if(SUCCEEDED(hres)) - hres = jsdisp_propput_idx(jsthis, i+add_args, &v, ei, caller); + hres = jsdisp_propput_idx(jsthis, i+add_args, &v, ei); } for(i=length; SUCCEEDED(hres) && i != length-delete_cnt+add_args; i--) @@ -943,12 +943,12 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args-1); else if(SUCCEEDED(hres)) - hres = jsdisp_propput_idx(jsthis, i+add_args-1, &v, ei, caller); + hres = jsdisp_propput_idx(jsthis, i+add_args-1, &v, ei); } } for(i=0; SUCCEEDED(hres) && i < add_args; i++) - hres = jsdisp_propput_idx(jsthis, start+i, get_arg(dp,i+2), ei, caller); + hres = jsdisp_propput_idx(jsthis, start+i, get_arg(dp,i+2), ei); if(SUCCEEDED(hres)) { V_VT(&v) = VT_I4; @@ -1021,7 +1021,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP if(FAILED(hres)) return hres; - hres = jsdisp_propput_idx(jsthis, i+argc, &var, ei, caller); + hres = jsdisp_propput_idx(jsthis, i+argc, &var, ei); VariantClear(&var); }else if(hres == DISP_E_UNKNOWNNAME) { hres = IDispatchEx_DeleteMemberByDispID(vthis->u.dispex, id); @@ -1033,7 +1033,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP } for(i=0; iu.var, val); } -HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, VARIANT *val, jsexcept_t *ei) { WCHAR buf[12]; diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 265269cb426..72626d5daec 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1222,7 +1222,7 @@ static HRESULT interp_carray(exec_ctx_t *ctx) i = arg; while(i--) { v = stack_pop(ctx); - hres = jsdisp_propput_idx(array, i, v, ctx->ei, NULL/*FIXME*/); + hres = jsdisp_propput_idx(array, i, v, ctx->ei); VariantClear(v); if(FAILED(hres)) { jsdisp_release(array); diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 87c009798ef..aeef2b28535 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -113,7 +113,7 @@ static const builtin_info_t Arguments_info = { }; static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS *dp, - jsexcept_t *ei, IServiceProvider *caller, jsdisp_t **ret) + jsexcept_t *ei, jsdisp_t **ret) { jsdisp_t *args; VARIANT var; @@ -133,7 +133,7 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS } for(i=0; i < arg_cnt(dp); i++) { - hres = jsdisp_propput_idx(args, i, get_arg(dp,i), ei, caller); + hres = jsdisp_propput_idx(args, i, get_arg(dp,i), ei); if(FAILED(hres)) break; } @@ -196,8 +196,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis return E_FAIL; } - hres = create_arguments(ctx, to_disp(&function->dispex), - dp, ei, caller, &arg_disp); + hres = create_arguments(ctx, to_disp(&function->dispex), dp, ei, &arg_disp); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index bfde889adfc..4b71bf79d11 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -215,7 +215,7 @@ HRESULT disp_propput(script_ctx_t*,IDispatch*,DISPID,VARIANT*,jsexcept_t*) DECLS HRESULT jsdisp_propget(jsdisp_t*,DISPID,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; -HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; +HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN; HRESULT jsdisp_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/regexp.c b/dlls/jscript/regexp.c index 32f45a5a88b..00b24d513a0 100644 --- a/dlls/jscript/regexp.c +++ b/dlls/jscript/regexp.c @@ -3605,7 +3605,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res break; } - hres = jsdisp_propput_idx(array, i+1, &var, ei, NULL/*FIXME*/); + hres = jsdisp_propput_idx(array, i+1, &var, ei); SysFreeString(V_BSTR(&var)); if(FAILED(hres)) break; @@ -3989,7 +3989,7 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, BSTR str, break; } - hres = jsdisp_propput_idx(array, i, &var, ei, NULL/*FIXME*/); + hres = jsdisp_propput_idx(array, i, &var, ei); SysFreeString(V_BSTR(&var)); if(FAILED(hres)) break; diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 44450e4f3ad..d30b4bd72e7 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1233,7 +1233,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP break; } - hres = jsdisp_propput_idx(array, i, &var, ei, sp); + hres = jsdisp_propput_idx(array, i, &var, ei); SysFreeString(V_BSTR(&var)); if(FAILED(hres)) break; @@ -1255,7 +1255,7 @@ static HRESULT String_split(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP V_BSTR(&var) = SysAllocStringLen(ptr, len); if(V_BSTR(&var)) { - hres = jsdisp_propput_idx(array, i, &var, ei, sp); + hres = jsdisp_propput_idx(array, i, &var, ei); SysFreeString(V_BSTR(&var)); }else { hres = E_OUTOFMEMORY; diff --git a/dlls/jscript/vbarray.c b/dlls/jscript/vbarray.c index da17a07090f..6d71279c216 100644 --- a/dlls/jscript/vbarray.c +++ b/dlls/jscript/vbarray.c @@ -166,7 +166,7 @@ static HRESULT VBArray_toArray(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DI } for(i=0; isafearray); jsdisp_release(array);