From: Jacek Caban jacek@codeweavers.com
--- dlls/oleaut32/tests/usrmarshal.c | 24 +++++++++--------------- dlls/oleaut32/usrmarshal.c | 12 ++++++------ include/oaidl.idl | 2 +- include/oleauto.h | 4 ++-- 4 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/dlls/oleaut32/tests/usrmarshal.c b/dlls/oleaut32/tests/usrmarshal.c index 6559cdcd865..fee8097fac8 100644 --- a/dlls/oleaut32/tests/usrmarshal.c +++ b/dlls/oleaut32/tests/usrmarshal.c @@ -30,12 +30,6 @@
#include "wine/test.h"
-#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) -# define V_U2(A) ((A)->n1.n2) -#else -# define V_U2(A) (*(A)) -#endif - typedef struct { IUnknown IUnknown_iface; @@ -870,9 +864,9 @@ static DWORD *check_variant_header(DWORD *wirev, VARIANT *v, ULONG size) ok(header->clSize == (size + 7) >> 3, "wv[0] %08lx, expected %08lx\n", header->clSize, (size + 7) >> 3); ok(header->rpcReserved == 0, "wv[1] %08lx\n", header->rpcReserved); ok(header->vt == V_VT(v), "vt %04x expected %04x\n", header->vt, V_VT(v)); - ok(header->wReserved1 == V_U2(v).wReserved1, "res1 %04x expected %04x\n", header->wReserved1, V_U2(v).wReserved1); - ok(header->wReserved2 == V_U2(v).wReserved2, "res2 %04x expected %04x\n", header->wReserved2, V_U2(v).wReserved2); - ok(header->wReserved3 == V_U2(v).wReserved3, "res3 %04x expected %04x\n", header->wReserved3, V_U2(v).wReserved3); + ok(header->wReserved1 == v->wReserved1, "res1 %04x expected %04x\n", header->wReserved1, v->wReserved1); + ok(header->wReserved2 == v->wReserved2, "res2 %04x expected %04x\n", header->wReserved2, v->wReserved2); + ok(header->wReserved3 == v->wReserved3, "res3 %04x expected %04x\n", header->wReserved3, v->wReserved3);
switch_is = V_VT(v); if(switch_is & VT_ARRAY) @@ -938,9 +932,9 @@ static void test_marshal_VARIANT(void) /* check_variant_header tests wReserved[123], so initialize to unique values. * (Could probably also do this by setting the variant to a known DECIMAL.) */ - V_U2(&v).wReserved1 = 0x1234; - V_U2(&v).wReserved2 = 0x5678; - V_U2(&v).wReserved3 = 0x9abc; + v.wReserved1 = 0x1234; + v.wReserved2 = 0x5678; + v.wReserved3 = 0x9abc;
/* Variants have an alignment of 8 */ rpcMsg.BufferLength = stubMsg.BufferLength = VARIANT_UserSize(&umcb.Flags, 1, &v); @@ -1306,9 +1300,9 @@ static void test_marshal_VARIANT(void) /* check_variant_header tests wReserved[123], so initialize to unique values. * (Could probably also do this by setting the variant to a known DECIMAL.) */ - V_U2(&v2).wReserved1 = 0x0123; - V_U2(&v2).wReserved2 = 0x4567; - V_U2(&v2).wReserved3 = 0x89ab; + v2.wReserved1 = 0x0123; + v2.wReserved2 = 0x4567; + v2.wReserved3 = 0x89ab;
stubMsg.Buffer = buffer; next = VARIANT_UserUnmarshal(&umcb.Flags, buffer, &v2); diff --git a/dlls/oleaut32/usrmarshal.c b/dlls/oleaut32/usrmarshal.c index eed0f3ac0aa..25bce3155bf 100644 --- a/dlls/oleaut32/usrmarshal.c +++ b/dlls/oleaut32/usrmarshal.c @@ -400,9 +400,9 @@ unsigned char * WINAPI VARIANT_UserMarshal(ULONG *pFlags, unsigned char *Buffer, header->clSize = 0; /* fixed up at the end */ header->rpcReserved = 0; header->vt = V_VT(pvar); - header->wReserved1 = pvar->n1.n2.wReserved1; - header->wReserved2 = pvar->n1.n2.wReserved2; - header->wReserved3 = pvar->n1.n2.wReserved3; + header->wReserved1 = pvar->wReserved1; + header->wReserved2 = pvar->wReserved2; + header->wReserved3 = pvar->wReserved3; header->switch_is = V_VT(pvar); if(header->switch_is & VT_ARRAY) header->switch_is &= ~VT_TYPEMASK; @@ -566,9 +566,9 @@ unsigned char * WINAPI VARIANT_UserUnmarshal(ULONG *pFlags, unsigned char *Buffe }
V_VT(pvar) = header->vt; - pvar->n1.n2.wReserved1 = header->wReserved1; - pvar->n1.n2.wReserved2 = header->wReserved2; - pvar->n1.n2.wReserved3 = header->wReserved3; + pvar->wReserved1 = header->wReserved1; + pvar->wReserved2 = header->wReserved2; + pvar->wReserved3 = header->wReserved3;
if(header->vt & VT_ARRAY) { diff --git a/include/oaidl.idl b/include/oaidl.idl index 37da734baf7..eb8b28e3b5a 100644 --- a/include/oaidl.idl +++ b/include/oaidl.idl @@ -142,7 +142,7 @@ const USHORT FADF_CREATEVECTOR = 0x2000; /* This array is a vector */
/* Variant */
-cpp_quote("#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)") +cpp_quote("#ifdef NONAMELESSUNION") cpp_quote("#define __VARIANT_NAME_1 n1") cpp_quote("#define __VARIANT_NAME_2 n2") cpp_quote("#define __VARIANT_NAME_3 n3") diff --git a/include/oleauto.h b/include/oleauto.h index 657986e399f..badf2b4258b 100644 --- a/include/oleauto.h +++ b/include/oleauto.h @@ -112,7 +112,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG */
/* Macros for accessing the fields of the VARIANT type */ -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) +#if (__STDC__ && !defined(_FORCENAMELESSUNION) && !defined(__WINESRC__)) || defined(NONAMELESSUNION) #define V_VT(A) ((A)->n1.n2.vt) #define V_UNION(A,B) ((A)->n1.n2.n3.B) #define V_RECORD(A) (V_UNION(A,brecVal).pvRecord) @@ -140,7 +140,7 @@ WINOLEAUTAPI HRESULT WINAPI GetRecordInfoFromGuids(REFGUID,ULONG,ULONG,LCID,REFG #define V_CYREF(A) V_UNION(A,pcyVal) #define V_DATE(A) V_UNION(A,date) #define V_DATEREF(A) V_UNION(A,pdate) -#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION) +#if (__STDC__ && !defined(_FORCENAMELESSUNION) && !defined(__WINESRC__)) || defined(NONAMELESSUNION) #define V_DECIMAL(A) ((A)->n1.decVal) #else #define V_DECIMAL(A) ((A)->decVal)