Changeset 636

Timestamp:

Aug 23, 1999, 12:15:15 AM (26 years ago)

Author:

sandervl

Message:

Added new headers for OLEAUT32

Location:

trunk/include/win

Files:

• debugdefs.h (added)
• debugstr.h (added)
• debugtools.h (added)
• oleauto.h (modified) (3 diffs)
• wtypes.h (modified) (1 diff)

trunk/include/win/oleauto.h

@@ -1 @@
-/* $Id: oleauto.h,v 1.1 1999-05-24 20:19:16 ktk Exp $ */
+/* $Id: oleauto.h,v 1.2 1999-08-22 22:15:15 sandervl Exp $ */
 
 #ifndef __WINE_OLEAUTO_H
@@ -96 +96 @@
 /* These are macros that help accessing the VARIANT date type.
  */
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(NONAMELESSUNION)
 #define V_UNION(A, B)   ((A)->B)
 #define V_VT(A)                 ((A)->vt)
@@ -481 +481 @@
     DISPID dispid;      /* method ID */
     UINT16 iMeth;         /* method index */
-    CALLCONV cc;        /* calling convention */
+    CALLCONV_OLE2 cc;        /* calling convention */
     UINT16 cArgs;         /* count of arguments */
     WORD wFlags;        /* same wFlags as on IDispatch::Invoke() */

trunk/include/win/wtypes.h

@@ -62 +62 @@
 #define REFIID              const IID* const
 #define REFFMTID            const FMTID* const
+//#define REFGUID             const GUID* 
+//#define REFCLSID            const CLSID* 
+//#define REFIID              const IID* 
+//#define REFFMTID            const FMTID* 
+
 #endif /* !defined(__cplusplus) && !defined(CINTERFACE) */