Many interface declarations that originated from oleidl.h, oaidl.h and

include/ocidl.h

@@ -7,6 +7,8 @@
 /* the following depend only on obj_base.h */
 #include "wine/obj_olefont.h"
 
+#include "wine/obj_control.h"
+#include "wine/obj_connection.h"
 
 #endif /* __WINE_OCIDL_H */
 

include/ole2.h

@@ -6,23 +6,13 @@
 #define __WINE_OLE2_H
 
 #include "wintypes.h"
+#include "winerror.h"
 #include "oleidl.h"
 
 /* OLE version */
 #define rmm             23
 #define rup            639
 
-/* FIXME: should be in oleidl.h */
-typedef struct  tagOleMenuGroupWidths
-{ LONG width[ 6 ];
-} OLEMENUGROUPWIDTHS32, OLEMENUGROUPWIDTHS;
-
-typedef struct tagOleMenuGroupWidths *LPOLEMENUGROUPWIDTHS32;
-typedef struct IOleInPlaceFrame        *LPOLEINPLACEFRAME;
-typedef struct IOleInPlaceActiveObject *LPOLEINPLACEACTIVEOBJECT;
-
-typedef HGLOBAL32 HOLEMENU32;
-
 /*
  * API declarations
  */
@@ -32,14 +22,8 @@ HRESULT     WINAPI RegisterDragDrop32(HWND32,LPDROPTARGET);
 HRESULT     WINAPI RevokeDragDrop16(HWND16);
 HRESULT     WINAPI RevokeDragDrop32(HWND32);
 #define     RevokeDragDrop WINELIB_NAME(RevokeDragDrop)
-HRESULT     WINAPI DoDragDrop16(LPDATAOBJECT, 
-                                LPDROPSOURCE,
-				DWORD,
-				DWORD*);
-HRESULT     WINAPI DoDragDrop32(LPDATAOBJECT,
-				LPDROPSOURCE,
-				DWORD,
-				DWORD*);
+HRESULT     WINAPI DoDragDrop16(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
+HRESULT     WINAPI DoDragDrop32(LPDATAOBJECT,LPDROPSOURCE,DWORD,DWORD*);
 #define     DoDragDrop WINELIB_NAME(DoDragDrop)
 
 HOLEMENU32  WINAPI OleCreateMenuDescriptor(HMENU32              hmenuCombined,

include/oleidl.h

@@ -16,6 +16,8 @@
 /* the following depend on obj_dataobject.h */
 #include "wine/obj_dragdrop.h"
 
+#include "wine/obj_inplace.h"
+#include "wine/obj_cache.h"
 
 #endif /* __WINE_OLEIDL_H */
 

include/wine/obj_cache.h

+/*
+ * Defines the COM interfaces and APIs related to structured data storage.
+ *
+ * Depends on 'obj_base.h'.
+ */
+
+#ifndef __WINE_WINE_OBJ_CACHE_H
+#define __WINE_WINE_OBJ_CACHE_H
+
+
+#include "winbase.h"
+
+
+/*****************************************************************************
+ * Declare the structures
+ */
+
+
+/*****************************************************************************
+ * Predeclare the interfaces
+ */
+
+DEFINE_OLEGUID(IID_IOleCache,  0x0000011eL, 0, 0);
+typedef struct IOleCache IOleCache, *LPOLECACHE;
+
+DEFINE_OLEGUID(IID_IOleCache2,  0x00000128L, 0, 0);
+typedef struct IOleCache2 IOleCache2, *LPOLECACHE2;
+
+DEFINE_OLEGUID(IID_IOleCacheControl,  0x00000129L, 0, 0);
+typedef struct IOleCacheControl IOleCacheControl, *LPOLECACHECONTROL;
+
+/*****************************************************************************
+ * IOleCache interface
+ */
+#define ICOM_INTERFACE IOleCache
+#define IOleCache_METHODS \
+	ICOM_METHOD3(HRESULT,Cache, FORMATETC32*,pformatetc, DWORD,advf, DWORD*, pdwConnection); \
+	ICOM_METHOD1(HRESULT,Uncache, DWORD,dwConnection); \
+	ICOM_METHOD1(HRESULT,EnumCache, IEnumSTATDATA**,ppenumSTATDATA); \
+	ICOM_METHOD1(HRESULT,InitCache, IDataObject*,pDataObject); \
+	ICOM_METHOD3(HRESULT,SetData, FORMATETC32*,pformatetc, STGMEDIUM32*,pmedium, BOOL32,fRelease);
+#define IOleCache_IMETHODS \
+	IUnknown_IMETHODS \
+	IOleCache_METHODS
+ICOM_DEFINE(IOleCache,IUnknown)
+#undef ICOM_INTERFACE
+
+#ifdef ICOM_CINTERFACE
+/*** IUnknwon methods ***/
+#define IOleCache_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
+#define IOleCache_AddRef(p)                  ICOM_CALL (AddRef,p)
+#define IOleCache_Release(p)                 ICOM_CALL (Release,p)
+/*** IOleCache methods ***/
+#define IOleCache_Cache(p,a,b,c)             ICOM_CALL3(Cache,p,a,b,c)
+#define IOleCache_Uncache(p,a)               ICOM_CALL1(Uncache,p,a)
+#define IOleCache_EnumCache(p,a)             ICOM_CALL1(EnumCache,p,a)
+#define IOleCache_InitCache(p,a)             ICOM_CALL1(InitCache,p,a)
+#define IOleCache_SetData(p,a,b,c)           ICOM_CALL3(SetData,p,a,b,c)
+#endif
+				 
+
+/*****************************************************************************
+ * IOleCache2 interface
+ */
+#define ICOM_INTERFACE IOleCache2
+#define IOleCache2_METHODS \
+	ICOM_METHOD3(HRESULT,UpdateCache, LPDATAOBJECT,pDataObject, DWORD,grfUpdf, LPVOID,pReserved); \
+	ICOM_METHOD1(HRESULT,DiscardCache, DWORD,dwDiscardOptions);
+#define IOleCache2_IMETHODS \
+	IOleCache_IMETHODS \
+	IOleCache2_METHODS
+ICOM_DEFINE(IOleCache2,IOleCache)
+#undef ICOM_INTERFACE
+
+#ifdef ICOM_CINTERFACE
+/*** IUnknwon methods ***/
+#define IOleCache2_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
+#define IOleCache2_AddRef(p)                  ICOM_CALL (AddRef,p)
+#define IOleCache2_Release(p)                 ICOM_CALL (Release,p)
+/*** IOleCache methods ***/
+#define IOleCache2_Cache(p,a,b,c)             ICOM_CALL3(Cache,p,a,b,c)
+#define IOleCache2_Uncache(p,a)               ICOM_CALL1(Uncache,p,a)
+#define IOleCache2_EnumCache(p,a)             ICOM_CALL1(EnumCache,p,a)
+#define IOleCache2_InitCache(p,a)             ICOM_CALL1(InitCache,p,a)
+#define IOleCache2_SetData(p,a,b,c)           ICOM_CALL3(SetData,p,a,b,c)
+/*** IOleCache2 methods ***/
+#define IOleCache2_UpdateCache(p,a,b,c)       ICOM_CALL3(UpdateCache,p,a,b,c)
+#define IOleCache2_DiscardCache(p,a)          ICOM_CALL1(DiscardCache,p,a)
+#endif
+
+
+/*****************************************************************************
+ * IOleCacheControl interface
+ */
+#define ICOM_INTERFACE IOleCacheControl
+#define IOleCacheControl_METHODS \
+	ICOM_METHOD1(HRESULT,OnRun, LPDATAOBJECT,pDataObject); \
+	ICOM_METHOD (HRESULT,OnStop);
+#define IOleCacheControl_IMETHODS \
+	IUnknown_IMETHODS \
+	IOleCacheControl_METHODS
+ICOM_DEFINE(IOleCacheControl,IUnknown)
+#undef ICOM_INTERFACE
+
+#ifdef ICOM_CINTERFACE
+/*** IUnknwon methods ***/
+#define IOleCacheControl_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
+#define IOleCacheControl_AddRef(p)                  ICOM_CALL (AddRef,p)
+#define IOleCacheControl_Release(p)                 ICOM_CALL (Release,p)
+/*** IOleCacheControl methods ***/
+#define IOleCacheControl_OnRun(p,a)                 ICOM_CALL1(UpdateCache,p,a)
+#define IOleCacheControl_OnStop(p)                  ICOM_CALL (OnStop,p)
+#endif
+				 
+
+
+#endif /* __WINE_WINE_OBJ_CONTROL_H */
+
+

include/wine/obj_connection.h

+/*
+ * Defines the COM interfaces and APIs related to structured data storage.
+ *
+ * Depends on 'obj_base.h'.
+ */
+
+#ifndef __WINE_WINE_OBJ_CONNECTION_H
+#define __WINE_WINE_OBJ_CONNECTION_H
+
+
+#include "winbase.h"
+
+
+/*****************************************************************************
+ * Declare the structures
+ */
+
+typedef struct tagCONNECTDATA
+{
+				  IUnknown *pUnk;
+					  DWORD dwCookie;
+} CONNECTDATA, *LPCONNECTDATA;
+ 
+/*****************************************************************************
+ * Predeclare the interfaces
+ */
+DEFINE_GUID(IID_IConnectionPoint, 0xb196b286, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
+typedef struct IConnectionPoint IConnectionPoint, *LPCONNECTIONPOINT;
+
+DEFINE_GUID(IID_IConnectionPointContainer, 0xb196b284, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
+typedef struct IConnectionPointContainer IConnectionPointContainer, *LPCONNECTIONPOINTCONTAINER;
+
+DEFINE_GUID(IID_IEnumConnections, 0xb196b287, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
+typedef struct IEnumConnections IEnumConnections, *LPENUMCONNECTIONS;
+
+DEFINE_GUID(IID_IEnumConnectionPoints, 0xb196b285, 0xbab4, 0x101a, 0xb6, 0x9c, 0x00, 0xaa, 0x00, 0x34, 0x1d, 0x07);
+typedef struct IEnumConnectionPoints IEnumConnectionPoints, *LPENUMCONNECTIONPOINTS;
+
+/*****************************************************************************
+ * IConnectionPoint interface
+ */
+#define ICOM_INTERFACE IConnectionPoint
+#define IConnectionPoint_METHODS \
+	ICOM_METHOD1(HRESULT,GetConnectionInterface, IID*,pIID); \
+	ICOM_METHOD1(HRESULT,GetConnectionPointContainer, IConnectionPointContainer**,ppCPC); \
+	ICOM_METHOD2(HRESULT,Advise, IUnknown*,pUnkSink, DWORD*,pdwCookie); \
+	ICOM_METHOD1(HRESULT,Unadvise, DWORD,dwCookie); \
+	ICOM_METHOD1(HRESULT,EnumConnections, IEnumConnections**,ppEnum);
+#define IConnectionPoint_IMETHODS \
+	IUnknown_IMETHODS \
+	IConnectionPoint_METHODS
+ICOM_DEFINE(IConnectionPoint,IUnknown)
+#undef ICOM_INTERFACE
+
+#ifdef ICOM_CINTERFACE
+/*** IUnknwon methods ***/
+#define IConnectionPoint_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
+#define IConnectionPoint_AddRef(p)                  ICOM_CALL (AddRef,p)
+#define IConnectionPoint_Release(p)                 ICOM_CALL (Release,p)
+/*** IConnectionPointContainer methods ***/
+#define IConnectionPoint_GetConnectionInterface(p,a)      ICOM_CALL1(GetConnectionInterface,p,a)
+#define IConnectionPoint_GetConnectionPointContainer(p,a) ICOM_CALL1(GetConnectionPointContainer,p,a)
+#define IConnectionPoint_Advise(p,a,b)                    ICOM_CALL2(Advise,p,a,b)
+#define IConnectionPoint_Unadvise(p,a)                    ICOM_CALL1(Unadvise,p,a)
+#define IConnectionPoint_EnumConnections(p,a)             ICOM_CALL1(EnumConnections,p,a)
+#endif
+
+
+/*****************************************************************************
+ * IConnectionPointContainer interface
+ */
+#define ICOM_INTERFACE IConnectionPointContainer
+#define IConnectionPointContainer_METHODS \
+	ICOM_METHOD1(HRESULT,EnumConnectionPoints, IEnumConnectionPoints**,ppEnum); \
+	ICOM_METHOD2(HRESULT,FindConnectionPoint, REFIID,riid, IConnectionPoint**,ppCP); 
+#define IConnectionPointContainer_IMETHODS \
+	IUnknown_IMETHODS \
+	IConnectionPointContainer_METHODS
+ICOM_DEFINE(IConnectionPointContainer,IUnknown)
+#undef ICOM_INTERFACE
+
+#ifdef ICOM_CINTERFACE
+/*** IUnknwon methods ***/
+#define IConnectionPointContainer_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
+#define IConnectionPointContainer_AddRef(p)                  ICOM_CALL (AddRef,p)
+#define IConnectionPointContainer_Release(p)                 ICOM_CALL (Release,p)
+/*** IConnectionPointContainer methods ***/
+#define IConnectionPointContainer_EnumConnectionPoints(p,a)  ICOM_CALL1(CreateInstance,p,a)
+#define IConnectionPointContainer_FindConnectionPoint(p,a,b) ICOM_CALL2(LockServer,p,a,b)
+#endif
+
+
+/*****************************************************************************
+ * IEnumConnections interface
+ */
+#define ICOM_INTERFACE IEnumConnections
+#define IEnumConnections_METHODS \
+	ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTDATA,rgcd, ULONG*,pcFectched); \
+	ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections); \
+	ICOM_METHOD (HRESULT,Reset); \
+	ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum);
+#define IEnumConnections_IMETHODS \
+	IUnknown_IMETHODS \
+	IEnumConnections_METHODS
+ICOM_DEFINE(IEnumConnections,IUnknown)
+#undef ICOM_INTERFACE
+
+#ifdef ICOM_CINTERFACE
+/*** IUnknwon methods ***/
+#define IEnumConnections_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
+#define IEnumConnections_AddRef(p)                  ICOM_CALL (AddRef,p)
+#define IEnumConnections_Release(p)                 ICOM_CALL (Release,p)
+/*** IConnectionPointContainer methods ***/
+#define IEnumConnections_Next(p,a,b,c)              ICOM_CALL3(Next,p,a,b,c)
+#define IEnumConnections_Skip(p,a)                  ICOM_CALL1(Skip,p,a)
+#define IEnumConnections_Reset(p)                   ICOM_CALL (Reset,p)
+#define IEnumConnections_Clone(p,a)                 ICOM_CALL1(Clone,p,a)
+#endif
+
+/*****************************************************************************
+ * IEnumConnectionPoints interface
+ */
+#define ICOM_INTERFACE IEnumConnectionPoints
+#define IEnumConnectionPoints_METHODS \
+	ICOM_METHOD3(HRESULT,Next, ULONG,cConnections, LPCONNECTIONPOINT*,ppCP, ULONG*,pcFectched); \
+	ICOM_METHOD1(HRESULT,Skip, ULONG,cConnections); \
+	ICOM_METHOD (HRESULT,Reset); \
+	ICOM_METHOD1(HRESULT,Clone, IEnumConnections**,ppEnum);
+#define IEnumConnectionPoints_IMETHODS \
+	IUnknown_IMETHODS \
+	IEnumConnectionPoints_METHODS
+ICOM_DEFINE(IEnumConnectionPoints,IUnknown)
+#undef ICOM_INTERFACE
+
+#ifdef ICOM_CINTERFACE
+/*** IUnknwon methods ***/
+#define IEnumConnectionPoints_QueryInterface(p,a,b)      ICOM_CALL2(QueryInterface,p,a,b)
+#define IEnumConnectionPoints_AddRef(p)                  ICOM_CALL (AddRef,p)
+#define IEnumConnectionPoints_Release(p)                 ICOM_CALL (Release,p)
+/*** IConnectionPointContainer methods ***/
+#define IEnumConnectionPoints_Next(p,a,b,c)              ICOM_CALL3(Next,p,a,b,c)
+#define IEnumConnectionPoints_Skip(p,a)                  ICOM_CALL1(Skip,p,a)
+#define IEnumConnectionPoints_Reset(p)                   ICOM_CALL (Reset,p)
+#define IEnumConnectionPoints_Clone(p,a)                 ICOM_CALL1(Clone,p,a)
+#endif
+				
+
+
+
+#endif /* __WINE_WINE_OBJ_CONTROL_H */
+
+

include/wintypes.h

@@ -532,10 +532,12 @@ typedef struct tagRECT
     INT32  right;
     INT32  bottom;
 } RECT32, *PRECT32, *LPRECT32;
+typedef const RECT32 *LPCRECT32;
 
 DECL_WINELIB_TYPE(RECT)
 DECL_WINELIB_TYPE(PRECT)
 DECL_WINELIB_TYPE(LPRECT)
+DECL_WINELIB_TYPE(LPCRECT)
 
 typedef struct tagRECTL
 {

ole/olefont.c

@@ -10,8 +10,8 @@
 
 #include "windows.h"
 #include "winerror.h"
-#include "ocidl.h"
 #include "oleauto.h"
+#include "ocidl.h"
 #include "olectl.h"
 #include "debug.h"