static const BOOL is_win64 = sizeof(void *) > sizeof(int);
+#ifdef __i386__
+static const BOOL abi_supports_stdcall = TRUE;
+#else
+static const BOOL abi_supports_stdcall = FALSE;
+#endif
+
+static HRESULT WINAPI collection_QueryInterface(ICollection *iface, REFIID riid, void **ret)
+{
+ if (IsEqualIID(riid, &IID_IUnknown) ||
+ IsEqualIID(riid, &IID_IDispatch) ||
+ IsEqualIID(riid, &IID_ICollection))
+ {
+ *ret = iface;
+ return S_OK;
+ }
+
+ return E_NOINTERFACE;
+}
+
+static ULONG WINAPI collection_AddRef(ICollection *iface)
+{
+ return 2;
+}
+
+static ULONG WINAPI collection_Release(ICollection *iface)
+{
+ return 1;
+}
+
+static HRESULT WINAPI collection_GetTypeInfoCount(ICollection *iface, UINT *cnt)
+{
+ ok(0, "unexpected call\n");
+ *cnt = 0;
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI collection_GetTypeInfo(ICollection *iface, UINT index, LCID lcid, ITypeInfo **ti)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI collection_GetIDsOfNames(ICollection *iface, REFIID riid, LPOLESTR *names,
+ UINT cnt, LCID lcid, DISPID *dispid)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static HRESULT WINAPI collection_Invoke(ICollection *iface, DISPID dispid, REFIID riid,
+ LCID lcid, WORD flags, DISPPARAMS *dispparams, VARIANT *res, EXCEPINFO *ei, UINT *argerr)
+{
+ if(dispid != DISPID_VALUE) {
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+ }
+
+ ok(flags == (DISPATCH_METHOD|DISPATCH_PROPERTYGET), "flags = %x\n", flags);
+ ok(dispparams != NULL, "dispparams == NULL\n");
+ ok(!dispparams->rgdispidNamedArgs, "dispparams->rgdispidNamedArgs != NULL\n");
+ ok(dispparams->cArgs == 1, "dispparams->cArgs = %d\n", dispparams->cArgs);
+ ok(!dispparams->cNamedArgs, "dispparams->cNamedArgs = %d\n", dispparams->cNamedArgs);
+ ok(V_VT(dispparams->rgvarg) == VT_I4, "V_VT(dispparams->rgvarg) = %d\n", V_VT(dispparams->rgvarg));
+ ok(V_I4(dispparams->rgvarg) == 7, "V_I4(dispparams->rgvarg) = %d\n", V_I4(dispparams->rgvarg));
+ ok(res != NULL, "res == NULL\n");
+ ok(V_VT(res) == VT_EMPTY, "V_VT(res) = %d\n", V_VT(res));
+
+ V_VT(res) = VT_I4;
+ V_I4(res) = 15;
+ return S_OK;
+}
+
+static HRESULT WINAPI collection_Item(ICollection *iface, int i, int *p)
+{
+ ok(0, "unexpected call\n");
+ return E_NOTIMPL;
+}
+
+static const ICollectionVtbl collectionvtbl = {
+ collection_QueryInterface,
+ collection_AddRef,
+ collection_Release,
+ collection_GetTypeInfoCount,
+ collection_GetTypeInfo,
+ collection_GetIDsOfNames,
+ collection_Invoke,
+ collection_Item
+};
+
+static ICollection collection = { &collectionvtbl };
+
static HRESULT WINAPI invoketest_QueryInterface(IInvokeTest *iface, REFIID riid, void **ret)
{
if (IsEqualIID(riid, &IID_IUnknown) ||
return S_OK;
}
+static HRESULT WINAPI invoketest_testget(IInvokeTest *iface, ICollection **p)
+{
+ *p = &collection;
+ ICollection_AddRef(&collection);
+ return S_OK;
+}
+
static const IInvokeTestVtbl invoketestvtbl = {
invoketest_QueryInterface,
invoketest_AddRef,
invoketest_get_test,
invoketest_putref_testprop,
invoketest_putref_testprop2,
- invoketest_testfunc
+ invoketest_testfunc,
+ invoketest_testget
};
static IInvokeTest invoketest = { &invoketestvtbl };
ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res));
ok(V_I4(&res) == 1, "got %d\n", V_I4(&res));
+ /* call propget with DISPATCH_METHOD|DISPATCH_PROPERTYGET flags */
+ V_VT(&args[0]) = VT_I4;
+ V_I4(&args[0]) = 7;
+
+ dispparams.cArgs = 1;
+ dispparams.rgvarg = args;
+
+ i = 0;
+ V_VT(&res) = VT_EMPTY;
+ V_I4(&res) = 0;
+ hr = ITypeInfo_Invoke(pTypeInfo, &invoketest, 4, DISPATCH_METHOD|DISPATCH_PROPERTYGET, &dispparams, &res, NULL, &i);
+ ok(hr == S_OK, "got 0x%08x, %d\n", hr, i);
+ ok(V_VT(&res) == VT_I4, "got %d\n", V_VT(&res));
+ ok(V_I4(&res) == 15, "got %d\n", V_I4(&res));
+
+
/* DISPATCH_PROPERTYPUTREF */
l = 1;
V_VT(&args[0]) = VT_I4|VT_BYREF;
return S_FALSE;
}
-static const WCHAR testW[] = { 'T','e','s','t',0 };
-
-static void WINAPI variant_func2(VARIANT *ret, VARIANT v1, VARIANT v2)
-{
- ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1));
- ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1));
- ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2));
- ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2)));
-
- V_VT(ret) = VT_UI4;
- V_I4(ret) = 4321;
-}
-
-static void WINAPI inst_func2(void *inst, VARIANT *ret, VARIANT v1, VARIANT v2)
-{
- ok( (*(void ***)inst)[3] == inst_func2, "wrong ptr %p\n", inst );
-
- ok(V_VT(ret) == VT_I4 || broken(V_VT(ret) == VT_VARIANT) /* win64 */, "unexpected %d\n", V_VT(ret));
- ok(V_I4(ret) == 1234, "unexpected %d\n", V_I4(ret));
-
- ok(V_VT(&v1) == VT_I4, "unexpected %d\n", V_VT(&v1));
- ok(V_I4(&v1) == 2, "unexpected %d\n", V_I4(&v1));
- ok(V_VT(&v2) == VT_BSTR, "unexpected %d\n", V_VT(&v2));
- ok(lstrcmpW(V_BSTR(&v2), testW) == 0, "unexpected %s\n", wine_dbgstr_w(V_BSTR(&v2)));
-
- V_VT(ret) = VT_UI4;
- V_I4(ret) = 4321;
-}
-
-static void *vtable[] = { NULL, NULL, NULL, inst_func };
-static void *vtable2[] = { NULL, NULL, NULL, inst_func2 };
+static const void *vtable[] = { NULL, NULL, NULL, inst_func };
static void test_DispCallFunc(void)
{
- void **inst;
+ const void **inst = vtable;
HRESULT res;
VARIANT result, args[5];
VARIANTARG *pargs[5];
for (i = 0; i < 5; i++) pargs[i] = &args[i];
- memset( args, 0x55, sizeof(args) );
-
- types[0] = VT_VARIANT;
- V_VT(&args[0]) = VT_I4;
- V_I4(&args[0]) = 2;
- types[1] = VT_VARIANT;
- V_VT(&args[1]) = VT_BSTR;
- V_BSTR(&args[1]) = SysAllocString(testW);
- memset( &result, 0xcc, sizeof(result) );
- res = DispCallFunc(NULL, (ULONG_PTR)variant_func2, CC_STDCALL, VT_VARIANT, 2, types, pargs, &result);
- ok(res == S_OK, "DispCallFunc error %#x\n", res);
- ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result));
- ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result));
-
- V_VT(&result) = VT_I4;
- V_UI4(&result) = 1234;
- inst = vtable2;
- res = DispCallFunc(&inst, 3 * sizeof(void *), CC_STDCALL, VT_VARIANT, 2, types, pargs, &result);
- ok(res == S_OK, "DispCallFunc error %#x\n", res);
- ok(V_VT(&result) == VT_UI4, "wrong result type %d\n", V_VT(&result));
- ok(V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result));
-
- VariantClear(&args[1]);
-
memset( args, 0x55, sizeof(args) );
types[0] = VT_UI4;
V_UI4(&args[0]) = 1;
ok( V_UI4(&result) == 4321, "wrong result %u\n", V_UI4(&result) );
/* the function checks the argument sizes for stdcall */
- if (!is_win64) /* no stdcall on 64-bit */
+ if (abi_supports_stdcall)
{
res = DispCallFunc( NULL, (ULONG_PTR)stdcall_func, CC_STDCALL, VT_UI4, 0, types, pargs, &result );
ok( res == DISP_E_BADCALLEE, "DispCallFunc wrong error %x\n", res );
types[0] = VT_I4;
V_I4(&args[0]) = 3;
memset( &result, 0xcc, sizeof(result) );
- inst = vtable;
res = DispCallFunc( &inst, 3 * sizeof(void*), CC_STDCALL, VT_I4, 1, types, pargs, &result );
ok( res == S_OK, "DispCallFunc failed %x\n", res );
ok( V_VT(&result) == VT_I4, "wrong result type %d\n", V_VT(&result) );
{
TYPEKIND kind;
WORD flags;
- } attrs[13] =
+ } attrs[] =
{
{ TKIND_INTERFACE, 0 },
{ TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE },
{ TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE },
{ TKIND_DISPATCH, TYPEFLAG_FDISPATCHABLE },
{ TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE },
+ { TKIND_INTERFACE, TYPEFLAG_FDISPATCHABLE },
{ TKIND_RECORD, 0 }
};
ok(hr == S_OK, "got %08x\n", hr);
count = ITypeLib_GetTypeInfoCount(typelib);
- ok(count == 13, "got %d\n", count);
+ ok(count == 14, "got %d\n", count);
for(i = 0; i < count; i++)
{
projects / reactos.git / blobdiff