Francois Gouget : oleaut32/tests: Fix compilation on systems that don' t support nameless unions.
Alexandre Julliard
julliard at winehq.org
Mon Mar 29 09:57:50 CDT 2010
Module: wine
Branch: master
Commit: 5ca6d9b5be30b359a401c74dd2bce368f2f82a78
URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ca6d9b5be30b359a401c74dd2bce368f2f82a78
Author: Francois Gouget <fgouget at free.fr>
Date: Sat Mar 27 16:55:34 2010 +0100
oleaut32/tests: Fix compilation on systems that don't support nameless unions.
---
dlls/oleaut32/tests/typelib.c | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c
index 8a8766a..a5d8e4a 100644
--- a/dlls/oleaut32/tests/typelib.c
+++ b/dlls/oleaut32/tests/typelib.c
@@ -1099,7 +1099,7 @@ static void test_CreateTypeLib(void) {
funcdesc.invkind = INVOKE_PROPERTYGET;
funcdesc.callconv = CC_STDCALL;
funcdesc.elemdescFunc.tdesc.vt = VT_BSTR;
- funcdesc.elemdescFunc.idldesc.wIDLFlags = IDLFLAG_NONE;
+ U(funcdesc.elemdescFunc).idldesc.wIDLFlags = IDLFLAG_NONE;
hres = ICreateTypeInfo_AddFuncDesc(createti, 0, NULL);
ok(hres == E_INVALIDARG, "got %08x\n", hres);
@@ -1122,8 +1122,8 @@ static void test_CreateTypeLib(void) {
ok(hres == TYPE_E_INCONSISTENTPROPFUNCS, "got %08x\n", hres);
elemdesc[0].tdesc.vt = VT_BSTR;
- elemdesc[0].idldesc.dwReserved = 0;
- elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN;
+ U(elemdesc[0]).idldesc.dwReserved = 0;
+ U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN;
funcdesc.lprgelemdescParam = elemdesc;
funcdesc.invkind = INVOKE_PROPERTYPUT;
@@ -1158,40 +1158,40 @@ static void test_CreateTypeLib(void) {
ok(hres == S_OK, "got %08x\n", hres);
elemdesc[0].tdesc.vt = VT_PTR;
- elemdesc[0].tdesc.lptdesc = &typedesc1;
+ U(elemdesc[0].tdesc).lptdesc = &typedesc1;
typedesc1.vt = VT_BSTR;
funcdesc.cParams = 1;
funcdesc.lprgelemdescParam = elemdesc;
hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc);
ok(hres == S_OK, "got %08x\n", hres);
- elemdesc[0].tdesc.lptdesc = &typedesc2;
+ U(elemdesc[0].tdesc).lptdesc = &typedesc2;
typedesc2.vt = VT_PTR;
- typedesc2.lptdesc = &typedesc1;
+ U(typedesc2).lptdesc = &typedesc1;
hres = ICreateTypeInfo_AddFuncDesc(createti, 4, &funcdesc);
ok(hres == S_OK, "got %08x\n", hres);
elemdesc[0].tdesc.vt = VT_INT;
- elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT;
- elemdesc[0].paramdesc.pparamdescex = ¶mdescex;
+ U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT;
+ U(elemdesc[0]).paramdesc.pparamdescex = ¶mdescex;
V_VT(¶mdescex.varDefaultValue) = VT_INT;
V_INT(¶mdescex.varDefaultValue) = 0x123;
hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc);
ok(hres == S_OK, "got %08x\n", hres);
- elemdesc[0].idldesc.dwReserved = 0;
- elemdesc[0].idldesc.wIDLFlags = IDLFLAG_FIN;
+ U(elemdesc[0]).idldesc.dwReserved = 0;
+ U(elemdesc[0]).idldesc.wIDLFlags = IDLFLAG_FIN;
elemdesc[1].tdesc.vt = VT_UI2;
- elemdesc[1].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT;
- elemdesc[1].paramdesc.pparamdescex = ¶mdescex;
+ U(elemdesc[1]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT;
+ U(elemdesc[1]).paramdesc.pparamdescex = ¶mdescex;
V_VT(¶mdescex.varDefaultValue) = VT_UI2;
V_UI2(¶mdescex.varDefaultValue) = 0xffff;
funcdesc.cParams = 2;
hres = ICreateTypeInfo_AddFuncDesc(createti, 3, &funcdesc);
ok(hres == S_OK, "got %08x\n", hres);
- elemdesc[0].paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT;
- elemdesc[0].paramdesc.pparamdescex = ¶mdescex;
+ U(elemdesc[0]).paramdesc.wParamFlags = PARAMFLAG_FHASDEFAULT;
+ U(elemdesc[0]).paramdesc.pparamdescex = ¶mdescex;
elemdesc[1].tdesc.vt = VT_INT;
V_VT(¶mdescex.varDefaultValue) = VT_INT;
V_INT(¶mdescex.varDefaultValue) = 0xffffffff;
More information about the wine-cvs
mailing list