From: <kti...@us...> - 2013-08-07 12:41:10
|
Revision: 6035 http://sourceforge.net/p/mingw-w64/code/6035 Author: ktietz70 Date: 2013-08-07 12:41:03 +0000 (Wed, 07 Aug 2013) Log Message: ----------- add servprov.idl file for existing servprov.h header, and improve. Modified Paths: -------------- trunk/mingw-w64-headers/Makefile.am trunk/mingw-w64-headers/include/servprov.h Added Paths: ----------- trunk/mingw-w64-headers/include/servprov.idl Modified: trunk/mingw-w64-headers/Makefile.am =================================================================== --- trunk/mingw-w64-headers/Makefile.am 2013-08-07 11:42:45 UTC (rev 6034) +++ trunk/mingw-w64-headers/Makefile.am 2013-08-07 12:41:03 UTC (rev 6035) @@ -60,6 +60,7 @@ IDL_SRCS = \ include/activation.idl \ include/activaut.idl \ + include/activprof.idl \ include/activscp.idl \ include/audioclient.idl \ include/audiopolicy.idl \ @@ -94,6 +95,7 @@ include/propidl.idl \ include/propsys.idl \ include/sensorsapi.idl \ + include/servprov.idl \ include/shobjidl.idl \ include/shtypes.idl \ include/strmif.idl \ Modified: trunk/mingw-w64-headers/include/servprov.h =================================================================== --- trunk/mingw-w64-headers/include/servprov.h 2013-08-07 11:42:45 UTC (rev 6034) +++ trunk/mingw-w64-headers/include/servprov.h 2013-08-07 12:41:03 UTC (rev 6035) @@ -1,103 +1,180 @@ -/** - * 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. - */ +/*** Autogenerated by WIDL 1.5.29 from servprov.idl - Do not edit ***/ + #ifndef __REQUIRED_RPCNDR_H_VERSION__ -#define __REQUIRED_RPCNDR_H_VERSION__ 440 +#define __REQUIRED_RPCNDR_H_VERSION__ 475 #endif -#include <_mingw.h> -#include "rpc.h" -#include "rpcndr.h" +#include <rpc.h> +#include <rpcndr.h> -#ifndef __RPCNDR_H_VERSION__ -#error This stub requires an updated version of <rpcndr.h> -#endif - #ifndef COM_NO_WINDOWS_H -#include "windows.h" -#include "ole2.h" +#include <windows.h> +#include <ole2.h> #endif #ifndef __servprov_h__ #define __servprov_h__ +/* Forward declarations */ + #ifndef __IServiceProvider_FWD_DEFINED__ #define __IServiceProvider_FWD_DEFINED__ -typedef struct IServiceProvider IServiceProvider; +typedef interface IServiceProvider IServiceProvider; #endif -#include "objidl.h" +/* Headers for imported files */ +#include <objidl.h> + #ifdef __cplusplus extern "C" { #endif -#ifndef __MIDL_user_allocate_free_DEFINED__ -#define __MIDL_user_allocate_free_DEFINED__ - void *__RPC_API MIDL_user_allocate(size_t); - void __RPC_API MIDL_user_free(void *); +/** + * 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_DESKTOP) + + +#ifndef __IServiceProvider_FWD_DEFINED__ +#define __IServiceProvider_FWD_DEFINED__ +typedef interface IServiceProvider IServiceProvider; #endif - extern RPC_IF_HANDLE __MIDL_itf_servprov_0000_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_servprov_0000_v0_0_s_ifspec; +/***************************************************************************** + * IServiceProvider interface + */ #ifndef __IServiceProvider_INTERFACE_DEFINED__ #define __IServiceProvider_INTERFACE_DEFINED__ - typedef IServiceProvider *LPSERVICEPROVIDER; +typedef IServiceProvider *LPSERVICEPROVIDER; #if defined(__cplusplus) && !defined(CINTERFACE) - EXTERN_C const IID IID_IServiceProvider; - extern "C++" { - struct IServiceProvider : public IUnknown { - public: - virtual HRESULT WINAPI QueryService(REFGUID guidService,REFIID riid,void **ppvObject) = 0; -#ifndef __STRICT_ANSI__ - template <class Q> HRESULT WINAPI QueryService(REFGUID guidService,Q **pp) { return QueryService(guidService,__uuidof(*pp),(void **)pp); } -#endif - }; - } - HRESULT WINAPI IServiceProvider_RemoteQueryService_Proxy(IServiceProvider *This,REFGUID guidService,REFIID riid,IUnknown **ppvObject); - void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); -#else - EXTERN_C const IID IID_IServiceProvider; -#if defined(__cplusplus) && !defined(CINTERFACE) - struct IServiceProvider : public IUnknown { +EXTERN_C const IID IID_IServiceProvider; +extern "C++" { + MIDL_INTERFACE("6d5140c1-7436-11ce-8034-00aa006009fa") + IServiceProvider : public IUnknown { public: - virtual HRESULT WINAPI QueryService(REFGUID guidService,REFIID riid,void **ppvObject) = 0; + virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) = 0; + + template <class Q> +HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, Q **pp) { + return QueryService(guidService, __uuidof(Q), (void **)pp); + } }; +} + +HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy(IServiceProvider __RPC_FAR *This, REFGUID guidService, REFIID riid, IUnknown __RPC_FAR *__RPC_FAR *ppvObject); +void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase); #else - typedef struct IServiceProviderVtbl { +DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa); +#if defined(__cplusplus) && !defined(CINTERFACE) +MIDL_INTERFACE("6d5140c1-7436-11ce-8034-00aa006009fa") +IServiceProvider : public IUnknown +{ + virtual HRESULT STDMETHODCALLTYPE QueryService( + REFGUID guidService, + REFIID riid, + void **ppvObject) = 0; + +}; +#ifdef __CRT_UUID_DECL +__CRT_UUID_DECL(IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa) +#endif +#else +typedef struct IServiceProviderVtbl { BEGIN_INTERFACE - HRESULT (WINAPI *QueryInterface)(IServiceProvider *This,REFIID riid,void **ppvObject); - ULONG (WINAPI *AddRef)(IServiceProvider *This); - ULONG (WINAPI *Release)(IServiceProvider *This); - HRESULT (WINAPI *QueryService)(IServiceProvider *This,REFGUID guidService,REFIID riid,void **ppvObject); + + /*** IUnknown methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryInterface)( + IServiceProvider* This, + REFIID riid, + void **ppvObject); + + ULONG (STDMETHODCALLTYPE *AddRef)( + IServiceProvider* This); + + ULONG (STDMETHODCALLTYPE *Release)( + IServiceProvider* This); + + /*** IServiceProvider methods ***/ + HRESULT (STDMETHODCALLTYPE *QueryService)( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + void **ppvObject); + END_INTERFACE - } IServiceProviderVtbl; - struct IServiceProvider { - CONST_VTBL struct IServiceProviderVtbl *lpVtbl; - }; +} IServiceProviderVtbl; +interface IServiceProvider { + CONST_VTBL IServiceProviderVtbl* lpVtbl; +}; + #ifdef COBJMACROS +#ifndef WIDL_C_INLINE_WRAPPERS +/*** IUnknown methods ***/ #define IServiceProvider_QueryInterface(This,riid,ppvObject) (This)->lpVtbl->QueryInterface(This,riid,ppvObject) #define IServiceProvider_AddRef(This) (This)->lpVtbl->AddRef(This) #define IServiceProvider_Release(This) (This)->lpVtbl->Release(This) +/*** IServiceProvider methods ***/ #define IServiceProvider_QueryService(This,guidService,riid,ppvObject) (This)->lpVtbl->QueryService(This,guidService,riid,ppvObject) +#else +/*** IUnknown methods ***/ +static FORCEINLINE HRESULT IServiceProvider_QueryInterface(IServiceProvider* This,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryInterface(This,riid,ppvObject); +} +static FORCEINLINE ULONG IServiceProvider_AddRef(IServiceProvider* This) { + return This->lpVtbl->AddRef(This); +} +static FORCEINLINE ULONG IServiceProvider_Release(IServiceProvider* This) { + return This->lpVtbl->Release(This); +} +/*** IServiceProvider methods ***/ +static FORCEINLINE HRESULT IServiceProvider_QueryService(IServiceProvider* This,REFGUID guidService,REFIID riid,void **ppvObject) { + return This->lpVtbl->QueryService(This,guidService,riid,ppvObject); +} #endif #endif - HRESULT WINAPI IServiceProvider_RemoteQueryService_Proxy(IServiceProvider *This,REFGUID guidService,REFIID riid,IUnknown **ppvObject); - void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This,IRpcChannelBuffer *_pRpcChannelBuffer,PRPC_MESSAGE _pRpcMessage,DWORD *_pdwStubPhase); + #endif + +HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + IUnknown **ppvObject); +void __RPC_STUB IServiceProvider_RemoteQueryService_Stub( + IRpcStubBuffer* This, + IRpcChannelBuffer* pRpcChannelBuffer, + PRPC_MESSAGE pRpcMessage, + DWORD* pdwStubPhase); +HRESULT CALLBACK IServiceProvider_QueryService_Proxy( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + void **ppvObject); +HRESULT __RPC_STUB IServiceProvider_QueryService_Stub( + IServiceProvider* This, + REFGUID guidService, + REFIID riid, + IUnknown **ppvObject); + +#endif /* __IServiceProvider_INTERFACE_DEFINED__ */ + #endif - extern RPC_IF_HANDLE __MIDL_itf_servprov_0093_v0_0_c_ifspec; - extern RPC_IF_HANDLE __MIDL_itf_servprov_0093_v0_0_s_ifspec; +#endif +/* Begin additional prototypes for all interfaces */ - HRESULT WINAPI IServiceProvider_QueryService_Proxy(IServiceProvider *This,REFGUID guidService,REFIID riid,void **ppvObject); - HRESULT WINAPI IServiceProvider_QueryService_Stub(IServiceProvider *This,REFGUID guidService,REFIID riid,IUnknown **ppvObject); +/* End additional prototypes */ + #ifdef __cplusplus } #endif -#endif + +#endif /* __servprov_h__ */ Added: trunk/mingw-w64-headers/include/servprov.idl =================================================================== --- trunk/mingw-w64-headers/include/servprov.idl (rev 0) +++ trunk/mingw-w64-headers/include/servprov.idl 2013-08-07 12:41:03 UTC (rev 6035) @@ -0,0 +1,43 @@ +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("") +cpp_quote("#include <winapifamily.h>") +cpp_quote("") +cpp_quote("#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)") +cpp_quote("") + +import "objidl.idl"; + +cpp_quote("") +interface IServiceProvider; + +cpp_quote("") +[object, uuid (6d5140c1-7436-11ce-8034-00aa006009fa), pointer_default (unique)] +interface IServiceProvider : IUnknown { + typedef [unique] IServiceProvider *LPSERVICEPROVIDER; + cpp_quote("#if defined(__cplusplus) && !defined(CINTERFACE)") + cpp_quote("EXTERN_C const IID IID_IServiceProvider;") + cpp_quote("extern \"C++\" {") + cpp_quote(" MIDL_INTERFACE(\"6d5140c1-7436-11ce-8034-00aa006009fa\")") + cpp_quote(" IServiceProvider : public IUnknown {") + cpp_quote(" public:") + cpp_quote(" virtual HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) = 0;") + cpp_quote("") + cpp_quote(" template <class Q>") + cpp_quote("HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, Q **pp) {") + cpp_quote(" return QueryService(guidService, __uuidof(Q), (void **)pp);") + cpp_quote(" }") + cpp_quote(" };") + cpp_quote("}") + cpp_quote("") + cpp_quote("HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy(IServiceProvider __RPC_FAR *This, REFGUID guidService, REFIID riid, IUnknown __RPC_FAR *__RPC_FAR *ppvObject);") + cpp_quote("void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);") + cpp_quote("#else") + [local] HRESULT QueryService ([in] REFGUID guidService,[in] REFIID riid,[out] void **ppvObject); + [call_as (QueryService)] HRESULT RemoteQueryService ([in] REFGUID guidService,[in] REFIID riid,[out, iid_is (riid)] IUnknown **ppvObject); +} +cpp_quote("#endif") +cpp_quote("") +cpp_quote("#endif") Property changes on: trunk/mingw-w64-headers/include/servprov.idl ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |