17 Nov
2015
17 Nov
'15
noon
Author: akhaldi
Date: Tue Nov 17 12:00:00 2015
New Revision: 69916
URL: http://svn.reactos.org/svn/reactos?rev=69916&view=rev
Log:
[OLEAUT32_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536
Modified:
trunk/rostests/winetests/oleaut32/safearray.c
trunk/rostests/winetests/oleaut32/test_tlb.idl
trunk/rostests/winetests/oleaut32/tmarshal.c
trunk/rostests/winetests/oleaut32/tmarshal.idl
trunk/rostests/winetests/oleaut32/tmarshal_dispids.h
trunk/rostests/winetests/oleaut32/typelib.c
trunk/rostests/winetests/oleaut32/vartest.c
trunk/rostests/winetests/oleaut32/vartype.c
Modified: trunk/rostests/winetests/oleaut32/safearray.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/safear…
==============================================================================
--- trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/safearray.c [iso-8859-1] Tue Nov 17 12:00:00 2015
@@ -216,7 +216,7 @@
static BOOL WINAPI RecordInfo_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2)
{
ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return FALSE;
}
static PVOID WINAPI RecordInfo_RecordCreate(IRecordInfo *iface)
Modified: trunk/rostests/winetests/oleaut32/test_tlb.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/test_t…
==============================================================================
--- trunk/rostests/winetests/oleaut32/test_tlb.idl [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/test_tlb.idl [iso-8859-1] Tue Nov 17 12:00:00 2015
@@ -2,6 +2,7 @@
* ITypeLib test IDL - we dump it and compare results in typelib.c
*
* Copyright 2007 Google (Mikolaj Zalewski)
+ * Copyright 2006,2015 Dmitry Timoshkov
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -27,6 +28,43 @@
library Test
{
importlib("stdole2.tlb");
+
+ typedef [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0001)]
+ struct g { int g1; } g;
+
+ [uuid(b14b6bb5-904e-4ff9-b247-bd361f7a0002)]
+ interface test_iface : IUnknown
+ {
+ HRESULT test([in] g *ptr);
+ }
+
+ interface child_iface;
+ interface parent_iface;
+
+ [uuid(b14b6bb5-904e-4ff9-b247-bd361f7aa001)]
+ interface parent_iface : IUnknown
+ {
+ HRESULT test1([out,retval] child_iface **iface);
+ }
+ [uuid(b14b6bb5-904e-4ff9-b247-bd361f7aa002)]
+ interface child_iface: parent_iface
+ {
+ HRESULT test2(void);
+ }
+
+ [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753901),restricted]
+ struct _n { int n1; };
+ [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753902),hidden]
+ typedef struct _n n;
+ [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753903),version(1.2),helpcontext(3)]
+ typedef struct _n nn;
+
+ [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753904),restricted]
+ struct _m { int m1; };
+ [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753905),hidden,version(1.2)]
+ typedef struct _m m;
+ [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753906),helpcontext(3)]
+ typedef struct _m mm;
[dual,uuid(b14b6bb5-904e-4ff9-b247-bd361f7aaedd)]
interface IDualIface : IDispatch
@@ -58,4 +96,40 @@
IDispatch *disp;
BSTR bstr;
};
+
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396a),restricted]
+ int t_INT;
+
+ typedef [public] enum _a { a1, a2 } a;
+ typedef [public] enum aa { aa1, aa2 } aa;
+ typedef enum _b { b1, b2 } b;
+ typedef enum bb { bb1, bb2 } bb;
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396b)] enum _c { c1, c2 } c;
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396c)] enum cc { cc1, cc2 } cc;
+
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396d),restricted,hidden]
+ enum _d { d1, d2 } d;
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a75396e),restricted,hidden]
+ enum dd { dd1, dd2 } dd;
+
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753970),restricted,hidden]
+ struct _e { int e1; } e;
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753971),restricted,hidden]
+ struct ee { int ee1; } ee;
+
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753972),restricted,hidden]
+ union _f { int f1; BSTR *f2; } f;
+ typedef [uuid(016fe2ec-b2c8-45f8-b23b-39e53a753973),restricted,hidden]
+ union ff { int ff1; BSTR *ff2; } ff;
+
+ [uuid(ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a)]
+ interface ITestIface : IDispatch
+ {
+ HRESULT test1(a value);
+ HRESULT test2(b value);
+ HRESULT test3(c value);
+ HRESULT test4(d value);
+ HRESULT test5(e value);
+ HRESULT test6(f value);
+ }
}
Modified: trunk/rostests/winetests/oleaut32/tmarshal.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh…
==============================================================================
--- trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/tmarshal.c [iso-8859-1] Tue Nov 17 12:00:00 2015
@@ -165,7 +165,7 @@
static HRESULT WINAPI ExternalConnection_QueryInterface(IExternalConnection *iface,
REFIID riid, void **ppv)
{
- ok(0, "unxpected call\n");
+ ok(0, "unexpected call\n");
*ppv = NULL;
return E_NOINTERFACE;
}
@@ -607,7 +607,7 @@
ApplicationObject2 **ppVal)
{
trace("CloneCoclass()\n");
- return S_OK;
+ return Widget_QueryInterface(iface, &IID_IWidget, (void **)ppVal);
}
static HRESULT WINAPI Widget_Value(
@@ -834,7 +834,7 @@
return S_OK;
}
-static HRESULT WINAPI Widget__restrict(IWidget* iface, INT *i)
+static HRESULT WINAPI Widget_pos_restrict(IWidget* iface, INT *i)
{
trace("restrict\n");
*i = DISPID_TM_RESTRICTED;
@@ -845,6 +845,85 @@
{
trace("neg_restrict\n");
*i = DISPID_TM_NEG_RESTRICTED;
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_VarArg_Run(
+ IWidget *iface, BSTR name, SAFEARRAY *params, VARIANT *result)
+{
+ static const WCHAR catW[] = { 'C','a','t',0 };
+ static const WCHAR supermanW[] = {
'S','u','p','e','r','m','a','n',0
};
+ LONG bound;
+ VARIANT *var;
+ BSTR bstr;
+ HRESULT hr;
+
+ trace("VarArg_Run(%p,%p,%p)\n", name, params, result);
+
+ ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name));
+
+ hr = SafeArrayGetLBound(params, 1, &bound);
+ ok(hr == S_OK, "SafeArrayGetLBound error %#x\n", hr);
+ ok(bound == 0, "expected 0, got %d\n", bound);
+
+ hr = SafeArrayGetUBound(params, 1, &bound);
+ ok(hr == S_OK, "SafeArrayGetUBound error %#x\n", hr);
+ ok(bound == 0, "expected 0, got %d\n", bound);
+
+ hr = SafeArrayAccessData(params, (void **)&var);
+ ok(hr == S_OK, "SafeArrayAccessData failed with %x\n", hr);
+
+ ok(V_VT(&var[0]) == VT_BSTR, "expected VT_BSTR, got %d\n",
V_VT(&var[0]));
+ bstr = V_BSTR(&var[0]);
+ ok(!lstrcmpW(bstr, supermanW), "got %s\n", wine_dbgstr_w(bstr));
+
+ hr = SafeArrayUnaccessData(params);
+ ok(hr == S_OK, "SafeArrayUnaccessData error %#x\n", hr);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_VarArg_Ref_Run(
+ IWidget *iface, BSTR name, SAFEARRAY **params, VARIANT *result)
+{
+ static const WCHAR catW[] = { 'C','a','t',0 };
+ static const WCHAR supermanW[] = {
'S','u','p','e','r','m','a','n',0
};
+ LONG bound;
+ VARIANT *var;
+ BSTR bstr;
+ HRESULT hr;
+
+ trace("VarArg_Ref_Run(%p,%p,%p)\n", name, params, result);
+
+ ok(!lstrcmpW(name, catW), "got %s\n", wine_dbgstr_w(name));
+
+ hr = SafeArrayGetLBound(*params, 1, &bound);
+ ok(hr == S_OK, "SafeArrayGetLBound error %#x\n", hr);
+ ok(bound == 0, "expected 0, got %d\n", bound);
+
+ hr = SafeArrayGetUBound(*params, 1, &bound);
+ ok(hr == S_OK, "SafeArrayGetUBound error %#x\n", hr);
+ ok(bound == 0, "expected 0, got %d\n", bound);
+
+ hr = SafeArrayAccessData(*params, (void **)&var);
+ ok(hr == S_OK, "SafeArrayAccessData error %#x\n", hr);
+
+ ok(V_VT(&var[0]) == VT_BSTR, "expected VT_BSTR, got %d\n",
V_VT(&var[0]));
+ bstr = V_BSTR(&var[0]);
+ ok(!lstrcmpW(bstr, supermanW), "got %s\n", wine_dbgstr_w(bstr));
+
+ hr = SafeArrayUnaccessData(*params);
+ ok(hr == S_OK, "SafeArrayUnaccessData error %#x\n", hr);
+
+ return S_OK;
+}
+
+static HRESULT WINAPI Widget_Coclass(
+ IWidget *iface,
+ ApplicationObject2 *p)
+{
+ trace("Coclass(%p)\n", p);
+ ok(p == (ApplicationObject2 *)iface, "expected p == %p, got %p\n", iface,
p);
return S_OK;
}
@@ -884,8 +963,11 @@
Widget_ByRefUInt,
Widget_put_prop_opt_arg,
Widget_put_prop_req_arg,
- Widget__restrict,
- Widget_neg_restrict
+ Widget_pos_restrict,
+ Widget_neg_restrict,
+ Widget_VarArg_Run,
+ Widget_VarArg_Ref_Run,
+ Widget_Coclass,
};
static HRESULT WINAPI StaticWidget_QueryInterface(IStaticWidget *iface, REFIID riid, void
**ppvObject)
@@ -1431,8 +1513,26 @@
excepinfo.wCode, excepinfo.scode);
ok(V_VT(&varresult) == VT_DISPATCH, "V_VT(&varresult) was %d instead of
VT_DISPATCH\n", V_VT(&varresult));
- ok(!V_DISPATCH(&varresult), "V_DISPATCH(&varresult) should be NULL
instead of %p\n", V_DISPATCH(&varresult));
- VariantClear(&varresult);
+ ok(V_DISPATCH(&varresult) != NULL, "expected V_DISPATCH(&varresult) !=
NULL\n");
+
+ /* call CoClass with VT_DISPATCH type */
+ vararg[0] = varresult;
+ dispparams.cNamedArgs = 0;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.cArgs = 1;
+ dispparams.rgvarg = vararg;
+ VariantInit(&varresult);
+ hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL);
+ 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);
+ VariantClear(&varresult);
+
+ /* call CoClass (direct) */
+ hr = IWidget_Coclass(pWidget, (void *)V_DISPATCH(&vararg[0]));
+ ok_ole_success(hr, IWidget_Coclass);
+ VariantClear(&vararg[0]);
/* call Value with a VT_VARIANT|VT_BYREF type */
V_VT(&vararg[0]) = VT_VARIANT|VT_BYREF;
@@ -1470,6 +1570,30 @@
hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARIANT, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
ok_ole_success(hr, IDispatch_Invoke);
VariantClear(&varresult);
+
+ /* call Array with BSTR argument - type mismatch */
+ VariantInit(&vararg[0]);
+ V_VT(&vararg[0]) = VT_BSTR;
+ V_BSTR(&vararg[0]) = SysAllocString(szSuperman);
+ dispparams.cNamedArgs = 0;
+ dispparams.cArgs = 1;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = vararg;
+ hr = IDispatch_Invoke(pDispatch, DISPID_TM_ARRAY, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected
DISP_E_TYPEMISMATCH, got %#x\n", hr);
+ SysFreeString(V_BSTR(&vararg[0]));
+
+ /* call ArrayPtr with BSTR argument - type mismatch */
+ VariantInit(&vararg[0]);
+ V_VT(&vararg[0]) = VT_BSTR;
+ V_BSTR(&vararg[0]) = SysAllocString(szSuperman);
+ dispparams.cNamedArgs = 0;
+ dispparams.cArgs = 1;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = vararg;
+ hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARRAYPTR, &IID_NULL,
LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok(hr == DISP_E_TYPEMISMATCH || hr == DISP_E_BADVARTYPE, "expected
DISP_E_TYPEMISMATCH, got %#x\n", hr);
+ SysFreeString(V_BSTR(&vararg[0]));
/* call VariantCArray - test marshaling of variant arrays */
V_VT(&vararg[0]) = VT_I4;
@@ -1501,7 +1625,7 @@
dispparams.rgdispidNamedArgs = NULL;
dispparams.rgvarg = vararg;
hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
- ok_ole_success(hr, ITypeInfo_Invoke);
+ ok_ole_success(hr, IDispatch_Invoke);
/* call VarArg, even one (non-optional, non-safearray) named argument is not allowed
*/
dispidNamed = 0;
@@ -1510,6 +1634,38 @@
hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
ok(hr == DISP_E_NONAMEDARGS, "IDispatch_Invoke should have returned
DISP_E_NONAMEDARGS instead of 0x%08x\n", hr);
dispidNamed = DISPID_PROPERTYPUT;
+
+ /* call VarArg_Run */
+ VariantInit(&vararg[1]);
+ V_VT(&vararg[1]) = VT_BSTR;
+ V_BSTR(&vararg[1]) = SysAllocString(szCat);
+ VariantInit(&vararg[0]);
+ V_VT(&vararg[0]) = VT_BSTR;
+ V_BSTR(&vararg[0]) = SysAllocString(szSuperman);
+ dispparams.cNamedArgs = 0;
+ dispparams.cArgs = 2;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = vararg;
+ hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_RUN, &IID_NULL, LOCALE_NEUTRAL,
DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok_ole_success(hr, IDispatch_Invoke);
+ SysFreeString(V_BSTR(&vararg[1]));
+ SysFreeString(V_BSTR(&vararg[0]));
+
+ /* call VarArg_Ref_Run */
+ VariantInit(&vararg[1]);
+ V_VT(&vararg[1]) = VT_BSTR;
+ V_BSTR(&vararg[1]) = SysAllocString(szCat);
+ VariantInit(&vararg[0]);
+ V_VT(&vararg[0]) = VT_BSTR;
+ V_BSTR(&vararg[0]) = SysAllocString(szSuperman);
+ dispparams.cNamedArgs = 0;
+ dispparams.cArgs = 2;
+ dispparams.rgdispidNamedArgs = NULL;
+ dispparams.rgvarg = vararg;
+ hr = IDispatch_Invoke(pDispatch, DISPID_TM_VARARG_REF_RUN, &IID_NULL,
LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, NULL, NULL);
+ ok_ole_success(hr, IDispatch_Invoke);
+ SysFreeString(V_BSTR(&vararg[1]));
+ SysFreeString(V_BSTR(&vararg[0]));
/* call Error */
dispparams.cNamedArgs = 0;
@@ -1918,6 +2074,9 @@
ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres);
ok(external_connections == 0, "external_connections = %d\n",
external_connections);
+ IStream_Release(stream);
+ IStream_Release(stream2);
+
/* Weak table marshaling does not increment external connections */
hres = CreateStreamOnHGlobal(NULL, TRUE, &stream);
ok(hres == S_OK, "CreateStreamOnHGlobal failed: %08x\n", hres);
@@ -1936,6 +2095,8 @@
hres = CoReleaseMarshalData(stream);
ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres);
ok(external_connections == 0, "external_connections = %d\n",
external_connections);
+
+ IStream_Release(stream);
}
START_TEST(tmarshal)
Modified: trunk/rostests/winetests/oleaut32/tmarshal.idl
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh…
==============================================================================
--- trunk/rostests/winetests/oleaut32/tmarshal.idl [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/tmarshal.idl [iso-8859-1] Tue Nov 17 12:00:00 2015
@@ -175,10 +175,19 @@
HRESULT prop_req_arg([in] INT req, [in] INT i);
[id(DISPID_TM_RESTRICTED), restricted]
- HRESULT do_restrict([out, retval] INT *i);
+ HRESULT pos_restrict([out, retval] INT *i);
[id(DISPID_TM_NEG_RESTRICTED), restricted]
HRESULT neg_restrict([out, retval] INT *i);
+
+ [id(DISPID_TM_VARARG_RUN), vararg]
+ HRESULT VarArg_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) params, [out, retval]
VARIANT *result);
+
+ [id(DISPID_TM_VARARG_REF_RUN), vararg]
+ HRESULT VarArg_Ref_Run([in] BSTR name, [in] SAFEARRAY(VARIANT) *params, [out,
retval] VARIANT *result);
+
+ [id(DISPID_TM_COCLASS)]
+ HRESULT Coclass([in] ApplicationObject2 *p);
}
[
Modified: trunk/rostests/winetests/oleaut32/tmarshal_dispids.h
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/tmarsh…
==============================================================================
--- trunk/rostests/winetests/oleaut32/tmarshal_dispids.h [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/tmarshal_dispids.h [iso-8859-1] Tue Nov 17 12:00:00
2015
@@ -44,6 +44,9 @@
#define DISPID_TM_RESTRICTED 25
#define DISPID_TM_NEG_RESTRICTED -26
#define DISPID_TM_TESTSECONDIFACE 27
+#define DISPID_TM_VARARG_RUN 28
+#define DISPID_TM_VARARG_REF_RUN 29
+#define DISPID_TM_COCLASS 30
#define DISPID_NOA_BSTRRET 1
#define DISPID_NOA_ERROR 2
Modified: trunk/rostests/winetests/oleaut32/typelib.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/typeli…
==============================================================================
--- trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/typelib.c [iso-8859-1] Tue Nov 17 12:00:00 2015
@@ -2,7 +2,7 @@
* ITypeLib and ITypeInfo test
*
* Copyright 2004 Jacek Caban
- * Copyright 2006 Dmitry Timoshkov
+ * Copyright 2006,2015 Dmitry Timoshkov
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -47,7 +47,7 @@
#define expect_int(expr, value) expect_eq(expr, (int)(value), int, "%d")
#define expect_hex(expr, value) expect_eq(expr, (int)(value), int, "0x%x")
#define expect_null(expr) expect_eq(expr, NULL, const void *, "%p")
-#define expect_guid(expected, guid) { ok(IsEqualGUID(expected, guid), "got wrong
guid\n"); }
+#define expect_guid(expected, guid) { ok(IsEqualGUID(expected, guid), "got wrong
guid %s\n", wine_dbgstr_guid(guid)); }
#define expect_wstr_acpval(expr, value) \
{ \
@@ -69,6 +69,10 @@
#define ARCH "x86"
#elif defined __x86_64__
#define ARCH "amd64"
+#elif defined __arm__
+#define ARCH "arm"
+#elif defined __aarch64__
+#define ARCH "arm64"
#else
#define ARCH "none"
#endif
@@ -3664,11 +3668,9 @@
static char *dump_string(LPWSTR wstr)
{
- int size = lstrlenW(wstr)+3;
+ int size = lstrlenW(wstr)+1;
char *out = CoTaskMemAlloc(size);
- WideCharToMultiByte(20127, 0, wstr, -1, out+1, size, NULL, NULL);
- out[0] = '\"';
- strcat(out, "\"");
+ WideCharToMultiByte(20127, 0, wstr, -1, out, size, NULL, NULL);
return out;
}
@@ -3709,9 +3711,95 @@
{0, NULL}
};
+static const struct map_entry callconv_map[] = {
+ MAP_ENTRY(CC_FASTCALL),
+ MAP_ENTRY(CC_CDECL),
+ MAP_ENTRY(CC_PASCAL),
+ MAP_ENTRY(CC_MACPASCAL),
+ MAP_ENTRY(CC_STDCALL),
+ MAP_ENTRY(CC_FPFASTCALL),
+ MAP_ENTRY(CC_SYSCALL),
+ MAP_ENTRY(CC_MPWCDECL),
+ MAP_ENTRY(CC_MPWPASCAL),
+ {0, NULL}
+};
+
+static const struct map_entry vt_map[] = {
+ MAP_ENTRY(VT_EMPTY),
+ MAP_ENTRY(VT_NULL),
+ MAP_ENTRY(VT_I2),
+ MAP_ENTRY(VT_I4),
+ MAP_ENTRY(VT_R4),
+ MAP_ENTRY(VT_R8),
+ MAP_ENTRY(VT_CY),
+ MAP_ENTRY(VT_DATE),
+ MAP_ENTRY(VT_BSTR),
+ MAP_ENTRY(VT_DISPATCH),
+ MAP_ENTRY(VT_ERROR),
+ MAP_ENTRY(VT_BOOL),
+ MAP_ENTRY(VT_VARIANT),
+ MAP_ENTRY(VT_UNKNOWN),
+ MAP_ENTRY(VT_DECIMAL),
+ MAP_ENTRY(15),
+ MAP_ENTRY(VT_I1),
+ MAP_ENTRY(VT_UI1),
+ MAP_ENTRY(VT_UI2),
+ MAP_ENTRY(VT_UI4),
+ MAP_ENTRY(VT_I8),
+ MAP_ENTRY(VT_UI8),
+ MAP_ENTRY(VT_INT),
+ MAP_ENTRY(VT_UINT),
+ MAP_ENTRY(VT_VOID),
+ MAP_ENTRY(VT_HRESULT),
+ MAP_ENTRY(VT_PTR),
+ MAP_ENTRY(VT_SAFEARRAY),
+ MAP_ENTRY(VT_CARRAY),
+ MAP_ENTRY(VT_USERDEFINED),
+ MAP_ENTRY(VT_LPSTR),
+ MAP_ENTRY(VT_LPWSTR),
+ MAP_ENTRY(VT_RECORD),
+ MAP_ENTRY(VT_INT_PTR),
+ MAP_ENTRY(VT_UINT_PTR),
+ MAP_ENTRY(39),
+ MAP_ENTRY(40),
+ MAP_ENTRY(41),
+ MAP_ENTRY(42),
+ MAP_ENTRY(43),
+ MAP_ENTRY(44),
+ MAP_ENTRY(45),
+ MAP_ENTRY(46),
+ MAP_ENTRY(47),
+ MAP_ENTRY(48),
+ MAP_ENTRY(49),
+ MAP_ENTRY(50),
+ MAP_ENTRY(51),
+ MAP_ENTRY(52),
+ MAP_ENTRY(53),
+ MAP_ENTRY(54),
+ MAP_ENTRY(55),
+ MAP_ENTRY(56),
+ MAP_ENTRY(57),
+ MAP_ENTRY(58),
+ MAP_ENTRY(59),
+ MAP_ENTRY(60),
+ MAP_ENTRY(61),
+ MAP_ENTRY(62),
+ MAP_ENTRY(63),
+ MAP_ENTRY(VT_FILETIME),
+ MAP_ENTRY(VT_BLOB),
+ MAP_ENTRY(VT_STREAM),
+ MAP_ENTRY(VT_STORAGE),
+ MAP_ENTRY(VT_STREAMED_OBJECT),
+ MAP_ENTRY(VT_STORED_OBJECT),
+ MAP_ENTRY(VT_BLOB_OBJECT),
+ MAP_ENTRY(VT_CF),
+ MAP_ENTRY(VT_CLSID),
+ {0, NULL}
+};
+
#undef MAP_ENTRY
-static const char *map_value(DWORD val, const struct map_entry *map)
+static const char *map_value(int val, const struct map_entry *map)
{
static int map_id;
static char bufs[16][256];
@@ -3725,8 +3813,150 @@
}
buf = bufs[(map_id++)%16];
- sprintf(buf, "0x%x", val);
+ sprintf(buf, "%d", val);
return buf;
+}
+
+static const char *dump_type_flags(DWORD flags)
+{
+ static char buf[256];
+
+ if (!flags) return "0";
+
+ buf[0] = 0;
+
+#define ADD_FLAG(x) if (flags & x) { if (buf[0]) strcat(buf, "|");
strcat(buf, #x); flags &= ~x; }
+ ADD_FLAG(TYPEFLAG_FPROXY)
+ ADD_FLAG(TYPEFLAG_FREVERSEBIND)
+ ADD_FLAG(TYPEFLAG_FDISPATCHABLE)
+ ADD_FLAG(TYPEFLAG_FREPLACEABLE)
+ ADD_FLAG(TYPEFLAG_FAGGREGATABLE)
+ ADD_FLAG(TYPEFLAG_FRESTRICTED)
+ ADD_FLAG(TYPEFLAG_FOLEAUTOMATION)
+ ADD_FLAG(TYPEFLAG_FNONEXTENSIBLE)
+ ADD_FLAG(TYPEFLAG_FDUAL)
+ ADD_FLAG(TYPEFLAG_FCONTROL)
+ ADD_FLAG(TYPEFLAG_FHIDDEN)
+ ADD_FLAG(TYPEFLAG_FPREDECLID)
+ ADD_FLAG(TYPEFLAG_FLICENSED)
+ ADD_FLAG(TYPEFLAG_FCANCREATE)
+ ADD_FLAG(TYPEFLAG_FAPPOBJECT)
+#undef ADD_FLAG
+
+ assert(!flags);
+ assert(strlen(buf) < sizeof(buf));
+
+ return buf;
+}
+
+static char *print_size(BSTR name, TYPEATTR *attr)
+{
+ static char buf[256];
+
+ switch (attr->typekind)
+ {
+ case TKIND_DISPATCH:
+ case TKIND_INTERFACE:
+ sprintf(buf, "sizeof(%s*)", dump_string(name));
+ break;
+
+ case TKIND_RECORD:
+ sprintf(buf, "sizeof(struct %s)", dump_string(name));
+ break;
+
+ case TKIND_UNION:
+ sprintf(buf, "sizeof(union %s)", dump_string(name));
+ break;
+
+ case TKIND_ENUM:
+ case TKIND_ALIAS:
+ sprintf(buf, "4");
+ break;
+
+ default:
+ assert(0);
+ return NULL;
+ }
+
+ return buf;
+}
+
+static const char *dump_param_flags(DWORD flags)
+{
+ static char buf[256];
+
+ if (!flags) return "PARAMFLAG_NONE";
+
+ buf[0] = 0;
+
+#define ADD_FLAG(x) if (flags & x) { if (buf[0]) strcat(buf, "|");
strcat(buf, #x); flags &= ~x; }
+ ADD_FLAG(PARAMFLAG_FIN)
+ ADD_FLAG(PARAMFLAG_FOUT)
+ ADD_FLAG(PARAMFLAG_FLCID)
+ ADD_FLAG(PARAMFLAG_FRETVAL)
+ ADD_FLAG(PARAMFLAG_FOPT)
+ ADD_FLAG(PARAMFLAG_FHASDEFAULT)
+ ADD_FLAG(PARAMFLAG_FHASCUSTDATA)
+#undef ADD_FLAG
+
+ assert(!flags);
+ assert(strlen(buf) < sizeof(buf));
+
+ return buf;
+}
+
+static const char *dump_func_flags(DWORD flags)
+{
+ static char buf[256];
+
+ if (!flags) return "0";
+
+ buf[0] = 0;
+
+#define ADD_FLAG(x) if (flags & x) { if (buf[0]) strcat(buf, "|");
strcat(buf, #x); flags &= ~x; }
+ ADD_FLAG(FUNCFLAG_FRESTRICTED)
+ ADD_FLAG(FUNCFLAG_FSOURCE)
+ ADD_FLAG(FUNCFLAG_FBINDABLE)
+ ADD_FLAG(FUNCFLAG_FREQUESTEDIT)
+ ADD_FLAG(FUNCFLAG_FDISPLAYBIND)
+ ADD_FLAG(FUNCFLAG_FDEFAULTBIND)
+ ADD_FLAG(FUNCFLAG_FHIDDEN)
+ ADD_FLAG(FUNCFLAG_FUSESGETLASTERROR)
+ ADD_FLAG(FUNCFLAG_FDEFAULTCOLLELEM)
+ ADD_FLAG(FUNCFLAG_FUIDEFAULT)
+ ADD_FLAG(FUNCFLAG_FNONBROWSABLE)
+ ADD_FLAG(FUNCFLAG_FREPLACEABLE)
+ ADD_FLAG(FUNCFLAG_FIMMEDIATEBIND)
+#undef ADD_FLAG
+
+ assert(!flags);
+ assert(strlen(buf) < sizeof(buf));
+
+ return buf;
+}
+
+static int get_href_type(ITypeInfo *info, TYPEDESC *tdesc)
+{
+ int href_type = -1;
+
+ if (tdesc->vt == VT_USERDEFINED)
+ {
+ HRESULT hr;
+ ITypeInfo *param;
+ TYPEATTR *attr;
+
+ hr = ITypeInfo_GetRefTypeInfo(info, U(*tdesc).hreftype, ¶m);
+ ok(hr == S_OK, "GetRefTypeInfo error %#x\n", hr);
+ hr = ITypeInfo_GetTypeAttr(param, &attr);
+ ok(hr == S_OK, "GetTypeAttr error %#x\n", hr);
+
+ href_type = attr->typekind;
+
+ ITypeInfo_ReleaseTypeAttr(param, attr);
+ ITypeInfo_Release(param);
+ }
+
+ return href_type;
}
static void test_dump_typelib(const char *name)
@@ -3739,27 +3969,36 @@
MultiByteToWideChar(CP_ACP, 0, name, -1, wszString, 260);
OLE_CHECK(LoadTypeLib(wszString, &lib));
+
+ printf("/*** Autogenerated data. Do not edit, change the generator above
instead. ***/\n");
+
count = ITypeLib_GetTypeInfoCount(lib);
- printf("/* interfaces count: %d */\n", count);
for (i = 0; i < count; i++)
{
TYPEATTR *attr;
BSTR name;
+ DWORD help_ctx;
int f = 0;
- OLE_CHECK(ITypeLib_GetDocumentation(lib, i, &name, NULL, NULL, NULL));
+ OLE_CHECK(ITypeLib_GetDocumentation(lib, i, &name, NULL, &help_ctx,
NULL));
printf("{\n"
- " %s,\n", dump_string(name));
- SysFreeString(name);
+ " \"%s\",\n", dump_string(name));
OLE_CHECK(ITypeLib_GetTypeInfo(lib, i, &info));
- ITypeInfo_GetTypeAttr(info, &attr);
- printf(" /*kind*/ %s, /*flags*/ 0x%x, /*align*/ %d, /*size*/ %d,\n"
- " /*#vtbl*/ %d, /*#func*/ %d,\n"
- " {\n",
- map_value(attr->typekind, tkind_map), attr->wTypeFlags,
attr->cbAlignment, attr->cbSizeInstance, attr->cbSizeVft,
- attr->cFuncs);
- ITypeInfo_ReleaseTypeAttr(info, attr);
+ OLE_CHECK(ITypeInfo_GetTypeAttr(info, &attr));
+
+ printf(" \"%s\",\n", wine_dbgstr_guid(&attr->guid));
+
+ printf(" /*kind*/ %s, /*flags*/ %s, /*align*/ %d, /*size*/ %s,\n"
+ " /*helpctx*/ 0x%04x, /*version*/ 0x%08x, /*#vtbl*/ %d, /*#func*/
%d",
+ map_value(attr->typekind, tkind_map),
dump_type_flags(attr->wTypeFlags),
+ attr->cbAlignment, print_size(name, attr),
+ help_ctx, MAKELONG(attr->wMinorVerNum, attr->wMajorVerNum),
+ attr->cbSizeVft/sizeof(void*), attr->cFuncs);
+
+ if (attr->cFuncs) printf(",\n {\n");
+ else printf("\n");
+
while (1)
{
FUNCDESC *desc;
@@ -3770,25 +4009,27 @@
if (FAILED(ITypeInfo_GetFuncDesc(info, f, &desc)))
break;
printf(" {\n"
- " 0x%x, /*func*/ %s, /*inv*/ %s, /*call*/ 0x%x,\n",
+ " /*id*/ 0x%x, /*func*/ %s, /*inv*/ %s, /*call*/
%s,\n",
desc->memid, map_value(desc->funckind, funckind_map),
map_value(desc->invkind, invkind_map),
- desc->callconv);
- printf(" /*#param*/ %d, /*#opt*/ %d, /*vtbl*/ %d, /*#scodes*/ %d,
/*flags*/ 0x%x,\n",
- desc->cParams, desc->cParamsOpt, desc->oVft, desc->cScodes,
desc->wFuncFlags);
- printf(" {%d, %x}, /* ret */\n",
desc->elemdescFunc.tdesc.vt, desc->elemdescFunc.paramdesc.wParamFlags);
+ map_value(desc->callconv, callconv_map));
+ printf(" /*#param*/ %d, /*#opt*/ %d, /*vtbl*/ %d, /*#scodes*/ %d,
/*flags*/ %s,\n",
+ desc->cParams, desc->cParamsOpt, desc->oVft/sizeof(void*),
desc->cScodes, dump_func_flags(desc->wFuncFlags));
+ printf(" {%s, %s, %s}, /* ret */\n",
map_value(desc->elemdescFunc.tdesc.vt, vt_map),
+ map_value(get_href_type(info, &desc->elemdescFunc.tdesc),
tkind_map), dump_param_flags(U(desc->elemdescFunc).paramdesc.wParamFlags));
printf(" { /* params */\n");
for (p = 0; p < desc->cParams; p++)
{
ELEMDESC e = desc->lprgelemdescParam[p];
- printf(" {%d, %x},\n", e.tdesc.vt,
e.paramdesc.wParamFlags);
+ printf(" {%s, %s, %s},\n", map_value(e.tdesc.vt,
vt_map),
+ map_value(get_href_type(info, &e.tdesc), tkind_map),
dump_param_flags(U(e).paramdesc.wParamFlags));
}
- printf(" {-1, -1}\n");
+ printf(" {-1, 0, 0}\n");
printf(" },\n");
printf(" { /* names */\n");
OLE_CHECK(ITypeInfo_GetNames(info, desc->memid, tab, 256, &cNames));
for (p = 0; p < cNames; p++)
{
- printf(" %s,\n", dump_string(tab[p]));
+ printf(" \"%s\",\n", dump_string(tab[p]));
SysFreeString(tab[p]);
}
printf(" NULL,\n");
@@ -3797,9 +4038,11 @@
ITypeInfo_ReleaseFuncDesc(info, desc);
f++;
}
- printf(" }\n");
+ if (attr->cFuncs) printf(" }\n");
printf("},\n");
+ ITypeInfo_ReleaseTypeAttr(info, attr);
ITypeInfo_Release(info);
+ SysFreeString(name);
}
ITypeLib_Release(lib);
}
@@ -3809,6 +4052,7 @@
typedef struct _element_info
{
VARTYPE vt;
+ TYPEKIND type;
USHORT wParamFlags;
} element_info;
@@ -3836,26 +4080,135 @@
WORD wTypeFlags;
USHORT cbAlignment;
USHORT cbSizeInstance;
+ USHORT help_ctx;
+ DWORD version;
USHORT cbSizeVft;
USHORT cFuncs;
function_info funcs[20];
} type_info;
static const type_info info[] = {
+/*** Autogenerated data. Do not edit, change the generator above instead. ***/
+{
+ "g",
+ "{b14b6bb5-904e-4ff9-b247-bd361f7a0001}",
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct g),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "test_iface",
+ "{b14b6bb5-904e-4ff9-b247-bd361f7a0002}",
+ /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(test_iface*),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1,
+ {
+ {
+ /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_PTR, -1, PARAMFLAG_FIN},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "Test",
+ "ptr",
+ NULL,
+ },
+ },
+ }
+},
+{
+ "parent_iface",
+ "{b14b6bb5-904e-4ff9-b247-bd361f7aa001}",
+ /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(parent_iface*),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 4, /*#func*/ 1,
+ {
+ {
+ /*id*/ 0x60010000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_PTR, -1, PARAMFLAG_FOUT|PARAMFLAG_FRETVAL},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test1",
+ "iface",
+ NULL,
+ },
+ },
+ }
+},
+{
+ "child_iface",
+ "{b14b6bb5-904e-4ff9-b247-bd361f7aa002}",
+ /*kind*/ TKIND_INTERFACE, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(child_iface*),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 5, /*#func*/ 1,
+ {
+ {
+ /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test2",
+ NULL,
+ },
+ },
+ }
+},
+{
+ "_n",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753903}",
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _n),
+ /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "n",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753902}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "nn",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0003, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "_m",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753906}",
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct _m),
+ /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "m",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753905}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FHIDDEN, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00010002, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "mm",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0003, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
{
"IDualIface",
"{b14b6bb5-904e-4ff9-b247-bd361f7aaedd}",
- /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ 4,
/*size*/ sizeof(void*),
- /*#vtbl*/ 7, /*#func*/ 8,
+ /*kind*/ TKIND_DISPATCH, /*flags*/ TYPEFLAG_FDISPATCHABLE|TYPEFLAG_FDUAL, /*align*/ 4,
/*size*/ sizeof(IDualIface*),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 7, /*#func*/ 8,
{
{
- 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/ 0x1,
- {24, 0}, /* ret */
+ /*id*/ 0x60000000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 2, /*#opt*/ 0, /*vtbl*/ 0, /*#scodes*/ 0, /*flags*/
FUNCFLAG_FRESTRICTED,
+ {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {26, 1},
- {26, 2},
- {-1, -1}
+ {VT_PTR, -1, PARAMFLAG_FIN},
+ {VT_PTR, -1, PARAMFLAG_FOUT},
+ {-1, 0, 0}
},
{ /* names */
"QueryInterface",
@@ -3865,11 +4218,11 @@
},
},
{
- 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/ 0x1,
- {19, 0}, /* ret */
+ /*id*/ 0x60000001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 1, /*#scodes*/ 0, /*flags*/
FUNCFLAG_FRESTRICTED,
+ {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {-1, -1}
+ {-1, 0, 0}
},
{ /* names */
"AddRef",
@@ -3877,11 +4230,11 @@
},
},
{
- 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/ 0x1,
- {19, 0}, /* ret */
+ /*id*/ 0x60000002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 2, /*#scodes*/ 0, /*flags*/
FUNCFLAG_FRESTRICTED,
+ {VT_UI4, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {-1, -1}
+ {-1, 0, 0}
},
{ /* names */
"Release",
@@ -3889,12 +4242,12 @@
},
},
{
- 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/ 0x1,
- {24, 0}, /* ret */
+ /*id*/ 0x60010000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 3, /*#scodes*/ 0, /*flags*/
FUNCFLAG_FRESTRICTED,
+ {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {26, 2},
- {-1, -1}
+ {VT_PTR, -1, PARAMFLAG_FOUT},
+ {-1, 0, 0}
},
{ /* names */
"GetTypeInfoCount",
@@ -3903,14 +4256,14 @@
},
},
{
- 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/ 0x1,
- {24, 0}, /* ret */
+ /*id*/ 0x60010001, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 3, /*#opt*/ 0, /*vtbl*/ 4, /*#scodes*/ 0, /*flags*/
FUNCFLAG_FRESTRICTED,
+ {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {23, 1},
- {19, 1},
- {26, 2},
- {-1, -1}
+ {VT_UINT, -1, PARAMFLAG_FIN},
+ {VT_UI4, -1, PARAMFLAG_FIN},
+ {VT_PTR, -1, PARAMFLAG_FOUT},
+ {-1, 0, 0}
},
{ /* names */
"GetTypeInfo",
@@ -3921,16 +4274,16 @@
},
},
{
- 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/ 0x1,
- {24, 0}, /* ret */
+ /*id*/ 0x60010002, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 5, /*#opt*/ 0, /*vtbl*/ 5, /*#scodes*/ 0, /*flags*/
FUNCFLAG_FRESTRICTED,
+ {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {26, 1},
- {26, 1},
- {23, 1},
- {19, 1},
- {26, 2},
- {-1, -1}
+ {VT_PTR, -1, PARAMFLAG_FIN},
+ {VT_PTR, -1, PARAMFLAG_FIN},
+ {VT_UINT, -1, PARAMFLAG_FIN},
+ {VT_UI4, -1, PARAMFLAG_FIN},
+ {VT_PTR, -1, PARAMFLAG_FOUT},
+ {-1, 0, 0}
},
{ /* names */
"GetIDsOfNames",
@@ -3943,19 +4296,19 @@
},
},
{
- 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/ 0x1,
- {24, 0}, /* ret */
+ /*id*/ 0x60010003, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 8, /*#opt*/ 0, /*vtbl*/ 6, /*#scodes*/ 0, /*flags*/
FUNCFLAG_FRESTRICTED,
+ {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {3, 1},
- {26, 1},
- {19, 1},
- {18, 1},
- {26, 1},
- {26, 2},
- {26, 2},
- {26, 2},
- {-1, -1}
+ {VT_I4, -1, PARAMFLAG_FIN},
+ {VT_PTR, -1, PARAMFLAG_FIN},
+ {VT_UI4, -1, PARAMFLAG_FIN},
+ {VT_UI2, -1, PARAMFLAG_FIN},
+ {VT_PTR, -1, PARAMFLAG_FIN},
+ {VT_PTR, -1, PARAMFLAG_FOUT},
+ {VT_PTR, -1, PARAMFLAG_FOUT},
+ {VT_PTR, -1, PARAMFLAG_FOUT},
+ {-1, 0, 0}
},
{ /* names */
"Invoke",
@@ -3971,11 +4324,11 @@
},
},
{
- 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0x0,
- {24, 0}, /* ret */
+ /*id*/ 0x60020000, /*func*/ FUNC_DISPATCH, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_VOID, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {-1, -1}
+ {-1, 0, 0}
},
{ /* names */
"Test",
@@ -3987,15 +4340,15 @@
{
"ISimpleIface",
"{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac009}",
- /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/
sizeof(void*),
- /*#vtbl*/ 8, /*#func*/ 1,
+ /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/
sizeof(ISimpleIface*),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 8, /*#func*/ 1,
{
{
- 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/ CC_STDCALL,
- /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0x0,
- {25, 0}, /* ret */
+ /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 0, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
{ /* params */
- {-1, -1}
+ {-1, 0, 0}
},
{ /* names */
"Test",
@@ -4007,12 +4360,214 @@
{
"test_struct",
"{4029f190-ca4a-4611-aeb9-673983cb96dd}",
- /* kind */ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct)
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
},
{
"test_struct2",
"{4029f190-ca4a-4611-aeb9-673983cb96de}",
- /* kind */ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct)
+ /*kind*/ TKIND_RECORD, /*flags*/ 0, /*align*/ 4, /*size*/ sizeof(struct test_struct2),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "t_INT",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a75396a}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "a",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "_a",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "aa",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "_b",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "bb",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "c",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a75396b}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "_c",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "cc",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a75396c}",
+ /*kind*/ TKIND_ENUM, /*flags*/ 0, /*align*/ 4, /*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "d",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a75396d}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "_d",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "dd",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a75396e}",
+ /*kind*/ TKIND_ENUM, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "e",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753970}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "_e",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ sizeof(struct _e),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "ee",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753971}",
+ /*kind*/ TKIND_RECORD, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ sizeof(struct ee),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "f",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753972}",
+ /*kind*/ TKIND_ALIAS, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ 4,
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "_f",
+ "{00000000-0000-0000-0000-000000000000}",
+ /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ sizeof(union _f),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "ff",
+ "{016fe2ec-b2c8-45f8-b23b-39e53a753973}",
+ /*kind*/ TKIND_UNION, /*flags*/ TYPEFLAG_FRESTRICTED|TYPEFLAG_FHIDDEN, /*align*/ 4,
/*size*/ sizeof(union ff),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 0, /*#func*/ 0
+},
+{
+ "ITestIface",
+ "{ec5dfcd6-eeb0-4cd6-b51e-8030e1dac00a}",
+ /*kind*/ TKIND_INTERFACE, /*flags*/ TYPEFLAG_FDISPATCHABLE, /*align*/ 4, /*size*/
sizeof(ITestIface*),
+ /*helpctx*/ 0x0000, /*version*/ 0x00000000, /*#vtbl*/ 13, /*#func*/ 6,
+ {
+ {
+ /*id*/ 0x60020000, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 7, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test1",
+ "value",
+ NULL,
+ },
+ },
+ {
+ /*id*/ 0x60020001, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 8, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_USERDEFINED, TKIND_ENUM, PARAMFLAG_NONE},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test2",
+ "value",
+ NULL,
+ },
+ },
+ {
+ /*id*/ 0x60020002, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 9, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test3",
+ "value",
+ NULL,
+ },
+ },
+ {
+ /*id*/ 0x60020003, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 10, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test4",
+ "value",
+ NULL,
+ },
+ },
+ {
+ /*id*/ 0x60020004, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 11, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test5",
+ "value",
+ NULL,
+ },
+ },
+ {
+ /*id*/ 0x60020005, /*func*/ FUNC_PUREVIRTUAL, /*inv*/ INVOKE_FUNC, /*call*/
CC_STDCALL,
+ /*#param*/ 1, /*#opt*/ 0, /*vtbl*/ 12, /*#scodes*/ 0, /*flags*/ 0,
+ {VT_HRESULT, -1, PARAMFLAG_NONE}, /* ret */
+ { /* params */
+ {VT_USERDEFINED, TKIND_ALIAS, PARAMFLAG_NONE},
+ {-1, 0, 0}
+ },
+ { /* names */
+ "test6",
+ "value",
+ NULL,
+ },
+ },
+ }
}
};
@@ -4037,18 +4592,34 @@
ITypeInfo *typeinfo;
TYPEATTR *typeattr;
BSTR bstrIfName;
+ DWORD help_ctx;
trace("Interface %s\n", ti->name);
ole_check(ITypeLib_GetTypeInfo(typelib, iface, &typeinfo));
- ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL, NULL,
NULL));
+ ole_check(ITypeLib_GetDocumentation(typelib, iface, &bstrIfName, NULL,
&help_ctx, NULL));
expect_wstr_acpval(bstrIfName, ti->name);
SysFreeString(bstrIfName);
ole_check(ITypeInfo_GetTypeAttr(typeinfo, &typeattr));
expect_int(typeattr->typekind, ti->type);
expect_hex(typeattr->wTypeFlags, ti->wTypeFlags);
+ /* FIXME: remove once widl is fixed */
+ if (typeattr->typekind == TKIND_ALIAS && typeattr->cbAlignment !=
ti->cbAlignment)
+ {
+todo_wine /* widl generates broken typelib and typeattr just reflects that */
+ ok(typeattr->cbAlignment == ti->cbAlignment ||
broken(typeattr->cbAlignment == 1),
+ "expected %d, got %d\n", ti->cbAlignment,
typeattr->cbAlignment);
+todo_wine /* widl generates broken typelib and typeattr just reflects that */
+ ok(typeattr->cbSizeInstance == ti->cbSizeInstance ||
broken(typeattr->cbSizeInstance == 0),
+ "expected %d, got %d\n", ti->cbSizeInstance,
typeattr->cbSizeInstance);
+ }
+ else
+ {
expect_int(typeattr->cbAlignment, ti->cbAlignment);
expect_int(typeattr->cbSizeInstance, ti->cbSizeInstance);
+ }
+ expect_int(help_ctx, ti->help_ctx);
+ expect_int(MAKELONG(typeattr->wMinorVerNum, typeattr->wMajorVerNum),
ti->version);
expect_int(typeattr->cbSizeVft, ti->cbSizeVft * sizeof(void*));
expect_int(typeattr->cFuncs, ti->cFuncs);
@@ -4067,8 +4638,8 @@
/* check that it's possible to search using this uuid */
typeinfo2 = NULL;
hr = ITypeLib_GetTypeInfoOfGuid(typelib, &guid, &typeinfo2);
- ok(hr == S_OK, "got 0x%08x\n", hr);
- ITypeInfo_Release(typeinfo2);
+ ok(hr == S_OK || (IsEqualGUID(&guid, &IID_NULL) && hr ==
TYPE_E_ELEMENTNOTFOUND), "got 0x%08x\n", hr);
+ if (hr == S_OK) ITypeInfo_Release(typeinfo2);
}
for (func = 0; func < typeattr->cFuncs; func++)
@@ -4104,6 +4675,20 @@
for (i = 0 ; i < desc->cParams; i++)
{
check_type(&desc->lprgelemdescParam[i],
&fn_info->params[i]);
+
+ if (desc->lprgelemdescParam[i].tdesc.vt == VT_USERDEFINED)
+ {
+ ITypeInfo *param;
+ TYPEATTR *var_attr;
+
+ ole_check(ITypeInfo_GetRefTypeInfo(typeinfo,
U(desc->lprgelemdescParam[i].tdesc).hreftype, ¶m));
+ ole_check(ITypeInfo_GetTypeAttr(param, &var_attr));
+
+ ok(var_attr->typekind == fn_info->params[i].type,
"expected %#x, got %#x\n", fn_info->params[i].type, var_attr->typekind);
+
+ ITypeInfo_ReleaseTypeAttr(param, var_attr);
+ ITypeInfo_Release(param);
+ }
}
expect_int(fn_info->params[desc->cParams].vt, (VARTYPE)-1);
Modified: trunk/rostests/winetests/oleaut32/vartest.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartes…
==============================================================================
--- trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/vartest.c [iso-8859-1] Tue Nov 17 12:00:00 2015
@@ -234,7 +234,7 @@
static BOOL WINAPI RecordInfo_IsMatchingType(IRecordInfo *iface, IRecordInfo *info2)
{
ok(0, "unexpected call\n");
- return E_NOTIMPL;
+ return FALSE;
}
static PVOID WINAPI RecordInfo_RecordCreate(IRecordInfo *iface)
@@ -1622,7 +1622,7 @@
#define EXPECT_UI4(val) EXPECT_OK { EXPECT_TYPE(VT_UI4); \
ok(V_UI4(&vOut) == val, "Expected ui4 = %d, got %d\n", (ULONG)val,
V_UI4(&vOut)); }
#define EXPECT_I8(high,low) EXPECT_OK { EXPECT_TYPE(VT_I8); \
- ok(V_I8(&vOut) == ((((LONG64)(high))<<32)|(low)), "Expected i8 = %x%08x,
got %x%08x\n", \
+ ok(V_I8(&vOut) == ((((ULONG64)(high))<<32)|(low)), "Expected i8 =
%x%08x, got %x%08x\n", \
(LONG)(high), (LONG)(low), (LONG)(V_I8(&vOut)>>32), (LONG)V_I8(&vOut)
); }
#define EXPECT_UI8(val) EXPECT_OK { EXPECT_TYPE(VT_UI8); \
ok(V_UI8(&vOut) == val, "Expected ui8 = 0x%x%08x, got 0x%x%08x\n", \
Modified: trunk/rostests/winetests/oleaut32/vartype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/oleaut32/vartyp…
==============================================================================
--- trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/oleaut32/vartype.c [iso-8859-1] Tue Nov 17 12:00:00 2015
@@ -2895,7 +2895,8 @@
CONVERT_DEC(VarR4FromDec,2,0x80,0,3276800); EXPECT(-32768.0f);
CONVERT_DEC(VarR4FromDec,2,0,0,3276700); EXPECT(32767.0f);
-
+ CONVERT_DEC(VarR4FromDec,10,0,0,3276700); EXPECT(0.00032767f);
+
CONVERT_DEC(VarR4FromDec,0,0,1,0); EXPECT(18446744073709551616.0f);
}