diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index 4cba6343e8d..8a75bbe1e12 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -161,15 +161,14 @@ static HRESULT Array_length(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return S_OK; } -static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, - jsexcept_t *ei, IServiceProvider *caller) +static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, jsexcept_t *ei) { VARIANT var; DWORD i; HRESULT hres; for(i=0; i < obj->length; i++) { - hres = jsdisp_get_idx(&obj->dispex, i, &var, ei, caller); + hres = jsdisp_get_idx(&obj->dispex, i, &var, ei); if(hres == DISP_E_UNKNOWNNAME) continue; if(FAILED(hres)) @@ -185,7 +184,7 @@ static HRESULT concat_array(jsdisp_t *array, ArrayInstance *obj, DWORD *len, return S_OK; } -static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_t *ei, IServiceProvider *caller) +static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_t *ei) { jsdisp_t *jsobj; VARIANT var; @@ -194,7 +193,7 @@ static HRESULT concat_obj(jsdisp_t *array, IDispatch *obj, DWORD *len, jsexcept_ jsobj = iface_to_jsdisp((IUnknown*)obj); if(jsobj) { if(is_class(jsobj, JSCLASS_ARRAY)) { - hres = concat_array(array, (ArrayInstance*)jsobj, len, ei, caller); + hres = concat_array(array, (ArrayInstance*)jsobj, len, ei); jsdisp_release(jsobj); return hres; } @@ -219,7 +218,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP if(FAILED(hres)) return hres; - hres = concat_obj(ret, jsthis->u.disp, &len, ei, caller); + hres = concat_obj(ret, jsthis->u.disp, &len, ei); if(SUCCEEDED(hres)) { VARIANT *arg; DWORD i; @@ -227,7 +226,7 @@ static HRESULT Array_concat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP for(i=0; i < arg_cnt(dp); i++) { arg = get_arg(dp, i); if(V_VT(arg) == VT_DISPATCH) - hres = concat_obj(ret, V_DISPATCH(arg), &len, ei, caller); + hres = concat_obj(ret, V_DISPATCH(arg), &len, ei); else hres = jsdisp_propput_idx(ret, len++, arg, ei); if(FAILED(hres)) @@ -268,7 +267,7 @@ static HRESULT array_join(script_ctx_t *ctx, jsdisp_t *array, DWORD length, cons return E_OUTOFMEMORY; for(i=0; i < length; i++) { - hres = jsdisp_get_idx(array, i, &var, ei, caller); + hres = jsdisp_get_idx(array, i, &var, ei); if(hres == DISP_E_UNKNOWNNAME) { hres = S_OK; continue; @@ -401,7 +400,7 @@ static HRESULT Array_pop(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPPARA } length--; - hres = jsdisp_get_idx(jsthis, length, &val, ei, caller); + hres = jsdisp_get_idx(jsthis, length, &val, ei); if(SUCCEEDED(hres)) { hres = jsdisp_delete_idx(jsthis, length); } else if(hres == DISP_E_UNKNOWNNAME) { @@ -476,11 +475,11 @@ static HRESULT Array_reverse(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP for(k=0; k delete_cnt) { for(i=length-delete_cnt; SUCCEEDED(hres) && i != start; i--) { - hres = jsdisp_get_idx(jsthis, i+delete_cnt-1, &v, ei, caller); + hres = jsdisp_get_idx(jsthis, i+delete_cnt-1, &v, ei); if(hres == DISP_E_UNKNOWNNAME) hres = jsdisp_delete_idx(jsthis, i+add_args-1); else if(SUCCEEDED(hres)) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 1de1dd0bdcc..418296f9b6f 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1148,7 +1148,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex return prop_get(obj, prop, &dp, var, ei, NULL); } -HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) +HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei) { WCHAR name[12]; DISPPARAMS dp = {NULL, NULL, 0, 0}; @@ -1167,7 +1167,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, I if(!prop || prop->type==PROP_DELETED) return DISP_E_UNKNOWNNAME; - return prop_get(obj, prop, &dp, var, ei, caller); + return prop_get(obj, prop, &dp, var, ei, NULL); } HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei) diff --git a/dlls/jscript/function.c b/dlls/jscript/function.c index 23e7033b5e0..8b57721f611 100644 --- a/dlls/jscript/function.c +++ b/dlls/jscript/function.c @@ -357,8 +357,7 @@ static HRESULT Function_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } -static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t *ei, IServiceProvider *caller, - DISPPARAMS *args) +static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t *ei, DISPPARAMS *args) { VARIANT var, *argv; DWORD length, i; @@ -378,7 +377,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t return E_OUTOFMEMORY; for(i=0; i