From 8b43f8bec9c6e445ccac3e7b4308fc9029f6b25a Mon Sep 17 00:00:00 2001 From: Rob Shearman Date: Wed, 7 Feb 2007 19:22:25 +0000 Subject: [PATCH] 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 8ef02d81ab1..0654622aa12 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 35d9916dc51..e99dbc77bdc 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)]