[Mingw-w64-svn] SF.net SVN: mingw-w64:[6175] trunk/mingw-w64-headers/include

[<kti...@us...>]

Revision: 6175
          http://sourceforge.net/p/mingw-w64/code/6175
Author:   ktietz70
Date:     2013-08-30 14:07:54 +0000 (Fri, 30 Aug 2013)
Log Message:
-----------
Add winapi-family check, and reworked idl-file a bit.

Modified Paths:
--------------
    trunk/mingw-w64-headers/include/servprov.h
    trunk/mingw-w64-headers/include/servprov.idl

Modified: trunk/mingw-w64-headers/include/servprov.h
===================================================================
--- trunk/mingw-w64-headers/include/servprov.h	2013-08-30 13:58:52 UTC (rev 6174)
+++ trunk/mingw-w64-headers/include/servprov.h	2013-08-30 14:07:54 UTC (rev 6175)
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/servprov.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.6 from servprov.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -56,21 +56,20 @@
 #if defined(__cplusplus) && !defined(CINTERFACE)
 EXTERN_C const IID IID_IServiceProvider;
 extern "C++" {
-  MIDL_INTERFACE("6d5140c1-7436-11ce-8034-00aa006009fa")
-  IServiceProvider : public IUnknown {
-  public:
-    virtual  HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void __RPC_FAR *__RPC_FAR *ppvObject) = 0;
+MIDL_INTERFACE("6d5140c1-7436-11ce-8034-00aa006009fa")
+IServiceProvider : public IUnknown {
+public:
+virtual  HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, REFIID riid, void **ppvObject) = 0;
 
-    template <class Q>
+template <class Q>
 HRESULT STDMETHODCALLTYPE QueryService(REFGUID guidService, Q **pp) {
-      return QueryService(guidService, __uuidof(Q), (void **)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);
+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);
-__CRT_UUID_DECL(IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa)
 #else
 DEFINE_GUID(IID_IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa);
 #if defined(__cplusplus) && !defined(CINTERFACE)

Modified: trunk/mingw-w64-headers/include/servprov.idl
===================================================================
--- trunk/mingw-w64-headers/include/servprov.idl	2013-08-30 13:58:52 UTC (rev 6174)
+++ trunk/mingw-w64-headers/include/servprov.idl	2013-08-30 14:07:54 UTC (rev 6175)
@@ -20,21 +20,20 @@
   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("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 **ppvObject) = 0;")
   cpp_quote("")
-  cpp_quote("    template <class Q>")
+  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("  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("HRESULT STDMETHODCALLTYPE IServiceProvider_RemoteQueryService_Proxy(IServiceProvider *This, REFGUID guidService, REFIID riid, IUnknown **ppvObject);")
   cpp_quote("void __RPC_STUB IServiceProvider_RemoteQueryService_Stub(IRpcStubBuffer *This, IRpcChannelBuffer *_pRpcChannelBuffer, PRPC_MESSAGE _pRpcMessage, DWORD *_pdwStubPhase);")
-  cpp_quote("__CRT_UUID_DECL(IServiceProvider, 0x6d5140c1, 0x7436, 0x11ce, 0x80,0x34, 0x00,0xaa,0x00,0x60,0x09,0xfa)")
   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);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.