From 975feaf0e76ff733ea0713ae341071c270ac32d0 Mon Sep 17 00:00:00 2001
From: Adrian Thurston <adriant@COREL.CA>
Date: Thu, 25 Feb 1999 16:32:10 +0000
Subject: [PATCH] Moved some definitions out of oleauto.h and into oaidl.h to
 conform to the SDK. Removed a redundant include. Added some c++ protection.

---
 include/mmsystem.h |  2 --
 include/oaidl.h    | 45 +++++++++++++++++++++++++++++++++++++++-
 include/oleauto.h  | 51 +++++++---------------------------------------
 3 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/include/mmsystem.h b/include/mmsystem.h
index 471aa526f41..a86b5ff6474 100644
--- a/include/mmsystem.h
+++ b/include/mmsystem.h
@@ -5,8 +5,6 @@
 #ifndef __WINE_MMSYSTEM_H
 #define __WINE_MMSYSTEM_H
 
-#include "wintypes.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif 
diff --git a/include/oaidl.h b/include/oaidl.h
index 62c4fcaba77..e71e8e7ce87 100644
--- a/include/oaidl.h
+++ b/include/oaidl.h
@@ -8,5 +8,48 @@
 #include "wine/obj_oleaut.h"
 
 
-#endif /* __WINE_OAIDL_H */
+/*****************************************************************
+ *  SafeArray defines and structs 
+ */
 
+#define FADF_AUTO       ( 0x1 )
+#define FADF_STATIC     ( 0x2 )
+#define FADF_EMBEDDED   ( 0x4 )
+#define FADF_FIXEDSIZE  ( 0x10 )
+#define FADF_BSTR       ( 0x100 )
+#define FADF_UNKNOWN    ( 0x200 )
+#define FADF_DISPATCH   ( 0x400 )
+#define FADF_VARIANT    ( 0x800 )
+#define FADF_RESERVED   ( 0xf0e8 )
+
+typedef struct  tagSAFEARRAYBOUND 
+{
+  ULONG cElements;                  /* Number of elements in dimension */
+  LONG  lLbound;                    /* Lower bound of dimension */
+} SAFEARRAYBOUND;
+
+typedef struct  tagSAFEARRAY
+{ 
+  USHORT          cDims;            /* Count of array dimension */
+  USHORT          fFeatures;        /* Flags describing the array */
+  ULONG           cbElements;       /* Size of each element */
+  ULONG           cLocks;           /* Number of lock on array */
+  PVOID           pvData;           /* Pointer to data valid when cLocks > 0 */
+  SAFEARRAYBOUND  rgsabound[ 1 ];   /* One bound for each dimension */
+} SAFEARRAY, *LPSAFEARRAY;
+
+
+typedef enum tagCALLCONV {
+    CC_CDECL    = 1,
+    CC_MSCPASCAL  = CC_CDECL + 1,
+    CC_PASCAL   = CC_MSCPASCAL,
+    CC_MACPASCAL  = CC_PASCAL + 1,
+    CC_STDCALL    = CC_MACPASCAL + 1,
+    CC_RESERVED   = CC_STDCALL + 1,
+    CC_SYSCALL    = CC_RESERVED + 1,
+    CC_MPWCDECL   = CC_SYSCALL + 1,
+    CC_MPWPASCAL  = CC_MPWCDECL + 1,
+    CC_MAX    = CC_MPWPASCAL + 1
+} CALLCONV;
+
+#endif /* _WINE_OAIDL_H */
diff --git a/include/oleauto.h b/include/oleauto.h
index d3a269fc643..69d755b71f7 100644
--- a/include/oleauto.h
+++ b/include/oleauto.h
@@ -1,6 +1,10 @@
 #ifndef __WINE_OLEAUTO_H
 #define __WINE_OLEAUTO_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 #include <ole.h>
 #include "mapidefs.h"
 #include "oaidl.h"
@@ -24,37 +28,6 @@ int WINAPI SysStringLen16(BSTR16);
 int WINAPI SysStringLen32(BSTR32);
 #define SysStringLen WINELIB_NAME(SysStringLen)
 
-/*****************************************************************
- *  SafeArray defines and structs 
- */
-
-#define FADF_AUTO       ( 0x1 )
-#define FADF_STATIC     ( 0x2 )
-#define FADF_EMBEDDED   ( 0x4 )
-#define FADF_FIXEDSIZE  ( 0x10 )
-#define FADF_BSTR       ( 0x100 )
-#define FADF_UNKNOWN    ( 0x200 )
-#define FADF_DISPATCH   ( 0x400 )
-#define FADF_VARIANT    ( 0x800 )
-#define FADF_RESERVED   ( 0xf0e8 )
-
-typedef struct  tagSAFEARRAYBOUND
-{
-  ULONG cElements;                  /* Number of elements in dimension */
-  LONG  lLbound;                    /* Lower bound of dimension */
-} SAFEARRAYBOUND;
-
-typedef struct  tagSAFEARRAY
-{
-  USHORT          cDims;            /* Count of array dimension */
-  USHORT          fFeatures;        /* Flags describing the array */
-  ULONG           cbElements;       /* Size of each element */
-  ULONG           cLocks;           /* Number of lock on array */
-  PVOID           pvData;           /* Pointer to data valid when cLocks > 0 */
-  SAFEARRAYBOUND  rgsabound[ 1 ];   /* One bound for each dimension */
-} SAFEARRAY;
-
-
 /*****************************************************************
  *  SafeArray API
  */
@@ -685,19 +658,9 @@ HRESULT WINAPI VarDecFromDisp32(IDispatch*pdispIn, LCID lcid, DECIMAL*pdecOut);
 #define VarUintFromDec32	VarUI4FromDec32
 #define VarUintFromInt32	VarUI4FromI432
 
-
-typedef enum tagCALLCONV {
-    CC_CDECL		= 1,
-    CC_MSCPASCAL	= CC_CDECL + 1,
-    CC_PASCAL		= CC_MSCPASCAL,
-    CC_MACPASCAL	= CC_PASCAL + 1,
-    CC_STDCALL		= CC_MACPASCAL + 1,
-    CC_RESERVED		= CC_STDCALL + 1,
-    CC_SYSCALL		= CC_RESERVED + 1,
-    CC_MPWCDECL		= CC_SYSCALL + 1,
-    CC_MPWPASCAL	= CC_MPWCDECL + 1,
-    CC_MAX 		= CC_MPWPASCAL + 1
-} CALLCONV;
+#ifdef __cplusplus
+} // extern "C"
+#endif 
 
 typedef struct tagPARAMDATA {
     OLECHAR16 * szName;    /* parameter name */