Use base-header instead

git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@6085 4407c894-4637-0410-b4f5-ada5f102cad1
This commit is contained in:
Kai Tietz 2013-08-18 16:02:09 +00:00
parent 061154a5a0
commit 573c861fef
2 changed files with 58 additions and 114 deletions

View File

@ -1,4 +1,4 @@
/*** Autogenerated by WIDL 1.5.25 from include/unknwn.idl - Do not edit ***/
/*** Autogenerated by WIDL 1.6 from unknwn.idl - Do not edit ***/
#ifndef __REQUIRED_RPCNDR_H_VERSION__
#define __REQUIRED_RPCNDR_H_VERSION__ 475
@ -40,31 +40,19 @@ typedef interface IClassFactory IClassFactory;
extern "C" {
#endif
#if defined(__cplusplus) && !defined(CINTERFACE) && !defined(__IUnknown_INTERFACE_DEFINED__)
#define __IUnknown_INTERFACE_DEFINED__
typedef IUnknown *LPUNKNOWN;
EXTERN_C const IID IID_IUnknown;
extern "C++" {
struct IUnknown {
public:
BEGIN_INTERFACE
virtual HRESULT WINAPI QueryInterface(REFIID riid,void **ppvObject) = 0;
virtual ULONG WINAPI AddRef(void) = 0;
virtual ULONG WINAPI Release(void) = 0;
#ifndef __STRICT_ANSI__
template<class Q> HRESULT WINAPI QueryInterface(Q **pp) { return QueryInterface(__uuidof(*pp),(void **)pp); }
#endif
END_INTERFACE
};
}
HRESULT WINAPI IUnknown_QueryInterface_Proxy(IUnknown *This,REFIID riid,void **ppvObject);
void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);
ULONG WINAPI IUnknown_AddRef_Proxy(IUnknown *This);
void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);
ULONG WINAPI IUnknown_Release_Proxy(IUnknown *This);
void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);
__CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46)
#else
/**
* This file is part of the mingw-w64 runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package.
*/
/**
* This file is part of the mingw-w64 runtime package.
* No warranty is given; refer to the file DISCLAIMER within this package.
*/
#include <winapifamily.h>
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
/*****************************************************************************
* IUnknown interface
*/
@ -72,6 +60,34 @@ __CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,
#define __IUnknown_INTERFACE_DEFINED__
typedef IUnknown *LPUNKNOWN;
#if defined(__cplusplus) && !defined(CINTERFACE)
EXTERN_C const IID IID_IUnknown;
extern "C++" {
MIDL_INTERFACE("00000000-0000-0000-C000-000000000046")
IUnknown {
public:
BEGIN_INTERFACE
virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void **ppvObject) = 0;
virtual ULONG STDMETHODCALLTYPE AddRef(void) = 0;
virtual ULONG STDMETHODCALLTYPE Release(void) = 0;
template<class Q>
HRESULT STDMETHODCALLTYPE QueryInterface(Q **pp) {
return QueryInterface(__uuidof(Q), (void **)pp);
}
END_INTERFACE
};
}
__CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46)
HRESULT STDMETHODCALLTYPE IUnknown_QueryInterface_Proxy(IUnknown *This, REFIID riid, void **ppvObject);
void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
ULONG STDMETHODCALLTYPE IUnknown_AddRef_Proxy(IUnknown *This);
void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
ULONG STDMETHODCALLTYPE IUnknown_Release_Proxy(IUnknown *This);
void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);
#else
DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
#if defined(__cplusplus) && !defined(CINTERFACE)
MIDL_INTERFACE("00000000-0000-0000-c000-000000000046")
@ -165,6 +181,9 @@ void __RPC_STUB IUnknown_Release_Stub(
#endif /* __IUnknown_INTERFACE_DEFINED__ */
#endif
#endif
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
/*****************************************************************************
* AsyncIUnknown interface
*/
@ -336,6 +355,9 @@ void __RPC_STUB AsyncIUnknown_Finish_Release_Stub(
#endif /* __AsyncIUnknown_INTERFACE_DEFINED__ */
#endif
#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
/*****************************************************************************
* IClassFactory interface
*/
@ -343,6 +365,7 @@ void __RPC_STUB AsyncIUnknown_Finish_Release_Stub(
#define __IClassFactory_INTERFACE_DEFINED__
typedef IClassFactory *LPCLASSFACTORY;
DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
#if defined(__cplusplus) && !defined(CINTERFACE)
MIDL_INTERFACE("00000001-0000-0000-c000-000000000046")
@ -434,7 +457,7 @@ void __RPC_STUB IClassFactory_RemoteCreateInstance_Stub(
IRpcChannelBuffer* pRpcChannelBuffer,
PRPC_MESSAGE pRpcMessage,
DWORD* pdwStubPhase);
HRESULT STDMETHODCALLTYPE IClassFactory_RemoteLockServer_Proxy(
HRESULT __stdcall IClassFactory_RemoteLockServer_Proxy(
IClassFactory* This,
WINBOOL fLock);
void __RPC_STUB IClassFactory_RemoteLockServer_Stub(
@ -460,6 +483,7 @@ HRESULT __RPC_STUB IClassFactory_LockServer_Stub(
#endif /* __IClassFactory_INTERFACE_DEFINED__ */
#endif
/* Begin additional prototypes for all interfaces */

View File

@ -1,92 +1,12 @@
/**
* This file has no copyright assigned and is placed in the Public Domain.
* This file is part of the mingw-w64 runtime package.
* No warranty is given; refer to the file DISCLAIMER.PD within this package.
*/
cpp_quote("/**")
cpp_quote(" * This file is part of the mingw-w64 runtime package.")
cpp_quote(" * No warranty is given; refer to the file DISCLAIMER within this package.")
cpp_quote(" */")
cpp_quote("")
#ifndef DO_NO_IMPORTS
import "wtypes.idl";
#endif
cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE) && !defined(__IUnknown_INTERFACE_DEFINED__)")
cpp_quote("#define __IUnknown_INTERFACE_DEFINED__")
cpp_quote(" typedef IUnknown *LPUNKNOWN;")
cpp_quote(" EXTERN_C const IID IID_IUnknown;")
cpp_quote(" extern \"C++\" {")
cpp_quote(" struct IUnknown {")
cpp_quote(" public:")
cpp_quote(" BEGIN_INTERFACE")
cpp_quote(" virtual HRESULT WINAPI QueryInterface(REFIID riid,void **ppvObject) = 0;")
cpp_quote(" virtual ULONG WINAPI AddRef(void) = 0;")
cpp_quote(" virtual ULONG WINAPI Release(void) = 0;")
cpp_quote("#ifndef __STRICT_ANSI__")
cpp_quote(" template<class Q> HRESULT WINAPI QueryInterface(Q **pp) { return QueryInterface(__uuidof(*pp),(void **)pp); }")
cpp_quote("#endif")
cpp_quote(" END_INTERFACE")
cpp_quote(" };")
cpp_quote(" }")
cpp_quote(" HRESULT WINAPI IUnknown_QueryInterface_Proxy(IUnknown *This,REFIID riid,void **ppvObject);")
cpp_quote(" void __RPC_STUB IUnknown_QueryInterface_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);")
cpp_quote(" ULONG WINAPI IUnknown_AddRef_Proxy(IUnknown *This);")
cpp_quote(" void __RPC_STUB IUnknown_AddRef_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);")
cpp_quote(" ULONG WINAPI IUnknown_Release_Proxy(IUnknown *This);")
cpp_quote(" void __RPC_STUB IUnknown_Release_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase);")
cpp_quote("__CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46)")
cpp_quote("#else")
[
local,
object,
uuid(00000000-0000-0000-C000-000000000046),
pointer_default(unique)
]
interface IUnknown
{
typedef [unique] IUnknown *LPUNKNOWN;
HRESULT QueryInterface([in] REFIID riid, [out, iid_is(riid)] void **ppvObject);
ULONG AddRef();
ULONG Release();
}
cpp_quote("#endif")
[
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,
uuid(00000001-0000-0000-C000-000000000046),
pointer_default(unique)
]
interface IClassFactory : IUnknown
{
typedef [unique] IClassFactory *LPCLASSFACTORY;
[local]
HRESULT CreateInstance(
[in, unique] IUnknown *pUnkOuter,
[in] REFIID riid,
[out, iid_is(riid)] void **ppvObject);
[call_as(CreateInstance)]
HRESULT RemoteCreateInstance(
[in] REFIID riid,
[out, iid_is(riid)] IUnknown **ppvObject);
[local] HRESULT LockServer([in] BOOL fLock);
[call_as(LockServer)] HRESULT RemoteLockServer([in] BOOL fLock);
}
#define BUILDING_UNKNWN_IDL
#include "unknwnbase.idl"