CVS: winex/include comcat.h, 1.1.1.3, 1.4 oaidl.h, 1.3, 1.4 oleidl.h, 1.2, 1.3 servprov.h, 1.2, 1.3 shobjidl.h, 1.1, 1.2 urlmon.h, 1.3, 1.4
[email protected] 14 Dec 2007 20:23:41 -0000
| Newsgroups | gmane.comp.emulators.winex.cvs |
|---|---|
| Message-ID | <[email protected]> |
Subject: winex/include comcat.h,1.1.1.3,1.4 oaidl.h,1.3,1.4 oleidl.h,1.2,1.3 servprov.h,1.2,1.3 shobjidl.h,1.1,1.2 urlmon.h,1.3,1.4Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv15951/include
Modified Files:
comcat.h oaidl.h oleidl.h servprov.h shobjidl.h urlmon.h
Log Message:
Recompiled remaining IDL files with new widl.
Index: comcat.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/comcat.h,v
retrieving revision 1.1.1.3
retrieving revision 1.4
diff -u -d -r1.1.1.3 -r1.4
--- comcat.h 29 Aug 2001 18:21:27 -0000 1.1.1.3
+++ comcat.h 14 Dec 2007 20:23:38 -0000 1.4
@@ -1,18 +1,21 @@
-#ifndef __WINE__
-#include "rpc.h"
-#include "rpcndr.h"
-#ifndef COM_NO_WINDOWS_H
-#include "windows.h"
-#include "ole2.h"
-#endif
-#endif
-
-#ifndef __WINE_COMCAT_H
-#define __WINE_COMCAT_H
-
-#include "unknwn.h"
+/*** Autogenerated by WIDL 20020228 from comcat.idl - Do not edit ***/
+#include <rpc.h>
+#include <rpcndr.h>
+#ifndef __WIDL_COMCAT_H
+#define __WIDL_COMCAT_H
+#ifdef __cplusplus
+extern "C" {
+#endif
+#include <unknwn.h>
typedef GUID CATID;
typedef REFGUID REFCATID;
+/* Begin additional prototypes for all interfaces */
-#endif /*__WINE_COMCAT_H */
+
+/* End additional prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+#endif /* __WIDL_COMCAT_H */
Index: oaidl.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/oaidl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- oaidl.h 1 Apr 2004 13:38:08 -0000 1.3
+++ oaidl.h 14 Dec 2007 20:23:38 -0000 1.4
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.1 from oaidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from oaidl.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -7,53 +7,60 @@
#ifdef __cplusplus
extern "C" {
#endif
-#include "objidl.h"
-typedef struct IDispatch IDispatch;
[...6292 lines suppressed...]
+/* Begin additional prototypes for all interfaces */
+
+ULONG __RPC_USER BSTR_UserSize (ULONG *, ULONG, BSTR *);
+unsigned char * __RPC_USER BSTR_UserMarshal (ULONG *, unsigned char *, BSTR *);
+unsigned char * __RPC_USER BSTR_UserUnmarshal(ULONG *, unsigned char *, BSTR *);
+void __RPC_USER BSTR_UserFree (ULONG *, BSTR *);
+ULONG __RPC_USER VARIANT_UserSize (ULONG *, ULONG, VARIANT *);
+unsigned char * __RPC_USER VARIANT_UserMarshal (ULONG *, unsigned char *, VARIANT *);
+unsigned char * __RPC_USER VARIANT_UserUnmarshal(ULONG *, unsigned char *, VARIANT *);
+void __RPC_USER VARIANT_UserFree (ULONG *, VARIANT *);
+ULONG __RPC_USER CLEANLOCALSTORAGE_UserSize (ULONG *, ULONG, CLEANLOCALSTORAGE *);
+unsigned char * __RPC_USER CLEANLOCALSTORAGE_UserMarshal (ULONG *, unsigned char *, CLEANLOCALSTORAGE *);
+unsigned char * __RPC_USER CLEANLOCALSTORAGE_UserUnmarshal(ULONG *, unsigned char *, CLEANLOCALSTORAGE *);
+void __RPC_USER CLEANLOCALSTORAGE_UserFree (ULONG *, CLEANLOCALSTORAGE *);
+
+/* End additional prototypes */
+
#ifdef __cplusplus
}
#endif
Index: oleidl.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/oleidl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- oleidl.h 1 Apr 2004 13:41:39 -0000 1.2
+++ oleidl.h 14 Dec 2007 20:23:38 -0000 1.3
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.1 from oleidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from oleidl.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -7,12 +7,23 @@
#ifdef __cplusplus
extern "C" {
#endif
-#include "objidl.h"
-typedef struct IOleInPlaceActiveObject IOleInPlaceActiveObject;
[...4624 lines suppressed...]
+/* Begin additional prototypes for all interfaces */
+
+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 STGMEDIUM_UserSize (ULONG *, ULONG, STGMEDIUM *);
+unsigned char * __RPC_USER STGMEDIUM_UserMarshal (ULONG *, unsigned char *, STGMEDIUM *);
+unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *, unsigned char *, STGMEDIUM *);
+void __RPC_USER STGMEDIUM_UserFree (ULONG *, STGMEDIUM *);
+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 */
+
#ifdef __cplusplus
}
#endif
Index: servprov.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/servprov.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- servprov.h 1 Apr 2004 13:42:43 -0000 1.2
+++ servprov.h 14 Dec 2007 20:23:38 -0000 1.3
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.1 from servprov.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from servprov.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -7,10 +7,13 @@
#ifdef __cplusplus
extern "C" {
#endif
-#include "objidl.h"
-typedef struct IServiceProvider IServiceProvider;
-typedef IServiceProvider *LPSERVICEPROVIDER;
+#include <objidl.h>
+#ifndef __IServiceProvider_FWD_DEFINED__
+#define __IServiceProvider_FWD_DEFINED__
+typedef interface IServiceProvider IServiceProvider;
+#endif
+typedef IServiceProvider *LPSERVICEPROVIDER;
/*****************************************************************************
* IServiceProvider interface
*/
@@ -19,46 +22,47 @@
DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa);
#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IServiceProvider: IUnknown {
-
- virtual HRESULT CALLBACK QueryService(
+interface IServiceProvider : public IUnknown
+{
+ virtual HRESULT STDMETHODCALLTYPE QueryService(
REFGUID guidService,
REFIID riid,
- void** ppvObject) = 0;
+ void **ppvObject) = 0;
-} ICOM_COM_INTERFACE_ATTRIBUTE;
-#else
-typedef struct IServiceProviderVtbl IServiceProviderVtbl;
-struct IServiceProvider {
- const IServiceProviderVtbl* lpVtbl;
};
-struct IServiceProviderVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
+#else
+typedef struct IServiceProviderVtbl {
+ BEGIN_INTERFACE
/*** IUnknown methods ***/
- HRESULT (CALLBACK *QueryInterface)(
+ HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IServiceProvider* This,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
- ULONG (CALLBACK *AddRef)(
+ ULONG (STDMETHODCALLTYPE *AddRef)(
IServiceProvider* This);
- ULONG (CALLBACK *Release)(
+ ULONG (STDMETHODCALLTYPE *Release)(
IServiceProvider* This);
/*** IServiceProvider methods ***/
- HRESULT (CALLBACK *QueryService)(
+ HRESULT (STDMETHODCALLTYPE *QueryService)(
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
+ END_INTERFACE
+} IServiceProviderVtbl;
+interface IServiceProvider {
+ CONST_VTBL IServiceProviderVtbl* lpVtbl;
};
+#ifdef COBJMACROS
#define IServiceProvider_IMETHODS \
IUnknown_IMETHODS \
- ICOM_METHOD3 (HRESULT,QueryService,REFGUID,guidService,REFIID,riid,void**,ppvObject)
+ ICOM_METHOD3 (HRESULT,QueryService,REFGUID,guidService,REFIID,riid,void **,ppvObject)
/*** IUnknown methods ***/
#define IServiceProvider_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
@@ -66,6 +70,7 @@
#define IServiceProvider_Release(p) (p)->lpVtbl->Release(p)
/*** IServiceProvider methods ***/
#define IServiceProvider_QueryService(p,a,b,c) (p)->lpVtbl->QueryService(p,a,b,c)
+#endif
#endif
@@ -73,25 +78,30 @@
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
- IUnknown** ppvObject);
+ IUnknown **ppvObject);
void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(
- struct IRpcStubBuffer* This,
- struct IRpcChannelBuffer* pRpcChannelBuffer,
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IServiceProvider_QueryService_Proxy(
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
HRESULT __RPC_STUB IServiceProvider_QueryService_Stub(
IServiceProvider* This,
REFGUID guidService,
REFIID riid,
- IUnknown** ppvObject);
+ IUnknown **ppvObject);
#endif /* __IServiceProvider_INTERFACE_DEFINED__ */
+/* Begin additional prototypes for all interfaces */
+
+
+/* End additional prototypes */
+
#ifdef __cplusplus
}
#endif
Index: shobjidl.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/shobjidl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- shobjidl.h 28 Mar 2007 17:12:39 -0000 1.1
+++ shobjidl.h 14 Dec 2007 20:23:38 -0000 1.2
@@ -2,9 +2,6 @@
#include <rpc.h>
#include <rpcndr.h>
-
-#define interface struct
-
#ifndef __WIDL_SHOBJIDL_H
#define __WIDL_SHOBJIDL_H
#ifdef __cplusplus
@@ -33,17 +30,17 @@
interface IShellLinkDataList : public IUnknown
{
virtual HRESULT STDMETHODCALLTYPE AddDataBlock(
- void* pDataBlock) = 0;
+ void *pDataBlock) = 0;
virtual HRESULT STDMETHODCALLTYPE CopyDataBlock(
DWORD dwSig,
- void** ppDataBlock) = 0;
+ void **ppDataBlock) = 0;
virtual HRESULT STDMETHODCALLTYPE RemoveDataBlock(
DWORD dwSig) = 0;
virtual HRESULT STDMETHODCALLTYPE GetFlags(
- DWORD* pdwFlags) = 0;
+ DWORD *pdwFlags) = 0;
virtual HRESULT STDMETHODCALLTYPE SetFlags(
DWORD dwFlags) = 0;
@@ -51,13 +48,13 @@
};
#else
typedef struct IShellLinkDataListVtbl {
-// BEGIN_INTERFACE
+ BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IShellLinkDataList* This,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
ULONG (STDMETHODCALLTYPE *AddRef)(
IShellLinkDataList* This);
@@ -68,12 +65,12 @@
/*** IShellLinkDataList methods ***/
HRESULT (STDMETHODCALLTYPE *AddDataBlock)(
IShellLinkDataList* This,
- void* pDataBlock);
+ void *pDataBlock);
HRESULT (STDMETHODCALLTYPE *CopyDataBlock)(
IShellLinkDataList* This,
DWORD dwSig,
- void** ppDataBlock);
+ void **ppDataBlock);
HRESULT (STDMETHODCALLTYPE *RemoveDataBlock)(
IShellLinkDataList* This,
@@ -81,19 +78,27 @@
HRESULT (STDMETHODCALLTYPE *GetFlags)(
IShellLinkDataList* This,
- DWORD* pdwFlags);
+ DWORD *pdwFlags);
HRESULT (STDMETHODCALLTYPE *SetFlags)(
IShellLinkDataList* This,
DWORD dwFlags);
-// END_INTERFACE
+ END_INTERFACE
} IShellLinkDataListVtbl;
interface IShellLinkDataList {
- const IShellLinkDataListVtbl* lpVtbl;
+ CONST_VTBL IShellLinkDataListVtbl* lpVtbl;
};
#ifdef COBJMACROS
+#define IShellLinkDataList_IMETHODS \
+ IUnknown_IMETHODS \
+ ICOM_METHOD1 (HRESULT,AddDataBlock,void *,pDataBlock) \
+ ICOM_METHOD2 (HRESULT,CopyDataBlock,DWORD,dwSig,void **,ppDataBlock) \
+ ICOM_METHOD1 (HRESULT,RemoveDataBlock,DWORD,dwSig) \
+ ICOM_METHOD1 (HRESULT,GetFlags,DWORD *,pdwFlags) \
+ ICOM_METHOD1 (HRESULT,SetFlags,DWORD,dwFlags)
+
/*** IUnknown methods ***/
#define IShellLinkDataList_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IShellLinkDataList_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -110,7 +115,7 @@
HRESULT CALLBACK IShellLinkDataList_AddDataBlock_Proxy(
IShellLinkDataList* This,
- void* pDataBlock);
+ void *pDataBlock);
void __RPC_STUB IShellLinkDataList_AddDataBlock_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
@@ -119,7 +124,7 @@
HRESULT CALLBACK IShellLinkDataList_CopyDataBlock_Proxy(
IShellLinkDataList* This,
DWORD dwSig,
- void** ppDataBlock);
+ void **ppDataBlock);
void __RPC_STUB IShellLinkDataList_CopyDataBlock_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
@@ -135,7 +140,7 @@
DWORD* pdwStubPhase);
HRESULT CALLBACK IShellLinkDataList_GetFlags_Proxy(
IShellLinkDataList* This,
- DWORD* pdwFlags);
+ DWORD *pdwFlags);
void __RPC_STUB IShellLinkDataList_GetFlags_Stub(
IRpcStubBuffer* This,
IRpcChannelBuffer* pRpcChannelBuffer,
Index: urlmon.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/urlmon.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- urlmon.h 2 Apr 2004 03:03:08 -0000 1.3
+++ urlmon.h 14 Dec 2007 20:23:38 -0000 1.4
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.1 from urlmon.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from urlmon.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -8,20 +8,59 @@
extern "C" {
#endif
typedef unsigned long HANDLE_PTR;
+#include <objidl.h>
+#include <oleidl.h>
[...5830 lines suppressed...]
+unsigned char * __RPC_USER HMETAFILEPICT_UserUnmarshal(ULONG *, unsigned char *, HMETAFILEPICT *);
+void __RPC_USER HMETAFILEPICT_UserFree (ULONG *, HMETAFILEPICT *);
+ULONG __RPC_USER HENHMETAFILE_UserSize (ULONG *, ULONG, HENHMETAFILE *);
+unsigned char * __RPC_USER HENHMETAFILE_UserMarshal (ULONG *, unsigned char *, HENHMETAFILE *);
+unsigned char * __RPC_USER HENHMETAFILE_UserUnmarshal(ULONG *, unsigned char *, HENHMETAFILE *);
+void __RPC_USER HENHMETAFILE_UserFree (ULONG *, HENHMETAFILE *);
+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 *);
+
+/* End additional prototypes */
+
#ifdef __cplusplus
}
#endif