CVS: winex/include objbase.h, 1.11, 1.12 objidl.h, 1.3, 1.4 unknwn.h, 1.2, 1.3
[email protected] 14 Dec 2007 20:23:05 -0000
| Newsgroups | gmane.comp.emulators.winex.cvs |
|---|---|
| Message-ID | <[email protected]> |
Subject: winex/include objbase.h,1.11,1.12 objidl.h,1.3,1.4 unknwn.h,1.2,1.3Update of /var/lib/cvsd/cvsroot/winex/include
In directory agravaine:/tmp/cvs-serv15861/include
Modified Files:
objbase.h objidl.h unknwn.h
Log Message:
Compiled unknwn.idl and objidl.idl with the new widl.
Index: objbase.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/objbase.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- objbase.h 14 Dec 2007 20:22:49 -0000 1.11
+++ objbase.h 14 Dec 2007 20:23:02 -0000 1.12
@@ -631,6 +631,15 @@
#endif /* __cplusplus && !CINTERFACE */
+#ifndef __IRpcStubBuffer_FWD_DEFINED__
+#define __IRpcStubBuffer_FWD_DEFINED__
+typedef interface IRpcStubBuffer IRpcStubBuffer;
+#endif
+#ifndef __IRpcChannelBuffer_FWD_DEFINED__
+#define __IRpcChannelBuffer_FWD_DEFINED__
+typedef interface IRpcChannelBuffer IRpcChannelBuffer;
+#endif
+
#ifndef RC_INVOKED
/* For compatibility only, at least for now */
#include <stdlib.h>
Index: objidl.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/objidl.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- objidl.h 1 Apr 2004 13:40:14 -0000 1.3
+++ objidl.h 14 Dec 2007 20:23:03 -0000 1.4
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.1 from objidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from objidl.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -7,17 +7,48 @@
#ifdef __cplusplus
extern "C" {
#endif
-#include "unknwn.h"
-typedef struct IStream IStream;
[...12150 lines suppressed...]
+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 FLAG_STGMEDIUM_UserSize (ULONG *, ULONG, FLAG_STGMEDIUM *);
+unsigned char * __RPC_USER FLAG_STGMEDIUM_UserMarshal (ULONG *, unsigned char *, FLAG_STGMEDIUM *);
+unsigned char * __RPC_USER FLAG_STGMEDIUM_UserUnmarshal(ULONG *, unsigned char *, FLAG_STGMEDIUM *);
+void __RPC_USER FLAG_STGMEDIUM_UserFree (ULONG *, FLAG_STGMEDIUM *);
+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 *);
+
+/* End additional prototypes */
+
#ifdef __cplusplus
}
#endif
Index: unknwn.h
===================================================================
RCS file: /var/lib/cvsd/cvsroot/winex/include/unknwn.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- unknwn.h 1 Apr 2004 13:36:02 -0000 1.2
+++ unknwn.h 14 Dec 2007 20:23:03 -0000 1.3
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 0.1 from unknwn.idl - Do not edit ***/
+/*** Autogenerated by WIDL 20020228 from unknwn.idl - Do not edit ***/
#include <rpc.h>
#include <rpcndr.h>
@@ -7,7 +7,7 @@
#ifdef __cplusplus
extern "C" {
#endif
-#include "wtypes.h"
+#include <wtypes.h>
#if defined(__cplusplus) && !defined(CINTERFACE)
#ifdef ICOM_USE_COM_INTERFACE_ATTRIBUTE
#define ICOM_COM_INTERFACE_ATTRIBUTE __attribute__((com_interface))
@@ -25,9 +25,12 @@
#define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
#endif
#endif
-typedef struct IUnknown IUnknown;
-typedef IUnknown *LPUNKNOWN;
+#ifndef __IUnknown_FWD_DEFINED__
+#define __IUnknown_FWD_DEFINED__
+typedef interface IUnknown IUnknown;
+#endif
+typedef IUnknown *LPUNKNOWN;
/*****************************************************************************
* IUnknown interface
*/
@@ -36,82 +39,90 @@
DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IUnknown {
+interface IUnknown
+{
+ BEGIN_INTERFACE
- virtual HRESULT CALLBACK QueryInterface(
+ virtual HRESULT STDMETHODCALLTYPE QueryInterface(
REFIID riid,
- void** ppvObject) = 0;
+ void **ppvObject) = 0;
- virtual ULONG CALLBACK AddRef(
+ virtual ULONG STDMETHODCALLTYPE AddRef(
) = 0;
- virtual ULONG CALLBACK Release(
+ virtual ULONG STDMETHODCALLTYPE Release(
) = 0;
-} ICOM_COM_INTERFACE_ATTRIBUTE;
-#else
-typedef struct IUnknownVtbl IUnknownVtbl;
-struct IUnknown {
- const IUnknownVtbl* lpVtbl;
+ END_INTERFACE
};
-struct IUnknownVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
+#else
+typedef struct IUnknownVtbl {
+ BEGIN_INTERFACE
/*** IUnknown methods ***/
- HRESULT (CALLBACK *QueryInterface)(
+ HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IUnknown* This,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
- ULONG (CALLBACK *AddRef)(
+ ULONG (STDMETHODCALLTYPE *AddRef)(
IUnknown* This);
- ULONG (CALLBACK *Release)(
+ ULONG (STDMETHODCALLTYPE *Release)(
IUnknown* This);
+ END_INTERFACE
+} IUnknownVtbl;
+interface IUnknown {
+ CONST_VTBL IUnknownVtbl* lpVtbl;
};
#define IUnknown_IMETHODS \
- ICOM_METHOD2 (HRESULT,QueryInterface,REFIID,riid,void**,ppvObject) \
+ ICOM_METHOD2 (HRESULT,QueryInterface,REFIID,riid,void **,ppvObject) \
ICOM_METHOD (ULONG,AddRef) \
ICOM_METHOD (ULONG,Release)
+#ifdef COBJMACROS
/*** IUnknown methods ***/
#define IUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IUnknown_AddRef(p) (p)->lpVtbl->AddRef(p)
#define IUnknown_Release(p) (p)->lpVtbl->Release(p)
+#endif
#endif
HRESULT CALLBACK IUnknown_QueryInterface_Proxy(
IUnknown* This,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
void __RPC_STUB IUnknown_QueryInterface_Stub(
- struct IRpcStubBuffer* This,
- struct IRpcChannelBuffer* pRpcChannelBuffer,
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
ULONG CALLBACK IUnknown_AddRef_Proxy(
IUnknown* This);
void __RPC_STUB IUnknown_AddRef_Stub(
- struct IRpcStubBuffer* This,
- struct IRpcChannelBuffer* pRpcChannelBuffer,
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
ULONG CALLBACK IUnknown_Release_Proxy(
IUnknown* This);
void __RPC_STUB IUnknown_Release_Stub(
- struct IRpcStubBuffer* This,
- struct IRpcChannelBuffer* pRpcChannelBuffer,
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
#endif /* __IUnknown_INTERFACE_DEFINED__ */
-typedef struct IClassFactory IClassFactory;
-typedef IClassFactory *LPCLASSFACTORY;
+#ifndef __IClassFactory_FWD_DEFINED__
+#define __IClassFactory_FWD_DEFINED__
+typedef interface IClassFactory IClassFactory;
+#endif
+typedef IClassFactory *LPCLASSFACTORY;
/*****************************************************************************
* IClassFactory interface
*/
@@ -120,55 +131,56 @@
DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
#if defined(__cplusplus) && !defined(CINTERFACE)
-struct IClassFactory: IUnknown {
-
- virtual HRESULT CALLBACK CreateInstance(
- IUnknown* pUnkOuter,
+interface IClassFactory : public IUnknown
+{
+ virtual HRESULT STDMETHODCALLTYPE CreateInstance(
+ IUnknown *pUnkOuter,
REFIID riid,
- void** ppvObject) = 0;
+ void **ppvObject) = 0;
- virtual HRESULT CALLBACK LockServer(
+ virtual HRESULT STDMETHODCALLTYPE LockServer(
BOOL fLock) = 0;
-} ICOM_COM_INTERFACE_ATTRIBUTE;
-#else
-typedef struct IClassFactoryVtbl IClassFactoryVtbl;
-struct IClassFactory {
- const IClassFactoryVtbl* lpVtbl;
};
-struct IClassFactoryVtbl {
- ICOM_MSVTABLE_COMPAT_FIELDS
+#else
+typedef struct IClassFactoryVtbl {
+ BEGIN_INTERFACE
/*** IUnknown methods ***/
- HRESULT (CALLBACK *QueryInterface)(
+ HRESULT (STDMETHODCALLTYPE *QueryInterface)(
IClassFactory* This,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
- ULONG (CALLBACK *AddRef)(
+ ULONG (STDMETHODCALLTYPE *AddRef)(
IClassFactory* This);
- ULONG (CALLBACK *Release)(
+ ULONG (STDMETHODCALLTYPE *Release)(
IClassFactory* This);
/*** IClassFactory methods ***/
- HRESULT (CALLBACK *CreateInstance)(
+ HRESULT (STDMETHODCALLTYPE *CreateInstance)(
IClassFactory* This,
- IUnknown* pUnkOuter,
+ IUnknown *pUnkOuter,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
- HRESULT (CALLBACK *LockServer)(
+ HRESULT (STDMETHODCALLTYPE *LockServer)(
IClassFactory* This,
BOOL fLock);
+ END_INTERFACE
+} IClassFactoryVtbl;
+interface IClassFactory {
+ CONST_VTBL IClassFactoryVtbl* lpVtbl;
};
#define IClassFactory_IMETHODS \
IUnknown_IMETHODS \
- ICOM_METHOD3 (HRESULT,CreateInstance,IUnknown*,pUnkOuter,REFIID,riid,void**,ppvObject) \
+ ICOM_METHOD3 (HRESULT,CreateInstance,IUnknown *,pUnkOuter,REFIID,riid,void **,ppvObject) \
ICOM_METHOD1 (HRESULT,LockServer,BOOL,fLock)
+#ifdef COBJMACROS
/*** IUnknown methods ***/
#define IClassFactory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b)
#define IClassFactory_AddRef(p) (p)->lpVtbl->AddRef(p)
@@ -176,33 +188,34 @@
/*** IClassFactory methods ***/
#define IClassFactory_CreateInstance(p,a,b,c) (p)->lpVtbl->CreateInstance(p,a,b,c)
#define IClassFactory_LockServer(p,a) (p)->lpVtbl->LockServer(p,a)
+#endif
#endif
HRESULT CALLBACK IClassFactory_RemoteCreateInstance_Proxy(
IClassFactory* This,
REFIID riid,
- IUnknown** ppvObject);
+ IUnknown **ppvObject);
void __RPC_STUB IClassFactory_RemoteCreateInstance_Stub(
- struct IRpcStubBuffer* This,
- struct IRpcChannelBuffer* pRpcChannelBuffer,
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IClassFactory_CreateInstance_Proxy(
IClassFactory* This,
- IUnknown* pUnkOuter,
+ IUnknown *pUnkOuter,
REFIID riid,
- void** ppvObject);
+ void **ppvObject);
HRESULT __RPC_STUB IClassFactory_CreateInstance_Stub(
IClassFactory* This,
REFIID riid,
- IUnknown** ppvObject);
+ IUnknown **ppvObject);
HRESULT CALLBACK IClassFactory_RemoteLockServer_Proxy(
IClassFactory* This,
BOOL fLock);
void __RPC_STUB IClassFactory_RemoteLockServer_Stub(
- struct IRpcStubBuffer* This,
- struct IRpcChannelBuffer* pRpcChannelBuffer,
+ IRpcStubBuffer* This,
+ IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT CALLBACK IClassFactory_LockServer_Proxy(
@@ -214,6 +227,11 @@
#endif /* __IClassFactory_INTERFACE_DEFINED__ */
+/* Begin additional prototypes for all interfaces */
+
+
+/* End additional prototypes */
+
#ifdef __cplusplus
}
#endif