Jacek Caban : jscript: Moved DISPPARAMS conversion to InvokeEx.
Alexandre Julliard
julliard at winehq.org
Thu Jun 21 15:03:40 CDT 2012
Module: wine
Branch: master
Commit: 00b5ba535587e4690d551685b96585e7caf80ecb
URL: http://source.winehq.org/git/wine.git/?a=commit;h=00b5ba535587e4690d551685b96585e7caf80ecb
Author: Jacek Caban <jacek at codeweavers.com>
Date: Thu Jun 21 10:48:36 2012 +0200
jscript: Moved DISPPARAMS conversion to InvokeEx.
---
dlls/jscript/dispex.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 86fcd85..37dc9de 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -407,18 +407,11 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t
switch(prop->type) {
case PROP_BUILTIN: {
- DISPPARAMS params;
- VARIANT buf[6];
-
if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) {
WARN("%s is not a constructor\n", debugstr_w(prop->name));
return E_INVALIDARG;
}
- hres = convert_params(dp, buf, ¶ms);
- if(FAILED(hres))
- return hres;
-
if(prop->name || This->builtin_info->class != JSCLASS_FUNCTION) {
vdisp_t vthis;
@@ -426,14 +419,12 @@ static HRESULT invoke_prop_func(jsdisp_t *This, IDispatch *jsthis, dispex_prop_t
set_disp(&vthis, jsthis);
else
set_jsdisp(&vthis, This);
- hres = prop->u.p->invoke(This->ctx, &vthis, flags, ¶ms, retv, ei);
+ hres = prop->u.p->invoke(This->ctx, &vthis, flags, dp, retv, ei);
vdisp_release(&vthis);
}else {
/* Function object calls are special case */
- hres = Function_invoke(This, jsthis, flags, ¶ms, retv, ei);
+ hres = Function_invoke(This, jsthis, flags, dp, retv, ei);
}
- if(params.rgvarg != buf && params.rgvarg != dp->rgvarg)
- heap_free(params.rgvarg);
return hres;
}
case PROP_PROTREF:
@@ -738,9 +729,19 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
wFlags = DISPATCH_METHOD;
/* fall through */
case DISPATCH_METHOD:
- case DISPATCH_CONSTRUCT:
- hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, pdp, pvarRes, &jsexcept, pspCaller);
+ case DISPATCH_CONSTRUCT: {
+ DISPPARAMS params;
+ VARIANT buf[6];
+
+ hres = convert_params(pdp, buf, ¶ms);
+ if(FAILED(hres))
+ return hres;
+
+ hres = invoke_prop_func(This, get_this(pdp), prop, wFlags, ¶ms, pvarRes, &jsexcept, pspCaller);
+ if(params.rgvarg != buf && params.rgvarg != pdp->rgvarg)
+ heap_free(params.rgvarg);
break;
+ }
case DISPATCH_PROPERTYGET:
hres = prop_get(This, prop, pdp, pvarRes, &jsexcept, pspCaller);
break;
More information about the wine-cvs
mailing list