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

jscript: Remove unused prop_get arguments. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2018-04-20 18:33:09 +02:00 committed by Alexandre Julliard
parent a2d618ef22
commit 23e4a530c5
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dlls/jscript/dispex.c
View File

@ -419,8 +419,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t
return E_FAIL; return E_FAIL;
} }
static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, DISPPARAMS *dp, static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, jsval_t *r)
jsval_t *r, IServiceProvider *caller)
{ {
HRESULT hres; HRESULT hres;
@ -445,7 +444,7 @@ static HRESULT prop_get(jsdisp_t *This, dispex_prop_t *prop, DISPPARAMS *dp,
} }
break; break;
case PROP_PROTREF: case PROP_PROTREF:
hres = prop_get(This->prototype, This->prototype->props+prop->u.ref, dp, r, caller); hres = prop_get(This->prototype, This->prototype->props + prop->u.ref, r);
break; break;
case PROP_JSVAL: case PROP_JSVAL:
hres = jsval_copy(prop->u.val, r); hres = jsval_copy(prop->u.val, r);
@ -704,7 +703,7 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
case DISPATCH_PROPERTYGET: { case DISPATCH_PROPERTYGET: {
jsval_t r; jsval_t r;
hres = prop_get(This, prop, pdp, &r, pspCaller); hres = prop_get(This, prop, &r);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
hres = jsval_to_variant(r, pvarRes); hres = jsval_to_variant(r, pvarRes);
jsval_release(r); jsval_release(r);
@ -1005,7 +1004,7 @@ HRESULT init_dispex_from_constr(jsdisp_t *dispex, script_ctx_t *ctx, const built
if(SUCCEEDED(hres) && prop && prop->type!=PROP_DELETED) { if(SUCCEEDED(hres) && prop && prop->type!=PROP_DELETED) {
jsval_t val; jsval_t val;
hres = prop_get(constr, prop, NULL, &val, NULL); hres = prop_get(constr, prop, &val);
if(FAILED(hres)) { if(FAILED(hres)) {
ERR("Could not get prototype\n"); ERR("Could not get prototype\n");
return hres; return hres;
@ -1389,7 +1388,6 @@ HRESULT disp_propput(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t val)
HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val) HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val)
{ {
DISPPARAMS dp = {NULL, NULL, 0, 0};
dispex_prop_t *prop; dispex_prop_t *prop;
HRESULT hres; HRESULT hres;
@ -1402,13 +1400,12 @@ HRESULT jsdisp_propget_name(jsdisp_t *obj, const WCHAR *name, jsval_t *val)
return S_OK; return S_OK;
} }
return prop_get(obj, prop, &dp, val, NULL); return prop_get(obj, prop, val);
} }
HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r) HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r)
{ {
WCHAR name[12]; WCHAR name[12];
DISPPARAMS dp = {NULL, NULL, 0, 0};
dispex_prop_t *prop; dispex_prop_t *prop;
HRESULT hres; HRESULT hres;
@ -1425,19 +1422,18 @@ HRESULT jsdisp_get_idx(jsdisp_t *obj, DWORD idx, jsval_t *r)
return DISP_E_UNKNOWNNAME; return DISP_E_UNKNOWNNAME;
} }
return prop_get(obj, prop, &dp, r, NULL); return prop_get(obj, prop, r);
} }
HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, jsval_t *val) HRESULT jsdisp_propget(jsdisp_t *jsdisp, DISPID id, jsval_t *val)
{ {
DISPPARAMS dp = {NULL,NULL,0,0};
dispex_prop_t *prop; dispex_prop_t *prop;
prop = get_prop(jsdisp, id); prop = get_prop(jsdisp, id);
if(!prop) if(!prop)
return DISP_E_MEMBERNOTFOUND; return DISP_E_MEMBERNOTFOUND;
return prop_get(jsdisp, prop, &dp, val, NULL); return prop_get(jsdisp, prop, val);
} }
HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val) HRESULT disp_propget(script_ctx_t *ctx, IDispatch *disp, DISPID id, jsval_t *val)