system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-04 10:14:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

oleaut32: Add a test for the memory pointed to by a byref parameter being preserved through a remote IDispatch::Invoke call.

Browse source
This commit is contained in:
Rob Shearman 2009-11-17 13:42:37 +00:00 committed by Alexandre Julliard
parent c73e2d5e02
commit 4c8eec346d
3 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
dlls/oleaut32/tests/tmarshal.c
View file

@ -587,6 +587,13 @@ static HRESULT WINAPI Widget_get_prop_uint(
return S_OK;
}
static HRESULT WINAPI Widget_ByRefUInt(
IWidget* iface, UINT *i)
{
*i = 42;
return S_OK;
}
static const struct IWidgetVtbl Widget_VTable =
{
Widget_QueryInterface,
@ -618,7 +625,8 @@ static const struct IWidgetVtbl Widget_VTable =
Widget_put_prop_with_lcid,
Widget_get_prop_with_lcid,
Widget_get_prop_int,
Widget_get_prop_uint
Widget_get_prop_uint,
Widget_ByRefUInt,
};
static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void **ppvObject)
@ -935,6 +943,7 @@ static void test_typelibmarshal(void)
ITypeInfo *pTypeInfo;
MYSTRUCT mystruct;
MYSTRUCT mystructArray[5];
UINT uval;
ok(pKEW != NULL, "Widget creation failed\n");
@ -1342,6 +1351,25 @@ static void test_typelibmarshal(void)
ok(V_UI4(&varresult) == 42, "got %x\n", V_UI4(&varresult));
VariantClear(&varresult);
/* test byref marshalling */
uval = 666;
VariantInit(&vararg[0]);
V_VT(&vararg[0]) = VT_UI4|VT_BYREF;
V_UI4REF(&vararg[0]) = &uval;
dispparams.cNamedArgs = 0;
dispparams.cArgs = 1;
dispparams.rgvarg = vararg;
dispparams.rgdispidNamedArgs = NULL;
hr = IDispatch_Invoke(pDispatch, DISPID_TM_BYREF_UINT, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
ok_ole_success(hr, ITypeInfo_Invoke);
ok(V_VT(&varresult) == VT_EMPTY, "varresult should be VT_EMPTY\n");
ok(V_VT(&vararg[0]) == (VT_UI4|VT_BYREF), "arg VT not unmarshalled correctly: %x\n", V_VT(&vararg[0]));
todo_wine
ok(V_UI4REF(&vararg[0]) == &uval, "Byref pointer not preserved: %p/%p\n", &uval, V_UI4REF(&vararg[0]));
ok(*V_UI4REF(&vararg[0]) == 42, "Expected 42 to be returned instead of %u\n", *V_UI4REF(&vararg[0]));
VariantClear(&varresult);
VariantClear(&vararg[0]);
IDispatch_Release(pDispatch);
IWidget_Release(pWidget);

3
dlls/oleaut32/tests/tmarshal.idl
View file

@ -137,6 +137,9 @@ library TestTypelib
[id(DISPID_TM_PROP_UINT), propget]
HRESULT prop_uint([out,retval] UINT *i);
[id(DISPID_TM_BYREF_UINT)]
HRESULT ByRefUInt([in, out] UINT *i);
}
[

1
dlls/oleaut32/tests/tmarshal_dispids.h
View file

@ -37,5 +37,6 @@
#define DISPID_TM_PROP_WITH_LCID 18
#define DISPID_TM_PROP_INT 19
#define DISPID_TM_PROP_UINT 20
#define DISPID_TM_BYREF_UINT 21
#define DISPID_NOA_BSTRRET 1