unknwn.idl: Added proper AsyncIUnknown IDL declaration git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@4708 4407c894-4637-0410-b4f5-ada5f102cad1
diff --git a/mingw-w64-headers/include/unknwn.h b/mingw-w64-headers/include/unknwn.h index 17df876..bccd9e6 100644 --- a/mingw-w64-headers/include/unknwn.h +++ b/mingw-w64-headers/include/unknwn.h
@@ -1,4 +1,4 @@ -/*** Autogenerated by WIDL 1.3.35 from include/unknwn.idl - Do not edit ***/ +/*** Autogenerated by WIDL 1.0 from include/unknwn.idl - Do not edit ***/ #ifndef __REQUIRED_RPCNDR_H_VERSION__ #define __REQUIRED_RPCNDR_H_VERSION__ 475 @@ -22,6 +22,11 @@ typedef interface IUnknown IUnknown; #endif +#ifndef __AsyncIUnknown_FWD_DEFINED__ +#define __AsyncIUnknown_FWD_DEFINED__ +typedef interface AsyncIUnknown AsyncIUnknown; +#endif + #ifndef __IClassFactory_FWD_DEFINED__ #define __IClassFactory_FWD_DEFINED__ typedef interface IClassFactory IClassFactory; @@ -35,13 +40,6 @@ extern "C" { #endif -#ifndef __AsyncIUnknown_FWD_DEFINED__ -#define __AsyncIUnknown_FWD_DEFINED__ -typedef struct AsyncIUnknown AsyncIUnknown; -#endif - extern RPC_IF_HANDLE __MIDL_itf_unknwn_0000_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_unknwn_0000_v0_0_s_ifspec; - #if defined(__cplusplus) && !defined(CINTERFACE) && !defined(__IUnknown_INTERFACE_DEFINED__) #define __IUnknown_INTERFACE_DEFINED__ typedef IUnknown *LPUNKNOWN; @@ -152,42 +150,88 @@ #endif /* __IUnknown_INTERFACE_DEFINED__ */ #endif - extern RPC_IF_HANDLE __MIDL_itf_unknwn_0005_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_unknwn_0005_v0_0_s_ifspec; +/***************************************************************************** + * AsyncIUnknown interface + */ #ifndef __AsyncIUnknown_INTERFACE_DEFINED__ #define __AsyncIUnknown_INTERFACE_DEFINED__ - EXTERN_C const IID IID_AsyncIUnknown; + +DEFINE_GUID(IID_AsyncIUnknown, 0x000e0000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46); #if defined(__cplusplus) && !defined(CINTERFACE) - struct AsyncIUnknown : public IUnknown { - public: - virtual HRESULT WINAPI Begin_QueryInterface(REFIID riid) = 0; - virtual HRESULT WINAPI Finish_QueryInterface(void **ppvObject) = 0; - virtual HRESULT WINAPI Begin_AddRef(void) = 0; - virtual ULONG WINAPI Finish_AddRef(void) = 0; - virtual HRESULT WINAPI Begin_Release(void) = 0; - virtual ULONG WINAPI Finish_Release(void) = 0; - }; +MIDL_INTERFACE("000e0000-0000-0000-c000-000000000046") +AsyncIUnknown : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE Begin_QueryInterface( + REFIID riid) = 0; + + virtual HRESULT STDMETHODCALLTYPE Finish_QueryInterface( + void **ppvObject) = 0; + + virtual HRESULT STDMETHODCALLTYPE Begin_AddRef( + ) = 0; + + virtual ULONG STDMETHODCALLTYPE Finish_AddRef( + ) = 0; + + virtual HRESULT STDMETHODCALLTYPE Begin_Release( + ) = 0; + + virtual ULONG STDMETHODCALLTYPE Finish_Release( + ) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(AsyncIUnknown, 0x000e0000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46) +#endif #else - typedef struct AsyncIUnknownVtbl { +typedef struct AsyncIUnknownVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(AsyncIUnknown *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(AsyncIUnknown *This); - ULONG (WINAPI *Release)(AsyncIUnknown *This); - HRESULT (WINAPI *Begin_QueryInterface)(AsyncIUnknown *This,REFIID riid); - HRESULT (WINAPI *Finish_QueryInterface)(AsyncIUnknown *This,void **ppvObject); - HRESULT (WINAPI *Begin_AddRef)(AsyncIUnknown *This); - ULONG (WINAPI *Finish_AddRef)(AsyncIUnknown *This); - HRESULT (WINAPI *Begin_Release)(AsyncIUnknown *This); - ULONG (WINAPI *Finish_Release)(AsyncIUnknown *This); + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + AsyncIUnknown* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + AsyncIUnknown* This); + + ULONG (STDMETHODCALLTYPE *Release)( + AsyncIUnknown* This); + + /*** AsyncIUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *Begin_QueryInterface)( + AsyncIUnknown* This, + REFIID riid); + + HRESULT (STDMETHODCALLTYPE *Finish_QueryInterface)( + AsyncIUnknown* This, + void **ppvObject); + + HRESULT (STDMETHODCALLTYPE *Begin_AddRef)( + AsyncIUnknown* This); + + ULONG (STDMETHODCALLTYPE *Finish_AddRef)( + AsyncIUnknown* This); + + HRESULT (STDMETHODCALLTYPE *Begin_Release)( + AsyncIUnknown* This); + + ULONG (STDMETHODCALLTYPE *Finish_Release)( + AsyncIUnknown* This); + END_INTERFACE - } AsyncIUnknownVtbl; - struct AsyncIUnknown { - CONST_VTBL struct AsyncIUnknownVtbl *lpVtbl; - }; +} AsyncIUnknownVtbl; +interface AsyncIUnknown { + CONST_VTBL AsyncIUnknownVtbl* lpVtbl; +}; + #ifdef COBJMACROS +/*** IUnknown methods ***/ #define AsyncIUnknown_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define AsyncIUnknown_AddRef(This) (This)->lpVtbl->AddRef(This) #define AsyncIUnknown_Release(This) (This)->lpVtbl->Release(This) +/*** AsyncIUnknown methods ***/ #define AsyncIUnknown_Begin_QueryInterface(This,riid) (This)->lpVtbl->Begin_QueryInterface(This,riid) #define AsyncIUnknown_Finish_QueryInterface(This,ppvObject) (This)->lpVtbl->Finish_QueryInterface(This,ppvObject) #define AsyncIUnknown_Begin_AddRef(This) (This)->lpVtbl->Begin_AddRef(This) @@ -195,20 +239,55 @@ #define AsyncIUnknown_Begin_Release(This) (This)->lpVtbl->Begin_Release(This) #define AsyncIUnknown_Finish_Release(This) (This)->lpVtbl->Finish_Release(This) #endif + #endif - HRESULT WINAPI AsyncIUnknown_Begin_QueryInterface_Proxy(AsyncIUnknown *This,REFIID riid); - void __RPC_STUB AsyncIUnknown_Begin_QueryInterface_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI AsyncIUnknown_Finish_QueryInterface_Proxy(AsyncIUnknown *This,void **ppvObject); - void __RPC_STUB AsyncIUnknown_Finish_QueryInterface_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI AsyncIUnknown_Begin_AddRef_Proxy(AsyncIUnknown *This); - void __RPC_STUB AsyncIUnknown_Begin_AddRef_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - ULONG WINAPI AsyncIUnknown_Finish_AddRef_Proxy(AsyncIUnknown *This); - void __RPC_STUB AsyncIUnknown_Finish_AddRef_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - HRESULT WINAPI AsyncIUnknown_Begin_Release_Proxy(AsyncIUnknown *This); - void __RPC_STUB AsyncIUnknown_Begin_Release_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); - ULONG WINAPI AsyncIUnknown_Finish_Release_Proxy(AsyncIUnknown *This); - void __RPC_STUB AsyncIUnknown_Finish_Release_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); -#endif + +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_QueryInterface_Proxy( + AsyncIUnknown* This, + REFIID riid); +void __RPC_STUB AsyncIUnknown_Begin_QueryInterface_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Finish_QueryInterface_Proxy( + AsyncIUnknown* This, + void **ppvObject); +void __RPC_STUB AsyncIUnknown_Finish_QueryInterface_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_AddRef_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Begin_AddRef_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +ULONG STDMETHODCALLTYPE AsyncIUnknown_Finish_AddRef_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Finish_AddRef_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT STDMETHODCALLTYPE AsyncIUnknown_Begin_Release_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Begin_Release_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +ULONG STDMETHODCALLTYPE AsyncIUnknown_Finish_Release_Proxy( + AsyncIUnknown* This); +void __RPC_STUB AsyncIUnknown_Finish_Release_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); + +#endif /* __AsyncIUnknown_INTERFACE_DEFINED__ */ /***************************************************************************** * IClassFactory interface
diff --git a/mingw-w64-headers/include/unknwn.idl b/mingw-w64-headers/include/unknwn.idl index 8ed2d54..5ad813d 100644 --- a/mingw-w64-headers/include/unknwn.idl +++ b/mingw-w64-headers/include/unknwn.idl
@@ -8,14 +8,6 @@ import "wtypes.idl"; #endif -cpp_quote("#ifndef __AsyncIUnknown_FWD_DEFINED__") -cpp_quote("#define __AsyncIUnknown_FWD_DEFINED__") -cpp_quote("typedef struct AsyncIUnknown AsyncIUnknown;") -cpp_quote("#endif") -cpp_quote(" extern RPC_IF_HANDLE __MIDL_itf_unknwn_0000_v0_0_c_ifspec;") -cpp_quote(" extern RPC_IF_HANDLE __MIDL_itf_unknwn_0000_v0_0_s_ifspec;") -cpp_quote("") - cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE) && !defined(__IUnknown_INTERFACE_DEFINED__)") cpp_quote("#define __IUnknown_INTERFACE_DEFINED__") cpp_quote(" typedef IUnknown *LPUNKNOWN;") @@ -57,64 +49,21 @@ cpp_quote("#endif") -cpp_quote(" extern RPC_IF_HANDLE __MIDL_itf_unknwn_0005_v0_0_c_ifspec;") -cpp_quote(" extern RPC_IF_HANDLE __MIDL_itf_unknwn_0005_v0_0_s_ifspec;") -cpp_quote("#ifndef __AsyncIUnknown_INTERFACE_DEFINED__") -cpp_quote("#define __AsyncIUnknown_INTERFACE_DEFINED__") -cpp_quote(" EXTERN_C const IID IID_AsyncIUnknown;") -cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE)") -cpp_quote(" struct AsyncIUnknown : public IUnknown {") -cpp_quote(" public:") -cpp_quote(" virtual HRESULT WINAPI Begin_QueryInterface(REFIID riid) = 0;") -cpp_quote(" virtual HRESULT WINAPI Finish_QueryInterface(void **ppvObject) = 0;") -cpp_quote(" virtual HRESULT WINAPI Begin_AddRef(void) = 0;") -cpp_quote(" virtual ULONG WINAPI Finish_AddRef(void) = 0;") -cpp_quote(" virtual HRESULT WINAPI Begin_Release(void) = 0;") -cpp_quote(" virtual ULONG WINAPI Finish_Release(void) = 0;") -cpp_quote(" };") -cpp_quote("#else") -cpp_quote(" typedef struct AsyncIUnknownVtbl {") -cpp_quote(" BEGIN_INTERFACE") -cpp_quote(" HRESULT (WINAPI *QueryInterface)(AsyncIUnknown *This,REFIID riid,void **ppvObject);") -cpp_quote(" ULONG (WINAPI *AddRef)(AsyncIUnknown *This);") -cpp_quote(" ULONG (WINAPI *Release)(AsyncIUnknown *This);") -cpp_quote(" HRESULT (WINAPI *Begin_QueryInterface)(AsyncIUnknown *This,REFIID riid);") -cpp_quote(" HRESULT (WINAPI *Finish_QueryInterface)(AsyncIUnknown *This,void **ppvObject);") -cpp_quote(" HRESULT (WINAPI *Begin_AddRef)(AsyncIUnknown *This);") -cpp_quote(" ULONG (WINAPI *Finish_AddRef)(AsyncIUnknown *This);") -cpp_quote(" HRESULT (WINAPI *Begin_Release)(AsyncIUnknown *This);") -cpp_quote(" ULONG (WINAPI *Finish_Release)(AsyncIUnknown *This);") -cpp_quote(" END_INTERFACE") -cpp_quote(" } AsyncIUnknownVtbl;") -cpp_quote(" struct AsyncIUnknown {") -cpp_quote(" CONST_VTBL struct AsyncIUnknownVtbl *lpVtbl;") -cpp_quote(" };") -cpp_quote("#ifdef COBJMACROS") -cpp_quote("#define AsyncIUnknown_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject)") -cpp_quote("#define AsyncIUnknown_AddRef(This) (This)->lpVtbl->AddRef(This)") -cpp_quote("#define AsyncIUnknown_Release(This) (This)->lpVtbl->Release(This)") -cpp_quote("#define AsyncIUnknown_Begin_QueryInterface(This,riid) (This)->lpVtbl->Begin_QueryInterface(This,riid)") -cpp_quote("#define AsyncIUnknown_Finish_QueryInterface(This,ppvObject) (This)->lpVtbl->Finish_QueryInterface(This,ppvObject)") -cpp_quote("#define AsyncIUnknown_Begin_AddRef(This) (This)->lpVtbl->Begin_AddRef(This)") -cpp_quote("#define AsyncIUnknown_Finish_AddRef(This) (This)->lpVtbl->Finish_AddRef(This)") -cpp_quote("#define AsyncIUnknown_Begin_Release(This) (This)->lpVtbl->Begin_Release(This)") -cpp_quote("#define AsyncIUnknown_Finish_Release(This) (This)->lpVtbl->Finish_Release(This)") -cpp_quote("#endif") -cpp_quote("#endif") -cpp_quote(" HRESULT WINAPI AsyncIUnknown_Begin_QueryInterface_Proxy(AsyncIUnknown *This,REFIID riid);") -cpp_quote(" void __RPC_STUB AsyncIUnknown_Begin_QueryInterface_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);") -cpp_quote(" HRESULT WINAPI AsyncIUnknown_Finish_QueryInterface_Proxy(AsyncIUnknown *This,void **ppvObject);") -cpp_quote(" void __RPC_STUB AsyncIUnknown_Finish_QueryInterface_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);") -cpp_quote(" HRESULT WINAPI AsyncIUnknown_Begin_AddRef_Proxy(AsyncIUnknown *This);") -cpp_quote(" void __RPC_STUB AsyncIUnknown_Begin_AddRef_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);") -cpp_quote(" ULONG WINAPI AsyncIUnknown_Finish_AddRef_Proxy(AsyncIUnknown *This);") -cpp_quote(" void __RPC_STUB AsyncIUnknown_Finish_AddRef_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);") -cpp_quote(" HRESULT WINAPI AsyncIUnknown_Begin_Release_Proxy(AsyncIUnknown *This);") -cpp_quote(" void __RPC_STUB AsyncIUnknown_Begin_Release_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);") -cpp_quote(" ULONG WINAPI AsyncIUnknown_Finish_Release_Proxy(AsyncIUnknown *This);") -cpp_quote(" void __RPC_STUB AsyncIUnknown_Finish_Release_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);") -cpp_quote("#endif") -cpp_quote("") +[ + local, + object, + uuid(000e0000-0000-0000-C000-000000000046), + pointer_default(unique) +] +interface AsyncIUnknown : IUnknown +{ + HRESULT Begin_QueryInterface([in] REFIID riid); + HRESULT Finish_QueryInterface([out] void **ppvObject); + HRESULT Begin_AddRef(); + ULONG Finish_AddRef(); + HRESULT Begin_Release(); + ULONG Finish_Release(); +} [ object,