ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

jscript: Removed no longer needed caller argument from jsdisp_propget_name.

This commit is contained in:
Jacek Caban 2012-03-12 12:14:38 +01:00 committed by Alexandre Julliard
parent 7d4ba8db63
commit 0d9cc45406
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/jscript/array.c
View File

@ -72,7 +72,7 @@ static HRESULT get_length(script_ctx_t *ctx, vdisp_t *vdisp, jsexcept_t *ei, jsd
if(!is_jsdisp(vdisp)) if(!is_jsdisp(vdisp))
return throw_type_error(ctx, ei, JS_E_JSCRIPT_EXPECTED, NULL); return throw_type_error(ctx, ei, JS_E_JSCRIPT_EXPECTED, NULL);
hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &var, ei, NULL/*FIXME*/); hres = jsdisp_propget_name(vdisp->u.jsdisp, lengthW, &var, ei);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;

4
dlls/jscript/dispex.c
View File

@ -1131,7 +1131,7 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, VARIANT *val
return hres; return hres;
} }
HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsexcept_t *ei, IServiceProvider *caller) HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsexcept_t *ei)
{ {
DISPPARAMS dp = {NULL, NULL, 0, 0}; DISPPARAMS dp = {NULL, NULL, 0, 0};
dispex_prop_t *prop; dispex_prop_t *prop;
@ -1145,7 +1145,7 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, VARIANT *var, jsex
if(!prop || prop->type==PROP_DELETED) if(!prop || prop->type==PROP_DELETED)
return S_OK; return S_OK;
return prop_get(obj, prop, &dp, var, ei, caller); 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, IServiceProvider *caller)

2
dlls/jscript/engine.c
View File

@ -1396,7 +1396,7 @@ static HRESULT interp_instanceof(exec_ctx_t *ctx)
} }
if(is_class(obj, JSCLASS_FUNCTION)) { if(is_class(obj, JSCLASS_FUNCTION)) {
hres = jsdisp_propget_name(obj, prototypeW, &prot, ctx->ei, NULL/*FIXME*/); hres = jsdisp_propget_name(obj, prototypeW, &prot, ctx->ei);
}else { }else {
hres = throw_type_error(ctx->parser->script, ctx->ei, JS_E_FUNCTION_EXPECTED, NULL); hres = throw_type_error(ctx->parser->script, ctx->ei, JS_E_FUNCTION_EXPECTED, NULL);
} }

4
dlls/jscript/error.c
View File

@ -56,7 +56,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
return S_OK; return S_OK;
} }
hres = jsdisp_propget_name(jsthis, nameW, &v, ei, caller); hres = jsdisp_propget_name(jsthis, nameW, &v, ei);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;
@ -71,7 +71,7 @@ static HRESULT Error_toString(script_ctx_t *ctx, vdisp_t *vthis, WORD flags,
} }
} }
hres = jsdisp_propget_name(jsthis, messageW, &v, ei, caller); hres = jsdisp_propget_name(jsthis, messageW, &v, ei);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
if(V_VT(&v) != VT_EMPTY) { if(V_VT(&v) != VT_EMPTY) {
hres = to_string(ctx, &v, ei, &msg); hres = to_string(ctx, &v, ei, &msg);

2
dlls/jscript/function.c
View File

@ -364,7 +364,7 @@ static HRESULT array_to_args(script_ctx_t *ctx, jsdisp_t *arg_array, jsexcept_t
DWORD length, i; DWORD length, i;
HRESULT hres; HRESULT hres;
hres = jsdisp_propget_name(arg_array, lengthW, &var, ei, NULL/*FIXME*/); hres = jsdisp_propget_name(arg_array, lengthW, &var, ei);
if(FAILED(hres)) if(FAILED(hres))
return hres; return hres;

2
dlls/jscript/jscript.h
View File

@ -216,7 +216,7 @@ 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_name(jsdisp_t*,const WCHAR*,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN; HRESULT jsdisp_propput_const(jsdisp_t*,const WCHAR*,VARIANT*) DECLSPEC_HIDDEN;
HRESULT jsdisp_propput_idx(jsdisp_t*,DWORD,VARIANT*,jsexcept_t*) 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_propget_name(jsdisp_t*,LPCWSTR,VARIANT*,jsexcept_t*) DECLSPEC_HIDDEN;
HRESULT jsdisp_get_idx(jsdisp_t*,DWORD,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; HRESULT jsdisp_get_id(jsdisp_t*,const WCHAR*,DWORD,DISPID*) DECLSPEC_HIDDEN;
HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN; HRESULT jsdisp_delete_idx(jsdisp_t*,DWORD) DECLSPEC_HIDDEN;