Moved some definitions to their proper include file.

include/mapidefs.h

@@ -3,14 +3,21 @@
 
 #include "wintypes.h"
 
-typedef union tagCY CY;
-
-union tagCY{
+#ifndef _tagCY_DEFINED
+#define _tagCY_DEFINED
+typedef union tagCY
+{
    struct {
+#ifdef BIG_ENDIAN
+        long Hi;
+        long Lo;
+#else
       unsigned long Lo;
       long Hi;
+#endif
    } u;
    LONGLONG int64;
-};
+} CY;
+#endif /* _tagCY_DEFINED */
 
 #endif /*__WINE_MAPIDEFS_H*/

include/objbase.h

@@ -18,102 +18,5 @@
 /* the following depend on obj_moniker.h */
 #include "wine/obj_dataobject.h"
 
-/* FIXME: the following should be moved to one of the wine/obj_XXX.h headers */
-
-/*****************************************************************************
- * CoXXX API
- */
-/* FIXME: more CoXXX functions are missing */
-DWORD WINAPI CoBuildVersion(void);
-
-typedef enum tagCOINIT
-{
-    COINIT_APARTMENTTHREADED  = 0x2, /* Apartment model */
-    COINIT_MULTITHREADED      = 0x0, /* OLE calls objects on any thread */
-    COINIT_DISABLE_OLE1DDE    = 0x4, /* Don't use DDE for Ole1 support */
-    COINIT_SPEED_OVER_MEMORY  = 0x8  /* Trade memory for speed */
-} COINIT;
-
-HRESULT WINAPI CoInitialize16(LPVOID lpReserved);
-HRESULT WINAPI CoInitialize32(LPVOID lpReserved);
-#define CoInitialize WINELIB_NAME(CoInitialize)
-
-HRESULT WINAPI CoInitializeEx32(LPVOID lpReserved, DWORD dwCoInit);
-#define CoInitializeEx WINELIB_NAME(CoInitializeEx)
-
-void WINAPI CoUninitialize16(void);
-void WINAPI CoUninitialize32(void);
-#define CoUninitialize WINELIB_NAME(CoUninitialize)
-
-HRESULT WINAPI CoCreateGuid(GUID *pguid);
-
-/* class registration flags; passed to CoRegisterClassObject */
-typedef enum tagREGCLS
-{
-    REGCLS_SINGLEUSE = 0,
-    REGCLS_MULTIPLEUSE = 1,
-    REGCLS_MULTI_SEPARATE = 2,
-    REGCLS_SUSPENDED = 4
-} REGCLS;
-
-HRESULT WINAPI CoRegisterClassObject16(REFCLSID rclsid, LPUNKNOWN pUnk, DWORD dwClsContext, DWORD flags, LPDWORD lpdwRegister);
-HRESULT WINAPI CoRegisterClassObject32(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsContext,DWORD flags,LPDWORD lpdwRegister);
-#define CoRegisterClassObject WINELIB_NAME(CoRegisterClassObject)
-
-HRESULT WINAPI CoRevokeClassObject32(DWORD dwRegister);
-#define CoRevokeClassObject WINELIB_NAME(CoRevokeClassObject)
-
-HRESULT WINAPI CoGetClassObject(REFCLSID rclsid, DWORD dwClsContext,LPVOID pvReserved, REFIID iid, LPVOID *ppv);
-
-
-HRESULT WINAPI CoCreateInstance(REFCLSID rclsid,LPUNKNOWN pUnkOuter,DWORD dwClsContext,REFIID iid,LPVOID *ppv);
-void WINAPI CoFreeLibrary(HINSTANCE32 hLibrary);
-void WINAPI CoFreeAllLibraries(void);
-void WINAPI CoFreeUnusedLibraries(void);
-HRESULT WINAPI CoFileTimeNow(FILETIME *lpFileTime);
-LPVOID WINAPI CoTaskMemAlloc(ULONG size);
-void WINAPI CoTaskMemFree(LPVOID ptr);
-HINSTANCE32 WINAPI CoLoadLibrary(LPOLESTR16 lpszLibName, BOOL32 bAutoFree);
-
-HRESULT WINAPI CoLockObjectExternal16(LPUNKNOWN pUnk,BOOL16 fLock,BOOL16 fLastUnlockReleases);
-HRESULT WINAPI CoLockObjectExternal32(LPUNKNOWN pUnk,BOOL32 fLock,BOOL32 fLastUnlockReleases);
-#define CoLockObjectExternal WINELIB_NAME(CoLockObjectExternal)
-
-
-/* internal Wine stuff */
-
-
-/*****************************************************************************
- * IClassFactory interface
- */
-
-typedef struct _IClassFactory {
-    /* IUnknown fields */
-    ICOM_VTABLE(IClassFactory)* lpvtbl;
-    DWORD                       ref;
-} _IClassFactory;
-
-HRESULT WINE_StringFromCLSID(const CLSID *id, LPSTR);
-
-
-/*****************************************************************************
- * IMalloc interface
- */
-/* private prototypes for the constructors */
-LPMALLOC16	IMalloc16_Constructor(void);
-LPMALLOC32	IMalloc32_Constructor(void);
-
-
-/*****************************************************************************
- * IUnknown interface
- */
-
-typedef struct _IUnknown {
-    /* IUnknown fields */
-    ICOM_VTABLE(IUnknown)* lpvtbl;
-    DWORD                  ref;
-} _IUnknown;
-
-LPUNKNOWN	IUnknown_Constructor(void);
 
 #endif /* __WINE_OBJBASE_H */

include/ole.h

@@ -19,7 +19,6 @@
 #define OLESTR32(x) L##x	/* probably wrong */
 #define OLESTR WINELIB_NAME(OLESTR)
 
-typedef unsigned short VARTYPE;
 typedef LONG DISPID;
 
 /* object types */
@@ -281,39 +280,4 @@ HINSTANCE32 WINAPI CoLoadLibrary(LPSTR lpszLibName, BOOL32 bAutoFree);
 void WINAPI CoFreeUnusedLibraries(void);
 void WINAPI CoFreeAllLibraries(void);
 
-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;
-
-typedef struct tagPARAMDATA {
-    OLECHAR16 * szName;    /* parameter name */
-    VARTYPE vt;         /* parameter type */
-} PARAMDATA, * LPPARAMDATA;
-
-typedef struct tagMETHODDATA {
-    OLECHAR16 * szName;    /* method name */
-    PARAMDATA * ppdata;  /* pointer to an array of PARAMDATAs */
-    DISPID dispid;      /* method ID */
-    UINT16 iMeth;         /* method index */
-    CALLCONV cc;        /* calling convention */
-    UINT16 cArgs;         /* count of arguments */
-    WORD wFlags;        /* same wFlags as on IDispatch::Invoke() */
-    VARTYPE vtReturn;
-} METHODDATA, * LPMETHODDATA;
-
-typedef struct tagINTERFACEDATA {
-    METHODDATA * pmethdata;  /* pointer to an array of METHODDATAs */
-    UINT16 cMembers;      /* count of members */
-} INTERFACEDATA, * LPINTERFACEDATA;
-
-
 #endif  /* __WINE_OLE_H */

include/oleauto.h

@@ -150,14 +150,6 @@ SafeArrayRedim32(SAFEARRAY *psa, SAFEARRAYBOUND *psaboundNew);
  * Data types for Variants.
  */
 
-/*
- * 0 == FALSE and -1 == TRUE
- */
-typedef short VARIANT_BOOL;
-
-#define VARIANT_TRUE	 ((VARIANT_BOOL)0xFFFF)
-#define VARIANT_FALSE	 ((VARIANT_BOOL)0x0000)
-
 enum VARENUM {
 	VT_EMPTY = 0,
 	VT_NULL = 1,
@@ -830,4 +822,39 @@ 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;
+
+typedef struct tagPARAMDATA {
+    OLECHAR16 * szName;    /* parameter name */
+    VARTYPE vt;         /* parameter type */
+} PARAMDATA, * LPPARAMDATA;
+
+typedef struct tagMETHODDATA {
+    OLECHAR16 * szName;    /* method name */
+    PARAMDATA * ppdata;  /* pointer to an array of PARAMDATAs */
+    DISPID dispid;      /* method ID */
+    UINT16 iMeth;         /* method index */
+    CALLCONV cc;        /* calling convention */
+    UINT16 cArgs;         /* count of arguments */
+    WORD wFlags;        /* same wFlags as on IDispatch::Invoke() */
+    VARTYPE vtReturn;
+} METHODDATA, * LPMETHODDATA;
+
+typedef struct tagINTERFACEDATA {
+    METHODDATA * pmethdata;  /* pointer to an array of METHODDATAs */
+    UINT16 cMembers;      /* count of members */
+} INTERFACEDATA, * LPINTERFACEDATA;
+
 #endif /*__WINE_OLEAUTO_H*/

include/winbase.h

@@ -164,28 +164,18 @@ typedef struct
     BOOL32  bInheritHandle;
 } SECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES;
 
-typedef WORD SECURITY_DESCRIPTOR_CONTROL;
-
-/* The security descriptor structure */
-typedef struct {
-    BYTE Revision;
-    BYTE Sbz1;
-    SECURITY_DESCRIPTOR_CONTROL Control;
-    PSID Owner;
-    PSID Group;
-    PACL Sacl;
-    PACL Dacl;
-} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
-
 typedef DWORD SECURITY_INFORMATION;
 
 
+#ifndef _FILETIME_
+#define _FILETIME_
 /* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */
 typedef struct
 {
   DWORD  dwLowDateTime;
   DWORD  dwHighDateTime;
 } FILETIME, *LPFILETIME;
+#endif /* _FILETIME_ */
 
 /* Find* structures */
 typedef struct

include/wine/obj_moniker.h

@@ -35,7 +35,6 @@ typedef struct IRunnableObject IRunnableObject,*LPRUNNABLEOBJECT;
 DEFINE_OLEGUID(IID_IRunningObjectTable,	0x00000010L, 0, 0);
 typedef struct IRunningObjectTable IRunningObjectTable,*LPRUNNINGOBJECTTABLE;
 
-typedef struct  COSERVERINFO COSERVERINFO; // must be defined !
 
 
 /*********************************************************************************

include/winnt.h

@@ -315,17 +315,6 @@ typedef struct _EXCEPTION_POINTERS
   PCONTEXT           ContextRecord;
 } EXCEPTION_POINTERS, *PEXCEPTION_POINTERS;
 
-typedef struct {
-    BYTE Value[6];
-} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY;
-
-typedef struct _SID {
-    BYTE Revision;
-    BYTE SubAuthorityCount;
-    SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
-    DWORD SubAuthority[1];
-} SID,*PSID;
-
 
 #pragma pack(4)
 /*
@@ -366,6 +355,47 @@ typedef enum _TOKEN_INFORMATION_CLASS {
   TokenStatistics 
 } TOKEN_INFORMATION_CLASS; 
 
+#ifndef _SECURITY_DEFINED
+#define _SECURITY_DEFINED
+
+typedef struct {
+    BYTE Value[6];
+} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY;
+
+typedef struct _SID {
+    BYTE Revision;
+    BYTE SubAuthorityCount;
+    SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
+    DWORD SubAuthority[1];
+} SID,*PSID;
+
+/* 
+ * ACL 
+ */
+
+typedef struct _ACL {
+    BYTE AclRevision;
+    BYTE Sbz1;
+    WORD AclSize;
+    WORD AceCount;
+    WORD Sbz2;
+} ACL, *PACL;
+
+typedef WORD SECURITY_DESCRIPTOR_CONTROL;
+
+/* The security descriptor structure */
+typedef struct {
+    BYTE Revision;
+    BYTE Sbz1;
+    SECURITY_DESCRIPTOR_CONTROL Control;
+    PSID Owner;
+    PSID Group;
+    PACL Sacl;
+    PACL Dacl;
+} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
+
+#endif /* _SECURITY_DEFINED */
+
 /* 
  * SID_AND_ATTRIBUTES
  */
@@ -441,18 +471,6 @@ typedef struct _TOKEN_PRIMARY_GROUP {
 } TOKEN_PRIMARY_GROUP; 
 
 /*
- * ACL 
- */
-
-typedef struct _ACL {
-    BYTE AclRevision;
-    BYTE Sbz1;
-    WORD AclSize;
-    WORD AceCount;
-    WORD Sbz2;
-} ACL, *PACL;
-
-/*
  * TOKEN_DEFAULT_DACL
  */
 
@@ -490,6 +508,7 @@ typedef enum _SECURITY_IMPERSONATION_LEVEL {
 } SECURITY_IMPERSONATION_LEVEL; 
 
 
+
 /*
  * TOKEN_STATISTICS
  */

include/wintypes.h

@@ -106,7 +106,6 @@ typedef unsigned short  WCHAR;
 typedef unsigned short  BOOL16;
 typedef int             BOOL32;
 typedef double          DATE;
-typedef long		SCODE;
 typedef long            LONG_PTR;
 typedef unsigned long   ULONG_PTR;
 typedef double          DOUBLE;

include/wtypes.h

@@ -8,6 +8,13 @@
 
 #include "wintypes.h"
 
+/* FIXME: this line should be in rpcndr.h */
+typedef unsigned char byte;
+
+/* FIXME: and the following group should be in rpcdce.h */
+typedef void* RPC_AUTH_IDENTITY_HANDLE;
+typedef void* RPC_AUTHZ_HANDLE;
+
 
 typedef WORD CLIPFORMAT32, *LPCLIPFORMAT32;
 DECL_WINELIB_TYPE(CLIPFORMAT)
@@ -64,6 +71,36 @@ typedef struct _GUID	FMTID,*LPFMTID;
 DECLARE_HANDLE(HMETAFILEPICT);
 #undef DECLARE_HANDLE
 
+typedef struct _COAUTHIDENTITY
+{
+    USHORT* User;
+    ULONG UserLength;
+    USHORT* Domain;
+    ULONG DomainLength;
+    USHORT* Password;
+    ULONG PasswordLength;
+    ULONG Flags;
+} COAUTHIDENTITY;
+
+typedef struct _COAUTHINFO
+{
+    DWORD dwAuthnSvc;
+    DWORD dwAuthzSvc;
+    LPWSTR pwszServerPrincName;
+    DWORD dwAuthnLevel;
+    DWORD dwImpersonationLevel;
+    COAUTHIDENTITY* pAuthIdentityData;
+    DWORD dwCapabilities;
+} COAUTHINFO;
+
+typedef struct _COSERVERINFO
+{
+    DWORD dwReserved1;
+    LPWSTR pwszName;
+    COAUTHINFO* pAuthInfo;
+    DWORD dwReserved2;
+} COSERVERINFO;
+
 typedef enum tagCLSCTX
 {
     CLSCTX_INPROC_SERVER     = 0x1,
@@ -80,5 +117,102 @@ typedef enum tagCLSCTX
 #define CLSCTX_ALL              (CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)
 #define CLSCTX_SERVER           (CLSCTX_INPROC_SERVER | CLSCTX_LOCAL_SERVER | CLSCTX_REMOTE_SERVER)
 
+typedef unsigned short VARTYPE;
+
+typedef ULONG PROPID;
+
+typedef struct tagBLOB
+{
+    ULONG cbSize;
+    BYTE *pBlobData;
+} BLOB;
+
+#ifndef _tagCY_DEFINED
+#define _tagCY_DEFINED
+typedef union tagCY
+{
+    struct {
+#ifdef BIG_ENDIAN
+        long Hi;
+        long Lo;
+#else
+        unsigned long Lo;
+        long Hi;
+#endif
+    } u;
+    LONGLONG int64;
+} CY;
+#endif /* _tagCY_DEFINED */
+
+/*
+ * 0 == FALSE and -1 == TRUE
+ */
+#define VARIANT_TRUE     ((VARIANT_BOOL)0xFFFF)
+#define VARIANT_FALSE    ((VARIANT_BOOL)0x0000)
+typedef short VARIANT_BOOL,_VARIANT_BOOL;
+
+typedef struct tagCLIPDATA
+{
+    ULONG cbSize;
+    long ulClipFmt;
+    BYTE *pClipData;
+} CLIPDATA;
+
+// Macro to calculate the size of the above pClipData
+#define CBPCLIPDATA(clipdata)    ( (clipdata).cbSize - sizeof((clipdata).ulClipFmt) )
+
+typedef LONG SCODE;
+
+#ifndef _FILETIME_
+#define _FILETIME_
+/* 64 bit number of 100 nanoseconds intervals since January 1, 1601 */
+typedef struct
+{
+  DWORD  dwLowDateTime;
+  DWORD  dwHighDateTime;
+} FILETIME, *LPFILETIME;
+#endif /* _FILETIME_ */
+
+#ifndef _SECURITY_DEFINED
+#define _SECURITY_DEFINED
+
+typedef struct {
+    BYTE Value[6];
+} SID_IDENTIFIER_AUTHORITY,*PSID_IDENTIFIER_AUTHORITY;
+
+typedef struct _SID {
+    BYTE Revision;
+    BYTE SubAuthorityCount;
+    SID_IDENTIFIER_AUTHORITY IdentifierAuthority;
+    DWORD SubAuthority[1];
+} SID,*PSID;
+
+/*
+ * ACL 
+ */
+
+typedef struct _ACL {
+    BYTE AclRevision;
+    BYTE Sbz1;
+    WORD AclSize;
+    WORD AceCount;
+    WORD Sbz2;
+} ACL, *PACL;
+
+typedef WORD SECURITY_DESCRIPTOR_CONTROL;
+
+/* The security descriptor structure */
+typedef struct {
+    BYTE Revision;
+    BYTE Sbz1;
+    SECURITY_DESCRIPTOR_CONTROL Control;
+    PSID Owner;
+    PSID Group;
+    PACL Sacl;
+    PACL Dacl;
+} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR;
+
+#endif /* _SECURITY_DEFINED */
+
 
 #endif /* __WINE_WTYPES_H */

ole/compobj.c

@@ -43,7 +43,9 @@
 #include "ldt.h"
 #include "winreg.h"
 
-#include "objbase.h"
+#include "wine/obj_base.h"
+#include "wine/obj_misc.h"
+#include "wine/obj_clientserver.h"
 
 #include "ifs.h"