Changeset 6573 for trunk/include/win/wine

Timestamp:

Aug 23, 2001, 8:10:25 PM (24 years ago)

Author:

sandervl

Message:

updates

File:

• trunk/include/win/wine/obj_oleaut.h (modified) (2 diffs)

trunk/include/win/wine/obj_oleaut.h

@@ -115 +115 @@
  * DISP_E_ARRAYISLOCKED : The variant contains an array that is locked.
  */
+#if (__STDC__ && !defined(_FORCENAMELESSUNION)) || defined(NONAMELESSUNION)
+#define __VARIANT_NAME_1 n1
+#define __VARIANT_NAME_2 n2
+#define __VARIANT_NAME_3 n3
+#else
+#define __tagVARIANT
+#define __VARIANT_NAME_1
+#define __VARIANT_NAME_2
+#define __VARIANT_NAME_3
+#endif
 
 typedef struct tagVARIANT VARIANT, *LPVARIANT;
 typedef struct tagVARIANT VARIANTARG, *LPVARIANTARG;
 
-struct tagVARIANT {
-        VARTYPE vt;
-        WORD wReserved1;
-        WORD wReserved2;
-        WORD wReserved3;
-        union /* DUMMYUNIONNAME */
-        {
-        /* By value. */
-                CHAR cVal;
-                USHORT uiVal;
-                ULONG ulVal;
-                INT intVal;
-                UINT uintVal;
-                BYTE bVal;
-                short iVal;
-                long lVal;
-                float fltVal;
-                double dblVal;
-                VARIANT_BOOL boolVal;
-                SCODE scode;
-                DATE date;
-                BSTR bstrVal;
-                CY cyVal;
-                /* DECIMAL decVal; */
-                IUnknown* punkVal;
-                IDispatch* pdispVal;
-                SAFEARRAY* parray;
-
-                /* By reference */
-                CHAR* pcVal;
-                USHORT* puiVal;
-                ULONG* pulVal;
-                INT* pintVal;
-                UINT* puintVal;
-                BYTE* pbVal;
-                short* piVal;
-                long* plVal;
-                float* pfltVal;
-                double* pdblVal;
-                VARIANT_BOOL* pboolVal;
-                SCODE* pscode;
-                DATE* pdate;
-                BSTR* pbstrVal;
-                VARIANT* pvarVal;
-                PVOID byref;
-                CY* pcyVal;
-          /* DECIMAL* pdecVal; */
-                IUnknown** ppunkVal;
-                IDispatch** ppdispVal;
-                SAFEARRAY** pparray;
-        } DUMMYUNIONNAME;
+struct tagVARIANT
+{
+    union
+    {
+        struct __tagVARIANT
+        {
+            VARTYPE vt;
+            WORD wReserved1;
+            WORD wReserved2;
+            WORD wReserved3;
+            union /* DUMMYUNIONNAME */
+            {
+                /* B    y value. */
+                CHAR cVal;
+                USHORT uiVal;
+                ULONG ulVal;
+                INT intVal;
+                UINT uintVal;
+                BYTE bVal;
+                short iVal;
+                long lVal;
+                float fltVal;
+                double dblVal;
+                VARIANT_BOOL boolVal;
+                SCODE scode;
+                DATE date;
+                BSTR bstrVal;
+                CY cyVal;
+                IUnknown* punkVal;
+                IDispatch* pdispVal;
+                SAFEARRAY* parray;
+
+                /* By reference */
+                CHAR* pcVal;
+                USHORT* puiVal;
+                ULONG* pulVal;
+                INT* pintVal;
+                UINT* puintVal;
+                BYTE* pbVal;
+                short* piVal;
+                long* plVal;
+                float* pfltVal;
+                double* pdblVal;
+                VARIANT_BOOL* pboolVal;
+                SCODE* pscode;
+                DATE* pdate;
+                BSTR* pbstrVal;
+                VARIANT* pvarVal;
+                PVOID byref;
+                CY* pcyVal;
+                DECIMAL* pdecVal;
+                IUnknown** ppunkVal;
+                IDispatch** ppdispVal;
+                SAFEARRAY** pparray;
+            } __VARIANT_NAME_3;
+        } __VARIANT_NAME_2;
+        DECIMAL decVal;
+    } __VARIANT_NAME_1;
 };
 
-             
+
 typedef LONG DISPID;
 typedef DWORD HREFTYPE;
@@ -215 +232 @@
     DWORD dwHelpContext;
     PVOID pvReserved;
-#ifdef __WIN32OS2__
     HRESULT (* __stdcall pfnDeferredFillIn)(struct tagEXCEPINFO *);
-#else
-    HRESULT __stdcall (*pfnDeferredFillIn)(struct tagEXCEPINFO *);
-#endif
     SCODE scode;
 } EXCEPINFO, * LPEXCEPINFO;