CVS: winex/include/wine-lgpl richole.h,1.1,1.2

[email protected] 14 Dec 2007 20:23:30 -0000
Newsgroups gmane.comp.emulators.winex.cvs
Message-ID <[email protected]>
Subject: winex/include/wine-lgpl richole.h,1.1,1.2Update of /var/lib/cvsd/cvsroot/winex/include/wine-lgpl
In directory agravaine:/tmp/cvs-serv15924/include/wine-lgpl

Modified Files:
	richole.h 
Log Message:
Recompiled remaining IDL files with new widl.


Index: richole.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/wine-lgpl/richole.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- richole.h	22 Feb 2007 23:20:29 -0000	1.1
+++ richole.h	14 Dec 2007 20:23:28 -0000	1.2
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.9.29 from ./richole.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from wine-lgpl/richole.idl - Do not edit ***/
 #include <rpc.h>
 #include <rpcndr.h>
 
@@ -75,7 +75,7 @@
 interface IRichEditOle : public IUnknown
 {
     virtual HRESULT STDMETHODCALLTYPE GetClientSite(
-        LPOLECLIENTSITE* lplpolesite) = 0;
+        LPOLECLIENTSITE *lplpolesite) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetObjectCount(
         ) = 0;
@@ -85,11 +85,11 @@
 
     virtual HRESULT STDMETHODCALLTYPE GetObject(
         LONG iob,
-        REOBJECT* lpreobject,
+        REOBJECT *lpreobject,
         DWORD dwFlags) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE InsertObject(
-        REOBJECT* lpreobject) = 0;
+        REOBJECT *lpreobject) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE ConvertObject(
         LONG iob,
@@ -126,9 +126,9 @@
         BOOL fEnterMode) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetClipboardData(
-        CHARRANGE* lpchrg,
+        CHARRANGE *lpchrg,
         DWORD reco,
-        LPDATAOBJECT* lplpdataobj) = 0;
+        LPDATAOBJECT *lplpdataobj) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE ImportDataObject(
         LPDATAOBJECT lpdataobj,
@@ -144,7 +144,7 @@
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IRichEditOle* This,
         REFIID riid,
-        void** ppvObject);
+        void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
         IRichEditOle* This);
@@ -155,7 +155,7 @@
     /*** IRichEditOle methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClientSite)(
         IRichEditOle* This,
-        LPOLECLIENTSITE* lplpolesite);
+        LPOLECLIENTSITE *lplpolesite);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectCount)(
         IRichEditOle* This);
@@ -166,12 +166,12 @@
     HRESULT (STDMETHODCALLTYPE *GetObject)(
         IRichEditOle* This,
         LONG iob,
-        REOBJECT* lpreobject,
+        REOBJECT *lpreobject,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *InsertObject)(
         IRichEditOle* This,
-        REOBJECT* lpreobject);
+        REOBJECT *lpreobject);
 
     HRESULT (STDMETHODCALLTYPE *ConvertObject)(
         IRichEditOle* This,
@@ -217,9 +217,9 @@
 
     HRESULT (STDMETHODCALLTYPE *GetClipboardData)(
         IRichEditOle* This,
-        CHARRANGE* lpchrg,
+        CHARRANGE *lpchrg,
         DWORD reco,
-        LPDATAOBJECT* lplpdataobj);
+        LPDATAOBJECT *lplpdataobj);
 
     HRESULT (STDMETHODCALLTYPE *ImportDataObject)(
         IRichEditOle* This,
@@ -233,6 +233,25 @@
     CONST_VTBL IRichEditOleVtbl* lpVtbl;
 };
 
+#define IRichEditOle_IMETHODS \
+    IUnknown_IMETHODS \
+    ICOM_METHOD1 (HRESULT,GetClientSite,LPOLECLIENTSITE *,lplpolesite) \
+    ICOM_METHOD  (HRESULT,GetObjectCount) \
+    ICOM_METHOD  (HRESULT,GetLinkCount) \
+    ICOM_METHOD3 (HRESULT,GetObject,LONG,iob,REOBJECT *,lpreobject,DWORD,dwFlags) \
+    ICOM_METHOD1 (HRESULT,InsertObject,REOBJECT *,lpreobject) \
+    ICOM_METHOD3 (HRESULT,ConvertObject,LONG,iob,REFCLSID,rclsidNew,LPCSTR,lpstrUserTypeNew) \
+    ICOM_METHOD2 (HRESULT,ActivateAs,REFCLSID,rclsid,REFCLSID,rclsidAs) \
+    ICOM_METHOD2 (HRESULT,SetHostNames,LPCSTR,lpstrContainerApp,LPCSTR,lpstrContainerObj) \
+    ICOM_METHOD2 (HRESULT,SetLinkAvailable,LONG,iob,BOOL,fAvailable) \
+    ICOM_METHOD2 (HRESULT,SetDvaspect,LONG,iob,DWORD,dvaspect) \
+    ICOM_METHOD1 (HRESULT,HandsOffStorage,LONG,iob) \
+    ICOM_METHOD2 (HRESULT,SaveCompleted,LONG,iob,LPSTORAGE,lpstg) \
+    ICOM_METHOD  (HRESULT,InPlaceDeactivate) \
+    ICOM_METHOD1 (HRESULT,ContextSensitiveHelp,BOOL,fEnterMode) \
+    ICOM_METHOD3 (HRESULT,GetClipboardData,CHARRANGE *,lpchrg,DWORD,reco,LPDATAOBJECT *,lplpdataobj) \
+    ICOM_METHOD3 (HRESULT,ImportDataObject,LPDATAOBJECT,lpdataobj,CLIPFORMAT,cf,HGLOBAL,hMetaPict)
+
 #ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IRichEditOle_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
@@ -261,7 +280,7 @@
 
 HRESULT CALLBACK IRichEditOle_GetClientSite_Proxy(
     IRichEditOle* This,
-    LPOLECLIENTSITE* lplpolesite);
+    LPOLECLIENTSITE *lplpolesite);
 void __RPC_STUB IRichEditOle_GetClientSite_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -284,7 +303,7 @@
 HRESULT CALLBACK IRichEditOle_GetObject_Proxy(
     IRichEditOle* This,
     LONG iob,
-    REOBJECT* lpreobject,
+    REOBJECT *lpreobject,
     DWORD dwFlags);
 void __RPC_STUB IRichEditOle_GetObject_Stub(
     IRpcStubBuffer* This,
@@ -293,7 +312,7 @@
     DWORD* pdwStubPhase);
 HRESULT CALLBACK IRichEditOle_InsertObject_Proxy(
     IRichEditOle* This,
-    REOBJECT* lpreobject);
+    REOBJECT *lpreobject);
 void __RPC_STUB IRichEditOle_InsertObject_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -379,9 +398,9 @@
     DWORD* pdwStubPhase);
 HRESULT CALLBACK IRichEditOle_GetClipboardData_Proxy(
     IRichEditOle* This,
-    CHARRANGE* lpchrg,
+    CHARRANGE *lpchrg,
     DWORD reco,
-    LPDATAOBJECT* lplpdataobj);
+    LPDATAOBJECT *lplpdataobj);
 void __RPC_STUB IRichEditOle_GetClipboardData_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -417,11 +436,11 @@
 interface IRichEditOleCallback : public IUnknown
 {
     virtual HRESULT STDMETHODCALLTYPE GetNewStorage(
-        LPSTORAGE* lplpstg) = 0;
+        LPSTORAGE *lplpstg) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetInPlaceContext(
-        LPOLEINPLACEFRAME* lplpFrame,
-        LPOLEINPLACEUIWINDOW* lplpDoc,
+        LPOLEINPLACEFRAME *lplpFrame,
+        LPOLEINPLACEUIWINDOW *lplpDoc,
         LPOLEINPLACEFRAMEINFO lpFrameInfo) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE ShowContainerUI(
@@ -437,7 +456,7 @@
 
     virtual HRESULT STDMETHODCALLTYPE QueryAcceptData(
         LPDATAOBJECT lpdataobj,
-        CLIPFORMAT* lpcfFormat,
+        CLIPFORMAT *lpcfFormat,
         DWORD reco,
         BOOL fReally,
         HGLOBAL hMetaPict) = 0;
@@ -446,9 +465,9 @@
         BOOL fEnterMode) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetClipboardData(
-        CHARRANGE* lpchrg,
+        CHARRANGE *lpchrg,
         DWORD reco,
-        LPDATAOBJECT* lplpdataobj) = 0;
+        LPDATAOBJECT *lplpdataobj) = 0;
 
     virtual HRESULT STDMETHODCALLTYPE GetDragDropEffect(
         BOOL fDrag,
@@ -458,8 +477,8 @@
     virtual HRESULT STDMETHODCALLTYPE GetContextMenu(
         WORD seltype,
         LPOLEOBJECT lpoleobj,
-        CHARRANGE* lpchrg,
-        HMENU* lphmenu) = 0;
+        CHARRANGE *lpchrg,
+        HMENU *lphmenu) = 0;
 
 };
 #else
@@ -470,7 +489,7 @@
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IRichEditOleCallback* This,
         REFIID riid,
-        void** ppvObject);
+        void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
         IRichEditOleCallback* This);
@@ -481,12 +500,12 @@
     /*** IRichEditOleCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *GetNewStorage)(
         IRichEditOleCallback* This,
-        LPSTORAGE* lplpstg);
+        LPSTORAGE *lplpstg);
 
     HRESULT (STDMETHODCALLTYPE *GetInPlaceContext)(
         IRichEditOleCallback* This,
-        LPOLEINPLACEFRAME* lplpFrame,
-        LPOLEINPLACEUIWINDOW* lplpDoc,
+        LPOLEINPLACEFRAME *lplpFrame,
+        LPOLEINPLACEUIWINDOW *lplpDoc,
         LPOLEINPLACEFRAMEINFO lpFrameInfo);
 
     HRESULT (STDMETHODCALLTYPE *ShowContainerUI)(
@@ -506,7 +525,7 @@
     HRESULT (STDMETHODCALLTYPE *QueryAcceptData)(
         IRichEditOleCallback* This,
         LPDATAOBJECT lpdataobj,
-        CLIPFORMAT* lpcfFormat,
+        CLIPFORMAT *lpcfFormat,
         DWORD reco,
         BOOL fReally,
         HGLOBAL hMetaPict);
@@ -517,9 +536,9 @@
 
     HRESULT (STDMETHODCALLTYPE *GetClipboardData)(
         IRichEditOleCallback* This,
-        CHARRANGE* lpchrg,
+        CHARRANGE *lpchrg,
         DWORD reco,
-        LPDATAOBJECT* lplpdataobj);
+        LPDATAOBJECT *lplpdataobj);
 
     HRESULT (STDMETHODCALLTYPE *GetDragDropEffect)(
         IRichEditOleCallback* This,
@@ -531,8 +550,8 @@
         IRichEditOleCallback* This,
         WORD seltype,
         LPOLEOBJECT lpoleobj,
-        CHARRANGE* lpchrg,
-        HMENU* lphmenu);
+        CHARRANGE *lpchrg,
+        HMENU *lphmenu);
 
     END_INTERFACE
 } IRichEditOleCallbackVtbl;
@@ -540,6 +559,19 @@
     CONST_VTBL IRichEditOleCallbackVtbl* lpVtbl;
 };
 
+#define IRichEditOleCallback_IMETHODS \
+    IUnknown_IMETHODS \
+    ICOM_METHOD1 (HRESULT,GetNewStorage,LPSTORAGE *,lplpstg) \
+    ICOM_METHOD3 (HRESULT,GetInPlaceContext,LPOLEINPLACEFRAME *,lplpFrame,LPOLEINPLACEUIWINDOW *,lplpDoc,LPOLEINPLACEFRAMEINFO,lpFrameInfo) \
+    ICOM_METHOD1 (HRESULT,ShowContainerUI,BOOL,fShow) \
+    ICOM_METHOD3 (HRESULT,QueryInsertObject,LPCLSID,lpclsid,LPSTORAGE,lpstg,LONG,cp) \
+    ICOM_METHOD1 (HRESULT,DeleteObject,LPOLEOBJECT,lpoleobj) \
+    ICOM_METHOD5 (HRESULT,QueryAcceptData,LPDATAOBJECT,lpdataobj,CLIPFORMAT *,lpcfFormat,DWORD,reco,BOOL,fReally,HGLOBAL,hMetaPict) \
+    ICOM_METHOD1 (HRESULT,ContextSensitiveHelp,BOOL,fEnterMode) \
+    ICOM_METHOD3 (HRESULT,GetClipboardData,CHARRANGE *,lpchrg,DWORD,reco,LPDATAOBJECT *,lplpdataobj) \
+    ICOM_METHOD3 (HRESULT,GetDragDropEffect,BOOL,fDrag,DWORD,grfKeyState,LPDWORD,pdwEffect) \
+    ICOM_METHOD4 (HRESULT,GetContextMenu,WORD,seltype,LPOLEOBJECT,lpoleobj,CHARRANGE *,lpchrg,HMENU *,lphmenu)
+
 #ifdef COBJMACROS
 /*** IUnknown methods ***/
 #define IRichEditOleCallback_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
@@ -562,7 +594,7 @@
 
 HRESULT CALLBACK IRichEditOleCallback_GetNewStorage_Proxy(
     IRichEditOleCallback* This,
-    LPSTORAGE* lplpstg);
+    LPSTORAGE *lplpstg);
 void __RPC_STUB IRichEditOleCallback_GetNewStorage_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -570,8 +602,8 @@
     DWORD* pdwStubPhase);
 HRESULT CALLBACK IRichEditOleCallback_GetInPlaceContext_Proxy(
     IRichEditOleCallback* This,
-    LPOLEINPLACEFRAME* lplpFrame,
-    LPOLEINPLACEUIWINDOW* lplpDoc,
+    LPOLEINPLACEFRAME *lplpFrame,
+    LPOLEINPLACEUIWINDOW *lplpDoc,
     LPOLEINPLACEFRAMEINFO lpFrameInfo);
 void __RPC_STUB IRichEditOleCallback_GetInPlaceContext_Stub(
     IRpcStubBuffer* This,
@@ -607,7 +639,7 @@
 HRESULT CALLBACK IRichEditOleCallback_QueryAcceptData_Proxy(
     IRichEditOleCallback* This,
     LPDATAOBJECT lpdataobj,
-    CLIPFORMAT* lpcfFormat,
+    CLIPFORMAT *lpcfFormat,
     DWORD reco,
     BOOL fReally,
     HGLOBAL hMetaPict);
@@ -626,9 +658,9 @@
     DWORD* pdwStubPhase);
 HRESULT CALLBACK IRichEditOleCallback_GetClipboardData_Proxy(
     IRichEditOleCallback* This,
-    CHARRANGE* lpchrg,
+    CHARRANGE *lpchrg,
     DWORD reco,
-    LPDATAOBJECT* lplpdataobj);
+    LPDATAOBJECT *lplpdataobj);
 void __RPC_STUB IRichEditOleCallback_GetClipboardData_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -648,8 +680,8 @@
     IRichEditOleCallback* This,
     WORD seltype,
     LPOLEOBJECT lpoleobj,
-    CHARRANGE* lpchrg,
-    HMENU* lphmenu);
+    CHARRANGE *lpchrg,
+    HMENU *lphmenu);
 void __RPC_STUB IRichEditOleCallback_GetContextMenu_Stub(
     IRpcStubBuffer* This,
     IRpcChannelBuffer* pRpcChannelBuffer,
@@ -660,14 +692,14 @@
 
 /* Begin additional prototypes for all interfaces */
 
-ULONG           __RPC_USER HGLOBAL_UserSize     (ULONG *, ULONG, HGLOBAL *);
-unsigned char * __RPC_USER HGLOBAL_UserMarshal  (ULONG *, unsigned char *, HGLOBAL *);
-unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *, unsigned char *, HGLOBAL *);
-void            __RPC_USER HGLOBAL_UserFree     (ULONG *, HGLOBAL *);
 ULONG           __RPC_USER CLIPFORMAT_UserSize     (ULONG *, ULONG, CLIPFORMAT *);
 unsigned char * __RPC_USER CLIPFORMAT_UserMarshal  (ULONG *, unsigned char *, CLIPFORMAT *);
 unsigned char * __RPC_USER CLIPFORMAT_UserUnmarshal(ULONG *, unsigned char *, CLIPFORMAT *);
 void            __RPC_USER CLIPFORMAT_UserFree     (ULONG *, CLIPFORMAT *);
+ULONG           __RPC_USER HGLOBAL_UserSize     (ULONG *, ULONG, HGLOBAL *);
+unsigned char * __RPC_USER HGLOBAL_UserMarshal  (ULONG *, unsigned char *, HGLOBAL *);
+unsigned char * __RPC_USER HGLOBAL_UserUnmarshal(ULONG *, unsigned char *, HGLOBAL *);
+void            __RPC_USER HGLOBAL_UserFree     (ULONG *, HGLOBAL *);
 
 /* End additional prototypes */