Jacek Caban : vbscript: Return error for unsupported flags in ScriptDisp:: InvokeEx.

Alexandre Julliard julliard at winehq.org
Tue Sep 18 14:04:30 CDT 2012


Module: wine
Branch: master
Commit: b6515030c88ca67c4b73ad0d94a79fe9eb0637eb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b6515030c88ca67c4b73ad0d94a79fe9eb0637eb

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Sep 18 12:26:30 2012 +0200

vbscript: Return error for unsupported flags in ScriptDisp::InvokeEx.

---

 dlls/vbscript/vbdisp.c |   15 +++++++++++----
 1 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index a003bf1..4721753 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -783,10 +783,17 @@ static HRESULT WINAPI ScriptDisp_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc
         return invoke_variant_prop(&ident->u.var->v, wFlags, pdp, pvarRes);
     }
 
-
-    IActiveScriptSite_OnEnterScript(This->ctx->site);
-    hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes);
-    IActiveScriptSite_OnLeaveScript(This->ctx->site);
+    switch(wFlags) {
+    case DISPATCH_METHOD:
+    case DISPATCH_METHOD|DISPATCH_PROPERTYGET:
+        IActiveScriptSite_OnEnterScript(This->ctx->site);
+        hres = exec_script(This->ctx, ident->u.func, NULL, pdp, pvarRes);
+        IActiveScriptSite_OnLeaveScript(This->ctx->site);
+        break;
+    default:
+        FIXME("Unsupported flags %x\n", wFlags);
+        hres = E_NOTIMPL;
+    }
 
     return hres;
 }




More information about the wine-cvs mailing list