Skip to content

W
wine-cw
Commit 12bc6e0c authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard
Browse files
Options

jscript: Removed no longer needed caller argument from jsdisp_propput_name and jsdisp_propget.

parent a80dd7cb
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
dlls/jscript/array.c
View file @ 12bc6e0c
......@@ -96,7 +96,7 @@ static HRESULT set_length(jsdisp_t *obj, jsexcept_t *ei, DWORD length)
V_VT(&var) = VT_I4;
V_I4(&var) = length;
return jsdisp_propput_name(obj, lengthW, &var, ei, NULL/*FIXME*/);
return jsdisp_propput_name(obj, lengthW, &var, ei);
}
static WCHAR *idx_to_str(DWORD idx, WCHAR *ptr)
......@@ -922,7 +922,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP
V_VT(&v) = VT_I4;
V_I4(&v) = delete_cnt;
hres = jsdisp_propput_name(ret_array, lengthW, &v, ei, caller);
hres = jsdisp_propput_name(ret_array, lengthW, &v, ei);
}
}
......@@ -953,7 +953,7 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP
if(SUCCEEDED(hres)) {
V_VT(&v) = VT_I4;
V_I4(&v) = length-delete_cnt+add_args;
hres = jsdisp_propput_name(jsthis, lengthW, &v, ei, caller);
hres = jsdisp_propput_name(jsthis, lengthW, &v, ei);
}
if(FAILED(hres)) {
......@@ -1017,7 +1017,7 @@ static HRESULT Array_unshift(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISP
hres = jsdisp_get_id(jsthis, str, 0, &id);
if(SUCCEEDED(hres)) {
hres = jsdisp_propget(jsthis, id, &var, ei, caller);
hres = jsdisp_propget(jsthis, id, &var, ei);
if(FAILED(hres))
return hres;
......
dlls/jscript/dispex.c
View file @ 12bc6e0c
......@@ -1060,7 +1060,7 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS
return hres;
}
HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller)
HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, VARIANT *val, jsexcept_t *ei)
{
dispex_prop_t *prop;
HRESULT hres;
......@@ -1069,7 +1069,7 @@ HRESULT jsdisp_propput_name(jsdisp_t *obj, const WCHAR *name, VARIANT *val, jsex
if(FAILED(hres))
return hres;
return prop_put(obj, prop, val, ei, caller);
return prop_put(obj, prop, val, ei, NULL);
}
HRESULT jsdisp_propput_const(jsdisp_t *obj, const WCHAR *name, VARIANT *val)
......@@ -1091,7 +1091,7 @@ HRESULT jsdisp_propput_idx(jsdisp_t *obj, DWORD idx, VARIANT *val, jsexcept_t *e
static const WCHAR formatW[] = {'%','d',0};
sprintfW(buf, formatW, idx);
return jsdisp_propput_name(obj, buf, val, ei, caller);
return jsdisp_propput_name(obj, buf, val, ei);
}
HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei)
......@@ -1170,7 +1170,7 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, VARIANT *var, jsexcept_t *ei, I
return prop_get(obj, prop, &dp, var, ei, caller);
}
HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei, IServiceProvider *caller)
HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei)
{
DISPPARAMS dp = {NULL,NULL,0,0};
dispex_prop_t *prop;
......@@ -1180,7 +1180,7 @@ HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, VARIANT *val, jsexcept_t *ei
return DISP_E_MEMBERNOTFOUND;
V_VT(val) = VT_EMPTY;
return prop_get(jsdisp, prop, &dp, val, ei, caller);
return prop_get(jsdisp, prop, &dp, val, ei, NULL);
}
HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val, jsexcept_t *ei)
......@@ -1192,7 +1192,7 @@ HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val
jsdisp = iface_to_jsdisp((IUnknown*)disp);
if(jsdisp) {
hres = jsdisp_propget(jsdisp, id, val, ei, NULL);
hres = jsdisp_propget(jsdisp, id, val, ei);
jsdisp_release(jsdisp);
return hres;
}
......
dlls/jscript/engine.c
View file @ 12bc6e0c
......@@ -559,7 +559,7 @@ static HRESULT interp_var_set(exec_ctx_t *ctx)
TRACE("%s\n", debugstr_w(name));
v = stack_pop(ctx);
hres = jsdisp_propput_name(ctx->var_disp, name, v, ctx->ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(ctx->var_disp, name, v, ctx->ei);
VariantClear(v);
return hres;
}
......@@ -1266,7 +1266,7 @@ static HRESULT interp_obj_prop(exec_ctx_t *ctx)
assert(V_VT(stack_top(ctx)) == VT_DISPATCH);
obj = as_jsdisp(V_DISPATCH(stack_top(ctx)));
hres = jsdisp_propput_name(obj, name, v, ctx->ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(obj, name, v, ctx->ei);
VariantClear(v);
return hres;
}
......@@ -2475,7 +2475,7 @@ static HRESULT unwind_exception(exec_ctx_t *ctx)
hres = create_dispex(ctx->parser->script, NULL, NULL, &scope_obj);
if(SUCCEEDED(hres)) {
hres = jsdisp_propput_name(scope_obj, ident, &except_val, ctx->ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(scope_obj, ident, &except_val, ctx->ei);
if(FAILED(hres))
jsdisp_release(scope_obj);
}
......@@ -2583,7 +2583,7 @@ HRESULT exec_source(exec_ctx_t *ctx, parser_ctx_t *parser, source_elements_t *so
return hres;
var_set_jsdisp(&var, func_obj);
hres = jsdisp_propput_name(ctx->var_disp, func->expr->identifier, &var, ei, NULL);
hres = jsdisp_propput_name(ctx->var_disp, func->expr->identifier, &var, ei);
jsdisp_release(func_obj);
if(FAILED(hres))
return hres;
......
dlls/jscript/error.c
View file @ 12bc6e0c
......@@ -200,7 +200,7 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr,
V_VT(&v) = VT_I4;
V_I4(&v) = number;
hres = jsdisp_propput_name(err, numberW, &v, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(err, numberW, &v, NULL/*FIXME*/);
if(FAILED(hres)) {
jsdisp_release(err);
return hres;
......@@ -210,9 +210,9 @@ static HRESULT create_error(script_ctx_t *ctx, jsdisp_t *constr,
if(msg) V_BSTR(&v) = SysAllocString(msg);
else V_BSTR(&v) = SysAllocStringLen(NULL, 0);
if(V_BSTR(&v)) {
hres = jsdisp_propput_name(err, messageW, &v, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(err, messageW, &v, NULL/*FIXME*/);
if(SUCCEEDED(hres))
hres = jsdisp_propput_name(err, descriptionW, &v, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(err, descriptionW, &v, NULL/*FIXME*/);
SysFreeString(V_BSTR(&v));
}else {
hres = E_OUTOFMEMORY;
......@@ -369,7 +369,7 @@ HRESULT init_error_constr(script_ctx_t *ctx, jsdisp_t *object_prototype)
return E_OUTOFMEMORY;
}
hres = jsdisp_propput_name(err, nameW, &v, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(err, nameW, &v, NULL/*FIXME*/);
if(SUCCEEDED(hres))
hres = create_builtin_function(ctx, constr_val[i], names[i], NULL,
......
dlls/jscript/function.c
View file @ 12bc6e0c
......@@ -75,7 +75,7 @@ static IDispatch *get_this(DISPPARAMS *dp)
}
static HRESULT init_parameters(jsdisp_t *var_disp, FunctionInstance *function, DISPPARAMS *dp,
jsexcept_t *ei, IServiceProvider *caller)
jsexcept_t *ei)
{
parameter_t *param;
VARIANT var_empty;
......@@ -87,7 +87,7 @@ static HRESULT init_parameters(jsdisp_t *var_disp, FunctionInstance *function, D
for(param = function->parameters; param; param = param->next) {
hres = jsdisp_propput_name(var_disp, param->identifier,
i < cargs ? get_arg(dp,i) : &var_empty, ei, caller);
i < cargs ? get_arg(dp,i) : &var_empty, ei);
if(FAILED(hres))
return hres;
......@@ -141,12 +141,12 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS
if(SUCCEEDED(hres)) {
V_VT(&var) = VT_I4;
V_I4(&var) = arg_cnt(dp);
hres = jsdisp_propput_name(args, lengthW, &var, ei, caller);
hres = jsdisp_propput_name(args, lengthW, &var, ei);
if(SUCCEEDED(hres)) {
V_VT(&var) = VT_DISPATCH;
V_DISPATCH(&var) = calee;
hres = jsdisp_propput_name(args, caleeW, &var, ei, caller);
hres = jsdisp_propput_name(args, caleeW, &var, ei);
}
}
......@@ -160,7 +160,7 @@ static HRESULT create_arguments(script_ctx_t *ctx, IDispatch *calee, DISPPARAMS
}
static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, jsdisp_t *arg_disp,
DISPPARAMS *dp, jsexcept_t *ei, IServiceProvider *caller, jsdisp_t **ret)
DISPPARAMS *dp, jsexcept_t *ei, jsdisp_t **ret)
{
jsdisp_t *var_disp;
VARIANT var;
......@@ -171,9 +171,9 @@ static HRESULT create_var_disp(script_ctx_t *ctx, FunctionInstance *function, js
return hres;
var_set_jsdisp(&var, arg_disp);
hres = jsdisp_propput_name(var_disp, argumentsW, &var, ei, caller);
hres = jsdisp_propput_name(var_disp, argumentsW, &var, ei);
if(SUCCEEDED(hres))
hres = init_parameters(var_disp, function, dp, ei, caller);
hres = init_parameters(var_disp, function, dp, ei);
if(FAILED(hres)) {
jsdisp_release(var_disp);
return hres;
......@@ -201,7 +201,7 @@ static HRESULT invoke_source(script_ctx_t *ctx, FunctionInstance *function, IDis
if(FAILED(hres))
return hres;
hres = create_var_disp(ctx, function, arg_disp, dp, ei, caller, &var_disp);
hres = create_var_disp(ctx, function, arg_disp, dp, ei, &var_disp);
if(FAILED(hres)) {
jsdisp_release(arg_disp);
return hres;
......@@ -627,7 +627,7 @@ static HRESULT set_prototype(script_ctx_t *ctx, jsdisp_t *dispex, jsdisp_t *prot
var_set_jsdisp(&var, prototype);
memset(&jsexcept, 0, sizeof(jsexcept));
return jsdisp_propput_name(dispex, prototypeW, &var, &jsexcept, NULL/*FIXME*/);
return jsdisp_propput_name(dispex, prototypeW, &var, &jsexcept);
}
HRESULT create_builtin_function(script_ctx_t *ctx, builtin_invoke_t value_proc, const WCHAR *name,
......
dlls/jscript/global.c
View file @ 12bc6e0c
......@@ -1274,22 +1274,22 @@ HRESULT init_global(script_ctx_t *ctx)
return hres;
var_set_jsdisp(&var, math);
hres = jsdisp_propput_name(ctx->global, MathW, &var, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(ctx->global, MathW, &var, NULL/*FIXME*/);
jsdisp_release(math);
if(FAILED(hres))
return hres;
V_VT(&var) = VT_EMPTY;
hres = jsdisp_propput_name(ctx->global, undefinedW, &var, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(ctx->global, undefinedW, &var, NULL/*FIXME*/);
if(FAILED(hres))
return hres;
num_set_nan(&var);
hres = jsdisp_propput_name(ctx->global, NaNW, &var, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(ctx->global, NaNW, &var, NULL/*FIXME*/);
if(FAILED(hres))
return hres;
num_set_inf(&var, TRUE);
hres = jsdisp_propput_name(ctx->global, InfinityW, &var, NULL/*FIXME*/, NULL/*FIXME*/);
hres = jsdisp_propput_name(ctx->global, InfinityW, &var, NULL/*FIXME*/);
return hres;
}
dlls/jscript/jscript.h
View file @ 12bc6e0c
......@@ -212,8 +212,8 @@ HRESULT jsdisp_call(jsdisp_t*,DISPID,WORD,DISPPARAMS*,VARIANT*,jsexcept_t*) DECL
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;
HRESULT jsdisp_propput_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
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_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*,IServiceProvider*) DECLSPEC_HIDDEN;
......
dlls/jscript/regexp.c
View file @ 12bc6e0c
......@@ -3614,18 +3614,18 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res
while(SUCCEEDED(hres)) {
V_VT(&var) = VT_I4;
V_I4(&var) = result->str-input;
hres = jsdisp_propput_name(array, indexW, &var, ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(array, indexW, &var, ei);
if(FAILED(hres))
break;
V_I4(&var) = result->str-input+result->len;
hres = jsdisp_propput_name(array, lastIndexW, &var, ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(array, lastIndexW, &var, ei);
if(FAILED(hres))
break;
V_VT(&var) = VT_BSTR;
V_BSTR(&var) = input;
hres = jsdisp_propput_name(array, inputW, &var, ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(array, inputW, &var, ei);
if(FAILED(hres))
break;
......@@ -3634,7 +3634,7 @@ static HRESULT create_match_array(script_ctx_t *ctx, BSTR input, const match_res
hres = E_OUTOFMEMORY;
break;
}
hres = jsdisp_propput_name(array, zeroW, &var, ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(array, zeroW, &var, ei);
SysFreeString(V_BSTR(&var));
break;
}
......@@ -3998,18 +3998,18 @@ HRESULT regexp_string_match(script_ctx_t *ctx, jsdisp_t *re, BSTR str,
while(SUCCEEDED(hres)) {
V_VT(&var) = VT_I4;
V_I4(&var) = match_result[match_cnt-1].str-str;
hres = jsdisp_propput_name(array, indexW, &var, ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(array, indexW, &var, ei);
if(FAILED(hres))
break;
V_I4(&var) = match_result[match_cnt-1].str-str+match_result[match_cnt-1].len;
hres = jsdisp_propput_name(array, lastIndexW, &var, ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(array, lastIndexW, &var, ei);
if(FAILED(hres))
break;
V_VT(&var) = VT_BSTR;
V_BSTR(&var) = str;
hres = jsdisp_propput_name(array, inputW, &var, ei, NULL/*FIXME*/);
hres = jsdisp_propput_name(array, inputW, &var, ei);
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment