Jacek Caban : vbscript: Added support for DISPATCH_PROPERTYGET in invoke_variant_prop.

Alexandre Julliard julliard at winehq.org
Mon Sep 10 15:22:10 CDT 2012


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Sep 10 10:34:38 2012 +0200

vbscript: Added support for DISPATCH_PROPERTYGET in invoke_variant_prop.

---

 dlls/vbscript/tests/run.c |    6 ++++++
 dlls/vbscript/vbdisp.c    |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/dlls/vbscript/tests/run.c b/dlls/vbscript/tests/run.c
index 6a2b72a..0e292af 100644
--- a/dlls/vbscript/tests/run.c
+++ b/dlls/vbscript/tests/run.c
@@ -300,6 +300,12 @@ static void test_disp(IDispatch *disp)
     ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v));
     ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v));
 
+    dp.cArgs = dp.cNamedArgs = 0;
+    hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET, &dp, &v, &ei, NULL);
+    ok(hres == S_OK, "InvokeEx failed: %08x\n", hres);
+    ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v));
+    ok(V_BOOL(&v), "V_BOOL(v) = %x\n", V_BOOL(&v));
+
     dp.cArgs = 1;
     hres = IDispatchEx_InvokeEx(dispex, public_prop_id, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dp, &v, &ei, NULL);
     ok(hres == DISP_E_MEMBERNOTFOUND, "InvokeEx failed: %08x, expected DISP_E_MEMBERNOTFOUND\n", hres);
diff --git a/dlls/vbscript/vbdisp.c b/dlls/vbscript/vbdisp.c
index a76660e..1b2b8fe 100644
--- a/dlls/vbscript/vbdisp.c
+++ b/dlls/vbscript/vbdisp.c
@@ -103,6 +103,7 @@ static HRESULT invoke_variant_prop(VARIANT *v, WORD flags, DISPPARAMS *dp, VARIA
 
     switch(flags) {
     case DISPATCH_PROPERTYGET|DISPATCH_METHOD:
+    case DISPATCH_PROPERTYGET:
         if(dp->cArgs) {
             WARN("called with arguments\n");
             return DISP_E_MEMBERNOTFOUND; /* That's what tests show */




More information about the wine-cvs mailing list