Changeset 10884

Timestamp:

Jul 4, 1999, 9:37:53 AM (26 years ago)

Author:

sandervl

Message:

OLE32 fixes for CINTERFACE

File:

• tags/trunk/include/win/wtypes.h (modified) (3 diffs)

tags/trunk/include/win/wtypes.h ¶

@@ -1 @@
-/* $Id: wtypes.h,v 1.1 1999-05-24 20:19:23 ktk Exp $ */
-
 /*
  * Defines the basic types used by COM interfaces.
@@ -54 +52 @@
 typedef GUID    IID,*LPIID;
 typedef GUID    FMTID,*LPFMTID;
-#ifdef __cplusplus
+#if defined(__cplusplus) && !defined(CINTERFACE)
 #define REFGUID             const GUID &
 #define REFCLSID            const CLSID &
 #define REFIID              const IID &
 #define REFFMTID            const FMTID &
-#else /* !defined(__cplusplus) */
+#else /* !defined(__cplusplus) && !defined(CINTERFACE) */
 #define REFGUID             const GUID* const
 #define REFCLSID            const CLSID* const
 #define REFIID              const IID* const
 #define REFFMTID            const FMTID* const
-#endif /* !defined(__cplusplus) */
+#endif /* !defined(__cplusplus) && !defined(CINTERFACE) */
 
 extern const IID GUID_NULL;
+#define IID_NULL            GUID_NULL
 #define CLSID_NULL GUID_NULL
+#define FMTID_NULL          GUID_NULL
    
 typedef enum tagDVASPECT
@@ -135 +135 @@
 typedef ULONG PROPID;
 
+#ifndef _tagBLOB_DEFINED
+#define _tagBLOB_DEFINED
+#define _BLOB_DEFINED
+#define _LPBLOB_DEFINED
 typedef struct tagBLOB
 {
     ULONG cbSize;
     BYTE *pBlobData;
-} BLOB;
+} BLOB, *LPBLOB;
+#endif
 
 #ifndef _tagCY_DEFINED