Piotr Caban : jscript: Added DISPATCH_PROPERTYGET flag to some calls.
Alexandre Julliard
julliard at winehq.org
Wed Oct 20 13:24:36 CDT 2010
Module: wine
Branch: master
Commit: cac0620fa5c249b4db2dc85dc45e5012437e5a5a
URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac0620fa5c249b4db2dc85dc45e5012437e5a5a
Author: Piotr Caban <piotr at codeweavers.com>
Date: Tue Oct 19 23:14:16 2010 +0200
jscript: Added DISPATCH_PROPERTYGET flag to some calls.
---
dlls/jscript/dispex.c | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c
index 0e823d3..99fad56 100644
--- a/dlls/jscript/dispex.c
+++ b/dlls/jscript/dispex.c
@@ -263,7 +263,7 @@ static HRESULT invoke_prop_func(jsdisp_t *This, jsdisp_t *jsthis, dispex_prop_t
case PROP_BUILTIN: {
vdisp_t vthis;
- if(flags == DISPATCH_CONSTRUCT && (prop->flags & DISPATCH_METHOD)) {
+ if(flags == DISPATCH_CONSTRUCT && (prop->flags & PROPF_METHOD)) {
WARN("%s is not a constructor\n", debugstr_w(prop->name));
return E_INVALIDARG;
}
@@ -576,6 +576,8 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
memset(&jsexcept, 0, sizeof(jsexcept));
switch(wFlags) {
+ case DISPATCH_METHOD|DISPATCH_PROPERTYGET:
+ wFlags = DISPATCH_METHOD;
case DISPATCH_METHOD:
case DISPATCH_CONSTRUCT:
hres = invoke_prop_func(This, This, prop, wFlags, pdp, pvarRes, &jsexcept, pspCaller);
@@ -940,6 +942,8 @@ HRESULT disp_call(script_ctx_t *ctx, IDispatch *disp, DISPID id, WORD flags, DIS
}
memset(ei, 0, sizeof(*ei));
+ if(retv && arg_cnt(dp))
+ flags |= DISPATCH_PROPERTYGET;
if(retv)
V_VT(retv) = VT_EMPTY;
More information about the wine-cvs
mailing list