Rob Shearman : oleaut32: Fix the IDL for the "Value" method in the tmarshal tests.

Alexandre Julliard julliard at wine.codeweavers.com
Thu Feb 8 06:20:39 CST 2007


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

Author: Rob Shearman <rob at codeweavers.com>
Date:   Wed Feb  7 19:22:25 2007 +0000

oleaut32: Fix the IDL for the "Value" method in the tmarshal tests.

---

 dlls/oleaut32/tests/tmarshal.c   |   12 +++---------
 dlls/oleaut32/tests/tmarshal.idl |    2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c
index 8ef02d8..0654622 100644
--- a/dlls/oleaut32/tests/tmarshal.c
+++ b/dlls/oleaut32/tests/tmarshal.c
@@ -916,20 +916,14 @@ static void test_typelibmarshal(void)
     dispparams.rgvarg = vararg;
     VariantInit(&varresult);
     hr = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL);
-    todo_wine
-    {
-        ok_ole_success(hr, IDispatch_Invoke);
-    }
+    ok_ole_success(hr, IDispatch_Invoke);
 
     ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK,
         "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n",
         excepinfo.wCode, excepinfo.scode);
 
-    todo_wine
-    {
-        ok(V_VT(&varresult) == VT_I2, "V_VT(&varresult) was %d instead of VT_I2\n", V_VT(&varresult));
-        ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult));
-    }
+    ok(V_VT(&varresult) == VT_I2, "V_VT(&varresult) was %d instead of VT_I2\n", V_VT(&varresult));
+    ok(V_I2(&varresult) == 1234, "V_I2(&varresult) was %d instead of 1234\n", V_I2(&varresult));
     VariantClear(&varresult);
 
     /* call Variant - exercises variant copying in ITypeInfo::Invoke and
diff --git a/dlls/oleaut32/tests/tmarshal.idl b/dlls/oleaut32/tests/tmarshal.idl
index 35d9916..e99dbc7 100644
--- a/dlls/oleaut32/tests/tmarshal.idl
+++ b/dlls/oleaut32/tests/tmarshal.idl
@@ -76,7 +76,7 @@ library TestTypelib
         [propget, id(DISPID_TM_CLONECOCLASS)]
         HRESULT CloneCoclass([out, retval] ApplicationObject2 **ppVal);
 
-        [id(DISPID_VALUE)]
+        [propget, id(DISPID_VALUE)]
         HRESULT Value([in] VARIANT *value, [out, retval] VARIANT *retval);
 
         [id(DISPID_TM_ARRAY)]




More information about the wine-cvs mailing list