Regenerate more header files with recent widl.
diff --git a/mingw-w64-headers/include/activation.h b/mingw-w64-headers/include/activation.h
index 38af050..e153da0 100644
--- a/mingw-w64-headers/include/activation.h
+++ b/mingw-w64-headers/include/activation.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/activation.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/activation.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IActivationFactory_FWD_DEFINED__
 #define __IActivationFactory_FWD_DEFINED__
 typedef interface IActivationFactory IActivationFactory;
+#ifdef __cplusplus
+interface IActivationFactory;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -54,37 +57,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActivationFactory* This,
+        IActivationFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActivationFactory* This);
+        IActivationFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActivationFactory* This);
+        IActivationFactory *This);
 
     /*** IInspectable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetIids)(
-        IActivationFactory* This,
+        IActivationFactory *This,
         ULONG *iidCount,
         IID **iids);
 
     HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)(
-        IActivationFactory* This,
+        IActivationFactory *This,
         HSTRING *className);
 
     HRESULT (STDMETHODCALLTYPE *GetTrustLevel)(
-        IActivationFactory* This,
+        IActivationFactory *This,
         TrustLevel *trustLevel);
 
     /*** IActivationFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *ActivateInstance)(
-        IActivationFactory* This,
+        IActivationFactory *This,
         IInspectable **instance);
 
     END_INTERFACE
 } IActivationFactoryVtbl;
+
 interface IActivationFactory {
     CONST_VTBL IActivationFactoryVtbl* lpVtbl;
 };
@@ -131,14 +135,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActivationFactory_ActivateInstance_Proxy(
-    IActivationFactory* This,
-    IInspectable **instance);
-void __RPC_STUB IActivationFactory_ActivateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActivationFactory_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/activaut.h b/mingw-w64-headers/include/activaut.h
index 2299a5d..1f0bd22 100644
--- a/mingw-w64-headers/include/activaut.h
+++ b/mingw-w64-headers/include/activaut.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/activaut.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/activaut.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,26 +20,41 @@
 #ifndef __IScriptNode_FWD_DEFINED__
 #define __IScriptNode_FWD_DEFINED__
 typedef interface IScriptNode IScriptNode;
+#ifdef __cplusplus
+interface IScriptNode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IScriptEntry_FWD_DEFINED__
 #define __IScriptEntry_FWD_DEFINED__
 typedef interface IScriptEntry IScriptEntry;
+#ifdef __cplusplus
+interface IScriptEntry;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IScriptScriptlet_FWD_DEFINED__
 #define __IScriptScriptlet_FWD_DEFINED__
 typedef interface IScriptScriptlet IScriptScriptlet;
+#ifdef __cplusplus
+interface IScriptScriptlet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptAuthor_FWD_DEFINED__
 #define __IActiveScriptAuthor_FWD_DEFINED__
 typedef interface IActiveScriptAuthor IActiveScriptAuthor;
+#ifdef __cplusplus
+interface IActiveScriptAuthor;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptAuthorProcedure_FWD_DEFINED__
 #define __IActiveScriptAuthorProcedure_FWD_DEFINED__
 typedef interface IActiveScriptAuthorProcedure IActiveScriptAuthorProcedure;
+#ifdef __cplusplus
+interface IActiveScriptAuthorProcedure;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -98,21 +113,33 @@
 #ifndef __IActiveScriptAuthor_FWD_DEFINED__
 #define __IActiveScriptAuthor_FWD_DEFINED__
 typedef interface IActiveScriptAuthor IActiveScriptAuthor;
+#ifdef __cplusplus
+interface IActiveScriptAuthor;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IScriptNode_FWD_DEFINED__
 #define __IScriptNode_FWD_DEFINED__
 typedef interface IScriptNode IScriptNode;
+#ifdef __cplusplus
+interface IScriptNode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IScriptEntry_FWD_DEFINED__
 #define __IScriptEntry_FWD_DEFINED__
 typedef interface IScriptEntry IScriptEntry;
+#ifdef __cplusplus
+interface IScriptEntry;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IScriptScriptlet_FWD_DEFINED__
 #define __IScriptScriptlet_FWD_DEFINED__
 typedef interface IScriptScriptlet IScriptScriptlet;
+#ifdef __cplusplus
+interface IScriptScriptlet;
+#endif /* __cplusplus */
 #endif
 
 typedef WORD SOURCE_TEXT_ATTR;
@@ -180,57 +207,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IScriptNode* This,
+        IScriptNode *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IScriptNode* This);
+        IScriptNode *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IScriptNode* This);
+        IScriptNode *This);
 
     /*** IScriptNode methods ***/
     HRESULT (STDMETHODCALLTYPE *Alive)(
-        IScriptNode* This);
+        IScriptNode *This);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IScriptNode* This);
+        IScriptNode *This);
 
     HRESULT (STDMETHODCALLTYPE *GetParent)(
-        IScriptNode* This,
+        IScriptNode *This,
         IScriptNode **ppsnParent);
 
     HRESULT (STDMETHODCALLTYPE *GetIndexInParent)(
-        IScriptNode* This,
+        IScriptNode *This,
         ULONG *pisn);
 
     HRESULT (STDMETHODCALLTYPE *GetCookie)(
-        IScriptNode* This,
+        IScriptNode *This,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)(
-        IScriptNode* This,
+        IScriptNode *This,
         ULONG *pcsn);
 
     HRESULT (STDMETHODCALLTYPE *GetChild)(
-        IScriptNode* This,
+        IScriptNode *This,
         ULONG isn,
         IScriptNode **ppsn);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IScriptNode* This,
+        IScriptNode *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *CreateChildEntry)(
-        IScriptNode* This,
+        IScriptNode *This,
         ULONG isn,
         DWORD dwCookie,
         LPCOLESTR pszDelimiter,
         IScriptEntry **ppse);
 
     HRESULT (STDMETHODCALLTYPE *CreateChildHandler)(
-        IScriptNode* This,
+        IScriptNode *This,
         LPCOLESTR pszDefaultName,
         LPCOLESTR *prgpszNames,
         ULONG cpszNames,
@@ -244,6 +271,7 @@
 
     END_INTERFACE
 } IScriptNodeVtbl;
+
 interface IScriptNode {
     CONST_VTBL IScriptNodeVtbl* lpVtbl;
 };
@@ -312,97 +340,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IScriptNode_Alive_Proxy(
-    IScriptNode* This);
-void __RPC_STUB IScriptNode_Alive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_Delete_Proxy(
-    IScriptNode* This);
-void __RPC_STUB IScriptNode_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_GetParent_Proxy(
-    IScriptNode* This,
-    IScriptNode **ppsnParent);
-void __RPC_STUB IScriptNode_GetParent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_GetIndexInParent_Proxy(
-    IScriptNode* This,
-    ULONG *pisn);
-void __RPC_STUB IScriptNode_GetIndexInParent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_GetCookie_Proxy(
-    IScriptNode* This,
-    DWORD *pdwCookie);
-void __RPC_STUB IScriptNode_GetCookie_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_GetNumberOfChildren_Proxy(
-    IScriptNode* This,
-    ULONG *pcsn);
-void __RPC_STUB IScriptNode_GetNumberOfChildren_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_GetChild_Proxy(
-    IScriptNode* This,
-    ULONG isn,
-    IScriptNode **ppsn);
-void __RPC_STUB IScriptNode_GetChild_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_GetLanguage_Proxy(
-    IScriptNode* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptNode_GetLanguage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_CreateChildEntry_Proxy(
-    IScriptNode* This,
-    ULONG isn,
-    DWORD dwCookie,
-    LPCOLESTR pszDelimiter,
-    IScriptEntry **ppse);
-void __RPC_STUB IScriptNode_CreateChildEntry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptNode_CreateChildHandler_Proxy(
-    IScriptNode* This,
-    LPCOLESTR pszDefaultName,
-    LPCOLESTR *prgpszNames,
-    ULONG cpszNames,
-    LPCOLESTR pszEvent,
-    LPCOLESTR pszDelimiter,
-    ITypeInfo *ptiSignature,
-    ULONG iMethodSignature,
-    ULONG isn,
-    DWORD dwCookie,
-    IScriptEntry **ppse);
-void __RPC_STUB IScriptNode_CreateChildHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IScriptNode_INTERFACE_DEFINED__ */
 
@@ -463,57 +400,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IScriptEntry* This);
+        IScriptEntry *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IScriptEntry* This);
+        IScriptEntry *This);
 
     /*** IScriptNode methods ***/
     HRESULT (STDMETHODCALLTYPE *Alive)(
-        IScriptEntry* This);
+        IScriptEntry *This);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IScriptEntry* This);
+        IScriptEntry *This);
 
     HRESULT (STDMETHODCALLTYPE *GetParent)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         IScriptNode **ppsnParent);
 
     HRESULT (STDMETHODCALLTYPE *GetIndexInParent)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         ULONG *pisn);
 
     HRESULT (STDMETHODCALLTYPE *GetCookie)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         ULONG *pcsn);
 
     HRESULT (STDMETHODCALLTYPE *GetChild)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         ULONG isn,
         IScriptNode **ppsn);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *CreateChildEntry)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         ULONG isn,
         DWORD dwCookie,
         LPCOLESTR pszDelimiter,
         IScriptEntry **ppse);
 
     HRESULT (STDMETHODCALLTYPE *CreateChildHandler)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         LPCOLESTR pszDefaultName,
         LPCOLESTR *prgpszNames,
         ULONG cpszNames,
@@ -527,54 +464,55 @@
 
     /*** IScriptEntry methods ***/
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetText)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetBody)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetBody)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetItemName)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetItemName)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetSignature)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         ITypeInfo **ppti,
         ULONG *piMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetSignature)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         ITypeInfo *pti,
         ULONG iMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetRange)(
-        IScriptEntry* This,
+        IScriptEntry *This,
         ULONG *pichMin,
         ULONG *pcch);
 
     END_INTERFACE
 } IScriptEntryVtbl;
+
 interface IScriptEntry {
     CONST_VTBL IScriptEntryVtbl* lpVtbl;
 };
@@ -689,97 +627,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IScriptEntry_GetText_Proxy(
-    IScriptEntry* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptEntry_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_SetText_Proxy(
-    IScriptEntry* This,
-    LPCOLESTR psz);
-void __RPC_STUB IScriptEntry_SetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_GetBody_Proxy(
-    IScriptEntry* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptEntry_GetBody_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_SetBody_Proxy(
-    IScriptEntry* This,
-    LPCOLESTR psz);
-void __RPC_STUB IScriptEntry_SetBody_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_GetName_Proxy(
-    IScriptEntry* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptEntry_GetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_SetName_Proxy(
-    IScriptEntry* This,
-    LPCOLESTR psz);
-void __RPC_STUB IScriptEntry_SetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_GetItemName_Proxy(
-    IScriptEntry* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptEntry_GetItemName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_SetItemName_Proxy(
-    IScriptEntry* This,
-    LPCOLESTR psz);
-void __RPC_STUB IScriptEntry_SetItemName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_GetSignature_Proxy(
-    IScriptEntry* This,
-    ITypeInfo **ppti,
-    ULONG *piMethod);
-void __RPC_STUB IScriptEntry_GetSignature_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_SetSignature_Proxy(
-    IScriptEntry* This,
-    ITypeInfo *pti,
-    ULONG iMethod);
-void __RPC_STUB IScriptEntry_SetSignature_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptEntry_GetRange_Proxy(
-    IScriptEntry* This,
-    ULONG *pichMin,
-    ULONG *pcch);
-void __RPC_STUB IScriptEntry_GetRange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IScriptEntry_INTERFACE_DEFINED__ */
 
@@ -822,57 +669,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IScriptScriptlet* This);
+        IScriptScriptlet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IScriptScriptlet* This);
+        IScriptScriptlet *This);
 
     /*** IScriptNode methods ***/
     HRESULT (STDMETHODCALLTYPE *Alive)(
-        IScriptScriptlet* This);
+        IScriptScriptlet *This);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IScriptScriptlet* This);
+        IScriptScriptlet *This);
 
     HRESULT (STDMETHODCALLTYPE *GetParent)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         IScriptNode **ppsnParent);
 
     HRESULT (STDMETHODCALLTYPE *GetIndexInParent)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         ULONG *pisn);
 
     HRESULT (STDMETHODCALLTYPE *GetCookie)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *GetNumberOfChildren)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         ULONG *pcsn);
 
     HRESULT (STDMETHODCALLTYPE *GetChild)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         ULONG isn,
         IScriptNode **ppsn);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *CreateChildEntry)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         ULONG isn,
         DWORD dwCookie,
         LPCOLESTR pszDelimiter,
         IScriptEntry **ppse);
 
     HRESULT (STDMETHODCALLTYPE *CreateChildHandler)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR pszDefaultName,
         LPCOLESTR *prgpszNames,
         ULONG cpszNames,
@@ -886,79 +733,80 @@
 
     /*** IScriptEntry methods ***/
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetText)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetBody)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetBody)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetItemName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetItemName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetSignature)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         ITypeInfo **ppti,
         ULONG *piMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetSignature)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         ITypeInfo *pti,
         ULONG iMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetRange)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         ULONG *pichMin,
         ULONG *pcch);
 
     /*** IScriptScriptlet methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSubItemName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetSubItemName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetEventName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetEventName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR psz);
 
     HRESULT (STDMETHODCALLTYPE *GetSimpleEventName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         BSTR *pbstr);
 
     HRESULT (STDMETHODCALLTYPE *SetSimpleEventName)(
-        IScriptScriptlet* This,
+        IScriptScriptlet *This,
         LPCOLESTR psz);
 
     END_INTERFACE
 } IScriptScriptletVtbl;
+
 interface IScriptScriptlet {
     CONST_VTBL IScriptScriptletVtbl* lpVtbl;
 };
@@ -1099,54 +947,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetSubItemName_Proxy(
-    IScriptScriptlet* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptScriptlet_GetSubItemName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetSubItemName_Proxy(
-    IScriptScriptlet* This,
-    LPCOLESTR psz);
-void __RPC_STUB IScriptScriptlet_SetSubItemName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetEventName_Proxy(
-    IScriptScriptlet* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptScriptlet_GetEventName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetEventName_Proxy(
-    IScriptScriptlet* This,
-    LPCOLESTR psz);
-void __RPC_STUB IScriptScriptlet_SetEventName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptScriptlet_GetSimpleEventName_Proxy(
-    IScriptScriptlet* This,
-    BSTR *pbstr);
-void __RPC_STUB IScriptScriptlet_GetSimpleEventName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptScriptlet_SetSimpleEventName_Proxy(
-    IScriptScriptlet* This,
-    LPCOLESTR psz);
-void __RPC_STUB IScriptScriptlet_SetSimpleEventName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IScriptScriptlet_INTERFACE_DEFINED__ */
 
@@ -1254,25 +1054,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptAuthor* This);
+        IActiveScriptAuthor *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptAuthor* This);
+        IActiveScriptAuthor *This);
 
     /*** IActiveScriptAuthor methods ***/
     HRESULT (STDMETHODCALLTYPE *AddNamedItem)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         LPCOLESTR pszName,
         DWORD dwFlags,
         IDispatch *pdisp);
 
     HRESULT (STDMETHODCALLTYPE *AddScriptlet)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         LPCOLESTR pszDefaultName,
         LPCOLESTR pszCode,
         LPCOLESTR pszItemName,
@@ -1283,7 +1083,7 @@
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *ParseScriptText)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         LPCOLESTR pszCode,
         LPCOLESTR pszItemName,
         LPCOLESTR pszDelimiter,
@@ -1291,7 +1091,7 @@
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetScriptTextAttributes)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         LPCOLESTR pszCode,
         ULONG cch,
         LPCOLESTR pszDelimiter,
@@ -1299,7 +1099,7 @@
         SOURCE_TEXT_ATTR *pattr);
 
     HRESULT (STDMETHODCALLTYPE *GetScriptletTextAttributes)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         LPCOLESTR pszCode,
         ULONG cch,
         LPCOLESTR pszDelimiter,
@@ -1307,15 +1107,15 @@
         SOURCE_TEXT_ATTR *pattr);
 
     HRESULT (STDMETHODCALLTYPE *GetRoot)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         IScriptNode **ppsp);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguageFlags)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         DWORD *pgrfasa);
 
     HRESULT (STDMETHODCALLTYPE *GetEventHandler)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         IDispatch *pdisp,
         LPCOLESTR pszItem,
         LPCOLESTR pszSubItem,
@@ -1323,29 +1123,29 @@
         IScriptEntry **ppse);
 
     HRESULT (STDMETHODCALLTYPE *RemoveNamedItem)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         LPCOLESTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *AddTypeLib)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         REFGUID rguidTypeLib,
         DWORD dwMajor,
         DWORD dwMinor,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *RemoveTypeLib)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         REFGUID rguidTypeLib,
         DWORD dwMajor,
         DWORD dwMinor);
 
     HRESULT (STDMETHODCALLTYPE *GetChars)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         DWORD fRequestedList,
         BSTR *pbstrChars);
 
     HRESULT (STDMETHODCALLTYPE *GetInfoFromContext)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         LPCOLESTR pszCode,
         ULONG cchCode,
         ULONG ichCurrentPosition,
@@ -1358,12 +1158,13 @@
         IUnknown **ppunk);
 
     HRESULT (STDMETHODCALLTYPE *IsCommitChar)(
-        IActiveScriptAuthor* This,
+        IActiveScriptAuthor *This,
         OLECHAR ch,
         WINBOOL *pfcommit);
 
     END_INTERFACE
 } IActiveScriptAuthorVtbl;
+
 interface IActiveScriptAuthor {
     CONST_VTBL IActiveScriptAuthorVtbl* lpVtbl;
 };
@@ -1448,159 +1249,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_AddNamedItem_Proxy(
-    IActiveScriptAuthor* This,
-    LPCOLESTR pszName,
-    DWORD dwFlags,
-    IDispatch *pdisp);
-void __RPC_STUB IActiveScriptAuthor_AddNamedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_AddScriptlet_Proxy(
-    IActiveScriptAuthor* This,
-    LPCOLESTR pszDefaultName,
-    LPCOLESTR pszCode,
-    LPCOLESTR pszItemName,
-    LPCOLESTR pszSubItemName,
-    LPCOLESTR pszEventName,
-    LPCOLESTR pszDelimiter,
-    DWORD dwCookie,
-    DWORD dwFlags);
-void __RPC_STUB IActiveScriptAuthor_AddScriptlet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_ParseScriptText_Proxy(
-    IActiveScriptAuthor* This,
-    LPCOLESTR pszCode,
-    LPCOLESTR pszItemName,
-    LPCOLESTR pszDelimiter,
-    DWORD dwCookie,
-    DWORD dwFlags);
-void __RPC_STUB IActiveScriptAuthor_ParseScriptText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetScriptTextAttributes_Proxy(
-    IActiveScriptAuthor* This,
-    LPCOLESTR pszCode,
-    ULONG cch,
-    LPCOLESTR pszDelimiter,
-    DWORD dwFlags,
-    SOURCE_TEXT_ATTR *pattr);
-void __RPC_STUB IActiveScriptAuthor_GetScriptTextAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetScriptletTextAttributes_Proxy(
-    IActiveScriptAuthor* This,
-    LPCOLESTR pszCode,
-    ULONG cch,
-    LPCOLESTR pszDelimiter,
-    DWORD dwFlags,
-    SOURCE_TEXT_ATTR *pattr);
-void __RPC_STUB IActiveScriptAuthor_GetScriptletTextAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetRoot_Proxy(
-    IActiveScriptAuthor* This,
-    IScriptNode **ppsp);
-void __RPC_STUB IActiveScriptAuthor_GetRoot_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetLanguageFlags_Proxy(
-    IActiveScriptAuthor* This,
-    DWORD *pgrfasa);
-void __RPC_STUB IActiveScriptAuthor_GetLanguageFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetEventHandler_Proxy(
-    IActiveScriptAuthor* This,
-    IDispatch *pdisp,
-    LPCOLESTR pszItem,
-    LPCOLESTR pszSubItem,
-    LPCOLESTR pszEvent,
-    IScriptEntry **ppse);
-void __RPC_STUB IActiveScriptAuthor_GetEventHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_RemoveNamedItem_Proxy(
-    IActiveScriptAuthor* This,
-    LPCOLESTR pszName);
-void __RPC_STUB IActiveScriptAuthor_RemoveNamedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_AddTypeLib_Proxy(
-    IActiveScriptAuthor* This,
-    REFGUID rguidTypeLib,
-    DWORD dwMajor,
-    DWORD dwMinor,
-    DWORD dwFlags);
-void __RPC_STUB IActiveScriptAuthor_AddTypeLib_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_RemoveTypeLib_Proxy(
-    IActiveScriptAuthor* This,
-    REFGUID rguidTypeLib,
-    DWORD dwMajor,
-    DWORD dwMinor);
-void __RPC_STUB IActiveScriptAuthor_RemoveTypeLib_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetChars_Proxy(
-    IActiveScriptAuthor* This,
-    DWORD fRequestedList,
-    BSTR *pbstrChars);
-void __RPC_STUB IActiveScriptAuthor_GetChars_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_GetInfoFromContext_Proxy(
-    IActiveScriptAuthor* This,
-    LPCOLESTR pszCode,
-    ULONG cchCode,
-    ULONG ichCurrentPosition,
-    DWORD dwListTypesRequested,
-    DWORD *pdwListTypesProvided,
-    ULONG *pichListAnchorPosition,
-    ULONG *pichFuncAnchorPosition,
-    MEMBERID *pmemid,
-    LONG *piCurrentParameter,
-    IUnknown **ppunk);
-void __RPC_STUB IActiveScriptAuthor_GetInfoFromContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthor_IsCommitChar_Proxy(
-    IActiveScriptAuthor* This,
-    OLECHAR ch,
-    WINBOOL *pfcommit);
-void __RPC_STUB IActiveScriptAuthor_IsCommitChar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptAuthor_INTERFACE_DEFINED__ */
 
@@ -1635,19 +1283,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptAuthorProcedure* This,
+        IActiveScriptAuthorProcedure *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptAuthorProcedure* This);
+        IActiveScriptAuthorProcedure *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptAuthorProcedure* This);
+        IActiveScriptAuthorProcedure *This);
 
     /*** IActiveScriptAuthorProcedure methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseProcedureText)(
-        IActiveScriptAuthorProcedure* This,
+        IActiveScriptAuthorProcedure *This,
         LPCOLESTR pszCode,
         LPCOLESTR pszFormalParams,
         LPCOLESTR pszProcedureName,
@@ -1659,6 +1307,7 @@
 
     END_INTERFACE
 } IActiveScriptAuthorProcedureVtbl;
+
 interface IActiveScriptAuthorProcedure {
     CONST_VTBL IActiveScriptAuthorProcedureVtbl* lpVtbl;
 };
@@ -1691,21 +1340,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptAuthorProcedure_ParseProcedureText_Proxy(
-    IActiveScriptAuthorProcedure* This,
-    LPCOLESTR pszCode,
-    LPCOLESTR pszFormalParams,
-    LPCOLESTR pszProcedureName,
-    LPCOLESTR pszItemName,
-    LPCOLESTR pszDelimiter,
-    DWORD dwCookie,
-    DWORD dwFlags,
-    IDispatch *pdispFor);
-void __RPC_STUB IActiveScriptAuthorProcedure_ParseProcedureText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptAuthorProcedure_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/activdbg100.h b/mingw-w64-headers/include/activdbg100.h
index 25bdaee..1c6d180 100644
--- a/mingw-w64-headers/include/activdbg100.h
+++ b/mingw-w64-headers/include/activdbg100.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/activdbg100.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/activdbg100.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,61 +20,97 @@
 #ifndef __IDebugApplicationNode100_FWD_DEFINED__
 #define __IDebugApplicationNode100_FWD_DEFINED__
 typedef interface IDebugApplicationNode100 IDebugApplicationNode100;
+#ifdef __cplusplus
+interface IDebugApplicationNode100;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWebAppDiagnosticsSetup_FWD_DEFINED__
 #define __IWebAppDiagnosticsSetup_FWD_DEFINED__
 typedef interface IWebAppDiagnosticsSetup IWebAppDiagnosticsSetup;
+#ifdef __cplusplus
+interface IWebAppDiagnosticsSetup;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRemoteDebugApplication110_FWD_DEFINED__
 #define __IRemoteDebugApplication110_FWD_DEFINED__
 typedef interface IRemoteDebugApplication110 IRemoteDebugApplication110;
+#ifdef __cplusplus
+interface IRemoteDebugApplication110;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugApplication11032_FWD_DEFINED__
 #define __IDebugApplication11032_FWD_DEFINED__
 typedef interface IDebugApplication11032 IDebugApplication11032;
+#ifdef __cplusplus
+interface IDebugApplication11032;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugApplication11064_FWD_DEFINED__
 #define __IDebugApplication11064_FWD_DEFINED__
 typedef interface IDebugApplication11064 IDebugApplication11064;
+#ifdef __cplusplus
+interface IDebugApplication11064;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWebAppDiagnosticsObjectInitialization_FWD_DEFINED__
 #define __IWebAppDiagnosticsObjectInitialization_FWD_DEFINED__
 typedef interface IWebAppDiagnosticsObjectInitialization IWebAppDiagnosticsObjectInitialization;
+#ifdef __cplusplus
+interface IWebAppDiagnosticsObjectInitialization;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptWinRTErrorDebug_FWD_DEFINED__
 #define __IActiveScriptWinRTErrorDebug_FWD_DEFINED__
 typedef interface IActiveScriptWinRTErrorDebug IActiveScriptWinRTErrorDebug;
+#ifdef __cplusplus
+interface IActiveScriptWinRTErrorDebug;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptErrorDebug110_FWD_DEFINED__
 #define __IActiveScriptErrorDebug110_FWD_DEFINED__
 typedef interface IActiveScriptErrorDebug110 IActiveScriptErrorDebug110;
+#ifdef __cplusplus
+interface IActiveScriptErrorDebug110;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugApplicationThreadEvents110_FWD_DEFINED__
 #define __IDebugApplicationThreadEvents110_FWD_DEFINED__
 typedef interface IDebugApplicationThreadEvents110 IDebugApplicationThreadEvents110;
+#ifdef __cplusplus
+interface IDebugApplicationThreadEvents110;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugApplicationThread11032_FWD_DEFINED__
 #define __IDebugApplicationThread11032_FWD_DEFINED__
 typedef interface IDebugApplicationThread11032 IDebugApplicationThread11032;
+#ifdef __cplusplus
+interface IDebugApplicationThread11032;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugApplicationThread11064_FWD_DEFINED__
 #define __IDebugApplicationThread11064_FWD_DEFINED__
 typedef interface IDebugApplicationThread11064 IDebugApplicationThread11064;
+#ifdef __cplusplus
+interface IDebugApplicationThread11064;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRemoteDebugCriticalErrorEvent110_FWD_DEFINED__
 #define __IRemoteDebugCriticalErrorEvent110_FWD_DEFINED__
 typedef interface IRemoteDebugCriticalErrorEvent110 IRemoteDebugCriticalErrorEvent110;
+#ifdef __cplusplus
+interface IRemoteDebugCriticalErrorEvent110;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -91,6 +127,9 @@
 #ifndef __IWebAppDiagnosticsSetupEvent_FWD_DEFINED__
 #define __IWebAppDiagnosticsSetupEvent_FWD_DEFINED__
 typedef interface IWebAppDiagnosticsSetupEvent IWebAppDiagnosticsSetupEvent;
+#ifdef __cplusplus
+interface IWebAppDiagnosticsSetupEvent;
+#endif /* __cplusplus */
 #endif
 
 typedef enum tagAPPLICATION_NODE_EVENT_FILTER {
@@ -109,7 +148,6 @@
     SDO_ENABLE_WEB_WORKER_SUPPORT = 0x2,
     SDO_ENABLE_NONUSER_CODE_SUPPORT = 0x4
 };
-
 typedef struct tagTEXT_DOCUMENT_ARRAY {
     DWORD dwCount;
     IDebugDocumentText **Members;
@@ -160,33 +198,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugApplicationNode100* This,
+        IDebugApplicationNode100 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugApplicationNode100* This);
+        IDebugApplicationNode100 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugApplicationNode100* This);
+        IDebugApplicationNode100 *This);
 
     /*** IDebugApplicationNode100 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFilterForEventSink)(
-        IDebugApplicationNode100* This,
+        IDebugApplicationNode100 *This,
         DWORD dwCookie,
         APPLICATION_NODE_EVENT_FILTER filter);
 
     HRESULT (STDMETHODCALLTYPE *GetExcludedDocuments)(
-        IDebugApplicationNode100* This,
+        IDebugApplicationNode100 *This,
         APPLICATION_NODE_EVENT_FILTER filter,
         TEXT_DOCUMENT_ARRAY *pDocuments);
 
     HRESULT (STDMETHODCALLTYPE *QueryIsChildNode)(
-        IDebugApplicationNode100* This,
+        IDebugApplicationNode100 *This,
         IDebugDocument *pSearchKey);
 
     END_INTERFACE
 } IDebugApplicationNode100Vtbl;
+
 interface IDebugApplicationNode100 {
     CONST_VTBL IDebugApplicationNode100Vtbl* lpVtbl;
 };
@@ -227,32 +266,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugApplicationNode100_SetFilterForEventSink_Proxy(
-    IDebugApplicationNode100* This,
-    DWORD dwCookie,
-    APPLICATION_NODE_EVENT_FILTER filter);
-void __RPC_STUB IDebugApplicationNode100_SetFilterForEventSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationNode100_GetExcludedDocuments_Proxy(
-    IDebugApplicationNode100* This,
-    APPLICATION_NODE_EVENT_FILTER filter,
-    TEXT_DOCUMENT_ARRAY *pDocuments);
-void __RPC_STUB IDebugApplicationNode100_GetExcludedDocuments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationNode100_QueryIsChildNode_Proxy(
-    IDebugApplicationNode100* This,
-    IDebugDocument *pSearchKey);
-void __RPC_STUB IDebugApplicationNode100_QueryIsChildNode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugApplicationNode100_INTERFACE_DEFINED__ */
 
@@ -286,23 +299,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWebAppDiagnosticsSetup* This,
+        IWebAppDiagnosticsSetup *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWebAppDiagnosticsSetup* This);
+        IWebAppDiagnosticsSetup *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWebAppDiagnosticsSetup* This);
+        IWebAppDiagnosticsSetup *This);
 
     /*** IWebAppDiagnosticsSetup methods ***/
     HRESULT (STDMETHODCALLTYPE *DiagnosticsSupported)(
-        IWebAppDiagnosticsSetup* This,
+        IWebAppDiagnosticsSetup *This,
         VARIANT_BOOL *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *CreateObjectWithSiteAtWebApp)(
-        IWebAppDiagnosticsSetup* This,
+        IWebAppDiagnosticsSetup *This,
         REFCLSID rclsid,
         DWORD dwClsContext,
         REFIID riid,
@@ -310,6 +323,7 @@
 
     END_INTERFACE
 } IWebAppDiagnosticsSetupVtbl;
+
 interface IWebAppDiagnosticsSetup {
     CONST_VTBL IWebAppDiagnosticsSetupVtbl* lpVtbl;
 };
@@ -346,25 +360,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWebAppDiagnosticsSetup_DiagnosticsSupported_Proxy(
-    IWebAppDiagnosticsSetup* This,
-    VARIANT_BOOL *pRetVal);
-void __RPC_STUB IWebAppDiagnosticsSetup_DiagnosticsSupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebAppDiagnosticsSetup_CreateObjectWithSiteAtWebApp_Proxy(
-    IWebAppDiagnosticsSetup* This,
-    REFCLSID rclsid,
-    DWORD dwClsContext,
-    REFIID riid,
-    DWORD_PTR hPassToObject);
-void __RPC_STUB IWebAppDiagnosticsSetup_CreateObjectWithSiteAtWebApp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWebAppDiagnosticsSetup_INTERFACE_DEFINED__ */
 
@@ -399,32 +394,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRemoteDebugApplication110* This,
+        IRemoteDebugApplication110 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRemoteDebugApplication110* This);
+        IRemoteDebugApplication110 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRemoteDebugApplication110* This);
+        IRemoteDebugApplication110 *This);
 
     /*** IRemoteDebugApplication110 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetDebuggerOptions)(
-        IRemoteDebugApplication110* This,
+        IRemoteDebugApplication110 *This,
         enum SCRIPT_DEBUGGER_OPTIONS mask,
         enum SCRIPT_DEBUGGER_OPTIONS value);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentDebuggerOptions)(
-        IRemoteDebugApplication110* This,
+        IRemoteDebugApplication110 *This,
         enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetMainThread)(
-        IRemoteDebugApplication110* This,
+        IRemoteDebugApplication110 *This,
         IRemoteDebugApplicationThread **ppThread);
 
     END_INTERFACE
 } IRemoteDebugApplication110Vtbl;
+
 interface IRemoteDebugApplication110 {
     CONST_VTBL IRemoteDebugApplication110Vtbl* lpVtbl;
 };
@@ -465,31 +461,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IRemoteDebugApplication110_SetDebuggerOptions_Proxy(
-    IRemoteDebugApplication110* This,
-    enum SCRIPT_DEBUGGER_OPTIONS mask,
-    enum SCRIPT_DEBUGGER_OPTIONS value);
-void __RPC_STUB IRemoteDebugApplication110_SetDebuggerOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRemoteDebugApplication110_GetCurrentDebuggerOptions_Proxy(
-    IRemoteDebugApplication110* This,
-    enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions);
-void __RPC_STUB IRemoteDebugApplication110_GetCurrentDebuggerOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRemoteDebugApplication110_GetMainThread_Proxy(
-    IRemoteDebugApplication110* This,
-    IRemoteDebugApplicationThread **ppThread);
-void __RPC_STUB IRemoteDebugApplication110_GetMainThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IRemoteDebugApplication110_INTERFACE_DEFINED__ */
 
@@ -531,53 +502,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugApplication11032* This,
+        IDebugApplication11032 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugApplication11032* This);
+        IDebugApplication11032 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugApplication11032* This);
+        IDebugApplication11032 *This);
 
     /*** IRemoteDebugApplication110 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetDebuggerOptions)(
-        IDebugApplication11032* This,
+        IDebugApplication11032 *This,
         enum SCRIPT_DEBUGGER_OPTIONS mask,
         enum SCRIPT_DEBUGGER_OPTIONS value);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentDebuggerOptions)(
-        IDebugApplication11032* This,
+        IDebugApplication11032 *This,
         enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetMainThread)(
-        IDebugApplication11032* This,
+        IDebugApplication11032 *This,
         IRemoteDebugApplicationThread **ppThread);
 
     /*** IDebugApplication11032 methods ***/
     HRESULT (STDMETHODCALLTYPE *SynchronousCallInMainThread)(
-        IDebugApplication11032* This,
+        IDebugApplication11032 *This,
         IDebugThreadCall32 *pptc,
         DWORD_PTR dwParam1,
         DWORD_PTR dwParam2,
         DWORD_PTR dwParam3);
 
     HRESULT (STDMETHODCALLTYPE *AsynchronousCallInMainThread)(
-        IDebugApplication11032* This,
+        IDebugApplication11032 *This,
         IDebugThreadCall32 *pptc,
         DWORD_PTR dwParam1,
         DWORD_PTR dwParam2,
         DWORD_PTR dwParam3);
 
     HRESULT (STDMETHODCALLTYPE *CallableWaitForHandles)(
-        IDebugApplication11032* This,
+        IDebugApplication11032 *This,
         DWORD handleCount,
         const HANDLE *pHandles,
         DWORD *pIndex);
 
     END_INTERFACE
 } IDebugApplication11032Vtbl;
+
 interface IDebugApplication11032 {
     CONST_VTBL IDebugApplication11032Vtbl* lpVtbl;
 };
@@ -632,38 +604,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugApplication11032_SynchronousCallInMainThread_Proxy(
-    IDebugApplication11032* This,
-    IDebugThreadCall32 *pptc,
-    DWORD_PTR dwParam1,
-    DWORD_PTR dwParam2,
-    DWORD_PTR dwParam3);
-void __RPC_STUB IDebugApplication11032_SynchronousCallInMainThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplication11032_AsynchronousCallInMainThread_Proxy(
-    IDebugApplication11032* This,
-    IDebugThreadCall32 *pptc,
-    DWORD_PTR dwParam1,
-    DWORD_PTR dwParam2,
-    DWORD_PTR dwParam3);
-void __RPC_STUB IDebugApplication11032_AsynchronousCallInMainThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplication11032_CallableWaitForHandles_Proxy(
-    IDebugApplication11032* This,
-    DWORD handleCount,
-    const HANDLE *pHandles,
-    DWORD *pIndex);
-void __RPC_STUB IDebugApplication11032_CallableWaitForHandles_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugApplication11032_INTERFACE_DEFINED__ */
 
@@ -705,53 +645,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugApplication11064* This,
+        IDebugApplication11064 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugApplication11064* This);
+        IDebugApplication11064 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugApplication11064* This);
+        IDebugApplication11064 *This);
 
     /*** IRemoteDebugApplication110 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetDebuggerOptions)(
-        IDebugApplication11064* This,
+        IDebugApplication11064 *This,
         enum SCRIPT_DEBUGGER_OPTIONS mask,
         enum SCRIPT_DEBUGGER_OPTIONS value);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentDebuggerOptions)(
-        IDebugApplication11064* This,
+        IDebugApplication11064 *This,
         enum SCRIPT_DEBUGGER_OPTIONS *pCurrentOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetMainThread)(
-        IDebugApplication11064* This,
+        IDebugApplication11064 *This,
         IRemoteDebugApplicationThread **ppThread);
 
     /*** IDebugApplication11064 methods ***/
     HRESULT (STDMETHODCALLTYPE *SynchronousCallInMainThread)(
-        IDebugApplication11064* This,
+        IDebugApplication11064 *This,
         IDebugThreadCall64 *pptc,
         DWORD_PTR dwParam1,
         DWORD_PTR dwParam2,
         DWORD_PTR dwParam3);
 
     HRESULT (STDMETHODCALLTYPE *AsynchronousCallInMainThread)(
-        IDebugApplication11064* This,
+        IDebugApplication11064 *This,
         IDebugThreadCall64 *pptc,
         DWORD_PTR dwParam1,
         DWORD_PTR dwParam2,
         DWORD_PTR dwParam3);
 
     HRESULT (STDMETHODCALLTYPE *CallableWaitForHandles)(
-        IDebugApplication11064* This,
+        IDebugApplication11064 *This,
         DWORD handleCount,
         const HANDLE *pHandles,
         DWORD *pIndex);
 
     END_INTERFACE
 } IDebugApplication11064Vtbl;
+
 interface IDebugApplication11064 {
     CONST_VTBL IDebugApplication11064Vtbl* lpVtbl;
 };
@@ -806,38 +747,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugApplication11064_SynchronousCallInMainThread_Proxy(
-    IDebugApplication11064* This,
-    IDebugThreadCall64 *pptc,
-    DWORD_PTR dwParam1,
-    DWORD_PTR dwParam2,
-    DWORD_PTR dwParam3);
-void __RPC_STUB IDebugApplication11064_SynchronousCallInMainThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplication11064_AsynchronousCallInMainThread_Proxy(
-    IDebugApplication11064* This,
-    IDebugThreadCall64 *pptc,
-    DWORD_PTR dwParam1,
-    DWORD_PTR dwParam2,
-    DWORD_PTR dwParam3);
-void __RPC_STUB IDebugApplication11064_AsynchronousCallInMainThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplication11064_CallableWaitForHandles_Proxy(
-    IDebugApplication11064* This,
-    DWORD handleCount,
-    const HANDLE *pHandles,
-    DWORD *pIndex);
-void __RPC_STUB IDebugApplication11064_CallableWaitForHandles_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugApplication11064_INTERFACE_DEFINED__ */
 
@@ -866,24 +775,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWebAppDiagnosticsObjectInitialization* This,
+        IWebAppDiagnosticsObjectInitialization *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWebAppDiagnosticsObjectInitialization* This);
+        IWebAppDiagnosticsObjectInitialization *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWebAppDiagnosticsObjectInitialization* This);
+        IWebAppDiagnosticsObjectInitialization *This);
 
     /*** IWebAppDiagnosticsObjectInitialization methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWebAppDiagnosticsObjectInitialization* This,
+        IWebAppDiagnosticsObjectInitialization *This,
         HANDLE_PTR hPassedHandle,
         IUnknown *pDebugApplication);
 
     END_INTERFACE
 } IWebAppDiagnosticsObjectInitializationVtbl;
+
 interface IWebAppDiagnosticsObjectInitialization {
     CONST_VTBL IWebAppDiagnosticsObjectInitializationVtbl* lpVtbl;
 };
@@ -916,15 +826,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWebAppDiagnosticsObjectInitialization_Initialize_Proxy(
-    IWebAppDiagnosticsObjectInitialization* This,
-    HANDLE_PTR hPassedHandle,
-    IUnknown *pDebugApplication);
-void __RPC_STUB IWebAppDiagnosticsObjectInitialization_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWebAppDiagnosticsObjectInitialization_INTERFACE_DEFINED__ */
 
@@ -958,46 +859,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptWinRTErrorDebug* This,
+        IActiveScriptWinRTErrorDebug *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptWinRTErrorDebug* This);
+        IActiveScriptWinRTErrorDebug *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptWinRTErrorDebug* This);
+        IActiveScriptWinRTErrorDebug *This);
 
     /*** IActiveScriptError methods ***/
     HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)(
-        IActiveScriptWinRTErrorDebug* This,
+        IActiveScriptWinRTErrorDebug *This,
         EXCEPINFO *pexcepinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetSourcePosition)(
-        IActiveScriptWinRTErrorDebug* This,
+        IActiveScriptWinRTErrorDebug *This,
         DWORD *pdwSourceContext,
         ULONG *pulLineNumber,
         LONG *plCharacterPosition);
 
     HRESULT (STDMETHODCALLTYPE *GetSourceLineText)(
-        IActiveScriptWinRTErrorDebug* This,
+        IActiveScriptWinRTErrorDebug *This,
         BSTR *pbstrSourceLine);
 
     /*** IActiveScriptWinRTErrorDebug methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRestrictedErrorString)(
-        IActiveScriptWinRTErrorDebug* This,
+        IActiveScriptWinRTErrorDebug *This,
         BSTR *errorString);
 
     HRESULT (STDMETHODCALLTYPE *GetRestrictedErrorReference)(
-        IActiveScriptWinRTErrorDebug* This,
+        IActiveScriptWinRTErrorDebug *This,
         BSTR *referenceString);
 
     HRESULT (STDMETHODCALLTYPE *GetCapabilitySid)(
-        IActiveScriptWinRTErrorDebug* This,
+        IActiveScriptWinRTErrorDebug *This,
         BSTR *capabilitySid);
 
     END_INTERFACE
 } IActiveScriptWinRTErrorDebugVtbl;
+
 interface IActiveScriptWinRTErrorDebug {
     CONST_VTBL IActiveScriptWinRTErrorDebugVtbl* lpVtbl;
 };
@@ -1052,30 +954,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptWinRTErrorDebug_GetRestrictedErrorString_Proxy(
-    IActiveScriptWinRTErrorDebug* This,
-    BSTR *errorString);
-void __RPC_STUB IActiveScriptWinRTErrorDebug_GetRestrictedErrorString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptWinRTErrorDebug_GetRestrictedErrorReference_Proxy(
-    IActiveScriptWinRTErrorDebug* This,
-    BSTR *referenceString);
-void __RPC_STUB IActiveScriptWinRTErrorDebug_GetRestrictedErrorReference_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptWinRTErrorDebug_GetCapabilitySid_Proxy(
-    IActiveScriptWinRTErrorDebug* This,
-    BSTR *capabilitySid);
-void __RPC_STUB IActiveScriptWinRTErrorDebug_GetCapabilitySid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptWinRTErrorDebug_INTERFACE_DEFINED__ */
 
@@ -1104,23 +982,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptErrorDebug110* This,
+        IActiveScriptErrorDebug110 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptErrorDebug110* This);
+        IActiveScriptErrorDebug110 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptErrorDebug110* This);
+        IActiveScriptErrorDebug110 *This);
 
     /*** IActiveScriptErrorDebug110 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetExceptionThrownKind)(
-        IActiveScriptErrorDebug110* This,
+        IActiveScriptErrorDebug110 *This,
         SCRIPT_ERROR_DEBUG_EXCEPTION_THROWN_KIND *pExceptionKind);
 
     END_INTERFACE
 } IActiveScriptErrorDebug110Vtbl;
+
 interface IActiveScriptErrorDebug110 {
     CONST_VTBL IActiveScriptErrorDebug110Vtbl* lpVtbl;
 };
@@ -1153,14 +1032,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptErrorDebug110_GetExceptionThrownKind_Proxy(
-    IActiveScriptErrorDebug110* This,
-    SCRIPT_ERROR_DEBUG_EXCEPTION_THROWN_KIND *pExceptionKind);
-void __RPC_STUB IActiveScriptErrorDebug110_GetExceptionThrownKind_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptErrorDebug110_INTERFACE_DEFINED__ */
 
@@ -1197,31 +1068,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugApplicationThreadEvents110* This,
+        IDebugApplicationThreadEvents110 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugApplicationThreadEvents110* This);
+        IDebugApplicationThreadEvents110 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugApplicationThreadEvents110* This);
+        IDebugApplicationThreadEvents110 *This);
 
     /*** IDebugApplicationThreadEvents110 methods ***/
     HRESULT (STDMETHODCALLTYPE *OnSuspendForBreakPoint)(
-        IDebugApplicationThreadEvents110* This);
+        IDebugApplicationThreadEvents110 *This);
 
     HRESULT (STDMETHODCALLTYPE *OnResumeFromBreakPoint)(
-        IDebugApplicationThreadEvents110* This);
+        IDebugApplicationThreadEvents110 *This);
 
     HRESULT (STDMETHODCALLTYPE *OnThreadRequestComplete)(
-        IDebugApplicationThreadEvents110* This);
+        IDebugApplicationThreadEvents110 *This);
 
     HRESULT (STDMETHODCALLTYPE *OnBeginThreadRequest)(
-        IDebugApplicationThreadEvents110* This);
+        IDebugApplicationThreadEvents110 *This);
 
     END_INTERFACE
 } IDebugApplicationThreadEvents110Vtbl;
+
 interface IDebugApplicationThreadEvents110 {
     CONST_VTBL IDebugApplicationThreadEvents110Vtbl* lpVtbl;
 };
@@ -1266,34 +1138,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnSuspendForBreakPoint_Proxy(
-    IDebugApplicationThreadEvents110* This);
-void __RPC_STUB IDebugApplicationThreadEvents110_OnSuspendForBreakPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnResumeFromBreakPoint_Proxy(
-    IDebugApplicationThreadEvents110* This);
-void __RPC_STUB IDebugApplicationThreadEvents110_OnResumeFromBreakPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnThreadRequestComplete_Proxy(
-    IDebugApplicationThreadEvents110* This);
-void __RPC_STUB IDebugApplicationThreadEvents110_OnThreadRequestComplete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThreadEvents110_OnBeginThreadRequest_Proxy(
-    IDebugApplicationThreadEvents110* This);
-void __RPC_STUB IDebugApplicationThreadEvents110_OnBeginThreadRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugApplicationThreadEvents110_INTERFACE_DEFINED__ */
 
@@ -1333,31 +1177,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugApplicationThread11032* This,
+        IDebugApplicationThread11032 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugApplicationThread11032* This);
+        IDebugApplicationThread11032 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugApplicationThread11032* This);
+        IDebugApplicationThread11032 *This);
 
     /*** IDebugApplicationThread11032 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetActiveThreadRequestCount)(
-        IDebugApplicationThread11032* This,
+        IDebugApplicationThread11032 *This,
         UINT *puiThreadRequests);
 
     HRESULT (STDMETHODCALLTYPE *IsSuspendedForBreakPoint)(
-        IDebugApplicationThread11032* This,
+        IDebugApplicationThread11032 *This,
         WINBOOL *pfIsSuspended);
 
     HRESULT (STDMETHODCALLTYPE *IsThreadCallable)(
-        IDebugApplicationThread11032* This,
+        IDebugApplicationThread11032 *This,
         WINBOOL *pfIsCallable);
 
     HRESULT (STDMETHODCALLTYPE *AsynchronousCallIntoThread)(
-        IDebugApplicationThread11032* This,
+        IDebugApplicationThread11032 *This,
         IDebugThreadCall32 *pptc,
         DWORD_PTR dwParam1,
         DWORD_PTR dwParam2,
@@ -1365,6 +1209,7 @@
 
     END_INTERFACE
 } IDebugApplicationThread11032Vtbl;
+
 interface IDebugApplicationThread11032 {
     CONST_VTBL IDebugApplicationThread11032Vtbl* lpVtbl;
 };
@@ -1409,41 +1254,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_GetActiveThreadRequestCount_Proxy(
-    IDebugApplicationThread11032* This,
-    UINT *puiThreadRequests);
-void __RPC_STUB IDebugApplicationThread11032_GetActiveThreadRequestCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_IsSuspendedForBreakPoint_Proxy(
-    IDebugApplicationThread11032* This,
-    WINBOOL *pfIsSuspended);
-void __RPC_STUB IDebugApplicationThread11032_IsSuspendedForBreakPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_IsThreadCallable_Proxy(
-    IDebugApplicationThread11032* This,
-    WINBOOL *pfIsCallable);
-void __RPC_STUB IDebugApplicationThread11032_IsThreadCallable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11032_AsynchronousCallIntoThread_Proxy(
-    IDebugApplicationThread11032* This,
-    IDebugThreadCall32 *pptc,
-    DWORD_PTR dwParam1,
-    DWORD_PTR dwParam2,
-    DWORD_PTR dwParam3);
-void __RPC_STUB IDebugApplicationThread11032_AsynchronousCallIntoThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugApplicationThread11032_INTERFACE_DEFINED__ */
 
@@ -1483,31 +1293,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugApplicationThread11064* This,
+        IDebugApplicationThread11064 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugApplicationThread11064* This);
+        IDebugApplicationThread11064 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugApplicationThread11064* This);
+        IDebugApplicationThread11064 *This);
 
     /*** IDebugApplicationThread11064 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetActiveThreadRequestCount)(
-        IDebugApplicationThread11064* This,
+        IDebugApplicationThread11064 *This,
         UINT *puiThreadRequests);
 
     HRESULT (STDMETHODCALLTYPE *IsSuspendedForBreakPoint)(
-        IDebugApplicationThread11064* This,
+        IDebugApplicationThread11064 *This,
         WINBOOL *pfIsSuspended);
 
     HRESULT (STDMETHODCALLTYPE *IsThreadCallable)(
-        IDebugApplicationThread11064* This,
+        IDebugApplicationThread11064 *This,
         WINBOOL *pfIsCallable);
 
     HRESULT (STDMETHODCALLTYPE *AsynchronousCallIntoThread)(
-        IDebugApplicationThread11064* This,
+        IDebugApplicationThread11064 *This,
         IDebugThreadCall64 *pptc,
         DWORD_PTR dwParam1,
         DWORD_PTR dwParam2,
@@ -1515,6 +1325,7 @@
 
     END_INTERFACE
 } IDebugApplicationThread11064Vtbl;
+
 interface IDebugApplicationThread11064 {
     CONST_VTBL IDebugApplicationThread11064Vtbl* lpVtbl;
 };
@@ -1559,41 +1370,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_GetActiveThreadRequestCount_Proxy(
-    IDebugApplicationThread11064* This,
-    UINT *puiThreadRequests);
-void __RPC_STUB IDebugApplicationThread11064_GetActiveThreadRequestCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_IsSuspendedForBreakPoint_Proxy(
-    IDebugApplicationThread11064* This,
-    WINBOOL *pfIsSuspended);
-void __RPC_STUB IDebugApplicationThread11064_IsSuspendedForBreakPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_IsThreadCallable_Proxy(
-    IDebugApplicationThread11064* This,
-    WINBOOL *pfIsCallable);
-void __RPC_STUB IDebugApplicationThread11064_IsThreadCallable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugApplicationThread11064_AsynchronousCallIntoThread_Proxy(
-    IDebugApplicationThread11064* This,
-    IDebugThreadCall64 *pptc,
-    DWORD_PTR dwParam1,
-    DWORD_PTR dwParam2,
-    DWORD_PTR dwParam3);
-void __RPC_STUB IDebugApplicationThread11064_AsynchronousCallIntoThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugApplicationThread11064_INTERFACE_DEFINED__ */
 
@@ -1624,19 +1400,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRemoteDebugCriticalErrorEvent110* This,
+        IRemoteDebugCriticalErrorEvent110 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRemoteDebugCriticalErrorEvent110* This);
+        IRemoteDebugCriticalErrorEvent110 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRemoteDebugCriticalErrorEvent110* This);
+        IRemoteDebugCriticalErrorEvent110 *This);
 
     /*** IRemoteDebugCriticalErrorEvent110 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetErrorInfo)(
-        IRemoteDebugCriticalErrorEvent110* This,
+        IRemoteDebugCriticalErrorEvent110 *This,
         BSTR *pbstrSource,
         int *pMessageId,
         BSTR *pbstrMessage,
@@ -1644,6 +1420,7 @@
 
     END_INTERFACE
 } IRemoteDebugCriticalErrorEvent110Vtbl;
+
 interface IRemoteDebugCriticalErrorEvent110 {
     CONST_VTBL IRemoteDebugCriticalErrorEvent110Vtbl* lpVtbl;
 };
@@ -1676,17 +1453,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IRemoteDebugCriticalErrorEvent110_GetErrorInfo_Proxy(
-    IRemoteDebugCriticalErrorEvent110* This,
-    BSTR *pbstrSource,
-    int *pMessageId,
-    BSTR *pbstrMessage,
-    IDebugDocumentContext **ppLocation);
-void __RPC_STUB IRemoteDebugCriticalErrorEvent110_GetErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IRemoteDebugCriticalErrorEvent110_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/activprof.h b/mingw-w64-headers/include/activprof.h
index df29427..bf4ca37 100644
--- a/mingw-w64-headers/include/activprof.h
+++ b/mingw-w64-headers/include/activprof.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/activprof.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/activprof.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,36 +20,57 @@
 #ifndef __IActiveScriptProfilerControl_FWD_DEFINED__
 #define __IActiveScriptProfilerControl_FWD_DEFINED__
 typedef interface IActiveScriptProfilerControl IActiveScriptProfilerControl;
+#ifdef __cplusplus
+interface IActiveScriptProfilerControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProfilerControl2_FWD_DEFINED__
 #define __IActiveScriptProfilerControl2_FWD_DEFINED__
 typedef interface IActiveScriptProfilerControl2 IActiveScriptProfilerControl2;
+#ifdef __cplusplus
+interface IActiveScriptProfilerControl2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProfilerHeapEnum_FWD_DEFINED__
 #define __IActiveScriptProfilerHeapEnum_FWD_DEFINED__
 typedef interface IActiveScriptProfilerHeapEnum IActiveScriptProfilerHeapEnum;
+#ifdef __cplusplus
+interface IActiveScriptProfilerHeapEnum;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProfilerControl3_FWD_DEFINED__
 #define __IActiveScriptProfilerControl3_FWD_DEFINED__
 typedef interface IActiveScriptProfilerControl3 IActiveScriptProfilerControl3;
+#ifdef __cplusplus
+interface IActiveScriptProfilerControl3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProfilerCallback_FWD_DEFINED__
 #define __IActiveScriptProfilerCallback_FWD_DEFINED__
 typedef interface IActiveScriptProfilerCallback IActiveScriptProfilerCallback;
+#ifdef __cplusplus
+interface IActiveScriptProfilerCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProfilerCallback2_FWD_DEFINED__
 #define __IActiveScriptProfilerCallback2_FWD_DEFINED__
 typedef interface IActiveScriptProfilerCallback2 IActiveScriptProfilerCallback2;
+#ifdef __cplusplus
+interface IActiveScriptProfilerCallback2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProfilerCallback3_FWD_DEFINED__
 #define __IActiveScriptProfilerCallback3_FWD_DEFINED__
 typedef interface IActiveScriptProfilerCallback3 IActiveScriptProfilerCallback3;
+#ifdef __cplusplus
+interface IActiveScriptProfilerCallback3;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -132,33 +153,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProfilerControl* This,
+        IActiveScriptProfilerControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProfilerControl* This);
+        IActiveScriptProfilerControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProfilerControl* This);
+        IActiveScriptProfilerControl *This);
 
     /*** IActiveScriptProfilerControl methods ***/
     HRESULT (STDMETHODCALLTYPE *StartProfiling)(
-        IActiveScriptProfilerControl* This,
+        IActiveScriptProfilerControl *This,
         REFCLSID clsidProfilerObject,
         DWORD dwEventMask,
         DWORD dwContext);
 
     HRESULT (STDMETHODCALLTYPE *SetProfilerEventMask)(
-        IActiveScriptProfilerControl* This,
+        IActiveScriptProfilerControl *This,
         DWORD dwEventMask);
 
     HRESULT (STDMETHODCALLTYPE *StopProfiling)(
-        IActiveScriptProfilerControl* This,
+        IActiveScriptProfilerControl *This,
         HRESULT hrShutdownReason);
 
     END_INTERFACE
 } IActiveScriptProfilerControlVtbl;
+
 interface IActiveScriptProfilerControl {
     CONST_VTBL IActiveScriptProfilerControlVtbl* lpVtbl;
 };
@@ -199,32 +221,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl_StartProfiling_Proxy(
-    IActiveScriptProfilerControl* This,
-    REFCLSID clsidProfilerObject,
-    DWORD dwEventMask,
-    DWORD dwContext);
-void __RPC_STUB IActiveScriptProfilerControl_StartProfiling_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl_SetProfilerEventMask_Proxy(
-    IActiveScriptProfilerControl* This,
-    DWORD dwEventMask);
-void __RPC_STUB IActiveScriptProfilerControl_SetProfilerEventMask_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl_StopProfiling_Proxy(
-    IActiveScriptProfilerControl* This,
-    HRESULT hrShutdownReason);
-void __RPC_STUB IActiveScriptProfilerControl_StopProfiling_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProfilerControl_INTERFACE_DEFINED__ */
 
@@ -256,40 +252,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProfilerControl2* This,
+        IActiveScriptProfilerControl2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProfilerControl2* This);
+        IActiveScriptProfilerControl2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProfilerControl2* This);
+        IActiveScriptProfilerControl2 *This);
 
     /*** IActiveScriptProfilerControl methods ***/
     HRESULT (STDMETHODCALLTYPE *StartProfiling)(
-        IActiveScriptProfilerControl2* This,
+        IActiveScriptProfilerControl2 *This,
         REFCLSID clsidProfilerObject,
         DWORD dwEventMask,
         DWORD dwContext);
 
     HRESULT (STDMETHODCALLTYPE *SetProfilerEventMask)(
-        IActiveScriptProfilerControl2* This,
+        IActiveScriptProfilerControl2 *This,
         DWORD dwEventMask);
 
     HRESULT (STDMETHODCALLTYPE *StopProfiling)(
-        IActiveScriptProfilerControl2* This,
+        IActiveScriptProfilerControl2 *This,
         HRESULT hrShutdownReason);
 
     /*** IActiveScriptProfilerControl2 methods ***/
     HRESULT (STDMETHODCALLTYPE *CompleteProfilerStart)(
-        IActiveScriptProfilerControl2* This);
+        IActiveScriptProfilerControl2 *This);
 
     HRESULT (STDMETHODCALLTYPE *PrepareProfilerStop)(
-        IActiveScriptProfilerControl2* This);
+        IActiveScriptProfilerControl2 *This);
 
     END_INTERFACE
 } IActiveScriptProfilerControl2Vtbl;
+
 interface IActiveScriptProfilerControl2 {
     CONST_VTBL IActiveScriptProfilerControl2Vtbl* lpVtbl;
 };
@@ -340,20 +337,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl2_CompleteProfilerStart_Proxy(
-    IActiveScriptProfilerControl2* This);
-void __RPC_STUB IActiveScriptProfilerControl2_CompleteProfilerStart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl2_PrepareProfilerStop_Proxy(
-    IActiveScriptProfilerControl2* This);
-void __RPC_STUB IActiveScriptProfilerControl2_PrepareProfilerStop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProfilerControl2_INTERFACE_DEFINED__ */
 
@@ -489,41 +472,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProfilerHeapEnum* This,
+        IActiveScriptProfilerHeapEnum *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProfilerHeapEnum* This);
+        IActiveScriptProfilerHeapEnum *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProfilerHeapEnum* This);
+        IActiveScriptProfilerHeapEnum *This);
 
     /*** IActiveScriptProfilerHeapEnum methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IActiveScriptProfilerHeapEnum* This,
+        IActiveScriptProfilerHeapEnum *This,
         ULONG celt,
         PROFILER_HEAP_OBJECT **heapObjects,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetOptionalInfo)(
-        IActiveScriptProfilerHeapEnum* This,
+        IActiveScriptProfilerHeapEnum *This,
         PROFILER_HEAP_OBJECT *heapObject,
         ULONG celt,
         PROFILER_HEAP_OBJECT_OPTIONAL_INFO *optionalInfo);
 
     HRESULT (STDMETHODCALLTYPE *FreeObjectAndOptionalInfo)(
-        IActiveScriptProfilerHeapEnum* This,
+        IActiveScriptProfilerHeapEnum *This,
         ULONG celt,
         PROFILER_HEAP_OBJECT **heapObjects);
 
     HRESULT (STDMETHODCALLTYPE *GetNameIdMap)(
-        IActiveScriptProfilerHeapEnum* This,
+        IActiveScriptProfilerHeapEnum *This,
         LPCWSTR * pNameList[],
         UINT *pcelt);
 
     END_INTERFACE
 } IActiveScriptProfilerHeapEnumVtbl;
+
 interface IActiveScriptProfilerHeapEnum {
     CONST_VTBL IActiveScriptProfilerHeapEnumVtbl* lpVtbl;
 };
@@ -568,44 +552,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_Next_Proxy(
-    IActiveScriptProfilerHeapEnum* This,
-    ULONG celt,
-    PROFILER_HEAP_OBJECT **heapObjects,
-    ULONG *pceltFetched);
-void __RPC_STUB IActiveScriptProfilerHeapEnum_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_GetOptionalInfo_Proxy(
-    IActiveScriptProfilerHeapEnum* This,
-    PROFILER_HEAP_OBJECT *heapObject,
-    ULONG celt,
-    PROFILER_HEAP_OBJECT_OPTIONAL_INFO *optionalInfo);
-void __RPC_STUB IActiveScriptProfilerHeapEnum_GetOptionalInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_FreeObjectAndOptionalInfo_Proxy(
-    IActiveScriptProfilerHeapEnum* This,
-    ULONG celt,
-    PROFILER_HEAP_OBJECT **heapObjects);
-void __RPC_STUB IActiveScriptProfilerHeapEnum_FreeObjectAndOptionalInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerHeapEnum_GetNameIdMap_Proxy(
-    IActiveScriptProfilerHeapEnum* This,
-    LPCWSTR * pNameList[],
-    UINT *pcelt);
-void __RPC_STUB IActiveScriptProfilerHeapEnum_GetNameIdMap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProfilerHeapEnum_INTERFACE_DEFINED__ */
 
@@ -634,45 +580,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProfilerControl3* This,
+        IActiveScriptProfilerControl3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProfilerControl3* This);
+        IActiveScriptProfilerControl3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProfilerControl3* This);
+        IActiveScriptProfilerControl3 *This);
 
     /*** IActiveScriptProfilerControl methods ***/
     HRESULT (STDMETHODCALLTYPE *StartProfiling)(
-        IActiveScriptProfilerControl3* This,
+        IActiveScriptProfilerControl3 *This,
         REFCLSID clsidProfilerObject,
         DWORD dwEventMask,
         DWORD dwContext);
 
     HRESULT (STDMETHODCALLTYPE *SetProfilerEventMask)(
-        IActiveScriptProfilerControl3* This,
+        IActiveScriptProfilerControl3 *This,
         DWORD dwEventMask);
 
     HRESULT (STDMETHODCALLTYPE *StopProfiling)(
-        IActiveScriptProfilerControl3* This,
+        IActiveScriptProfilerControl3 *This,
         HRESULT hrShutdownReason);
 
     /*** IActiveScriptProfilerControl2 methods ***/
     HRESULT (STDMETHODCALLTYPE *CompleteProfilerStart)(
-        IActiveScriptProfilerControl3* This);
+        IActiveScriptProfilerControl3 *This);
 
     HRESULT (STDMETHODCALLTYPE *PrepareProfilerStop)(
-        IActiveScriptProfilerControl3* This);
+        IActiveScriptProfilerControl3 *This);
 
     /*** IActiveScriptProfilerControl3 methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumHeap)(
-        IActiveScriptProfilerControl3* This,
+        IActiveScriptProfilerControl3 *This,
         IActiveScriptProfilerHeapEnum **ppEnum);
 
     END_INTERFACE
 } IActiveScriptProfilerControl3Vtbl;
+
 interface IActiveScriptProfilerControl3 {
     CONST_VTBL IActiveScriptProfilerControl3Vtbl* lpVtbl;
 };
@@ -729,14 +676,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerControl3_EnumHeap_Proxy(
-    IActiveScriptProfilerControl3* This,
-    IActiveScriptProfilerHeapEnum **ppEnum);
-void __RPC_STUB IActiveScriptProfilerControl3_EnumHeap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProfilerControl3_INTERFACE_DEFINED__ */
 
@@ -788,33 +727,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProfilerCallback* This,
+        IActiveScriptProfilerCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProfilerCallback* This);
+        IActiveScriptProfilerCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProfilerCallback* This);
+        IActiveScriptProfilerCallback *This);
 
     /*** IActiveScriptProfilerCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IActiveScriptProfilerCallback* This,
+        IActiveScriptProfilerCallback *This,
         DWORD dwContext);
 
     HRESULT (STDMETHODCALLTYPE *Shutdown)(
-        IActiveScriptProfilerCallback* This,
+        IActiveScriptProfilerCallback *This,
         HRESULT hrReason);
 
     HRESULT (STDMETHODCALLTYPE *ScriptCompiled)(
-        IActiveScriptProfilerCallback* This,
+        IActiveScriptProfilerCallback *This,
         PROFILER_TOKEN scriptId,
         PROFILER_SCRIPT_TYPE type,
         IUnknown *pIDebugDocumentContext);
 
     HRESULT (STDMETHODCALLTYPE *FunctionCompiled)(
-        IActiveScriptProfilerCallback* This,
+        IActiveScriptProfilerCallback *This,
         PROFILER_TOKEN functionId,
         PROFILER_TOKEN scriptId,
         const WCHAR *pwszFunctionName,
@@ -822,17 +761,18 @@
         IUnknown *pIDebugDocumentContext);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionEnter)(
-        IActiveScriptProfilerCallback* This,
+        IActiveScriptProfilerCallback *This,
         PROFILER_TOKEN scriptId,
         PROFILER_TOKEN functionId);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionExit)(
-        IActiveScriptProfilerCallback* This,
+        IActiveScriptProfilerCallback *This,
         PROFILER_TOKEN scriptId,
         PROFILER_TOKEN functionId);
 
     END_INTERFACE
 } IActiveScriptProfilerCallbackVtbl;
+
 interface IActiveScriptProfilerCallback {
     CONST_VTBL IActiveScriptProfilerCallbackVtbl* lpVtbl;
 };
@@ -885,62 +825,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_Initialize_Proxy(
-    IActiveScriptProfilerCallback* This,
-    DWORD dwContext);
-void __RPC_STUB IActiveScriptProfilerCallback_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_Shutdown_Proxy(
-    IActiveScriptProfilerCallback* This,
-    HRESULT hrReason);
-void __RPC_STUB IActiveScriptProfilerCallback_Shutdown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_ScriptCompiled_Proxy(
-    IActiveScriptProfilerCallback* This,
-    PROFILER_TOKEN scriptId,
-    PROFILER_SCRIPT_TYPE type,
-    IUnknown *pIDebugDocumentContext);
-void __RPC_STUB IActiveScriptProfilerCallback_ScriptCompiled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_FunctionCompiled_Proxy(
-    IActiveScriptProfilerCallback* This,
-    PROFILER_TOKEN functionId,
-    PROFILER_TOKEN scriptId,
-    const WCHAR *pwszFunctionName,
-    const WCHAR *pwszFunctionNameHint,
-    IUnknown *pIDebugDocumentContext);
-void __RPC_STUB IActiveScriptProfilerCallback_FunctionCompiled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_OnFunctionEnter_Proxy(
-    IActiveScriptProfilerCallback* This,
-    PROFILER_TOKEN scriptId,
-    PROFILER_TOKEN functionId);
-void __RPC_STUB IActiveScriptProfilerCallback_OnFunctionEnter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback_OnFunctionExit_Proxy(
-    IActiveScriptProfilerCallback* This,
-    PROFILER_TOKEN scriptId,
-    PROFILER_TOKEN functionId);
-void __RPC_STUB IActiveScriptProfilerCallback_OnFunctionExit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProfilerCallback_INTERFACE_DEFINED__ */
 
@@ -974,33 +858,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProfilerCallback2* This);
+        IActiveScriptProfilerCallback2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProfilerCallback2* This);
+        IActiveScriptProfilerCallback2 *This);
 
     /*** IActiveScriptProfilerCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         DWORD dwContext);
 
     HRESULT (STDMETHODCALLTYPE *Shutdown)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         HRESULT hrReason);
 
     HRESULT (STDMETHODCALLTYPE *ScriptCompiled)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         PROFILER_TOKEN scriptId,
         PROFILER_SCRIPT_TYPE type,
         IUnknown *pIDebugDocumentContext);
 
     HRESULT (STDMETHODCALLTYPE *FunctionCompiled)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         PROFILER_TOKEN functionId,
         PROFILER_TOKEN scriptId,
         const WCHAR *pwszFunctionName,
@@ -1008,28 +892,29 @@
         IUnknown *pIDebugDocumentContext);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionEnter)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         PROFILER_TOKEN scriptId,
         PROFILER_TOKEN functionId);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionExit)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         PROFILER_TOKEN scriptId,
         PROFILER_TOKEN functionId);
 
     /*** IActiveScriptProfilerCallback2 methods ***/
     HRESULT (STDMETHODCALLTYPE *OnFunctionEnterByName)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         const WCHAR *pwszFunctionName,
         PROFILER_SCRIPT_TYPE type);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionExitByName)(
-        IActiveScriptProfilerCallback2* This,
+        IActiveScriptProfilerCallback2 *This,
         const WCHAR *pwszFunctionName,
         PROFILER_SCRIPT_TYPE type);
 
     END_INTERFACE
 } IActiveScriptProfilerCallback2Vtbl;
+
 interface IActiveScriptProfilerCallback2 {
     CONST_VTBL IActiveScriptProfilerCallback2Vtbl* lpVtbl;
 };
@@ -1092,24 +977,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback2_OnFunctionEnterByName_Proxy(
-    IActiveScriptProfilerCallback2* This,
-    const WCHAR *pwszFunctionName,
-    PROFILER_SCRIPT_TYPE type);
-void __RPC_STUB IActiveScriptProfilerCallback2_OnFunctionEnterByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback2_OnFunctionExitByName_Proxy(
-    IActiveScriptProfilerCallback2* This,
-    const WCHAR *pwszFunctionName,
-    PROFILER_SCRIPT_TYPE type);
-void __RPC_STUB IActiveScriptProfilerCallback2_OnFunctionExitByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProfilerCallback2_INTERFACE_DEFINED__ */
 
@@ -1138,33 +1005,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProfilerCallback3* This);
+        IActiveScriptProfilerCallback3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProfilerCallback3* This);
+        IActiveScriptProfilerCallback3 *This);
 
     /*** IActiveScriptProfilerCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         DWORD dwContext);
 
     HRESULT (STDMETHODCALLTYPE *Shutdown)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         HRESULT hrReason);
 
     HRESULT (STDMETHODCALLTYPE *ScriptCompiled)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         PROFILER_TOKEN scriptId,
         PROFILER_SCRIPT_TYPE type,
         IUnknown *pIDebugDocumentContext);
 
     HRESULT (STDMETHODCALLTYPE *FunctionCompiled)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         PROFILER_TOKEN functionId,
         PROFILER_TOKEN scriptId,
         const WCHAR *pwszFunctionName,
@@ -1172,33 +1039,34 @@
         IUnknown *pIDebugDocumentContext);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionEnter)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         PROFILER_TOKEN scriptId,
         PROFILER_TOKEN functionId);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionExit)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         PROFILER_TOKEN scriptId,
         PROFILER_TOKEN functionId);
 
     /*** IActiveScriptProfilerCallback2 methods ***/
     HRESULT (STDMETHODCALLTYPE *OnFunctionEnterByName)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         const WCHAR *pwszFunctionName,
         PROFILER_SCRIPT_TYPE type);
 
     HRESULT (STDMETHODCALLTYPE *OnFunctionExitByName)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         const WCHAR *pwszFunctionName,
         PROFILER_SCRIPT_TYPE type);
 
     /*** IActiveScriptProfilerCallback3 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetWebWorkerId)(
-        IActiveScriptProfilerCallback3* This,
+        IActiveScriptProfilerCallback3 *This,
         DWORD webWorkerId);
 
     END_INTERFACE
 } IActiveScriptProfilerCallback3Vtbl;
+
 interface IActiveScriptProfilerCallback3 {
     CONST_VTBL IActiveScriptProfilerCallback3Vtbl* lpVtbl;
 };
@@ -1267,14 +1135,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProfilerCallback3_SetWebWorkerId_Proxy(
-    IActiveScriptProfilerCallback3* This,
-    DWORD webWorkerId);
-void __RPC_STUB IActiveScriptProfilerCallback3_SetWebWorkerId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProfilerCallback3_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/activscp.h b/mingw-w64-headers/include/activscp.h
index cf93d7a..fc4a820 100644
--- a/mingw-w64-headers/include/activscp.h
+++ b/mingw-w64-headers/include/activscp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/activscp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/activscp.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,131 +20,209 @@
 #ifndef __IActiveScriptSite_FWD_DEFINED__
 #define __IActiveScriptSite_FWD_DEFINED__
 typedef interface IActiveScriptSite IActiveScriptSite;
+#ifdef __cplusplus
+interface IActiveScriptSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptError_FWD_DEFINED__
 #define __IActiveScriptError_FWD_DEFINED__
 typedef interface IActiveScriptError IActiveScriptError;
+#ifdef __cplusplus
+interface IActiveScriptError;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptError64_FWD_DEFINED__
 #define __IActiveScriptError64_FWD_DEFINED__
 typedef interface IActiveScriptError64 IActiveScriptError64;
+#ifdef __cplusplus
+interface IActiveScriptError64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSiteWindow_FWD_DEFINED__
 #define __IActiveScriptSiteWindow_FWD_DEFINED__
 typedef interface IActiveScriptSiteWindow IActiveScriptSiteWindow;
+#ifdef __cplusplus
+interface IActiveScriptSiteWindow;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSiteUIControl_FWD_DEFINED__
 #define __IActiveScriptSiteUIControl_FWD_DEFINED__
 typedef interface IActiveScriptSiteUIControl IActiveScriptSiteUIControl;
+#ifdef __cplusplus
+interface IActiveScriptSiteUIControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSiteInterruptPoll_FWD_DEFINED__
 #define __IActiveScriptSiteInterruptPoll_FWD_DEFINED__
 typedef interface IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll;
+#ifdef __cplusplus
+interface IActiveScriptSiteInterruptPoll;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScript_FWD_DEFINED__
 #define __IActiveScript_FWD_DEFINED__
 typedef interface IActiveScript IActiveScript;
+#ifdef __cplusplus
+interface IActiveScript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParse32_FWD_DEFINED__
 #define __IActiveScriptParse32_FWD_DEFINED__
 typedef interface IActiveScriptParse32 IActiveScriptParse32;
+#ifdef __cplusplus
+interface IActiveScriptParse32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParse64_FWD_DEFINED__
 #define __IActiveScriptParse64_FWD_DEFINED__
 typedef interface IActiveScriptParse64 IActiveScriptParse64;
+#ifdef __cplusplus
+interface IActiveScriptParse64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedureOld32_FWD_DEFINED__
 #define __IActiveScriptParseProcedureOld32_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedureOld32 IActiveScriptParseProcedureOld32;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedureOld32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedureOld64_FWD_DEFINED__
 #define __IActiveScriptParseProcedureOld64_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedureOld64 IActiveScriptParseProcedureOld64;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedureOld64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure32_FWD_DEFINED__
 #define __IActiveScriptParseProcedure32_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure32 IActiveScriptParseProcedure32;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure64_FWD_DEFINED__
 #define __IActiveScriptParseProcedure64_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure64 IActiveScriptParseProcedure64;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure2_32_FWD_DEFINED__
 #define __IActiveScriptParseProcedure2_32_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure2_32 IActiveScriptParseProcedure2_32;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure2_32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure2_64_FWD_DEFINED__
 #define __IActiveScriptParseProcedure2_64_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure2_64 IActiveScriptParseProcedure2_64;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure2_64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptEncode_FWD_DEFINED__
 #define __IActiveScriptEncode_FWD_DEFINED__
 typedef interface IActiveScriptEncode IActiveScriptEncode;
+#ifdef __cplusplus
+interface IActiveScriptEncode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptHostEncode_FWD_DEFINED__
 #define __IActiveScriptHostEncode_FWD_DEFINED__
 typedef interface IActiveScriptHostEncode IActiveScriptHostEncode;
+#ifdef __cplusplus
+interface IActiveScriptHostEncode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindEventHandler_FWD_DEFINED__
 #define __IBindEventHandler_FWD_DEFINED__
 typedef interface IBindEventHandler IBindEventHandler;
+#ifdef __cplusplus
+interface IBindEventHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptStats_FWD_DEFINED__
 #define __IActiveScriptStats_FWD_DEFINED__
 typedef interface IActiveScriptStats IActiveScriptStats;
+#ifdef __cplusplus
+interface IActiveScriptStats;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProperty_FWD_DEFINED__
 #define __IActiveScriptProperty_FWD_DEFINED__
 typedef interface IActiveScriptProperty IActiveScriptProperty;
+#ifdef __cplusplus
+interface IActiveScriptProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITridentEventSink_FWD_DEFINED__
 #define __ITridentEventSink_FWD_DEFINED__
 typedef interface ITridentEventSink ITridentEventSink;
+#ifdef __cplusplus
+interface ITridentEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptGarbageCollector_FWD_DEFINED__
 #define __IActiveScriptGarbageCollector_FWD_DEFINED__
 typedef interface IActiveScriptGarbageCollector IActiveScriptGarbageCollector;
+#ifdef __cplusplus
+interface IActiveScriptGarbageCollector;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSIPInfo_FWD_DEFINED__
 #define __IActiveScriptSIPInfo_FWD_DEFINED__
 typedef interface IActiveScriptSIPInfo IActiveScriptSIPInfo;
+#ifdef __cplusplus
+interface IActiveScriptSIPInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSiteTraceInfo_FWD_DEFINED__
 #define __IActiveScriptSiteTraceInfo_FWD_DEFINED__
 typedef interface IActiveScriptSiteTraceInfo IActiveScriptSiteTraceInfo;
+#ifdef __cplusplus
+interface IActiveScriptSiteTraceInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptTraceInfo_FWD_DEFINED__
 #define __IActiveScriptTraceInfo_FWD_DEFINED__
 typedef interface IActiveScriptTraceInfo IActiveScriptTraceInfo;
+#ifdef __cplusplus
+interface IActiveScriptTraceInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptStringCompare_FWD_DEFINED__
 #define __IActiveScriptStringCompare_FWD_DEFINED__
 typedef interface IActiveScriptStringCompare IActiveScriptStringCompare;
+#ifdef __cplusplus
+interface IActiveScriptStringCompare;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -317,121 +395,193 @@
 #ifndef __IActiveScriptSite_FWD_DEFINED__
 #define __IActiveScriptSite_FWD_DEFINED__
 typedef interface IActiveScriptSite IActiveScriptSite;
+#ifdef __cplusplus
+interface IActiveScriptSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptError_FWD_DEFINED__
 #define __IActiveScriptError_FWD_DEFINED__
 typedef interface IActiveScriptError IActiveScriptError;
+#ifdef __cplusplus
+interface IActiveScriptError;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptError64_FWD_DEFINED__
 #define __IActiveScriptError64_FWD_DEFINED__
 typedef interface IActiveScriptError64 IActiveScriptError64;
+#ifdef __cplusplus
+interface IActiveScriptError64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSiteWindow_FWD_DEFINED__
 #define __IActiveScriptSiteWindow_FWD_DEFINED__
 typedef interface IActiveScriptSiteWindow IActiveScriptSiteWindow;
+#ifdef __cplusplus
+interface IActiveScriptSiteWindow;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSiteUIControl_FWD_DEFINED__
 #define __IActiveScriptSiteUIControl_FWD_DEFINED__
 typedef interface IActiveScriptSiteUIControl IActiveScriptSiteUIControl;
+#ifdef __cplusplus
+interface IActiveScriptSiteUIControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSiteInterruptPoll_FWD_DEFINED__
 #define __IActiveScriptSiteInterruptPoll_FWD_DEFINED__
 typedef interface IActiveScriptSiteInterruptPoll IActiveScriptSiteInterruptPoll;
+#ifdef __cplusplus
+interface IActiveScriptSiteInterruptPoll;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScript_FWD_DEFINED__
 #define __IActiveScript_FWD_DEFINED__
 typedef interface IActiveScript IActiveScript;
+#ifdef __cplusplus
+interface IActiveScript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParse32_FWD_DEFINED__
 #define __IActiveScriptParse32_FWD_DEFINED__
 typedef interface IActiveScriptParse32 IActiveScriptParse32;
+#ifdef __cplusplus
+interface IActiveScriptParse32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParse64_FWD_DEFINED__
 #define __IActiveScriptParse64_FWD_DEFINED__
 typedef interface IActiveScriptParse64 IActiveScriptParse64;
+#ifdef __cplusplus
+interface IActiveScriptParse64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedureOld32_FWD_DEFINED__
 #define __IActiveScriptParseProcedureOld32_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedureOld32 IActiveScriptParseProcedureOld32;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedureOld32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedureOld64_FWD_DEFINED__
 #define __IActiveScriptParseProcedureOld64_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedureOld64 IActiveScriptParseProcedureOld64;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedureOld64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure32_FWD_DEFINED__
 #define __IActiveScriptParseProcedure32_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure32 IActiveScriptParseProcedure32;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure64_FWD_DEFINED__
 #define __IActiveScriptParseProcedure64_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure64 IActiveScriptParseProcedure64;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure2_32_FWD_DEFINED__
 #define __IActiveScriptParseProcedure2_32_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure2_32 IActiveScriptParseProcedure2_32;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure2_32;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptParseProcedure2_64_FWD_DEFINED__
 #define __IActiveScriptParseProcedure2_64_FWD_DEFINED__
 typedef interface IActiveScriptParseProcedure2_64 IActiveScriptParseProcedure2_64;
+#ifdef __cplusplus
+interface IActiveScriptParseProcedure2_64;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptEncode_FWD_DEFINED__
 #define __IActiveScriptEncode_FWD_DEFINED__
 typedef interface IActiveScriptEncode IActiveScriptEncode;
+#ifdef __cplusplus
+interface IActiveScriptEncode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptHostEncode_FWD_DEFINED__
 #define __IActiveScriptHostEncode_FWD_DEFINED__
 typedef interface IActiveScriptHostEncode IActiveScriptHostEncode;
+#ifdef __cplusplus
+interface IActiveScriptHostEncode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindEventHandler_FWD_DEFINED__
 #define __IBindEventHandler_FWD_DEFINED__
 typedef interface IBindEventHandler IBindEventHandler;
+#ifdef __cplusplus
+interface IBindEventHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptStats_FWD_DEFINED__
 #define __IActiveScriptStats_FWD_DEFINED__
 typedef interface IActiveScriptStats IActiveScriptStats;
+#ifdef __cplusplus
+interface IActiveScriptStats;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptProperty_FWD_DEFINED__
 #define __IActiveScriptProperty_FWD_DEFINED__
 typedef interface IActiveScriptProperty IActiveScriptProperty;
+#ifdef __cplusplus
+interface IActiveScriptProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITridentEventSink_FWD_DEFINED__
 #define __ITridentEventSink_FWD_DEFINED__
 typedef interface ITridentEventSink ITridentEventSink;
+#ifdef __cplusplus
+interface ITridentEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptGarbageCollector_FWD_DEFINED__
 #define __IActiveScriptGarbageCollector_FWD_DEFINED__
 typedef interface IActiveScriptGarbageCollector IActiveScriptGarbageCollector;
+#ifdef __cplusplus
+interface IActiveScriptGarbageCollector;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptSIPInfo_FWD_DEFINED__
 #define __IActiveScriptSIPInfo_FWD_DEFINED__
 typedef interface IActiveScriptSIPInfo IActiveScriptSIPInfo;
+#ifdef __cplusplus
+interface IActiveScriptSIPInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveScriptStringCompare_FWD_DEFINED__
 #define __IActiveScriptStringCompare_FWD_DEFINED__
 typedef interface IActiveScriptStringCompare IActiveScriptStringCompare;
+#ifdef __cplusplus
+interface IActiveScriptStringCompare;
+#endif /* __cplusplus */
 #endif
 
 
@@ -484,53 +634,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptSite* This,
+        IActiveScriptSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptSite* This);
+        IActiveScriptSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptSite* This);
+        IActiveScriptSite *This);
 
     /*** IActiveScriptSite methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLCID)(
-        IActiveScriptSite* This,
+        IActiveScriptSite *This,
         LCID *plcid);
 
     HRESULT (STDMETHODCALLTYPE *GetItemInfo)(
-        IActiveScriptSite* This,
+        IActiveScriptSite *This,
         LPCOLESTR pstrName,
         DWORD dwReturnMask,
         IUnknown **ppiunkItem,
         ITypeInfo **ppti);
 
     HRESULT (STDMETHODCALLTYPE *GetDocVersionString)(
-        IActiveScriptSite* This,
+        IActiveScriptSite *This,
         BSTR *pbstrVersion);
 
     HRESULT (STDMETHODCALLTYPE *OnScriptTerminate)(
-        IActiveScriptSite* This,
+        IActiveScriptSite *This,
         const VARIANT *pvarResult,
         const EXCEPINFO *pexcepinfo);
 
     HRESULT (STDMETHODCALLTYPE *OnStateChange)(
-        IActiveScriptSite* This,
+        IActiveScriptSite *This,
         SCRIPTSTATE ssScriptState);
 
     HRESULT (STDMETHODCALLTYPE *OnScriptError)(
-        IActiveScriptSite* This,
+        IActiveScriptSite *This,
         IActiveScriptError *pscripterror);
 
     HRESULT (STDMETHODCALLTYPE *OnEnterScript)(
-        IActiveScriptSite* This);
+        IActiveScriptSite *This);
 
     HRESULT (STDMETHODCALLTYPE *OnLeaveScript)(
-        IActiveScriptSite* This);
+        IActiveScriptSite *This);
 
     END_INTERFACE
 } IActiveScriptSiteVtbl;
+
 interface IActiveScriptSite {
     CONST_VTBL IActiveScriptSiteVtbl* lpVtbl;
 };
@@ -591,72 +742,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetLCID_Proxy(
-    IActiveScriptSite* This,
-    LCID *plcid);
-void __RPC_STUB IActiveScriptSite_GetLCID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetItemInfo_Proxy(
-    IActiveScriptSite* This,
-    LPCOLESTR pstrName,
-    DWORD dwReturnMask,
-    IUnknown **ppiunkItem,
-    ITypeInfo **ppti);
-void __RPC_STUB IActiveScriptSite_GetItemInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_GetDocVersionString_Proxy(
-    IActiveScriptSite* This,
-    BSTR *pbstrVersion);
-void __RPC_STUB IActiveScriptSite_GetDocVersionString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnScriptTerminate_Proxy(
-    IActiveScriptSite* This,
-    const VARIANT *pvarResult,
-    const EXCEPINFO *pexcepinfo);
-void __RPC_STUB IActiveScriptSite_OnScriptTerminate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnStateChange_Proxy(
-    IActiveScriptSite* This,
-    SCRIPTSTATE ssScriptState);
-void __RPC_STUB IActiveScriptSite_OnStateChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnScriptError_Proxy(
-    IActiveScriptSite* This,
-    IActiveScriptError *pscripterror);
-void __RPC_STUB IActiveScriptSite_OnScriptError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnEnterScript_Proxy(
-    IActiveScriptSite* This);
-void __RPC_STUB IActiveScriptSite_OnEnterScript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSite_OnLeaveScript_Proxy(
-    IActiveScriptSite* This);
-void __RPC_STUB IActiveScriptSite_OnLeaveScript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptSite_INTERFACE_DEFINED__ */
 
@@ -693,33 +778,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptError* This,
+        IActiveScriptError *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptError* This);
+        IActiveScriptError *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptError* This);
+        IActiveScriptError *This);
 
     /*** IActiveScriptError methods ***/
     HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)(
-        IActiveScriptError* This,
+        IActiveScriptError *This,
         EXCEPINFO *pexcepinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetSourcePosition)(
-        IActiveScriptError* This,
+        IActiveScriptError *This,
         DWORD *pdwSourceContext,
         ULONG *pulLineNumber,
         LONG *plCharacterPosition);
 
     HRESULT (STDMETHODCALLTYPE *GetSourceLineText)(
-        IActiveScriptError* This,
+        IActiveScriptError *This,
         BSTR *pbstrSourceLine);
 
     END_INTERFACE
 } IActiveScriptErrorVtbl;
+
 interface IActiveScriptError {
     CONST_VTBL IActiveScriptErrorVtbl* lpVtbl;
 };
@@ -768,24 +854,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptError_GetSourcePosition_Proxy(
-    IActiveScriptError* This,
-    DWORD *pdwSourceContext,
-    ULONG *pulLineNumber,
-    LONG *plCharacterPosition);
-void __RPC_STUB IActiveScriptError_GetSourcePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptError_GetSourceLineText_Proxy(
-    IActiveScriptError* This,
-    BSTR *pbstrSourceLine);
-void __RPC_STUB IActiveScriptError_GetSourceLineText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IActiveScriptError_GetExceptionInfo_Proxy(
     IActiveScriptError* This,
     EXCEPINFO *pexcepinfo);
@@ -822,40 +890,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptError64* This,
+        IActiveScriptError64 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptError64* This);
+        IActiveScriptError64 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptError64* This);
+        IActiveScriptError64 *This);
 
     /*** IActiveScriptError methods ***/
     HRESULT (STDMETHODCALLTYPE *GetExceptionInfo)(
-        IActiveScriptError64* This,
+        IActiveScriptError64 *This,
         EXCEPINFO *pexcepinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetSourcePosition)(
-        IActiveScriptError64* This,
+        IActiveScriptError64 *This,
         DWORD *pdwSourceContext,
         ULONG *pulLineNumber,
         LONG *plCharacterPosition);
 
     HRESULT (STDMETHODCALLTYPE *GetSourceLineText)(
-        IActiveScriptError64* This,
+        IActiveScriptError64 *This,
         BSTR *pbstrSourceLine);
 
     /*** IActiveScriptError64 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSourcePosition64)(
-        IActiveScriptError64* This,
+        IActiveScriptError64 *This,
         DWORDLONG *pdwSourceContext,
         ULONG *pulLineNumber,
         LONG *plCharacterPosition);
 
     END_INTERFACE
 } IActiveScriptError64Vtbl;
+
 interface IActiveScriptError64 {
     CONST_VTBL IActiveScriptError64Vtbl* lpVtbl;
 };
@@ -902,16 +971,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptError64_GetSourcePosition64_Proxy(
-    IActiveScriptError64* This,
-    DWORDLONG *pdwSourceContext,
-    ULONG *pulLineNumber,
-    LONG *plCharacterPosition);
-void __RPC_STUB IActiveScriptError64_GetSourcePosition64_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptError64_INTERFACE_DEFINED__ */
 
@@ -942,27 +1001,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptSiteWindow* This,
+        IActiveScriptSiteWindow *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptSiteWindow* This);
+        IActiveScriptSiteWindow *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptSiteWindow* This);
+        IActiveScriptSiteWindow *This);
 
     /*** IActiveScriptSiteWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IActiveScriptSiteWindow* This,
+        IActiveScriptSiteWindow *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IActiveScriptSiteWindow* This,
+        IActiveScriptSiteWindow *This,
         WINBOOL fEnable);
 
     END_INTERFACE
 } IActiveScriptSiteWindowVtbl;
+
 interface IActiveScriptSiteWindow {
     CONST_VTBL IActiveScriptSiteWindowVtbl* lpVtbl;
 };
@@ -999,22 +1059,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptSiteWindow_GetWindow_Proxy(
-    IActiveScriptSiteWindow* This,
-    HWND *phwnd);
-void __RPC_STUB IActiveScriptSiteWindow_GetWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptSiteWindow_EnableModeless_Proxy(
-    IActiveScriptSiteWindow* This,
-    WINBOOL fEnable);
-void __RPC_STUB IActiveScriptSiteWindow_EnableModeless_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptSiteWindow_INTERFACE_DEFINED__ */
 
@@ -1044,24 +1088,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptSiteUIControl* This,
+        IActiveScriptSiteUIControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptSiteUIControl* This);
+        IActiveScriptSiteUIControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptSiteUIControl* This);
+        IActiveScriptSiteUIControl *This);
 
     /*** IActiveScriptSiteUIControl methods ***/
     HRESULT (STDMETHODCALLTYPE *GetUIBehavior)(
-        IActiveScriptSiteUIControl* This,
+        IActiveScriptSiteUIControl *This,
         SCRIPTUICITEM UicItem,
         SCRIPTUICHANDLING *pUicHandling);
 
     END_INTERFACE
 } IActiveScriptSiteUIControlVtbl;
+
 interface IActiveScriptSiteUIControl {
     CONST_VTBL IActiveScriptSiteUIControlVtbl* lpVtbl;
 };
@@ -1094,15 +1139,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptSiteUIControl_GetUIBehavior_Proxy(
-    IActiveScriptSiteUIControl* This,
-    SCRIPTUICITEM UicItem,
-    SCRIPTUICHANDLING *pUicHandling);
-void __RPC_STUB IActiveScriptSiteUIControl_GetUIBehavior_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptSiteUIControl_INTERFACE_DEFINED__ */
 
@@ -1131,22 +1167,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptSiteInterruptPoll* This,
+        IActiveScriptSiteInterruptPoll *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptSiteInterruptPoll* This);
+        IActiveScriptSiteInterruptPoll *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptSiteInterruptPoll* This);
+        IActiveScriptSiteInterruptPoll *This);
 
     /*** IActiveScriptSiteInterruptPoll methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryContinue)(
-        IActiveScriptSiteInterruptPoll* This);
+        IActiveScriptSiteInterruptPoll *This);
 
     END_INTERFACE
 } IActiveScriptSiteInterruptPollVtbl;
+
 interface IActiveScriptSiteInterruptPoll {
     CONST_VTBL IActiveScriptSiteInterruptPollVtbl* lpVtbl;
 };
@@ -1179,13 +1216,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptSiteInterruptPoll_QueryContinue_Proxy(
-    IActiveScriptSiteInterruptPoll* This);
-void __RPC_STUB IActiveScriptSiteInterruptPoll_QueryContinue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptSiteInterruptPoll_INTERFACE_DEFINED__ */
 
@@ -1260,80 +1290,81 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScript* This,
+        IActiveScript *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScript* This);
+        IActiveScript *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScript* This);
+        IActiveScript *This);
 
     /*** IActiveScript methods ***/
     HRESULT (STDMETHODCALLTYPE *SetScriptSite)(
-        IActiveScript* This,
+        IActiveScript *This,
         IActiveScriptSite *pass);
 
     HRESULT (STDMETHODCALLTYPE *GetScriptSite)(
-        IActiveScript* This,
+        IActiveScript *This,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *SetScriptState)(
-        IActiveScript* This,
+        IActiveScript *This,
         SCRIPTSTATE ss);
 
     HRESULT (STDMETHODCALLTYPE *GetScriptState)(
-        IActiveScript* This,
+        IActiveScript *This,
         SCRIPTSTATE *pssState);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IActiveScript* This);
+        IActiveScript *This);
 
     HRESULT (STDMETHODCALLTYPE *AddNamedItem)(
-        IActiveScript* This,
+        IActiveScript *This,
         LPCOLESTR pstrName,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *AddTypeLib)(
-        IActiveScript* This,
+        IActiveScript *This,
         REFGUID rguidTypeLib,
         DWORD dwMajor,
         DWORD dwMinor,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetScriptDispatch)(
-        IActiveScript* This,
+        IActiveScript *This,
         LPCOLESTR pstrItemName,
         IDispatch **ppdisp);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentScriptThreadID)(
-        IActiveScript* This,
+        IActiveScript *This,
         SCRIPTTHREADID *pstidThread);
 
     HRESULT (STDMETHODCALLTYPE *GetScriptThreadID)(
-        IActiveScript* This,
+        IActiveScript *This,
         DWORD dwWin32ThreadId,
         SCRIPTTHREADID *pstidThread);
 
     HRESULT (STDMETHODCALLTYPE *GetScriptThreadState)(
-        IActiveScript* This,
+        IActiveScript *This,
         SCRIPTTHREADID stidThread,
         SCRIPTTHREADSTATE *pstsState);
 
     HRESULT (STDMETHODCALLTYPE *InterruptScriptThread)(
-        IActiveScript* This,
+        IActiveScript *This,
         SCRIPTTHREADID stidThread,
         const EXCEPINFO *pexcepinfo,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IActiveScript* This,
+        IActiveScript *This,
         IActiveScript **ppscript);
 
     END_INTERFACE
 } IActiveScriptVtbl;
+
 interface IActiveScript {
     CONST_VTBL IActiveScriptVtbl* lpVtbl;
 };
@@ -1414,119 +1445,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScript_SetScriptSite_Proxy(
-    IActiveScript* This,
-    IActiveScriptSite *pass);
-void __RPC_STUB IActiveScript_SetScriptSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptSite_Proxy(
-    IActiveScript* This,
-    REFIID riid,
-    void **ppvObject);
-void __RPC_STUB IActiveScript_GetScriptSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_SetScriptState_Proxy(
-    IActiveScript* This,
-    SCRIPTSTATE ss);
-void __RPC_STUB IActiveScript_SetScriptState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptState_Proxy(
-    IActiveScript* This,
-    SCRIPTSTATE *pssState);
-void __RPC_STUB IActiveScript_GetScriptState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_Close_Proxy(
-    IActiveScript* This);
-void __RPC_STUB IActiveScript_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_AddNamedItem_Proxy(
-    IActiveScript* This,
-    LPCOLESTR pstrName,
-    DWORD dwFlags);
-void __RPC_STUB IActiveScript_AddNamedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_AddTypeLib_Proxy(
-    IActiveScript* This,
-    REFGUID rguidTypeLib,
-    DWORD dwMajor,
-    DWORD dwMinor,
-    DWORD dwFlags);
-void __RPC_STUB IActiveScript_AddTypeLib_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptDispatch_Proxy(
-    IActiveScript* This,
-    LPCOLESTR pstrItemName,
-    IDispatch **ppdisp);
-void __RPC_STUB IActiveScript_GetScriptDispatch_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_GetCurrentScriptThreadID_Proxy(
-    IActiveScript* This,
-    SCRIPTTHREADID *pstidThread);
-void __RPC_STUB IActiveScript_GetCurrentScriptThreadID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptThreadID_Proxy(
-    IActiveScript* This,
-    DWORD dwWin32ThreadId,
-    SCRIPTTHREADID *pstidThread);
-void __RPC_STUB IActiveScript_GetScriptThreadID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_GetScriptThreadState_Proxy(
-    IActiveScript* This,
-    SCRIPTTHREADID stidThread,
-    SCRIPTTHREADSTATE *pstsState);
-void __RPC_STUB IActiveScript_GetScriptThreadState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_InterruptScriptThread_Proxy(
-    IActiveScript* This,
-    SCRIPTTHREADID stidThread,
-    const EXCEPINFO *pexcepinfo,
-    DWORD dwFlags);
-void __RPC_STUB IActiveScript_InterruptScriptThread_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScript_Clone_Proxy(
-    IActiveScript* This,
-    IActiveScript **ppscript);
-void __RPC_STUB IActiveScript_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScript_INTERFACE_DEFINED__ */
 
@@ -1579,22 +1497,22 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParse32* This,
+        IActiveScriptParse32 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParse32* This);
+        IActiveScriptParse32 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParse32* This);
+        IActiveScriptParse32 *This);
 
     /*** IActiveScriptParse32 methods ***/
     HRESULT (STDMETHODCALLTYPE *InitNew)(
-        IActiveScriptParse32* This);
+        IActiveScriptParse32 *This);
 
     HRESULT (STDMETHODCALLTYPE *AddScriptlet)(
-        IActiveScriptParse32* This,
+        IActiveScriptParse32 *This,
         LPCOLESTR pstrDefaultName,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrItemName,
@@ -1608,7 +1526,7 @@
         EXCEPINFO *pexcepinfo);
 
     HRESULT (STDMETHODCALLTYPE *ParseScriptText)(
-        IActiveScriptParse32* This,
+        IActiveScriptParse32 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrItemName,
         IUnknown *punkContext,
@@ -1621,6 +1539,7 @@
 
     END_INTERFACE
 } IActiveScriptParse32Vtbl;
+
 interface IActiveScriptParse32 {
     CONST_VTBL IActiveScriptParse32Vtbl* lpVtbl;
 };
@@ -1661,47 +1580,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptParse32_InitNew_Proxy(
-    IActiveScriptParse32* This);
-void __RPC_STUB IActiveScriptParse32_InitNew_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptParse32_AddScriptlet_Proxy(
-    IActiveScriptParse32* This,
-    LPCOLESTR pstrDefaultName,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrItemName,
-    LPCOLESTR pstrSubItemName,
-    LPCOLESTR pstrEventName,
-    LPCOLESTR pstrDelimiter,
-    DWORD dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    BSTR *pbstrName,
-    EXCEPINFO *pexcepinfo);
-void __RPC_STUB IActiveScriptParse32_AddScriptlet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptParse32_ParseScriptText_Proxy(
-    IActiveScriptParse32* This,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrItemName,
-    IUnknown *punkContext,
-    LPCOLESTR pstrDelimiter,
-    DWORD dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    VARIANT *pvarResult,
-    EXCEPINFO *pexcepinfo);
-void __RPC_STUB IActiveScriptParse32_ParseScriptText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptParse32_INTERFACE_DEFINED__ */
 
@@ -1754,22 +1632,22 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParse64* This,
+        IActiveScriptParse64 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParse64* This);
+        IActiveScriptParse64 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParse64* This);
+        IActiveScriptParse64 *This);
 
     /*** IActiveScriptParse64 methods ***/
     HRESULT (STDMETHODCALLTYPE *InitNew)(
-        IActiveScriptParse64* This);
+        IActiveScriptParse64 *This);
 
     HRESULT (STDMETHODCALLTYPE *AddScriptlet)(
-        IActiveScriptParse64* This,
+        IActiveScriptParse64 *This,
         LPCOLESTR pstrDefaultName,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrItemName,
@@ -1783,7 +1661,7 @@
         EXCEPINFO *pexcepinfo);
 
     HRESULT (STDMETHODCALLTYPE *ParseScriptText)(
-        IActiveScriptParse64* This,
+        IActiveScriptParse64 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrItemName,
         IUnknown *punkContext,
@@ -1796,6 +1674,7 @@
 
     END_INTERFACE
 } IActiveScriptParse64Vtbl;
+
 interface IActiveScriptParse64 {
     CONST_VTBL IActiveScriptParse64Vtbl* lpVtbl;
 };
@@ -1836,47 +1715,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptParse64_InitNew_Proxy(
-    IActiveScriptParse64* This);
-void __RPC_STUB IActiveScriptParse64_InitNew_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptParse64_AddScriptlet_Proxy(
-    IActiveScriptParse64* This,
-    LPCOLESTR pstrDefaultName,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrItemName,
-    LPCOLESTR pstrSubItemName,
-    LPCOLESTR pstrEventName,
-    LPCOLESTR pstrDelimiter,
-    DWORDLONG dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    BSTR *pbstrName,
-    EXCEPINFO *pexcepinfo);
-void __RPC_STUB IActiveScriptParse64_AddScriptlet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptParse64_ParseScriptText_Proxy(
-    IActiveScriptParse64* This,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrItemName,
-    IUnknown *punkContext,
-    LPCOLESTR pstrDelimiter,
-    DWORDLONG dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    VARIANT *pvarResult,
-    EXCEPINFO *pexcepinfo);
-void __RPC_STUB IActiveScriptParse64_ParseScriptText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptParse64_INTERFACE_DEFINED__ */
 
@@ -1923,19 +1761,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParseProcedureOld32* This,
+        IActiveScriptParseProcedureOld32 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParseProcedureOld32* This);
+        IActiveScriptParseProcedureOld32 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParseProcedureOld32* This);
+        IActiveScriptParseProcedureOld32 *This);
 
     /*** IActiveScriptParseProcedureOld32 methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseProcedureText)(
-        IActiveScriptParseProcedureOld32* This,
+        IActiveScriptParseProcedureOld32 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrFormalParams,
         LPCOLESTR pstrItemName,
@@ -1948,6 +1786,7 @@
 
     END_INTERFACE
 } IActiveScriptParseProcedureOld32Vtbl;
+
 interface IActiveScriptParseProcedureOld32 {
     CONST_VTBL IActiveScriptParseProcedureOld32Vtbl* lpVtbl;
 };
@@ -1980,22 +1819,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedureOld32_ParseProcedureText_Proxy(
-    IActiveScriptParseProcedureOld32* This,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrFormalParams,
-    LPCOLESTR pstrItemName,
-    IUnknown *punkContext,
-    LPCOLESTR pstrDelimiter,
-    DWORD dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    IDispatch **ppdisp);
-void __RPC_STUB IActiveScriptParseProcedureOld32_ParseProcedureText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptParseProcedureOld32_INTERFACE_DEFINED__ */
 
@@ -2032,19 +1855,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParseProcedureOld64* This,
+        IActiveScriptParseProcedureOld64 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParseProcedureOld64* This);
+        IActiveScriptParseProcedureOld64 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParseProcedureOld64* This);
+        IActiveScriptParseProcedureOld64 *This);
 
     /*** IActiveScriptParseProcedureOld64 methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseProcedureText)(
-        IActiveScriptParseProcedureOld64* This,
+        IActiveScriptParseProcedureOld64 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrFormalParams,
         LPCOLESTR pstrItemName,
@@ -2057,6 +1880,7 @@
 
     END_INTERFACE
 } IActiveScriptParseProcedureOld64Vtbl;
+
 interface IActiveScriptParseProcedureOld64 {
     CONST_VTBL IActiveScriptParseProcedureOld64Vtbl* lpVtbl;
 };
@@ -2089,22 +1913,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedureOld64_ParseProcedureText_Proxy(
-    IActiveScriptParseProcedureOld64* This,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrFormalParams,
-    LPCOLESTR pstrItemName,
-    IUnknown *punkContext,
-    LPCOLESTR pstrDelimiter,
-    DWORDLONG dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    IDispatch **ppdisp);
-void __RPC_STUB IActiveScriptParseProcedureOld64_ParseProcedureText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptParseProcedureOld64_INTERFACE_DEFINED__ */
 
@@ -2152,19 +1960,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParseProcedure32* This,
+        IActiveScriptParseProcedure32 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParseProcedure32* This);
+        IActiveScriptParseProcedure32 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParseProcedure32* This);
+        IActiveScriptParseProcedure32 *This);
 
     /*** IActiveScriptParseProcedure32 methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseProcedureText)(
-        IActiveScriptParseProcedure32* This,
+        IActiveScriptParseProcedure32 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrFormalParams,
         LPCOLESTR pstrProcedureName,
@@ -2178,6 +1986,7 @@
 
     END_INTERFACE
 } IActiveScriptParseProcedure32Vtbl;
+
 interface IActiveScriptParseProcedure32 {
     CONST_VTBL IActiveScriptParseProcedure32Vtbl* lpVtbl;
 };
@@ -2210,23 +2019,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedure32_ParseProcedureText_Proxy(
-    IActiveScriptParseProcedure32* This,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrFormalParams,
-    LPCOLESTR pstrProcedureName,
-    LPCOLESTR pstrItemName,
-    IUnknown *punkContext,
-    LPCOLESTR pstrDelimiter,
-    DWORD dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    IDispatch **ppdisp);
-void __RPC_STUB IActiveScriptParseProcedure32_ParseProcedureText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptParseProcedure32_INTERFACE_DEFINED__ */
 
@@ -2264,19 +2056,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParseProcedure64* This,
+        IActiveScriptParseProcedure64 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParseProcedure64* This);
+        IActiveScriptParseProcedure64 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParseProcedure64* This);
+        IActiveScriptParseProcedure64 *This);
 
     /*** IActiveScriptParseProcedure64 methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseProcedureText)(
-        IActiveScriptParseProcedure64* This,
+        IActiveScriptParseProcedure64 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrFormalParams,
         LPCOLESTR pstrProcedureName,
@@ -2290,6 +2082,7 @@
 
     END_INTERFACE
 } IActiveScriptParseProcedure64Vtbl;
+
 interface IActiveScriptParseProcedure64 {
     CONST_VTBL IActiveScriptParseProcedure64Vtbl* lpVtbl;
 };
@@ -2322,23 +2115,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptParseProcedure64_ParseProcedureText_Proxy(
-    IActiveScriptParseProcedure64* This,
-    LPCOLESTR pstrCode,
-    LPCOLESTR pstrFormalParams,
-    LPCOLESTR pstrProcedureName,
-    LPCOLESTR pstrItemName,
-    IUnknown *punkContext,
-    LPCOLESTR pstrDelimiter,
-    DWORDLONG dwSourceContextCookie,
-    ULONG ulStartingLineNumber,
-    DWORD dwFlags,
-    IDispatch **ppdisp);
-void __RPC_STUB IActiveScriptParseProcedure64_ParseProcedureText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptParseProcedure64_INTERFACE_DEFINED__ */
 
@@ -2374,19 +2150,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParseProcedure2_32* This,
+        IActiveScriptParseProcedure2_32 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParseProcedure2_32* This);
+        IActiveScriptParseProcedure2_32 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParseProcedure2_32* This);
+        IActiveScriptParseProcedure2_32 *This);
 
     /*** IActiveScriptParseProcedure32 methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseProcedureText)(
-        IActiveScriptParseProcedure2_32* This,
+        IActiveScriptParseProcedure2_32 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrFormalParams,
         LPCOLESTR pstrProcedureName,
@@ -2400,6 +2176,7 @@
 
     END_INTERFACE
 } IActiveScriptParseProcedure2_32Vtbl;
+
 interface IActiveScriptParseProcedure2_32 {
     CONST_VTBL IActiveScriptParseProcedure2_32Vtbl* lpVtbl;
 };
@@ -2457,19 +2234,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptParseProcedure2_64* This,
+        IActiveScriptParseProcedure2_64 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptParseProcedure2_64* This);
+        IActiveScriptParseProcedure2_64 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptParseProcedure2_64* This);
+        IActiveScriptParseProcedure2_64 *This);
 
     /*** IActiveScriptParseProcedure64 methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseProcedureText)(
-        IActiveScriptParseProcedure2_64* This,
+        IActiveScriptParseProcedure2_64 *This,
         LPCOLESTR pstrCode,
         LPCOLESTR pstrFormalParams,
         LPCOLESTR pstrProcedureName,
@@ -2483,6 +2260,7 @@
 
     END_INTERFACE
 } IActiveScriptParseProcedure2_64Vtbl;
+
 interface IActiveScriptParseProcedure2_64 {
     CONST_VTBL IActiveScriptParseProcedure2_64Vtbl* lpVtbl;
 };
@@ -2567,19 +2345,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptEncode* This,
+        IActiveScriptEncode *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptEncode* This);
+        IActiveScriptEncode *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptEncode* This);
+        IActiveScriptEncode *This);
 
     /*** IActiveScriptEncode methods ***/
     HRESULT (STDMETHODCALLTYPE *EncodeSection)(
-        IActiveScriptEncode* This,
+        IActiveScriptEncode *This,
         LPCOLESTR pchIn,
         DWORD cchIn,
         LPOLESTR pchOut,
@@ -2587,7 +2365,7 @@
         DWORD *pcchRet);
 
     HRESULT (STDMETHODCALLTYPE *DecodeScript)(
-        IActiveScriptEncode* This,
+        IActiveScriptEncode *This,
         LPCOLESTR pchIn,
         DWORD cchIn,
         LPOLESTR pchOut,
@@ -2595,11 +2373,12 @@
         DWORD *pcchRet);
 
     HRESULT (STDMETHODCALLTYPE *GetEncodeProgId)(
-        IActiveScriptEncode* This,
+        IActiveScriptEncode *This,
         BSTR *pbstrOut);
 
     END_INTERFACE
 } IActiveScriptEncodeVtbl;
+
 interface IActiveScriptEncode {
     CONST_VTBL IActiveScriptEncodeVtbl* lpVtbl;
 };
@@ -2640,38 +2419,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptEncode_EncodeSection_Proxy(
-    IActiveScriptEncode* This,
-    LPCOLESTR pchIn,
-    DWORD cchIn,
-    LPOLESTR pchOut,
-    DWORD cchOut,
-    DWORD *pcchRet);
-void __RPC_STUB IActiveScriptEncode_EncodeSection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptEncode_DecodeScript_Proxy(
-    IActiveScriptEncode* This,
-    LPCOLESTR pchIn,
-    DWORD cchIn,
-    LPOLESTR pchOut,
-    DWORD cchOut,
-    DWORD *pcchRet);
-void __RPC_STUB IActiveScriptEncode_DecodeScript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptEncode_GetEncodeProgId_Proxy(
-    IActiveScriptEncode* This,
-    BSTR *pbstrOut);
-void __RPC_STUB IActiveScriptEncode_GetEncodeProgId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptEncode_INTERFACE_DEFINED__ */
 
@@ -2703,19 +2450,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptHostEncode* This,
+        IActiveScriptHostEncode *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptHostEncode* This);
+        IActiveScriptHostEncode *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptHostEncode* This);
+        IActiveScriptHostEncode *This);
 
     /*** IActiveScriptHostEncode methods ***/
     HRESULT (STDMETHODCALLTYPE *EncodeScriptHostFile)(
-        IActiveScriptHostEncode* This,
+        IActiveScriptHostEncode *This,
         BSTR bstrInFile,
         BSTR *pbstrOutFile,
         ULONG cFlags,
@@ -2723,6 +2470,7 @@
 
     END_INTERFACE
 } IActiveScriptHostEncodeVtbl;
+
 interface IActiveScriptHostEncode {
     CONST_VTBL IActiveScriptHostEncodeVtbl* lpVtbl;
 };
@@ -2755,17 +2503,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptHostEncode_EncodeScriptHostFile_Proxy(
-    IActiveScriptHostEncode* This,
-    BSTR bstrInFile,
-    BSTR *pbstrOutFile,
-    ULONG cFlags,
-    BSTR bstrDefaultLang);
-void __RPC_STUB IActiveScriptHostEncode_EncodeScriptHostFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptHostEncode_INTERFACE_DEFINED__ */
 
@@ -2795,24 +2532,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBindEventHandler* This,
+        IBindEventHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBindEventHandler* This);
+        IBindEventHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBindEventHandler* This);
+        IBindEventHandler *This);
 
     /*** IBindEventHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *BindHandler)(
-        IBindEventHandler* This,
+        IBindEventHandler *This,
         LPCOLESTR pstrEvent,
         IDispatch *pdisp);
 
     END_INTERFACE
 } IBindEventHandlerVtbl;
+
 interface IBindEventHandler {
     CONST_VTBL IBindEventHandlerVtbl* lpVtbl;
 };
@@ -2845,15 +2583,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBindEventHandler_BindHandler_Proxy(
-    IBindEventHandler* This,
-    LPCOLESTR pstrEvent,
-    IDispatch *pdisp);
-void __RPC_STUB IBindEventHandler_BindHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IBindEventHandler_INTERFACE_DEFINED__ */
 
@@ -2892,34 +2621,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptStats* This,
+        IActiveScriptStats *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptStats* This);
+        IActiveScriptStats *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptStats* This);
+        IActiveScriptStats *This);
 
     /*** IActiveScriptStats methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStat)(
-        IActiveScriptStats* This,
+        IActiveScriptStats *This,
         DWORD stid,
         ULONG *pluHi,
         ULONG *pluLo);
 
     HRESULT (STDMETHODCALLTYPE *GetStatEx)(
-        IActiveScriptStats* This,
+        IActiveScriptStats *This,
         REFGUID guid,
         ULONG *pluHi,
         ULONG *pluLo);
 
     HRESULT (STDMETHODCALLTYPE *ResetStats)(
-        IActiveScriptStats* This);
+        IActiveScriptStats *This);
 
     END_INTERFACE
 } IActiveScriptStatsVtbl;
+
 interface IActiveScriptStats {
     CONST_VTBL IActiveScriptStatsVtbl* lpVtbl;
 };
@@ -2960,33 +2690,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptStats_GetStat_Proxy(
-    IActiveScriptStats* This,
-    DWORD stid,
-    ULONG *pluHi,
-    ULONG *pluLo);
-void __RPC_STUB IActiveScriptStats_GetStat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptStats_GetStatEx_Proxy(
-    IActiveScriptStats* This,
-    REFGUID guid,
-    ULONG *pluHi,
-    ULONG *pluLo);
-void __RPC_STUB IActiveScriptStats_GetStatEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptStats_ResetStats_Proxy(
-    IActiveScriptStats* This);
-void __RPC_STUB IActiveScriptStats_ResetStats_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptStats_INTERFACE_DEFINED__ */
 
@@ -3022,31 +2725,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptProperty* This,
+        IActiveScriptProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptProperty* This);
+        IActiveScriptProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptProperty* This);
+        IActiveScriptProperty *This);
 
     /*** IActiveScriptProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        IActiveScriptProperty* This,
+        IActiveScriptProperty *This,
         DWORD dwProperty,
         VARIANT *pvarIndex,
         VARIANT *pvarValue);
 
     HRESULT (STDMETHODCALLTYPE *SetProperty)(
-        IActiveScriptProperty* This,
+        IActiveScriptProperty *This,
         DWORD dwProperty,
         VARIANT *pvarIndex,
         VARIANT *pvarValue);
 
     END_INTERFACE
 } IActiveScriptPropertyVtbl;
+
 interface IActiveScriptProperty {
     CONST_VTBL IActiveScriptPropertyVtbl* lpVtbl;
 };
@@ -3083,26 +2787,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptProperty_GetProperty_Proxy(
-    IActiveScriptProperty* This,
-    DWORD dwProperty,
-    VARIANT *pvarIndex,
-    VARIANT *pvarValue);
-void __RPC_STUB IActiveScriptProperty_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptProperty_SetProperty_Proxy(
-    IActiveScriptProperty* This,
-    DWORD dwProperty,
-    VARIANT *pvarIndex,
-    VARIANT *pvarValue);
-void __RPC_STUB IActiveScriptProperty_SetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptProperty_INTERFACE_DEFINED__ */
 
@@ -3134,19 +2818,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITridentEventSink* This,
+        ITridentEventSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITridentEventSink* This);
+        ITridentEventSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITridentEventSink* This);
+        ITridentEventSink *This);
 
     /*** ITridentEventSink methods ***/
     HRESULT (STDMETHODCALLTYPE *FireEvent)(
-        ITridentEventSink* This,
+        ITridentEventSink *This,
         LPCOLESTR pstrEvent,
         DISPPARAMS *pdp,
         VARIANT *pvarRes,
@@ -3154,6 +2838,7 @@
 
     END_INTERFACE
 } ITridentEventSinkVtbl;
+
 interface ITridentEventSink {
     CONST_VTBL ITridentEventSinkVtbl* lpVtbl;
 };
@@ -3186,17 +2871,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITridentEventSink_FireEvent_Proxy(
-    ITridentEventSink* This,
-    LPCOLESTR pstrEvent,
-    DISPPARAMS *pdp,
-    VARIANT *pvarRes,
-    EXCEPINFO *pei);
-void __RPC_STUB ITridentEventSink_FireEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITridentEventSink_INTERFACE_DEFINED__ */
 
@@ -3225,23 +2899,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptGarbageCollector* This,
+        IActiveScriptGarbageCollector *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptGarbageCollector* This);
+        IActiveScriptGarbageCollector *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptGarbageCollector* This);
+        IActiveScriptGarbageCollector *This);
 
     /*** IActiveScriptGarbageCollector methods ***/
     HRESULT (STDMETHODCALLTYPE *CollectGarbage)(
-        IActiveScriptGarbageCollector* This,
+        IActiveScriptGarbageCollector *This,
         SCRIPTGCTYPE scriptgctype);
 
     END_INTERFACE
 } IActiveScriptGarbageCollectorVtbl;
+
 interface IActiveScriptGarbageCollector {
     CONST_VTBL IActiveScriptGarbageCollectorVtbl* lpVtbl;
 };
@@ -3274,14 +2949,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptGarbageCollector_CollectGarbage_Proxy(
-    IActiveScriptGarbageCollector* This,
-    SCRIPTGCTYPE scriptgctype);
-void __RPC_STUB IActiveScriptGarbageCollector_CollectGarbage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptGarbageCollector_INTERFACE_DEFINED__ */
 
@@ -3310,23 +2977,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptSIPInfo* This,
+        IActiveScriptSIPInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptSIPInfo* This);
+        IActiveScriptSIPInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptSIPInfo* This);
+        IActiveScriptSIPInfo *This);
 
     /*** IActiveScriptSIPInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSIPOID)(
-        IActiveScriptSIPInfo* This,
+        IActiveScriptSIPInfo *This,
         GUID *poid_sip);
 
     END_INTERFACE
 } IActiveScriptSIPInfoVtbl;
+
 interface IActiveScriptSIPInfo {
     CONST_VTBL IActiveScriptSIPInfoVtbl* lpVtbl;
 };
@@ -3359,14 +3027,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptSIPInfo_GetSIPOID_Proxy(
-    IActiveScriptSIPInfo* This,
-    GUID *poid_sip);
-void __RPC_STUB IActiveScriptSIPInfo_GetSIPOID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptSIPInfo_INTERFACE_DEFINED__ */
 
@@ -3400,19 +3060,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptSiteTraceInfo* This,
+        IActiveScriptSiteTraceInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptSiteTraceInfo* This);
+        IActiveScriptSiteTraceInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptSiteTraceInfo* This);
+        IActiveScriptSiteTraceInfo *This);
 
     /*** IActiveScriptSiteTraceInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *SendScriptTraceInfo)(
-        IActiveScriptSiteTraceInfo* This,
+        IActiveScriptSiteTraceInfo *This,
         SCRIPTTRACEINFO stiEventType,
         GUID guidContextID,
         DWORD dwScriptContextCookie,
@@ -3422,6 +3082,7 @@
 
     END_INTERFACE
 } IActiveScriptSiteTraceInfoVtbl;
+
 interface IActiveScriptSiteTraceInfo {
     CONST_VTBL IActiveScriptSiteTraceInfoVtbl* lpVtbl;
 };
@@ -3454,19 +3115,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptSiteTraceInfo_SendScriptTraceInfo_Proxy(
-    IActiveScriptSiteTraceInfo* This,
-    SCRIPTTRACEINFO stiEventType,
-    GUID guidContextID,
-    DWORD dwScriptContextCookie,
-    LONG lScriptStatementStart,
-    LONG lScriptStatementEnd,
-    DWORD64 dwReserved);
-void __RPC_STUB IActiveScriptSiteTraceInfo_SendScriptTraceInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptSiteTraceInfo_INTERFACE_DEFINED__ */
 
@@ -3499,27 +3147,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptTraceInfo* This,
+        IActiveScriptTraceInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptTraceInfo* This);
+        IActiveScriptTraceInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptTraceInfo* This);
+        IActiveScriptTraceInfo *This);
 
     /*** IActiveScriptTraceInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *StartScriptTracing)(
-        IActiveScriptTraceInfo* This,
+        IActiveScriptTraceInfo *This,
         IActiveScriptSiteTraceInfo *pSiteTraceInfo,
         GUID guidContextID);
 
     HRESULT (STDMETHODCALLTYPE *StopScriptTracing)(
-        IActiveScriptTraceInfo* This);
+        IActiveScriptTraceInfo *This);
 
     END_INTERFACE
 } IActiveScriptTraceInfoVtbl;
+
 interface IActiveScriptTraceInfo {
     CONST_VTBL IActiveScriptTraceInfoVtbl* lpVtbl;
 };
@@ -3556,22 +3205,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptTraceInfo_StartScriptTracing_Proxy(
-    IActiveScriptTraceInfo* This,
-    IActiveScriptSiteTraceInfo *pSiteTraceInfo,
-    GUID guidContextID);
-void __RPC_STUB IActiveScriptTraceInfo_StartScriptTracing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveScriptTraceInfo_StopScriptTracing_Proxy(
-    IActiveScriptTraceInfo* This);
-void __RPC_STUB IActiveScriptTraceInfo_StopScriptTracing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptTraceInfo_INTERFACE_DEFINED__ */
 
@@ -3602,25 +3235,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveScriptStringCompare* This,
+        IActiveScriptStringCompare *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveScriptStringCompare* This);
+        IActiveScriptStringCompare *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveScriptStringCompare* This);
+        IActiveScriptStringCompare *This);
 
     /*** IActiveScriptStringCompare methods ***/
     HRESULT (STDMETHODCALLTYPE *StrComp)(
-        IActiveScriptStringCompare* This,
+        IActiveScriptStringCompare *This,
         BSTR bszStr1,
         BSTR bszStr2,
         LONG *iRet);
 
     END_INTERFACE
 } IActiveScriptStringCompareVtbl;
+
 interface IActiveScriptStringCompare {
     CONST_VTBL IActiveScriptStringCompareVtbl* lpVtbl;
 };
@@ -3653,16 +3287,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveScriptStringCompare_StrComp_Proxy(
-    IActiveScriptStringCompare* This,
-    BSTR bszStr1,
-    BSTR bszStr2,
-    LONG *iRet);
-void __RPC_STUB IActiveScriptStringCompare_StrComp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveScriptStringCompare_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/adhoc.h b/mingw-w64-headers/include/adhoc.h
index 9828a45..ab1fcdd 100644
--- a/mingw-w64-headers/include/adhoc.h
+++ b/mingw-w64-headers/include/adhoc.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/adhoc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/adhoc.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IDot11AdHocManager_FWD_DEFINED__
 #define __IDot11AdHocManager_FWD_DEFINED__
 typedef interface IDot11AdHocManager IDot11AdHocManager;
+#ifdef __cplusplus
+interface IDot11AdHocManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocManagerNotificationSink_FWD_DEFINED__
 #define __IDot11AdHocManagerNotificationSink_FWD_DEFINED__
 typedef interface IDot11AdHocManagerNotificationSink IDot11AdHocManagerNotificationSink;
+#ifdef __cplusplus
+interface IDot11AdHocManagerNotificationSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDot11AdHocNetworks_FWD_DEFINED__
 #define __IEnumDot11AdHocNetworks_FWD_DEFINED__
 typedef interface IEnumDot11AdHocNetworks IEnumDot11AdHocNetworks;
+#ifdef __cplusplus
+interface IEnumDot11AdHocNetworks;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocNetwork_FWD_DEFINED__
 #define __IDot11AdHocNetwork_FWD_DEFINED__
 typedef interface IDot11AdHocNetwork IDot11AdHocNetwork;
+#ifdef __cplusplus
+interface IDot11AdHocNetwork;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__
 #define __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__
 typedef interface IDot11AdHocNetworkNotificationSink IDot11AdHocNetworkNotificationSink;
+#ifdef __cplusplus
+interface IDot11AdHocNetworkNotificationSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocInterface_FWD_DEFINED__
 #define __IDot11AdHocInterface_FWD_DEFINED__
 typedef interface IDot11AdHocInterface IDot11AdHocInterface;
+#ifdef __cplusplus
+interface IDot11AdHocInterface;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDot11AdHocInterfaces_FWD_DEFINED__
 #define __IEnumDot11AdHocInterfaces_FWD_DEFINED__
 typedef interface IEnumDot11AdHocInterfaces IEnumDot11AdHocInterfaces;
+#ifdef __cplusplus
+interface IEnumDot11AdHocInterfaces;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__
 #define __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__
 typedef interface IEnumDot11AdHocSecuritySettings IEnumDot11AdHocSecuritySettings;
+#ifdef __cplusplus
+interface IEnumDot11AdHocSecuritySettings;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocSecuritySettings_FWD_DEFINED__
 #define __IDot11AdHocSecuritySettings_FWD_DEFINED__
 typedef interface IDot11AdHocSecuritySettings IDot11AdHocSecuritySettings;
+#ifdef __cplusplus
+interface IDot11AdHocSecuritySettings;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__
 #define __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__
 typedef interface IDot11AdHocInterfaceNotificationSink IDot11AdHocInterfaceNotificationSink;
+#ifdef __cplusplus
+interface IDot11AdHocInterfaceNotificationSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __Dot11AdHocManager_FWD_DEFINED__
@@ -92,51 +122,81 @@
 #ifndef __IDot11AdHocManager_FWD_DEFINED__
 #define __IDot11AdHocManager_FWD_DEFINED__
 typedef interface IDot11AdHocManager IDot11AdHocManager;
+#ifdef __cplusplus
+interface IDot11AdHocManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocManagerNotificationSink_FWD_DEFINED__
 #define __IDot11AdHocManagerNotificationSink_FWD_DEFINED__
 typedef interface IDot11AdHocManagerNotificationSink IDot11AdHocManagerNotificationSink;
+#ifdef __cplusplus
+interface IDot11AdHocManagerNotificationSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocNetwork_FWD_DEFINED__
 #define __IDot11AdHocNetwork_FWD_DEFINED__
 typedef interface IDot11AdHocNetwork IDot11AdHocNetwork;
+#ifdef __cplusplus
+interface IDot11AdHocNetwork;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__
 #define __IDot11AdHocNetworkNotificationSink_FWD_DEFINED__
 typedef interface IDot11AdHocNetworkNotificationSink IDot11AdHocNetworkNotificationSink;
+#ifdef __cplusplus
+interface IDot11AdHocNetworkNotificationSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocInterface_FWD_DEFINED__
 #define __IDot11AdHocInterface_FWD_DEFINED__
 typedef interface IDot11AdHocInterface IDot11AdHocInterface;
+#ifdef __cplusplus
+interface IDot11AdHocInterface;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__
 #define __IDot11AdHocInterfaceNotificationSink_FWD_DEFINED__
 typedef interface IDot11AdHocInterfaceNotificationSink IDot11AdHocInterfaceNotificationSink;
+#ifdef __cplusplus
+interface IDot11AdHocInterfaceNotificationSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDot11AdHocSecuritySettings_FWD_DEFINED__
 #define __IDot11AdHocSecuritySettings_FWD_DEFINED__
 typedef interface IDot11AdHocSecuritySettings IDot11AdHocSecuritySettings;
+#ifdef __cplusplus
+interface IDot11AdHocSecuritySettings;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDot11AdHocInterfaces_FWD_DEFINED__
 #define __IEnumDot11AdHocInterfaces_FWD_DEFINED__
 typedef interface IEnumDot11AdHocInterfaces IEnumDot11AdHocInterfaces;
+#ifdef __cplusplus
+interface IEnumDot11AdHocInterfaces;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDot11AdHocNetworks_FWD_DEFINED__
 #define __IEnumDot11AdHocNetworks_FWD_DEFINED__
 typedef interface IEnumDot11AdHocNetworks IEnumDot11AdHocNetworks;
+#ifdef __cplusplus
+interface IEnumDot11AdHocNetworks;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__
 #define __IEnumDot11AdHocSecuritySettings_FWD_DEFINED__
 typedef interface IEnumDot11AdHocSecuritySettings IEnumDot11AdHocSecuritySettings;
+#ifdef __cplusplus
+interface IEnumDot11AdHocSecuritySettings;
+#endif /* __cplusplus */
 #endif
 
 typedef enum tagDOT11_ADHOC_CIPHER_ALGORITHM {
@@ -209,19 +269,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDot11AdHocManager* This,
+        IDot11AdHocManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDot11AdHocManager* This);
+        IDot11AdHocManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDot11AdHocManager* This);
+        IDot11AdHocManager *This);
 
     /*** IDot11AdHocManager methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateNetwork)(
-        IDot11AdHocManager* This,
+        IDot11AdHocManager *This,
         LPCWSTR Name,
         LPCWSTR Password,
         LONG GeographicalId,
@@ -231,27 +291,28 @@
         IDot11AdHocNetwork **pIAdHoc);
 
     HRESULT (STDMETHODCALLTYPE *CommitCreatedNetwork)(
-        IDot11AdHocManager* This,
+        IDot11AdHocManager *This,
         IDot11AdHocNetwork *pIAdHoc,
         BOOLEAN fSaveProfile,
         BOOLEAN fMakeSavedProfileUserSpecific);
 
     HRESULT (STDMETHODCALLTYPE *GetIEnumDot11AdHocNetworks)(
-        IDot11AdHocManager* This,
+        IDot11AdHocManager *This,
         GUID *pContextGuid,
         IEnumDot11AdHocNetworks **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *GetIEnumDot11AdHocInterfaces)(
-        IDot11AdHocManager* This,
+        IDot11AdHocManager *This,
         IEnumDot11AdHocInterfaces **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *GetNetwork)(
-        IDot11AdHocManager* This,
+        IDot11AdHocManager *This,
         GUID *NetworkSignature,
         IDot11AdHocNetwork **pNetwork);
 
     END_INTERFACE
 } IDot11AdHocManagerVtbl;
+
 interface IDot11AdHocManager {
     CONST_VTBL IDot11AdHocManagerVtbl* lpVtbl;
 };
@@ -300,56 +361,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDot11AdHocManager_CreateNetwork_Proxy(
-    IDot11AdHocManager* This,
-    LPCWSTR Name,
-    LPCWSTR Password,
-    LONG GeographicalId,
-    IDot11AdHocInterface *pInterface,
-    IDot11AdHocSecuritySettings *pSecurity,
-    GUID *pContextGuid,
-    IDot11AdHocNetwork **pIAdHoc);
-void __RPC_STUB IDot11AdHocManager_CreateNetwork_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocManager_CommitCreatedNetwork_Proxy(
-    IDot11AdHocManager* This,
-    IDot11AdHocNetwork *pIAdHoc,
-    BOOLEAN fSaveProfile,
-    BOOLEAN fMakeSavedProfileUserSpecific);
-void __RPC_STUB IDot11AdHocManager_CommitCreatedNetwork_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocManager_GetIEnumDot11AdHocNetworks_Proxy(
-    IDot11AdHocManager* This,
-    GUID *pContextGuid,
-    IEnumDot11AdHocNetworks **ppEnum);
-void __RPC_STUB IDot11AdHocManager_GetIEnumDot11AdHocNetworks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocManager_GetIEnumDot11AdHocInterfaces_Proxy(
-    IDot11AdHocManager* This,
-    IEnumDot11AdHocInterfaces **ppEnum);
-void __RPC_STUB IDot11AdHocManager_GetIEnumDot11AdHocInterfaces_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocManager_GetNetwork_Proxy(
-    IDot11AdHocManager* This,
-    GUID *NetworkSignature,
-    IDot11AdHocNetwork **pNetwork);
-void __RPC_STUB IDot11AdHocManager_GetNetwork_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDot11AdHocManager_INTERFACE_DEFINED__ */
 
@@ -386,35 +397,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDot11AdHocManagerNotificationSink* This,
+        IDot11AdHocManagerNotificationSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDot11AdHocManagerNotificationSink* This);
+        IDot11AdHocManagerNotificationSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDot11AdHocManagerNotificationSink* This);
+        IDot11AdHocManagerNotificationSink *This);
 
     /*** IDot11AdHocManagerNotificationSink methods ***/
     HRESULT (STDMETHODCALLTYPE *OnNetworkAdd)(
-        IDot11AdHocManagerNotificationSink* This,
+        IDot11AdHocManagerNotificationSink *This,
         IDot11AdHocNetwork *pIAdHocNetwork);
 
     HRESULT (STDMETHODCALLTYPE *OnNetworkRemove)(
-        IDot11AdHocManagerNotificationSink* This,
+        IDot11AdHocManagerNotificationSink *This,
         GUID *Signature);
 
     HRESULT (STDMETHODCALLTYPE *OnInterfaceAdd)(
-        IDot11AdHocManagerNotificationSink* This,
+        IDot11AdHocManagerNotificationSink *This,
         IDot11AdHocInterface *pIAdHocInterface);
 
     HRESULT (STDMETHODCALLTYPE *OnInterfaceRemove)(
-        IDot11AdHocManagerNotificationSink* This,
+        IDot11AdHocManagerNotificationSink *This,
         GUID *Signature);
 
     END_INTERFACE
 } IDot11AdHocManagerNotificationSinkVtbl;
+
 interface IDot11AdHocManagerNotificationSink {
     CONST_VTBL IDot11AdHocManagerNotificationSinkVtbl* lpVtbl;
 };
@@ -459,38 +471,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnNetworkAdd_Proxy(
-    IDot11AdHocManagerNotificationSink* This,
-    IDot11AdHocNetwork *pIAdHocNetwork);
-void __RPC_STUB IDot11AdHocManagerNotificationSink_OnNetworkAdd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnNetworkRemove_Proxy(
-    IDot11AdHocManagerNotificationSink* This,
-    GUID *Signature);
-void __RPC_STUB IDot11AdHocManagerNotificationSink_OnNetworkRemove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnInterfaceAdd_Proxy(
-    IDot11AdHocManagerNotificationSink* This,
-    IDot11AdHocInterface *pIAdHocInterface);
-void __RPC_STUB IDot11AdHocManagerNotificationSink_OnInterfaceAdd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocManagerNotificationSink_OnInterfaceRemove_Proxy(
-    IDot11AdHocManagerNotificationSink* This,
-    GUID *Signature);
-void __RPC_STUB IDot11AdHocManagerNotificationSink_OnInterfaceRemove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDot11AdHocManagerNotificationSink_INTERFACE_DEFINED__ */
 
@@ -529,36 +509,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumDot11AdHocNetworks* This,
+        IEnumDot11AdHocNetworks *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumDot11AdHocNetworks* This);
+        IEnumDot11AdHocNetworks *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumDot11AdHocNetworks* This);
+        IEnumDot11AdHocNetworks *This);
 
     /*** IEnumDot11AdHocNetworks methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumDot11AdHocNetworks* This,
+        IEnumDot11AdHocNetworks *This,
         ULONG cElt,
         IDot11AdHocNetwork **rgElt,
         ULONG *pcEltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumDot11AdHocNetworks* This,
+        IEnumDot11AdHocNetworks *This,
         ULONG cElt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumDot11AdHocNetworks* This);
+        IEnumDot11AdHocNetworks *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumDot11AdHocNetworks* This,
+        IEnumDot11AdHocNetworks *This,
         IEnumDot11AdHocNetworks **ppEnum);
 
     END_INTERFACE
 } IEnumDot11AdHocNetworksVtbl;
+
 interface IEnumDot11AdHocNetworks {
     CONST_VTBL IEnumDot11AdHocNetworksVtbl* lpVtbl;
 };
@@ -603,39 +584,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Next_Proxy(
-    IEnumDot11AdHocNetworks* This,
-    ULONG cElt,
-    IDot11AdHocNetwork **rgElt,
-    ULONG *pcEltFetched);
-void __RPC_STUB IEnumDot11AdHocNetworks_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Skip_Proxy(
-    IEnumDot11AdHocNetworks* This,
-    ULONG cElt);
-void __RPC_STUB IEnumDot11AdHocNetworks_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Reset_Proxy(
-    IEnumDot11AdHocNetworks* This);
-void __RPC_STUB IEnumDot11AdHocNetworks_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocNetworks_Clone_Proxy(
-    IEnumDot11AdHocNetworks* This,
-    IEnumDot11AdHocNetworks **ppEnum);
-void __RPC_STUB IEnumDot11AdHocNetworks_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumDot11AdHocNetworks_INTERFACE_DEFINED__ */
 
@@ -700,69 +648,70 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDot11AdHocNetwork* This);
+        IDot11AdHocNetwork *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDot11AdHocNetwork* This);
+        IDot11AdHocNetwork *This);
 
     /*** IDot11AdHocNetwork methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         DOT11_ADHOC_NETWORK_CONNECTION_STATUS *eStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetSSID)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         LPWSTR *ppszwSSID);
 
     HRESULT (STDMETHODCALLTYPE *HasProfile)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         BOOLEAN *pf11d);
 
     HRESULT (STDMETHODCALLTYPE *GetProfileName)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         LPWSTR *ppszwProfileName);
 
     HRESULT (STDMETHODCALLTYPE *DeleteProfile)(
-        IDot11AdHocNetwork* This);
+        IDot11AdHocNetwork *This);
 
     HRESULT (STDMETHODCALLTYPE *GetSignalQuality)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         ULONG *puStrengthValue,
         ULONG *puStrengthMax);
 
     HRESULT (STDMETHODCALLTYPE *GetSecuritySetting)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         IDot11AdHocSecuritySettings **pAdHocSecuritySetting);
 
     HRESULT (STDMETHODCALLTYPE *GetContextGuid)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         GUID *pContextGuid);
 
     HRESULT (STDMETHODCALLTYPE *GetSignature)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         GUID *pSignature);
 
     HRESULT (STDMETHODCALLTYPE *GetInterface)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         IDot11AdHocInterface **pAdHocInterface);
 
     HRESULT (STDMETHODCALLTYPE *Connect)(
-        IDot11AdHocNetwork* This,
+        IDot11AdHocNetwork *This,
         LPCWSTR Passphrase,
         LONG GeographicalId,
         BOOLEAN fSaveProfile,
         BOOLEAN fMakeSavedProfileUserSpecific);
 
     HRESULT (STDMETHODCALLTYPE *Disconnect)(
-        IDot11AdHocNetwork* This);
+        IDot11AdHocNetwork *This);
 
     END_INTERFACE
 } IDot11AdHocNetworkVtbl;
+
 interface IDot11AdHocNetwork {
     CONST_VTBL IDot11AdHocNetworkVtbl* lpVtbl;
 };
@@ -839,104 +788,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetStatus_Proxy(
-    IDot11AdHocNetwork* This,
-    DOT11_ADHOC_NETWORK_CONNECTION_STATUS *eStatus);
-void __RPC_STUB IDot11AdHocNetwork_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSSID_Proxy(
-    IDot11AdHocNetwork* This,
-    LPWSTR *ppszwSSID);
-void __RPC_STUB IDot11AdHocNetwork_GetSSID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_HasProfile_Proxy(
-    IDot11AdHocNetwork* This,
-    BOOLEAN *pf11d);
-void __RPC_STUB IDot11AdHocNetwork_HasProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetProfileName_Proxy(
-    IDot11AdHocNetwork* This,
-    LPWSTR *ppszwProfileName);
-void __RPC_STUB IDot11AdHocNetwork_GetProfileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_DeleteProfile_Proxy(
-    IDot11AdHocNetwork* This);
-void __RPC_STUB IDot11AdHocNetwork_DeleteProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSignalQuality_Proxy(
-    IDot11AdHocNetwork* This,
-    ULONG *puStrengthValue,
-    ULONG *puStrengthMax);
-void __RPC_STUB IDot11AdHocNetwork_GetSignalQuality_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSecuritySetting_Proxy(
-    IDot11AdHocNetwork* This,
-    IDot11AdHocSecuritySettings **pAdHocSecuritySetting);
-void __RPC_STUB IDot11AdHocNetwork_GetSecuritySetting_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetContextGuid_Proxy(
-    IDot11AdHocNetwork* This,
-    GUID *pContextGuid);
-void __RPC_STUB IDot11AdHocNetwork_GetContextGuid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetSignature_Proxy(
-    IDot11AdHocNetwork* This,
-    GUID *pSignature);
-void __RPC_STUB IDot11AdHocNetwork_GetSignature_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_GetInterface_Proxy(
-    IDot11AdHocNetwork* This,
-    IDot11AdHocInterface **pAdHocInterface);
-void __RPC_STUB IDot11AdHocNetwork_GetInterface_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_Connect_Proxy(
-    IDot11AdHocNetwork* This,
-    LPCWSTR Passphrase,
-    LONG GeographicalId,
-    BOOLEAN fSaveProfile,
-    BOOLEAN fMakeSavedProfileUserSpecific);
-void __RPC_STUB IDot11AdHocNetwork_Connect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetwork_Disconnect_Proxy(
-    IDot11AdHocNetwork* This);
-void __RPC_STUB IDot11AdHocNetwork_Disconnect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDot11AdHocNetwork_INTERFACE_DEFINED__ */
 
@@ -967,27 +818,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDot11AdHocNetworkNotificationSink* This,
+        IDot11AdHocNetworkNotificationSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDot11AdHocNetworkNotificationSink* This);
+        IDot11AdHocNetworkNotificationSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDot11AdHocNetworkNotificationSink* This);
+        IDot11AdHocNetworkNotificationSink *This);
 
     /*** IDot11AdHocNetworkNotificationSink methods ***/
     HRESULT (STDMETHODCALLTYPE *OnStatusChange)(
-        IDot11AdHocNetworkNotificationSink* This,
+        IDot11AdHocNetworkNotificationSink *This,
         DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus);
 
     HRESULT (STDMETHODCALLTYPE *OnConnectFail)(
-        IDot11AdHocNetworkNotificationSink* This,
+        IDot11AdHocNetworkNotificationSink *This,
         DOT11_ADHOC_CONNECT_FAIL_REASON eFailReason);
 
     END_INTERFACE
 } IDot11AdHocNetworkNotificationSinkVtbl;
+
 interface IDot11AdHocNetworkNotificationSink {
     CONST_VTBL IDot11AdHocNetworkNotificationSinkVtbl* lpVtbl;
 };
@@ -1024,22 +876,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetworkNotificationSink_OnStatusChange_Proxy(
-    IDot11AdHocNetworkNotificationSink* This,
-    DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus);
-void __RPC_STUB IDot11AdHocNetworkNotificationSink_OnStatusChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocNetworkNotificationSink_OnConnectFail_Proxy(
-    IDot11AdHocNetworkNotificationSink* This,
-    DOT11_ADHOC_CONNECT_FAIL_REASON eFailReason);
-void __RPC_STUB IDot11AdHocNetworkNotificationSink_OnConnectFail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDot11AdHocNetworkNotificationSink_INTERFACE_DEFINED__ */
 
@@ -1092,56 +928,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDot11AdHocInterface* This);
+        IDot11AdHocInterface *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDot11AdHocInterface* This);
+        IDot11AdHocInterface *This);
 
     /*** IDot11AdHocInterface methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDeviceSignature)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         GUID *pSignature);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *IsDot11d)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         BOOLEAN *pf11d);
 
     HRESULT (STDMETHODCALLTYPE *IsAdHocCapable)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         BOOLEAN *pfAdHocCapable);
 
     HRESULT (STDMETHODCALLTYPE *IsRadioOn)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         BOOLEAN *pfIsRadioOn);
 
     HRESULT (STDMETHODCALLTYPE *GetActiveNetwork)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         IDot11AdHocNetwork **ppNetwork);
 
     HRESULT (STDMETHODCALLTYPE *GetIEnumSecuritySettings)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         IEnumDot11AdHocSecuritySettings **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *GetIEnumDot11AdHocNetworks)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         GUID *pFilterGuid,
         IEnumDot11AdHocNetworks **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        IDot11AdHocInterface* This,
+        IDot11AdHocInterface *This,
         DOT11_ADHOC_NETWORK_CONNECTION_STATUS *pState);
 
     END_INTERFACE
 } IDot11AdHocInterfaceVtbl;
+
 interface IDot11AdHocInterface {
     CONST_VTBL IDot11AdHocInterfaceVtbl* lpVtbl;
 };
@@ -1206,79 +1043,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetDeviceSignature_Proxy(
-    IDot11AdHocInterface* This,
-    GUID *pSignature);
-void __RPC_STUB IDot11AdHocInterface_GetDeviceSignature_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetFriendlyName_Proxy(
-    IDot11AdHocInterface* This,
-    LPWSTR *ppszName);
-void __RPC_STUB IDot11AdHocInterface_GetFriendlyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_IsDot11d_Proxy(
-    IDot11AdHocInterface* This,
-    BOOLEAN *pf11d);
-void __RPC_STUB IDot11AdHocInterface_IsDot11d_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_IsAdHocCapable_Proxy(
-    IDot11AdHocInterface* This,
-    BOOLEAN *pfAdHocCapable);
-void __RPC_STUB IDot11AdHocInterface_IsAdHocCapable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_IsRadioOn_Proxy(
-    IDot11AdHocInterface* This,
-    BOOLEAN *pfIsRadioOn);
-void __RPC_STUB IDot11AdHocInterface_IsRadioOn_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetActiveNetwork_Proxy(
-    IDot11AdHocInterface* This,
-    IDot11AdHocNetwork **ppNetwork);
-void __RPC_STUB IDot11AdHocInterface_GetActiveNetwork_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetIEnumSecuritySettings_Proxy(
-    IDot11AdHocInterface* This,
-    IEnumDot11AdHocSecuritySettings **ppEnum);
-void __RPC_STUB IDot11AdHocInterface_GetIEnumSecuritySettings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetIEnumDot11AdHocNetworks_Proxy(
-    IDot11AdHocInterface* This,
-    GUID *pFilterGuid,
-    IEnumDot11AdHocNetworks **ppEnum);
-void __RPC_STUB IDot11AdHocInterface_GetIEnumDot11AdHocNetworks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterface_GetStatus_Proxy(
-    IDot11AdHocInterface* This,
-    DOT11_ADHOC_NETWORK_CONNECTION_STATUS *pState);
-void __RPC_STUB IDot11AdHocInterface_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDot11AdHocInterface_INTERFACE_DEFINED__ */
 
@@ -1317,36 +1081,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumDot11AdHocInterfaces* This,
+        IEnumDot11AdHocInterfaces *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumDot11AdHocInterfaces* This);
+        IEnumDot11AdHocInterfaces *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumDot11AdHocInterfaces* This);
+        IEnumDot11AdHocInterfaces *This);
 
     /*** IEnumDot11AdHocInterfaces methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumDot11AdHocInterfaces* This,
+        IEnumDot11AdHocInterfaces *This,
         ULONG cElt,
         IDot11AdHocInterface **rgElt,
         ULONG *pcEltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumDot11AdHocInterfaces* This,
+        IEnumDot11AdHocInterfaces *This,
         ULONG cElt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumDot11AdHocInterfaces* This);
+        IEnumDot11AdHocInterfaces *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumDot11AdHocInterfaces* This,
+        IEnumDot11AdHocInterfaces *This,
         IEnumDot11AdHocInterfaces **ppEnum);
 
     END_INTERFACE
 } IEnumDot11AdHocInterfacesVtbl;
+
 interface IEnumDot11AdHocInterfaces {
     CONST_VTBL IEnumDot11AdHocInterfacesVtbl* lpVtbl;
 };
@@ -1391,39 +1156,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Next_Proxy(
-    IEnumDot11AdHocInterfaces* This,
-    ULONG cElt,
-    IDot11AdHocInterface **rgElt,
-    ULONG *pcEltFetched);
-void __RPC_STUB IEnumDot11AdHocInterfaces_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Skip_Proxy(
-    IEnumDot11AdHocInterfaces* This,
-    ULONG cElt);
-void __RPC_STUB IEnumDot11AdHocInterfaces_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Reset_Proxy(
-    IEnumDot11AdHocInterfaces* This);
-void __RPC_STUB IEnumDot11AdHocInterfaces_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocInterfaces_Clone_Proxy(
-    IEnumDot11AdHocInterfaces* This,
-    IEnumDot11AdHocInterfaces **ppEnum);
-void __RPC_STUB IEnumDot11AdHocInterfaces_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumDot11AdHocInterfaces_INTERFACE_DEFINED__ */
 
@@ -1462,36 +1194,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumDot11AdHocSecuritySettings* This,
+        IEnumDot11AdHocSecuritySettings *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumDot11AdHocSecuritySettings* This);
+        IEnumDot11AdHocSecuritySettings *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumDot11AdHocSecuritySettings* This);
+        IEnumDot11AdHocSecuritySettings *This);
 
     /*** IEnumDot11AdHocSecuritySettings methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumDot11AdHocSecuritySettings* This,
+        IEnumDot11AdHocSecuritySettings *This,
         ULONG cElt,
         IDot11AdHocSecuritySettings **rgElt,
         ULONG *pcEltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumDot11AdHocSecuritySettings* This,
+        IEnumDot11AdHocSecuritySettings *This,
         ULONG cElt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumDot11AdHocSecuritySettings* This);
+        IEnumDot11AdHocSecuritySettings *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumDot11AdHocSecuritySettings* This,
+        IEnumDot11AdHocSecuritySettings *This,
         IEnumDot11AdHocSecuritySettings **ppEnum);
 
     END_INTERFACE
 } IEnumDot11AdHocSecuritySettingsVtbl;
+
 interface IEnumDot11AdHocSecuritySettings {
     CONST_VTBL IEnumDot11AdHocSecuritySettingsVtbl* lpVtbl;
 };
@@ -1536,39 +1269,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Next_Proxy(
-    IEnumDot11AdHocSecuritySettings* This,
-    ULONG cElt,
-    IDot11AdHocSecuritySettings **rgElt,
-    ULONG *pcEltFetched);
-void __RPC_STUB IEnumDot11AdHocSecuritySettings_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Skip_Proxy(
-    IEnumDot11AdHocSecuritySettings* This,
-    ULONG cElt);
-void __RPC_STUB IEnumDot11AdHocSecuritySettings_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Reset_Proxy(
-    IEnumDot11AdHocSecuritySettings* This);
-void __RPC_STUB IEnumDot11AdHocSecuritySettings_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDot11AdHocSecuritySettings_Clone_Proxy(
-    IEnumDot11AdHocSecuritySettings* This,
-    IEnumDot11AdHocSecuritySettings **ppEnum);
-void __RPC_STUB IEnumDot11AdHocSecuritySettings_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumDot11AdHocSecuritySettings_INTERFACE_DEFINED__ */
 
@@ -1599,27 +1299,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDot11AdHocSecuritySettings* This,
+        IDot11AdHocSecuritySettings *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDot11AdHocSecuritySettings* This);
+        IDot11AdHocSecuritySettings *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDot11AdHocSecuritySettings* This);
+        IDot11AdHocSecuritySettings *This);
 
     /*** IDot11AdHocSecuritySettings methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDot11AuthAlgorithm)(
-        IDot11AdHocSecuritySettings* This,
+        IDot11AdHocSecuritySettings *This,
         DOT11_ADHOC_AUTH_ALGORITHM *pAuth);
 
     HRESULT (STDMETHODCALLTYPE *GetDot11CipherAlgorithm)(
-        IDot11AdHocSecuritySettings* This,
+        IDot11AdHocSecuritySettings *This,
         DOT11_ADHOC_CIPHER_ALGORITHM *pCipher);
 
     END_INTERFACE
 } IDot11AdHocSecuritySettingsVtbl;
+
 interface IDot11AdHocSecuritySettings {
     CONST_VTBL IDot11AdHocSecuritySettingsVtbl* lpVtbl;
 };
@@ -1656,22 +1357,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDot11AdHocSecuritySettings_GetDot11AuthAlgorithm_Proxy(
-    IDot11AdHocSecuritySettings* This,
-    DOT11_ADHOC_AUTH_ALGORITHM *pAuth);
-void __RPC_STUB IDot11AdHocSecuritySettings_GetDot11AuthAlgorithm_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDot11AdHocSecuritySettings_GetDot11CipherAlgorithm_Proxy(
-    IDot11AdHocSecuritySettings* This,
-    DOT11_ADHOC_CIPHER_ALGORITHM *pCipher);
-void __RPC_STUB IDot11AdHocSecuritySettings_GetDot11CipherAlgorithm_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDot11AdHocSecuritySettings_INTERFACE_DEFINED__ */
 
@@ -1699,23 +1384,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDot11AdHocInterfaceNotificationSink* This,
+        IDot11AdHocInterfaceNotificationSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDot11AdHocInterfaceNotificationSink* This);
+        IDot11AdHocInterfaceNotificationSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDot11AdHocInterfaceNotificationSink* This);
+        IDot11AdHocInterfaceNotificationSink *This);
 
     /*** IDot11AdHocInterfaceNotificationSink methods ***/
     HRESULT (STDMETHODCALLTYPE *OnConnectionStatusChange)(
-        IDot11AdHocInterfaceNotificationSink* This,
+        IDot11AdHocInterfaceNotificationSink *This,
         DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus);
 
     END_INTERFACE
 } IDot11AdHocInterfaceNotificationSinkVtbl;
+
 interface IDot11AdHocInterfaceNotificationSink {
     CONST_VTBL IDot11AdHocInterfaceNotificationSinkVtbl* lpVtbl;
 };
@@ -1748,14 +1434,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDot11AdHocInterfaceNotificationSink_OnConnectionStatusChange_Proxy(
-    IDot11AdHocInterfaceNotificationSink* This,
-    DOT11_ADHOC_NETWORK_CONNECTION_STATUS eStatus);
-void __RPC_STUB IDot11AdHocInterfaceNotificationSink_OnConnectionStatusChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDot11AdHocInterfaceNotificationSink_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/alg.h b/mingw-w64-headers/include/alg.h
index 110648d..a486f47 100644
--- a/mingw-w64-headers/include/alg.h
+++ b/mingw-w64-headers/include/alg.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/alg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/alg.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IAdapterInfo_FWD_DEFINED__
 #define __IAdapterInfo_FWD_DEFINED__
 typedef interface IAdapterInfo IAdapterInfo;
+#ifdef __cplusplus
+interface IAdapterInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPendingProxyConnection_FWD_DEFINED__
 #define __IPendingProxyConnection_FWD_DEFINED__
 typedef interface IPendingProxyConnection IPendingProxyConnection;
+#ifdef __cplusplus
+interface IPendingProxyConnection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDataChannel_FWD_DEFINED__
 #define __IDataChannel_FWD_DEFINED__
 typedef interface IDataChannel IDataChannel;
+#ifdef __cplusplus
+interface IDataChannel;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistentDataChannel_FWD_DEFINED__
 #define __IPersistentDataChannel_FWD_DEFINED__
 typedef interface IPersistentDataChannel IPersistentDataChannel;
+#ifdef __cplusplus
+interface IPersistentDataChannel;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPrimaryControlChannel_FWD_DEFINED__
 #define __IPrimaryControlChannel_FWD_DEFINED__
 typedef interface IPrimaryControlChannel IPrimaryControlChannel;
+#ifdef __cplusplus
+interface IPrimaryControlChannel;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISecondaryControlChannel_FWD_DEFINED__
 #define __ISecondaryControlChannel_FWD_DEFINED__
 typedef interface ISecondaryControlChannel ISecondaryControlChannel;
+#ifdef __cplusplus
+interface ISecondaryControlChannel;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumAdapterInfo_FWD_DEFINED__
 #define __IEnumAdapterInfo_FWD_DEFINED__
 typedef interface IEnumAdapterInfo IEnumAdapterInfo;
+#ifdef __cplusplus
+interface IEnumAdapterInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAdapterNotificationSink_FWD_DEFINED__
 #define __IAdapterNotificationSink_FWD_DEFINED__
 typedef interface IAdapterNotificationSink IAdapterNotificationSink;
+#ifdef __cplusplus
+interface IAdapterNotificationSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationGatewayServices_FWD_DEFINED__
 #define __IApplicationGatewayServices_FWD_DEFINED__
 typedef interface IApplicationGatewayServices IApplicationGatewayServices;
+#ifdef __cplusplus
+interface IApplicationGatewayServices;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationGateway_FWD_DEFINED__
 #define __IApplicationGateway_FWD_DEFINED__
 typedef interface IApplicationGateway IApplicationGateway;
+#ifdef __cplusplus
+interface IApplicationGateway;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ApplicationGatewayServices_FWD_DEFINED__
@@ -251,32 +281,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAdapterInfo* This,
+        IAdapterInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAdapterInfo* This);
+        IAdapterInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAdapterInfo* This);
+        IAdapterInfo *This);
 
     /*** IAdapterInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAdapterIndex)(
-        IAdapterInfo* This,
+        IAdapterInfo *This,
         ULONG *pulIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetAdapterType)(
-        IAdapterInfo* This,
+        IAdapterInfo *This,
         ALG_ADAPTER_TYPE *pAdapterType);
 
     HRESULT (STDMETHODCALLTYPE *GetAdapterAddresses)(
-        IAdapterInfo* This,
+        IAdapterInfo *This,
         ULONG *pulAddressCount,
         ULONG **prgAddresses);
 
     END_INTERFACE
 } IAdapterInfoVtbl;
+
 interface IAdapterInfo {
     CONST_VTBL IAdapterInfoVtbl* lpVtbl;
 };
@@ -317,31 +348,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAdapterInfo_GetAdapterIndex_Proxy(
-    IAdapterInfo* This,
-    ULONG *pulIndex);
-void __RPC_STUB IAdapterInfo_GetAdapterIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAdapterInfo_GetAdapterType_Proxy(
-    IAdapterInfo* This,
-    ALG_ADAPTER_TYPE *pAdapterType);
-void __RPC_STUB IAdapterInfo_GetAdapterType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAdapterInfo_GetAdapterAddresses_Proxy(
-    IAdapterInfo* This,
-    ULONG *pulAddressCount,
-    ULONG **prgAddresses);
-void __RPC_STUB IAdapterInfo_GetAdapterAddresses_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAdapterInfo_INTERFACE_DEFINED__ */
 
@@ -369,22 +375,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPendingProxyConnection* This,
+        IPendingProxyConnection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPendingProxyConnection* This);
+        IPendingProxyConnection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPendingProxyConnection* This);
+        IPendingProxyConnection *This);
 
     /*** IPendingProxyConnection methods ***/
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IPendingProxyConnection* This);
+        IPendingProxyConnection *This);
 
     END_INTERFACE
 } IPendingProxyConnectionVtbl;
+
 interface IPendingProxyConnection {
     CONST_VTBL IPendingProxyConnectionVtbl* lpVtbl;
 };
@@ -417,13 +424,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPendingProxyConnection_Cancel_Proxy(
-    IPendingProxyConnection* This);
-void __RPC_STUB IPendingProxyConnection_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPendingProxyConnection_INTERFACE_DEFINED__ */
 
@@ -460,34 +460,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDataChannel* This,
+        IDataChannel *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDataChannel* This);
+        IDataChannel *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDataChannel* This);
+        IDataChannel *This);
 
     /*** IDataChannel methods ***/
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IDataChannel* This);
+        IDataChannel *This);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelProperties)(
-        IDataChannel* This,
+        IDataChannel *This,
         ALG_DATA_CHANNEL_PROPERTIES **ppProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetSessionCreationEventHandle)(
-        IDataChannel* This,
+        IDataChannel *This,
         HANDLE *pHandle);
 
     HRESULT (STDMETHODCALLTYPE *GetSessionDeletionEventHandle)(
-        IDataChannel* This,
+        IDataChannel *This,
         HANDLE *pHandle);
 
     END_INTERFACE
 } IDataChannelVtbl;
+
 interface IDataChannel {
     CONST_VTBL IDataChannelVtbl* lpVtbl;
 };
@@ -532,37 +533,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDataChannel_Cancel_Proxy(
-    IDataChannel* This);
-void __RPC_STUB IDataChannel_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataChannel_GetChannelProperties_Proxy(
-    IDataChannel* This,
-    ALG_DATA_CHANNEL_PROPERTIES **ppProperties);
-void __RPC_STUB IDataChannel_GetChannelProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataChannel_GetSessionCreationEventHandle_Proxy(
-    IDataChannel* This,
-    HANDLE *pHandle);
-void __RPC_STUB IDataChannel_GetSessionCreationEventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataChannel_GetSessionDeletionEventHandle_Proxy(
-    IDataChannel* This,
-    HANDLE *pHandle);
-void __RPC_STUB IDataChannel_GetSessionDeletionEventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDataChannel_INTERFACE_DEFINED__ */
 
@@ -593,26 +563,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistentDataChannel* This,
+        IPersistentDataChannel *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistentDataChannel* This);
+        IPersistentDataChannel *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistentDataChannel* This);
+        IPersistentDataChannel *This);
 
     /*** IPersistentDataChannel methods ***/
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IPersistentDataChannel* This);
+        IPersistentDataChannel *This);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelProperties)(
-        IPersistentDataChannel* This,
+        IPersistentDataChannel *This,
         ALG_PERSISTENT_DATA_CHANNEL_PROPERTIES **ppProperties);
 
     END_INTERFACE
 } IPersistentDataChannelVtbl;
+
 interface IPersistentDataChannel {
     CONST_VTBL IPersistentDataChannelVtbl* lpVtbl;
 };
@@ -649,21 +620,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistentDataChannel_Cancel_Proxy(
-    IPersistentDataChannel* This);
-void __RPC_STUB IPersistentDataChannel_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistentDataChannel_GetChannelProperties_Proxy(
-    IPersistentDataChannel* This,
-    ALG_PERSISTENT_DATA_CHANNEL_PROPERTIES **ppProperties);
-void __RPC_STUB IPersistentDataChannel_GetChannelProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistentDataChannel_INTERFACE_DEFINED__ */
 
@@ -703,26 +659,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPrimaryControlChannel* This,
+        IPrimaryControlChannel *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPrimaryControlChannel* This);
+        IPrimaryControlChannel *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPrimaryControlChannel* This);
+        IPrimaryControlChannel *This);
 
     /*** IPrimaryControlChannel methods ***/
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IPrimaryControlChannel* This);
+        IPrimaryControlChannel *This);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelProperties)(
-        IPrimaryControlChannel* This,
+        IPrimaryControlChannel *This,
         ALG_PRIMARY_CHANNEL_PROPERTIES **ppProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetOriginalDestinationInformation)(
-        IPrimaryControlChannel* This,
+        IPrimaryControlChannel *This,
         ULONG ulSourceAddress,
         USHORT usSourcePort,
         ULONG *pulOriginalDestinationAddress,
@@ -733,6 +689,7 @@
 
     END_INTERFACE
 } IPrimaryControlChannelVtbl;
+
 interface IPrimaryControlChannel {
     CONST_VTBL IPrimaryControlChannelVtbl* lpVtbl;
 };
@@ -773,35 +730,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPrimaryControlChannel_Cancel_Proxy(
-    IPrimaryControlChannel* This);
-void __RPC_STUB IPrimaryControlChannel_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPrimaryControlChannel_GetChannelProperties_Proxy(
-    IPrimaryControlChannel* This,
-    ALG_PRIMARY_CHANNEL_PROPERTIES **ppProperties);
-void __RPC_STUB IPrimaryControlChannel_GetChannelProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPrimaryControlChannel_GetOriginalDestinationInformation_Proxy(
-    IPrimaryControlChannel* This,
-    ULONG ulSourceAddress,
-    USHORT usSourcePort,
-    ULONG *pulOriginalDestinationAddress,
-    USHORT *pusOriginalDestinationPort,
-    ULONG *pulRemapDestinationAddress,
-    USHORT *pulRemapDestinationPort,
-    IAdapterInfo **ppReceiveAdapter);
-void __RPC_STUB IPrimaryControlChannel_GetOriginalDestinationInformation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPrimaryControlChannel_INTERFACE_DEFINED__ */
 
@@ -839,26 +767,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISecondaryControlChannel* This,
+        ISecondaryControlChannel *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISecondaryControlChannel* This);
+        ISecondaryControlChannel *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISecondaryControlChannel* This);
+        ISecondaryControlChannel *This);
 
     /*** ISecondaryControlChannel methods ***/
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        ISecondaryControlChannel* This);
+        ISecondaryControlChannel *This);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelProperties)(
-        ISecondaryControlChannel* This,
+        ISecondaryControlChannel *This,
         ALG_SECONDARY_CHANNEL_PROPERTIES **ppProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetOriginalDestinationInformation)(
-        ISecondaryControlChannel* This,
+        ISecondaryControlChannel *This,
         ULONG ulSourceAddress,
         USHORT usSourcePort,
         ULONG *pulOriginalDestinationAddress,
@@ -867,6 +795,7 @@
 
     END_INTERFACE
 } ISecondaryControlChannelVtbl;
+
 interface ISecondaryControlChannel {
     CONST_VTBL ISecondaryControlChannelVtbl* lpVtbl;
 };
@@ -907,33 +836,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISecondaryControlChannel_Cancel_Proxy(
-    ISecondaryControlChannel* This);
-void __RPC_STUB ISecondaryControlChannel_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISecondaryControlChannel_GetChannelProperties_Proxy(
-    ISecondaryControlChannel* This,
-    ALG_SECONDARY_CHANNEL_PROPERTIES **ppProperties);
-void __RPC_STUB ISecondaryControlChannel_GetChannelProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISecondaryControlChannel_GetOriginalDestinationInformation_Proxy(
-    ISecondaryControlChannel* This,
-    ULONG ulSourceAddress,
-    USHORT usSourcePort,
-    ULONG *pulOriginalDestinationAddress,
-    USHORT *pusOriginalDestinationPort,
-    IAdapterInfo **ppReceiveAdapter);
-void __RPC_STUB ISecondaryControlChannel_GetOriginalDestinationInformation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISecondaryControlChannel_INTERFACE_DEFINED__ */
 
@@ -972,36 +874,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumAdapterInfo* This,
+        IEnumAdapterInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumAdapterInfo* This);
+        IEnumAdapterInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumAdapterInfo* This);
+        IEnumAdapterInfo *This);
 
     /*** IEnumAdapterInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumAdapterInfo* This,
+        IEnumAdapterInfo *This,
         ULONG celt,
         IAdapterInfo **rgAI,
         ULONG *pCeltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumAdapterInfo* This,
+        IEnumAdapterInfo *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumAdapterInfo* This);
+        IEnumAdapterInfo *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumAdapterInfo* This,
+        IEnumAdapterInfo *This,
         IEnumAdapterInfo **ppEnum);
 
     END_INTERFACE
 } IEnumAdapterInfoVtbl;
+
 interface IEnumAdapterInfo {
     CONST_VTBL IEnumAdapterInfoVtbl* lpVtbl;
 };
@@ -1046,39 +949,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Next_Proxy(
-    IEnumAdapterInfo* This,
-    ULONG celt,
-    IAdapterInfo **rgAI,
-    ULONG *pCeltFetched);
-void __RPC_STUB IEnumAdapterInfo_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Skip_Proxy(
-    IEnumAdapterInfo* This,
-    ULONG celt);
-void __RPC_STUB IEnumAdapterInfo_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Reset_Proxy(
-    IEnumAdapterInfo* This);
-void __RPC_STUB IEnumAdapterInfo_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumAdapterInfo_Clone_Proxy(
-    IEnumAdapterInfo* This,
-    IEnumAdapterInfo **ppEnum);
-void __RPC_STUB IEnumAdapterInfo_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumAdapterInfo_INTERFACE_DEFINED__ */
 
@@ -1115,35 +985,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAdapterNotificationSink* This,
+        IAdapterNotificationSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAdapterNotificationSink* This);
+        IAdapterNotificationSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAdapterNotificationSink* This);
+        IAdapterNotificationSink *This);
 
     /*** IAdapterNotificationSink methods ***/
     HRESULT (STDMETHODCALLTYPE *AdapterAdded)(
-        IAdapterNotificationSink* This,
+        IAdapterNotificationSink *This,
         IAdapterInfo *pAdapter);
 
     HRESULT (STDMETHODCALLTYPE *AdapterRemoved)(
-        IAdapterNotificationSink* This,
+        IAdapterNotificationSink *This,
         IAdapterInfo *pAdapter);
 
     HRESULT (STDMETHODCALLTYPE *AdapterModified)(
-        IAdapterNotificationSink* This,
+        IAdapterNotificationSink *This,
         IAdapterInfo *pAdapter);
 
     HRESULT (STDMETHODCALLTYPE *AdapterUpdatePortMapping)(
-        IAdapterNotificationSink* This,
+        IAdapterNotificationSink *This,
         IAdapterInfo *pAdapter);
 
     END_INTERFACE
 } IAdapterNotificationSinkVtbl;
+
 interface IAdapterNotificationSink {
     CONST_VTBL IAdapterNotificationSinkVtbl* lpVtbl;
 };
@@ -1188,38 +1059,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterAdded_Proxy(
-    IAdapterNotificationSink* This,
-    IAdapterInfo *pAdapter);
-void __RPC_STUB IAdapterNotificationSink_AdapterAdded_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterRemoved_Proxy(
-    IAdapterNotificationSink* This,
-    IAdapterInfo *pAdapter);
-void __RPC_STUB IAdapterNotificationSink_AdapterRemoved_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterModified_Proxy(
-    IAdapterNotificationSink* This,
-    IAdapterInfo *pAdapter);
-void __RPC_STUB IAdapterNotificationSink_AdapterModified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAdapterNotificationSink_AdapterUpdatePortMapping_Proxy(
-    IAdapterNotificationSink* This,
-    IAdapterInfo *pAdapter);
-void __RPC_STUB IAdapterNotificationSink_AdapterUpdatePortMapping_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAdapterNotificationSink_INTERFACE_DEFINED__ */
 
@@ -1342,19 +1181,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationGatewayServices* This);
+        IApplicationGatewayServices *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationGatewayServices* This);
+        IApplicationGatewayServices *This);
 
     /*** IApplicationGatewayServices methods ***/
     HRESULT (STDMETHODCALLTYPE *CreatePrimaryControlChannel)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ULONG uAdapterIndex,
         ALG_PROTOCOL eProtocol,
         USHORT usPortToCapture,
@@ -1365,7 +1204,7 @@
         IPrimaryControlChannel **ppIControlChannel);
 
     HRESULT (STDMETHODCALLTYPE *CreateSecondaryControlChannel)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ALG_PROTOCOL eProtocol,
         ULONG ulPrivateAddress,
         USHORT usPrivatePort,
@@ -1380,13 +1219,13 @@
         ISecondaryControlChannel **ppControlChannel);
 
     HRESULT (STDMETHODCALLTYPE *GetBestSourceAddressForDestinationAddress)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ULONG ulDstAddress,
         WINBOOL fDemandDial,
         ULONG *pulBestSrcAddress);
 
     HRESULT (STDMETHODCALLTYPE *PrepareProxyConnection)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ALG_PROTOCOL eProtocol,
         ULONG ulSrcAddress,
         USHORT usSrcPort,
@@ -1396,7 +1235,7 @@
         IPendingProxyConnection **ppPendingConnection);
 
     HRESULT (STDMETHODCALLTYPE *PrepareSourceModifiedProxyConnection)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ALG_PROTOCOL eProtocol,
         ULONG ulSrcAddress,
         USHORT usSrcPort,
@@ -1407,7 +1246,7 @@
         IPendingProxyConnection **ppPendingConnection);
 
     HRESULT (STDMETHODCALLTYPE *CreateDataChannel)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ALG_PROTOCOL eProtocol,
         ULONG ulPrivateAddress,
         USHORT usPrivatePort,
@@ -1421,7 +1260,7 @@
         IDataChannel **ppDataChannel);
 
     HRESULT (STDMETHODCALLTYPE *CreatePersistentDataChannel)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ALG_PROTOCOL eProtocol,
         ULONG ulPrivateAddress,
         USHORT usPrivatePort,
@@ -1433,30 +1272,30 @@
         IPersistentDataChannel **ppIPersistentDataChannel);
 
     HRESULT (STDMETHODCALLTYPE *ReservePort)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         USHORT usPortCount,
         USHORT *pusReservedPort);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseReservedPort)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         USHORT usReservedPortBase,
         USHORT usPortCount);
 
     HRESULT (STDMETHODCALLTYPE *EnumerateAdapters)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         IEnumAdapterInfo **ppIEnumAdapterInfo);
 
     HRESULT (STDMETHODCALLTYPE *StartAdapterNotifications)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         IAdapterNotificationSink *pSink,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *StopAdapterNotifications)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         DWORD dwCookieOfSink);
 
     HRESULT (STDMETHODCALLTYPE *LookupAdapterPortMapping)(
-        IApplicationGatewayServices* This,
+        IApplicationGatewayServices *This,
         ULONG ulAdapterIndex,
         UCHAR Protocol,
         ULONG ulDestinationAddress,
@@ -1466,6 +1305,7 @@
 
     END_INTERFACE
 } IApplicationGatewayServicesVtbl;
+
 interface IApplicationGatewayServices {
     CONST_VTBL IApplicationGatewayServicesVtbl* lpVtbl;
 };
@@ -1546,169 +1386,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreatePrimaryControlChannel_Proxy(
-    IApplicationGatewayServices* This,
-    ULONG uAdapterIndex,
-    ALG_PROTOCOL eProtocol,
-    USHORT usPortToCapture,
-    ALG_CAPTURE eCaptureType,
-    WINBOOL fCaptureInbound,
-    ULONG ulListenAddress,
-    USHORT usListenPort,
-    IPrimaryControlChannel **ppIControlChannel);
-void __RPC_STUB IApplicationGatewayServices_CreatePrimaryControlChannel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreateSecondaryControlChannel_Proxy(
-    IApplicationGatewayServices* This,
-    ALG_PROTOCOL eProtocol,
-    ULONG ulPrivateAddress,
-    USHORT usPrivatePort,
-    ULONG ulPublicAddress,
-    USHORT usPublicPort,
-    ULONG ulRemoteAddress,
-    USHORT usRemotePort,
-    ULONG ulListenAddress,
-    USHORT usListenPort,
-    ALG_DIRECTION eDirection,
-    WINBOOL fPersistent,
-    ISecondaryControlChannel **ppControlChannel);
-void __RPC_STUB IApplicationGatewayServices_CreateSecondaryControlChannel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_GetBestSourceAddressForDestinationAddress_Proxy(
-    IApplicationGatewayServices* This,
-    ULONG ulDstAddress,
-    WINBOOL fDemandDial,
-    ULONG *pulBestSrcAddress);
-void __RPC_STUB IApplicationGatewayServices_GetBestSourceAddressForDestinationAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_PrepareProxyConnection_Proxy(
-    IApplicationGatewayServices* This,
-    ALG_PROTOCOL eProtocol,
-    ULONG ulSrcAddress,
-    USHORT usSrcPort,
-    ULONG ulDstAddress,
-    USHORT usDstPort,
-    WINBOOL fNoTimeout,
-    IPendingProxyConnection **ppPendingConnection);
-void __RPC_STUB IApplicationGatewayServices_PrepareProxyConnection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_PrepareSourceModifiedProxyConnection_Proxy(
-    IApplicationGatewayServices* This,
-    ALG_PROTOCOL eProtocol,
-    ULONG ulSrcAddress,
-    USHORT usSrcPort,
-    ULONG ulDstAddress,
-    USHORT usDstPort,
-    ULONG ulNewSrcAddress,
-    USHORT usNewSourcePort,
-    IPendingProxyConnection **ppPendingConnection);
-void __RPC_STUB IApplicationGatewayServices_PrepareSourceModifiedProxyConnection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreateDataChannel_Proxy(
-    IApplicationGatewayServices* This,
-    ALG_PROTOCOL eProtocol,
-    ULONG ulPrivateAddress,
-    USHORT usPrivatePort,
-    ULONG ulPublicAddress,
-    USHORT usPublicPort,
-    ULONG ulRemoteAddress,
-    USHORT usRemotePort,
-    ALG_DIRECTION eDirection,
-    ALG_NOTIFICATION eDesiredNotification,
-    WINBOOL fNoTimeout,
-    IDataChannel **ppDataChannel);
-void __RPC_STUB IApplicationGatewayServices_CreateDataChannel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_CreatePersistentDataChannel_Proxy(
-    IApplicationGatewayServices* This,
-    ALG_PROTOCOL eProtocol,
-    ULONG ulPrivateAddress,
-    USHORT usPrivatePort,
-    ULONG ulPublicAddress,
-    USHORT usPublicPort,
-    ULONG ulRemoteAddress,
-    USHORT usRemotePort,
-    ALG_DIRECTION eDirection,
-    IPersistentDataChannel **ppIPersistentDataChannel);
-void __RPC_STUB IApplicationGatewayServices_CreatePersistentDataChannel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_ReservePort_Proxy(
-    IApplicationGatewayServices* This,
-    USHORT usPortCount,
-    USHORT *pusReservedPort);
-void __RPC_STUB IApplicationGatewayServices_ReservePort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_ReleaseReservedPort_Proxy(
-    IApplicationGatewayServices* This,
-    USHORT usReservedPortBase,
-    USHORT usPortCount);
-void __RPC_STUB IApplicationGatewayServices_ReleaseReservedPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_EnumerateAdapters_Proxy(
-    IApplicationGatewayServices* This,
-    IEnumAdapterInfo **ppIEnumAdapterInfo);
-void __RPC_STUB IApplicationGatewayServices_EnumerateAdapters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_StartAdapterNotifications_Proxy(
-    IApplicationGatewayServices* This,
-    IAdapterNotificationSink *pSink,
-    DWORD *pdwCookie);
-void __RPC_STUB IApplicationGatewayServices_StartAdapterNotifications_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_StopAdapterNotifications_Proxy(
-    IApplicationGatewayServices* This,
-    DWORD dwCookieOfSink);
-void __RPC_STUB IApplicationGatewayServices_StopAdapterNotifications_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGatewayServices_LookupAdapterPortMapping_Proxy(
-    IApplicationGatewayServices* This,
-    ULONG ulAdapterIndex,
-    UCHAR Protocol,
-    ULONG ulDestinationAddress,
-    USHORT usDestinationPort,
-    ULONG *pulRemapAddress,
-    USHORT *pusRemapPort);
-void __RPC_STUB IApplicationGatewayServices_LookupAdapterPortMapping_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationGatewayServices_INTERFACE_DEFINED__ */
 
@@ -1739,26 +1416,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationGateway* This,
+        IApplicationGateway *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationGateway* This);
+        IApplicationGateway *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationGateway* This);
+        IApplicationGateway *This);
 
     /*** IApplicationGateway methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IApplicationGateway* This,
+        IApplicationGateway *This,
         IApplicationGatewayServices *pAlgServices);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IApplicationGateway* This);
+        IApplicationGateway *This);
 
     END_INTERFACE
 } IApplicationGatewayVtbl;
+
 interface IApplicationGateway {
     CONST_VTBL IApplicationGatewayVtbl* lpVtbl;
 };
@@ -1795,21 +1473,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationGateway_Initialize_Proxy(
-    IApplicationGateway* This,
-    IApplicationGatewayServices *pAlgServices);
-void __RPC_STUB IApplicationGateway_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationGateway_Stop_Proxy(
-    IApplicationGateway* This);
-void __RPC_STUB IApplicationGateway_Stop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationGateway_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/audioclient.h b/mingw-w64-headers/include/audioclient.h
index 92029e9..5c30e48 100644
--- a/mingw-w64-headers/include/audioclient.h
+++ b/mingw-w64-headers/include/audioclient.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/audioclient.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/audioclient.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IAudioClient_FWD_DEFINED__
 #define __IAudioClient_FWD_DEFINED__
 typedef interface IAudioClient IAudioClient;
+#ifdef __cplusplus
+interface IAudioClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioClient2_FWD_DEFINED__
 #define __IAudioClient2_FWD_DEFINED__
 typedef interface IAudioClient2 IAudioClient2;
+#ifdef __cplusplus
+interface IAudioClient2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioRenderClient_FWD_DEFINED__
 #define __IAudioRenderClient_FWD_DEFINED__
 typedef interface IAudioRenderClient IAudioRenderClient;
+#ifdef __cplusplus
+interface IAudioRenderClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioCaptureClient_FWD_DEFINED__
 #define __IAudioCaptureClient_FWD_DEFINED__
 typedef interface IAudioCaptureClient IAudioCaptureClient;
+#ifdef __cplusplus
+interface IAudioCaptureClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioClock_FWD_DEFINED__
 #define __IAudioClock_FWD_DEFINED__
 typedef interface IAudioClock IAudioClock;
+#ifdef __cplusplus
+interface IAudioClock;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioClock2_FWD_DEFINED__
 #define __IAudioClock2_FWD_DEFINED__
 typedef interface IAudioClock2 IAudioClock2;
+#ifdef __cplusplus
+interface IAudioClock2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioClockAdjustment_FWD_DEFINED__
 #define __IAudioClockAdjustment_FWD_DEFINED__
 typedef interface IAudioClockAdjustment IAudioClockAdjustment;
+#ifdef __cplusplus
+interface IAudioClockAdjustment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISimpleAudioVolume_FWD_DEFINED__
 #define __ISimpleAudioVolume_FWD_DEFINED__
 typedef interface ISimpleAudioVolume ISimpleAudioVolume;
+#ifdef __cplusplus
+interface ISimpleAudioVolume;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioStreamVolume_FWD_DEFINED__
 #define __IAudioStreamVolume_FWD_DEFINED__
 typedef interface IAudioStreamVolume IAudioStreamVolume;
+#ifdef __cplusplus
+interface IAudioStreamVolume;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IChannelAudioVolume_FWD_DEFINED__
 #define __IChannelAudioVolume_FWD_DEFINED__
 typedef interface IChannelAudioVolume IChannelAudioVolume;
+#ifdef __cplusplus
+interface IChannelAudioVolume;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -108,7 +138,6 @@
     AUDCLNT_BUFFERFLAGS_TIMESTAMP_ERROR = 0x4
 };
 
-
 typedef struct AudioClientProperties {
     UINT32 cbSize;
     WINBOOL bIsOffload;
@@ -181,19 +210,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioClient* This,
+        IAudioClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioClient* This);
+        IAudioClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioClient* This);
+        IAudioClient *This);
 
     /*** IAudioClient methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IAudioClient* This,
+        IAudioClient *This,
         AUDCLNT_SHAREMODE ShareMode,
         DWORD StreamFlags,
         REFERENCE_TIME hnsBufferDuration,
@@ -202,52 +231,53 @@
         LPCGUID AudioSessionGuid);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferSize)(
-        IAudioClient* This,
+        IAudioClient *This,
         UINT32 *pNumBufferFrames);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamLatency)(
-        IAudioClient* This,
+        IAudioClient *This,
         REFERENCE_TIME *phnsLatency);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentPadding)(
-        IAudioClient* This,
+        IAudioClient *This,
         UINT32 *pNumPaddingFrames);
 
     HRESULT (STDMETHODCALLTYPE *IsFormatSupported)(
-        IAudioClient* This,
+        IAudioClient *This,
         AUDCLNT_SHAREMODE ShareMode,
         const WAVEFORMATEX *pFormat,
         WAVEFORMATEX **ppClosestMatch);
 
     HRESULT (STDMETHODCALLTYPE *GetMixFormat)(
-        IAudioClient* This,
+        IAudioClient *This,
         WAVEFORMATEX **ppDeviceFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetDevicePeriod)(
-        IAudioClient* This,
+        IAudioClient *This,
         REFERENCE_TIME *phnsDefaultDevicePeriod,
         REFERENCE_TIME *phnsMinimumDevicePeriod);
 
     HRESULT (STDMETHODCALLTYPE *Start)(
-        IAudioClient* This);
+        IAudioClient *This);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IAudioClient* This);
+        IAudioClient *This);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IAudioClient* This);
+        IAudioClient *This);
 
     HRESULT (STDMETHODCALLTYPE *SetEventHandle)(
-        IAudioClient* This,
+        IAudioClient *This,
         HANDLE eventHandle);
 
     HRESULT (STDMETHODCALLTYPE *GetService)(
-        IAudioClient* This,
+        IAudioClient *This,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IAudioClientVtbl;
+
 interface IAudioClient {
     CONST_VTBL IAudioClientVtbl* lpVtbl;
 };
@@ -324,108 +354,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioClient_Initialize_Proxy(
-    IAudioClient* This,
-    AUDCLNT_SHAREMODE ShareMode,
-    DWORD StreamFlags,
-    REFERENCE_TIME hnsBufferDuration,
-    REFERENCE_TIME hnsPeriodicity,
-    const WAVEFORMATEX *pFormat,
-    LPCGUID AudioSessionGuid);
-void __RPC_STUB IAudioClient_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_GetBufferSize_Proxy(
-    IAudioClient* This,
-    UINT32 *pNumBufferFrames);
-void __RPC_STUB IAudioClient_GetBufferSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_GetStreamLatency_Proxy(
-    IAudioClient* This,
-    REFERENCE_TIME *phnsLatency);
-void __RPC_STUB IAudioClient_GetStreamLatency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_GetCurrentPadding_Proxy(
-    IAudioClient* This,
-    UINT32 *pNumPaddingFrames);
-void __RPC_STUB IAudioClient_GetCurrentPadding_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_IsFormatSupported_Proxy(
-    IAudioClient* This,
-    AUDCLNT_SHAREMODE ShareMode,
-    const WAVEFORMATEX *pFormat,
-    WAVEFORMATEX **ppClosestMatch);
-void __RPC_STUB IAudioClient_IsFormatSupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_GetMixFormat_Proxy(
-    IAudioClient* This,
-    WAVEFORMATEX **ppDeviceFormat);
-void __RPC_STUB IAudioClient_GetMixFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_GetDevicePeriod_Proxy(
-    IAudioClient* This,
-    REFERENCE_TIME *phnsDefaultDevicePeriod,
-    REFERENCE_TIME *phnsMinimumDevicePeriod);
-void __RPC_STUB IAudioClient_GetDevicePeriod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_Start_Proxy(
-    IAudioClient* This);
-void __RPC_STUB IAudioClient_Start_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_Stop_Proxy(
-    IAudioClient* This);
-void __RPC_STUB IAudioClient_Stop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_Reset_Proxy(
-    IAudioClient* This);
-void __RPC_STUB IAudioClient_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_SetEventHandle_Proxy(
-    IAudioClient* This,
-    HANDLE eventHandle);
-void __RPC_STUB IAudioClient_SetEventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient_GetService_Proxy(
-    IAudioClient* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IAudioClient_GetService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioClient_INTERFACE_DEFINED__ */
 
@@ -464,19 +392,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioClient2* This);
+        IAudioClient2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioClient2* This);
+        IAudioClient2 *This);
 
     /*** IAudioClient methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         AUDCLNT_SHAREMODE ShareMode,
         DWORD StreamFlags,
         REFERENCE_TIME hnsBufferDuration,
@@ -485,62 +413,62 @@
         LPCGUID AudioSessionGuid);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferSize)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         UINT32 *pNumBufferFrames);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamLatency)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         REFERENCE_TIME *phnsLatency);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentPadding)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         UINT32 *pNumPaddingFrames);
 
     HRESULT (STDMETHODCALLTYPE *IsFormatSupported)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         AUDCLNT_SHAREMODE ShareMode,
         const WAVEFORMATEX *pFormat,
         WAVEFORMATEX **ppClosestMatch);
 
     HRESULT (STDMETHODCALLTYPE *GetMixFormat)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         WAVEFORMATEX **ppDeviceFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetDevicePeriod)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         REFERENCE_TIME *phnsDefaultDevicePeriod,
         REFERENCE_TIME *phnsMinimumDevicePeriod);
 
     HRESULT (STDMETHODCALLTYPE *Start)(
-        IAudioClient2* This);
+        IAudioClient2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IAudioClient2* This);
+        IAudioClient2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IAudioClient2* This);
+        IAudioClient2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetEventHandle)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         HANDLE eventHandle);
 
     HRESULT (STDMETHODCALLTYPE *GetService)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         REFIID riid,
         void **ppv);
 
     /*** IAudioClient2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsOffloadCapable)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         AUDIO_STREAM_CATEGORY Category,
         WINBOOL *pbOffloadCapable);
 
     HRESULT (STDMETHODCALLTYPE *SetClientProperties)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         const AudioClientProperties *pProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferSizeLimits)(
-        IAudioClient2* This,
+        IAudioClient2 *This,
         const WAVEFORMATEX *pFormat,
         WINBOOL bEventDriven,
         REFERENCE_TIME *phnsMinBufferDuration,
@@ -548,6 +476,7 @@
 
     END_INTERFACE
 } IAudioClient2Vtbl;
+
 interface IAudioClient2 {
     CONST_VTBL IAudioClient2Vtbl* lpVtbl;
 };
@@ -638,34 +567,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioClient2_IsOffloadCapable_Proxy(
-    IAudioClient2* This,
-    AUDIO_STREAM_CATEGORY Category,
-    WINBOOL *pbOffloadCapable);
-void __RPC_STUB IAudioClient2_IsOffloadCapable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient2_SetClientProperties_Proxy(
-    IAudioClient2* This,
-    const AudioClientProperties *pProperties);
-void __RPC_STUB IAudioClient2_SetClientProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClient2_GetBufferSizeLimits_Proxy(
-    IAudioClient2* This,
-    const WAVEFORMATEX *pFormat,
-    WINBOOL bEventDriven,
-    REFERENCE_TIME *phnsMinBufferDuration,
-    REFERENCE_TIME *phnsMaxBufferDuration);
-void __RPC_STUB IAudioClient2_GetBufferSizeLimits_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioClient2_INTERFACE_DEFINED__ */
 
@@ -699,29 +600,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioRenderClient* This,
+        IAudioRenderClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioRenderClient* This);
+        IAudioRenderClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioRenderClient* This);
+        IAudioRenderClient *This);
 
     /*** IAudioRenderClient methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBuffer)(
-        IAudioRenderClient* This,
+        IAudioRenderClient *This,
         UINT32 NumFramesRequested,
         BYTE **ppData);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)(
-        IAudioRenderClient* This,
+        IAudioRenderClient *This,
         UINT32 NumFramesWritten,
         DWORD dwFlags);
 
     END_INTERFACE
 } IAudioRenderClientVtbl;
+
 interface IAudioRenderClient {
     CONST_VTBL IAudioRenderClientVtbl* lpVtbl;
 };
@@ -758,24 +660,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioRenderClient_GetBuffer_Proxy(
-    IAudioRenderClient* This,
-    UINT32 NumFramesRequested,
-    BYTE **ppData);
-void __RPC_STUB IAudioRenderClient_GetBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioRenderClient_ReleaseBuffer_Proxy(
-    IAudioRenderClient* This,
-    UINT32 NumFramesWritten,
-    DWORD dwFlags);
-void __RPC_STUB IAudioRenderClient_ReleaseBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioRenderClient_INTERFACE_DEFINED__ */
 
@@ -814,19 +698,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioCaptureClient* This,
+        IAudioCaptureClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioCaptureClient* This);
+        IAudioCaptureClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioCaptureClient* This);
+        IAudioCaptureClient *This);
 
     /*** IAudioCaptureClient methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBuffer)(
-        IAudioCaptureClient* This,
+        IAudioCaptureClient *This,
         BYTE **ppData,
         UINT32 *pNumFramesToRead,
         DWORD *pdwFlags,
@@ -834,15 +718,16 @@
         UINT64 *pu64QPCPosition);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)(
-        IAudioCaptureClient* This,
+        IAudioCaptureClient *This,
         UINT32 NumFramesRead);
 
     HRESULT (STDMETHODCALLTYPE *GetNextPacketSize)(
-        IAudioCaptureClient* This,
+        IAudioCaptureClient *This,
         UINT32 *pNumFramesInNextPacket);
 
     END_INTERFACE
 } IAudioCaptureClientVtbl;
+
 interface IAudioCaptureClient {
     CONST_VTBL IAudioCaptureClientVtbl* lpVtbl;
 };
@@ -883,34 +768,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioCaptureClient_GetBuffer_Proxy(
-    IAudioCaptureClient* This,
-    BYTE **ppData,
-    UINT32 *pNumFramesToRead,
-    DWORD *pdwFlags,
-    UINT64 *pu64DevicePosition,
-    UINT64 *pu64QPCPosition);
-void __RPC_STUB IAudioCaptureClient_GetBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioCaptureClient_ReleaseBuffer_Proxy(
-    IAudioCaptureClient* This,
-    UINT32 NumFramesRead);
-void __RPC_STUB IAudioCaptureClient_ReleaseBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioCaptureClient_GetNextPacketSize_Proxy(
-    IAudioCaptureClient* This,
-    UINT32 *pNumFramesInNextPacket);
-void __RPC_STUB IAudioCaptureClient_GetNextPacketSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioCaptureClient_INTERFACE_DEFINED__ */
 
@@ -948,32 +805,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioClock* This,
+        IAudioClock *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioClock* This);
+        IAudioClock *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioClock* This);
+        IAudioClock *This);
 
     /*** IAudioClock methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFrequency)(
-        IAudioClock* This,
+        IAudioClock *This,
         UINT64 *pu64Frequency);
 
     HRESULT (STDMETHODCALLTYPE *GetPosition)(
-        IAudioClock* This,
+        IAudioClock *This,
         UINT64 *pu64Position,
         UINT64 *pu64QPCPosition);
 
     HRESULT (STDMETHODCALLTYPE *GetCharacteristics)(
-        IAudioClock* This,
+        IAudioClock *This,
         DWORD *pdwCharacteristics);
 
     END_INTERFACE
 } IAudioClockVtbl;
+
 interface IAudioClock {
     CONST_VTBL IAudioClockVtbl* lpVtbl;
 };
@@ -1014,31 +872,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioClock_GetFrequency_Proxy(
-    IAudioClock* This,
-    UINT64 *pu64Frequency);
-void __RPC_STUB IAudioClock_GetFrequency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClock_GetPosition_Proxy(
-    IAudioClock* This,
-    UINT64 *pu64Position,
-    UINT64 *pu64QPCPosition);
-void __RPC_STUB IAudioClock_GetPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioClock_GetCharacteristics_Proxy(
-    IAudioClock* This,
-    DWORD *pdwCharacteristics);
-void __RPC_STUB IAudioClock_GetCharacteristics_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioClock_INTERFACE_DEFINED__ */
 
@@ -1070,24 +903,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioClock2* This,
+        IAudioClock2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioClock2* This);
+        IAudioClock2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioClock2* This);
+        IAudioClock2 *This);
 
     /*** IAudioClock2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDevicePosition)(
-        IAudioClock2* This,
+        IAudioClock2 *This,
         UINT64 *DevicePosition,
         UINT64 *QPCPosition);
 
     END_INTERFACE
 } IAudioClock2Vtbl;
+
 interface IAudioClock2 {
     CONST_VTBL IAudioClock2Vtbl* lpVtbl;
 };
@@ -1120,15 +954,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioClock2_GetDevicePosition_Proxy(
-    IAudioClock2* This,
-    UINT64 *DevicePosition,
-    UINT64 *QPCPosition);
-void __RPC_STUB IAudioClock2_GetDevicePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioClock2_INTERFACE_DEFINED__ */
 
@@ -1157,23 +982,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioClockAdjustment* This,
+        IAudioClockAdjustment *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioClockAdjustment* This);
+        IAudioClockAdjustment *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioClockAdjustment* This);
+        IAudioClockAdjustment *This);
 
     /*** IAudioClockAdjustment methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSampleRate)(
-        IAudioClockAdjustment* This,
+        IAudioClockAdjustment *This,
         float flSampleRate);
 
     END_INTERFACE
 } IAudioClockAdjustmentVtbl;
+
 interface IAudioClockAdjustment {
     CONST_VTBL IAudioClockAdjustmentVtbl* lpVtbl;
 };
@@ -1206,14 +1032,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioClockAdjustment_SetSampleRate_Proxy(
-    IAudioClockAdjustment* This,
-    float flSampleRate);
-void __RPC_STUB IAudioClockAdjustment_SetSampleRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioClockAdjustment_INTERFACE_DEFINED__ */
 
@@ -1255,37 +1073,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISimpleAudioVolume* This,
+        ISimpleAudioVolume *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISimpleAudioVolume* This);
+        ISimpleAudioVolume *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISimpleAudioVolume* This);
+        ISimpleAudioVolume *This);
 
     /*** ISimpleAudioVolume methods ***/
     HRESULT (STDMETHODCALLTYPE *SetMasterVolume)(
-        ISimpleAudioVolume* This,
+        ISimpleAudioVolume *This,
         float fLevel,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetMasterVolume)(
-        ISimpleAudioVolume* This,
+        ISimpleAudioVolume *This,
         float *pfLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetMute)(
-        ISimpleAudioVolume* This,
+        ISimpleAudioVolume *This,
         const WINBOOL bMute,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetMute)(
-        ISimpleAudioVolume* This,
+        ISimpleAudioVolume *This,
         WINBOOL *pbMute);
 
     END_INTERFACE
 } ISimpleAudioVolumeVtbl;
+
 interface ISimpleAudioVolume {
     CONST_VTBL ISimpleAudioVolumeVtbl* lpVtbl;
 };
@@ -1330,40 +1149,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_SetMasterVolume_Proxy(
-    ISimpleAudioVolume* This,
-    float fLevel,
-    LPCGUID EventContext);
-void __RPC_STUB ISimpleAudioVolume_SetMasterVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_GetMasterVolume_Proxy(
-    ISimpleAudioVolume* This,
-    float *pfLevel);
-void __RPC_STUB ISimpleAudioVolume_GetMasterVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_SetMute_Proxy(
-    ISimpleAudioVolume* This,
-    const WINBOOL bMute,
-    LPCGUID EventContext);
-void __RPC_STUB ISimpleAudioVolume_SetMute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISimpleAudioVolume_GetMute_Proxy(
-    ISimpleAudioVolume* This,
-    WINBOOL *pbMute);
-void __RPC_STUB ISimpleAudioVolume_GetMute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISimpleAudioVolume_INTERFACE_DEFINED__ */
 
@@ -1410,43 +1195,44 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioStreamVolume* This,
+        IAudioStreamVolume *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioStreamVolume* This);
+        IAudioStreamVolume *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioStreamVolume* This);
+        IAudioStreamVolume *This);
 
     /*** IAudioStreamVolume methods ***/
     HRESULT (STDMETHODCALLTYPE *GetChannelCount)(
-        IAudioStreamVolume* This,
+        IAudioStreamVolume *This,
         UINT32 *pdwCount);
 
     HRESULT (STDMETHODCALLTYPE *SetChannelVolume)(
-        IAudioStreamVolume* This,
+        IAudioStreamVolume *This,
         UINT32 dwIndex,
         const float fLevel);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelVolume)(
-        IAudioStreamVolume* This,
+        IAudioStreamVolume *This,
         UINT32 dwIndex,
         float *pfLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetAllVolumes)(
-        IAudioStreamVolume* This,
+        IAudioStreamVolume *This,
         UINT32 dwCount,
         const float *pfVolumes);
 
     HRESULT (STDMETHODCALLTYPE *GetAllVolumes)(
-        IAudioStreamVolume* This,
+        IAudioStreamVolume *This,
         UINT32 dwCount,
         float *pfVolumes);
 
     END_INTERFACE
 } IAudioStreamVolumeVtbl;
+
 interface IAudioStreamVolume {
     CONST_VTBL IAudioStreamVolumeVtbl* lpVtbl;
 };
@@ -1495,50 +1281,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioStreamVolume_GetChannelCount_Proxy(
-    IAudioStreamVolume* This,
-    UINT32 *pdwCount);
-void __RPC_STUB IAudioStreamVolume_GetChannelCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioStreamVolume_SetChannelVolume_Proxy(
-    IAudioStreamVolume* This,
-    UINT32 dwIndex,
-    const float fLevel);
-void __RPC_STUB IAudioStreamVolume_SetChannelVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioStreamVolume_GetChannelVolume_Proxy(
-    IAudioStreamVolume* This,
-    UINT32 dwIndex,
-    float *pfLevel);
-void __RPC_STUB IAudioStreamVolume_GetChannelVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioStreamVolume_SetAllVolumes_Proxy(
-    IAudioStreamVolume* This,
-    UINT32 dwCount,
-    const float *pfVolumes);
-void __RPC_STUB IAudioStreamVolume_SetAllVolumes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioStreamVolume_GetAllVolumes_Proxy(
-    IAudioStreamVolume* This,
-    UINT32 dwCount,
-    float *pfVolumes);
-void __RPC_STUB IAudioStreamVolume_GetAllVolumes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioStreamVolume_INTERFACE_DEFINED__ */
 
@@ -1585,45 +1327,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IChannelAudioVolume* This,
+        IChannelAudioVolume *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IChannelAudioVolume* This);
+        IChannelAudioVolume *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IChannelAudioVolume* This);
+        IChannelAudioVolume *This);
 
     /*** IChannelAudioVolume methods ***/
     HRESULT (STDMETHODCALLTYPE *GetChannelCount)(
-        IChannelAudioVolume* This,
+        IChannelAudioVolume *This,
         UINT32 *pdwCount);
 
     HRESULT (STDMETHODCALLTYPE *SetChannelVolume)(
-        IChannelAudioVolume* This,
+        IChannelAudioVolume *This,
         UINT32 dwIndex,
         const float fLevel,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelVolume)(
-        IChannelAudioVolume* This,
+        IChannelAudioVolume *This,
         UINT32 dwIndex,
         float *pfLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetAllVolumes)(
-        IChannelAudioVolume* This,
+        IChannelAudioVolume *This,
         UINT32 dwCount,
         const float *pfVolumes,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetAllVolumes)(
-        IChannelAudioVolume* This,
+        IChannelAudioVolume *This,
         UINT32 dwCount,
         float *pfVolumes);
 
     END_INTERFACE
 } IChannelAudioVolumeVtbl;
+
 interface IChannelAudioVolume {
     CONST_VTBL IChannelAudioVolumeVtbl* lpVtbl;
 };
@@ -1672,52 +1415,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IChannelAudioVolume_GetChannelCount_Proxy(
-    IChannelAudioVolume* This,
-    UINT32 *pdwCount);
-void __RPC_STUB IChannelAudioVolume_GetChannelCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IChannelAudioVolume_SetChannelVolume_Proxy(
-    IChannelAudioVolume* This,
-    UINT32 dwIndex,
-    const float fLevel,
-    LPCGUID EventContext);
-void __RPC_STUB IChannelAudioVolume_SetChannelVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IChannelAudioVolume_GetChannelVolume_Proxy(
-    IChannelAudioVolume* This,
-    UINT32 dwIndex,
-    float *pfLevel);
-void __RPC_STUB IChannelAudioVolume_GetChannelVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IChannelAudioVolume_SetAllVolumes_Proxy(
-    IChannelAudioVolume* This,
-    UINT32 dwCount,
-    const float *pfVolumes,
-    LPCGUID EventContext);
-void __RPC_STUB IChannelAudioVolume_SetAllVolumes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IChannelAudioVolume_GetAllVolumes_Proxy(
-    IChannelAudioVolume* This,
-    UINT32 dwCount,
-    float *pfVolumes);
-void __RPC_STUB IChannelAudioVolume_GetAllVolumes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IChannelAudioVolume_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/audioendpoints.h b/mingw-w64-headers/include/audioendpoints.h
index 3f972b8..90b1a81 100644
--- a/mingw-w64-headers/include/audioendpoints.h
+++ b/mingw-w64-headers/include/audioendpoints.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/audioendpoints.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/audioendpoints.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IAudioEndpointFormatControl_FWD_DEFINED__
 #define __IAudioEndpointFormatControl_FWD_DEFINED__
 typedef interface IAudioEndpointFormatControl IAudioEndpointFormatControl;
+#ifdef __cplusplus
+interface IAudioEndpointFormatControl;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -62,23 +65,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioEndpointFormatControl* This,
+        IAudioEndpointFormatControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioEndpointFormatControl* This);
+        IAudioEndpointFormatControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioEndpointFormatControl* This);
+        IAudioEndpointFormatControl *This);
 
     /*** IAudioEndpointFormatControl methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetToDefault)(
-        IAudioEndpointFormatControl* This,
+        IAudioEndpointFormatControl *This,
         DWORD ResetFlags);
 
     END_INTERFACE
 } IAudioEndpointFormatControlVtbl;
+
 interface IAudioEndpointFormatControl {
     CONST_VTBL IAudioEndpointFormatControlVtbl* lpVtbl;
 };
@@ -111,14 +115,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioEndpointFormatControl_ResetToDefault_Proxy(
-    IAudioEndpointFormatControl* This,
-    DWORD ResetFlags);
-void __RPC_STUB IAudioEndpointFormatControl_ResetToDefault_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioEndpointFormatControl_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/audiopolicy.h b/mingw-w64-headers/include/audiopolicy.h
index b9521aa..e7e0211 100644
--- a/mingw-w64-headers/include/audiopolicy.h
+++ b/mingw-w64-headers/include/audiopolicy.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/audiopolicy.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/audiopolicy.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,41 +20,65 @@
 #ifndef __IAudioSessionEvents_FWD_DEFINED__
 #define __IAudioSessionEvents_FWD_DEFINED__
 typedef interface IAudioSessionEvents IAudioSessionEvents;
+#ifdef __cplusplus
+interface IAudioSessionEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioSessionControl_FWD_DEFINED__
 #define __IAudioSessionControl_FWD_DEFINED__
 typedef interface IAudioSessionControl IAudioSessionControl;
+#ifdef __cplusplus
+interface IAudioSessionControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioSessionControl2_FWD_DEFINED__
 #define __IAudioSessionControl2_FWD_DEFINED__
 typedef interface IAudioSessionControl2 IAudioSessionControl2;
+#ifdef __cplusplus
+interface IAudioSessionControl2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioSessionManager_FWD_DEFINED__
 #define __IAudioSessionManager_FWD_DEFINED__
 typedef interface IAudioSessionManager IAudioSessionManager;
+#ifdef __cplusplus
+interface IAudioSessionManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioVolumeDuckNotification_FWD_DEFINED__
 #define __IAudioVolumeDuckNotification_FWD_DEFINED__
 typedef interface IAudioVolumeDuckNotification IAudioVolumeDuckNotification;
+#ifdef __cplusplus
+interface IAudioVolumeDuckNotification;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioSessionNotification_FWD_DEFINED__
 #define __IAudioSessionNotification_FWD_DEFINED__
 typedef interface IAudioSessionNotification IAudioSessionNotification;
+#ifdef __cplusplus
+interface IAudioSessionNotification;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioSessionEnumerator_FWD_DEFINED__
 #define __IAudioSessionEnumerator_FWD_DEFINED__
 typedef interface IAudioSessionEnumerator IAudioSessionEnumerator;
+#ifdef __cplusplus
+interface IAudioSessionEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAudioSessionManager2_FWD_DEFINED__
 #define __IAudioSessionManager2_FWD_DEFINED__
 typedef interface IAudioSessionManager2 IAudioSessionManager2;
+#ifdef __cplusplus
+interface IAudioSessionManager2;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -132,55 +156,56 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioSessionEvents* This);
+        IAudioSessionEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioSessionEvents* This);
+        IAudioSessionEvents *This);
 
     /*** IAudioSessionEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnDisplayNameChanged)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         LPCWSTR NewDisplayName,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *OnIconPathChanged)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         LPCWSTR NewIconPath,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *OnSimpleVolumeChanged)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         float NewVolume,
         WINBOOL NewMute,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *OnChannelVolumeChanged)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         DWORD ChannelCount,
         float NewChannelVolumeArray[],
         DWORD ChangedChannel,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *OnGroupingParamChanged)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         LPCGUID NewGroupingParam,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *OnStateChanged)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         AudioSessionState NewState);
 
     HRESULT (STDMETHODCALLTYPE *OnSessionDisconnected)(
-        IAudioSessionEvents* This,
+        IAudioSessionEvents *This,
         AudioSessionDisconnectReason DisconnectReason);
 
     END_INTERFACE
 } IAudioSessionEventsVtbl;
+
 interface IAudioSessionEvents {
     CONST_VTBL IAudioSessionEventsVtbl* lpVtbl;
 };
@@ -237,70 +262,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnDisplayNameChanged_Proxy(
-    IAudioSessionEvents* This,
-    LPCWSTR NewDisplayName,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionEvents_OnDisplayNameChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnIconPathChanged_Proxy(
-    IAudioSessionEvents* This,
-    LPCWSTR NewIconPath,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionEvents_OnIconPathChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnSimpleVolumeChanged_Proxy(
-    IAudioSessionEvents* This,
-    float NewVolume,
-    WINBOOL NewMute,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionEvents_OnSimpleVolumeChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnChannelVolumeChanged_Proxy(
-    IAudioSessionEvents* This,
-    DWORD ChannelCount,
-    float NewChannelVolumeArray[],
-    DWORD ChangedChannel,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionEvents_OnChannelVolumeChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnGroupingParamChanged_Proxy(
-    IAudioSessionEvents* This,
-    LPCGUID NewGroupingParam,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionEvents_OnGroupingParamChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnStateChanged_Proxy(
-    IAudioSessionEvents* This,
-    AudioSessionState NewState);
-void __RPC_STUB IAudioSessionEvents_OnStateChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionEvents_OnSessionDisconnected_Proxy(
-    IAudioSessionEvents* This,
-    AudioSessionDisconnectReason DisconnectReason);
-void __RPC_STUB IAudioSessionEvents_OnSessionDisconnected_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioSessionEvents_INTERFACE_DEFINED__ */
 
@@ -356,58 +317,59 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioSessionControl* This);
+        IAudioSessionControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioSessionControl* This);
+        IAudioSessionControl *This);
 
     /*** IAudioSessionControl methods ***/
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         AudioSessionState *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         LPWSTR *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *SetDisplayName)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         LPCWSTR Value,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetIconPath)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         LPWSTR *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *SetIconPath)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         LPCWSTR Value,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupingParam)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         GUID *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *SetGroupingParam)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         LPCGUID Override,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *RegisterAudioSessionNotification)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         IAudioSessionEvents *NewNotifications);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterAudioSessionNotification)(
-        IAudioSessionControl* This,
+        IAudioSessionControl *This,
         IAudioSessionEvents *NewNotifications);
 
     END_INTERFACE
 } IAudioSessionControlVtbl;
+
 interface IAudioSessionControl {
     CONST_VTBL IAudioSessionControlVtbl* lpVtbl;
 };
@@ -472,81 +434,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetState_Proxy(
-    IAudioSessionControl* This,
-    AudioSessionState *pRetVal);
-void __RPC_STUB IAudioSessionControl_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetDisplayName_Proxy(
-    IAudioSessionControl* This,
-    LPWSTR *pRetVal);
-void __RPC_STUB IAudioSessionControl_GetDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_SetDisplayName_Proxy(
-    IAudioSessionControl* This,
-    LPCWSTR Value,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionControl_SetDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetIconPath_Proxy(
-    IAudioSessionControl* This,
-    LPWSTR *pRetVal);
-void __RPC_STUB IAudioSessionControl_GetIconPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_SetIconPath_Proxy(
-    IAudioSessionControl* This,
-    LPCWSTR Value,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionControl_SetIconPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_GetGroupingParam_Proxy(
-    IAudioSessionControl* This,
-    GUID *pRetVal);
-void __RPC_STUB IAudioSessionControl_GetGroupingParam_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_SetGroupingParam_Proxy(
-    IAudioSessionControl* This,
-    LPCGUID Override,
-    LPCGUID EventContext);
-void __RPC_STUB IAudioSessionControl_SetGroupingParam_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_RegisterAudioSessionNotification_Proxy(
-    IAudioSessionControl* This,
-    IAudioSessionEvents *NewNotifications);
-void __RPC_STUB IAudioSessionControl_RegisterAudioSessionNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl_UnregisterAudioSessionNotification_Proxy(
-    IAudioSessionControl* This,
-    IAudioSessionEvents *NewNotifications);
-void __RPC_STUB IAudioSessionControl_UnregisterAudioSessionNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioSessionControl_INTERFACE_DEFINED__ */
 
@@ -589,78 +476,79 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioSessionControl2* This);
+        IAudioSessionControl2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioSessionControl2* This);
+        IAudioSessionControl2 *This);
 
     /*** IAudioSessionControl methods ***/
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         AudioSessionState *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         LPWSTR *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *SetDisplayName)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         LPCWSTR Value,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetIconPath)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         LPWSTR *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *SetIconPath)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         LPCWSTR Value,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupingParam)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         GUID *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *SetGroupingParam)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         LPCGUID Override,
         LPCGUID EventContext);
 
     HRESULT (STDMETHODCALLTYPE *RegisterAudioSessionNotification)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         IAudioSessionEvents *NewNotifications);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterAudioSessionNotification)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         IAudioSessionEvents *NewNotifications);
 
     /*** IAudioSessionControl2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSessionIdentifier)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         LPWSTR *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *GetSessionInstanceIdentifier)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         LPWSTR *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *GetProcessId)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         DWORD *pRetVal);
 
     HRESULT (STDMETHODCALLTYPE *IsSystemSoundsSession)(
-        IAudioSessionControl2* This);
+        IAudioSessionControl2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetDuckingPreference)(
-        IAudioSessionControl2* This,
+        IAudioSessionControl2 *This,
         WINBOOL optOut);
 
     END_INTERFACE
 } IAudioSessionControl2Vtbl;
+
 interface IAudioSessionControl2 {
     CONST_VTBL IAudioSessionControl2Vtbl* lpVtbl;
 };
@@ -747,45 +635,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioSessionControl2_GetSessionIdentifier_Proxy(
-    IAudioSessionControl2* This,
-    LPWSTR *pRetVal);
-void __RPC_STUB IAudioSessionControl2_GetSessionIdentifier_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl2_GetSessionInstanceIdentifier_Proxy(
-    IAudioSessionControl2* This,
-    LPWSTR *pRetVal);
-void __RPC_STUB IAudioSessionControl2_GetSessionInstanceIdentifier_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl2_GetProcessId_Proxy(
-    IAudioSessionControl2* This,
-    DWORD *pRetVal);
-void __RPC_STUB IAudioSessionControl2_GetProcessId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl2_IsSystemSoundsSession_Proxy(
-    IAudioSessionControl2* This);
-void __RPC_STUB IAudioSessionControl2_IsSystemSoundsSession_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionControl2_SetDuckingPreference_Proxy(
-    IAudioSessionControl2* This,
-    WINBOOL optOut);
-void __RPC_STUB IAudioSessionControl2_SetDuckingPreference_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioSessionControl2_INTERFACE_DEFINED__ */
 
@@ -821,31 +670,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioSessionManager* This,
+        IAudioSessionManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioSessionManager* This);
+        IAudioSessionManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioSessionManager* This);
+        IAudioSessionManager *This);
 
     /*** IAudioSessionManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAudioSessionControl)(
-        IAudioSessionManager* This,
+        IAudioSessionManager *This,
         LPCGUID AudioSessionGuid,
         DWORD StreamFlags,
         IAudioSessionControl **SessionControl);
 
     HRESULT (STDMETHODCALLTYPE *GetSimpleAudioVolume)(
-        IAudioSessionManager* This,
+        IAudioSessionManager *This,
         LPCGUID AudioSessionGuid,
         DWORD StreamFlags,
         ISimpleAudioVolume **AudioVolume);
 
     END_INTERFACE
 } IAudioSessionManagerVtbl;
+
 interface IAudioSessionManager {
     CONST_VTBL IAudioSessionManagerVtbl* lpVtbl;
 };
@@ -882,26 +732,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioSessionManager_GetAudioSessionControl_Proxy(
-    IAudioSessionManager* This,
-    LPCGUID AudioSessionGuid,
-    DWORD StreamFlags,
-    IAudioSessionControl **SessionControl);
-void __RPC_STUB IAudioSessionManager_GetAudioSessionControl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionManager_GetSimpleAudioVolume_Proxy(
-    IAudioSessionManager* This,
-    LPCGUID AudioSessionGuid,
-    DWORD StreamFlags,
-    ISimpleAudioVolume **AudioVolume);
-void __RPC_STUB IAudioSessionManager_GetSimpleAudioVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioSessionManager_INTERFACE_DEFINED__ */
 
@@ -934,28 +764,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioVolumeDuckNotification* This,
+        IAudioVolumeDuckNotification *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioVolumeDuckNotification* This);
+        IAudioVolumeDuckNotification *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioVolumeDuckNotification* This);
+        IAudioVolumeDuckNotification *This);
 
     /*** IAudioVolumeDuckNotification methods ***/
     HRESULT (STDMETHODCALLTYPE *OnVolumeDuckNotification)(
-        IAudioVolumeDuckNotification* This,
+        IAudioVolumeDuckNotification *This,
         LPCWSTR sessionID,
         UINT32 countCommunicationSessions);
 
     HRESULT (STDMETHODCALLTYPE *OnVolumeUnduckNotification)(
-        IAudioVolumeDuckNotification* This,
+        IAudioVolumeDuckNotification *This,
         LPCWSTR sessionID);
 
     END_INTERFACE
 } IAudioVolumeDuckNotificationVtbl;
+
 interface IAudioVolumeDuckNotification {
     CONST_VTBL IAudioVolumeDuckNotificationVtbl* lpVtbl;
 };
@@ -992,23 +823,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioVolumeDuckNotification_OnVolumeDuckNotification_Proxy(
-    IAudioVolumeDuckNotification* This,
-    LPCWSTR sessionID,
-    UINT32 countCommunicationSessions);
-void __RPC_STUB IAudioVolumeDuckNotification_OnVolumeDuckNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioVolumeDuckNotification_OnVolumeUnduckNotification_Proxy(
-    IAudioVolumeDuckNotification* This,
-    LPCWSTR sessionID);
-void __RPC_STUB IAudioVolumeDuckNotification_OnVolumeUnduckNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioVolumeDuckNotification_INTERFACE_DEFINED__ */
 
@@ -1037,23 +851,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioSessionNotification* This,
+        IAudioSessionNotification *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioSessionNotification* This);
+        IAudioSessionNotification *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioSessionNotification* This);
+        IAudioSessionNotification *This);
 
     /*** IAudioSessionNotification methods ***/
     HRESULT (STDMETHODCALLTYPE *OnSessionCreated)(
-        IAudioSessionNotification* This,
+        IAudioSessionNotification *This,
         IAudioSessionControl *NewSession);
 
     END_INTERFACE
 } IAudioSessionNotificationVtbl;
+
 interface IAudioSessionNotification {
     CONST_VTBL IAudioSessionNotificationVtbl* lpVtbl;
 };
@@ -1086,14 +901,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioSessionNotification_OnSessionCreated_Proxy(
-    IAudioSessionNotification* This,
-    IAudioSessionControl *NewSession);
-void __RPC_STUB IAudioSessionNotification_OnSessionCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioSessionNotification_INTERFACE_DEFINED__ */
 
@@ -1126,28 +933,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioSessionEnumerator* This,
+        IAudioSessionEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioSessionEnumerator* This);
+        IAudioSessionEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioSessionEnumerator* This);
+        IAudioSessionEnumerator *This);
 
     /*** IAudioSessionEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IAudioSessionEnumerator* This,
+        IAudioSessionEnumerator *This,
         int *SessionCount);
 
     HRESULT (STDMETHODCALLTYPE *GetSession)(
-        IAudioSessionEnumerator* This,
+        IAudioSessionEnumerator *This,
         int SessionCount,
         IAudioSessionControl **Session);
 
     END_INTERFACE
 } IAudioSessionEnumeratorVtbl;
+
 interface IAudioSessionEnumerator {
     CONST_VTBL IAudioSessionEnumeratorVtbl* lpVtbl;
 };
@@ -1184,23 +992,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioSessionEnumerator_GetCount_Proxy(
-    IAudioSessionEnumerator* This,
-    int *SessionCount);
-void __RPC_STUB IAudioSessionEnumerator_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionEnumerator_GetSession_Proxy(
-    IAudioSessionEnumerator* This,
-    int SessionCount,
-    IAudioSessionControl **Session);
-void __RPC_STUB IAudioSessionEnumerator_GetSession_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioSessionEnumerator_INTERFACE_DEFINED__ */
 
@@ -1242,53 +1033,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAudioSessionManager2* This);
+        IAudioSessionManager2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAudioSessionManager2* This);
+        IAudioSessionManager2 *This);
 
     /*** IAudioSessionManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAudioSessionControl)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         LPCGUID AudioSessionGuid,
         DWORD StreamFlags,
         IAudioSessionControl **SessionControl);
 
     HRESULT (STDMETHODCALLTYPE *GetSimpleAudioVolume)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         LPCGUID AudioSessionGuid,
         DWORD StreamFlags,
         ISimpleAudioVolume **AudioVolume);
 
     /*** IAudioSessionManager2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSessionEnumerator)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         IAudioSessionEnumerator **SessionEnum);
 
     HRESULT (STDMETHODCALLTYPE *RegisterSessionNotification)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         IAudioSessionNotification *SessionNotification);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterSessionNotification)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         IAudioSessionNotification *SessionNotification);
 
     HRESULT (STDMETHODCALLTYPE *RegisterDuckNotification)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         LPCWSTR sessionID,
         IAudioVolumeDuckNotification *duckNotification);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterDuckNotification)(
-        IAudioSessionManager2* This,
+        IAudioSessionManager2 *This,
         IAudioVolumeDuckNotification *duckNotification);
 
     END_INTERFACE
 } IAudioSessionManager2Vtbl;
+
 interface IAudioSessionManager2 {
     CONST_VTBL IAudioSessionManager2Vtbl* lpVtbl;
 };
@@ -1347,47 +1139,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAudioSessionManager2_GetSessionEnumerator_Proxy(
-    IAudioSessionManager2* This,
-    IAudioSessionEnumerator **SessionEnum);
-void __RPC_STUB IAudioSessionManager2_GetSessionEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionManager2_RegisterSessionNotification_Proxy(
-    IAudioSessionManager2* This,
-    IAudioSessionNotification *SessionNotification);
-void __RPC_STUB IAudioSessionManager2_RegisterSessionNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionManager2_UnregisterSessionNotification_Proxy(
-    IAudioSessionManager2* This,
-    IAudioSessionNotification *SessionNotification);
-void __RPC_STUB IAudioSessionManager2_UnregisterSessionNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionManager2_RegisterDuckNotification_Proxy(
-    IAudioSessionManager2* This,
-    LPCWSTR sessionID,
-    IAudioVolumeDuckNotification *duckNotification);
-void __RPC_STUB IAudioSessionManager2_RegisterDuckNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAudioSessionManager2_UnregisterDuckNotification_Proxy(
-    IAudioSessionManager2* This,
-    IAudioVolumeDuckNotification *duckNotification);
-void __RPC_STUB IAudioSessionManager2_UnregisterDuckNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAudioSessionManager2_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/comadmin.h b/mingw-w64-headers/include/comadmin.h
index a84a1a5..6c1515c 100644
--- a/mingw-w64-headers/include/comadmin.h
+++ b/mingw-w64-headers/include/comadmin.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/comadmin.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/comadmin.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __ICOMAdminCatalog_FWD_DEFINED__
 #define __ICOMAdminCatalog_FWD_DEFINED__
 typedef interface ICOMAdminCatalog ICOMAdminCatalog;
+#ifdef __cplusplus
+interface ICOMAdminCatalog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICOMAdminCatalog2_FWD_DEFINED__
 #define __ICOMAdminCatalog2_FWD_DEFINED__
 typedef interface ICOMAdminCatalog2 ICOMAdminCatalog2;
+#ifdef __cplusplus
+interface ICOMAdminCatalog2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICatalogObject_FWD_DEFINED__
 #define __ICatalogObject_FWD_DEFINED__
 typedef interface ICatalogObject ICatalogObject;
+#ifdef __cplusplus
+interface ICatalogObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICatalogCollection_FWD_DEFINED__
 #define __ICatalogCollection_FWD_DEFINED__
 typedef interface ICatalogCollection ICatalogCollection;
+#ifdef __cplusplus
+interface ICatalogCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __COMAdminCatalog_FWD_DEFINED__
@@ -471,29 +483,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -501,7 +513,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -513,53 +525,53 @@
 
     /*** ICOMAdminCatalog methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCollection)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrCollName,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *Connect)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrCatalogServerName,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *get_MajorVersion)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         LONG *plMajorVersion);
 
     HRESULT (STDMETHODCALLTYPE *get_MinorVersion)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         LONG *plMinorVersion);
 
     HRESULT (STDMETHODCALLTYPE *GetCollectionByQuery)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrCollName,
         SAFEARRAY **ppsaVarQuery,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *ImportComponent)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIDOrName,
         BSTR bstrCLSIDOrProgID);
 
     HRESULT (STDMETHODCALLTYPE *InstallComponent)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIDOrName,
         BSTR bstrDLL,
         BSTR bstrTLB,
         BSTR bstrPSDLL);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownApplication)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIDOrName);
 
     HRESULT (STDMETHODCALLTYPE *ExportApplication)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIDOrName,
         BSTR bstrApplicationFile,
         LONG lOptions);
 
     HRESULT (STDMETHODCALLTYPE *InstallApplication)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplicationFile,
         BSTR bstrDestinationDirectory,
         LONG lOptions,
@@ -568,28 +580,28 @@
         BSTR bstrRSN);
 
     HRESULT (STDMETHODCALLTYPE *StopRouter)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshRouter)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     HRESULT (STDMETHODCALLTYPE *StartRouter)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     HRESULT (STDMETHODCALLTYPE *Reserved1)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     HRESULT (STDMETHODCALLTYPE *Reserved2)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     HRESULT (STDMETHODCALLTYPE *InstallMultipleComponents)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIDOrName,
         SAFEARRAY **ppsaVarFileNames,
         SAFEARRAY **ppsaVarCLSIDs);
 
     HRESULT (STDMETHODCALLTYPE *GetMultipleComponentsInfo)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIdOrName,
         SAFEARRAY **ppsaVarFileNames,
         SAFEARRAY **ppsaVarCLSIDs,
@@ -598,18 +610,18 @@
         SAFEARRAY **ppsaVarComponentFlags);
 
     HRESULT (STDMETHODCALLTYPE *RefreshComponents)(
-        ICOMAdminCatalog* This);
+        ICOMAdminCatalog *This);
 
     HRESULT (STDMETHODCALLTYPE *BackupREGDB)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrBackupFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RestoreREGDB)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrBackupFilePath);
 
     HRESULT (STDMETHODCALLTYPE *QueryApplicationFile)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplicationFile,
         BSTR *pbstrApplicationName,
         BSTR *pbstrApplicationDescription,
@@ -618,29 +630,29 @@
         SAFEARRAY **ppsaVarFileNames);
 
     HRESULT (STDMETHODCALLTYPE *StartApplication)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIdOrName);
 
     HRESULT (STDMETHODCALLTYPE *ServiceCheck)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         LONG lService,
         LONG *plStatus);
 
     HRESULT (STDMETHODCALLTYPE *InstallMultipleEventClasses)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIdOrName,
         SAFEARRAY **ppsaVarFileNames,
         SAFEARRAY **ppsaVarCLSIDS);
 
     HRESULT (STDMETHODCALLTYPE *InstallEventClass)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrApplIdOrName,
         BSTR bstrDLL,
         BSTR bstrTLB,
         BSTR bstrPSDLL);
 
     HRESULT (STDMETHODCALLTYPE *GetEventClassesForIID)(
-        ICOMAdminCatalog* This,
+        ICOMAdminCatalog *This,
         BSTR bstrIID,
         SAFEARRAY **ppsaVarCLSIDs,
         SAFEARRAY **ppsaVarProgIDs,
@@ -648,6 +660,7 @@
 
     END_INTERFACE
 } ICOMAdminCatalogVtbl;
+
 interface ICOMAdminCatalog {
     CONST_VTBL ICOMAdminCatalogVtbl* lpVtbl;
 };
@@ -798,244 +811,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetCollection_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrCollName,
-    IDispatch **ppCatalogCollection);
-void __RPC_STUB ICOMAdminCatalog_GetCollection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_Connect_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrCatalogServerName,
-    IDispatch **ppCatalogCollection);
-void __RPC_STUB ICOMAdminCatalog_Connect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_get_MajorVersion_Proxy(
-    ICOMAdminCatalog* This,
-    LONG *plMajorVersion);
-void __RPC_STUB ICOMAdminCatalog_get_MajorVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_get_MinorVersion_Proxy(
-    ICOMAdminCatalog* This,
-    LONG *plMinorVersion);
-void __RPC_STUB ICOMAdminCatalog_get_MinorVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetCollectionByQuery_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrCollName,
-    SAFEARRAY **ppsaVarQuery,
-    IDispatch **ppCatalogCollection);
-void __RPC_STUB ICOMAdminCatalog_GetCollectionByQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ImportComponent_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIDOrName,
-    BSTR bstrCLSIDOrProgID);
-void __RPC_STUB ICOMAdminCatalog_ImportComponent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallComponent_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIDOrName,
-    BSTR bstrDLL,
-    BSTR bstrTLB,
-    BSTR bstrPSDLL);
-void __RPC_STUB ICOMAdminCatalog_InstallComponent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ShutdownApplication_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIDOrName);
-void __RPC_STUB ICOMAdminCatalog_ShutdownApplication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ExportApplication_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIDOrName,
-    BSTR bstrApplicationFile,
-    LONG lOptions);
-void __RPC_STUB ICOMAdminCatalog_ExportApplication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallApplication_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplicationFile,
-    BSTR bstrDestinationDirectory,
-    LONG lOptions,
-    BSTR bstrUserId,
-    BSTR bstrPassword,
-    BSTR bstrRSN);
-void __RPC_STUB ICOMAdminCatalog_InstallApplication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_StopRouter_Proxy(
-    ICOMAdminCatalog* This);
-void __RPC_STUB ICOMAdminCatalog_StopRouter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_RefreshRouter_Proxy(
-    ICOMAdminCatalog* This);
-void __RPC_STUB ICOMAdminCatalog_RefreshRouter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_StartRouter_Proxy(
-    ICOMAdminCatalog* This);
-void __RPC_STUB ICOMAdminCatalog_StartRouter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_Reserved1_Proxy(
-    ICOMAdminCatalog* This);
-void __RPC_STUB ICOMAdminCatalog_Reserved1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_Reserved2_Proxy(
-    ICOMAdminCatalog* This);
-void __RPC_STUB ICOMAdminCatalog_Reserved2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallMultipleComponents_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIDOrName,
-    SAFEARRAY **ppsaVarFileNames,
-    SAFEARRAY **ppsaVarCLSIDs);
-void __RPC_STUB ICOMAdminCatalog_InstallMultipleComponents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetMultipleComponentsInfo_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIdOrName,
-    SAFEARRAY **ppsaVarFileNames,
-    SAFEARRAY **ppsaVarCLSIDs,
-    SAFEARRAY **ppsaVarClassNames,
-    SAFEARRAY **ppsaVarFileFlags,
-    SAFEARRAY **ppsaVarComponentFlags);
-void __RPC_STUB ICOMAdminCatalog_GetMultipleComponentsInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_RefreshComponents_Proxy(
-    ICOMAdminCatalog* This);
-void __RPC_STUB ICOMAdminCatalog_RefreshComponents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_BackupREGDB_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrBackupFilePath);
-void __RPC_STUB ICOMAdminCatalog_BackupREGDB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_RestoreREGDB_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrBackupFilePath);
-void __RPC_STUB ICOMAdminCatalog_RestoreREGDB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_QueryApplicationFile_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplicationFile,
-    BSTR *pbstrApplicationName,
-    BSTR *pbstrApplicationDescription,
-    VARIANT_BOOL *pbHasUsers,
-    VARIANT_BOOL *pbIsProxy,
-    SAFEARRAY **ppsaVarFileNames);
-void __RPC_STUB ICOMAdminCatalog_QueryApplicationFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_StartApplication_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIdOrName);
-void __RPC_STUB ICOMAdminCatalog_StartApplication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_ServiceCheck_Proxy(
-    ICOMAdminCatalog* This,
-    LONG lService,
-    LONG *plStatus);
-void __RPC_STUB ICOMAdminCatalog_ServiceCheck_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallMultipleEventClasses_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIdOrName,
-    SAFEARRAY **ppsaVarFileNames,
-    SAFEARRAY **ppsaVarCLSIDS);
-void __RPC_STUB ICOMAdminCatalog_InstallMultipleEventClasses_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_InstallEventClass_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrApplIdOrName,
-    BSTR bstrDLL,
-    BSTR bstrTLB,
-    BSTR bstrPSDLL);
-void __RPC_STUB ICOMAdminCatalog_InstallEventClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog_GetEventClassesForIID_Proxy(
-    ICOMAdminCatalog* This,
-    BSTR bstrIID,
-    SAFEARRAY **ppsaVarCLSIDs,
-    SAFEARRAY **ppsaVarProgIDs,
-    SAFEARRAY **ppsaVarDescriptions);
-void __RPC_STUB ICOMAdminCatalog_GetEventClassesForIID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICOMAdminCatalog_INTERFACE_DEFINED__ */
 
@@ -1196,29 +971,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1226,7 +1001,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1238,53 +1013,53 @@
 
     /*** ICOMAdminCatalog methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCollection)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrCollName,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *Connect)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrCatalogServerName,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *get_MajorVersion)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         LONG *plMajorVersion);
 
     HRESULT (STDMETHODCALLTYPE *get_MinorVersion)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         LONG *plMinorVersion);
 
     HRESULT (STDMETHODCALLTYPE *GetCollectionByQuery)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrCollName,
         SAFEARRAY **ppsaVarQuery,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *ImportComponent)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIDOrName,
         BSTR bstrCLSIDOrProgID);
 
     HRESULT (STDMETHODCALLTYPE *InstallComponent)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIDOrName,
         BSTR bstrDLL,
         BSTR bstrTLB,
         BSTR bstrPSDLL);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownApplication)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIDOrName);
 
     HRESULT (STDMETHODCALLTYPE *ExportApplication)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIDOrName,
         BSTR bstrApplicationFile,
         LONG lOptions);
 
     HRESULT (STDMETHODCALLTYPE *InstallApplication)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationFile,
         BSTR bstrDestinationDirectory,
         LONG lOptions,
@@ -1293,28 +1068,28 @@
         BSTR bstrRSN);
 
     HRESULT (STDMETHODCALLTYPE *StopRouter)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshRouter)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *StartRouter)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Reserved1)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Reserved2)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *InstallMultipleComponents)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIDOrName,
         SAFEARRAY **ppsaVarFileNames,
         SAFEARRAY **ppsaVarCLSIDs);
 
     HRESULT (STDMETHODCALLTYPE *GetMultipleComponentsInfo)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIdOrName,
         SAFEARRAY **ppsaVarFileNames,
         SAFEARRAY **ppsaVarCLSIDs,
@@ -1323,18 +1098,18 @@
         SAFEARRAY **ppsaVarComponentFlags);
 
     HRESULT (STDMETHODCALLTYPE *RefreshComponents)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *BackupREGDB)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrBackupFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RestoreREGDB)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrBackupFilePath);
 
     HRESULT (STDMETHODCALLTYPE *QueryApplicationFile)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationFile,
         BSTR *pbstrApplicationName,
         BSTR *pbstrApplicationDescription,
@@ -1343,29 +1118,29 @@
         SAFEARRAY **ppsaVarFileNames);
 
     HRESULT (STDMETHODCALLTYPE *StartApplication)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIdOrName);
 
     HRESULT (STDMETHODCALLTYPE *ServiceCheck)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         LONG lService,
         LONG *plStatus);
 
     HRESULT (STDMETHODCALLTYPE *InstallMultipleEventClasses)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIdOrName,
         SAFEARRAY **ppsaVarFileNames,
         SAFEARRAY **ppsaVarCLSIDS);
 
     HRESULT (STDMETHODCALLTYPE *InstallEventClass)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplIdOrName,
         BSTR bstrDLL,
         BSTR bstrTLB,
         BSTR bstrPSDLL);
 
     HRESULT (STDMETHODCALLTYPE *GetEventClassesForIID)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrIID,
         SAFEARRAY **ppsaVarCLSIDs,
         SAFEARRAY **ppsaVarProgIDs,
@@ -1373,51 +1148,51 @@
 
     /*** ICOMAdminCatalog2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCollectionByQuery2)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrCollectionName,
         VARIANT *pVarQueryStrings,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *GetApplicationInstanceIDFromProcessID)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         LONG lProcessID,
         BSTR *pbstrApplicationInstanceID);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownApplicationInstances)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         VARIANT *pVarApplicationInstanceID);
 
     HRESULT (STDMETHODCALLTYPE *PauseApplicationInstances)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         VARIANT *pVarApplicationInstanceID);
 
     HRESULT (STDMETHODCALLTYPE *ResumeApplicationInstances)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         VARIANT *pVarApplicationInstanceID);
 
     HRESULT (STDMETHODCALLTYPE *RecycleApplicationInstances)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         VARIANT *pVarApplicationInstanceID,
         LONG lReasonCode);
 
     HRESULT (STDMETHODCALLTYPE *AreApplicationInstancesPaused)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         VARIANT *pVarApplicationInstanceID,
         VARIANT_BOOL *pVarBoolPaused);
 
     HRESULT (STDMETHODCALLTYPE *DumpApplicationInstance)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationInstanceID,
         BSTR bstrDirectory,
         LONG lMaxImages,
         BSTR *pbstrDumpFile);
 
     HRESULT (STDMETHODCALLTYPE *get_IsApplicationInstanceDumpSupported)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         VARIANT_BOOL *pVarBoolDumpSupported);
 
     HRESULT (STDMETHODCALLTYPE *CreateServiceForApplication)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationIDOrName,
         BSTR bstrServiceName,
         BSTR bstrStartType,
@@ -1428,58 +1203,58 @@
         VARIANT_BOOL bDesktopOk);
 
     HRESULT (STDMETHODCALLTYPE *DeleteServiceForApplication)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationIDOrName);
 
     HRESULT (STDMETHODCALLTYPE *GetPartitionID)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationIDOrName,
         BSTR *pbstrPartitionID);
 
     HRESULT (STDMETHODCALLTYPE *GetPartitionName)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationIDOrName,
         BSTR *pbstrPartitionName);
 
     HRESULT (STDMETHODCALLTYPE *put_CurrentPartition)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrPartitionIDOrName);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentPartitionID)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR *pbstrPartitionID);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentPartitionName)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR *pbstrPartitionName);
 
     HRESULT (STDMETHODCALLTYPE *get_GlobalPartitionID)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR *pbstrGlobalPartitionID);
 
     HRESULT (STDMETHODCALLTYPE *FlushPartitionCache)(
-        ICOMAdminCatalog2* This);
+        ICOMAdminCatalog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *CopyApplications)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrSourcePartitionIDOrName,
         VARIANT *pVarApplicationID,
         BSTR bstrDestinationPartitionIDOrName);
 
     HRESULT (STDMETHODCALLTYPE *CopyComponents)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrSourceApplicationIDOrName,
         VARIANT *pVarCLSIDOrProgID,
         BSTR bstrDestinationApplicationIDOrName);
 
     HRESULT (STDMETHODCALLTYPE *MoveComponents)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrSourceApplicationIDOrName,
         VARIANT *pVarCLSIDOrProgID,
         BSTR bstrDestinationApplicationIDOrName);
 
     HRESULT (STDMETHODCALLTYPE *AliasComponent)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrSrcApplicationIDOrName,
         BSTR bstrCLSIDOrProgID,
         BSTR bstrDestApplicationIDOrName,
@@ -1487,40 +1262,40 @@
         BSTR bstrNewClsid);
 
     HRESULT (STDMETHODCALLTYPE *IsSafeToDelete)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrDllName,
         COMAdminInUse *pCOMAdminInUse);
 
     HRESULT (STDMETHODCALLTYPE *ImportUnconfiguredComponents)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationIDOrName,
         VARIANT *pVarCLSIDOrProgID,
         VARIANT *pVarComponentType);
 
     HRESULT (STDMETHODCALLTYPE *PromoteUnconfiguredComponents)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationIDOrName,
         VARIANT *pVarCLSIDOrProgID,
         VARIANT *pVarComponentType);
 
     HRESULT (STDMETHODCALLTYPE *ImportComponents)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationIDOrName,
         VARIANT *pVarCLSIDOrProgID,
         VARIANT *pVarComponentType);
 
     HRESULT (STDMETHODCALLTYPE *get_Is64BitCatalogServer)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         VARIANT_BOOL *pbIs64Bit);
 
     HRESULT (STDMETHODCALLTYPE *ExportPartition)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrPartitionIDOrName,
         BSTR bstrPartitionFileName,
         LONG lOptions);
 
     HRESULT (STDMETHODCALLTYPE *InstallPartition)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrFileName,
         BSTR bstrDestDirectory,
         LONG lOptions,
@@ -1529,17 +1304,18 @@
         BSTR bstrRSN);
 
     HRESULT (STDMETHODCALLTYPE *QueryApplicationFile2)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrApplicationFile,
         IDispatch **ppFilesForImport);
 
     HRESULT (STDMETHODCALLTYPE *GetComponentVersionCount)(
-        ICOMAdminCatalog2* This,
+        ICOMAdminCatalog2 *This,
         BSTR bstrCLSIDOrProgID,
         LONG *plVersionCount);
 
     END_INTERFACE
 } ICOMAdminCatalog2Vtbl;
+
 interface ICOMAdminCatalog2 {
     CONST_VTBL ICOMAdminCatalog2Vtbl* lpVtbl;
 };
@@ -1816,296 +1592,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetCollectionByQuery2_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrCollectionName,
-    VARIANT *pVarQueryStrings,
-    IDispatch **ppCatalogCollection);
-void __RPC_STUB ICOMAdminCatalog2_GetCollectionByQuery2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetApplicationInstanceIDFromProcessID_Proxy(
-    ICOMAdminCatalog2* This,
-    LONG lProcessID,
-    BSTR *pbstrApplicationInstanceID);
-void __RPC_STUB ICOMAdminCatalog2_GetApplicationInstanceIDFromProcessID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ShutdownApplicationInstances_Proxy(
-    ICOMAdminCatalog2* This,
-    VARIANT *pVarApplicationInstanceID);
-void __RPC_STUB ICOMAdminCatalog2_ShutdownApplicationInstances_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_PauseApplicationInstances_Proxy(
-    ICOMAdminCatalog2* This,
-    VARIANT *pVarApplicationInstanceID);
-void __RPC_STUB ICOMAdminCatalog2_PauseApplicationInstances_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ResumeApplicationInstances_Proxy(
-    ICOMAdminCatalog2* This,
-    VARIANT *pVarApplicationInstanceID);
-void __RPC_STUB ICOMAdminCatalog2_ResumeApplicationInstances_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_RecycleApplicationInstances_Proxy(
-    ICOMAdminCatalog2* This,
-    VARIANT *pVarApplicationInstanceID,
-    LONG lReasonCode);
-void __RPC_STUB ICOMAdminCatalog2_RecycleApplicationInstances_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_AreApplicationInstancesPaused_Proxy(
-    ICOMAdminCatalog2* This,
-    VARIANT *pVarApplicationInstanceID,
-    VARIANT_BOOL *pVarBoolPaused);
-void __RPC_STUB ICOMAdminCatalog2_AreApplicationInstancesPaused_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_DumpApplicationInstance_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationInstanceID,
-    BSTR bstrDirectory,
-    LONG lMaxImages,
-    BSTR *pbstrDumpFile);
-void __RPC_STUB ICOMAdminCatalog2_DumpApplicationInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_IsApplicationInstanceDumpSupported_Proxy(
-    ICOMAdminCatalog2* This,
-    VARIANT_BOOL *pVarBoolDumpSupported);
-void __RPC_STUB ICOMAdminCatalog2_get_IsApplicationInstanceDumpSupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_CreateServiceForApplication_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationIDOrName,
-    BSTR bstrServiceName,
-    BSTR bstrStartType,
-    BSTR bstrErrorControl,
-    BSTR bstrDependencies,
-    BSTR bstrRunAs,
-    BSTR bstrPassword,
-    VARIANT_BOOL bDesktopOk);
-void __RPC_STUB ICOMAdminCatalog2_CreateServiceForApplication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_DeleteServiceForApplication_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationIDOrName);
-void __RPC_STUB ICOMAdminCatalog2_DeleteServiceForApplication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetPartitionID_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationIDOrName,
-    BSTR *pbstrPartitionID);
-void __RPC_STUB ICOMAdminCatalog2_GetPartitionID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetPartitionName_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationIDOrName,
-    BSTR *pbstrPartitionName);
-void __RPC_STUB ICOMAdminCatalog2_GetPartitionName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_put_CurrentPartition_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrPartitionIDOrName);
-void __RPC_STUB ICOMAdminCatalog2_put_CurrentPartition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_CurrentPartitionID_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR *pbstrPartitionID);
-void __RPC_STUB ICOMAdminCatalog2_get_CurrentPartitionID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_CurrentPartitionName_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR *pbstrPartitionName);
-void __RPC_STUB ICOMAdminCatalog2_get_CurrentPartitionName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_GlobalPartitionID_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR *pbstrGlobalPartitionID);
-void __RPC_STUB ICOMAdminCatalog2_get_GlobalPartitionID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_FlushPartitionCache_Proxy(
-    ICOMAdminCatalog2* This);
-void __RPC_STUB ICOMAdminCatalog2_FlushPartitionCache_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_CopyApplications_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrSourcePartitionIDOrName,
-    VARIANT *pVarApplicationID,
-    BSTR bstrDestinationPartitionIDOrName);
-void __RPC_STUB ICOMAdminCatalog2_CopyApplications_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_CopyComponents_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrSourceApplicationIDOrName,
-    VARIANT *pVarCLSIDOrProgID,
-    BSTR bstrDestinationApplicationIDOrName);
-void __RPC_STUB ICOMAdminCatalog2_CopyComponents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_MoveComponents_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrSourceApplicationIDOrName,
-    VARIANT *pVarCLSIDOrProgID,
-    BSTR bstrDestinationApplicationIDOrName);
-void __RPC_STUB ICOMAdminCatalog2_MoveComponents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_AliasComponent_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrSrcApplicationIDOrName,
-    BSTR bstrCLSIDOrProgID,
-    BSTR bstrDestApplicationIDOrName,
-    BSTR bstrNewProgId,
-    BSTR bstrNewClsid);
-void __RPC_STUB ICOMAdminCatalog2_AliasComponent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_IsSafeToDelete_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrDllName,
-    COMAdminInUse *pCOMAdminInUse);
-void __RPC_STUB ICOMAdminCatalog2_IsSafeToDelete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ImportUnconfiguredComponents_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationIDOrName,
-    VARIANT *pVarCLSIDOrProgID,
-    VARIANT *pVarComponentType);
-void __RPC_STUB ICOMAdminCatalog2_ImportUnconfiguredComponents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_PromoteUnconfiguredComponents_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationIDOrName,
-    VARIANT *pVarCLSIDOrProgID,
-    VARIANT *pVarComponentType);
-void __RPC_STUB ICOMAdminCatalog2_PromoteUnconfiguredComponents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ImportComponents_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationIDOrName,
-    VARIANT *pVarCLSIDOrProgID,
-    VARIANT *pVarComponentType);
-void __RPC_STUB ICOMAdminCatalog2_ImportComponents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_get_Is64BitCatalogServer_Proxy(
-    ICOMAdminCatalog2* This,
-    VARIANT_BOOL *pbIs64Bit);
-void __RPC_STUB ICOMAdminCatalog2_get_Is64BitCatalogServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_ExportPartition_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrPartitionIDOrName,
-    BSTR bstrPartitionFileName,
-    LONG lOptions);
-void __RPC_STUB ICOMAdminCatalog2_ExportPartition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_InstallPartition_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrFileName,
-    BSTR bstrDestDirectory,
-    LONG lOptions,
-    BSTR bstrUserID,
-    BSTR bstrPassword,
-    BSTR bstrRSN);
-void __RPC_STUB ICOMAdminCatalog2_InstallPartition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_QueryApplicationFile2_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrApplicationFile,
-    IDispatch **ppFilesForImport);
-void __RPC_STUB ICOMAdminCatalog2_QueryApplicationFile2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICOMAdminCatalog2_GetComponentVersionCount_Proxy(
-    ICOMAdminCatalog2* This,
-    BSTR bstrCLSIDOrProgID,
-    LONG *plVersionCount);
-void __RPC_STUB ICOMAdminCatalog2_GetComponentVersionCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICOMAdminCatalog2_INTERFACE_DEFINED__ */
 
@@ -2155,29 +1641,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICatalogObject* This);
+        ICatalogObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICatalogObject* This);
+        ICatalogObject *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2185,7 +1671,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2197,39 +1683,40 @@
 
     /*** ICatalogObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         BSTR bstrPropName,
         VARIANT *pvarRetVal);
 
     HRESULT (STDMETHODCALLTYPE *put_Value)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         BSTR bstrPropName,
         VARIANT val);
 
     HRESULT (STDMETHODCALLTYPE *get_Key)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         VARIANT *pvarRetVal);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         VARIANT *pvarRetVal);
 
     HRESULT (STDMETHODCALLTYPE *IsPropertyReadOnly)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         BSTR bstrPropName,
         VARIANT_BOOL *pbRetVal);
 
     HRESULT (STDMETHODCALLTYPE *get_Valid)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         VARIANT_BOOL *pbRetVal);
 
     HRESULT (STDMETHODCALLTYPE *IsPropertyWriteOnly)(
-        ICatalogObject* This,
+        ICatalogObject *This,
         BSTR bstrPropName,
         VARIANT_BOOL *pbRetVal);
 
     END_INTERFACE
 } ICatalogObjectVtbl;
+
 interface ICatalogObject {
     CONST_VTBL ICatalogObjectVtbl* lpVtbl;
 };
@@ -2304,66 +1791,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICatalogObject_get_Value_Proxy(
-    ICatalogObject* This,
-    BSTR bstrPropName,
-    VARIANT *pvarRetVal);
-void __RPC_STUB ICatalogObject_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogObject_put_Value_Proxy(
-    ICatalogObject* This,
-    BSTR bstrPropName,
-    VARIANT val);
-void __RPC_STUB ICatalogObject_put_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogObject_get_Key_Proxy(
-    ICatalogObject* This,
-    VARIANT *pvarRetVal);
-void __RPC_STUB ICatalogObject_get_Key_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogObject_get_Name_Proxy(
-    ICatalogObject* This,
-    VARIANT *pvarRetVal);
-void __RPC_STUB ICatalogObject_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogObject_IsPropertyReadOnly_Proxy(
-    ICatalogObject* This,
-    BSTR bstrPropName,
-    VARIANT_BOOL *pbRetVal);
-void __RPC_STUB ICatalogObject_IsPropertyReadOnly_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogObject_get_Valid_Proxy(
-    ICatalogObject* This,
-    VARIANT_BOOL *pbRetVal);
-void __RPC_STUB ICatalogObject_get_Valid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogObject_IsPropertyWriteOnly_Proxy(
-    ICatalogObject* This,
-    BSTR bstrPropName,
-    VARIANT_BOOL *pbRetVal);
-void __RPC_STUB ICatalogObject_IsPropertyWriteOnly_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICatalogObject_INTERFACE_DEFINED__ */
 
@@ -2440,29 +1867,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICatalogCollection* This);
+        ICatalogCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICatalogCollection* This);
+        ICatalogCollection *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2470,7 +1897,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2482,74 +1909,75 @@
 
     /*** ICatalogCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         IUnknown **ppEnumVariant);
 
     HRESULT (STDMETHODCALLTYPE *get_Item)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         LONG lIndex,
         IDispatch **ppCatalogObject);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         LONG *plObjectCount);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         LONG lIndex);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         IDispatch **ppCatalogObject);
 
     HRESULT (STDMETHODCALLTYPE *Populate)(
-        ICatalogCollection* This);
+        ICatalogCollection *This);
 
     HRESULT (STDMETHODCALLTYPE *SaveChanges)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         LONG *pcChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetCollection)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         BSTR bstrCollName,
         VARIANT varObjectKey,
         IDispatch **ppCatalogCollection);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         VARIANT *pVarNamel);
 
     HRESULT (STDMETHODCALLTYPE *get_AddEnabled)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         VARIANT_BOOL *pVarBool);
 
     HRESULT (STDMETHODCALLTYPE *get_RemoveEnabled)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         VARIANT_BOOL *pVarBool);
 
     HRESULT (STDMETHODCALLTYPE *GetUtilInterface)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         IDispatch **ppIDispatch);
 
     HRESULT (STDMETHODCALLTYPE *get_DataStoreMajorVersion)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         LONG *plMajorVersion);
 
     HRESULT (STDMETHODCALLTYPE *get_DataStoreMinorVersion)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         LONG *plMinorVersionl);
 
     HRESULT (STDMETHODCALLTYPE *PopulateByKey)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         SAFEARRAY *psaKeys);
 
     HRESULT (STDMETHODCALLTYPE *PopulateByQuery)(
-        ICatalogCollection* This,
+        ICatalogCollection *This,
         BSTR bstrQueryString,
         LONG lQueryType);
 
     END_INTERFACE
 } ICatalogCollectionVtbl;
+
 interface ICatalogCollection {
     CONST_VTBL ICatalogCollectionVtbl* lpVtbl;
 };
@@ -2660,137 +2088,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get__NewEnum_Proxy(
-    ICatalogCollection* This,
-    IUnknown **ppEnumVariant);
-void __RPC_STUB ICatalogCollection_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get_Item_Proxy(
-    ICatalogCollection* This,
-    LONG lIndex,
-    IDispatch **ppCatalogObject);
-void __RPC_STUB ICatalogCollection_get_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get_Count_Proxy(
-    ICatalogCollection* This,
-    LONG *plObjectCount);
-void __RPC_STUB ICatalogCollection_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_Remove_Proxy(
-    ICatalogCollection* This,
-    LONG lIndex);
-void __RPC_STUB ICatalogCollection_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_Add_Proxy(
-    ICatalogCollection* This,
-    IDispatch **ppCatalogObject);
-void __RPC_STUB ICatalogCollection_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_Populate_Proxy(
-    ICatalogCollection* This);
-void __RPC_STUB ICatalogCollection_Populate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_SaveChanges_Proxy(
-    ICatalogCollection* This,
-    LONG *pcChanges);
-void __RPC_STUB ICatalogCollection_SaveChanges_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_GetCollection_Proxy(
-    ICatalogCollection* This,
-    BSTR bstrCollName,
-    VARIANT varObjectKey,
-    IDispatch **ppCatalogCollection);
-void __RPC_STUB ICatalogCollection_GetCollection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get_Name_Proxy(
-    ICatalogCollection* This,
-    VARIANT *pVarNamel);
-void __RPC_STUB ICatalogCollection_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get_AddEnabled_Proxy(
-    ICatalogCollection* This,
-    VARIANT_BOOL *pVarBool);
-void __RPC_STUB ICatalogCollection_get_AddEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get_RemoveEnabled_Proxy(
-    ICatalogCollection* This,
-    VARIANT_BOOL *pVarBool);
-void __RPC_STUB ICatalogCollection_get_RemoveEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_GetUtilInterface_Proxy(
-    ICatalogCollection* This,
-    IDispatch **ppIDispatch);
-void __RPC_STUB ICatalogCollection_GetUtilInterface_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get_DataStoreMajorVersion_Proxy(
-    ICatalogCollection* This,
-    LONG *plMajorVersion);
-void __RPC_STUB ICatalogCollection_get_DataStoreMajorVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_get_DataStoreMinorVersion_Proxy(
-    ICatalogCollection* This,
-    LONG *plMinorVersionl);
-void __RPC_STUB ICatalogCollection_get_DataStoreMinorVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_PopulateByKey_Proxy(
-    ICatalogCollection* This,
-    SAFEARRAY *psaKeys);
-void __RPC_STUB ICatalogCollection_PopulateByKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogCollection_PopulateByQuery_Proxy(
-    ICatalogCollection* This,
-    BSTR bstrQueryString,
-    LONG lQueryType);
-void __RPC_STUB ICatalogCollection_PopulateByQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICatalogCollection_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/comcat.h b/mingw-w64-headers/include/comcat.h
index 5465d81..9b5112a 100644
--- a/mingw-w64-headers/include/comcat.h
+++ b/mingw-w64-headers/include/comcat.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/comcat.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/comcat.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __IEnumGUID_FWD_DEFINED__
 #define __IEnumGUID_FWD_DEFINED__
 typedef interface IEnumGUID IEnumGUID;
+#ifdef __cplusplus
+interface IEnumGUID;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumCATEGORYINFO_FWD_DEFINED__
 #define __IEnumCATEGORYINFO_FWD_DEFINED__
 typedef interface IEnumCATEGORYINFO IEnumCATEGORYINFO;
+#ifdef __cplusplus
+interface IEnumCATEGORYINFO;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICatRegister_FWD_DEFINED__
 #define __ICatRegister_FWD_DEFINED__
 typedef interface ICatRegister ICatRegister;
+#ifdef __cplusplus
+interface ICatRegister;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICatInformation_FWD_DEFINED__
 #define __ICatInformation_FWD_DEFINED__
 typedef interface ICatInformation ICatInformation;
+#ifdef __cplusplus
+interface ICatInformation;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -56,6 +68,9 @@
 #ifndef __IEnumGUID_FWD_DEFINED__
 #define __IEnumGUID_FWD_DEFINED__
 typedef interface IEnumGUID IEnumGUID;
+#ifdef __cplusplus
+interface IEnumGUID;
+#endif /* __cplusplus */
 #endif
 
 #endif
@@ -63,16 +78,25 @@
 #ifndef __IEnumCATEGORYINFO_FWD_DEFINED__
 #define __IEnumCATEGORYINFO_FWD_DEFINED__
 typedef interface IEnumCATEGORYINFO IEnumCATEGORYINFO;
+#ifdef __cplusplus
+interface IEnumCATEGORYINFO;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICatRegister_FWD_DEFINED__
 #define __ICatRegister_FWD_DEFINED__
 typedef interface ICatRegister ICatRegister;
+#ifdef __cplusplus
+interface ICatRegister;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICatInformation_FWD_DEFINED__
 #define __ICatInformation_FWD_DEFINED__
 typedef interface ICatInformation ICatInformation;
+#ifdef __cplusplus
+interface ICatInformation;
+#endif /* __cplusplus */
 #endif
 
 
@@ -153,36 +177,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumGUID* This,
+        IEnumGUID *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumGUID* This);
+        IEnumGUID *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumGUID* This);
+        IEnumGUID *This);
 
     /*** IEnumGUID methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumGUID* This,
+        IEnumGUID *This,
         ULONG celt,
         GUID *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumGUID* This,
+        IEnumGUID *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumGUID* This);
+        IEnumGUID *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumGUID* This,
+        IEnumGUID *This,
         IEnumGUID **ppenum);
 
     END_INTERFACE
 } IEnumGUIDVtbl;
+
 interface IEnumGUID {
     CONST_VTBL IEnumGUIDVtbl* lpVtbl;
 };
@@ -237,29 +262,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumGUID_Skip_Proxy(
-    IEnumGUID* This,
-    ULONG celt);
-void __RPC_STUB IEnumGUID_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumGUID_Reset_Proxy(
-    IEnumGUID* This);
-void __RPC_STUB IEnumGUID_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumGUID_Clone_Proxy(
-    IEnumGUID* This,
-    IEnumGUID **ppenum);
-void __RPC_STUB IEnumGUID_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumGUID_Next_Proxy(
     IEnumGUID* This,
     ULONG celt,
@@ -323,36 +325,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumCATEGORYINFO* This,
+        IEnumCATEGORYINFO *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumCATEGORYINFO* This);
+        IEnumCATEGORYINFO *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumCATEGORYINFO* This);
+        IEnumCATEGORYINFO *This);
 
     /*** IEnumCATEGORYINFO methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumCATEGORYINFO* This,
+        IEnumCATEGORYINFO *This,
         ULONG celt,
         CATEGORYINFO *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumCATEGORYINFO* This,
+        IEnumCATEGORYINFO *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumCATEGORYINFO* This);
+        IEnumCATEGORYINFO *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumCATEGORYINFO* This,
+        IEnumCATEGORYINFO *This,
         IEnumCATEGORYINFO **ppenum);
 
     END_INTERFACE
 } IEnumCATEGORYINFOVtbl;
+
 interface IEnumCATEGORYINFO {
     CONST_VTBL IEnumCATEGORYINFOVtbl* lpVtbl;
 };
@@ -397,39 +400,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Next_Proxy(
-    IEnumCATEGORYINFO* This,
-    ULONG celt,
-    CATEGORYINFO *rgelt,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumCATEGORYINFO_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Skip_Proxy(
-    IEnumCATEGORYINFO* This,
-    ULONG celt);
-void __RPC_STUB IEnumCATEGORYINFO_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Reset_Proxy(
-    IEnumCATEGORYINFO* This);
-void __RPC_STUB IEnumCATEGORYINFO_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumCATEGORYINFO_Clone_Proxy(
-    IEnumCATEGORYINFO* This,
-    IEnumCATEGORYINFO **ppenum);
-void __RPC_STUB IEnumCATEGORYINFO_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumCATEGORYINFO_INTERFACE_DEFINED__ */
 
@@ -488,53 +458,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICatRegister* This,
+        ICatRegister *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICatRegister* This);
+        ICatRegister *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICatRegister* This);
+        ICatRegister *This);
 
     /*** ICatRegister methods ***/
     HRESULT (STDMETHODCALLTYPE *RegisterCategories)(
-        ICatRegister* This,
+        ICatRegister *This,
         ULONG cCategories,
         CATEGORYINFO rgCategoryInfo[]);
 
     HRESULT (STDMETHODCALLTYPE *UnRegisterCategories)(
-        ICatRegister* This,
+        ICatRegister *This,
         ULONG cCategories,
         CATID rgcatid[]);
 
     HRESULT (STDMETHODCALLTYPE *RegisterClassImplCategories)(
-        ICatRegister* This,
+        ICatRegister *This,
         REFCLSID rclsid,
         ULONG cCategories,
         CATID rgcatid[]);
 
     HRESULT (STDMETHODCALLTYPE *UnRegisterClassImplCategories)(
-        ICatRegister* This,
+        ICatRegister *This,
         REFCLSID rclsid,
         ULONG cCategories,
         CATID rgcatid[]);
 
     HRESULT (STDMETHODCALLTYPE *RegisterClassReqCategories)(
-        ICatRegister* This,
+        ICatRegister *This,
         REFCLSID rclsid,
         ULONG cCategories,
         CATID rgcatid[]);
 
     HRESULT (STDMETHODCALLTYPE *UnRegisterClassReqCategories)(
-        ICatRegister* This,
+        ICatRegister *This,
         REFCLSID rclsid,
         ULONG cCategories,
         CATID rgcatid[]);
 
     END_INTERFACE
 } ICatRegisterVtbl;
+
 interface ICatRegister {
     CONST_VTBL ICatRegisterVtbl* lpVtbl;
 };
@@ -587,64 +558,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICatRegister_RegisterCategories_Proxy(
-    ICatRegister* This,
-    ULONG cCategories,
-    CATEGORYINFO rgCategoryInfo[]);
-void __RPC_STUB ICatRegister_RegisterCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatRegister_UnRegisterCategories_Proxy(
-    ICatRegister* This,
-    ULONG cCategories,
-    CATID rgcatid[]);
-void __RPC_STUB ICatRegister_UnRegisterCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatRegister_RegisterClassImplCategories_Proxy(
-    ICatRegister* This,
-    REFCLSID rclsid,
-    ULONG cCategories,
-    CATID rgcatid[]);
-void __RPC_STUB ICatRegister_RegisterClassImplCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatRegister_UnRegisterClassImplCategories_Proxy(
-    ICatRegister* This,
-    REFCLSID rclsid,
-    ULONG cCategories,
-    CATID rgcatid[]);
-void __RPC_STUB ICatRegister_UnRegisterClassImplCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatRegister_RegisterClassReqCategories_Proxy(
-    ICatRegister* This,
-    REFCLSID rclsid,
-    ULONG cCategories,
-    CATID rgcatid[]);
-void __RPC_STUB ICatRegister_RegisterClassReqCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatRegister_UnRegisterClassReqCategories_Proxy(
-    ICatRegister* This,
-    REFCLSID rclsid,
-    ULONG cCategories,
-    CATID rgcatid[]);
-void __RPC_STUB ICatRegister_UnRegisterClassReqCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICatRegister_INTERFACE_DEFINED__ */
 
@@ -706,30 +619,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICatInformation* This,
+        ICatInformation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICatInformation* This);
+        ICatInformation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICatInformation* This);
+        ICatInformation *This);
 
     /*** ICatInformation methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumCategories)(
-        ICatInformation* This,
+        ICatInformation *This,
         LCID lcid,
         IEnumCATEGORYINFO **ppenumCategoryInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetCategoryDesc)(
-        ICatInformation* This,
+        ICatInformation *This,
         REFCATID rcatid,
         LCID lcid,
         LPWSTR *pszDesc);
 
     HRESULT (STDMETHODCALLTYPE *EnumClassesOfCategories)(
-        ICatInformation* This,
+        ICatInformation *This,
         ULONG cImplemented,
         const CATID rgcatidImpl[],
         ULONG cRequired,
@@ -737,7 +650,7 @@
         IEnumGUID **ppenumClsid);
 
     HRESULT (STDMETHODCALLTYPE *IsClassOfCategories)(
-        ICatInformation* This,
+        ICatInformation *This,
         REFCLSID rclsid,
         ULONG cImplemented,
         const CATID rgcatidImpl[],
@@ -745,17 +658,18 @@
         const CATID rgcatidReq[]);
 
     HRESULT (STDMETHODCALLTYPE *EnumImplCategoriesOfClass)(
-        ICatInformation* This,
+        ICatInformation *This,
         REFCLSID rclsid,
         IEnumGUID **ppenumCatid);
 
     HRESULT (STDMETHODCALLTYPE *EnumReqCategoriesOfClass)(
-        ICatInformation* This,
+        ICatInformation *This,
         REFCLSID rclsid,
         IEnumGUID **ppenumCatid);
 
     END_INTERFACE
 } ICatInformationVtbl;
+
 interface ICatInformation {
     CONST_VTBL ICatInformationVtbl* lpVtbl;
 };
@@ -808,25 +722,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICatInformation_EnumCategories_Proxy(
-    ICatInformation* This,
-    LCID lcid,
-    IEnumCATEGORYINFO **ppenumCategoryInfo);
-void __RPC_STUB ICatInformation_EnumCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatInformation_GetCategoryDesc_Proxy(
-    ICatInformation* This,
-    REFCATID rcatid,
-    LCID lcid,
-    LPWSTR *pszDesc);
-void __RPC_STUB ICatInformation_GetCategoryDesc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ICatInformation_RemoteEnumClassesOfCategories_Proxy(
     ICatInformation* This,
     ULONG cImplemented,
@@ -851,24 +746,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatInformation_EnumImplCategoriesOfClass_Proxy(
-    ICatInformation* This,
-    REFCLSID rclsid,
-    IEnumGUID **ppenumCatid);
-void __RPC_STUB ICatInformation_EnumImplCategoriesOfClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatInformation_EnumReqCategoriesOfClass_Proxy(
-    ICatInformation* This,
-    REFCLSID rclsid,
-    IEnumGUID **ppenumCatid);
-void __RPC_STUB ICatInformation_EnumReqCategoriesOfClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK ICatInformation_EnumClassesOfCategories_Proxy(
     ICatInformation* This,
     ULONG cImplemented,
diff --git a/mingw-w64-headers/include/commoncontrols.h b/mingw-w64-headers/include/commoncontrols.h
index 59fc68d..c40e907 100644
--- a/mingw-w64-headers/include/commoncontrols.h
+++ b/mingw-w64-headers/include/commoncontrols.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/commoncontrols.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/commoncontrols.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,11 +20,17 @@
 #ifndef __IImageList_FWD_DEFINED__
 #define __IImageList_FWD_DEFINED__
 typedef interface IImageList IImageList;
+#ifdef __cplusplus
+interface IImageList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IImageList2_FWD_DEFINED__
 #define __IImageList2_FWD_DEFINED__
 typedef interface IImageList2 IImageList2;
+#ifdef __cplusplus
+interface IImageList2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ImageList_FWD_DEFINED__
@@ -277,74 +283,74 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IImageList* This,
+        IImageList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IImageList* This);
+        IImageList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IImageList* This);
+        IImageList *This);
 
     /*** IImageList methods ***/
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IImageList* This,
+        IImageList *This,
         HBITMAP hbmImage,
         HBITMAP hbmMask,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *ReplaceIcon)(
-        IImageList* This,
+        IImageList *This,
         int i,
         HICON hicon,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *SetOverlayImage)(
-        IImageList* This,
+        IImageList *This,
         int iImage,
         int iOverlay);
 
     HRESULT (STDMETHODCALLTYPE *Replace)(
-        IImageList* This,
+        IImageList *This,
         int i,
         HBITMAP hbmImage,
         HBITMAP hbmMask);
 
     HRESULT (STDMETHODCALLTYPE *AddMasked)(
-        IImageList* This,
+        IImageList *This,
         HBITMAP hbmImage,
         COLORREF crMask,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *Draw)(
-        IImageList* This,
+        IImageList *This,
         IMAGELISTDRAWPARAMS *pimldp);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IImageList* This,
+        IImageList *This,
         int i);
 
     HRESULT (STDMETHODCALLTYPE *GetIcon)(
-        IImageList* This,
+        IImageList *This,
         int i,
         UINT flags,
         HICON *picon);
 
     HRESULT (STDMETHODCALLTYPE *GetImageInfo)(
-        IImageList* This,
+        IImageList *This,
         int i,
         IMAGEINFO *pImageInfo);
 
     HRESULT (STDMETHODCALLTYPE *Copy)(
-        IImageList* This,
+        IImageList *This,
         int iDst,
         IUnknown *punkSrc,
         int iSrc,
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *Merge)(
-        IImageList* This,
+        IImageList *This,
         int i1,
         IUnknown *punk2,
         int i2,
@@ -354,96 +360,97 @@
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IImageList* This,
+        IImageList *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetImageRect)(
-        IImageList* This,
+        IImageList *This,
         int i,
         RECT *prc);
 
     HRESULT (STDMETHODCALLTYPE *GetIconSize)(
-        IImageList* This,
+        IImageList *This,
         int *cx,
         int *cy);
 
     HRESULT (STDMETHODCALLTYPE *SetIconSize)(
-        IImageList* This,
+        IImageList *This,
         int cx,
         int cy);
 
     HRESULT (STDMETHODCALLTYPE *GetImageCount)(
-        IImageList* This,
+        IImageList *This,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *SetImageCount)(
-        IImageList* This,
+        IImageList *This,
         UINT uNewCount);
 
     HRESULT (STDMETHODCALLTYPE *SetBkColor)(
-        IImageList* This,
+        IImageList *This,
         COLORREF clrBk,
         COLORREF *pclr);
 
     HRESULT (STDMETHODCALLTYPE *GetBkColor)(
-        IImageList* This,
+        IImageList *This,
         COLORREF *pclr);
 
     HRESULT (STDMETHODCALLTYPE *BeginDrag)(
-        IImageList* This,
+        IImageList *This,
         int iTrack,
         int dxHotspot,
         int dyHotspot);
 
     HRESULT (STDMETHODCALLTYPE *EndDrag)(
-        IImageList* This);
+        IImageList *This);
 
     HRESULT (STDMETHODCALLTYPE *DragEnter)(
-        IImageList* This,
+        IImageList *This,
         HWND hwndLock,
         int x,
         int y);
 
     HRESULT (STDMETHODCALLTYPE *DragLeave)(
-        IImageList* This,
+        IImageList *This,
         HWND hwndLock);
 
     HRESULT (STDMETHODCALLTYPE *DragMove)(
-        IImageList* This,
+        IImageList *This,
         int x,
         int y);
 
     HRESULT (STDMETHODCALLTYPE *SetDragCursorImage)(
-        IImageList* This,
+        IImageList *This,
         IUnknown *punk,
         int iDrag,
         int dxHotspot,
         int dyHotspot);
 
     HRESULT (STDMETHODCALLTYPE *DragShowNolock)(
-        IImageList* This,
+        IImageList *This,
         WINBOOL fShow);
 
     HRESULT (STDMETHODCALLTYPE *GetDragImage)(
-        IImageList* This,
+        IImageList *This,
         POINT *ppt,
         POINT *pptHotspot,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetItemFlags)(
-        IImageList* This,
+        IImageList *This,
         int i,
         DWORD *dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetOverlayImage)(
-        IImageList* This,
+        IImageList *This,
         int iOverlay,
         int *piIndex);
 
     END_INTERFACE
 } IImageListVtbl;
+
 interface IImageList {
     CONST_VTBL IImageListVtbl* lpVtbl;
 };
@@ -588,276 +595,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IImageList_Add_Proxy(
-    IImageList* This,
-    HBITMAP hbmImage,
-    HBITMAP hbmMask,
-    int *pi);
-void __RPC_STUB IImageList_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_ReplaceIcon_Proxy(
-    IImageList* This,
-    int i,
-    HICON hicon,
-    int *pi);
-void __RPC_STUB IImageList_ReplaceIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_SetOverlayImage_Proxy(
-    IImageList* This,
-    int iImage,
-    int iOverlay);
-void __RPC_STUB IImageList_SetOverlayImage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_Replace_Proxy(
-    IImageList* This,
-    int i,
-    HBITMAP hbmImage,
-    HBITMAP hbmMask);
-void __RPC_STUB IImageList_Replace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_AddMasked_Proxy(
-    IImageList* This,
-    HBITMAP hbmImage,
-    COLORREF crMask,
-    int *pi);
-void __RPC_STUB IImageList_AddMasked_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_Draw_Proxy(
-    IImageList* This,
-    IMAGELISTDRAWPARAMS *pimldp);
-void __RPC_STUB IImageList_Draw_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_Remove_Proxy(
-    IImageList* This,
-    int i);
-void __RPC_STUB IImageList_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetIcon_Proxy(
-    IImageList* This,
-    int i,
-    UINT flags,
-    HICON *picon);
-void __RPC_STUB IImageList_GetIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetImageInfo_Proxy(
-    IImageList* This,
-    int i,
-    IMAGEINFO *pImageInfo);
-void __RPC_STUB IImageList_GetImageInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_Copy_Proxy(
-    IImageList* This,
-    int iDst,
-    IUnknown *punkSrc,
-    int iSrc,
-    UINT uFlags);
-void __RPC_STUB IImageList_Copy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_Merge_Proxy(
-    IImageList* This,
-    int i1,
-    IUnknown *punk2,
-    int i2,
-    int dx,
-    int dy,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IImageList_Merge_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_Clone_Proxy(
-    IImageList* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IImageList_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetImageRect_Proxy(
-    IImageList* This,
-    int i,
-    RECT *prc);
-void __RPC_STUB IImageList_GetImageRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetIconSize_Proxy(
-    IImageList* This,
-    int *cx,
-    int *cy);
-void __RPC_STUB IImageList_GetIconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_SetIconSize_Proxy(
-    IImageList* This,
-    int cx,
-    int cy);
-void __RPC_STUB IImageList_SetIconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetImageCount_Proxy(
-    IImageList* This,
-    int *pi);
-void __RPC_STUB IImageList_GetImageCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_SetImageCount_Proxy(
-    IImageList* This,
-    UINT uNewCount);
-void __RPC_STUB IImageList_SetImageCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_SetBkColor_Proxy(
-    IImageList* This,
-    COLORREF clrBk,
-    COLORREF *pclr);
-void __RPC_STUB IImageList_SetBkColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetBkColor_Proxy(
-    IImageList* This,
-    COLORREF *pclr);
-void __RPC_STUB IImageList_GetBkColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_BeginDrag_Proxy(
-    IImageList* This,
-    int iTrack,
-    int dxHotspot,
-    int dyHotspot);
-void __RPC_STUB IImageList_BeginDrag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_EndDrag_Proxy(
-    IImageList* This);
-void __RPC_STUB IImageList_EndDrag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_DragEnter_Proxy(
-    IImageList* This,
-    HWND hwndLock,
-    int x,
-    int y);
-void __RPC_STUB IImageList_DragEnter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_DragLeave_Proxy(
-    IImageList* This,
-    HWND hwndLock);
-void __RPC_STUB IImageList_DragLeave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_DragMove_Proxy(
-    IImageList* This,
-    int x,
-    int y);
-void __RPC_STUB IImageList_DragMove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_SetDragCursorImage_Proxy(
-    IImageList* This,
-    IUnknown *punk,
-    int iDrag,
-    int dxHotspot,
-    int dyHotspot);
-void __RPC_STUB IImageList_SetDragCursorImage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_DragShowNolock_Proxy(
-    IImageList* This,
-    WINBOOL fShow);
-void __RPC_STUB IImageList_DragShowNolock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetDragImage_Proxy(
-    IImageList* This,
-    POINT *ppt,
-    POINT *pptHotspot,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IImageList_GetDragImage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetItemFlags_Proxy(
-    IImageList* This,
-    int i,
-    DWORD *dwFlags);
-void __RPC_STUB IImageList_GetItemFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList_GetOverlayImage_Proxy(
-    IImageList* This,
-    int iOverlay,
-    int *piIndex);
-void __RPC_STUB IImageList_GetOverlayImage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IImageList_INTERFACE_DEFINED__ */
 
@@ -940,74 +677,74 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IImageList2* This,
+        IImageList2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IImageList2* This);
+        IImageList2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IImageList2* This);
+        IImageList2 *This);
 
     /*** IImageList methods ***/
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IImageList2* This,
+        IImageList2 *This,
         HBITMAP hbmImage,
         HBITMAP hbmMask,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *ReplaceIcon)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         HICON hicon,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *SetOverlayImage)(
-        IImageList2* This,
+        IImageList2 *This,
         int iImage,
         int iOverlay);
 
     HRESULT (STDMETHODCALLTYPE *Replace)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         HBITMAP hbmImage,
         HBITMAP hbmMask);
 
     HRESULT (STDMETHODCALLTYPE *AddMasked)(
-        IImageList2* This,
+        IImageList2 *This,
         HBITMAP hbmImage,
         COLORREF crMask,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *Draw)(
-        IImageList2* This,
+        IImageList2 *This,
         IMAGELISTDRAWPARAMS *pimldp);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IImageList2* This,
+        IImageList2 *This,
         int i);
 
     HRESULT (STDMETHODCALLTYPE *GetIcon)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         UINT flags,
         HICON *picon);
 
     HRESULT (STDMETHODCALLTYPE *GetImageInfo)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         IMAGEINFO *pImageInfo);
 
     HRESULT (STDMETHODCALLTYPE *Copy)(
-        IImageList2* This,
+        IImageList2 *This,
         int iDst,
         IUnknown *punkSrc,
         int iSrc,
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *Merge)(
-        IImageList2* This,
+        IImageList2 *This,
         int i1,
         IUnknown *punk2,
         int i2,
@@ -1017,143 +754,143 @@
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IImageList2* This,
+        IImageList2 *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetImageRect)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         RECT *prc);
 
     HRESULT (STDMETHODCALLTYPE *GetIconSize)(
-        IImageList2* This,
+        IImageList2 *This,
         int *cx,
         int *cy);
 
     HRESULT (STDMETHODCALLTYPE *SetIconSize)(
-        IImageList2* This,
+        IImageList2 *This,
         int cx,
         int cy);
 
     HRESULT (STDMETHODCALLTYPE *GetImageCount)(
-        IImageList2* This,
+        IImageList2 *This,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *SetImageCount)(
-        IImageList2* This,
+        IImageList2 *This,
         UINT uNewCount);
 
     HRESULT (STDMETHODCALLTYPE *SetBkColor)(
-        IImageList2* This,
+        IImageList2 *This,
         COLORREF clrBk,
         COLORREF *pclr);
 
     HRESULT (STDMETHODCALLTYPE *GetBkColor)(
-        IImageList2* This,
+        IImageList2 *This,
         COLORREF *pclr);
 
     HRESULT (STDMETHODCALLTYPE *BeginDrag)(
-        IImageList2* This,
+        IImageList2 *This,
         int iTrack,
         int dxHotspot,
         int dyHotspot);
 
     HRESULT (STDMETHODCALLTYPE *EndDrag)(
-        IImageList2* This);
+        IImageList2 *This);
 
     HRESULT (STDMETHODCALLTYPE *DragEnter)(
-        IImageList2* This,
+        IImageList2 *This,
         HWND hwndLock,
         int x,
         int y);
 
     HRESULT (STDMETHODCALLTYPE *DragLeave)(
-        IImageList2* This,
+        IImageList2 *This,
         HWND hwndLock);
 
     HRESULT (STDMETHODCALLTYPE *DragMove)(
-        IImageList2* This,
+        IImageList2 *This,
         int x,
         int y);
 
     HRESULT (STDMETHODCALLTYPE *SetDragCursorImage)(
-        IImageList2* This,
+        IImageList2 *This,
         IUnknown *punk,
         int iDrag,
         int dxHotspot,
         int dyHotspot);
 
     HRESULT (STDMETHODCALLTYPE *DragShowNolock)(
-        IImageList2* This,
+        IImageList2 *This,
         WINBOOL fShow);
 
     HRESULT (STDMETHODCALLTYPE *GetDragImage)(
-        IImageList2* This,
+        IImageList2 *This,
         POINT *ppt,
         POINT *pptHotspot,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetItemFlags)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         DWORD *dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetOverlayImage)(
-        IImageList2* This,
+        IImageList2 *This,
         int iOverlay,
         int *piIndex);
 
     /*** IImageList2 methods ***/
     HRESULT (STDMETHODCALLTYPE *Resize)(
-        IImageList2* This,
+        IImageList2 *This,
         int cxNewIconSize,
         int cyNewIconSize);
 
     HRESULT (STDMETHODCALLTYPE *GetOriginalSize)(
-        IImageList2* This,
+        IImageList2 *This,
         int iImage,
         DWORD dwFlags,
         int *pcx,
         int *pcy);
 
     HRESULT (STDMETHODCALLTYPE *SetOriginalSize)(
-        IImageList2* This,
+        IImageList2 *This,
         int iImage,
         int cx,
         int cy);
 
     HRESULT (STDMETHODCALLTYPE *SetCallback)(
-        IImageList2* This,
+        IImageList2 *This,
         IUnknown *punk);
 
     HRESULT (STDMETHODCALLTYPE *GetCallback)(
-        IImageList2* This,
+        IImageList2 *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *ForceImagePresent)(
-        IImageList2* This,
+        IImageList2 *This,
         int iImage,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *DiscardImages)(
-        IImageList2* This,
+        IImageList2 *This,
         int iFirstImage,
         int iLastImage,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *PreloadImages)(
-        IImageList2* This,
+        IImageList2 *This,
         IMAGELISTDRAWPARAMS *pimldp);
 
     HRESULT (STDMETHODCALLTYPE *GetStatistics)(
-        IImageList2* This,
+        IImageList2 *This,
         IMAGELISTSTATS *pils);
 
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IImageList2* This,
+        IImageList2 *This,
         int cx,
         int cy,
         UINT flags,
@@ -1161,7 +898,7 @@
         int cGrow);
 
     HRESULT (STDMETHODCALLTYPE *Replace2)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         HBITMAP hbmImage,
         HBITMAP hbmMask,
@@ -1169,7 +906,7 @@
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *ReplaceFromImageList)(
-        IImageList2* This,
+        IImageList2 *This,
         int i,
         IImageList *pil,
         int iSrc,
@@ -1178,6 +915,7 @@
 
     END_INTERFACE
 } IImageList2Vtbl;
+
 interface IImageList2 {
     CONST_VTBL IImageList2Vtbl* lpVtbl;
 };
@@ -1372,124 +1110,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IImageList2_Resize_Proxy(
-    IImageList2* This,
-    int cxNewIconSize,
-    int cyNewIconSize);
-void __RPC_STUB IImageList2_Resize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_GetOriginalSize_Proxy(
-    IImageList2* This,
-    int iImage,
-    DWORD dwFlags,
-    int *pcx,
-    int *pcy);
-void __RPC_STUB IImageList2_GetOriginalSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_SetOriginalSize_Proxy(
-    IImageList2* This,
-    int iImage,
-    int cx,
-    int cy);
-void __RPC_STUB IImageList2_SetOriginalSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_SetCallback_Proxy(
-    IImageList2* This,
-    IUnknown *punk);
-void __RPC_STUB IImageList2_SetCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_GetCallback_Proxy(
-    IImageList2* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IImageList2_GetCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_ForceImagePresent_Proxy(
-    IImageList2* This,
-    int iImage,
-    DWORD dwFlags);
-void __RPC_STUB IImageList2_ForceImagePresent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_DiscardImages_Proxy(
-    IImageList2* This,
-    int iFirstImage,
-    int iLastImage,
-    DWORD dwFlags);
-void __RPC_STUB IImageList2_DiscardImages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_PreloadImages_Proxy(
-    IImageList2* This,
-    IMAGELISTDRAWPARAMS *pimldp);
-void __RPC_STUB IImageList2_PreloadImages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_GetStatistics_Proxy(
-    IImageList2* This,
-    IMAGELISTSTATS *pils);
-void __RPC_STUB IImageList2_GetStatistics_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_Initialize_Proxy(
-    IImageList2* This,
-    int cx,
-    int cy,
-    UINT flags,
-    int cInitial,
-    int cGrow);
-void __RPC_STUB IImageList2_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_Replace2_Proxy(
-    IImageList2* This,
-    int i,
-    HBITMAP hbmImage,
-    HBITMAP hbmMask,
-    IUnknown *punk,
-    DWORD dwFlags);
-void __RPC_STUB IImageList2_Replace2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IImageList2_ReplaceFromImageList_Proxy(
-    IImageList2* This,
-    int i,
-    IImageList *pil,
-    int iSrc,
-    IUnknown *punk,
-    DWORD dwFlags);
-void __RPC_STUB IImageList2_ReplaceFromImageList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IImageList2_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/control.h b/mingw-w64-headers/include/control.h
index e40ace1..dbaa44f 100644
--- a/mingw-w64-headers/include/control.h
+++ b/mingw-w64-headers/include/control.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/control.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/control.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IMediaControl_FWD_DEFINED__
 #define __IMediaControl_FWD_DEFINED__
 typedef interface IMediaControl IMediaControl;
+#ifdef __cplusplus
+interface IMediaControl;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -179,29 +182,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaControl* This,
+        IMediaControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaControl* This);
+        IMediaControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaControl* This);
+        IMediaControl *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IMediaControl* This,
+        IMediaControl *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IMediaControl* This,
+        IMediaControl *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IMediaControl* This,
+        IMediaControl *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -209,7 +212,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IMediaControl* This,
+        IMediaControl *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -221,41 +224,42 @@
 
     /*** IMediaControl methods ***/
     HRESULT (STDMETHODCALLTYPE *Run)(
-        IMediaControl* This);
+        IMediaControl *This);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        IMediaControl* This);
+        IMediaControl *This);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IMediaControl* This);
+        IMediaControl *This);
 
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IMediaControl* This,
+        IMediaControl *This,
         LONG msTimeout,
         OAFilterState *pfs);
 
     HRESULT (STDMETHODCALLTYPE *RenderFile)(
-        IMediaControl* This,
+        IMediaControl *This,
         BSTR strFilename);
 
     HRESULT (STDMETHODCALLTYPE *AddSourceFilter)(
-        IMediaControl* This,
+        IMediaControl *This,
         BSTR strFilename,
         IDispatch **ppUnk);
 
     HRESULT (STDMETHODCALLTYPE *get_FilterCollection)(
-        IMediaControl* This,
+        IMediaControl *This,
         IDispatch **ppUnk);
 
     HRESULT (STDMETHODCALLTYPE *get_RegFilterCollection)(
-        IMediaControl* This,
+        IMediaControl *This,
         IDispatch **ppUnk);
 
     HRESULT (STDMETHODCALLTYPE *StopWhenReady)(
-        IMediaControl* This);
+        IMediaControl *This);
 
     END_INTERFACE
 } IMediaControlVtbl;
+
 interface IMediaControl {
     CONST_VTBL IMediaControlVtbl* lpVtbl;
 };
@@ -338,76 +342,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaControl_Run_Proxy(
-    IMediaControl* This);
-void __RPC_STUB IMediaControl_Run_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_Pause_Proxy(
-    IMediaControl* This);
-void __RPC_STUB IMediaControl_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_Stop_Proxy(
-    IMediaControl* This);
-void __RPC_STUB IMediaControl_Stop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_GetState_Proxy(
-    IMediaControl* This,
-    LONG msTimeout,
-    OAFilterState *pfs);
-void __RPC_STUB IMediaControl_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_RenderFile_Proxy(
-    IMediaControl* This,
-    BSTR strFilename);
-void __RPC_STUB IMediaControl_RenderFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_AddSourceFilter_Proxy(
-    IMediaControl* This,
-    BSTR strFilename,
-    IDispatch **ppUnk);
-void __RPC_STUB IMediaControl_AddSourceFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_get_FilterCollection_Proxy(
-    IMediaControl* This,
-    IDispatch **ppUnk);
-void __RPC_STUB IMediaControl_get_FilterCollection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_get_RegFilterCollection_Proxy(
-    IMediaControl* This,
-    IDispatch **ppUnk);
-void __RPC_STUB IMediaControl_get_RegFilterCollection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaControl_StopWhenReady_Proxy(
-    IMediaControl* This);
-void __RPC_STUB IMediaControl_StopWhenReady_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaControl_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/ctfutb.h b/mingw-w64-headers/include/ctfutb.h
index ac46717..1362619 100644
--- a/mingw-w64-headers/include/ctfutb.h
+++ b/mingw-w64-headers/include/ctfutb.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/ctfutb.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/ctfutb.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/dbgprop.h b/mingw-w64-headers/include/dbgprop.h
index 2240ed8..5d35ce5 100644
--- a/mingw-w64-headers/include/dbgprop.h
+++ b/mingw-w64-headers/include/dbgprop.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/dbgprop.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/dbgprop.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IDebugProperty_FWD_DEFINED__
 #define __IDebugProperty_FWD_DEFINED__
 typedef interface IDebugProperty IDebugProperty;
+#ifdef __cplusplus
+interface IDebugProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDebugPropertyInfo_FWD_DEFINED__
 #define __IEnumDebugPropertyInfo_FWD_DEFINED__
 typedef interface IEnumDebugPropertyInfo IEnumDebugPropertyInfo;
+#ifdef __cplusplus
+interface IEnumDebugPropertyInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugExtendedProperty_FWD_DEFINED__
 #define __IDebugExtendedProperty_FWD_DEFINED__
 typedef interface IDebugExtendedProperty IDebugExtendedProperty;
+#ifdef __cplusplus
+interface IDebugExtendedProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__
 #define __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__
 typedef interface IEnumDebugExtendedPropertyInfo IEnumDebugExtendedPropertyInfo;
+#ifdef __cplusplus
+interface IEnumDebugExtendedPropertyInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPerPropertyBrowsing2_FWD_DEFINED__
 #define __IPerPropertyBrowsing2_FWD_DEFINED__
 typedef interface IPerPropertyBrowsing2 IPerPropertyBrowsing2;
+#ifdef __cplusplus
+interface IPerPropertyBrowsing2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugPropertyEnumType_All_FWD_DEFINED__
 #define __IDebugPropertyEnumType_All_FWD_DEFINED__
 typedef interface IDebugPropertyEnumType_All IDebugPropertyEnumType_All;
+#ifdef __cplusplus
+interface IDebugPropertyEnumType_All;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugPropertyEnumType_Locals_FWD_DEFINED__
 #define __IDebugPropertyEnumType_Locals_FWD_DEFINED__
 typedef interface IDebugPropertyEnumType_Locals IDebugPropertyEnumType_Locals;
+#ifdef __cplusplus
+interface IDebugPropertyEnumType_Locals;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugPropertyEnumType_Arguments_FWD_DEFINED__
 #define __IDebugPropertyEnumType_Arguments_FWD_DEFINED__
 typedef interface IDebugPropertyEnumType_Arguments IDebugPropertyEnumType_Arguments;
+#ifdef __cplusplus
+interface IDebugPropertyEnumType_Arguments;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugPropertyEnumType_LocalsPlusArgs_FWD_DEFINED__
 #define __IDebugPropertyEnumType_LocalsPlusArgs_FWD_DEFINED__
 typedef interface IDebugPropertyEnumType_LocalsPlusArgs IDebugPropertyEnumType_LocalsPlusArgs;
+#ifdef __cplusplus
+interface IDebugPropertyEnumType_LocalsPlusArgs;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugPropertyEnumType_Registers_FWD_DEFINED__
 #define __IDebugPropertyEnumType_Registers_FWD_DEFINED__
 typedef interface IDebugPropertyEnumType_Registers IDebugPropertyEnumType_Registers;
+#ifdef __cplusplus
+interface IDebugPropertyEnumType_Registers;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -89,26 +119,41 @@
 #ifndef __IDebugProperty_FWD_DEFINED__
 #define __IDebugProperty_FWD_DEFINED__
 typedef interface IDebugProperty IDebugProperty;
+#ifdef __cplusplus
+interface IDebugProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDebugExtendedProperty_FWD_DEFINED__
 #define __IDebugExtendedProperty_FWD_DEFINED__
 typedef interface IDebugExtendedProperty IDebugExtendedProperty;
+#ifdef __cplusplus
+interface IDebugExtendedProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDebugPropertyInfo_FWD_DEFINED__
 #define __IEnumDebugPropertyInfo_FWD_DEFINED__
 typedef interface IEnumDebugPropertyInfo IEnumDebugPropertyInfo;
+#ifdef __cplusplus
+interface IEnumDebugPropertyInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__
 #define __IEnumDebugExtendedPropertyInfo_FWD_DEFINED__
 typedef interface IEnumDebugExtendedPropertyInfo IEnumDebugExtendedPropertyInfo;
+#ifdef __cplusplus
+interface IEnumDebugExtendedPropertyInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPerPropertyBrowsing2_FWD_DEFINED__
 #define __IPerPropertyBrowsing2_FWD_DEFINED__
 typedef interface IPerPropertyBrowsing2 IPerPropertyBrowsing2;
+#ifdef __cplusplus
+interface IPerPropertyBrowsing2;
+#endif /* __cplusplus */
 #endif
 
 
@@ -138,7 +183,6 @@
     DBGPROP_ATTRIB_HAS_EXTENDED_ATTRIBS = 0x800000
 };
 
-
 typedef DWORD DBGPROP_ATTRIB_FLAGS;
 
 enum {
@@ -153,7 +197,6 @@
     DBGPROP_INFO_AUTOEXPAND = 0x8000000
 };
 
-
 typedef DWORD DBGPROP_INFO_FLAGS;
 
 #define DBGPROP_INFO_STANDARD (((DBGPROP_INFO_NAME | DBGPROP_INFO_TYPE) | DBGPROP_INFO_VALUE) | DBGPROP_INFO_ATTRIBUTES)
@@ -290,47 +333,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugProperty* This,
+        IDebugProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugProperty* This);
+        IDebugProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugProperty* This);
+        IDebugProperty *This);
 
     /*** IDebugProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyInfo)(
-        IDebugProperty* This,
+        IDebugProperty *This,
         DWORD dwFieldSpec,
         UINT nRadix,
         DebugPropertyInfo *pPropertyInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetExtendedInfo)(
-        IDebugProperty* This,
+        IDebugProperty *This,
         ULONG cInfos,
         GUID *rgguidExtendedInfo,
         VARIANT *rgvar);
 
     HRESULT (STDMETHODCALLTYPE *SetValueAsString)(
-        IDebugProperty* This,
+        IDebugProperty *This,
         LPCOLESTR pszValue,
         UINT nRadix);
 
     HRESULT (STDMETHODCALLTYPE *EnumMembers)(
-        IDebugProperty* This,
+        IDebugProperty *This,
         DWORD dwFieldSpec,
         UINT nRadix,
         REFIID refiid,
         IEnumDebugPropertyInfo **ppepi);
 
     HRESULT (STDMETHODCALLTYPE *GetParent)(
-        IDebugProperty* This,
+        IDebugProperty *This,
         IDebugProperty **ppDebugProp);
 
     END_INTERFACE
 } IDebugPropertyVtbl;
+
 interface IDebugProperty {
     CONST_VTBL IDebugPropertyVtbl* lpVtbl;
 };
@@ -395,44 +439,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugProperty_GetExtendedInfo_Proxy(
-    IDebugProperty* This,
-    ULONG cInfos,
-    GUID *rgguidExtendedInfo,
-    VARIANT *rgvar);
-void __RPC_STUB IDebugProperty_GetExtendedInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugProperty_SetValueAsString_Proxy(
-    IDebugProperty* This,
-    LPCOLESTR pszValue,
-    UINT nRadix);
-void __RPC_STUB IDebugProperty_SetValueAsString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugProperty_EnumMembers_Proxy(
-    IDebugProperty* This,
-    DWORD dwFieldSpec,
-    UINT nRadix,
-    REFIID refiid,
-    IEnumDebugPropertyInfo **ppepi);
-void __RPC_STUB IDebugProperty_EnumMembers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugProperty_GetParent_Proxy(
-    IDebugProperty* This,
-    IDebugProperty **ppDebugProp);
-void __RPC_STUB IDebugProperty_GetParent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IDebugProperty_GetPropertyInfo_Proxy(
     IDebugProperty* This,
     DWORD dwFieldSpec,
@@ -491,40 +497,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumDebugPropertyInfo* This,
+        IEnumDebugPropertyInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumDebugPropertyInfo* This);
+        IEnumDebugPropertyInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumDebugPropertyInfo* This);
+        IEnumDebugPropertyInfo *This);
 
     /*** IEnumDebugPropertyInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumDebugPropertyInfo* This,
+        IEnumDebugPropertyInfo *This,
         ULONG celt,
         DebugPropertyInfo *pi,
         ULONG *pcEltsfetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumDebugPropertyInfo* This,
+        IEnumDebugPropertyInfo *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumDebugPropertyInfo* This);
+        IEnumDebugPropertyInfo *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumDebugPropertyInfo* This,
+        IEnumDebugPropertyInfo *This,
         IEnumDebugPropertyInfo **ppepi);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IEnumDebugPropertyInfo* This,
+        IEnumDebugPropertyInfo *This,
         ULONG *pcelt);
 
     END_INTERFACE
 } IEnumDebugPropertyInfoVtbl;
+
 interface IEnumDebugPropertyInfo {
     CONST_VTBL IEnumDebugPropertyInfoVtbl* lpVtbl;
 };
@@ -583,37 +590,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_Skip_Proxy(
-    IEnumDebugPropertyInfo* This,
-    ULONG celt);
-void __RPC_STUB IEnumDebugPropertyInfo_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_Reset_Proxy(
-    IEnumDebugPropertyInfo* This);
-void __RPC_STUB IEnumDebugPropertyInfo_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_Clone_Proxy(
-    IEnumDebugPropertyInfo* This,
-    IEnumDebugPropertyInfo **ppepi);
-void __RPC_STUB IEnumDebugPropertyInfo_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugPropertyInfo_GetCount_Proxy(
-    IEnumDebugPropertyInfo* This,
-    ULONG *pcelt);
-void __RPC_STUB IEnumDebugPropertyInfo_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumDebugPropertyInfo_Next_Proxy(
     IEnumDebugPropertyInfo* This,
     ULONG celt,
@@ -659,60 +635,61 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugExtendedProperty* This);
+        IDebugExtendedProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugExtendedProperty* This);
+        IDebugExtendedProperty *This);
 
     /*** IDebugProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyInfo)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         DWORD dwFieldSpec,
         UINT nRadix,
         DebugPropertyInfo *pPropertyInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetExtendedInfo)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         ULONG cInfos,
         GUID *rgguidExtendedInfo,
         VARIANT *rgvar);
 
     HRESULT (STDMETHODCALLTYPE *SetValueAsString)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         LPCOLESTR pszValue,
         UINT nRadix);
 
     HRESULT (STDMETHODCALLTYPE *EnumMembers)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         DWORD dwFieldSpec,
         UINT nRadix,
         REFIID refiid,
         IEnumDebugPropertyInfo **ppepi);
 
     HRESULT (STDMETHODCALLTYPE *GetParent)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         IDebugProperty **ppDebugProp);
 
     /*** IDebugExtendedProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *GetExtendedPropertyInfo)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         DWORD dwFieldSpec,
         UINT nRadix,
         ExtendedDebugPropertyInfo *pExtendedPropertyInfo);
 
     HRESULT (STDMETHODCALLTYPE *EnumExtendedMembers)(
-        IDebugExtendedProperty* This,
+        IDebugExtendedProperty *This,
         DWORD dwFieldSpec,
         UINT nRadix,
         IEnumDebugExtendedPropertyInfo **ppeepi);
 
     END_INTERFACE
 } IDebugExtendedPropertyVtbl;
+
 interface IDebugExtendedProperty {
     CONST_VTBL IDebugExtendedPropertyVtbl* lpVtbl;
 };
@@ -771,26 +748,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugExtendedProperty_GetExtendedPropertyInfo_Proxy(
-    IDebugExtendedProperty* This,
-    DWORD dwFieldSpec,
-    UINT nRadix,
-    ExtendedDebugPropertyInfo *pExtendedPropertyInfo);
-void __RPC_STUB IDebugExtendedProperty_GetExtendedPropertyInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDebugExtendedProperty_EnumExtendedMembers_Proxy(
-    IDebugExtendedProperty* This,
-    DWORD dwFieldSpec,
-    UINT nRadix,
-    IEnumDebugExtendedPropertyInfo **ppeepi);
-void __RPC_STUB IDebugExtendedProperty_EnumExtendedMembers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugExtendedProperty_INTERFACE_DEFINED__ */
 
@@ -833,40 +790,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumDebugExtendedPropertyInfo* This,
+        IEnumDebugExtendedPropertyInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumDebugExtendedPropertyInfo* This);
+        IEnumDebugExtendedPropertyInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumDebugExtendedPropertyInfo* This);
+        IEnumDebugExtendedPropertyInfo *This);
 
     /*** IEnumDebugExtendedPropertyInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumDebugExtendedPropertyInfo* This,
+        IEnumDebugExtendedPropertyInfo *This,
         ULONG celt,
         ExtendedDebugPropertyInfo *rgExtendedPropertyInfo,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumDebugExtendedPropertyInfo* This,
+        IEnumDebugExtendedPropertyInfo *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumDebugExtendedPropertyInfo* This);
+        IEnumDebugExtendedPropertyInfo *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumDebugExtendedPropertyInfo* This,
+        IEnumDebugExtendedPropertyInfo *This,
         IEnumDebugExtendedPropertyInfo **pedpe);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IEnumDebugExtendedPropertyInfo* This,
+        IEnumDebugExtendedPropertyInfo *This,
         ULONG *pcelt);
 
     END_INTERFACE
 } IEnumDebugExtendedPropertyInfoVtbl;
+
 interface IEnumDebugExtendedPropertyInfo {
     CONST_VTBL IEnumDebugExtendedPropertyInfoVtbl* lpVtbl;
 };
@@ -915,47 +873,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Next_Proxy(
-    IEnumDebugExtendedPropertyInfo* This,
-    ULONG celt,
-    ExtendedDebugPropertyInfo *rgExtendedPropertyInfo,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumDebugExtendedPropertyInfo_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Skip_Proxy(
-    IEnumDebugExtendedPropertyInfo* This,
-    ULONG celt);
-void __RPC_STUB IEnumDebugExtendedPropertyInfo_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Reset_Proxy(
-    IEnumDebugExtendedPropertyInfo* This);
-void __RPC_STUB IEnumDebugExtendedPropertyInfo_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_Clone_Proxy(
-    IEnumDebugExtendedPropertyInfo* This,
-    IEnumDebugExtendedPropertyInfo **pedpe);
-void __RPC_STUB IEnumDebugExtendedPropertyInfo_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDebugExtendedPropertyInfo_GetCount_Proxy(
-    IEnumDebugExtendedPropertyInfo* This,
-    ULONG *pcelt);
-void __RPC_STUB IEnumDebugExtendedPropertyInfo_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumDebugExtendedPropertyInfo_INTERFACE_DEFINED__ */
 
@@ -998,40 +915,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPerPropertyBrowsing2* This,
+        IPerPropertyBrowsing2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPerPropertyBrowsing2* This);
+        IPerPropertyBrowsing2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPerPropertyBrowsing2* This);
+        IPerPropertyBrowsing2 *This);
 
     /*** IPerPropertyBrowsing2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDisplayString)(
-        IPerPropertyBrowsing2* This,
+        IPerPropertyBrowsing2 *This,
         DISPID dispid,
         BSTR *pBstr);
 
     HRESULT (STDMETHODCALLTYPE *MapPropertyToPage)(
-        IPerPropertyBrowsing2* This,
+        IPerPropertyBrowsing2 *This,
         DISPID dispid,
         CLSID *pClsidPropPage);
 
     HRESULT (STDMETHODCALLTYPE *GetPredefinedStrings)(
-        IPerPropertyBrowsing2* This,
+        IPerPropertyBrowsing2 *This,
         DISPID dispid,
         CALPOLESTR *pCaStrings,
         CADWORD *pCaCookies);
 
     HRESULT (STDMETHODCALLTYPE *SetPredefinedValue)(
-        IPerPropertyBrowsing2* This,
+        IPerPropertyBrowsing2 *This,
         DISPID dispid,
         DWORD dwCookie);
 
     END_INTERFACE
 } IPerPropertyBrowsing2Vtbl;
+
 interface IPerPropertyBrowsing2 {
     CONST_VTBL IPerPropertyBrowsing2Vtbl* lpVtbl;
 };
@@ -1076,43 +994,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_GetDisplayString_Proxy(
-    IPerPropertyBrowsing2* This,
-    DISPID dispid,
-    BSTR *pBstr);
-void __RPC_STUB IPerPropertyBrowsing2_GetDisplayString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_MapPropertyToPage_Proxy(
-    IPerPropertyBrowsing2* This,
-    DISPID dispid,
-    CLSID *pClsidPropPage);
-void __RPC_STUB IPerPropertyBrowsing2_MapPropertyToPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_GetPredefinedStrings_Proxy(
-    IPerPropertyBrowsing2* This,
-    DISPID dispid,
-    CALPOLESTR *pCaStrings,
-    CADWORD *pCaCookies);
-void __RPC_STUB IPerPropertyBrowsing2_GetPredefinedStrings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing2_SetPredefinedValue_Proxy(
-    IPerPropertyBrowsing2* This,
-    DISPID dispid,
-    DWORD dwCookie);
-void __RPC_STUB IPerPropertyBrowsing2_SetPredefinedValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPerPropertyBrowsing2_INTERFACE_DEFINED__ */
 
@@ -1141,23 +1022,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugPropertyEnumType_All* This,
+        IDebugPropertyEnumType_All *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugPropertyEnumType_All* This);
+        IDebugPropertyEnumType_All *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugPropertyEnumType_All* This);
+        IDebugPropertyEnumType_All *This);
 
     /*** IDebugPropertyEnumType_All methods ***/
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IDebugPropertyEnumType_All* This,
+        IDebugPropertyEnumType_All *This,
         BSTR *a);
 
     END_INTERFACE
 } IDebugPropertyEnumType_AllVtbl;
+
 interface IDebugPropertyEnumType_All {
     CONST_VTBL IDebugPropertyEnumType_AllVtbl* lpVtbl;
 };
@@ -1190,14 +1072,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDebugPropertyEnumType_All_GetName_Proxy(
-    IDebugPropertyEnumType_All* This,
-    BSTR *a);
-void __RPC_STUB IDebugPropertyEnumType_All_GetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDebugPropertyEnumType_All_INTERFACE_DEFINED__ */
 
@@ -1223,23 +1097,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugPropertyEnumType_Locals* This,
+        IDebugPropertyEnumType_Locals *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugPropertyEnumType_Locals* This);
+        IDebugPropertyEnumType_Locals *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugPropertyEnumType_Locals* This);
+        IDebugPropertyEnumType_Locals *This);
 
     /*** IDebugPropertyEnumType_All methods ***/
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IDebugPropertyEnumType_Locals* This,
+        IDebugPropertyEnumType_Locals *This,
         BSTR *a);
 
     END_INTERFACE
 } IDebugPropertyEnumType_LocalsVtbl;
+
 interface IDebugPropertyEnumType_Locals {
     CONST_VTBL IDebugPropertyEnumType_LocalsVtbl* lpVtbl;
 };
@@ -1297,23 +1172,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugPropertyEnumType_Arguments* This,
+        IDebugPropertyEnumType_Arguments *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugPropertyEnumType_Arguments* This);
+        IDebugPropertyEnumType_Arguments *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugPropertyEnumType_Arguments* This);
+        IDebugPropertyEnumType_Arguments *This);
 
     /*** IDebugPropertyEnumType_All methods ***/
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IDebugPropertyEnumType_Arguments* This,
+        IDebugPropertyEnumType_Arguments *This,
         BSTR *a);
 
     END_INTERFACE
 } IDebugPropertyEnumType_ArgumentsVtbl;
+
 interface IDebugPropertyEnumType_Arguments {
     CONST_VTBL IDebugPropertyEnumType_ArgumentsVtbl* lpVtbl;
 };
@@ -1371,23 +1247,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugPropertyEnumType_LocalsPlusArgs* This,
+        IDebugPropertyEnumType_LocalsPlusArgs *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugPropertyEnumType_LocalsPlusArgs* This);
+        IDebugPropertyEnumType_LocalsPlusArgs *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugPropertyEnumType_LocalsPlusArgs* This);
+        IDebugPropertyEnumType_LocalsPlusArgs *This);
 
     /*** IDebugPropertyEnumType_All methods ***/
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IDebugPropertyEnumType_LocalsPlusArgs* This,
+        IDebugPropertyEnumType_LocalsPlusArgs *This,
         BSTR *a);
 
     END_INTERFACE
 } IDebugPropertyEnumType_LocalsPlusArgsVtbl;
+
 interface IDebugPropertyEnumType_LocalsPlusArgs {
     CONST_VTBL IDebugPropertyEnumType_LocalsPlusArgsVtbl* lpVtbl;
 };
@@ -1445,23 +1322,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDebugPropertyEnumType_Registers* This,
+        IDebugPropertyEnumType_Registers *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDebugPropertyEnumType_Registers* This);
+        IDebugPropertyEnumType_Registers *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDebugPropertyEnumType_Registers* This);
+        IDebugPropertyEnumType_Registers *This);
 
     /*** IDebugPropertyEnumType_All methods ***/
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IDebugPropertyEnumType_Registers* This,
+        IDebugPropertyEnumType_Registers *This,
         BSTR *a);
 
     END_INTERFACE
 } IDebugPropertyEnumType_RegistersVtbl;
+
 interface IDebugPropertyEnumType_Registers {
     CONST_VTBL IDebugPropertyEnumType_RegistersVtbl* lpVtbl;
 };
diff --git a/mingw-w64-headers/include/dcompanimation.h b/mingw-w64-headers/include/dcompanimation.h
index 20df083..1079e9b 100644
--- a/mingw-w64-headers/include/dcompanimation.h
+++ b/mingw-w64-headers/include/dcompanimation.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/dcompanimation.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/dcompanimation.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IDCompositionAnimation_FWD_DEFINED__
 #define __IDCompositionAnimation_FWD_DEFINED__
 typedef interface IDCompositionAnimation IDCompositionAnimation;
+#ifdef __cplusplus
+interface IDCompositionAnimation;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -80,26 +83,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDCompositionAnimation* This,
+        IDCompositionAnimation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDCompositionAnimation* This);
+        IDCompositionAnimation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDCompositionAnimation* This);
+        IDCompositionAnimation *This);
 
     /*** IDCompositionAnimation methods ***/
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IDCompositionAnimation* This);
+        IDCompositionAnimation *This);
 
     HRESULT (STDMETHODCALLTYPE *SetAbsoluteBeginTime)(
-        IDCompositionAnimation* This,
+        IDCompositionAnimation *This,
         LARGE_INTEGER a);
 
     HRESULT (STDMETHODCALLTYPE *AddCubic)(
-        IDCompositionAnimation* This,
+        IDCompositionAnimation *This,
         double a,
         float b,
         float c,
@@ -107,7 +110,7 @@
         float e);
 
     HRESULT (STDMETHODCALLTYPE *AddSinusoidal)(
-        IDCompositionAnimation* This,
+        IDCompositionAnimation *This,
         double a,
         float b,
         float c,
@@ -115,17 +118,18 @@
         float e);
 
     HRESULT (STDMETHODCALLTYPE *AddRepeat)(
-        IDCompositionAnimation* This,
+        IDCompositionAnimation *This,
         double a,
         double b);
 
     HRESULT (STDMETHODCALLTYPE *End)(
-        IDCompositionAnimation* This,
+        IDCompositionAnimation *This,
         double a,
         float b);
 
     END_INTERFACE
 } IDCompositionAnimationVtbl;
+
 interface IDCompositionAnimation {
     CONST_VTBL IDCompositionAnimationVtbl* lpVtbl;
 };
@@ -178,63 +182,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDCompositionAnimation_Reset_Proxy(
-    IDCompositionAnimation* This);
-void __RPC_STUB IDCompositionAnimation_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDCompositionAnimation_SetAbsoluteBeginTime_Proxy(
-    IDCompositionAnimation* This,
-    LARGE_INTEGER a);
-void __RPC_STUB IDCompositionAnimation_SetAbsoluteBeginTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDCompositionAnimation_AddCubic_Proxy(
-    IDCompositionAnimation* This,
-    double a,
-    float b,
-    float c,
-    float d,
-    float e);
-void __RPC_STUB IDCompositionAnimation_AddCubic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDCompositionAnimation_AddSinusoidal_Proxy(
-    IDCompositionAnimation* This,
-    double a,
-    float b,
-    float c,
-    float d,
-    float e);
-void __RPC_STUB IDCompositionAnimation_AddSinusoidal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDCompositionAnimation_AddRepeat_Proxy(
-    IDCompositionAnimation* This,
-    double a,
-    double b);
-void __RPC_STUB IDCompositionAnimation_AddRepeat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDCompositionAnimation_End_Proxy(
-    IDCompositionAnimation* This,
-    double a,
-    float b);
-void __RPC_STUB IDCompositionAnimation_End_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDCompositionAnimation_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/devicetopology.h b/mingw-w64-headers/include/devicetopology.h
index 4610a39..5b20262 100644
--- a/mingw-w64-headers/include/devicetopology.h
+++ b/mingw-w64-headers/include/devicetopology.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/devicetopology.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/devicetopology.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/dimm.h b/mingw-w64-headers/include/dimm.h
index c97f1b7..13fac8f 100644
--- a/mingw-w64-headers/include/dimm.h
+++ b/mingw-w64-headers/include/dimm.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/dimm.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/dimm.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,46 +20,73 @@
 #ifndef __IEnumInputContext_FWD_DEFINED__
 #define __IEnumInputContext_FWD_DEFINED__
 typedef interface IEnumInputContext IEnumInputContext;
+#ifdef __cplusplus
+interface IEnumInputContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveIMMRegistrar_FWD_DEFINED__
 #define __IActiveIMMRegistrar_FWD_DEFINED__
 typedef interface IActiveIMMRegistrar IActiveIMMRegistrar;
+#ifdef __cplusplus
+interface IActiveIMMRegistrar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveIMMMessagePumpOwner_FWD_DEFINED__
 #define __IActiveIMMMessagePumpOwner_FWD_DEFINED__
 typedef interface IActiveIMMMessagePumpOwner IActiveIMMMessagePumpOwner;
+#ifdef __cplusplus
+interface IActiveIMMMessagePumpOwner;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveIMMApp_FWD_DEFINED__
 #define __IActiveIMMApp_FWD_DEFINED__
 typedef interface IActiveIMMApp IActiveIMMApp;
+#ifdef __cplusplus
+interface IActiveIMMApp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveIMMIME_FWD_DEFINED__
 #define __IActiveIMMIME_FWD_DEFINED__
 typedef interface IActiveIMMIME IActiveIMMIME;
+#ifdef __cplusplus
+interface IActiveIMMIME;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveIME_FWD_DEFINED__
 #define __IActiveIME_FWD_DEFINED__
 typedef interface IActiveIME IActiveIME;
+#ifdef __cplusplus
+interface IActiveIME;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActiveIME2_FWD_DEFINED__
 #define __IActiveIME2_FWD_DEFINED__
 typedef interface IActiveIME2 IActiveIME2;
+#ifdef __cplusplus
+interface IActiveIME2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumRegisterWordA_FWD_DEFINED__
 #define __IEnumRegisterWordA_FWD_DEFINED__
 typedef interface IEnumRegisterWordA IEnumRegisterWordA;
+#ifdef __cplusplus
+interface IEnumRegisterWordA;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumRegisterWordW_FWD_DEFINED__
 #define __IEnumRegisterWordW_FWD_DEFINED__
 typedef interface IEnumRegisterWordW IEnumRegisterWordW;
+#ifdef __cplusplus
+interface IEnumRegisterWordW;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __CActiveIMM_FWD_DEFINED__
@@ -87,11 +114,17 @@
 #ifndef __IEnumRegisterWordA_FWD_DEFINED__
 #define __IEnumRegisterWordA_FWD_DEFINED__
 typedef interface IEnumRegisterWordA IEnumRegisterWordA;
+#ifdef __cplusplus
+interface IEnumRegisterWordA;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumRegisterWordW_FWD_DEFINED__
 #define __IEnumRegisterWordW_FWD_DEFINED__
 typedef interface IEnumRegisterWordW IEnumRegisterWordW;
+#ifdef __cplusplus
+interface IEnumRegisterWordW;
+#endif /* __cplusplus */
 #endif
 
 #include <winapifamily.h>
@@ -265,36 +298,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumInputContext* This,
+        IEnumInputContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumInputContext* This);
+        IEnumInputContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumInputContext* This);
+        IEnumInputContext *This);
 
     /*** IEnumInputContext methods ***/
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumInputContext* This,
+        IEnumInputContext *This,
         IEnumInputContext **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumInputContext* This,
+        IEnumInputContext *This,
         ULONG ulCount,
         HIMC *rgInputContext,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumInputContext* This);
+        IEnumInputContext *This);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumInputContext* This,
+        IEnumInputContext *This,
         ULONG ulCount);
 
     END_INTERFACE
 } IEnumInputContextVtbl;
+
 interface IEnumInputContext {
     CONST_VTBL IEnumInputContextVtbl* lpVtbl;
 };
@@ -339,39 +373,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumInputContext_Clone_Proxy(
-    IEnumInputContext* This,
-    IEnumInputContext **ppEnum);
-void __RPC_STUB IEnumInputContext_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumInputContext_Next_Proxy(
-    IEnumInputContext* This,
-    ULONG ulCount,
-    HIMC *rgInputContext,
-    ULONG *pcFetched);
-void __RPC_STUB IEnumInputContext_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumInputContext_Reset_Proxy(
-    IEnumInputContext* This);
-void __RPC_STUB IEnumInputContext_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumInputContext_Skip_Proxy(
-    IEnumInputContext* This,
-    ULONG ulCount);
-void __RPC_STUB IEnumInputContext_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumInputContext_INTERFACE_DEFINED__ */
 
@@ -405,30 +406,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveIMMRegistrar* This,
+        IActiveIMMRegistrar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveIMMRegistrar* This);
+        IActiveIMMRegistrar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveIMMRegistrar* This);
+        IActiveIMMRegistrar *This);
 
     /*** IActiveIMMRegistrar methods ***/
     HRESULT (STDMETHODCALLTYPE *RegisterIME)(
-        IActiveIMMRegistrar* This,
+        IActiveIMMRegistrar *This,
         REFCLSID rclsid,
         LANGID lgid,
         LPCWSTR pszIconFile,
         LPCWSTR pszDesc);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterIME)(
-        IActiveIMMRegistrar* This,
+        IActiveIMMRegistrar *This,
         REFCLSID rclsid);
 
     END_INTERFACE
 } IActiveIMMRegistrarVtbl;
+
 interface IActiveIMMRegistrar {
     CONST_VTBL IActiveIMMRegistrarVtbl* lpVtbl;
 };
@@ -465,25 +467,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveIMMRegistrar_RegisterIME_Proxy(
-    IActiveIMMRegistrar* This,
-    REFCLSID rclsid,
-    LANGID lgid,
-    LPCWSTR pszIconFile,
-    LPCWSTR pszDesc);
-void __RPC_STUB IActiveIMMRegistrar_RegisterIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMRegistrar_UnregisterIME_Proxy(
-    IActiveIMMRegistrar* This,
-    REFCLSID rclsid);
-void __RPC_STUB IActiveIMMRegistrar_UnregisterIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveIMMRegistrar_INTERFACE_DEFINED__ */
 
@@ -523,37 +506,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveIMMMessagePumpOwner* This,
+        IActiveIMMMessagePumpOwner *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveIMMMessagePumpOwner* This);
+        IActiveIMMMessagePumpOwner *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveIMMMessagePumpOwner* This);
+        IActiveIMMMessagePumpOwner *This);
 
     /*** IActiveIMMMessagePumpOwner methods ***/
     HRESULT (STDMETHODCALLTYPE *Start)(
-        IActiveIMMMessagePumpOwner* This);
+        IActiveIMMMessagePumpOwner *This);
 
     HRESULT (STDMETHODCALLTYPE *End)(
-        IActiveIMMMessagePumpOwner* This);
+        IActiveIMMMessagePumpOwner *This);
 
     HRESULT (STDMETHODCALLTYPE *OnTranslateMessage)(
-        IActiveIMMMessagePumpOwner* This,
+        IActiveIMMMessagePumpOwner *This,
         const MSG *pMsg);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        IActiveIMMMessagePumpOwner* This,
+        IActiveIMMMessagePumpOwner *This,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IActiveIMMMessagePumpOwner* This,
+        IActiveIMMMessagePumpOwner *This,
         DWORD dwCookie);
 
     END_INTERFACE
 } IActiveIMMMessagePumpOwnerVtbl;
+
 interface IActiveIMMMessagePumpOwner {
     CONST_VTBL IActiveIMMMessagePumpOwnerVtbl* lpVtbl;
 };
@@ -602,44 +586,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_Start_Proxy(
-    IActiveIMMMessagePumpOwner* This);
-void __RPC_STUB IActiveIMMMessagePumpOwner_Start_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_End_Proxy(
-    IActiveIMMMessagePumpOwner* This);
-void __RPC_STUB IActiveIMMMessagePumpOwner_End_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_OnTranslateMessage_Proxy(
-    IActiveIMMMessagePumpOwner* This,
-    const MSG *pMsg);
-void __RPC_STUB IActiveIMMMessagePumpOwner_OnTranslateMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_Pause_Proxy(
-    IActiveIMMMessagePumpOwner* This,
-    DWORD *pdwCookie);
-void __RPC_STUB IActiveIMMMessagePumpOwner_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMMessagePumpOwner_Resume_Proxy(
-    IActiveIMMMessagePumpOwner* This,
-    DWORD dwCookie);
-void __RPC_STUB IActiveIMMMessagePumpOwner_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveIMMMessagePumpOwner_INTERFACE_DEFINED__ */
 
@@ -1032,47 +978,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveIMMApp* This);
+        IActiveIMMApp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveIMMApp* This);
+        IActiveIMMApp *This);
 
     /*** IActiveIMMApp methods ***/
     HRESULT (STDMETHODCALLTYPE *AssociateContext)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         HIMC hIME,
         HIMC *phPrev);
 
     HRESULT (STDMETHODCALLTYPE *ConfigureIMEA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         HWND hWnd,
         DWORD dwMode,
         REGISTERWORDA *pData);
 
     HRESULT (STDMETHODCALLTYPE *ConfigureIMEW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         HWND hWnd,
         DWORD dwMode,
         REGISTERWORDW *pData);
 
     HRESULT (STDMETHODCALLTYPE *CreateContext)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC *phIMC);
 
     HRESULT (STDMETHODCALLTYPE *DestroyContext)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIME);
 
     HRESULT (STDMETHODCALLTYPE *EnumRegisterWordA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         LPSTR szReading,
         DWORD dwStyle,
@@ -1081,7 +1027,7 @@
         IEnumRegisterWordA **pEnum);
 
     HRESULT (STDMETHODCALLTYPE *EnumRegisterWordW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         LPWSTR szReading,
         DWORD dwStyle,
@@ -1090,7 +1036,7 @@
         IEnumRegisterWordW **pEnum);
 
     HRESULT (STDMETHODCALLTYPE *EscapeA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         HIMC hIMC,
         UINT uEscape,
@@ -1098,7 +1044,7 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *EscapeW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         HIMC hIMC,
         UINT uEscape,
@@ -1106,7 +1052,7 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         UINT uBufLen,
@@ -1114,7 +1060,7 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         UINT uBufLen,
@@ -1122,35 +1068,35 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListCountA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD *pdwListSize,
         DWORD *pdwBufLen);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListCountW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD *pdwListSize,
         DWORD *pdwBufLen);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateWindow)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         CANDIDATEFORM *pCandidate);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionFontA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         LOGFONTA *plf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionFontW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         LOGFONTW *plf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionStringA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -1158,7 +1104,7 @@
         LPVOID pBuf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionStringW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -1166,17 +1112,17 @@
         LPVOID pBuf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionWindow)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         COMPOSITIONFORM *pCompForm);
 
     HRESULT (STDMETHODCALLTYPE *GetContext)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         HIMC *phIMC);
 
     HRESULT (STDMETHODCALLTYPE *GetConversionListA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         HIMC hIMC,
         LPSTR pSrc,
@@ -1186,7 +1132,7 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetConversionListW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         HIMC hIMC,
         LPWSTR pSrc,
@@ -1196,32 +1142,32 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetConversionStatus)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD *pfdwConversion,
         DWORD *pfdwSentence);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultIMEWnd)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         HWND *phDefWnd);
 
     HRESULT (STDMETHODCALLTYPE *GetDescriptionA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         UINT uBufLen,
         LPSTR szDescription,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetDescriptionW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         UINT uBufLen,
         LPWSTR szDescription,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetGuideLineA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -1229,7 +1175,7 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *GetGuideLineW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -1237,126 +1183,126 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *GetIMEFileNameA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         UINT uBufLen,
         LPSTR szFileName,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetIMEFileNameW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         UINT uBufLen,
         LPWSTR szFileName,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetOpenStatus)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         DWORD fdwIndex,
         DWORD *pdwProperty);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         UINT nItem,
         STYLEBUFA *pStyleBuf,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         UINT nItem,
         STYLEBUFW *pStyleBuf,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetStatusWindowPos)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         POINT *pptPos);
 
     HRESULT (STDMETHODCALLTYPE *GetVirtualKey)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         UINT *puVirtualKey);
 
     HRESULT (STDMETHODCALLTYPE *InstallIMEA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         LPSTR szIMEFileName,
         LPSTR szLayoutText,
         HKL *phKL);
 
     HRESULT (STDMETHODCALLTYPE *InstallIMEW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         LPWSTR szIMEFileName,
         LPWSTR szLayoutText,
         HKL *phKL);
 
     HRESULT (STDMETHODCALLTYPE *IsIME)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL);
 
     HRESULT (STDMETHODCALLTYPE *IsUIMessageA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWndIME,
         UINT msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *IsUIMessageW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWndIME,
         UINT msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *NotifyIME)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwAction,
         DWORD dwIndex,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *RegisterWordA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         LPSTR szReading,
         DWORD dwStyle,
         LPSTR szRegister);
 
     HRESULT (STDMETHODCALLTYPE *RegisterWordW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szRegister);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseContext)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         HIMC hIMC);
 
     HRESULT (STDMETHODCALLTYPE *SetCandidateWindow)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         CANDIDATEFORM *pCandidate);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionFontA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         LOGFONTA *plf);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionFontW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         LOGFONTW *plf);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionStringA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         LPVOID pComp,
@@ -1365,7 +1311,7 @@
         DWORD dwReadLen);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionStringW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwIndex,
         LPVOID pComp,
@@ -1374,54 +1320,54 @@
         DWORD dwReadLen);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionWindow)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         COMPOSITIONFORM *pCompForm);
 
     HRESULT (STDMETHODCALLTYPE *SetConversionStatus)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD fdwConversion,
         DWORD fdwSentence);
 
     HRESULT (STDMETHODCALLTYPE *SetOpenStatus)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         WINBOOL fOpen);
 
     HRESULT (STDMETHODCALLTYPE *SetStatusWindowPos)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         POINT *pptPos);
 
     HRESULT (STDMETHODCALLTYPE *SimulateHotKey)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         DWORD dwHotKeyID);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterWordA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         LPSTR szReading,
         DWORD dwStyle,
         LPSTR szUnregister);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterWordW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szUnregister);
 
     HRESULT (STDMETHODCALLTYPE *Activate)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         WINBOOL fRestoreLayout);
 
     HRESULT (STDMETHODCALLTYPE *Deactivate)(
-        IActiveIMMApp* This);
+        IActiveIMMApp *This);
 
     HRESULT (STDMETHODCALLTYPE *OnDefWindowProc)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
@@ -1429,32 +1375,32 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *FilterClientWindows)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         ATOM *aaClassList,
         UINT uSize);
 
     HRESULT (STDMETHODCALLTYPE *GetCodePageA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         UINT *uCodePage);
 
     HRESULT (STDMETHODCALLTYPE *GetLangId)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HKL hKL,
         LANGID *plid);
 
     HRESULT (STDMETHODCALLTYPE *AssociateContextEx)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HWND hWnd,
         HIMC hIMC,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *DisableIME)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         DWORD idThread);
 
     HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsA)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwFlags,
         DWORD dwType,
@@ -1464,7 +1410,7 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsW)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         HIMC hIMC,
         DWORD dwFlags,
         DWORD dwType,
@@ -1474,12 +1420,13 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *EnumInputContext)(
-        IActiveIMMApp* This,
+        IActiveIMMApp *This,
         DWORD idThread,
         IEnumInputContext **ppEnum);
 
     END_INTERFACE
 } IActiveIMMAppVtbl;
+
 interface IActiveIMMApp {
     CONST_VTBL IActiveIMMAppVtbl* lpVtbl;
 };
@@ -1780,713 +1727,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_AssociateContext_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    HIMC hIME,
-    HIMC *phPrev);
-void __RPC_STUB IActiveIMMApp_AssociateContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_ConfigureIMEA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    HWND hWnd,
-    DWORD dwMode,
-    REGISTERWORDA *pData);
-void __RPC_STUB IActiveIMMApp_ConfigureIMEA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_ConfigureIMEW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    HWND hWnd,
-    DWORD dwMode,
-    REGISTERWORDW *pData);
-void __RPC_STUB IActiveIMMApp_ConfigureIMEW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_CreateContext_Proxy(
-    IActiveIMMApp* This,
-    HIMC *phIMC);
-void __RPC_STUB IActiveIMMApp_CreateContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_DestroyContext_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIME);
-void __RPC_STUB IActiveIMMApp_DestroyContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_EnumRegisterWordA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    LPSTR szReading,
-    DWORD dwStyle,
-    LPSTR szRegister,
-    LPVOID pData,
-    IEnumRegisterWordA **pEnum);
-void __RPC_STUB IActiveIMMApp_EnumRegisterWordA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_EnumRegisterWordW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szRegister,
-    LPVOID pData,
-    IEnumRegisterWordW **pEnum);
-void __RPC_STUB IActiveIMMApp_EnumRegisterWordW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_EscapeA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    HIMC hIMC,
-    UINT uEscape,
-    LPVOID pData,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMApp_EscapeA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_EscapeW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    HIMC hIMC,
-    UINT uEscape,
-    LPVOID pData,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMApp_EscapeW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    UINT uBufLen,
-    CANDIDATELIST *pCandList,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetCandidateListA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    UINT uBufLen,
-    CANDIDATELIST *pCandList,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetCandidateListW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListCountA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD *pdwListSize,
-    DWORD *pdwBufLen);
-void __RPC_STUB IActiveIMMApp_GetCandidateListCountA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateListCountW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD *pdwListSize,
-    DWORD *pdwBufLen);
-void __RPC_STUB IActiveIMMApp_GetCandidateListCountW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCandidateWindow_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    CANDIDATEFORM *pCandidate);
-void __RPC_STUB IActiveIMMApp_GetCandidateWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionFontA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    LOGFONTA *plf);
-void __RPC_STUB IActiveIMMApp_GetCompositionFontA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionFontW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    LOGFONTW *plf);
-void __RPC_STUB IActiveIMMApp_GetCompositionFontW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionStringA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LONG *plCopied,
-    LPVOID pBuf);
-void __RPC_STUB IActiveIMMApp_GetCompositionStringA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionStringW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LONG *plCopied,
-    LPVOID pBuf);
-void __RPC_STUB IActiveIMMApp_GetCompositionStringW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCompositionWindow_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    COMPOSITIONFORM *pCompForm);
-void __RPC_STUB IActiveIMMApp_GetCompositionWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetContext_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    HIMC *phIMC);
-void __RPC_STUB IActiveIMMApp_GetContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetConversionListA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    HIMC hIMC,
-    LPSTR pSrc,
-    UINT uBufLen,
-    UINT uFlag,
-    CANDIDATELIST *pDst,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetConversionListA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetConversionListW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    HIMC hIMC,
-    LPWSTR pSrc,
-    UINT uBufLen,
-    UINT uFlag,
-    CANDIDATELIST *pDst,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetConversionListW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetConversionStatus_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD *pfdwConversion,
-    DWORD *pfdwSentence);
-void __RPC_STUB IActiveIMMApp_GetConversionStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetDefaultIMEWnd_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    HWND *phDefWnd);
-void __RPC_STUB IActiveIMMApp_GetDefaultIMEWnd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetDescriptionA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPSTR szDescription,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetDescriptionA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetDescriptionW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPWSTR szDescription,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetDescriptionW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetGuideLineA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LPSTR pBuf,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMApp_GetGuideLineA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetGuideLineW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LPWSTR pBuf,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMApp_GetGuideLineW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetIMEFileNameA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPSTR szFileName,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetIMEFileNameA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetIMEFileNameW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPWSTR szFileName,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetIMEFileNameW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetOpenStatus_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC);
-void __RPC_STUB IActiveIMMApp_GetOpenStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetProperty_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    DWORD fdwIndex,
-    DWORD *pdwProperty);
-void __RPC_STUB IActiveIMMApp_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetRegisterWordStyleA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    UINT nItem,
-    STYLEBUFA *pStyleBuf,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetRegisterWordStyleA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetRegisterWordStyleW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    UINT nItem,
-    STYLEBUFW *pStyleBuf,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMApp_GetRegisterWordStyleW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetStatusWindowPos_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    POINT *pptPos);
-void __RPC_STUB IActiveIMMApp_GetStatusWindowPos_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetVirtualKey_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    UINT *puVirtualKey);
-void __RPC_STUB IActiveIMMApp_GetVirtualKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_InstallIMEA_Proxy(
-    IActiveIMMApp* This,
-    LPSTR szIMEFileName,
-    LPSTR szLayoutText,
-    HKL *phKL);
-void __RPC_STUB IActiveIMMApp_InstallIMEA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_InstallIMEW_Proxy(
-    IActiveIMMApp* This,
-    LPWSTR szIMEFileName,
-    LPWSTR szLayoutText,
-    HKL *phKL);
-void __RPC_STUB IActiveIMMApp_InstallIMEW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_IsIME_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL);
-void __RPC_STUB IActiveIMMApp_IsIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_IsUIMessageA_Proxy(
-    IActiveIMMApp* This,
-    HWND hWndIME,
-    UINT msg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IActiveIMMApp_IsUIMessageA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_IsUIMessageW_Proxy(
-    IActiveIMMApp* This,
-    HWND hWndIME,
-    UINT msg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IActiveIMMApp_IsUIMessageW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_NotifyIME_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwAction,
-    DWORD dwIndex,
-    DWORD dwValue);
-void __RPC_STUB IActiveIMMApp_NotifyIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_RegisterWordA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    LPSTR szReading,
-    DWORD dwStyle,
-    LPSTR szRegister);
-void __RPC_STUB IActiveIMMApp_RegisterWordA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_RegisterWordW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szRegister);
-void __RPC_STUB IActiveIMMApp_RegisterWordW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_ReleaseContext_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    HIMC hIMC);
-void __RPC_STUB IActiveIMMApp_ReleaseContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCandidateWindow_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    CANDIDATEFORM *pCandidate);
-void __RPC_STUB IActiveIMMApp_SetCandidateWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionFontA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    LOGFONTA *plf);
-void __RPC_STUB IActiveIMMApp_SetCompositionFontA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionFontW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    LOGFONTW *plf);
-void __RPC_STUB IActiveIMMApp_SetCompositionFontW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionStringA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    LPVOID pComp,
-    DWORD dwCompLen,
-    LPVOID pRead,
-    DWORD dwReadLen);
-void __RPC_STUB IActiveIMMApp_SetCompositionStringA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionStringW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    LPVOID pComp,
-    DWORD dwCompLen,
-    LPVOID pRead,
-    DWORD dwReadLen);
-void __RPC_STUB IActiveIMMApp_SetCompositionStringW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetCompositionWindow_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    COMPOSITIONFORM *pCompForm);
-void __RPC_STUB IActiveIMMApp_SetCompositionWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetConversionStatus_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD fdwConversion,
-    DWORD fdwSentence);
-void __RPC_STUB IActiveIMMApp_SetConversionStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetOpenStatus_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    WINBOOL fOpen);
-void __RPC_STUB IActiveIMMApp_SetOpenStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SetStatusWindowPos_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    POINT *pptPos);
-void __RPC_STUB IActiveIMMApp_SetStatusWindowPos_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_SimulateHotKey_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    DWORD dwHotKeyID);
-void __RPC_STUB IActiveIMMApp_SimulateHotKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_UnregisterWordA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    LPSTR szReading,
-    DWORD dwStyle,
-    LPSTR szUnregister);
-void __RPC_STUB IActiveIMMApp_UnregisterWordA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_UnregisterWordW_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szUnregister);
-void __RPC_STUB IActiveIMMApp_UnregisterWordW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_Activate_Proxy(
-    IActiveIMMApp* This,
-    WINBOOL fRestoreLayout);
-void __RPC_STUB IActiveIMMApp_Activate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_Deactivate_Proxy(
-    IActiveIMMApp* This);
-void __RPC_STUB IActiveIMMApp_Deactivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_OnDefWindowProc_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    UINT Msg,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMApp_OnDefWindowProc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_FilterClientWindows_Proxy(
-    IActiveIMMApp* This,
-    ATOM *aaClassList,
-    UINT uSize);
-void __RPC_STUB IActiveIMMApp_FilterClientWindows_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetCodePageA_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    UINT *uCodePage);
-void __RPC_STUB IActiveIMMApp_GetCodePageA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetLangId_Proxy(
-    IActiveIMMApp* This,
-    HKL hKL,
-    LANGID *plid);
-void __RPC_STUB IActiveIMMApp_GetLangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_AssociateContextEx_Proxy(
-    IActiveIMMApp* This,
-    HWND hWnd,
-    HIMC hIMC,
-    DWORD dwFlags);
-void __RPC_STUB IActiveIMMApp_AssociateContextEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_DisableIME_Proxy(
-    IActiveIMMApp* This,
-    DWORD idThread);
-void __RPC_STUB IActiveIMMApp_DisableIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetImeMenuItemsA_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwFlags,
-    DWORD dwType,
-    IMEMENUITEMINFOA *pImeParentMenu,
-    IMEMENUITEMINFOA *pImeMenu,
-    DWORD dwSize,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMApp_GetImeMenuItemsA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_GetImeMenuItemsW_Proxy(
-    IActiveIMMApp* This,
-    HIMC hIMC,
-    DWORD dwFlags,
-    DWORD dwType,
-    IMEMENUITEMINFOW *pImeParentMenu,
-    IMEMENUITEMINFOW *pImeMenu,
-    DWORD dwSize,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMApp_GetImeMenuItemsW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMApp_EnumInputContext_Proxy(
-    IActiveIMMApp* This,
-    DWORD idThread,
-    IEnumInputContext **ppEnum);
-void __RPC_STUB IActiveIMMApp_EnumInputContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveIMMApp_INTERFACE_DEFINED__ */
 
@@ -2971,47 +2211,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveIMMIME* This);
+        IActiveIMMIME *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveIMMIME* This);
+        IActiveIMMIME *This);
 
     /*** IActiveIMMIME methods ***/
     HRESULT (STDMETHODCALLTYPE *AssociateContext)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         HIMC hIME,
         HIMC *phPrev);
 
     HRESULT (STDMETHODCALLTYPE *ConfigureIMEA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         HWND hWnd,
         DWORD dwMode,
         REGISTERWORDA *pData);
 
     HRESULT (STDMETHODCALLTYPE *ConfigureIMEW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         HWND hWnd,
         DWORD dwMode,
         REGISTERWORDW *pData);
 
     HRESULT (STDMETHODCALLTYPE *CreateContext)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC *phIMC);
 
     HRESULT (STDMETHODCALLTYPE *DestroyContext)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIME);
 
     HRESULT (STDMETHODCALLTYPE *EnumRegisterWordA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         LPSTR szReading,
         DWORD dwStyle,
@@ -3020,7 +2260,7 @@
         IEnumRegisterWordA **pEnum);
 
     HRESULT (STDMETHODCALLTYPE *EnumRegisterWordW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         LPWSTR szReading,
         DWORD dwStyle,
@@ -3029,7 +2269,7 @@
         IEnumRegisterWordW **pEnum);
 
     HRESULT (STDMETHODCALLTYPE *EscapeA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         HIMC hIMC,
         UINT uEscape,
@@ -3037,7 +2277,7 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *EscapeW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         HIMC hIMC,
         UINT uEscape,
@@ -3045,7 +2285,7 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         UINT uBufLen,
@@ -3053,7 +2293,7 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         UINT uBufLen,
@@ -3061,35 +2301,35 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListCountA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD *pdwListSize,
         DWORD *pdwBufLen);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateListCountW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD *pdwListSize,
         DWORD *pdwBufLen);
 
     HRESULT (STDMETHODCALLTYPE *GetCandidateWindow)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         CANDIDATEFORM *pCandidate);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionFontA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         LOGFONTA *plf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionFontW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         LOGFONTW *plf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionStringA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -3097,7 +2337,7 @@
         LPVOID pBuf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionStringW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -3105,17 +2345,17 @@
         LPVOID pBuf);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionWindow)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         COMPOSITIONFORM *pCompForm);
 
     HRESULT (STDMETHODCALLTYPE *GetContext)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         HIMC *phIMC);
 
     HRESULT (STDMETHODCALLTYPE *GetConversionListA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         HIMC hIMC,
         LPSTR pSrc,
@@ -3125,7 +2365,7 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetConversionListW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         HIMC hIMC,
         LPWSTR pSrc,
@@ -3135,32 +2375,32 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetConversionStatus)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD *pfdwConversion,
         DWORD *pfdwSentence);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultIMEWnd)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         HWND *phDefWnd);
 
     HRESULT (STDMETHODCALLTYPE *GetDescriptionA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         UINT uBufLen,
         LPSTR szDescription,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetDescriptionW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         UINT uBufLen,
         LPWSTR szDescription,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetGuideLineA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -3168,7 +2408,7 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *GetGuideLineW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         DWORD dwBufLen,
@@ -3176,126 +2416,126 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *GetIMEFileNameA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         UINT uBufLen,
         LPSTR szFileName,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetIMEFileNameW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         UINT uBufLen,
         LPWSTR szFileName,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetOpenStatus)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         DWORD fdwIndex,
         DWORD *pdwProperty);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         UINT nItem,
         STYLEBUFA *pStyleBuf,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyleW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         UINT nItem,
         STYLEBUFW *pStyleBuf,
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *GetStatusWindowPos)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         POINT *pptPos);
 
     HRESULT (STDMETHODCALLTYPE *GetVirtualKey)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         UINT *puVirtualKey);
 
     HRESULT (STDMETHODCALLTYPE *InstallIMEA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         LPSTR szIMEFileName,
         LPSTR szLayoutText,
         HKL *phKL);
 
     HRESULT (STDMETHODCALLTYPE *InstallIMEW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         LPWSTR szIMEFileName,
         LPWSTR szLayoutText,
         HKL *phKL);
 
     HRESULT (STDMETHODCALLTYPE *IsIME)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL);
 
     HRESULT (STDMETHODCALLTYPE *IsUIMessageA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWndIME,
         UINT msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *IsUIMessageW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWndIME,
         UINT msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *NotifyIME)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwAction,
         DWORD dwIndex,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *RegisterWordA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         LPSTR szReading,
         DWORD dwStyle,
         LPSTR szRegister);
 
     HRESULT (STDMETHODCALLTYPE *RegisterWordW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szRegister);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseContext)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         HIMC hIMC);
 
     HRESULT (STDMETHODCALLTYPE *SetCandidateWindow)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         CANDIDATEFORM *pCandidate);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionFontA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         LOGFONTA *plf);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionFontW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         LOGFONTW *plf);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionStringA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         LPVOID pComp,
@@ -3304,7 +2544,7 @@
         DWORD dwReadLen);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionStringW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         LPVOID pComp,
@@ -3313,113 +2553,113 @@
         DWORD dwReadLen);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionWindow)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         COMPOSITIONFORM *pCompForm);
 
     HRESULT (STDMETHODCALLTYPE *SetConversionStatus)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD fdwConversion,
         DWORD fdwSentence);
 
     HRESULT (STDMETHODCALLTYPE *SetOpenStatus)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         WINBOOL fOpen);
 
     HRESULT (STDMETHODCALLTYPE *SetStatusWindowPos)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         POINT *pptPos);
 
     HRESULT (STDMETHODCALLTYPE *SimulateHotKey)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         DWORD dwHotKeyID);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterWordA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         LPSTR szReading,
         DWORD dwStyle,
         LPSTR szUnregister);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterWordW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szUnregister);
 
     HRESULT (STDMETHODCALLTYPE *GenerateMessage)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC);
 
     HRESULT (STDMETHODCALLTYPE *LockIMC)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         INPUTCONTEXT **ppIMC);
 
     HRESULT (STDMETHODCALLTYPE *UnlockIMC)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC);
 
     HRESULT (STDMETHODCALLTYPE *GetIMCLockCount)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD *pdwLockCount);
 
     HRESULT (STDMETHODCALLTYPE *CreateIMCC)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         DWORD dwSize,
         HIMCC *phIMCC);
 
     HRESULT (STDMETHODCALLTYPE *DestroyIMCC)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMCC hIMCC);
 
     HRESULT (STDMETHODCALLTYPE *LockIMCC)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMCC hIMCC,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *UnlockIMCC)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMCC hIMCC);
 
     HRESULT (STDMETHODCALLTYPE *ReSizeIMCC)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMCC hIMCC,
         DWORD dwSize,
         HIMCC *phIMCC);
 
     HRESULT (STDMETHODCALLTYPE *GetIMCCSize)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMCC hIMCC,
         DWORD *pdwSize);
 
     HRESULT (STDMETHODCALLTYPE *GetIMCCLockCount)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMCC hIMCC,
         DWORD *pdwLockCount);
 
     HRESULT (STDMETHODCALLTYPE *GetHotKey)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         DWORD dwHotKeyID,
         UINT *puModifiers,
         UINT *puVKey,
         HKL *phKL);
 
     HRESULT (STDMETHODCALLTYPE *SetHotKey)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         DWORD dwHotKeyID,
         UINT uModifiers,
         UINT uVKey,
         HKL hKL);
 
     HRESULT (STDMETHODCALLTYPE *CreateSoftKeyboard)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         UINT uType,
         HWND hOwner,
         int x,
@@ -3427,26 +2667,26 @@
         HWND *phSoftKbdWnd);
 
     HRESULT (STDMETHODCALLTYPE *DestroySoftKeyboard)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hSoftKbdWnd);
 
     HRESULT (STDMETHODCALLTYPE *ShowSoftKeyboard)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hSoftKbdWnd,
         int nCmdShow);
 
     HRESULT (STDMETHODCALLTYPE *GetCodePageA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         UINT *uCodePage);
 
     HRESULT (STDMETHODCALLTYPE *GetLangId)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HKL hKL,
         LANGID *plid);
 
     HRESULT (STDMETHODCALLTYPE *KeybdEvent)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         LANGID lgidIME,
         BYTE bVk,
         BYTE bScan,
@@ -3454,23 +2694,23 @@
         DWORD dwExtraInfo);
 
     HRESULT (STDMETHODCALLTYPE *LockModal)(
-        IActiveIMMIME* This);
+        IActiveIMMIME *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockModal)(
-        IActiveIMMIME* This);
+        IActiveIMMIME *This);
 
     HRESULT (STDMETHODCALLTYPE *AssociateContextEx)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         HIMC hIMC,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *DisableIME)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         DWORD idThread);
 
     HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwFlags,
         DWORD dwType,
@@ -3480,7 +2720,7 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *GetImeMenuItemsW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         DWORD dwFlags,
         DWORD dwType,
@@ -3490,26 +2730,26 @@
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *EnumInputContext)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         DWORD idThread,
         IEnumInputContext **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *RequestMessageA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         WPARAM wParam,
         LPARAM lParam,
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *RequestMessageW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HIMC hIMC,
         WPARAM wParam,
         LPARAM lParam,
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *SendIMCA)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         UINT uMsg,
         WPARAM wParam,
@@ -3517,7 +2757,7 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *SendIMCW)(
-        IActiveIMMIME* This,
+        IActiveIMMIME *This,
         HWND hWnd,
         UINT uMsg,
         WPARAM wParam,
@@ -3525,10 +2765,11 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *IsSleeping)(
-        IActiveIMMIME* This);
+        IActiveIMMIME *This);
 
     END_INTERFACE
 } IActiveIMMIMEVtbl;
+
 interface IActiveIMMIME {
     CONST_VTBL IActiveIMMIMEVtbl* lpVtbl;
 };
@@ -3909,903 +3150,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_AssociateContext_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    HIMC hIME,
-    HIMC *phPrev);
-void __RPC_STUB IActiveIMMIME_AssociateContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_ConfigureIMEA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    HWND hWnd,
-    DWORD dwMode,
-    REGISTERWORDA *pData);
-void __RPC_STUB IActiveIMMIME_ConfigureIMEA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_ConfigureIMEW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    HWND hWnd,
-    DWORD dwMode,
-    REGISTERWORDW *pData);
-void __RPC_STUB IActiveIMMIME_ConfigureIMEW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_CreateContext_Proxy(
-    IActiveIMMIME* This,
-    HIMC *phIMC);
-void __RPC_STUB IActiveIMMIME_CreateContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_DestroyContext_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIME);
-void __RPC_STUB IActiveIMMIME_DestroyContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_EnumRegisterWordA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    LPSTR szReading,
-    DWORD dwStyle,
-    LPSTR szRegister,
-    LPVOID pData,
-    IEnumRegisterWordA **pEnum);
-void __RPC_STUB IActiveIMMIME_EnumRegisterWordA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_EnumRegisterWordW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szRegister,
-    LPVOID pData,
-    IEnumRegisterWordW **pEnum);
-void __RPC_STUB IActiveIMMIME_EnumRegisterWordW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_EscapeA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    HIMC hIMC,
-    UINT uEscape,
-    LPVOID pData,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMIME_EscapeA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_EscapeW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    HIMC hIMC,
-    UINT uEscape,
-    LPVOID pData,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMIME_EscapeW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    UINT uBufLen,
-    CANDIDATELIST *pCandList,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetCandidateListA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    UINT uBufLen,
-    CANDIDATELIST *pCandList,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetCandidateListW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListCountA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD *pdwListSize,
-    DWORD *pdwBufLen);
-void __RPC_STUB IActiveIMMIME_GetCandidateListCountA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateListCountW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD *pdwListSize,
-    DWORD *pdwBufLen);
-void __RPC_STUB IActiveIMMIME_GetCandidateListCountW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCandidateWindow_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    CANDIDATEFORM *pCandidate);
-void __RPC_STUB IActiveIMMIME_GetCandidateWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionFontA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    LOGFONTA *plf);
-void __RPC_STUB IActiveIMMIME_GetCompositionFontA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionFontW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    LOGFONTW *plf);
-void __RPC_STUB IActiveIMMIME_GetCompositionFontW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionStringA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LONG *plCopied,
-    LPVOID pBuf);
-void __RPC_STUB IActiveIMMIME_GetCompositionStringA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionStringW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LONG *plCopied,
-    LPVOID pBuf);
-void __RPC_STUB IActiveIMMIME_GetCompositionStringW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCompositionWindow_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    COMPOSITIONFORM *pCompForm);
-void __RPC_STUB IActiveIMMIME_GetCompositionWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetContext_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    HIMC *phIMC);
-void __RPC_STUB IActiveIMMIME_GetContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetConversionListA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    HIMC hIMC,
-    LPSTR pSrc,
-    UINT uBufLen,
-    UINT uFlag,
-    CANDIDATELIST *pDst,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetConversionListA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetConversionListW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    HIMC hIMC,
-    LPWSTR pSrc,
-    UINT uBufLen,
-    UINT uFlag,
-    CANDIDATELIST *pDst,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetConversionListW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetConversionStatus_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD *pfdwConversion,
-    DWORD *pfdwSentence);
-void __RPC_STUB IActiveIMMIME_GetConversionStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetDefaultIMEWnd_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    HWND *phDefWnd);
-void __RPC_STUB IActiveIMMIME_GetDefaultIMEWnd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetDescriptionA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPSTR szDescription,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetDescriptionA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetDescriptionW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPWSTR szDescription,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetDescriptionW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetGuideLineA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LPSTR pBuf,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMIME_GetGuideLineA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetGuideLineW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    DWORD dwBufLen,
-    LPWSTR pBuf,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMIME_GetGuideLineW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMEFileNameA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPSTR szFileName,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetIMEFileNameA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMEFileNameW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    UINT uBufLen,
-    LPWSTR szFileName,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetIMEFileNameW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetOpenStatus_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC);
-void __RPC_STUB IActiveIMMIME_GetOpenStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetProperty_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    DWORD fdwIndex,
-    DWORD *pdwProperty);
-void __RPC_STUB IActiveIMMIME_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetRegisterWordStyleA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    UINT nItem,
-    STYLEBUFA *pStyleBuf,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetRegisterWordStyleA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetRegisterWordStyleW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    UINT nItem,
-    STYLEBUFW *pStyleBuf,
-    UINT *puCopied);
-void __RPC_STUB IActiveIMMIME_GetRegisterWordStyleW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetStatusWindowPos_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    POINT *pptPos);
-void __RPC_STUB IActiveIMMIME_GetStatusWindowPos_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetVirtualKey_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    UINT *puVirtualKey);
-void __RPC_STUB IActiveIMMIME_GetVirtualKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_InstallIMEA_Proxy(
-    IActiveIMMIME* This,
-    LPSTR szIMEFileName,
-    LPSTR szLayoutText,
-    HKL *phKL);
-void __RPC_STUB IActiveIMMIME_InstallIMEA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_InstallIMEW_Proxy(
-    IActiveIMMIME* This,
-    LPWSTR szIMEFileName,
-    LPWSTR szLayoutText,
-    HKL *phKL);
-void __RPC_STUB IActiveIMMIME_InstallIMEW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsIME_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL);
-void __RPC_STUB IActiveIMMIME_IsIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsUIMessageA_Proxy(
-    IActiveIMMIME* This,
-    HWND hWndIME,
-    UINT msg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IActiveIMMIME_IsUIMessageA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsUIMessageW_Proxy(
-    IActiveIMMIME* This,
-    HWND hWndIME,
-    UINT msg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IActiveIMMIME_IsUIMessageW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_NotifyIME_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwAction,
-    DWORD dwIndex,
-    DWORD dwValue);
-void __RPC_STUB IActiveIMMIME_NotifyIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_RegisterWordA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    LPSTR szReading,
-    DWORD dwStyle,
-    LPSTR szRegister);
-void __RPC_STUB IActiveIMMIME_RegisterWordA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_RegisterWordW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szRegister);
-void __RPC_STUB IActiveIMMIME_RegisterWordW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_ReleaseContext_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    HIMC hIMC);
-void __RPC_STUB IActiveIMMIME_ReleaseContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCandidateWindow_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    CANDIDATEFORM *pCandidate);
-void __RPC_STUB IActiveIMMIME_SetCandidateWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionFontA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    LOGFONTA *plf);
-void __RPC_STUB IActiveIMMIME_SetCompositionFontA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionFontW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    LOGFONTW *plf);
-void __RPC_STUB IActiveIMMIME_SetCompositionFontW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionStringA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    LPVOID pComp,
-    DWORD dwCompLen,
-    LPVOID pRead,
-    DWORD dwReadLen);
-void __RPC_STUB IActiveIMMIME_SetCompositionStringA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionStringW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    LPVOID pComp,
-    DWORD dwCompLen,
-    LPVOID pRead,
-    DWORD dwReadLen);
-void __RPC_STUB IActiveIMMIME_SetCompositionStringW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetCompositionWindow_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    COMPOSITIONFORM *pCompForm);
-void __RPC_STUB IActiveIMMIME_SetCompositionWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetConversionStatus_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD fdwConversion,
-    DWORD fdwSentence);
-void __RPC_STUB IActiveIMMIME_SetConversionStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetOpenStatus_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    WINBOOL fOpen);
-void __RPC_STUB IActiveIMMIME_SetOpenStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetStatusWindowPos_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    POINT *pptPos);
-void __RPC_STUB IActiveIMMIME_SetStatusWindowPos_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SimulateHotKey_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    DWORD dwHotKeyID);
-void __RPC_STUB IActiveIMMIME_SimulateHotKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnregisterWordA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    LPSTR szReading,
-    DWORD dwStyle,
-    LPSTR szUnregister);
-void __RPC_STUB IActiveIMMIME_UnregisterWordA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnregisterWordW_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szUnregister);
-void __RPC_STUB IActiveIMMIME_UnregisterWordW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GenerateMessage_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC);
-void __RPC_STUB IActiveIMMIME_GenerateMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_LockIMC_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    INPUTCONTEXT **ppIMC);
-void __RPC_STUB IActiveIMMIME_LockIMC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnlockIMC_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC);
-void __RPC_STUB IActiveIMMIME_UnlockIMC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMCLockCount_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD *pdwLockCount);
-void __RPC_STUB IActiveIMMIME_GetIMCLockCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_CreateIMCC_Proxy(
-    IActiveIMMIME* This,
-    DWORD dwSize,
-    HIMCC *phIMCC);
-void __RPC_STUB IActiveIMMIME_CreateIMCC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_DestroyIMCC_Proxy(
-    IActiveIMMIME* This,
-    HIMCC hIMCC);
-void __RPC_STUB IActiveIMMIME_DestroyIMCC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_LockIMCC_Proxy(
-    IActiveIMMIME* This,
-    HIMCC hIMCC,
-    void **ppv);
-void __RPC_STUB IActiveIMMIME_LockIMCC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnlockIMCC_Proxy(
-    IActiveIMMIME* This,
-    HIMCC hIMCC);
-void __RPC_STUB IActiveIMMIME_UnlockIMCC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_ReSizeIMCC_Proxy(
-    IActiveIMMIME* This,
-    HIMCC hIMCC,
-    DWORD dwSize,
-    HIMCC *phIMCC);
-void __RPC_STUB IActiveIMMIME_ReSizeIMCC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMCCSize_Proxy(
-    IActiveIMMIME* This,
-    HIMCC hIMCC,
-    DWORD *pdwSize);
-void __RPC_STUB IActiveIMMIME_GetIMCCSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetIMCCLockCount_Proxy(
-    IActiveIMMIME* This,
-    HIMCC hIMCC,
-    DWORD *pdwLockCount);
-void __RPC_STUB IActiveIMMIME_GetIMCCLockCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetHotKey_Proxy(
-    IActiveIMMIME* This,
-    DWORD dwHotKeyID,
-    UINT *puModifiers,
-    UINT *puVKey,
-    HKL *phKL);
-void __RPC_STUB IActiveIMMIME_GetHotKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SetHotKey_Proxy(
-    IActiveIMMIME* This,
-    DWORD dwHotKeyID,
-    UINT uModifiers,
-    UINT uVKey,
-    HKL hKL);
-void __RPC_STUB IActiveIMMIME_SetHotKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_CreateSoftKeyboard_Proxy(
-    IActiveIMMIME* This,
-    UINT uType,
-    HWND hOwner,
-    int x,
-    int y,
-    HWND *phSoftKbdWnd);
-void __RPC_STUB IActiveIMMIME_CreateSoftKeyboard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_DestroySoftKeyboard_Proxy(
-    IActiveIMMIME* This,
-    HWND hSoftKbdWnd);
-void __RPC_STUB IActiveIMMIME_DestroySoftKeyboard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_ShowSoftKeyboard_Proxy(
-    IActiveIMMIME* This,
-    HWND hSoftKbdWnd,
-    int nCmdShow);
-void __RPC_STUB IActiveIMMIME_ShowSoftKeyboard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetCodePageA_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    UINT *uCodePage);
-void __RPC_STUB IActiveIMMIME_GetCodePageA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetLangId_Proxy(
-    IActiveIMMIME* This,
-    HKL hKL,
-    LANGID *plid);
-void __RPC_STUB IActiveIMMIME_GetLangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_KeybdEvent_Proxy(
-    IActiveIMMIME* This,
-    LANGID lgidIME,
-    BYTE bVk,
-    BYTE bScan,
-    DWORD dwFlags,
-    DWORD dwExtraInfo);
-void __RPC_STUB IActiveIMMIME_KeybdEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_LockModal_Proxy(
-    IActiveIMMIME* This);
-void __RPC_STUB IActiveIMMIME_LockModal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_UnlockModal_Proxy(
-    IActiveIMMIME* This);
-void __RPC_STUB IActiveIMMIME_UnlockModal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_AssociateContextEx_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    HIMC hIMC,
-    DWORD dwFlags);
-void __RPC_STUB IActiveIMMIME_AssociateContextEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_DisableIME_Proxy(
-    IActiveIMMIME* This,
-    DWORD idThread);
-void __RPC_STUB IActiveIMMIME_DisableIME_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetImeMenuItemsA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwFlags,
-    DWORD dwType,
-    IMEMENUITEMINFOA *pImeParentMenu,
-    IMEMENUITEMINFOA *pImeMenu,
-    DWORD dwSize,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMIME_GetImeMenuItemsA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_GetImeMenuItemsW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    DWORD dwFlags,
-    DWORD dwType,
-    IMEMENUITEMINFOW *pImeParentMenu,
-    IMEMENUITEMINFOW *pImeMenu,
-    DWORD dwSize,
-    DWORD *pdwResult);
-void __RPC_STUB IActiveIMMIME_GetImeMenuItemsW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_EnumInputContext_Proxy(
-    IActiveIMMIME* This,
-    DWORD idThread,
-    IEnumInputContext **ppEnum);
-void __RPC_STUB IActiveIMMIME_EnumInputContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_RequestMessageA_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMIME_RequestMessageA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_RequestMessageW_Proxy(
-    IActiveIMMIME* This,
-    HIMC hIMC,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMIME_RequestMessageW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SendIMCA_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMIME_SendIMCA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_SendIMCW_Proxy(
-    IActiveIMMIME* This,
-    HWND hWnd,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIMMIME_SendIMCW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIMMIME_IsSleeping_Proxy(
-    IActiveIMMIME* This);
-void __RPC_STUB IActiveIMMIME_IsSleeping_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveIMMIME_INTERFACE_DEFINED__ */
 
@@ -4924,26 +3268,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveIME* This,
+        IActiveIME *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveIME* This);
+        IActiveIME *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveIME* This);
+        IActiveIME *This);
 
     /*** IActiveIME methods ***/
     HRESULT (STDMETHODCALLTYPE *Inquire)(
-        IActiveIME* This,
+        IActiveIME *This,
         DWORD dwSystemInfoFlags,
         IMEINFO *pIMEInfo,
         LPWSTR szWndClass,
         DWORD *pdwPrivate);
 
     HRESULT (STDMETHODCALLTYPE *ConversionList)(
-        IActiveIME* This,
+        IActiveIME *This,
         HIMC hIMC,
         LPWSTR szSource,
         UINT uFlag,
@@ -4952,49 +3296,49 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *Configure)(
-        IActiveIME* This,
+        IActiveIME *This,
         HKL hKL,
         HWND hWnd,
         DWORD dwMode,
         REGISTERWORDW *pRegisterWord);
 
     HRESULT (STDMETHODCALLTYPE *Destroy)(
-        IActiveIME* This,
+        IActiveIME *This,
         UINT uReserved);
 
     HRESULT (STDMETHODCALLTYPE *Escape)(
-        IActiveIME* This,
+        IActiveIME *This,
         HIMC hIMC,
         UINT uEscape,
         void *pData,
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveContext)(
-        IActiveIME* This,
+        IActiveIME *This,
         HIMC hIMC,
         WINBOOL fFlag);
 
     HRESULT (STDMETHODCALLTYPE *ProcessKey)(
-        IActiveIME* This,
+        IActiveIME *This,
         HIMC hIMC,
         UINT uVirKey,
         DWORD lParam,
         BYTE *pbKeyState);
 
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        IActiveIME* This,
+        IActiveIME *This,
         HIMC hIMC,
         DWORD dwAction,
         DWORD dwIndex,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *Select)(
-        IActiveIME* This,
+        IActiveIME *This,
         HIMC hIMC,
         WINBOOL fSelect);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionString)(
-        IActiveIME* This,
+        IActiveIME *This,
         HIMC hIMC,
         DWORD dwIndex,
         void *pComp,
@@ -5003,7 +3347,7 @@
         DWORD dwReadLen);
 
     HRESULT (STDMETHODCALLTYPE *ToAsciiEx)(
-        IActiveIME* This,
+        IActiveIME *This,
         UINT uVirKey,
         UINT uScanCode,
         BYTE *pbKeyState,
@@ -5013,25 +3357,25 @@
         UINT *puSize);
 
     HRESULT (STDMETHODCALLTYPE *RegisterWord)(
-        IActiveIME* This,
+        IActiveIME *This,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szString);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterWord)(
-        IActiveIME* This,
+        IActiveIME *This,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szString);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyle)(
-        IActiveIME* This,
+        IActiveIME *This,
         UINT nItem,
         STYLEBUFW *pStyleBuf,
         UINT *puBufSize);
 
     HRESULT (STDMETHODCALLTYPE *EnumRegisterWord)(
-        IActiveIME* This,
+        IActiveIME *This,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szRegister,
@@ -5039,15 +3383,16 @@
         IEnumRegisterWordW **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *GetCodePageA)(
-        IActiveIME* This,
+        IActiveIME *This,
         UINT *uCodePage);
 
     HRESULT (STDMETHODCALLTYPE *GetLangId)(
-        IActiveIME* This,
+        IActiveIME *This,
         LANGID *plid);
 
     END_INTERFACE
 } IActiveIMEVtbl;
+
 interface IActiveIME {
     CONST_VTBL IActiveIMEVtbl* lpVtbl;
 };
@@ -5144,185 +3489,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveIME_Inquire_Proxy(
-    IActiveIME* This,
-    DWORD dwSystemInfoFlags,
-    IMEINFO *pIMEInfo,
-    LPWSTR szWndClass,
-    DWORD *pdwPrivate);
-void __RPC_STUB IActiveIME_Inquire_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_ConversionList_Proxy(
-    IActiveIME* This,
-    HIMC hIMC,
-    LPWSTR szSource,
-    UINT uFlag,
-    UINT uBufLen,
-    CANDIDATELIST *pDest,
-    UINT *puCopied);
-void __RPC_STUB IActiveIME_ConversionList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_Configure_Proxy(
-    IActiveIME* This,
-    HKL hKL,
-    HWND hWnd,
-    DWORD dwMode,
-    REGISTERWORDW *pRegisterWord);
-void __RPC_STUB IActiveIME_Configure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_Destroy_Proxy(
-    IActiveIME* This,
-    UINT uReserved);
-void __RPC_STUB IActiveIME_Destroy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_Escape_Proxy(
-    IActiveIME* This,
-    HIMC hIMC,
-    UINT uEscape,
-    void *pData,
-    LRESULT *plResult);
-void __RPC_STUB IActiveIME_Escape_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_SetActiveContext_Proxy(
-    IActiveIME* This,
-    HIMC hIMC,
-    WINBOOL fFlag);
-void __RPC_STUB IActiveIME_SetActiveContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_ProcessKey_Proxy(
-    IActiveIME* This,
-    HIMC hIMC,
-    UINT uVirKey,
-    DWORD lParam,
-    BYTE *pbKeyState);
-void __RPC_STUB IActiveIME_ProcessKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_Notify_Proxy(
-    IActiveIME* This,
-    HIMC hIMC,
-    DWORD dwAction,
-    DWORD dwIndex,
-    DWORD dwValue);
-void __RPC_STUB IActiveIME_Notify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_Select_Proxy(
-    IActiveIME* This,
-    HIMC hIMC,
-    WINBOOL fSelect);
-void __RPC_STUB IActiveIME_Select_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_SetCompositionString_Proxy(
-    IActiveIME* This,
-    HIMC hIMC,
-    DWORD dwIndex,
-    void *pComp,
-    DWORD dwCompLen,
-    void *pRead,
-    DWORD dwReadLen);
-void __RPC_STUB IActiveIME_SetCompositionString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_ToAsciiEx_Proxy(
-    IActiveIME* This,
-    UINT uVirKey,
-    UINT uScanCode,
-    BYTE *pbKeyState,
-    UINT fuState,
-    HIMC hIMC,
-    DWORD *pdwTransBuf,
-    UINT *puSize);
-void __RPC_STUB IActiveIME_ToAsciiEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_RegisterWord_Proxy(
-    IActiveIME* This,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szString);
-void __RPC_STUB IActiveIME_RegisterWord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_UnregisterWord_Proxy(
-    IActiveIME* This,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szString);
-void __RPC_STUB IActiveIME_UnregisterWord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_GetRegisterWordStyle_Proxy(
-    IActiveIME* This,
-    UINT nItem,
-    STYLEBUFW *pStyleBuf,
-    UINT *puBufSize);
-void __RPC_STUB IActiveIME_GetRegisterWordStyle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_EnumRegisterWord_Proxy(
-    IActiveIME* This,
-    LPWSTR szReading,
-    DWORD dwStyle,
-    LPWSTR szRegister,
-    LPVOID pData,
-    IEnumRegisterWordW **ppEnum);
-void __RPC_STUB IActiveIME_EnumRegisterWord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_GetCodePageA_Proxy(
-    IActiveIME* This,
-    UINT *uCodePage);
-void __RPC_STUB IActiveIME_GetCodePageA_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME_GetLangId_Proxy(
-    IActiveIME* This,
-    LANGID *plid);
-void __RPC_STUB IActiveIME_GetLangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveIME_INTERFACE_DEFINED__ */
 
@@ -5353,26 +3519,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActiveIME2* This);
+        IActiveIME2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActiveIME2* This);
+        IActiveIME2 *This);
 
     /*** IActiveIME methods ***/
     HRESULT (STDMETHODCALLTYPE *Inquire)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         DWORD dwSystemInfoFlags,
         IMEINFO *pIMEInfo,
         LPWSTR szWndClass,
         DWORD *pdwPrivate);
 
     HRESULT (STDMETHODCALLTYPE *ConversionList)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HIMC hIMC,
         LPWSTR szSource,
         UINT uFlag,
@@ -5381,49 +3547,49 @@
         UINT *puCopied);
 
     HRESULT (STDMETHODCALLTYPE *Configure)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HKL hKL,
         HWND hWnd,
         DWORD dwMode,
         REGISTERWORDW *pRegisterWord);
 
     HRESULT (STDMETHODCALLTYPE *Destroy)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         UINT uReserved);
 
     HRESULT (STDMETHODCALLTYPE *Escape)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HIMC hIMC,
         UINT uEscape,
         void *pData,
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveContext)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HIMC hIMC,
         WINBOOL fFlag);
 
     HRESULT (STDMETHODCALLTYPE *ProcessKey)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HIMC hIMC,
         UINT uVirKey,
         DWORD lParam,
         BYTE *pbKeyState);
 
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HIMC hIMC,
         DWORD dwAction,
         DWORD dwIndex,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *Select)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HIMC hIMC,
         WINBOOL fSelect);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionString)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         HIMC hIMC,
         DWORD dwIndex,
         void *pComp,
@@ -5432,7 +3598,7 @@
         DWORD dwReadLen);
 
     HRESULT (STDMETHODCALLTYPE *ToAsciiEx)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         UINT uVirKey,
         UINT uScanCode,
         BYTE *pbKeyState,
@@ -5442,25 +3608,25 @@
         UINT *puSize);
 
     HRESULT (STDMETHODCALLTYPE *RegisterWord)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szString);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterWord)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szString);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisterWordStyle)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         UINT nItem,
         STYLEBUFW *pStyleBuf,
         UINT *puBufSize);
 
     HRESULT (STDMETHODCALLTYPE *EnumRegisterWord)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         LPWSTR szReading,
         DWORD dwStyle,
         LPWSTR szRegister,
@@ -5468,23 +3634,24 @@
         IEnumRegisterWordW **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *GetCodePageA)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         UINT *uCodePage);
 
     HRESULT (STDMETHODCALLTYPE *GetLangId)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         LANGID *plid);
 
     /*** IActiveIME2 methods ***/
     HRESULT (STDMETHODCALLTYPE *Sleep)(
-        IActiveIME2* This);
+        IActiveIME2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Unsleep)(
-        IActiveIME2* This,
+        IActiveIME2 *This,
         WINBOOL fDead);
 
     END_INTERFACE
 } IActiveIME2Vtbl;
+
 interface IActiveIME2 {
     CONST_VTBL IActiveIME2Vtbl* lpVtbl;
 };
@@ -5591,21 +3758,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActiveIME2_Sleep_Proxy(
-    IActiveIME2* This);
-void __RPC_STUB IActiveIME2_Sleep_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActiveIME2_Unsleep_Proxy(
-    IActiveIME2* This,
-    WINBOOL fDead);
-void __RPC_STUB IActiveIME2_Unsleep_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActiveIME2_INTERFACE_DEFINED__ */
 
@@ -5644,36 +3796,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumRegisterWordA* This,
+        IEnumRegisterWordA *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumRegisterWordA* This);
+        IEnumRegisterWordA *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumRegisterWordA* This);
+        IEnumRegisterWordA *This);
 
     /*** IEnumRegisterWordA methods ***/
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumRegisterWordA* This,
+        IEnumRegisterWordA *This,
         IEnumRegisterWordA **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumRegisterWordA* This,
+        IEnumRegisterWordA *This,
         ULONG ulCount,
         REGISTERWORDA *rgRegisterWord,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumRegisterWordA* This);
+        IEnumRegisterWordA *This);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumRegisterWordA* This,
+        IEnumRegisterWordA *This,
         ULONG ulCount);
 
     END_INTERFACE
 } IEnumRegisterWordAVtbl;
+
 interface IEnumRegisterWordA {
     CONST_VTBL IEnumRegisterWordAVtbl* lpVtbl;
 };
@@ -5718,39 +3871,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Clone_Proxy(
-    IEnumRegisterWordA* This,
-    IEnumRegisterWordA **ppEnum);
-void __RPC_STUB IEnumRegisterWordA_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Next_Proxy(
-    IEnumRegisterWordA* This,
-    ULONG ulCount,
-    REGISTERWORDA *rgRegisterWord,
-    ULONG *pcFetched);
-void __RPC_STUB IEnumRegisterWordA_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Reset_Proxy(
-    IEnumRegisterWordA* This);
-void __RPC_STUB IEnumRegisterWordA_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordA_Skip_Proxy(
-    IEnumRegisterWordA* This,
-    ULONG ulCount);
-void __RPC_STUB IEnumRegisterWordA_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumRegisterWordA_INTERFACE_DEFINED__ */
 
@@ -5789,36 +3909,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumRegisterWordW* This,
+        IEnumRegisterWordW *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumRegisterWordW* This);
+        IEnumRegisterWordW *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumRegisterWordW* This);
+        IEnumRegisterWordW *This);
 
     /*** IEnumRegisterWordW methods ***/
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumRegisterWordW* This,
+        IEnumRegisterWordW *This,
         IEnumRegisterWordW **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumRegisterWordW* This,
+        IEnumRegisterWordW *This,
         ULONG ulCount,
         REGISTERWORDW *rgRegisterWord,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumRegisterWordW* This);
+        IEnumRegisterWordW *This);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumRegisterWordW* This,
+        IEnumRegisterWordW *This,
         ULONG ulCount);
 
     END_INTERFACE
 } IEnumRegisterWordWVtbl;
+
 interface IEnumRegisterWordW {
     CONST_VTBL IEnumRegisterWordWVtbl* lpVtbl;
 };
@@ -5863,39 +3984,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Clone_Proxy(
-    IEnumRegisterWordW* This,
-    IEnumRegisterWordW **ppEnum);
-void __RPC_STUB IEnumRegisterWordW_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Next_Proxy(
-    IEnumRegisterWordW* This,
-    ULONG ulCount,
-    REGISTERWORDW *rgRegisterWord,
-    ULONG *pcFetched);
-void __RPC_STUB IEnumRegisterWordW_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Reset_Proxy(
-    IEnumRegisterWordW* This);
-void __RPC_STUB IEnumRegisterWordW_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegisterWordW_Skip_Proxy(
-    IEnumRegisterWordW* This,
-    ULONG ulCount);
-void __RPC_STUB IEnumRegisterWordW_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumRegisterWordW_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/dispex.h b/mingw-w64-headers/include/dispex.h
index da36a2f..bb4ab79 100644
--- a/mingw-w64-headers/include/dispex.h
+++ b/mingw-w64-headers/include/dispex.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/dispex.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/dispex.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,31 +20,49 @@
 #ifndef __IDispatchEx_FWD_DEFINED__
 #define __IDispatchEx_FWD_DEFINED__
 typedef interface IDispatchEx IDispatchEx;
+#ifdef __cplusplus
+interface IDispatchEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDispError_FWD_DEFINED__
 #define __IDispError_FWD_DEFINED__
 typedef interface IDispError IDispError;
+#ifdef __cplusplus
+interface IDispError;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IVariantChangeType_FWD_DEFINED__
 #define __IVariantChangeType_FWD_DEFINED__
 typedef interface IVariantChangeType IVariantChangeType;
+#ifdef __cplusplus
+interface IVariantChangeType;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectIdentity_FWD_DEFINED__
 #define __IObjectIdentity_FWD_DEFINED__
 typedef interface IObjectIdentity IObjectIdentity;
+#ifdef __cplusplus
+interface IObjectIdentity;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICanHandleException_FWD_DEFINED__
 #define __ICanHandleException_FWD_DEFINED__
 typedef interface ICanHandleException ICanHandleException;
+#ifdef __cplusplus
+interface ICanHandleException;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProvideRuntimeContext_FWD_DEFINED__
 #define __IProvideRuntimeContext_FWD_DEFINED__
 typedef interface IProvideRuntimeContext IProvideRuntimeContext;
+#ifdef __cplusplus
+interface IProvideRuntimeContext;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -66,16 +84,25 @@
 #ifndef __IDispatchEx_FWD_DEFINED__
 #define __IDispatchEx_FWD_DEFINED__
 typedef interface IDispatchEx IDispatchEx;
+#ifdef __cplusplus
+interface IDispatchEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDispError_FWD_DEFINED__
 #define __IDispError_FWD_DEFINED__
 typedef interface IDispError IDispError;
+#ifdef __cplusplus
+interface IDispError;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IVariantChangeType_FWD_DEFINED__
 #define __IVariantChangeType_FWD_DEFINED__
 typedef interface IVariantChangeType IVariantChangeType;
+#ifdef __cplusplus
+interface IVariantChangeType;
+#endif /* __cplusplus */
 #endif
 
 #ifndef DISPEX_H_
@@ -192,29 +219,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDispatchEx* This);
+        IDispatchEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDispatchEx* This);
+        IDispatchEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -222,7 +249,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -234,13 +261,13 @@
 
     /*** IDispatchEx methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDispID)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         BSTR bstrName,
         DWORD grfdex,
         DISPID *pid);
 
     HRESULT (STDMETHODCALLTYPE *InvokeEx)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         DISPID id,
         LCID lcid,
         WORD wFlags,
@@ -250,37 +277,38 @@
         IServiceProvider *pspCaller);
 
     HRESULT (STDMETHODCALLTYPE *DeleteMemberByName)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         BSTR bstrName,
         DWORD grfdex);
 
     HRESULT (STDMETHODCALLTYPE *DeleteMemberByDispID)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         DISPID id);
 
     HRESULT (STDMETHODCALLTYPE *GetMemberProperties)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         DISPID id,
         DWORD grfdexFetch,
         DWORD *pgrfdex);
 
     HRESULT (STDMETHODCALLTYPE *GetMemberName)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         DISPID id,
         BSTR *pbstrName);
 
     HRESULT (STDMETHODCALLTYPE *GetNextDispID)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         DWORD grfdex,
         DISPID id,
         DISPID *pid);
 
     HRESULT (STDMETHODCALLTYPE *GetNameSpaceParent)(
-        IDispatchEx* This,
+        IDispatchEx *This,
         IUnknown **ppunk);
 
     END_INTERFACE
 } IDispatchExVtbl;
+
 interface IDispatchEx {
     CONST_VTBL IDispatchExVtbl* lpVtbl;
 };
@@ -359,16 +387,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDispatchEx_GetDispID_Proxy(
-    IDispatchEx* This,
-    BSTR bstrName,
-    DWORD grfdex,
-    DISPID *pid);
-void __RPC_STUB IDispatchEx_GetDispID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IDispatchEx_RemoteInvokeEx_Proxy(
     IDispatchEx* This,
     DISPID id,
@@ -386,60 +404,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatchEx_DeleteMemberByName_Proxy(
-    IDispatchEx* This,
-    BSTR bstrName,
-    DWORD grfdex);
-void __RPC_STUB IDispatchEx_DeleteMemberByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatchEx_DeleteMemberByDispID_Proxy(
-    IDispatchEx* This,
-    DISPID id);
-void __RPC_STUB IDispatchEx_DeleteMemberByDispID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatchEx_GetMemberProperties_Proxy(
-    IDispatchEx* This,
-    DISPID id,
-    DWORD grfdexFetch,
-    DWORD *pgrfdex);
-void __RPC_STUB IDispatchEx_GetMemberProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatchEx_GetMemberName_Proxy(
-    IDispatchEx* This,
-    DISPID id,
-    BSTR *pbstrName);
-void __RPC_STUB IDispatchEx_GetMemberName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatchEx_GetNextDispID_Proxy(
-    IDispatchEx* This,
-    DWORD grfdex,
-    DISPID id,
-    DISPID *pid);
-void __RPC_STUB IDispatchEx_GetNextDispID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatchEx_GetNameSpaceParent_Proxy(
-    IDispatchEx* This,
-    IUnknown **ppunk);
-void __RPC_STUB IDispatchEx_GetNameSpaceParent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IDispatchEx_InvokeEx_Proxy(
     IDispatchEx* This,
     DISPID id,
@@ -505,45 +469,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDispError* This,
+        IDispError *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDispError* This);
+        IDispError *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDispError* This);
+        IDispError *This);
 
     /*** IDispError methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryErrorInfo)(
-        IDispError* This,
+        IDispError *This,
         GUID guidErrorType,
         IDispError **ppde);
 
     HRESULT (STDMETHODCALLTYPE *GetNext)(
-        IDispError* This,
+        IDispError *This,
         IDispError **ppde);
 
     HRESULT (STDMETHODCALLTYPE *GetHresult)(
-        IDispError* This,
+        IDispError *This,
         HRESULT *phr);
 
     HRESULT (STDMETHODCALLTYPE *GetSource)(
-        IDispError* This,
+        IDispError *This,
         BSTR *pbstrSource);
 
     HRESULT (STDMETHODCALLTYPE *GetHelpInfo)(
-        IDispError* This,
+        IDispError *This,
         BSTR *pbstrFileName,
         DWORD *pdwContext);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IDispError* This,
+        IDispError *This,
         BSTR *pbstrDescription);
 
     END_INTERFACE
 } IDispErrorVtbl;
+
 interface IDispError {
     CONST_VTBL IDispErrorVtbl* lpVtbl;
 };
@@ -596,56 +561,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDispError_QueryErrorInfo_Proxy(
-    IDispError* This,
-    GUID guidErrorType,
-    IDispError **ppde);
-void __RPC_STUB IDispError_QueryErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispError_GetNext_Proxy(
-    IDispError* This,
-    IDispError **ppde);
-void __RPC_STUB IDispError_GetNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispError_GetHresult_Proxy(
-    IDispError* This,
-    HRESULT *phr);
-void __RPC_STUB IDispError_GetHresult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispError_GetSource_Proxy(
-    IDispError* This,
-    BSTR *pbstrSource);
-void __RPC_STUB IDispError_GetSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispError_GetHelpInfo_Proxy(
-    IDispError* This,
-    BSTR *pbstrFileName,
-    DWORD *pdwContext);
-void __RPC_STUB IDispError_GetHelpInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispError_GetDescription_Proxy(
-    IDispError* This,
-    BSTR *pbstrDescription);
-void __RPC_STUB IDispError_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDispError_INTERFACE_DEFINED__ */
 
@@ -676,19 +591,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IVariantChangeType* This,
+        IVariantChangeType *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IVariantChangeType* This);
+        IVariantChangeType *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IVariantChangeType* This);
+        IVariantChangeType *This);
 
     /*** IVariantChangeType methods ***/
     HRESULT (STDMETHODCALLTYPE *ChangeType)(
-        IVariantChangeType* This,
+        IVariantChangeType *This,
         VARIANT *pvarDst,
         VARIANT *pvarSrc,
         LCID lcid,
@@ -696,6 +611,7 @@
 
     END_INTERFACE
 } IVariantChangeTypeVtbl;
+
 interface IVariantChangeType {
     CONST_VTBL IVariantChangeTypeVtbl* lpVtbl;
 };
@@ -728,17 +644,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IVariantChangeType_ChangeType_Proxy(
-    IVariantChangeType* This,
-    VARIANT *pvarDst,
-    VARIANT *pvarSrc,
-    LCID lcid,
-    VARTYPE vtNew);
-void __RPC_STUB IVariantChangeType_ChangeType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IVariantChangeType_INTERFACE_DEFINED__ */
 
@@ -766,23 +671,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectIdentity* This,
+        IObjectIdentity *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectIdentity* This);
+        IObjectIdentity *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectIdentity* This);
+        IObjectIdentity *This);
 
     /*** IObjectIdentity methods ***/
     HRESULT (STDMETHODCALLTYPE *IsEqualObject)(
-        IObjectIdentity* This,
+        IObjectIdentity *This,
         IUnknown *punk);
 
     END_INTERFACE
 } IObjectIdentityVtbl;
+
 interface IObjectIdentity {
     CONST_VTBL IObjectIdentityVtbl* lpVtbl;
 };
@@ -815,14 +721,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectIdentity_IsEqualObject_Proxy(
-    IObjectIdentity* This,
-    IUnknown *punk);
-void __RPC_STUB IObjectIdentity_IsEqualObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectIdentity_INTERFACE_DEFINED__ */
 
@@ -851,24 +749,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICanHandleException* This,
+        ICanHandleException *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICanHandleException* This);
+        ICanHandleException *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICanHandleException* This);
+        ICanHandleException *This);
 
     /*** ICanHandleException methods ***/
     HRESULT (STDMETHODCALLTYPE *CanHandleException)(
-        ICanHandleException* This,
+        ICanHandleException *This,
         EXCEPINFO *pExcepInfo,
         VARIANT *pvar);
 
     END_INTERFACE
 } ICanHandleExceptionVtbl;
+
 interface ICanHandleException {
     CONST_VTBL ICanHandleExceptionVtbl* lpVtbl;
 };
@@ -901,15 +800,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICanHandleException_CanHandleException_Proxy(
-    ICanHandleException* This,
-    EXCEPINFO *pExcepInfo,
-    VARIANT *pvar);
-void __RPC_STUB ICanHandleException_CanHandleException_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICanHandleException_INTERFACE_DEFINED__ */
 
@@ -938,24 +828,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IProvideRuntimeContext* This,
+        IProvideRuntimeContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IProvideRuntimeContext* This);
+        IProvideRuntimeContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IProvideRuntimeContext* This);
+        IProvideRuntimeContext *This);
 
     /*** IProvideRuntimeContext methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCurrentSourceContext)(
-        IProvideRuntimeContext* This,
+        IProvideRuntimeContext *This,
         DWORD_PTR *pdwContext,
         VARIANT_BOOL *pfExecutingGlobalCode);
 
     END_INTERFACE
 } IProvideRuntimeContextVtbl;
+
 interface IProvideRuntimeContext {
     CONST_VTBL IProvideRuntimeContextVtbl* lpVtbl;
 };
@@ -988,15 +879,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IProvideRuntimeContext_GetCurrentSourceContext_Proxy(
-    IProvideRuntimeContext* This,
-    DWORD_PTR *pdwContext,
-    VARIANT_BOOL *pfExecutingGlobalCode);
-void __RPC_STUB IProvideRuntimeContext_GetCurrentSourceContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IProvideRuntimeContext_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/docobj.h b/mingw-w64-headers/include/docobj.h
index bd89676..f687171 100644
--- a/mingw-w64-headers/include/docobj.h
+++ b/mingw-w64-headers/include/docobj.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/docobj.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/docobj.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IOleDocument_FWD_DEFINED__
 #define __IOleDocument_FWD_DEFINED__
 typedef interface IOleDocument IOleDocument;
+#ifdef __cplusplus
+interface IOleDocument;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleDocumentSite_FWD_DEFINED__
 #define __IOleDocumentSite_FWD_DEFINED__
 typedef interface IOleDocumentSite IOleDocumentSite;
+#ifdef __cplusplus
+interface IOleDocumentSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleDocumentView_FWD_DEFINED__
 #define __IOleDocumentView_FWD_DEFINED__
 typedef interface IOleDocumentView IOleDocumentView;
+#ifdef __cplusplus
+interface IOleDocumentView;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumOleDocumentViews_FWD_DEFINED__
 #define __IEnumOleDocumentViews_FWD_DEFINED__
 typedef interface IEnumOleDocumentViews IEnumOleDocumentViews;
+#ifdef __cplusplus
+interface IEnumOleDocumentViews;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IContinueCallback_FWD_DEFINED__
 #define __IContinueCallback_FWD_DEFINED__
 typedef interface IContinueCallback IContinueCallback;
+#ifdef __cplusplus
+interface IContinueCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPrint_FWD_DEFINED__
 #define __IPrint_FWD_DEFINED__
 typedef interface IPrint IPrint;
+#ifdef __cplusplus
+interface IPrint;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleCommandTarget_FWD_DEFINED__
 #define __IOleCommandTarget_FWD_DEFINED__
 typedef interface IOleCommandTarget IOleCommandTarget;
+#ifdef __cplusplus
+interface IOleCommandTarget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IZoomEvents_FWD_DEFINED__
 #define __IZoomEvents_FWD_DEFINED__
 typedef interface IZoomEvents IZoomEvents;
+#ifdef __cplusplus
+interface IZoomEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProtectFocus_FWD_DEFINED__
 #define __IProtectFocus_FWD_DEFINED__
 typedef interface IProtectFocus IProtectFocus;
+#ifdef __cplusplus
+interface IProtectFocus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProtectedModeMenuServices_FWD_DEFINED__
 #define __IProtectedModeMenuServices_FWD_DEFINED__
 typedef interface IProtectedModeMenuServices IProtectedModeMenuServices;
+#ifdef __cplusplus
+interface IProtectedModeMenuServices;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -92,41 +122,65 @@
 #ifndef __IOleDocument_FWD_DEFINED__
 #define __IOleDocument_FWD_DEFINED__
 typedef interface IOleDocument IOleDocument;
+#ifdef __cplusplus
+interface IOleDocument;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleDocumentSite_FWD_DEFINED__
 #define __IOleDocumentSite_FWD_DEFINED__
 typedef interface IOleDocumentSite IOleDocumentSite;
+#ifdef __cplusplus
+interface IOleDocumentSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleDocumentView_FWD_DEFINED__
 #define __IOleDocumentView_FWD_DEFINED__
 typedef interface IOleDocumentView IOleDocumentView;
+#ifdef __cplusplus
+interface IOleDocumentView;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumOleDocumentViews_FWD_DEFINED__
 #define __IEnumOleDocumentViews_FWD_DEFINED__
 typedef interface IEnumOleDocumentViews IEnumOleDocumentViews;
+#ifdef __cplusplus
+interface IEnumOleDocumentViews;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IContinueCallback_FWD_DEFINED__
 #define __IContinueCallback_FWD_DEFINED__
 typedef interface IContinueCallback IContinueCallback;
+#ifdef __cplusplus
+interface IContinueCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPrint_FWD_DEFINED__
 #define __IPrint_FWD_DEFINED__
 typedef interface IPrint IPrint;
+#ifdef __cplusplus
+interface IPrint;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleCommandTarget_FWD_DEFINED__
 #define __IOleCommandTarget_FWD_DEFINED__
 typedef interface IOleCommandTarget IOleCommandTarget;
+#ifdef __cplusplus
+interface IOleCommandTarget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProtectedModeMenuServices_FWD_DEFINED__
 #define __IProtectedModeMenuServices_FWD_DEFINED__
 typedef interface IProtectedModeMenuServices IProtectedModeMenuServices;
+#ifdef __cplusplus
+interface IProtectedModeMenuServices;
+#endif /* __cplusplus */
 #endif
 
 
@@ -175,35 +229,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleDocument* This,
+        IOleDocument *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleDocument* This);
+        IOleDocument *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleDocument* This);
+        IOleDocument *This);
 
     /*** IOleDocument methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateView)(
-        IOleDocument* This,
+        IOleDocument *This,
         IOleInPlaceSite *pIPSite,
         IStream *pstm,
         DWORD dwReserved,
         IOleDocumentView **ppView);
 
     HRESULT (STDMETHODCALLTYPE *GetDocMiscStatus)(
-        IOleDocument* This,
+        IOleDocument *This,
         DWORD *pdwStatus);
 
     HRESULT (STDMETHODCALLTYPE *EnumViews)(
-        IOleDocument* This,
+        IOleDocument *This,
         IEnumOleDocumentViews **ppEnum,
         IOleDocumentView **ppView);
 
     END_INTERFACE
 } IOleDocumentVtbl;
+
 interface IOleDocument {
     CONST_VTBL IOleDocumentVtbl* lpVtbl;
 };
@@ -244,34 +299,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleDocument_CreateView_Proxy(
-    IOleDocument* This,
-    IOleInPlaceSite *pIPSite,
-    IStream *pstm,
-    DWORD dwReserved,
-    IOleDocumentView **ppView);
-void __RPC_STUB IOleDocument_CreateView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocument_GetDocMiscStatus_Proxy(
-    IOleDocument* This,
-    DWORD *pdwStatus);
-void __RPC_STUB IOleDocument_GetDocMiscStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocument_EnumViews_Proxy(
-    IOleDocument* This,
-    IEnumOleDocumentViews **ppEnum,
-    IOleDocumentView **ppView);
-void __RPC_STUB IOleDocument_EnumViews_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleDocument_INTERFACE_DEFINED__ */
 
@@ -305,23 +332,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleDocumentSite* This,
+        IOleDocumentSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleDocumentSite* This);
+        IOleDocumentSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleDocumentSite* This);
+        IOleDocumentSite *This);
 
     /*** IOleDocumentSite methods ***/
     HRESULT (STDMETHODCALLTYPE *ActivateMe)(
-        IOleDocumentSite* This,
+        IOleDocumentSite *This,
         IOleDocumentView *pViewToActivate);
 
     END_INTERFACE
 } IOleDocumentSiteVtbl;
+
 interface IOleDocumentSite {
     CONST_VTBL IOleDocumentSiteVtbl* lpVtbl;
 };
@@ -354,14 +382,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleDocumentSite_ActivateMe_Proxy(
-    IOleDocumentSite* This,
-    IOleDocumentView *pViewToActivate);
-void __RPC_STUB IOleDocumentSite_ActivateMe_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleDocumentSite_INTERFACE_DEFINED__ */
 
@@ -435,74 +455,75 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleDocumentView* This);
+        IOleDocumentView *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleDocumentView* This);
+        IOleDocumentView *This);
 
     /*** IOleDocumentView methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInPlaceSite)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         IOleInPlaceSite *pIPSite);
 
     HRESULT (STDMETHODCALLTYPE *GetInPlaceSite)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         IOleInPlaceSite **ppIPSite);
 
     HRESULT (STDMETHODCALLTYPE *GetDocument)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         IUnknown **ppunk);
 
     HRESULT (STDMETHODCALLTYPE *SetRect)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         LPRECT prcView);
 
     HRESULT (STDMETHODCALLTYPE *GetRect)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         LPRECT prcView);
 
     HRESULT (STDMETHODCALLTYPE *SetRectComplex)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         LPRECT prcView,
         LPRECT prcHScroll,
         LPRECT prcVScroll,
         LPRECT prcSizeBox);
 
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         WINBOOL fShow);
 
     HRESULT (STDMETHODCALLTYPE *UIActivate)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         WINBOOL fUIActivate);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IOleDocumentView* This);
+        IOleDocumentView *This);
 
     HRESULT (STDMETHODCALLTYPE *CloseView)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SaveViewState)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         LPSTREAM pstm);
 
     HRESULT (STDMETHODCALLTYPE *ApplyViewState)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         LPSTREAM pstm);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOleDocumentView* This,
+        IOleDocumentView *This,
         IOleInPlaceSite *pIPSiteNew,
         IOleDocumentView **ppViewNew);
 
     END_INTERFACE
 } IOleDocumentViewVtbl;
+
 interface IOleDocumentView {
     CONST_VTBL IOleDocumentViewVtbl* lpVtbl;
 };
@@ -583,113 +604,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleDocumentView_SetInPlaceSite_Proxy(
-    IOleDocumentView* This,
-    IOleInPlaceSite *pIPSite);
-void __RPC_STUB IOleDocumentView_SetInPlaceSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_GetInPlaceSite_Proxy(
-    IOleDocumentView* This,
-    IOleInPlaceSite **ppIPSite);
-void __RPC_STUB IOleDocumentView_GetInPlaceSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_GetDocument_Proxy(
-    IOleDocumentView* This,
-    IUnknown **ppunk);
-void __RPC_STUB IOleDocumentView_GetDocument_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_SetRect_Proxy(
-    IOleDocumentView* This,
-    LPRECT prcView);
-void __RPC_STUB IOleDocumentView_SetRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_GetRect_Proxy(
-    IOleDocumentView* This,
-    LPRECT prcView);
-void __RPC_STUB IOleDocumentView_GetRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_SetRectComplex_Proxy(
-    IOleDocumentView* This,
-    LPRECT prcView,
-    LPRECT prcHScroll,
-    LPRECT prcVScroll,
-    LPRECT prcSizeBox);
-void __RPC_STUB IOleDocumentView_SetRectComplex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_Show_Proxy(
-    IOleDocumentView* This,
-    WINBOOL fShow);
-void __RPC_STUB IOleDocumentView_Show_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_UIActivate_Proxy(
-    IOleDocumentView* This,
-    WINBOOL fUIActivate);
-void __RPC_STUB IOleDocumentView_UIActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_Open_Proxy(
-    IOleDocumentView* This);
-void __RPC_STUB IOleDocumentView_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_CloseView_Proxy(
-    IOleDocumentView* This,
-    DWORD dwReserved);
-void __RPC_STUB IOleDocumentView_CloseView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_SaveViewState_Proxy(
-    IOleDocumentView* This,
-    LPSTREAM pstm);
-void __RPC_STUB IOleDocumentView_SaveViewState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_ApplyViewState_Proxy(
-    IOleDocumentView* This,
-    LPSTREAM pstm);
-void __RPC_STUB IOleDocumentView_ApplyViewState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleDocumentView_Clone_Proxy(
-    IOleDocumentView* This,
-    IOleInPlaceSite *pIPSiteNew,
-    IOleDocumentView **ppViewNew);
-void __RPC_STUB IOleDocumentView_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleDocumentView_INTERFACE_DEFINED__ */
 
@@ -734,36 +648,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumOleDocumentViews* This,
+        IEnumOleDocumentViews *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumOleDocumentViews* This);
+        IEnumOleDocumentViews *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumOleDocumentViews* This);
+        IEnumOleDocumentViews *This);
 
     /*** IEnumOleDocumentViews methods ***/
     HRESULT (__stdcall *Next)(
-        IEnumOleDocumentViews* This,
+        IEnumOleDocumentViews *This,
         ULONG cViews,
         IOleDocumentView **rgpView,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumOleDocumentViews* This,
+        IEnumOleDocumentViews *This,
         ULONG cViews);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumOleDocumentViews* This);
+        IEnumOleDocumentViews *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumOleDocumentViews* This,
+        IEnumOleDocumentViews *This,
         IEnumOleDocumentViews **ppEnum);
 
     END_INTERFACE
 } IEnumOleDocumentViewsVtbl;
+
 interface IEnumOleDocumentViews {
     CONST_VTBL IEnumOleDocumentViewsVtbl* lpVtbl;
 };
@@ -818,29 +733,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOleDocumentViews_Skip_Proxy(
-    IEnumOleDocumentViews* This,
-    ULONG cViews);
-void __RPC_STUB IEnumOleDocumentViews_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOleDocumentViews_Reset_Proxy(
-    IEnumOleDocumentViews* This);
-void __RPC_STUB IEnumOleDocumentViews_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOleDocumentViews_Clone_Proxy(
-    IEnumOleDocumentViews* This,
-    IEnumOleDocumentViews **ppEnum);
-void __RPC_STUB IEnumOleDocumentViews_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumOleDocumentViews_Next_Proxy(
     IEnumOleDocumentViews* This,
     ULONG cViews,
@@ -889,28 +781,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContinueCallback* This,
+        IContinueCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContinueCallback* This);
+        IContinueCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IContinueCallback* This);
+        IContinueCallback *This);
 
     /*** IContinueCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *FContinue)(
-        IContinueCallback* This);
+        IContinueCallback *This);
 
     HRESULT (STDMETHODCALLTYPE *FContinuePrinting)(
-        IContinueCallback* This,
+        IContinueCallback *This,
         LONG nCntPrinted,
         LONG nCurPage,
         wchar_t *pwszPrintStatus);
 
     END_INTERFACE
 } IContinueCallbackVtbl;
+
 interface IContinueCallback {
     CONST_VTBL IContinueCallbackVtbl* lpVtbl;
 };
@@ -947,23 +840,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IContinueCallback_FContinue_Proxy(
-    IContinueCallback* This);
-void __RPC_STUB IContinueCallback_FContinue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IContinueCallback_FContinuePrinting_Proxy(
-    IContinueCallback* This,
-    LONG nCntPrinted,
-    LONG nCurPage,
-    wchar_t *pwszPrintStatus);
-void __RPC_STUB IContinueCallback_FContinuePrinting_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IContinueCallback_INTERFACE_DEFINED__ */
 
@@ -1036,28 +912,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPrint* This,
+        IPrint *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPrint* This);
+        IPrint *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPrint* This);
+        IPrint *This);
 
     /*** IPrint methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInitialPageNum)(
-        IPrint* This,
+        IPrint *This,
         LONG nFirstPage);
 
     HRESULT (STDMETHODCALLTYPE *GetPageInfo)(
-        IPrint* This,
+        IPrint *This,
         LONG *pnFirstPage,
         LONG *pcPages);
 
     HRESULT (__stdcall *Print)(
-        IPrint* This,
+        IPrint *This,
         DWORD grfFlags,
         DVTARGETDEVICE **pptd,
         PAGESET **ppPageSet,
@@ -1069,6 +945,7 @@
 
     END_INTERFACE
 } IPrintVtbl;
+
 interface IPrint {
     CONST_VTBL IPrintVtbl* lpVtbl;
 };
@@ -1109,23 +986,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPrint_SetInitialPageNum_Proxy(
-    IPrint* This,
-    LONG nFirstPage);
-void __RPC_STUB IPrint_SetInitialPageNum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPrint_GetPageInfo_Proxy(
-    IPrint* This,
-    LONG *pnFirstPage,
-    LONG *pcPages);
-void __RPC_STUB IPrint_GetPageInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT __stdcall IPrint_RemotePrint_Proxy(
     IPrint* This,
     DWORD grfFlags,
@@ -1363,26 +1223,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleCommandTarget* This,
+        IOleCommandTarget *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleCommandTarget* This);
+        IOleCommandTarget *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleCommandTarget* This);
+        IOleCommandTarget *This);
 
     /*** IOleCommandTarget methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryStatus)(
-        IOleCommandTarget* This,
+        IOleCommandTarget *This,
         const GUID *pguidCmdGroup,
         ULONG cCmds,
         OLECMD prgCmds[],
         OLECMDTEXT *pCmdText);
 
     HRESULT (STDMETHODCALLTYPE *Exec)(
-        IOleCommandTarget* This,
+        IOleCommandTarget *This,
         const GUID *pguidCmdGroup,
         DWORD nCmdID,
         DWORD nCmdexecopt,
@@ -1391,6 +1251,7 @@
 
     END_INTERFACE
 } IOleCommandTargetVtbl;
+
 interface IOleCommandTarget {
     CONST_VTBL IOleCommandTargetVtbl* lpVtbl;
 };
@@ -1427,29 +1288,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleCommandTarget_QueryStatus_Proxy(
-    IOleCommandTarget* This,
-    const GUID *pguidCmdGroup,
-    ULONG cCmds,
-    OLECMD prgCmds[],
-    OLECMDTEXT *pCmdText);
-void __RPC_STUB IOleCommandTarget_QueryStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleCommandTarget_Exec_Proxy(
-    IOleCommandTarget* This,
-    const GUID *pguidCmdGroup,
-    DWORD nCmdID,
-    DWORD nCmdexecopt,
-    VARIANT *pvaIn,
-    VARIANT *pvaOut);
-void __RPC_STUB IOleCommandTarget_Exec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleCommandTarget_INTERFACE_DEFINED__ */
 
@@ -1629,23 +1467,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IZoomEvents* This,
+        IZoomEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IZoomEvents* This);
+        IZoomEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IZoomEvents* This);
+        IZoomEvents *This);
 
     /*** IZoomEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnZoomPercentChanged)(
-        IZoomEvents* This,
+        IZoomEvents *This,
         ULONG ulZoomPercent);
 
     END_INTERFACE
 } IZoomEventsVtbl;
+
 interface IZoomEvents {
     CONST_VTBL IZoomEventsVtbl* lpVtbl;
 };
@@ -1678,14 +1517,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IZoomEvents_OnZoomPercentChanged_Proxy(
-    IZoomEvents* This,
-    ULONG ulZoomPercent);
-void __RPC_STUB IZoomEvents_OnZoomPercentChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IZoomEvents_INTERFACE_DEFINED__ */
 
@@ -1714,23 +1545,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IProtectFocus* This,
+        IProtectFocus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IProtectFocus* This);
+        IProtectFocus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IProtectFocus* This);
+        IProtectFocus *This);
 
     /*** IProtectFocus methods ***/
     HRESULT (STDMETHODCALLTYPE *AllowFocusChange)(
-        IProtectFocus* This,
+        IProtectFocus *This,
         WINBOOL *pfAllow);
 
     END_INTERFACE
 } IProtectFocusVtbl;
+
 interface IProtectFocus {
     CONST_VTBL IProtectFocusVtbl* lpVtbl;
 };
@@ -1763,14 +1595,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IProtectFocus_AllowFocusChange_Proxy(
-    IProtectFocus* This,
-    WINBOOL *pfAllow);
-void __RPC_STUB IProtectFocus_AllowFocusChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IProtectFocus_INTERFACE_DEFINED__ */
 
@@ -1813,35 +1637,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IProtectedModeMenuServices* This,
+        IProtectedModeMenuServices *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IProtectedModeMenuServices* This);
+        IProtectedModeMenuServices *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IProtectedModeMenuServices* This);
+        IProtectedModeMenuServices *This);
 
     /*** IProtectedModeMenuServices methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateMenu)(
-        IProtectedModeMenuServices* This,
+        IProtectedModeMenuServices *This,
         HMENU *phMenu);
 
     HRESULT (STDMETHODCALLTYPE *LoadMenu)(
-        IProtectedModeMenuServices* This,
+        IProtectedModeMenuServices *This,
         LPCWSTR pszModuleName,
         LPCWSTR pszMenuName,
         HMENU *phMenu);
 
     HRESULT (STDMETHODCALLTYPE *LoadMenuID)(
-        IProtectedModeMenuServices* This,
+        IProtectedModeMenuServices *This,
         LPCWSTR pszModuleName,
         WORD wResourceID,
         HMENU *phMenu);
 
     END_INTERFACE
 } IProtectedModeMenuServicesVtbl;
+
 interface IProtectedModeMenuServices {
     CONST_VTBL IProtectedModeMenuServicesVtbl* lpVtbl;
 };
@@ -1882,34 +1707,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IProtectedModeMenuServices_CreateMenu_Proxy(
-    IProtectedModeMenuServices* This,
-    HMENU *phMenu);
-void __RPC_STUB IProtectedModeMenuServices_CreateMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IProtectedModeMenuServices_LoadMenu_Proxy(
-    IProtectedModeMenuServices* This,
-    LPCWSTR pszModuleName,
-    LPCWSTR pszMenuName,
-    HMENU *phMenu);
-void __RPC_STUB IProtectedModeMenuServices_LoadMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IProtectedModeMenuServices_LoadMenuID_Proxy(
-    IProtectedModeMenuServices* This,
-    LPCWSTR pszModuleName,
-    WORD wResourceID,
-    HMENU *phMenu);
-void __RPC_STUB IProtectedModeMenuServices_LoadMenuID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IProtectedModeMenuServices_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/documenttarget.h b/mingw-w64-headers/include/documenttarget.h
index afae359..cd8aa73 100644
--- a/mingw-w64-headers/include/documenttarget.h
+++ b/mingw-w64-headers/include/documenttarget.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/documenttarget.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/documenttarget.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,16 +20,25 @@
 #ifndef __IPrintDocumentPackageTarget_FWD_DEFINED__
 #define __IPrintDocumentPackageTarget_FWD_DEFINED__
 typedef interface IPrintDocumentPackageTarget IPrintDocumentPackageTarget;
+#ifdef __cplusplus
+interface IPrintDocumentPackageTarget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPrintDocumentPackageStatusEvent_FWD_DEFINED__
 #define __IPrintDocumentPackageStatusEvent_FWD_DEFINED__
 typedef interface IPrintDocumentPackageStatusEvent IPrintDocumentPackageStatusEvent;
+#ifdef __cplusplus
+interface IPrintDocumentPackageStatusEvent;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPrintDocumentPackageTargetFactory_FWD_DEFINED__
 #define __IPrintDocumentPackageTargetFactory_FWD_DEFINED__
 typedef interface IPrintDocumentPackageTargetFactory IPrintDocumentPackageTargetFactory;
+#ifdef __cplusplus
+interface IPrintDocumentPackageTargetFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __PrintDocumentPackageTarget_FWD_DEFINED__
@@ -104,33 +113,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPrintDocumentPackageTarget* This,
+        IPrintDocumentPackageTarget *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPrintDocumentPackageTarget* This);
+        IPrintDocumentPackageTarget *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPrintDocumentPackageTarget* This);
+        IPrintDocumentPackageTarget *This);
 
     /*** IPrintDocumentPackageTarget methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPackageTargetTypes)(
-        IPrintDocumentPackageTarget* This,
+        IPrintDocumentPackageTarget *This,
         UINT32 *targetCount,
         GUID **targetTypes);
 
     HRESULT (STDMETHODCALLTYPE *GetPackageTarget)(
-        IPrintDocumentPackageTarget* This,
+        IPrintDocumentPackageTarget *This,
         REFGUID guidTargetType,
         REFIID riid,
         void **ppvTarget);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IPrintDocumentPackageTarget* This);
+        IPrintDocumentPackageTarget *This);
 
     END_INTERFACE
 } IPrintDocumentPackageTargetVtbl;
+
 interface IPrintDocumentPackageTarget {
     CONST_VTBL IPrintDocumentPackageTargetVtbl* lpVtbl;
 };
@@ -171,32 +181,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTarget_GetPackageTargetTypes_Proxy(
-    IPrintDocumentPackageTarget* This,
-    UINT32 *targetCount,
-    GUID **targetTypes);
-void __RPC_STUB IPrintDocumentPackageTarget_GetPackageTargetTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTarget_GetPackageTarget_Proxy(
-    IPrintDocumentPackageTarget* This,
-    REFGUID guidTargetType,
-    REFIID riid,
-    void **ppvTarget);
-void __RPC_STUB IPrintDocumentPackageTarget_GetPackageTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTarget_Cancel_Proxy(
-    IPrintDocumentPackageTarget* This);
-void __RPC_STUB IPrintDocumentPackageTarget_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPrintDocumentPackageTarget_INTERFACE_DEFINED__ */
 
@@ -241,29 +225,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPrintDocumentPackageStatusEvent* This,
+        IPrintDocumentPackageStatusEvent *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPrintDocumentPackageStatusEvent* This);
+        IPrintDocumentPackageStatusEvent *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPrintDocumentPackageStatusEvent* This);
+        IPrintDocumentPackageStatusEvent *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IPrintDocumentPackageStatusEvent* This,
+        IPrintDocumentPackageStatusEvent *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IPrintDocumentPackageStatusEvent* This,
+        IPrintDocumentPackageStatusEvent *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IPrintDocumentPackageStatusEvent* This,
+        IPrintDocumentPackageStatusEvent *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -271,7 +255,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IPrintDocumentPackageStatusEvent* This,
+        IPrintDocumentPackageStatusEvent *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -283,11 +267,12 @@
 
     /*** IPrintDocumentPackageStatusEvent methods ***/
     HRESULT (STDMETHODCALLTYPE *PackageStatusUpdated)(
-        IPrintDocumentPackageStatusEvent* This,
+        IPrintDocumentPackageStatusEvent *This,
         PrintDocumentPackageStatus *packageStatus);
 
     END_INTERFACE
 } IPrintDocumentPackageStatusEventVtbl;
+
 interface IPrintDocumentPackageStatusEvent {
     CONST_VTBL IPrintDocumentPackageStatusEventVtbl* lpVtbl;
 };
@@ -338,14 +323,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPrintDocumentPackageStatusEvent_PackageStatusUpdated_Proxy(
-    IPrintDocumentPackageStatusEvent* This,
-    PrintDocumentPackageStatus *packageStatus);
-void __RPC_STUB IPrintDocumentPackageStatusEvent_PackageStatusUpdated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPrintDocumentPackageStatusEvent_INTERFACE_DEFINED__ */
 
@@ -377,19 +354,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPrintDocumentPackageTargetFactory* This,
+        IPrintDocumentPackageTargetFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPrintDocumentPackageTargetFactory* This);
+        IPrintDocumentPackageTargetFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPrintDocumentPackageTargetFactory* This);
+        IPrintDocumentPackageTargetFactory *This);
 
     /*** IPrintDocumentPackageTargetFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateDocumentPackageTargetForPrintJob)(
-        IPrintDocumentPackageTargetFactory* This,
+        IPrintDocumentPackageTargetFactory *This,
         LPCWSTR printerName,
         LPCWSTR jobName,
         IStream *jobOutputStream,
@@ -398,6 +375,7 @@
 
     END_INTERFACE
 } IPrintDocumentPackageTargetFactoryVtbl;
+
 interface IPrintDocumentPackageTargetFactory {
     CONST_VTBL IPrintDocumentPackageTargetFactoryVtbl* lpVtbl;
 };
@@ -430,18 +408,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPrintDocumentPackageTargetFactory_CreateDocumentPackageTargetForPrintJob_Proxy(
-    IPrintDocumentPackageTargetFactory* This,
-    LPCWSTR printerName,
-    LPCWSTR jobName,
-    IStream *jobOutputStream,
-    IStream *jobPrintTicketStream,
-    IPrintDocumentPackageTarget **docPackageTarget);
-void __RPC_STUB IPrintDocumentPackageTargetFactory_CreateDocumentPackageTargetForPrintJob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPrintDocumentPackageTargetFactory_INTERFACE_DEFINED__ */
 
@@ -453,6 +419,9 @@
 #ifndef __IPrintDocumentPackageTarget_FWD_DEFINED__
 #define __IPrintDocumentPackageTarget_FWD_DEFINED__
 typedef interface IPrintDocumentPackageTarget IPrintDocumentPackageTarget;
+#ifdef __cplusplus
+interface IPrintDocumentPackageTarget;
+#endif /* __cplusplus */
 #endif
 
 #endif
@@ -460,11 +429,17 @@
 #ifndef __IPrintDocumentPackageStatusEvent_FWD_DEFINED__
 #define __IPrintDocumentPackageStatusEvent_FWD_DEFINED__
 typedef interface IPrintDocumentPackageStatusEvent IPrintDocumentPackageStatusEvent;
+#ifdef __cplusplus
+interface IPrintDocumentPackageStatusEvent;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPrintDocumentPackageTargetFactory_FWD_DEFINED__
 #define __IPrintDocumentPackageTargetFactory_FWD_DEFINED__
 typedef interface IPrintDocumentPackageTargetFactory IPrintDocumentPackageTargetFactory;
+#ifdef __cplusplus
+interface IPrintDocumentPackageTargetFactory;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
diff --git a/mingw-w64-headers/include/downloadmgr.h b/mingw-w64-headers/include/downloadmgr.h
index 75e38ba..6a10c52 100644
--- a/mingw-w64-headers/include/downloadmgr.h
+++ b/mingw-w64-headers/include/downloadmgr.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/downloadmgr.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/downloadmgr.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/drmexternals.h b/mingw-w64-headers/include/drmexternals.h
index bd35fa7..9547175 100644
--- a/mingw-w64-headers/include/drmexternals.h
+++ b/mingw-w64-headers/include/drmexternals.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/drmexternals.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/drmexternals.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/dxva2api.h b/mingw-w64-headers/include/dxva2api.h
index d4c5446..04da739 100644
--- a/mingw-w64-headers/include/dxva2api.h
+++ b/mingw-w64-headers/include/dxva2api.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/dxva2api.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/dxva2api.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __IDirect3DDeviceManager9_FWD_DEFINED__
 #define __IDirect3DDeviceManager9_FWD_DEFINED__
 typedef interface IDirect3DDeviceManager9 IDirect3DDeviceManager9;
+#ifdef __cplusplus
+interface IDirect3DDeviceManager9;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDirectXVideoDecoder_FWD_DEFINED__
 #define __IDirectXVideoDecoder_FWD_DEFINED__
 typedef interface IDirectXVideoDecoder IDirectXVideoDecoder;
+#ifdef __cplusplus
+interface IDirectXVideoDecoder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDirectXVideoAccelerationService_FWD_DEFINED__
 #define __IDirectXVideoAccelerationService_FWD_DEFINED__
 typedef interface IDirectXVideoAccelerationService IDirectXVideoAccelerationService;
+#ifdef __cplusplus
+interface IDirectXVideoAccelerationService;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDirectXVideoDecoderService_FWD_DEFINED__
 #define __IDirectXVideoDecoderService_FWD_DEFINED__
 typedef interface IDirectXVideoDecoderService IDirectXVideoDecoderService;
+#ifdef __cplusplus
+interface IDirectXVideoDecoderService;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -54,6 +66,9 @@
 #ifndef __IDirectXVideoDecoderService_FWD_DEFINED__
 #define __IDirectXVideoDecoderService_FWD_DEFINED__
 typedef interface IDirectXVideoDecoderService IDirectXVideoDecoderService;
+#ifdef __cplusplus
+interface IDirectXVideoDecoderService;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __REFERENCE_TIME_DEFINED
@@ -487,53 +502,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDirect3DDeviceManager9* This);
+        IDirect3DDeviceManager9 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDirect3DDeviceManager9* This);
+        IDirect3DDeviceManager9 *This);
 
     /*** IDirect3DDeviceManager9 methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetDevice)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         IDirect3DDevice9 *pDevice,
         UINT resetToken);
 
     HRESULT (STDMETHODCALLTYPE *OpenDeviceHandle)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         HANDLE *phDevice);
 
     HRESULT (STDMETHODCALLTYPE *CloseDeviceHandle)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         HANDLE hDevice);
 
     HRESULT (STDMETHODCALLTYPE *TestDevice)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         HANDLE hDevice);
 
     HRESULT (STDMETHODCALLTYPE *LockDevice)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         HANDLE hDevice,
         IDirect3DDevice9 **ppDevice,
         WINBOOL fBlock);
 
     HRESULT (STDMETHODCALLTYPE *UnlockDevice)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         HANDLE hDevice,
         WINBOOL fSaveState);
 
     HRESULT (STDMETHODCALLTYPE *GetVideoService)(
-        IDirect3DDeviceManager9* This,
+        IDirect3DDeviceManager9 *This,
         HANDLE hDevice,
         REFIID riid,
         void **ppService);
 
     END_INTERFACE
 } IDirect3DDeviceManager9Vtbl;
+
 interface IDirect3DDeviceManager9 {
     CONST_VTBL IDirect3DDeviceManager9Vtbl* lpVtbl;
 };
@@ -590,68 +606,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_ResetDevice_Proxy(
-    IDirect3DDeviceManager9* This,
-    IDirect3DDevice9 *pDevice,
-    UINT resetToken);
-void __RPC_STUB IDirect3DDeviceManager9_ResetDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_OpenDeviceHandle_Proxy(
-    IDirect3DDeviceManager9* This,
-    HANDLE *phDevice);
-void __RPC_STUB IDirect3DDeviceManager9_OpenDeviceHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_CloseDeviceHandle_Proxy(
-    IDirect3DDeviceManager9* This,
-    HANDLE hDevice);
-void __RPC_STUB IDirect3DDeviceManager9_CloseDeviceHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_TestDevice_Proxy(
-    IDirect3DDeviceManager9* This,
-    HANDLE hDevice);
-void __RPC_STUB IDirect3DDeviceManager9_TestDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_LockDevice_Proxy(
-    IDirect3DDeviceManager9* This,
-    HANDLE hDevice,
-    IDirect3DDevice9 **ppDevice,
-    WINBOOL fBlock);
-void __RPC_STUB IDirect3DDeviceManager9_LockDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_UnlockDevice_Proxy(
-    IDirect3DDeviceManager9* This,
-    HANDLE hDevice,
-    WINBOOL fSaveState);
-void __RPC_STUB IDirect3DDeviceManager9_UnlockDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirect3DDeviceManager9_GetVideoService_Proxy(
-    IDirect3DDeviceManager9* This,
-    HANDLE hDevice,
-    REFIID riid,
-    void **ppService);
-void __RPC_STUB IDirect3DDeviceManager9_GetVideoService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDirect3DDeviceManager9_INTERFACE_DEFINED__ */
 
@@ -704,23 +658,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDirectXVideoDecoder* This);
+        IDirectXVideoDecoder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDirectXVideoDecoder* This);
+        IDirectXVideoDecoder *This);
 
     /*** IDirectXVideoDecoder methods ***/
     HRESULT (STDMETHODCALLTYPE *GetVideoDecoderService)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         IDirectXVideoDecoderService **ppService);
 
     HRESULT (STDMETHODCALLTYPE *GetCreationParameters)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         GUID *pDeviceGuid,
         DXVA2_VideoDesc *pVideoDesc,
         DXVA2_ConfigPictureDecode *pConfig,
@@ -728,30 +682,31 @@
         UINT *pNumSurfaces);
 
     HRESULT (STDMETHODCALLTYPE *GetBuffer)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         UINT BufferType,
         void **ppBuffer,
         UINT *pBufferSize);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         UINT BufferType);
 
     HRESULT (STDMETHODCALLTYPE *BeginFrame)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         IDirect3DSurface9 *pRenderTarget,
         void *pvPVPData);
 
     HRESULT (STDMETHODCALLTYPE *EndFrame)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         HANDLE *pHandleComplete);
 
     HRESULT (STDMETHODCALLTYPE *Execute)(
-        IDirectXVideoDecoder* This,
+        IDirectXVideoDecoder *This,
         const DXVA2_DecodeExecuteParams *pExecuteParams);
 
     END_INTERFACE
 } IDirectXVideoDecoderVtbl;
+
 interface IDirectXVideoDecoder {
     CONST_VTBL IDirectXVideoDecoderVtbl* lpVtbl;
 };
@@ -808,69 +763,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_GetVideoDecoderService_Proxy(
-    IDirectXVideoDecoder* This,
-    IDirectXVideoDecoderService **ppService);
-void __RPC_STUB IDirectXVideoDecoder_GetVideoDecoderService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_GetCreationParameters_Proxy(
-    IDirectXVideoDecoder* This,
-    GUID *pDeviceGuid,
-    DXVA2_VideoDesc *pVideoDesc,
-    DXVA2_ConfigPictureDecode *pConfig,
-    IDirect3DSurface9 ***pDecoderRenderTargets,
-    UINT *pNumSurfaces);
-void __RPC_STUB IDirectXVideoDecoder_GetCreationParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_GetBuffer_Proxy(
-    IDirectXVideoDecoder* This,
-    UINT BufferType,
-    void **ppBuffer,
-    UINT *pBufferSize);
-void __RPC_STUB IDirectXVideoDecoder_GetBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_ReleaseBuffer_Proxy(
-    IDirectXVideoDecoder* This,
-    UINT BufferType);
-void __RPC_STUB IDirectXVideoDecoder_ReleaseBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_BeginFrame_Proxy(
-    IDirectXVideoDecoder* This,
-    IDirect3DSurface9 *pRenderTarget,
-    void *pvPVPData);
-void __RPC_STUB IDirectXVideoDecoder_BeginFrame_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_EndFrame_Proxy(
-    IDirectXVideoDecoder* This,
-    HANDLE *pHandleComplete);
-void __RPC_STUB IDirectXVideoDecoder_EndFrame_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoder_Execute_Proxy(
-    IDirectXVideoDecoder* This,
-    const DXVA2_DecodeExecuteParams *pExecuteParams);
-void __RPC_STUB IDirectXVideoDecoder_Execute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDirectXVideoDecoder_INTERFACE_DEFINED__ */
 
@@ -906,19 +798,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDirectXVideoAccelerationService* This,
+        IDirectXVideoAccelerationService *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDirectXVideoAccelerationService* This);
+        IDirectXVideoAccelerationService *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDirectXVideoAccelerationService* This);
+        IDirectXVideoAccelerationService *This);
 
     /*** IDirectXVideoAccelerationService methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateSurface)(
-        IDirectXVideoAccelerationService* This,
+        IDirectXVideoAccelerationService *This,
         UINT Width,
         UINT Height,
         UINT BackBuffers,
@@ -931,6 +823,7 @@
 
     END_INTERFACE
 } IDirectXVideoAccelerationServiceVtbl;
+
 interface IDirectXVideoAccelerationService {
     CONST_VTBL IDirectXVideoAccelerationServiceVtbl* lpVtbl;
 };
@@ -963,22 +856,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDirectXVideoAccelerationService_CreateSurface_Proxy(
-    IDirectXVideoAccelerationService* This,
-    UINT Width,
-    UINT Height,
-    UINT BackBuffers,
-    D3DFORMAT Format,
-    D3DPOOL Pool,
-    DWORD Usage,
-    DWORD DxvaType,
-    IDirect3DSurface9 **ppSurface,
-    HANDLE *pSharedHandle);
-void __RPC_STUB IDirectXVideoAccelerationService_CreateSurface_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDirectXVideoAccelerationService_INTERFACE_DEFINED__ */
 
@@ -1027,19 +904,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDirectXVideoDecoderService* This,
+        IDirectXVideoDecoderService *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDirectXVideoDecoderService* This);
+        IDirectXVideoDecoderService *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDirectXVideoDecoderService* This);
+        IDirectXVideoDecoderService *This);
 
     /*** IDirectXVideoAccelerationService methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateSurface)(
-        IDirectXVideoDecoderService* This,
+        IDirectXVideoDecoderService *This,
         UINT Width,
         UINT Height,
         UINT BackBuffers,
@@ -1052,18 +929,18 @@
 
     /*** IDirectXVideoDecoderService methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDecoderDeviceGuids)(
-        IDirectXVideoDecoderService* This,
+        IDirectXVideoDecoderService *This,
         UINT *pCount,
         GUID **pGuids);
 
     HRESULT (STDMETHODCALLTYPE *GetDecoderRenderTargets)(
-        IDirectXVideoDecoderService* This,
+        IDirectXVideoDecoderService *This,
         REFGUID Guid,
         UINT *pCount,
         D3DFORMAT **pFormats);
 
     HRESULT (STDMETHODCALLTYPE *GetDecoderConfigurations)(
-        IDirectXVideoDecoderService* This,
+        IDirectXVideoDecoderService *This,
         REFGUID Guid,
         const DXVA2_VideoDesc *pVideoDesc,
         void *pReserved,
@@ -1071,7 +948,7 @@
         DXVA2_ConfigPictureDecode **ppConfigs);
 
     HRESULT (STDMETHODCALLTYPE *CreateVideoDecoder)(
-        IDirectXVideoDecoderService* This,
+        IDirectXVideoDecoderService *This,
         REFGUID Guid,
         const DXVA2_VideoDesc *pVideoDesc,
         const DXVA2_ConfigPictureDecode *pConfig,
@@ -1081,6 +958,7 @@
 
     END_INTERFACE
 } IDirectXVideoDecoderServiceVtbl;
+
 interface IDirectXVideoDecoderService {
     CONST_VTBL IDirectXVideoDecoderServiceVtbl* lpVtbl;
 };
@@ -1131,50 +1009,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_GetDecoderDeviceGuids_Proxy(
-    IDirectXVideoDecoderService* This,
-    UINT *pCount,
-    GUID **pGuids);
-void __RPC_STUB IDirectXVideoDecoderService_GetDecoderDeviceGuids_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_GetDecoderRenderTargets_Proxy(
-    IDirectXVideoDecoderService* This,
-    REFGUID Guid,
-    UINT *pCount,
-    D3DFORMAT **pFormats);
-void __RPC_STUB IDirectXVideoDecoderService_GetDecoderRenderTargets_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_GetDecoderConfigurations_Proxy(
-    IDirectXVideoDecoderService* This,
-    REFGUID Guid,
-    const DXVA2_VideoDesc *pVideoDesc,
-    void *pReserved,
-    UINT *pCount,
-    DXVA2_ConfigPictureDecode **ppConfigs);
-void __RPC_STUB IDirectXVideoDecoderService_GetDecoderConfigurations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDirectXVideoDecoderService_CreateVideoDecoder_Proxy(
-    IDirectXVideoDecoderService* This,
-    REFGUID Guid,
-    const DXVA2_VideoDesc *pVideoDesc,
-    const DXVA2_ConfigPictureDecode *pConfig,
-    IDirect3DSurface9 **ppDecoderRenderTargets,
-    UINT NumRenderTargets,
-    IDirectXVideoDecoder **ppDecode);
-void __RPC_STUB IDirectXVideoDecoderService_CreateVideoDecoder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDirectXVideoDecoderService_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/endpointvolume.h b/mingw-w64-headers/include/endpointvolume.h
index 59c1c11..18557af 100644
--- a/mingw-w64-headers/include/endpointvolume.h
+++ b/mingw-w64-headers/include/endpointvolume.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/endpointvolume.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/endpointvolume.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/evr.h b/mingw-w64-headers/include/evr.h
index cf8d4fc..391251e 100644
--- a/mingw-w64-headers/include/evr.h
+++ b/mingw-w64-headers/include/evr.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.1 from include/evr.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/evr.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/exdisp.h b/mingw-w64-headers/include/exdisp.h
index 3189953..3087080 100644
--- a/mingw-w64-headers/include/exdisp.h
+++ b/mingw-w64-headers/include/exdisp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/exdisp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/exdisp.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,26 +20,41 @@
 #ifndef __IWebBrowser_FWD_DEFINED__
 #define __IWebBrowser_FWD_DEFINED__
 typedef interface IWebBrowser IWebBrowser;
+#ifdef __cplusplus
+interface IWebBrowser;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __DWebBrowserEvents_FWD_DEFINED__
 #define __DWebBrowserEvents_FWD_DEFINED__
 typedef interface DWebBrowserEvents DWebBrowserEvents;
+#ifdef __cplusplus
+interface DWebBrowserEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWebBrowserApp_FWD_DEFINED__
 #define __IWebBrowserApp_FWD_DEFINED__
 typedef interface IWebBrowserApp IWebBrowserApp;
+#ifdef __cplusplus
+interface IWebBrowserApp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWebBrowser2_FWD_DEFINED__
 #define __IWebBrowser2_FWD_DEFINED__
 typedef interface IWebBrowser2 IWebBrowser2;
+#ifdef __cplusplus
+interface IWebBrowser2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __DWebBrowserEvents2_FWD_DEFINED__
 #define __DWebBrowserEvents2_FWD_DEFINED__
 typedef interface DWebBrowserEvents2 DWebBrowserEvents2;
+#ifdef __cplusplus
+interface DWebBrowserEvents2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __WebBrowser_V1_FWD_DEFINED__
@@ -81,11 +96,17 @@
 #ifndef __DShellWindowsEvents_FWD_DEFINED__
 #define __DShellWindowsEvents_FWD_DEFINED__
 typedef interface DShellWindowsEvents DShellWindowsEvents;
+#ifdef __cplusplus
+interface DShellWindowsEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellWindows_FWD_DEFINED__
 #define __IShellWindows_FWD_DEFINED__
 typedef interface IShellWindows IShellWindows;
+#ifdef __cplusplus
+interface IShellWindows;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellWindows_FWD_DEFINED__
@@ -100,11 +121,17 @@
 #ifndef __IShellUIHelper_FWD_DEFINED__
 #define __IShellUIHelper_FWD_DEFINED__
 typedef interface IShellUIHelper IShellUIHelper;
+#ifdef __cplusplus
+interface IShellUIHelper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellUIHelper2_FWD_DEFINED__
 #define __IShellUIHelper2_FWD_DEFINED__
 typedef interface IShellUIHelper2 IShellUIHelper2;
+#ifdef __cplusplus
+interface IShellUIHelper2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellUIHelper_FWD_DEFINED__
@@ -119,16 +146,25 @@
 #ifndef __DShellNameSpaceEvents_FWD_DEFINED__
 #define __DShellNameSpaceEvents_FWD_DEFINED__
 typedef interface DShellNameSpaceEvents DShellNameSpaceEvents;
+#ifdef __cplusplus
+interface DShellNameSpaceEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellFavoritesNameSpace_FWD_DEFINED__
 #define __IShellFavoritesNameSpace_FWD_DEFINED__
 typedef interface IShellFavoritesNameSpace IShellFavoritesNameSpace;
+#ifdef __cplusplus
+interface IShellFavoritesNameSpace;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellNameSpace_FWD_DEFINED__
 #define __IShellNameSpace_FWD_DEFINED__
 typedef interface IShellNameSpace IShellNameSpace;
+#ifdef __cplusplus
+interface IShellNameSpace;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellShellNameSpace_FWD_DEFINED__
@@ -152,6 +188,9 @@
 #ifndef __IScriptErrorList_FWD_DEFINED__
 #define __IScriptErrorList_FWD_DEFINED__
 typedef interface IScriptErrorList IScriptErrorList;
+#ifdef __cplusplus
+interface IScriptErrorList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __CScriptErrorList_FWD_DEFINED__
@@ -166,31 +205,49 @@
 #ifndef __ISearch_FWD_DEFINED__
 #define __ISearch_FWD_DEFINED__
 typedef interface ISearch ISearch;
+#ifdef __cplusplus
+interface ISearch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISearches_FWD_DEFINED__
 #define __ISearches_FWD_DEFINED__
 typedef interface ISearches ISearches;
+#ifdef __cplusplus
+interface ISearches;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISearchAssistantOC_FWD_DEFINED__
 #define __ISearchAssistantOC_FWD_DEFINED__
 typedef interface ISearchAssistantOC ISearchAssistantOC;
+#ifdef __cplusplus
+interface ISearchAssistantOC;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISearchAssistantOC2_FWD_DEFINED__
 #define __ISearchAssistantOC2_FWD_DEFINED__
 typedef interface ISearchAssistantOC2 ISearchAssistantOC2;
+#ifdef __cplusplus
+interface ISearchAssistantOC2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISearchAssistantOC3_FWD_DEFINED__
 #define __ISearchAssistantOC3_FWD_DEFINED__
 typedef interface ISearchAssistantOC3 ISearchAssistantOC3;
+#ifdef __cplusplus
+interface ISearchAssistantOC3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___SearchAssistantEvents_FWD_DEFINED__
 #define ___SearchAssistantEvents_FWD_DEFINED__
 typedef interface _SearchAssistantEvents _SearchAssistantEvents;
+#ifdef __cplusplus
+interface _SearchAssistantEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellSearchAssistantOC_FWD_DEFINED__
@@ -341,29 +398,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -371,7 +428,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -383,19 +440,19 @@
 
     /*** IWebBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *GoBack)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *GoForward)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *GoHome)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *GoSearch)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *Navigate)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         BSTR URL,
         VARIANT *Flags,
         VARIANT *TargetFrameName,
@@ -403,85 +460,86 @@
         VARIANT *Headers);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh2)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         VARIANT *Level);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IWebBrowser* This);
+        IWebBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Container)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Document)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_TopLevelContainer)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         BSTR *Type);
 
     HRESULT (STDMETHODCALLTYPE *get_Left)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Left)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG Left);
 
     HRESULT (STDMETHODCALLTYPE *get_Top)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Top)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG Top);
 
     HRESULT (STDMETHODCALLTYPE *get_Width)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Width)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG Width);
 
     HRESULT (STDMETHODCALLTYPE *get_Height)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Height)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         LONG Height);
 
     HRESULT (STDMETHODCALLTYPE *get_LocationName)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         BSTR *LocationName);
 
     HRESULT (STDMETHODCALLTYPE *get_LocationURL)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         BSTR *LocationURL);
 
     HRESULT (STDMETHODCALLTYPE *get_Busy)(
-        IWebBrowser* This,
+        IWebBrowser *This,
         VARIANT_BOOL *pBool);
 
     END_INTERFACE
 } IWebBrowserVtbl;
+
 interface IWebBrowser {
     CONST_VTBL IWebBrowserVtbl* lpVtbl;
 };
@@ -628,204 +686,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWebBrowser_GoBack_Proxy(
-    IWebBrowser* This);
-void __RPC_STUB IWebBrowser_GoBack_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_GoForward_Proxy(
-    IWebBrowser* This);
-void __RPC_STUB IWebBrowser_GoForward_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_GoHome_Proxy(
-    IWebBrowser* This);
-void __RPC_STUB IWebBrowser_GoHome_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_GoSearch_Proxy(
-    IWebBrowser* This);
-void __RPC_STUB IWebBrowser_GoSearch_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_Navigate_Proxy(
-    IWebBrowser* This,
-    BSTR URL,
-    VARIANT *Flags,
-    VARIANT *TargetFrameName,
-    VARIANT *PostData,
-    VARIANT *Headers);
-void __RPC_STUB IWebBrowser_Navigate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_Refresh_Proxy(
-    IWebBrowser* This);
-void __RPC_STUB IWebBrowser_Refresh_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_Refresh2_Proxy(
-    IWebBrowser* This,
-    VARIANT *Level);
-void __RPC_STUB IWebBrowser_Refresh2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_Stop_Proxy(
-    IWebBrowser* This);
-void __RPC_STUB IWebBrowser_Stop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Application_Proxy(
-    IWebBrowser* This,
-    IDispatch **ppDisp);
-void __RPC_STUB IWebBrowser_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Parent_Proxy(
-    IWebBrowser* This,
-    IDispatch **ppDisp);
-void __RPC_STUB IWebBrowser_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Container_Proxy(
-    IWebBrowser* This,
-    IDispatch **ppDisp);
-void __RPC_STUB IWebBrowser_get_Container_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Document_Proxy(
-    IWebBrowser* This,
-    IDispatch **ppDisp);
-void __RPC_STUB IWebBrowser_get_Document_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_TopLevelContainer_Proxy(
-    IWebBrowser* This,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IWebBrowser_get_TopLevelContainer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Type_Proxy(
-    IWebBrowser* This,
-    BSTR *Type);
-void __RPC_STUB IWebBrowser_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Left_Proxy(
-    IWebBrowser* This,
-    LONG *pl);
-void __RPC_STUB IWebBrowser_get_Left_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_put_Left_Proxy(
-    IWebBrowser* This,
-    LONG Left);
-void __RPC_STUB IWebBrowser_put_Left_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Top_Proxy(
-    IWebBrowser* This,
-    LONG *pl);
-void __RPC_STUB IWebBrowser_get_Top_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_put_Top_Proxy(
-    IWebBrowser* This,
-    LONG Top);
-void __RPC_STUB IWebBrowser_put_Top_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Width_Proxy(
-    IWebBrowser* This,
-    LONG *pl);
-void __RPC_STUB IWebBrowser_get_Width_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_put_Width_Proxy(
-    IWebBrowser* This,
-    LONG Width);
-void __RPC_STUB IWebBrowser_put_Width_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Height_Proxy(
-    IWebBrowser* This,
-    LONG *pl);
-void __RPC_STUB IWebBrowser_get_Height_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_put_Height_Proxy(
-    IWebBrowser* This,
-    LONG Height);
-void __RPC_STUB IWebBrowser_put_Height_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_LocationName_Proxy(
-    IWebBrowser* This,
-    BSTR *LocationName);
-void __RPC_STUB IWebBrowser_get_LocationName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_LocationURL_Proxy(
-    IWebBrowser* This,
-    BSTR *LocationURL);
-void __RPC_STUB IWebBrowser_get_LocationURL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser_get_Busy_Proxy(
-    IWebBrowser* This,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IWebBrowser_get_Busy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWebBrowser_INTERFACE_DEFINED__ */
 
@@ -850,29 +710,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        DWebBrowserEvents* This,
+        DWebBrowserEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        DWebBrowserEvents* This);
+        DWebBrowserEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        DWebBrowserEvents* This);
+        DWebBrowserEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        DWebBrowserEvents* This,
+        DWebBrowserEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        DWebBrowserEvents* This,
+        DWebBrowserEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        DWebBrowserEvents* This,
+        DWebBrowserEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -880,7 +740,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        DWebBrowserEvents* This,
+        DWebBrowserEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -892,6 +752,7 @@
 
     END_INTERFACE
 } DWebBrowserEventsVtbl;
+
 interface DWebBrowserEvents {
     CONST_VTBL DWebBrowserEventsVtbl* lpVtbl;
 };
@@ -1027,29 +888,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1057,7 +918,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1069,19 +930,19 @@
 
     /*** IWebBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *GoBack)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     HRESULT (STDMETHODCALLTYPE *GoForward)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     HRESULT (STDMETHODCALLTYPE *GoHome)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     HRESULT (STDMETHODCALLTYPE *GoSearch)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     HRESULT (STDMETHODCALLTYPE *Navigate)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR URL,
         VARIANT *Flags,
         VARIANT *TargetFrameName,
@@ -1089,168 +950,169 @@
         VARIANT *Headers);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh2)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT *Level);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Container)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Document)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_TopLevelContainer)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR *Type);
 
     HRESULT (STDMETHODCALLTYPE *get_Left)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Left)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG Left);
 
     HRESULT (STDMETHODCALLTYPE *get_Top)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Top)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG Top);
 
     HRESULT (STDMETHODCALLTYPE *get_Width)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Width)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG Width);
 
     HRESULT (STDMETHODCALLTYPE *get_Height)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Height)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         LONG Height);
 
     HRESULT (STDMETHODCALLTYPE *get_LocationName)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR *LocationName);
 
     HRESULT (STDMETHODCALLTYPE *get_LocationURL)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR *LocationURL);
 
     HRESULT (STDMETHODCALLTYPE *get_Busy)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL *pBool);
 
     /*** IWebBrowserApp methods ***/
     HRESULT (STDMETHODCALLTYPE *Quit)(
-        IWebBrowserApp* This);
+        IWebBrowserApp *This);
 
     HRESULT (STDMETHODCALLTYPE *ClientToWindow)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         int *pcx,
         int *pcy);
 
     HRESULT (STDMETHODCALLTYPE *PutProperty)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR Property,
         VARIANT vtValue);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR Property,
         VARIANT *pvtValue);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_HWND)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         SHANDLE_PTR *pHWND);
 
     HRESULT (STDMETHODCALLTYPE *get_FullName)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR *FullName);
 
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR *Path);
 
     HRESULT (STDMETHODCALLTYPE *get_Visible)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *put_Visible)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *get_StatusBar)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *put_StatusBar)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *get_StatusText)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR *StatusText);
 
     HRESULT (STDMETHODCALLTYPE *put_StatusText)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         BSTR StatusText);
 
     HRESULT (STDMETHODCALLTYPE *get_ToolBar)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         int *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_ToolBar)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         int Value);
 
     HRESULT (STDMETHODCALLTYPE *get_MenuBar)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_MenuBar)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *get_FullScreen)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL *pbFullScreen);
 
     HRESULT (STDMETHODCALLTYPE *put_FullScreen)(
-        IWebBrowserApp* This,
+        IWebBrowserApp *This,
         VARIANT_BOOL bFullScreen);
 
     END_INTERFACE
 } IWebBrowserAppVtbl;
+
 interface IWebBrowserApp {
     CONST_VTBL IWebBrowserAppVtbl* lpVtbl;
 };
@@ -1479,168 +1341,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_Quit_Proxy(
-    IWebBrowserApp* This);
-void __RPC_STUB IWebBrowserApp_Quit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_ClientToWindow_Proxy(
-    IWebBrowserApp* This,
-    int *pcx,
-    int *pcy);
-void __RPC_STUB IWebBrowserApp_ClientToWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_PutProperty_Proxy(
-    IWebBrowserApp* This,
-    BSTR Property,
-    VARIANT vtValue);
-void __RPC_STUB IWebBrowserApp_PutProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_GetProperty_Proxy(
-    IWebBrowserApp* This,
-    BSTR Property,
-    VARIANT *pvtValue);
-void __RPC_STUB IWebBrowserApp_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_Name_Proxy(
-    IWebBrowserApp* This,
-    BSTR *Name);
-void __RPC_STUB IWebBrowserApp_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_HWND_Proxy(
-    IWebBrowserApp* This,
-    SHANDLE_PTR *pHWND);
-void __RPC_STUB IWebBrowserApp_get_HWND_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_FullName_Proxy(
-    IWebBrowserApp* This,
-    BSTR *FullName);
-void __RPC_STUB IWebBrowserApp_get_FullName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_Path_Proxy(
-    IWebBrowserApp* This,
-    BSTR *Path);
-void __RPC_STUB IWebBrowserApp_get_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_Visible_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IWebBrowserApp_get_Visible_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_Visible_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL Value);
-void __RPC_STUB IWebBrowserApp_put_Visible_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_StatusBar_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IWebBrowserApp_get_StatusBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_StatusBar_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL Value);
-void __RPC_STUB IWebBrowserApp_put_StatusBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_StatusText_Proxy(
-    IWebBrowserApp* This,
-    BSTR *StatusText);
-void __RPC_STUB IWebBrowserApp_get_StatusText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_StatusText_Proxy(
-    IWebBrowserApp* This,
-    BSTR StatusText);
-void __RPC_STUB IWebBrowserApp_put_StatusText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_ToolBar_Proxy(
-    IWebBrowserApp* This,
-    int *Value);
-void __RPC_STUB IWebBrowserApp_get_ToolBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_ToolBar_Proxy(
-    IWebBrowserApp* This,
-    int Value);
-void __RPC_STUB IWebBrowserApp_put_ToolBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_MenuBar_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL *Value);
-void __RPC_STUB IWebBrowserApp_get_MenuBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_MenuBar_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL Value);
-void __RPC_STUB IWebBrowserApp_put_MenuBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_get_FullScreen_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL *pbFullScreen);
-void __RPC_STUB IWebBrowserApp_get_FullScreen_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowserApp_put_FullScreen_Proxy(
-    IWebBrowserApp* This,
-    VARIANT_BOOL bFullScreen);
-void __RPC_STUB IWebBrowserApp_put_FullScreen_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWebBrowserApp_INTERFACE_DEFINED__ */
 
@@ -1732,29 +1432,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1762,7 +1462,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1774,19 +1474,19 @@
 
     /*** IWebBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *GoBack)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GoForward)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GoHome)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GoSearch)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Navigate)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR URL,
         VARIANT *Flags,
         VARIANT *TargetFrameName,
@@ -1794,169 +1494,169 @@
         VARIANT *Headers);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh2)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT *Level);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Container)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_Document)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_TopLevelContainer)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR *Type);
 
     HRESULT (STDMETHODCALLTYPE *get_Left)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Left)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG Left);
 
     HRESULT (STDMETHODCALLTYPE *get_Top)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Top)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG Top);
 
     HRESULT (STDMETHODCALLTYPE *get_Width)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Width)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG Width);
 
     HRESULT (STDMETHODCALLTYPE *get_Height)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG *pl);
 
     HRESULT (STDMETHODCALLTYPE *put_Height)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         LONG Height);
 
     HRESULT (STDMETHODCALLTYPE *get_LocationName)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR *LocationName);
 
     HRESULT (STDMETHODCALLTYPE *get_LocationURL)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR *LocationURL);
 
     HRESULT (STDMETHODCALLTYPE *get_Busy)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pBool);
 
     /*** IWebBrowserApp methods ***/
     HRESULT (STDMETHODCALLTYPE *Quit)(
-        IWebBrowser2* This);
+        IWebBrowser2 *This);
 
     HRESULT (STDMETHODCALLTYPE *ClientToWindow)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         int *pcx,
         int *pcy);
 
     HRESULT (STDMETHODCALLTYPE *PutProperty)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR Property,
         VARIANT vtValue);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR Property,
         VARIANT *pvtValue);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_HWND)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         SHANDLE_PTR *pHWND);
 
     HRESULT (STDMETHODCALLTYPE *get_FullName)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR *FullName);
 
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR *Path);
 
     HRESULT (STDMETHODCALLTYPE *get_Visible)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *put_Visible)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *get_StatusBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *put_StatusBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *get_StatusText)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR *StatusText);
 
     HRESULT (STDMETHODCALLTYPE *put_StatusText)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         BSTR StatusText);
 
     HRESULT (STDMETHODCALLTYPE *get_ToolBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         int *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_ToolBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         int Value);
 
     HRESULT (STDMETHODCALLTYPE *get_MenuBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_MenuBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *get_FullScreen)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pbFullScreen);
 
     HRESULT (STDMETHODCALLTYPE *put_FullScreen)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL bFullScreen);
 
     /*** IWebBrowser2 methods ***/
     HRESULT (STDMETHODCALLTYPE *Navigate2)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT *URL,
         VARIANT *Flags,
         VARIANT *TargetFrameName,
@@ -1964,85 +1664,86 @@
         VARIANT *Headers);
 
     HRESULT (STDMETHODCALLTYPE *QueryStatusWB)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         OLECMDID cmdID,
         OLECMDF *pcmdf);
 
     HRESULT (STDMETHODCALLTYPE *ExecWB)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         OLECMDID cmdID,
         OLECMDEXECOPT cmdexecopt,
         VARIANT *pvaIn,
         VARIANT *pvaOut);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT *pvaClsid,
         VARIANT *pvarShow,
         VARIANT *pvarSize);
 
     HRESULT (STDMETHODCALLTYPE *get_ReadyState)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         READYSTATE *plReadyState);
 
     HRESULT (STDMETHODCALLTYPE *get_Offline)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pbOffline);
 
     HRESULT (STDMETHODCALLTYPE *put_Offline)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL bOffline);
 
     HRESULT (STDMETHODCALLTYPE *get_Silent)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pbSilent);
 
     HRESULT (STDMETHODCALLTYPE *put_Silent)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL bSilent);
 
     HRESULT (STDMETHODCALLTYPE *get_RegisterAsBrowser)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pbRegister);
 
     HRESULT (STDMETHODCALLTYPE *put_RegisterAsBrowser)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL bRegister);
 
     HRESULT (STDMETHODCALLTYPE *get_RegisterAsDropTarget)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pbRegister);
 
     HRESULT (STDMETHODCALLTYPE *put_RegisterAsDropTarget)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL bRegister);
 
     HRESULT (STDMETHODCALLTYPE *get_TheaterMode)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *pbRegister);
 
     HRESULT (STDMETHODCALLTYPE *put_TheaterMode)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL bRegister);
 
     HRESULT (STDMETHODCALLTYPE *get_AddressBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_AddressBar)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *get_Resizable)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_Resizable)(
-        IWebBrowser2* This,
+        IWebBrowser2 *This,
         VARIANT_BOOL Value);
 
     END_INTERFACE
 } IWebBrowser2Vtbl;
+
 interface IWebBrowser2 {
     CONST_VTBL IWebBrowser2Vtbl* lpVtbl;
 };
@@ -2349,168 +2050,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWebBrowser2_Navigate2_Proxy(
-    IWebBrowser2* This,
-    VARIANT *URL,
-    VARIANT *Flags,
-    VARIANT *TargetFrameName,
-    VARIANT *PostData,
-    VARIANT *Headers);
-void __RPC_STUB IWebBrowser2_Navigate2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_QueryStatusWB_Proxy(
-    IWebBrowser2* This,
-    OLECMDID cmdID,
-    OLECMDF *pcmdf);
-void __RPC_STUB IWebBrowser2_QueryStatusWB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_ExecWB_Proxy(
-    IWebBrowser2* This,
-    OLECMDID cmdID,
-    OLECMDEXECOPT cmdexecopt,
-    VARIANT *pvaIn,
-    VARIANT *pvaOut);
-void __RPC_STUB IWebBrowser2_ExecWB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_ShowBrowserBar_Proxy(
-    IWebBrowser2* This,
-    VARIANT *pvaClsid,
-    VARIANT *pvarShow,
-    VARIANT *pvarSize);
-void __RPC_STUB IWebBrowser2_ShowBrowserBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_ReadyState_Proxy(
-    IWebBrowser2* This,
-    READYSTATE *plReadyState);
-void __RPC_STUB IWebBrowser2_get_ReadyState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_Offline_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL *pbOffline);
-void __RPC_STUB IWebBrowser2_get_Offline_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_put_Offline_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL bOffline);
-void __RPC_STUB IWebBrowser2_put_Offline_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_Silent_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL *pbSilent);
-void __RPC_STUB IWebBrowser2_get_Silent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_put_Silent_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL bSilent);
-void __RPC_STUB IWebBrowser2_put_Silent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_RegisterAsBrowser_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL *pbRegister);
-void __RPC_STUB IWebBrowser2_get_RegisterAsBrowser_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_put_RegisterAsBrowser_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL bRegister);
-void __RPC_STUB IWebBrowser2_put_RegisterAsBrowser_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_RegisterAsDropTarget_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL *pbRegister);
-void __RPC_STUB IWebBrowser2_get_RegisterAsDropTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_put_RegisterAsDropTarget_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL bRegister);
-void __RPC_STUB IWebBrowser2_put_RegisterAsDropTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_TheaterMode_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL *pbRegister);
-void __RPC_STUB IWebBrowser2_get_TheaterMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_put_TheaterMode_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL bRegister);
-void __RPC_STUB IWebBrowser2_put_TheaterMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_AddressBar_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL *Value);
-void __RPC_STUB IWebBrowser2_get_AddressBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_put_AddressBar_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL Value);
-void __RPC_STUB IWebBrowser2_put_AddressBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_get_Resizable_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL *Value);
-void __RPC_STUB IWebBrowser2_get_Resizable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebBrowser2_put_Resizable_Proxy(
-    IWebBrowser2* This,
-    VARIANT_BOOL Value);
-void __RPC_STUB IWebBrowser2_put_Resizable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWebBrowser2_INTERFACE_DEFINED__ */
 
@@ -2544,29 +2083,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        DWebBrowserEvents2* This,
+        DWebBrowserEvents2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        DWebBrowserEvents2* This);
+        DWebBrowserEvents2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        DWebBrowserEvents2* This);
+        DWebBrowserEvents2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        DWebBrowserEvents2* This,
+        DWebBrowserEvents2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        DWebBrowserEvents2* This,
+        DWebBrowserEvents2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        DWebBrowserEvents2* This,
+        DWebBrowserEvents2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2574,7 +2113,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        DWebBrowserEvents2* This,
+        DWebBrowserEvents2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2586,6 +2125,7 @@
 
     END_INTERFACE
 } DWebBrowserEvents2Vtbl;
+
 interface DWebBrowserEvents2 {
     CONST_VTBL DWebBrowserEvents2Vtbl* lpVtbl;
 };
@@ -2717,29 +2257,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        DShellWindowsEvents* This,
+        DShellWindowsEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        DShellWindowsEvents* This);
+        DShellWindowsEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        DShellWindowsEvents* This);
+        DShellWindowsEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        DShellWindowsEvents* This,
+        DShellWindowsEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        DShellWindowsEvents* This,
+        DShellWindowsEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        DShellWindowsEvents* This,
+        DShellWindowsEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2747,7 +2287,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        DShellWindowsEvents* This,
+        DShellWindowsEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2759,6 +2299,7 @@
 
     END_INTERFACE
 } DShellWindowsEventsVtbl;
+
 interface DShellWindowsEvents {
     CONST_VTBL DShellWindowsEventsVtbl* lpVtbl;
 };
@@ -2875,29 +2416,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellWindows* This,
+        IShellWindows *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellWindows* This);
+        IShellWindows *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellWindows* This);
+        IShellWindows *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellWindows* This,
+        IShellWindows *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellWindows* This,
+        IShellWindows *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellWindows* This,
+        IShellWindows *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2905,7 +2446,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellWindows* This,
+        IShellWindows *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2917,27 +2458,27 @@
 
     /*** IShellWindows methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IShellWindows* This,
+        IShellWindows *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IShellWindows* This,
+        IShellWindows *This,
         VARIANT index,
         IDispatch **Folder);
 
     HRESULT (STDMETHODCALLTYPE *_NewEnum)(
-        IShellWindows* This,
+        IShellWindows *This,
         IUnknown **ppunk);
 
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IShellWindows* This,
+        IShellWindows *This,
         IDispatch *pid,
         LONG hWnd,
         int swClass,
         LONG *plCookie);
 
     HRESULT (STDMETHODCALLTYPE *RegisterPending)(
-        IShellWindows* This,
+        IShellWindows *This,
         LONG lThreadId,
         VARIANT *pvarloc,
         VARIANT *pvarlocRoot,
@@ -2945,21 +2486,21 @@
         LONG *plCookie);
 
     HRESULT (STDMETHODCALLTYPE *Revoke)(
-        IShellWindows* This,
+        IShellWindows *This,
         LONG lCookie);
 
     HRESULT (STDMETHODCALLTYPE *OnNavigate)(
-        IShellWindows* This,
+        IShellWindows *This,
         LONG lCookie,
         VARIANT *pvarLoc);
 
     HRESULT (STDMETHODCALLTYPE *OnActivated)(
-        IShellWindows* This,
+        IShellWindows *This,
         LONG lCookie,
         VARIANT_BOOL fActive);
 
     HRESULT (STDMETHODCALLTYPE *FindWindowSW)(
-        IShellWindows* This,
+        IShellWindows *This,
         VARIANT *pvarLoc,
         VARIANT *pvarLocRoot,
         int swClass,
@@ -2968,16 +2509,17 @@
         IDispatch **ppdispOut);
 
     HRESULT (STDMETHODCALLTYPE *OnCreated)(
-        IShellWindows* This,
+        IShellWindows *This,
         LONG lCookie,
         IUnknown *punk);
 
     HRESULT (STDMETHODCALLTYPE *ProcessAttachDetach)(
-        IShellWindows* This,
+        IShellWindows *This,
         VARIANT_BOOL fAttach);
 
     END_INTERFACE
 } IShellWindowsVtbl;
+
 interface IShellWindows {
     CONST_VTBL IShellWindowsVtbl* lpVtbl;
 };
@@ -3068,110 +2610,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellWindows_get_Count_Proxy(
-    IShellWindows* This,
-    LONG *Count);
-void __RPC_STUB IShellWindows_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_Item_Proxy(
-    IShellWindows* This,
-    VARIANT index,
-    IDispatch **Folder);
-void __RPC_STUB IShellWindows_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows__NewEnum_Proxy(
-    IShellWindows* This,
-    IUnknown **ppunk);
-void __RPC_STUB IShellWindows__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_Register_Proxy(
-    IShellWindows* This,
-    IDispatch *pid,
-    LONG hWnd,
-    int swClass,
-    LONG *plCookie);
-void __RPC_STUB IShellWindows_Register_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_RegisterPending_Proxy(
-    IShellWindows* This,
-    LONG lThreadId,
-    VARIANT *pvarloc,
-    VARIANT *pvarlocRoot,
-    int swClass,
-    LONG *plCookie);
-void __RPC_STUB IShellWindows_RegisterPending_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_Revoke_Proxy(
-    IShellWindows* This,
-    LONG lCookie);
-void __RPC_STUB IShellWindows_Revoke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_OnNavigate_Proxy(
-    IShellWindows* This,
-    LONG lCookie,
-    VARIANT *pvarLoc);
-void __RPC_STUB IShellWindows_OnNavigate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_OnActivated_Proxy(
-    IShellWindows* This,
-    LONG lCookie,
-    VARIANT_BOOL fActive);
-void __RPC_STUB IShellWindows_OnActivated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_FindWindowSW_Proxy(
-    IShellWindows* This,
-    VARIANT *pvarLoc,
-    VARIANT *pvarLocRoot,
-    int swClass,
-    LONG *phwnd,
-    int swfwOptions,
-    IDispatch **ppdispOut);
-void __RPC_STUB IShellWindows_FindWindowSW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_OnCreated_Proxy(
-    IShellWindows* This,
-    LONG lCookie,
-    IUnknown *punk);
-void __RPC_STUB IShellWindows_OnCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellWindows_ProcessAttachDetach_Proxy(
-    IShellWindows* This,
-    VARIANT_BOOL fAttach);
-void __RPC_STUB IShellWindows_ProcessAttachDetach_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellWindows_INTERFACE_DEFINED__ */
 
@@ -3262,29 +2700,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellUIHelper* This);
+        IShellUIHelper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellUIHelper* This);
+        IShellUIHelper *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3292,7 +2730,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3304,25 +2742,25 @@
 
     /*** IShellUIHelper methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetFirstBootMode)(
-        IShellUIHelper* This);
+        IShellUIHelper *This);
 
     HRESULT (STDMETHODCALLTYPE *ResetSafeMode)(
-        IShellUIHelper* This);
+        IShellUIHelper *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshOfflineDesktop)(
-        IShellUIHelper* This);
+        IShellUIHelper *This);
 
     HRESULT (STDMETHODCALLTYPE *AddFavorite)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         BSTR URL,
         VARIANT *Title);
 
     HRESULT (STDMETHODCALLTYPE *AddChannel)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         BSTR URL);
 
     HRESULT (STDMETHODCALLTYPE *AddDesktopComponent)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         BSTR URL,
         BSTR Type,
         VARIANT *Left,
@@ -3331,43 +2769,44 @@
         VARIANT *Height);
 
     HRESULT (STDMETHODCALLTYPE *IsSubscribed)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         BSTR URL,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *NavigateAndFind)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         BSTR URL,
         BSTR strQuery,
         VARIANT *varTargetFrame);
 
     HRESULT (STDMETHODCALLTYPE *ImportExportFavorites)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         VARIANT_BOOL fImport,
         BSTR strImpExpPath);
 
     HRESULT (STDMETHODCALLTYPE *AutoCompleteSaveForm)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         VARIANT *Form);
 
     HRESULT (STDMETHODCALLTYPE *AutoScan)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         BSTR strSearch,
         BSTR strFailureUrl,
         VARIANT *pvarTargetFrame);
 
     HRESULT (STDMETHODCALLTYPE *AutoCompleteAttach)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         VARIANT *Reserved);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserUI)(
-        IShellUIHelper* This,
+        IShellUIHelper *This,
         BSTR bstrName,
         VARIANT *pvarIn,
         VARIANT *pvarOut);
 
     END_INTERFACE
 } IShellUIHelperVtbl;
+
 interface IShellUIHelper {
     CONST_VTBL IShellUIHelperVtbl* lpVtbl;
 };
@@ -3466,121 +2905,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellUIHelper_ResetFirstBootMode_Proxy(
-    IShellUIHelper* This);
-void __RPC_STUB IShellUIHelper_ResetFirstBootMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_ResetSafeMode_Proxy(
-    IShellUIHelper* This);
-void __RPC_STUB IShellUIHelper_ResetSafeMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_RefreshOfflineDesktop_Proxy(
-    IShellUIHelper* This);
-void __RPC_STUB IShellUIHelper_RefreshOfflineDesktop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_AddFavorite_Proxy(
-    IShellUIHelper* This,
-    BSTR URL,
-    VARIANT *Title);
-void __RPC_STUB IShellUIHelper_AddFavorite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_AddChannel_Proxy(
-    IShellUIHelper* This,
-    BSTR URL);
-void __RPC_STUB IShellUIHelper_AddChannel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_AddDesktopComponent_Proxy(
-    IShellUIHelper* This,
-    BSTR URL,
-    BSTR Type,
-    VARIANT *Left,
-    VARIANT *Top,
-    VARIANT *Width,
-    VARIANT *Height);
-void __RPC_STUB IShellUIHelper_AddDesktopComponent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_IsSubscribed_Proxy(
-    IShellUIHelper* This,
-    BSTR URL,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IShellUIHelper_IsSubscribed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_NavigateAndFind_Proxy(
-    IShellUIHelper* This,
-    BSTR URL,
-    BSTR strQuery,
-    VARIANT *varTargetFrame);
-void __RPC_STUB IShellUIHelper_NavigateAndFind_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_ImportExportFavorites_Proxy(
-    IShellUIHelper* This,
-    VARIANT_BOOL fImport,
-    BSTR strImpExpPath);
-void __RPC_STUB IShellUIHelper_ImportExportFavorites_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_AutoCompleteSaveForm_Proxy(
-    IShellUIHelper* This,
-    VARIANT *Form);
-void __RPC_STUB IShellUIHelper_AutoCompleteSaveForm_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_AutoScan_Proxy(
-    IShellUIHelper* This,
-    BSTR strSearch,
-    BSTR strFailureUrl,
-    VARIANT *pvarTargetFrame);
-void __RPC_STUB IShellUIHelper_AutoScan_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_AutoCompleteAttach_Proxy(
-    IShellUIHelper* This,
-    VARIANT *Reserved);
-void __RPC_STUB IShellUIHelper_AutoCompleteAttach_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper_ShowBrowserUI_Proxy(
-    IShellUIHelper* This,
-    BSTR bstrName,
-    VARIANT *pvarIn,
-    VARIANT *pvarOut);
-void __RPC_STUB IShellUIHelper_ShowBrowserUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellUIHelper_INTERFACE_DEFINED__ */
 
@@ -3656,29 +2980,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3686,7 +3010,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3698,25 +3022,25 @@
 
     /*** IShellUIHelper methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetFirstBootMode)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     HRESULT (STDMETHODCALLTYPE *ResetSafeMode)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshOfflineDesktop)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     HRESULT (STDMETHODCALLTYPE *AddFavorite)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR URL,
         VARIANT *Title);
 
     HRESULT (STDMETHODCALLTYPE *AddChannel)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR URL);
 
     HRESULT (STDMETHODCALLTYPE *AddDesktopComponent)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR URL,
         BSTR Type,
         VARIANT *Left,
@@ -3725,107 +3049,108 @@
         VARIANT *Height);
 
     HRESULT (STDMETHODCALLTYPE *IsSubscribed)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR URL,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *NavigateAndFind)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR URL,
         BSTR strQuery,
         VARIANT *varTargetFrame);
 
     HRESULT (STDMETHODCALLTYPE *ImportExportFavorites)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL fImport,
         BSTR strImpExpPath);
 
     HRESULT (STDMETHODCALLTYPE *AutoCompleteSaveForm)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT *Form);
 
     HRESULT (STDMETHODCALLTYPE *AutoScan)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR strSearch,
         BSTR strFailureUrl,
         VARIANT *pvarTargetFrame);
 
     HRESULT (STDMETHODCALLTYPE *AutoCompleteAttach)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT *Reserved);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserUI)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR bstrName,
         VARIANT *pvarIn,
         VARIANT *pvarOut);
 
     /*** IShellUIHelper2 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddSearchProvider)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR URL);
 
     HRESULT (STDMETHODCALLTYPE *RunOnceShown)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SkipRunOnce)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     HRESULT (STDMETHODCALLTYPE *CustomizeSettings)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL fSQM,
         VARIANT_BOOL fPhishing,
         BSTR bstrLocale);
 
     HRESULT (STDMETHODCALLTYPE *SqmEnabled)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL *pfEnabled);
 
     HRESULT (STDMETHODCALLTYPE *PhishingEnabled)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL *pfEnabled);
 
     HRESULT (STDMETHODCALLTYPE *BrandImageUri)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR *pbstrUri);
 
     HRESULT (STDMETHODCALLTYPE *SkipTabsWelcome)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     HRESULT (STDMETHODCALLTYPE *DiagnoseConnection)(
-        IShellUIHelper2* This);
+        IShellUIHelper2 *This);
 
     HRESULT (STDMETHODCALLTYPE *CustomizeClearType)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL fSet);
 
     HRESULT (STDMETHODCALLTYPE *IsSearchProviderInstalled)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR URL,
         DWORD *pdwResult);
 
     HRESULT (STDMETHODCALLTYPE *IsSearchMigrated)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL *pfMigrated);
 
     HRESULT (STDMETHODCALLTYPE *DefaultSearchProvider)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR *pbstrName);
 
     HRESULT (STDMETHODCALLTYPE *RunOnceRequiredSettingsComplete)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL fComplete);
 
     HRESULT (STDMETHODCALLTYPE *RunOnceHasShown)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         VARIANT_BOOL *pfShown);
 
     HRESULT (STDMETHODCALLTYPE *SearchGuideUrl)(
-        IShellUIHelper2* This,
+        IShellUIHelper2 *This,
         BSTR *pbstrUrl);
 
     END_INTERFACE
 } IShellUIHelper2Vtbl;
+
 interface IShellUIHelper2 {
     CONST_VTBL IShellUIHelper2Vtbl* lpVtbl;
 };
@@ -3990,133 +3315,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_AddSearchProvider_Proxy(
-    IShellUIHelper2* This,
-    BSTR URL);
-void __RPC_STUB IShellUIHelper2_AddSearchProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_RunOnceShown_Proxy(
-    IShellUIHelper2* This);
-void __RPC_STUB IShellUIHelper2_RunOnceShown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_SkipRunOnce_Proxy(
-    IShellUIHelper2* This);
-void __RPC_STUB IShellUIHelper2_SkipRunOnce_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_CustomizeSettings_Proxy(
-    IShellUIHelper2* This,
-    VARIANT_BOOL fSQM,
-    VARIANT_BOOL fPhishing,
-    BSTR bstrLocale);
-void __RPC_STUB IShellUIHelper2_CustomizeSettings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_SqmEnabled_Proxy(
-    IShellUIHelper2* This,
-    VARIANT_BOOL *pfEnabled);
-void __RPC_STUB IShellUIHelper2_SqmEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_PhishingEnabled_Proxy(
-    IShellUIHelper2* This,
-    VARIANT_BOOL *pfEnabled);
-void __RPC_STUB IShellUIHelper2_PhishingEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_BrandImageUri_Proxy(
-    IShellUIHelper2* This,
-    BSTR *pbstrUri);
-void __RPC_STUB IShellUIHelper2_BrandImageUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_SkipTabsWelcome_Proxy(
-    IShellUIHelper2* This);
-void __RPC_STUB IShellUIHelper2_SkipTabsWelcome_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_DiagnoseConnection_Proxy(
-    IShellUIHelper2* This);
-void __RPC_STUB IShellUIHelper2_DiagnoseConnection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_CustomizeClearType_Proxy(
-    IShellUIHelper2* This,
-    VARIANT_BOOL fSet);
-void __RPC_STUB IShellUIHelper2_CustomizeClearType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_IsSearchProviderInstalled_Proxy(
-    IShellUIHelper2* This,
-    BSTR URL,
-    DWORD *pdwResult);
-void __RPC_STUB IShellUIHelper2_IsSearchProviderInstalled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_IsSearchMigrated_Proxy(
-    IShellUIHelper2* This,
-    VARIANT_BOOL *pfMigrated);
-void __RPC_STUB IShellUIHelper2_IsSearchMigrated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_DefaultSearchProvider_Proxy(
-    IShellUIHelper2* This,
-    BSTR *pbstrName);
-void __RPC_STUB IShellUIHelper2_DefaultSearchProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_RunOnceRequiredSettingsComplete_Proxy(
-    IShellUIHelper2* This,
-    VARIANT_BOOL fComplete);
-void __RPC_STUB IShellUIHelper2_RunOnceRequiredSettingsComplete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_RunOnceHasShown_Proxy(
-    IShellUIHelper2* This,
-    VARIANT_BOOL *pfShown);
-void __RPC_STUB IShellUIHelper2_RunOnceHasShown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellUIHelper2_SearchGuideUrl_Proxy(
-    IShellUIHelper2* This,
-    BSTR *pbstrUrl);
-void __RPC_STUB IShellUIHelper2_SearchGuideUrl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellUIHelper2_INTERFACE_DEFINED__ */
 
@@ -4154,29 +3352,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        DShellNameSpaceEvents* This,
+        DShellNameSpaceEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        DShellNameSpaceEvents* This);
+        DShellNameSpaceEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        DShellNameSpaceEvents* This);
+        DShellNameSpaceEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        DShellNameSpaceEvents* This,
+        DShellNameSpaceEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        DShellNameSpaceEvents* This,
+        DShellNameSpaceEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        DShellNameSpaceEvents* This,
+        DShellNameSpaceEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4184,7 +3382,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        DShellNameSpaceEvents* This,
+        DShellNameSpaceEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4196,6 +3394,7 @@
 
     END_INTERFACE
 } DShellNameSpaceEventsVtbl;
+
 interface DShellNameSpaceEvents {
     CONST_VTBL DShellNameSpaceEventsVtbl* lpVtbl;
 };
@@ -4302,29 +3501,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4332,7 +3531,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4344,51 +3543,52 @@
 
     /*** IShellFavoritesNameSpace methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveSelectionUp)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *MoveSelectionDown)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *ResetSort)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *NewFolder)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *Synchronize)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *Import)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *Export)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *InvokeContextMenuCommand)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         BSTR strCommand);
 
     HRESULT (STDMETHODCALLTYPE *MoveSelectionTo)(
-        IShellFavoritesNameSpace* This);
+        IShellFavoritesNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *get_SubscriptionsEnabled)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *CreateSubscriptionForSelection)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *DeleteSubscriptionForSelection)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *SetRoot)(
-        IShellFavoritesNameSpace* This,
+        IShellFavoritesNameSpace *This,
         BSTR bstrFullPath);
 
     END_INTERFACE
 } IShellFavoritesNameSpaceVtbl;
+
 interface IShellFavoritesNameSpace {
     CONST_VTBL IShellFavoritesNameSpaceVtbl* lpVtbl;
 };
@@ -4487,102 +3687,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_MoveSelectionUp_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_MoveSelectionUp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_MoveSelectionDown_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_MoveSelectionDown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_ResetSort_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_ResetSort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_NewFolder_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_NewFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_Synchronize_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_Synchronize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_Import_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_Import_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_Export_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_Export_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_InvokeContextMenuCommand_Proxy(
-    IShellFavoritesNameSpace* This,
-    BSTR strCommand);
-void __RPC_STUB IShellFavoritesNameSpace_InvokeContextMenuCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_MoveSelectionTo_Proxy(
-    IShellFavoritesNameSpace* This);
-void __RPC_STUB IShellFavoritesNameSpace_MoveSelectionTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_get_SubscriptionsEnabled_Proxy(
-    IShellFavoritesNameSpace* This,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IShellFavoritesNameSpace_get_SubscriptionsEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_CreateSubscriptionForSelection_Proxy(
-    IShellFavoritesNameSpace* This,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IShellFavoritesNameSpace_CreateSubscriptionForSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_DeleteSubscriptionForSelection_Proxy(
-    IShellFavoritesNameSpace* This,
-    VARIANT_BOOL *pBool);
-void __RPC_STUB IShellFavoritesNameSpace_DeleteSubscriptionForSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFavoritesNameSpace_SetRoot_Proxy(
-    IShellFavoritesNameSpace* This,
-    BSTR bstrFullPath);
-void __RPC_STUB IShellFavoritesNameSpace_SetRoot_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellFavoritesNameSpace_INTERFACE_DEFINED__ */
 
@@ -4671,29 +3775,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4701,7 +3805,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4713,136 +3817,137 @@
 
     /*** IShellFavoritesNameSpace methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveSelectionUp)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *MoveSelectionDown)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *ResetSort)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *NewFolder)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *Synchronize)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *Import)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *Export)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *InvokeContextMenuCommand)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         BSTR strCommand);
 
     HRESULT (STDMETHODCALLTYPE *MoveSelectionTo)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     HRESULT (STDMETHODCALLTYPE *get_SubscriptionsEnabled)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *CreateSubscriptionForSelection)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *DeleteSubscriptionForSelection)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         VARIANT_BOOL *pBool);
 
     HRESULT (STDMETHODCALLTYPE *SetRoot)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         BSTR bstrFullPath);
 
     /*** IShellNameSpace methods ***/
     HRESULT (STDMETHODCALLTYPE *get_EnumOptions)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         LONG *pgrfEnumFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_EnumOptions)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         LONG pgrfEnumFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_SelectedItem)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         IDispatch **pItem);
 
     HRESULT (STDMETHODCALLTYPE *put_SelectedItem)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         IDispatch *pItem);
 
     HRESULT (STDMETHODCALLTYPE *get_Root)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         VARIANT *pvar);
 
     HRESULT (STDMETHODCALLTYPE *put_Root)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         VARIANT pvar);
 
     HRESULT (STDMETHODCALLTYPE *get_Depth)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         int *piDepth);
 
     HRESULT (STDMETHODCALLTYPE *put_Depth)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         int piDepth);
 
     HRESULT (STDMETHODCALLTYPE *get_Mode)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         unsigned int *puMode);
 
     HRESULT (STDMETHODCALLTYPE *put_Mode)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         unsigned int puMode);
 
     HRESULT (STDMETHODCALLTYPE *get_Flags)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         ULONG *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_Flags)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         ULONG pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_TVFlags)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         ULONG dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_TVFlags)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         ULONG *dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_Columns)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         BSTR *bstrColumns);
 
     HRESULT (STDMETHODCALLTYPE *put_Columns)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         BSTR bstrColumns);
 
     HRESULT (STDMETHODCALLTYPE *get_CountViewTypes)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         int *piTypes);
 
     HRESULT (STDMETHODCALLTYPE *SetViewType)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         int iType);
 
     HRESULT (STDMETHODCALLTYPE *SelectedItems)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Expand)(
-        IShellNameSpace* This,
+        IShellNameSpace *This,
         VARIANT var,
         int iDepth);
 
     HRESULT (STDMETHODCALLTYPE *UnselectAll)(
-        IShellNameSpace* This);
+        IShellNameSpace *This);
 
     END_INTERFACE
 } IShellNameSpaceVtbl;
+
 interface IShellNameSpace {
     CONST_VTBL IShellNameSpaceVtbl* lpVtbl;
 };
@@ -5027,174 +4132,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_EnumOptions_Proxy(
-    IShellNameSpace* This,
-    LONG *pgrfEnumFlags);
-void __RPC_STUB IShellNameSpace_get_EnumOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_EnumOptions_Proxy(
-    IShellNameSpace* This,
-    LONG pgrfEnumFlags);
-void __RPC_STUB IShellNameSpace_put_EnumOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_SelectedItem_Proxy(
-    IShellNameSpace* This,
-    IDispatch **pItem);
-void __RPC_STUB IShellNameSpace_get_SelectedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_SelectedItem_Proxy(
-    IShellNameSpace* This,
-    IDispatch *pItem);
-void __RPC_STUB IShellNameSpace_put_SelectedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Root_Proxy(
-    IShellNameSpace* This,
-    VARIANT *pvar);
-void __RPC_STUB IShellNameSpace_get_Root_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Root_Proxy(
-    IShellNameSpace* This,
-    VARIANT pvar);
-void __RPC_STUB IShellNameSpace_put_Root_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Depth_Proxy(
-    IShellNameSpace* This,
-    int *piDepth);
-void __RPC_STUB IShellNameSpace_get_Depth_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Depth_Proxy(
-    IShellNameSpace* This,
-    int piDepth);
-void __RPC_STUB IShellNameSpace_put_Depth_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Mode_Proxy(
-    IShellNameSpace* This,
-    unsigned int *puMode);
-void __RPC_STUB IShellNameSpace_get_Mode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Mode_Proxy(
-    IShellNameSpace* This,
-    unsigned int puMode);
-void __RPC_STUB IShellNameSpace_put_Mode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Flags_Proxy(
-    IShellNameSpace* This,
-    ULONG *pdwFlags);
-void __RPC_STUB IShellNameSpace_get_Flags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Flags_Proxy(
-    IShellNameSpace* This,
-    ULONG pdwFlags);
-void __RPC_STUB IShellNameSpace_put_Flags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_TVFlags_Proxy(
-    IShellNameSpace* This,
-    ULONG dwFlags);
-void __RPC_STUB IShellNameSpace_put_TVFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_TVFlags_Proxy(
-    IShellNameSpace* This,
-    ULONG *dwFlags);
-void __RPC_STUB IShellNameSpace_get_TVFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_Columns_Proxy(
-    IShellNameSpace* This,
-    BSTR *bstrColumns);
-void __RPC_STUB IShellNameSpace_get_Columns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_put_Columns_Proxy(
-    IShellNameSpace* This,
-    BSTR bstrColumns);
-void __RPC_STUB IShellNameSpace_put_Columns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_get_CountViewTypes_Proxy(
-    IShellNameSpace* This,
-    int *piTypes);
-void __RPC_STUB IShellNameSpace_get_CountViewTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_SetViewType_Proxy(
-    IShellNameSpace* This,
-    int iType);
-void __RPC_STUB IShellNameSpace_SetViewType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_SelectedItems_Proxy(
-    IShellNameSpace* This,
-    IDispatch **ppid);
-void __RPC_STUB IShellNameSpace_SelectedItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_Expand_Proxy(
-    IShellNameSpace* This,
-    VARIANT var,
-    int iDepth);
-void __RPC_STUB IShellNameSpace_Expand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellNameSpace_UnselectAll_Proxy(
-    IShellNameSpace* This);
-void __RPC_STUB IShellNameSpace_UnselectAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellNameSpace_INTERFACE_DEFINED__ */
 
@@ -5287,29 +4224,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IScriptErrorList* This);
+        IScriptErrorList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IScriptErrorList* This);
+        IScriptErrorList *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5317,7 +4254,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5329,61 +4266,62 @@
 
     /*** IScriptErrorList methods ***/
     HRESULT (STDMETHODCALLTYPE *advanceError)(
-        IScriptErrorList* This);
+        IScriptErrorList *This);
 
     HRESULT (STDMETHODCALLTYPE *retreatError)(
-        IScriptErrorList* This);
+        IScriptErrorList *This);
 
     HRESULT (STDMETHODCALLTYPE *canAdvanceError)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *pfCanAdvance);
 
     HRESULT (STDMETHODCALLTYPE *canRetreatError)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *pfCanRetreat);
 
     HRESULT (STDMETHODCALLTYPE *getErrorLine)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *plLine);
 
     HRESULT (STDMETHODCALLTYPE *getErrorChar)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *plChar);
 
     HRESULT (STDMETHODCALLTYPE *getErrorCode)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *plCode);
 
     HRESULT (STDMETHODCALLTYPE *getErrorMsg)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         BSTR *pstr);
 
     HRESULT (STDMETHODCALLTYPE *getErrorUrl)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         BSTR *pstr);
 
     HRESULT (STDMETHODCALLTYPE *getAlwaysShowLockState)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *pfAlwaysShowLocked);
 
     HRESULT (STDMETHODCALLTYPE *getDetailsPaneOpen)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *pfDetailsPaneOpen);
 
     HRESULT (STDMETHODCALLTYPE *setDetailsPaneOpen)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG fDetailsPaneOpen);
 
     HRESULT (STDMETHODCALLTYPE *getPerErrorDisplay)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG *pfPerErrorDisplay);
 
     HRESULT (STDMETHODCALLTYPE *setPerErrorDisplay)(
-        IScriptErrorList* This,
+        IScriptErrorList *This,
         LONG fPerErrorDisplay);
 
     END_INTERFACE
 } IScriptErrorListVtbl;
+
 interface IScriptErrorList {
     CONST_VTBL IScriptErrorListVtbl* lpVtbl;
 };
@@ -5486,116 +4424,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IScriptErrorList_advanceError_Proxy(
-    IScriptErrorList* This);
-void __RPC_STUB IScriptErrorList_advanceError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_retreatError_Proxy(
-    IScriptErrorList* This);
-void __RPC_STUB IScriptErrorList_retreatError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_canAdvanceError_Proxy(
-    IScriptErrorList* This,
-    LONG *pfCanAdvance);
-void __RPC_STUB IScriptErrorList_canAdvanceError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_canRetreatError_Proxy(
-    IScriptErrorList* This,
-    LONG *pfCanRetreat);
-void __RPC_STUB IScriptErrorList_canRetreatError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorLine_Proxy(
-    IScriptErrorList* This,
-    LONG *plLine);
-void __RPC_STUB IScriptErrorList_getErrorLine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorChar_Proxy(
-    IScriptErrorList* This,
-    LONG *plChar);
-void __RPC_STUB IScriptErrorList_getErrorChar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorCode_Proxy(
-    IScriptErrorList* This,
-    LONG *plCode);
-void __RPC_STUB IScriptErrorList_getErrorCode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorMsg_Proxy(
-    IScriptErrorList* This,
-    BSTR *pstr);
-void __RPC_STUB IScriptErrorList_getErrorMsg_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getErrorUrl_Proxy(
-    IScriptErrorList* This,
-    BSTR *pstr);
-void __RPC_STUB IScriptErrorList_getErrorUrl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getAlwaysShowLockState_Proxy(
-    IScriptErrorList* This,
-    LONG *pfAlwaysShowLocked);
-void __RPC_STUB IScriptErrorList_getAlwaysShowLockState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getDetailsPaneOpen_Proxy(
-    IScriptErrorList* This,
-    LONG *pfDetailsPaneOpen);
-void __RPC_STUB IScriptErrorList_getDetailsPaneOpen_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_setDetailsPaneOpen_Proxy(
-    IScriptErrorList* This,
-    LONG fDetailsPaneOpen);
-void __RPC_STUB IScriptErrorList_setDetailsPaneOpen_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_getPerErrorDisplay_Proxy(
-    IScriptErrorList* This,
-    LONG *pfPerErrorDisplay);
-void __RPC_STUB IScriptErrorList_getPerErrorDisplay_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IScriptErrorList_setPerErrorDisplay_Proxy(
-    IScriptErrorList* This,
-    LONG fPerErrorDisplay);
-void __RPC_STUB IScriptErrorList_setPerErrorDisplay_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IScriptErrorList_INTERFACE_DEFINED__ */
 
@@ -5642,29 +4470,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearch* This,
+        ISearch *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearch* This);
+        ISearch *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearch* This);
+        ISearch *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISearch* This,
+        ISearch *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISearch* This,
+        ISearch *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISearch* This,
+        ISearch *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5672,7 +4500,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISearch* This,
+        ISearch *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5684,19 +4512,20 @@
 
     /*** ISearch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Title)(
-        ISearch* This,
+        ISearch *This,
         BSTR *pbstrTitle);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISearch* This,
+        ISearch *This,
         BSTR *pbstrId);
 
     HRESULT (STDMETHODCALLTYPE *get_URL)(
-        ISearch* This,
+        ISearch *This,
         BSTR *pbstrUrl);
 
     END_INTERFACE
 } ISearchVtbl;
+
 interface ISearch {
     CONST_VTBL ISearchVtbl* lpVtbl;
 };
@@ -5755,30 +4584,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearch_get_Title_Proxy(
-    ISearch* This,
-    BSTR *pbstrTitle);
-void __RPC_STUB ISearch_get_Title_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearch_get_Id_Proxy(
-    ISearch* This,
-    BSTR *pbstrId);
-void __RPC_STUB ISearch_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearch_get_URL_Proxy(
-    ISearch* This,
-    BSTR *pbstrUrl);
-void __RPC_STUB ISearch_get_URL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearch_INTERFACE_DEFINED__ */
 
@@ -5816,29 +4621,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearches* This,
+        ISearches *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearches* This);
+        ISearches *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearches* This);
+        ISearches *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISearches* This,
+        ISearches *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISearches* This,
+        ISearches *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISearches* This,
+        ISearches *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5846,7 +4651,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISearches* This,
+        ISearches *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5858,24 +4663,25 @@
 
     /*** ISearches methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISearches* This,
+        ISearches *This,
         LONG *plCount);
 
     HRESULT (STDMETHODCALLTYPE *get_Default)(
-        ISearches* This,
+        ISearches *This,
         BSTR *pbstrDefault);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISearches* This,
+        ISearches *This,
         VARIANT index,
         ISearch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *_NewEnum)(
-        ISearches* This,
+        ISearches *This,
         IUnknown **ppunk);
 
     END_INTERFACE
 } ISearchesVtbl;
+
 interface ISearches {
     CONST_VTBL ISearchesVtbl* lpVtbl;
 };
@@ -5938,39 +4744,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearches_get_Count_Proxy(
-    ISearches* This,
-    LONG *plCount);
-void __RPC_STUB ISearches_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearches_get_Default_Proxy(
-    ISearches* This,
-    BSTR *pbstrDefault);
-void __RPC_STUB ISearches_get_Default_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearches_Item_Proxy(
-    ISearches* This,
-    VARIANT index,
-    ISearch **ppid);
-void __RPC_STUB ISearches_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearches__NewEnum_Proxy(
-    ISearches* This,
-    IUnknown **ppunk);
-void __RPC_STUB ISearches__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearches_INTERFACE_DEFINED__ */
 
@@ -6087,29 +4860,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6117,7 +4890,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6129,110 +4902,110 @@
 
     /*** ISearchAssistantOC methods ***/
     HRESULT (STDMETHODCALLTYPE *AddNextMenuItem)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         BSTR bstrText,
         LONG idItem);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultSearchUrl)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         BSTR bstrUrl);
 
     HRESULT (STDMETHODCALLTYPE *NavigateToDefaultSearch)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         BSTR bstrGuid,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_ShellFeaturesEnabled)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_SearchAssistantDefault)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_Searches)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         ISearches **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_InWebFolder)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *PutProperty)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         VARIANT_BOOL bPerLocale,
         BSTR bstrName,
         BSTR bstrValue);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         VARIANT_BOOL bPerLocale,
         BSTR bstrName,
         BSTR *pbstrValue);
 
     HRESULT (STDMETHODCALLTYPE *put_EventHandled)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         VARIANT_BOOL rhs);
 
     HRESULT (STDMETHODCALLTYPE *ResetNextMenu)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *FindOnWeb)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFilesOrFolders)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *FindPeople)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *GetSearchAssistantURL)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         VARIANT_BOOL bSubstitute,
         VARIANT_BOOL bCustomize,
         BSTR *pbstrValue);
 
     HRESULT (STDMETHODCALLTYPE *NotifySearchSettingsChanged)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *put_ASProvider)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         BSTR pProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_ASProvider)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         BSTR *pProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ASSetting)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         int pSetting);
 
     HRESULT (STDMETHODCALLTYPE *get_ASSetting)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         int *pSetting);
 
     HRESULT (STDMETHODCALLTYPE *NETDetectNextNavigate)(
-        ISearchAssistantOC* This);
+        ISearchAssistantOC *This);
 
     HRESULT (STDMETHODCALLTYPE *PutFindText)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         BSTR FindText);
 
     HRESULT (STDMETHODCALLTYPE *get_Version)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         int *pVersion);
 
     HRESULT (STDMETHODCALLTYPE *EncodeString)(
-        ISearchAssistantOC* This,
+        ISearchAssistantOC *This,
         BSTR bstrValue,
         BSTR bstrCharSet,
         VARIANT_BOOL bUseUTF8,
@@ -6240,6 +5013,7 @@
 
     END_INTERFACE
 } ISearchAssistantOCVtbl;
+
 interface ISearchAssistantOC {
     CONST_VTBL ISearchAssistantOCVtbl* lpVtbl;
 };
@@ -6394,224 +5168,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_AddNextMenuItem_Proxy(
-    ISearchAssistantOC* This,
-    BSTR bstrText,
-    LONG idItem);
-void __RPC_STUB ISearchAssistantOC_AddNextMenuItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_SetDefaultSearchUrl_Proxy(
-    ISearchAssistantOC* This,
-    BSTR bstrUrl);
-void __RPC_STUB ISearchAssistantOC_SetDefaultSearchUrl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_NavigateToDefaultSearch_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_NavigateToDefaultSearch_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_IsRestricted_Proxy(
-    ISearchAssistantOC* This,
-    BSTR bstrGuid,
-    VARIANT_BOOL *pVal);
-void __RPC_STUB ISearchAssistantOC_IsRestricted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_ShellFeaturesEnabled_Proxy(
-    ISearchAssistantOC* This,
-    VARIANT_BOOL *pVal);
-void __RPC_STUB ISearchAssistantOC_get_ShellFeaturesEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_SearchAssistantDefault_Proxy(
-    ISearchAssistantOC* This,
-    VARIANT_BOOL *pVal);
-void __RPC_STUB ISearchAssistantOC_get_SearchAssistantDefault_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_Searches_Proxy(
-    ISearchAssistantOC* This,
-    ISearches **ppid);
-void __RPC_STUB ISearchAssistantOC_get_Searches_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_InWebFolder_Proxy(
-    ISearchAssistantOC* This,
-    VARIANT_BOOL *pVal);
-void __RPC_STUB ISearchAssistantOC_get_InWebFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_PutProperty_Proxy(
-    ISearchAssistantOC* This,
-    VARIANT_BOOL bPerLocale,
-    BSTR bstrName,
-    BSTR bstrValue);
-void __RPC_STUB ISearchAssistantOC_PutProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_GetProperty_Proxy(
-    ISearchAssistantOC* This,
-    VARIANT_BOOL bPerLocale,
-    BSTR bstrName,
-    BSTR *pbstrValue);
-void __RPC_STUB ISearchAssistantOC_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_put_EventHandled_Proxy(
-    ISearchAssistantOC* This,
-    VARIANT_BOOL rhs);
-void __RPC_STUB ISearchAssistantOC_put_EventHandled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_ResetNextMenu_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_ResetNextMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindOnWeb_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_FindOnWeb_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindFilesOrFolders_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_FindFilesOrFolders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindComputer_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_FindComputer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindPrinter_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_FindPrinter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_FindPeople_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_FindPeople_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_GetSearchAssistantURL_Proxy(
-    ISearchAssistantOC* This,
-    VARIANT_BOOL bSubstitute,
-    VARIANT_BOOL bCustomize,
-    BSTR *pbstrValue);
-void __RPC_STUB ISearchAssistantOC_GetSearchAssistantURL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_NotifySearchSettingsChanged_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_NotifySearchSettingsChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_put_ASProvider_Proxy(
-    ISearchAssistantOC* This,
-    BSTR pProvider);
-void __RPC_STUB ISearchAssistantOC_put_ASProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_ASProvider_Proxy(
-    ISearchAssistantOC* This,
-    BSTR *pProvider);
-void __RPC_STUB ISearchAssistantOC_get_ASProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_put_ASSetting_Proxy(
-    ISearchAssistantOC* This,
-    int pSetting);
-void __RPC_STUB ISearchAssistantOC_put_ASSetting_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_ASSetting_Proxy(
-    ISearchAssistantOC* This,
-    int *pSetting);
-void __RPC_STUB ISearchAssistantOC_get_ASSetting_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_NETDetectNextNavigate_Proxy(
-    ISearchAssistantOC* This);
-void __RPC_STUB ISearchAssistantOC_NETDetectNextNavigate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_PutFindText_Proxy(
-    ISearchAssistantOC* This,
-    BSTR FindText);
-void __RPC_STUB ISearchAssistantOC_PutFindText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_get_Version_Proxy(
-    ISearchAssistantOC* This,
-    int *pVersion);
-void __RPC_STUB ISearchAssistantOC_get_Version_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC_EncodeString_Proxy(
-    ISearchAssistantOC* This,
-    BSTR bstrValue,
-    BSTR bstrCharSet,
-    VARIANT_BOOL bUseUTF8,
-    BSTR *pbstrResult);
-void __RPC_STUB ISearchAssistantOC_EncodeString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearchAssistantOC_INTERFACE_DEFINED__ */
 
@@ -6639,29 +5195,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6669,7 +5225,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6681,110 +5237,110 @@
 
     /*** ISearchAssistantOC methods ***/
     HRESULT (STDMETHODCALLTYPE *AddNextMenuItem)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         BSTR bstrText,
         LONG idItem);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultSearchUrl)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         BSTR bstrUrl);
 
     HRESULT (STDMETHODCALLTYPE *NavigateToDefaultSearch)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         BSTR bstrGuid,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_ShellFeaturesEnabled)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_SearchAssistantDefault)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_Searches)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         ISearches **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_InWebFolder)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *PutProperty)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL bPerLocale,
         BSTR bstrName,
         BSTR bstrValue);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL bPerLocale,
         BSTR bstrName,
         BSTR *pbstrValue);
 
     HRESULT (STDMETHODCALLTYPE *put_EventHandled)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL rhs);
 
     HRESULT (STDMETHODCALLTYPE *ResetNextMenu)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindOnWeb)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFilesOrFolders)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindPeople)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetSearchAssistantURL)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL bSubstitute,
         VARIANT_BOOL bCustomize,
         BSTR *pbstrValue);
 
     HRESULT (STDMETHODCALLTYPE *NotifySearchSettingsChanged)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *put_ASProvider)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         BSTR pProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_ASProvider)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         BSTR *pProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ASSetting)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         int pSetting);
 
     HRESULT (STDMETHODCALLTYPE *get_ASSetting)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         int *pSetting);
 
     HRESULT (STDMETHODCALLTYPE *NETDetectNextNavigate)(
-        ISearchAssistantOC2* This);
+        ISearchAssistantOC2 *This);
 
     HRESULT (STDMETHODCALLTYPE *PutFindText)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         BSTR FindText);
 
     HRESULT (STDMETHODCALLTYPE *get_Version)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         int *pVersion);
 
     HRESULT (STDMETHODCALLTYPE *EncodeString)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         BSTR bstrValue,
         BSTR bstrCharSet,
         VARIANT_BOOL bUseUTF8,
@@ -6792,11 +5348,12 @@
 
     /*** ISearchAssistantOC2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ShowFindPrinter)(
-        ISearchAssistantOC2* This,
+        ISearchAssistantOC2 *This,
         VARIANT_BOOL *pbShowFindPrinter);
 
     END_INTERFACE
 } ISearchAssistantOC2Vtbl;
+
 interface ISearchAssistantOC2 {
     CONST_VTBL ISearchAssistantOC2Vtbl* lpVtbl;
 };
@@ -6957,14 +5514,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC2_get_ShowFindPrinter_Proxy(
-    ISearchAssistantOC2* This,
-    VARIANT_BOOL *pbShowFindPrinter);
-void __RPC_STUB ISearchAssistantOC2_get_ShowFindPrinter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearchAssistantOC2_INTERFACE_DEFINED__ */
 
@@ -6998,29 +5547,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7028,7 +5577,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7040,110 +5589,110 @@
 
     /*** ISearchAssistantOC methods ***/
     HRESULT (STDMETHODCALLTYPE *AddNextMenuItem)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         BSTR bstrText,
         LONG idItem);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultSearchUrl)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         BSTR bstrUrl);
 
     HRESULT (STDMETHODCALLTYPE *NavigateToDefaultSearch)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         BSTR bstrGuid,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_ShellFeaturesEnabled)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_SearchAssistantDefault)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *get_Searches)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         ISearches **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_InWebFolder)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL *pVal);
 
     HRESULT (STDMETHODCALLTYPE *PutProperty)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL bPerLocale,
         BSTR bstrName,
         BSTR bstrValue);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL bPerLocale,
         BSTR bstrName,
         BSTR *pbstrValue);
 
     HRESULT (STDMETHODCALLTYPE *put_EventHandled)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL rhs);
 
     HRESULT (STDMETHODCALLTYPE *ResetNextMenu)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindOnWeb)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFilesOrFolders)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindPeople)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetSearchAssistantURL)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL bSubstitute,
         VARIANT_BOOL bCustomize,
         BSTR *pbstrValue);
 
     HRESULT (STDMETHODCALLTYPE *NotifySearchSettingsChanged)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *put_ASProvider)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         BSTR pProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_ASProvider)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         BSTR *pProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ASSetting)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         int pSetting);
 
     HRESULT (STDMETHODCALLTYPE *get_ASSetting)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         int *pSetting);
 
     HRESULT (STDMETHODCALLTYPE *NETDetectNextNavigate)(
-        ISearchAssistantOC3* This);
+        ISearchAssistantOC3 *This);
 
     HRESULT (STDMETHODCALLTYPE *PutFindText)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         BSTR FindText);
 
     HRESULT (STDMETHODCALLTYPE *get_Version)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         int *pVersion);
 
     HRESULT (STDMETHODCALLTYPE *EncodeString)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         BSTR bstrValue,
         BSTR bstrCharSet,
         VARIANT_BOOL bUseUTF8,
@@ -7151,24 +5700,25 @@
 
     /*** ISearchAssistantOC2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ShowFindPrinter)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL *pbShowFindPrinter);
 
     /*** ISearchAssistantOC3 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_SearchCompanionAvailable)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL *pbAvailable);
 
     HRESULT (STDMETHODCALLTYPE *put_UseSearchCompanion)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL pbUseSC);
 
     HRESULT (STDMETHODCALLTYPE *get_UseSearchCompanion)(
-        ISearchAssistantOC3* This,
+        ISearchAssistantOC3 *This,
         VARIANT_BOOL *pbUseSC);
 
     END_INTERFACE
 } ISearchAssistantOC3Vtbl;
+
 interface ISearchAssistantOC3 {
     CONST_VTBL ISearchAssistantOC3Vtbl* lpVtbl;
 };
@@ -7343,30 +5893,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC3_get_SearchCompanionAvailable_Proxy(
-    ISearchAssistantOC3* This,
-    VARIANT_BOOL *pbAvailable);
-void __RPC_STUB ISearchAssistantOC3_get_SearchCompanionAvailable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC3_put_UseSearchCompanion_Proxy(
-    ISearchAssistantOC3* This,
-    VARIANT_BOOL pbUseSC);
-void __RPC_STUB ISearchAssistantOC3_put_UseSearchCompanion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchAssistantOC3_get_UseSearchCompanion_Proxy(
-    ISearchAssistantOC3* This,
-    VARIANT_BOOL *pbUseSC);
-void __RPC_STUB ISearchAssistantOC3_get_UseSearchCompanion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearchAssistantOC3_INTERFACE_DEFINED__ */
 
@@ -7391,29 +5917,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _SearchAssistantEvents* This,
+        _SearchAssistantEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _SearchAssistantEvents* This);
+        _SearchAssistantEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _SearchAssistantEvents* This);
+        _SearchAssistantEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _SearchAssistantEvents* This,
+        _SearchAssistantEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _SearchAssistantEvents* This,
+        _SearchAssistantEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _SearchAssistantEvents* This,
+        _SearchAssistantEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7421,7 +5947,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _SearchAssistantEvents* This,
+        _SearchAssistantEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7433,6 +5959,7 @@
 
     END_INTERFACE
 } _SearchAssistantEventsVtbl;
+
 interface _SearchAssistantEvents {
     CONST_VTBL _SearchAssistantEventsVtbl* lpVtbl;
 };
diff --git a/mingw-w64-headers/include/filter.h b/mingw-w64-headers/include/filter.h
index dd6f61a..f0c732b 100644
--- a/mingw-w64-headers/include/filter.h
+++ b/mingw-w64-headers/include/filter.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/filter.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/filter.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IFilter_FWD_DEFINED__
 #define __IFilter_FWD_DEFINED__
 typedef interface IFilter IFilter;
+#ifdef __cplusplus
+interface IFilter;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -35,6 +38,9 @@
 #ifndef __IFilter_FWD_DEFINED__
 #define __IFilter_FWD_DEFINED__
 typedef interface IFilter IFilter;
+#ifdef __cplusplus
+interface IFilter;
+#endif /* __cplusplus */
 #endif
 
 #include <winapifamily.h>
@@ -158,45 +164,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFilter* This,
+        IFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFilter* This);
+        IFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFilter* This);
+        IFilter *This);
 
     /*** IFilter methods ***/
     SCODE (STDMETHODCALLTYPE *Init)(
-        IFilter* This,
+        IFilter *This,
         ULONG grfFlags,
         ULONG cAttributes,
         const FULLPROPSPEC *aAttributes,
         ULONG *pFlags);
 
     SCODE (STDMETHODCALLTYPE *GetChunk)(
-        IFilter* This,
+        IFilter *This,
         STAT_CHUNK *pStat);
 
     SCODE (STDMETHODCALLTYPE *GetText)(
-        IFilter* This,
+        IFilter *This,
         ULONG *pcwcBuffer,
         WCHAR *awcBuffer);
 
     SCODE (STDMETHODCALLTYPE *GetValue)(
-        IFilter* This,
+        IFilter *This,
         PROPVARIANT **ppPropValue);
 
     SCODE (STDMETHODCALLTYPE *BindRegion)(
-        IFilter* This,
+        IFilter *This,
         FILTERREGION origPos,
         REFIID riid,
         void **ppunk);
 
     END_INTERFACE
 } IFilterVtbl;
+
 interface IFilter {
     CONST_VTBL IFilterVtbl* lpVtbl;
 };
@@ -245,42 +252,6 @@
 
 #endif
 
-SCODE STDMETHODCALLTYPE IFilter_Init_Proxy(
-    IFilter* This,
-    ULONG grfFlags,
-    ULONG cAttributes,
-    const FULLPROPSPEC *aAttributes,
-    ULONG *pFlags);
-void __RPC_STUB IFilter_Init_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-SCODE STDMETHODCALLTYPE IFilter_GetChunk_Proxy(
-    IFilter* This,
-    STAT_CHUNK *pStat);
-void __RPC_STUB IFilter_GetChunk_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-SCODE STDMETHODCALLTYPE IFilter_GetText_Proxy(
-    IFilter* This,
-    ULONG *pcwcBuffer,
-    WCHAR *awcBuffer);
-void __RPC_STUB IFilter_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-SCODE STDMETHODCALLTYPE IFilter_GetValue_Proxy(
-    IFilter* This,
-    PROPVARIANT **ppPropValue);
-void __RPC_STUB IFilter_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFilter_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/fsrm.h b/mingw-w64-headers/include/fsrm.h
index 7d78b4a..6d0b5f2 100644
--- a/mingw-w64-headers/include/fsrm.h
+++ b/mingw-w64-headers/include/fsrm.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/fsrm.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/fsrm.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,76 +20,121 @@
 #ifndef __IFsrmCommittableCollection_FWD_DEFINED__
 #define __IFsrmCommittableCollection_FWD_DEFINED__
 typedef interface IFsrmCommittableCollection IFsrmCommittableCollection;
+#ifdef __cplusplus
+interface IFsrmCommittableCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmAccessDeniedRemediationClient_FWD_DEFINED__
 #define __IFsrmAccessDeniedRemediationClient_FWD_DEFINED__
 typedef interface IFsrmAccessDeniedRemediationClient IFsrmAccessDeniedRemediationClient;
+#ifdef __cplusplus
+interface IFsrmAccessDeniedRemediationClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmAction_FWD_DEFINED__
 #define __IFsrmAction_FWD_DEFINED__
 typedef interface IFsrmAction IFsrmAction;
+#ifdef __cplusplus
+interface IFsrmAction;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionCommand_FWD_DEFINED__
 #define __IFsrmActionCommand_FWD_DEFINED__
 typedef interface IFsrmActionCommand IFsrmActionCommand;
+#ifdef __cplusplus
+interface IFsrmActionCommand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionEventLog_FWD_DEFINED__
 #define __IFsrmActionEventLog_FWD_DEFINED__
 typedef interface IFsrmActionEventLog IFsrmActionEventLog;
+#ifdef __cplusplus
+interface IFsrmActionEventLog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionReport_FWD_DEFINED__
 #define __IFsrmActionReport_FWD_DEFINED__
 typedef interface IFsrmActionReport IFsrmActionReport;
+#ifdef __cplusplus
+interface IFsrmActionReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmCollection_FWD_DEFINED__
 #define __IFsrmCollection_FWD_DEFINED__
 typedef interface IFsrmCollection IFsrmCollection;
+#ifdef __cplusplus
+interface IFsrmCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmDerivedObjectsResult_FWD_DEFINED__
 #define __IFsrmDerivedObjectsResult_FWD_DEFINED__
 typedef interface IFsrmDerivedObjectsResult IFsrmDerivedObjectsResult;
+#ifdef __cplusplus
+interface IFsrmDerivedObjectsResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmExportImport_FWD_DEFINED__
 #define __IFsrmExportImport_FWD_DEFINED__
 typedef interface IFsrmExportImport IFsrmExportImport;
+#ifdef __cplusplus
+interface IFsrmExportImport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmObject_FWD_DEFINED__
 #define __IFsrmObject_FWD_DEFINED__
 typedef interface IFsrmObject IFsrmObject;
+#ifdef __cplusplus
+interface IFsrmObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmPathMapper_FWD_DEFINED__
 #define __IFsrmPathMapper_FWD_DEFINED__
 typedef interface IFsrmPathMapper IFsrmPathMapper;
+#ifdef __cplusplus
+interface IFsrmPathMapper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmSetting_FWD_DEFINED__
 #define __IFsrmSetting_FWD_DEFINED__
 typedef interface IFsrmSetting IFsrmSetting;
+#ifdef __cplusplus
+interface IFsrmSetting;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionEmail_FWD_DEFINED__
 #define __IFsrmActionEmail_FWD_DEFINED__
 typedef interface IFsrmActionEmail IFsrmActionEmail;
+#ifdef __cplusplus
+interface IFsrmActionEmail;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionEmail2_FWD_DEFINED__
 #define __IFsrmActionEmail2_FWD_DEFINED__
 typedef interface IFsrmActionEmail2 IFsrmActionEmail2;
+#ifdef __cplusplus
+interface IFsrmActionEmail2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmMutableCollection_FWD_DEFINED__
 #define __IFsrmMutableCollection_FWD_DEFINED__
 typedef interface IFsrmMutableCollection IFsrmMutableCollection;
+#ifdef __cplusplus
+interface IFsrmMutableCollection;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -107,61 +152,97 @@
 #ifndef __IFsrmObject_FWD_DEFINED__
 #define __IFsrmObject_FWD_DEFINED__
 typedef interface IFsrmObject IFsrmObject;
+#ifdef __cplusplus
+interface IFsrmObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmCollection_FWD_DEFINED__
 #define __IFsrmCollection_FWD_DEFINED__
 typedef interface IFsrmCollection IFsrmCollection;
+#ifdef __cplusplus
+interface IFsrmCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmMutableCollection_FWD_DEFINED__
 #define __IFsrmMutableCollection_FWD_DEFINED__
 typedef interface IFsrmMutableCollection IFsrmMutableCollection;
+#ifdef __cplusplus
+interface IFsrmMutableCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmCommittableCollection_FWD_DEFINED__
 #define __IFsrmCommittableCollection_FWD_DEFINED__
 typedef interface IFsrmCommittableCollection IFsrmCommittableCollection;
+#ifdef __cplusplus
+interface IFsrmCommittableCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmAction_FWD_DEFINED__
 #define __IFsrmAction_FWD_DEFINED__
 typedef interface IFsrmAction IFsrmAction;
+#ifdef __cplusplus
+interface IFsrmAction;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionEmail_FWD_DEFINED__
 #define __IFsrmActionEmail_FWD_DEFINED__
 typedef interface IFsrmActionEmail IFsrmActionEmail;
+#ifdef __cplusplus
+interface IFsrmActionEmail;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionReport_FWD_DEFINED__
 #define __IFsrmActionReport_FWD_DEFINED__
 typedef interface IFsrmActionReport IFsrmActionReport;
+#ifdef __cplusplus
+interface IFsrmActionReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionEventLog_FWD_DEFINED__
 #define __IFsrmActionEventLog_FWD_DEFINED__
 typedef interface IFsrmActionEventLog IFsrmActionEventLog;
+#ifdef __cplusplus
+interface IFsrmActionEventLog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmActionCommand_FWD_DEFINED__
 #define __IFsrmActionCommand_FWD_DEFINED__
 typedef interface IFsrmActionCommand IFsrmActionCommand;
+#ifdef __cplusplus
+interface IFsrmActionCommand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmSetting_FWD_DEFINED__
 #define __IFsrmSetting_FWD_DEFINED__
 typedef interface IFsrmSetting IFsrmSetting;
+#ifdef __cplusplus
+interface IFsrmSetting;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmPathMapper_FWD_DEFINED__
 #define __IFsrmPathMapper_FWD_DEFINED__
 typedef interface IFsrmPathMapper IFsrmPathMapper;
+#ifdef __cplusplus
+interface IFsrmPathMapper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmExportImport_FWD_DEFINED__
 #define __IFsrmExportImport_FWD_DEFINED__
 typedef interface IFsrmExportImport IFsrmExportImport;
+#ifdef __cplusplus
+interface IFsrmExportImport;
+#endif /* __cplusplus */
 #endif
 
 #define FSRM_DISPID_FEATURE_MASK (0xf000000)
@@ -249,29 +330,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmCommittableCollection* This);
+        IFsrmCommittableCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmCommittableCollection* This);
+        IFsrmCommittableCollection *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -279,7 +360,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -291,60 +372,61 @@
 
     /*** IFsrmCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         IUnknown **unknown);
 
     HRESULT (STDMETHODCALLTYPE *get_Item)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         LONG index,
         VARIANT *item);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         LONG *count);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         FsrmCollectionState *state);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IFsrmCommittableCollection* This);
+        IFsrmCommittableCollection *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForCompletion)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         LONG waitSeconds,
         VARIANT_BOOL *completed);
 
     HRESULT (STDMETHODCALLTYPE *GetById)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         FSRM_OBJECT_ID id,
         VARIANT *entry);
 
     /*** IFsrmMutableCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         VARIANT item);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         LONG index);
 
     HRESULT (STDMETHODCALLTYPE *RemoveById)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         FSRM_OBJECT_ID id);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         IFsrmMutableCollection **collection);
 
     /*** IFsrmCommittableCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmCommittableCollection* This,
+        IFsrmCommittableCollection *This,
         FsrmCommitOptions options,
         IFsrmCollection **results);
 
     END_INTERFACE
 } IFsrmCommittableCollectionVtbl;
+
 interface IFsrmCommittableCollection {
     CONST_VTBL IFsrmCommittableCollectionVtbl* lpVtbl;
 };
@@ -443,15 +525,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmCommittableCollection_Commit_Proxy(
-    IFsrmCommittableCollection* This,
-    FsrmCommitOptions options,
-    IFsrmCollection **results);
-void __RPC_STUB IFsrmCommittableCollection_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmCommittableCollection_INTERFACE_DEFINED__ */
 
@@ -485,29 +558,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmAccessDeniedRemediationClient* This,
+        IFsrmAccessDeniedRemediationClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmAccessDeniedRemediationClient* This);
+        IFsrmAccessDeniedRemediationClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmAccessDeniedRemediationClient* This);
+        IFsrmAccessDeniedRemediationClient *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmAccessDeniedRemediationClient* This,
+        IFsrmAccessDeniedRemediationClient *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmAccessDeniedRemediationClient* This,
+        IFsrmAccessDeniedRemediationClient *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmAccessDeniedRemediationClient* This,
+        IFsrmAccessDeniedRemediationClient *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -515,7 +588,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmAccessDeniedRemediationClient* This,
+        IFsrmAccessDeniedRemediationClient *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -527,7 +600,7 @@
 
     /*** IFsrmAccessDeniedRemediationClient methods ***/
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IFsrmAccessDeniedRemediationClient* This,
+        IFsrmAccessDeniedRemediationClient *This,
         ULONG_PTR parentWnd,
         BSTR accessPath,
         AdrClientErrorType errorType,
@@ -538,6 +611,7 @@
 
     END_INTERFACE
 } IFsrmAccessDeniedRemediationClientVtbl;
+
 interface IFsrmAccessDeniedRemediationClient {
     CONST_VTBL IFsrmAccessDeniedRemediationClientVtbl* lpVtbl;
 };
@@ -588,20 +662,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmAccessDeniedRemediationClient_Show_Proxy(
-    IFsrmAccessDeniedRemediationClient* This,
-    ULONG_PTR parentWnd,
-    BSTR accessPath,
-    AdrClientErrorType errorType,
-    LONG flags,
-    BSTR windowTitle,
-    BSTR windowMessage,
-    LONG *result);
-void __RPC_STUB IFsrmAccessDeniedRemediationClient_Show_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmAccessDeniedRemediationClient_INTERFACE_DEFINED__ */
 
@@ -641,29 +701,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmAction* This);
+        IFsrmAction *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmAction* This);
+        IFsrmAction *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -671,7 +731,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -683,26 +743,27 @@
 
     /*** IFsrmAction methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionType)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         FsrmActionType *actionType);
 
     HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         LONG *minutes);
 
     HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)(
-        IFsrmAction* This,
+        IFsrmAction *This,
         LONG minutes);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmAction* This);
+        IFsrmAction *This);
 
     END_INTERFACE
 } IFsrmActionVtbl;
+
 interface IFsrmAction {
     CONST_VTBL IFsrmActionVtbl* lpVtbl;
 };
@@ -769,45 +830,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmAction_get_Id_Proxy(
-    IFsrmAction* This,
-    FSRM_OBJECT_ID *id);
-void __RPC_STUB IFsrmAction_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmAction_get_ActionType_Proxy(
-    IFsrmAction* This,
-    FsrmActionType *actionType);
-void __RPC_STUB IFsrmAction_get_ActionType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmAction_get_RunLimitInterval_Proxy(
-    IFsrmAction* This,
-    LONG *minutes);
-void __RPC_STUB IFsrmAction_get_RunLimitInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmAction_put_RunLimitInterval_Proxy(
-    IFsrmAction* This,
-    LONG minutes);
-void __RPC_STUB IFsrmAction_put_RunLimitInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmAction_Delete_Proxy(
-    IFsrmAction* This);
-void __RPC_STUB IFsrmAction_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmAction_INTERFACE_DEFINED__ */
 
@@ -874,29 +896,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmActionCommand* This);
+        IFsrmActionCommand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmActionCommand* This);
+        IFsrmActionCommand *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -904,7 +926,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -916,83 +938,84 @@
 
     /*** IFsrmAction methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionType)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         FsrmActionType *actionType);
 
     HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         LONG *minutes);
 
     HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         LONG minutes);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmActionCommand* This);
+        IFsrmActionCommand *This);
 
     /*** IFsrmActionCommand methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ExecutablePath)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         BSTR *executablePath);
 
     HRESULT (STDMETHODCALLTYPE *put_ExecutablePath)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         BSTR executablePath);
 
     HRESULT (STDMETHODCALLTYPE *get_Arguments)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         BSTR *arguments);
 
     HRESULT (STDMETHODCALLTYPE *put_Arguments)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         BSTR arguments);
 
     HRESULT (STDMETHODCALLTYPE *get_Account)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         FsrmAccountType *account);
 
     HRESULT (STDMETHODCALLTYPE *put_Account)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         FsrmAccountType account);
 
     HRESULT (STDMETHODCALLTYPE *get_WorkingDirectory)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         BSTR *workingDirectory);
 
     HRESULT (STDMETHODCALLTYPE *put_WorkingDirectory)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         BSTR workingDirectory);
 
     HRESULT (STDMETHODCALLTYPE *get_MonitorCommand)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         VARIANT_BOOL *monitorCommand);
 
     HRESULT (STDMETHODCALLTYPE *put_MonitorCommand)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         VARIANT_BOOL monitorCommand);
 
     HRESULT (STDMETHODCALLTYPE *get_KillTimeOut)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         LONG *minutes);
 
     HRESULT (STDMETHODCALLTYPE *put_KillTimeOut)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         LONG minutes);
 
     HRESULT (STDMETHODCALLTYPE *get_LogResult)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         VARIANT_BOOL *logResults);
 
     HRESULT (STDMETHODCALLTYPE *put_LogResult)(
-        IFsrmActionCommand* This,
+        IFsrmActionCommand *This,
         VARIANT_BOOL logResults);
 
     END_INTERFACE
 } IFsrmActionCommandVtbl;
+
 interface IFsrmActionCommand {
     CONST_VTBL IFsrmActionCommandVtbl* lpVtbl;
 };
@@ -1117,118 +1140,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_ExecutablePath_Proxy(
-    IFsrmActionCommand* This,
-    BSTR *executablePath);
-void __RPC_STUB IFsrmActionCommand_get_ExecutablePath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_ExecutablePath_Proxy(
-    IFsrmActionCommand* This,
-    BSTR executablePath);
-void __RPC_STUB IFsrmActionCommand_put_ExecutablePath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_Arguments_Proxy(
-    IFsrmActionCommand* This,
-    BSTR *arguments);
-void __RPC_STUB IFsrmActionCommand_get_Arguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_Arguments_Proxy(
-    IFsrmActionCommand* This,
-    BSTR arguments);
-void __RPC_STUB IFsrmActionCommand_put_Arguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_Account_Proxy(
-    IFsrmActionCommand* This,
-    FsrmAccountType *account);
-void __RPC_STUB IFsrmActionCommand_get_Account_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_Account_Proxy(
-    IFsrmActionCommand* This,
-    FsrmAccountType account);
-void __RPC_STUB IFsrmActionCommand_put_Account_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_WorkingDirectory_Proxy(
-    IFsrmActionCommand* This,
-    BSTR *workingDirectory);
-void __RPC_STUB IFsrmActionCommand_get_WorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_WorkingDirectory_Proxy(
-    IFsrmActionCommand* This,
-    BSTR workingDirectory);
-void __RPC_STUB IFsrmActionCommand_put_WorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_MonitorCommand_Proxy(
-    IFsrmActionCommand* This,
-    VARIANT_BOOL *monitorCommand);
-void __RPC_STUB IFsrmActionCommand_get_MonitorCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_MonitorCommand_Proxy(
-    IFsrmActionCommand* This,
-    VARIANT_BOOL monitorCommand);
-void __RPC_STUB IFsrmActionCommand_put_MonitorCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_KillTimeOut_Proxy(
-    IFsrmActionCommand* This,
-    LONG *minutes);
-void __RPC_STUB IFsrmActionCommand_get_KillTimeOut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_KillTimeOut_Proxy(
-    IFsrmActionCommand* This,
-    LONG minutes);
-void __RPC_STUB IFsrmActionCommand_put_KillTimeOut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_get_LogResult_Proxy(
-    IFsrmActionCommand* This,
-    VARIANT_BOOL *logResults);
-void __RPC_STUB IFsrmActionCommand_get_LogResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionCommand_put_LogResult_Proxy(
-    IFsrmActionCommand* This,
-    VARIANT_BOOL logResults);
-void __RPC_STUB IFsrmActionCommand_put_LogResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmActionCommand_INTERFACE_DEFINED__ */
 
@@ -1265,29 +1176,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmActionEventLog* This);
+        IFsrmActionEventLog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmActionEventLog* This);
+        IFsrmActionEventLog *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1295,7 +1206,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1307,43 +1218,44 @@
 
     /*** IFsrmAction methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionType)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         FsrmActionType *actionType);
 
     HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         LONG *minutes);
 
     HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         LONG minutes);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmActionEventLog* This);
+        IFsrmActionEventLog *This);
 
     /*** IFsrmActionEventLog methods ***/
     HRESULT (STDMETHODCALLTYPE *get_EventType)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         FsrmEventType *eventType);
 
     HRESULT (STDMETHODCALLTYPE *put_EventType)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         FsrmEventType eventType);
 
     HRESULT (STDMETHODCALLTYPE *get_MessageText)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         BSTR *messageText);
 
     HRESULT (STDMETHODCALLTYPE *put_MessageText)(
-        IFsrmActionEventLog* This,
+        IFsrmActionEventLog *This,
         BSTR messageText);
 
     END_INTERFACE
 } IFsrmActionEventLogVtbl;
+
 interface IFsrmActionEventLog {
     CONST_VTBL IFsrmActionEventLogVtbl* lpVtbl;
 };
@@ -1428,38 +1340,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_get_EventType_Proxy(
-    IFsrmActionEventLog* This,
-    FsrmEventType *eventType);
-void __RPC_STUB IFsrmActionEventLog_get_EventType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_put_EventType_Proxy(
-    IFsrmActionEventLog* This,
-    FsrmEventType eventType);
-void __RPC_STUB IFsrmActionEventLog_put_EventType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_get_MessageText_Proxy(
-    IFsrmActionEventLog* This,
-    BSTR *messageText);
-void __RPC_STUB IFsrmActionEventLog_get_MessageText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEventLog_put_MessageText_Proxy(
-    IFsrmActionEventLog* This,
-    BSTR messageText);
-void __RPC_STUB IFsrmActionEventLog_put_MessageText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmActionEventLog_INTERFACE_DEFINED__ */
 
@@ -1496,29 +1376,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmActionReport* This);
+        IFsrmActionReport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmActionReport* This);
+        IFsrmActionReport *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1526,7 +1406,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1538,43 +1418,44 @@
 
     /*** IFsrmAction methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionType)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         FsrmActionType *actionType);
 
     HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         LONG *minutes);
 
     HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         LONG minutes);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmActionReport* This);
+        IFsrmActionReport *This);
 
     /*** IFsrmActionReport methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ReportTypes)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         SAFEARRAY **reportTypes);
 
     HRESULT (STDMETHODCALLTYPE *put_ReportTypes)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         SAFEARRAY *reportTypes);
 
     HRESULT (STDMETHODCALLTYPE *get_MailTo)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         BSTR *mailTo);
 
     HRESULT (STDMETHODCALLTYPE *put_MailTo)(
-        IFsrmActionReport* This,
+        IFsrmActionReport *This,
         BSTR mailTo);
 
     END_INTERFACE
 } IFsrmActionReportVtbl;
+
 interface IFsrmActionReport {
     CONST_VTBL IFsrmActionReportVtbl* lpVtbl;
 };
@@ -1659,38 +1540,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmActionReport_get_ReportTypes_Proxy(
-    IFsrmActionReport* This,
-    SAFEARRAY **reportTypes);
-void __RPC_STUB IFsrmActionReport_get_ReportTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionReport_put_ReportTypes_Proxy(
-    IFsrmActionReport* This,
-    SAFEARRAY *reportTypes);
-void __RPC_STUB IFsrmActionReport_put_ReportTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionReport_get_MailTo_Proxy(
-    IFsrmActionReport* This,
-    BSTR *mailTo);
-void __RPC_STUB IFsrmActionReport_get_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionReport_put_MailTo_Proxy(
-    IFsrmActionReport* This,
-    BSTR mailTo);
-void __RPC_STUB IFsrmActionReport_put_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmActionReport_INTERFACE_DEFINED__ */
 
@@ -1739,29 +1588,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmCollection* This);
+        IFsrmCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmCollection* This);
+        IFsrmCollection *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1769,7 +1618,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1781,37 +1630,38 @@
 
     /*** IFsrmCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         IUnknown **unknown);
 
     HRESULT (STDMETHODCALLTYPE *get_Item)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         LONG index,
         VARIANT *item);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         LONG *count);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         FsrmCollectionState *state);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IFsrmCollection* This);
+        IFsrmCollection *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForCompletion)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         LONG waitSeconds,
         VARIANT_BOOL *completed);
 
     HRESULT (STDMETHODCALLTYPE *GetById)(
-        IFsrmCollection* This,
+        IFsrmCollection *This,
         FSRM_OBJECT_ID id,
         VARIANT *entry);
 
     END_INTERFACE
 } IFsrmCollectionVtbl;
+
 interface IFsrmCollection {
     CONST_VTBL IFsrmCollectionVtbl* lpVtbl;
 };
@@ -1886,64 +1736,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmCollection_get__NewEnum_Proxy(
-    IFsrmCollection* This,
-    IUnknown **unknown);
-void __RPC_STUB IFsrmCollection_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmCollection_get_Item_Proxy(
-    IFsrmCollection* This,
-    LONG index,
-    VARIANT *item);
-void __RPC_STUB IFsrmCollection_get_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmCollection_get_Count_Proxy(
-    IFsrmCollection* This,
-    LONG *count);
-void __RPC_STUB IFsrmCollection_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmCollection_get_State_Proxy(
-    IFsrmCollection* This,
-    FsrmCollectionState *state);
-void __RPC_STUB IFsrmCollection_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmCollection_Cancel_Proxy(
-    IFsrmCollection* This);
-void __RPC_STUB IFsrmCollection_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmCollection_WaitForCompletion_Proxy(
-    IFsrmCollection* This,
-    LONG waitSeconds,
-    VARIANT_BOOL *completed);
-void __RPC_STUB IFsrmCollection_WaitForCompletion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmCollection_GetById_Proxy(
-    IFsrmCollection* This,
-    FSRM_OBJECT_ID id,
-    VARIANT *entry);
-void __RPC_STUB IFsrmCollection_GetById_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmCollection_INTERFACE_DEFINED__ */
 
@@ -1974,29 +1766,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmDerivedObjectsResult* This,
+        IFsrmDerivedObjectsResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmDerivedObjectsResult* This);
+        IFsrmDerivedObjectsResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmDerivedObjectsResult* This);
+        IFsrmDerivedObjectsResult *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmDerivedObjectsResult* This,
+        IFsrmDerivedObjectsResult *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmDerivedObjectsResult* This,
+        IFsrmDerivedObjectsResult *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmDerivedObjectsResult* This,
+        IFsrmDerivedObjectsResult *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2004,7 +1796,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmDerivedObjectsResult* This,
+        IFsrmDerivedObjectsResult *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2016,15 +1808,16 @@
 
     /*** IFsrmDerivedObjectsResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_DerivedObjects)(
-        IFsrmDerivedObjectsResult* This,
+        IFsrmDerivedObjectsResult *This,
         IFsrmCollection **derivedObjects);
 
     HRESULT (STDMETHODCALLTYPE *get_Results)(
-        IFsrmDerivedObjectsResult* This,
+        IFsrmDerivedObjectsResult *This,
         IFsrmCollection **results);
 
     END_INTERFACE
 } IFsrmDerivedObjectsResultVtbl;
+
 interface IFsrmDerivedObjectsResult {
     CONST_VTBL IFsrmDerivedObjectsResultVtbl* lpVtbl;
 };
@@ -2079,22 +1872,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmDerivedObjectsResult_get_DerivedObjects_Proxy(
-    IFsrmDerivedObjectsResult* This,
-    IFsrmCollection **derivedObjects);
-void __RPC_STUB IFsrmDerivedObjectsResult_get_DerivedObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmDerivedObjectsResult_get_Results_Proxy(
-    IFsrmDerivedObjectsResult* This,
-    IFsrmCollection **results);
-void __RPC_STUB IFsrmDerivedObjectsResult_get_Results_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmDerivedObjectsResult_INTERFACE_DEFINED__ */
 
@@ -2152,29 +1929,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmExportImport* This);
+        IFsrmExportImport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmExportImport* This);
+        IFsrmExportImport *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2182,7 +1959,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2194,39 +1971,39 @@
 
     /*** IFsrmExportImport methods ***/
     HRESULT (STDMETHODCALLTYPE *ExportFileGroups)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         BSTR filePath,
         VARIANT *fileGroupNamesSafeArray,
         BSTR remoteHost);
 
     HRESULT (STDMETHODCALLTYPE *ImportFileGroups)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         BSTR filePath,
         VARIANT *fileGroupNamesSafeArray,
         BSTR remoteHost,
         IFsrmCommittableCollection **fileGroups);
 
     HRESULT (STDMETHODCALLTYPE *ExportFileScreenTemplates)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         BSTR filePath,
         VARIANT *templateNamesSafeArray,
         BSTR remoteHost);
 
     HRESULT (STDMETHODCALLTYPE *ImportFileScreenTemplates)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         BSTR filePath,
         VARIANT *templateNamesSafeArray,
         BSTR remoteHost,
         IFsrmCommittableCollection **templates);
 
     HRESULT (STDMETHODCALLTYPE *ExportQuotaTemplates)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         BSTR filePath,
         VARIANT *templateNamesSafeArray,
         BSTR remoteHost);
 
     HRESULT (STDMETHODCALLTYPE *ImportQuotaTemplates)(
-        IFsrmExportImport* This,
+        IFsrmExportImport *This,
         BSTR filePath,
         VARIANT *templateNamesSafeArray,
         BSTR remoteHost,
@@ -2234,6 +2011,7 @@
 
     END_INTERFACE
 } IFsrmExportImportVtbl;
+
 interface IFsrmExportImport {
     CONST_VTBL IFsrmExportImportVtbl* lpVtbl;
 };
@@ -2304,69 +2082,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmExportImport_ExportFileGroups_Proxy(
-    IFsrmExportImport* This,
-    BSTR filePath,
-    VARIANT *fileGroupNamesSafeArray,
-    BSTR remoteHost);
-void __RPC_STUB IFsrmExportImport_ExportFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmExportImport_ImportFileGroups_Proxy(
-    IFsrmExportImport* This,
-    BSTR filePath,
-    VARIANT *fileGroupNamesSafeArray,
-    BSTR remoteHost,
-    IFsrmCommittableCollection **fileGroups);
-void __RPC_STUB IFsrmExportImport_ImportFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmExportImport_ExportFileScreenTemplates_Proxy(
-    IFsrmExportImport* This,
-    BSTR filePath,
-    VARIANT *templateNamesSafeArray,
-    BSTR remoteHost);
-void __RPC_STUB IFsrmExportImport_ExportFileScreenTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmExportImport_ImportFileScreenTemplates_Proxy(
-    IFsrmExportImport* This,
-    BSTR filePath,
-    VARIANT *templateNamesSafeArray,
-    BSTR remoteHost,
-    IFsrmCommittableCollection **templates);
-void __RPC_STUB IFsrmExportImport_ImportFileScreenTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmExportImport_ExportQuotaTemplates_Proxy(
-    IFsrmExportImport* This,
-    BSTR filePath,
-    VARIANT *templateNamesSafeArray,
-    BSTR remoteHost);
-void __RPC_STUB IFsrmExportImport_ExportQuotaTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmExportImport_ImportQuotaTemplates_Proxy(
-    IFsrmExportImport* This,
-    BSTR filePath,
-    VARIANT *templateNamesSafeArray,
-    BSTR remoteHost,
-    IFsrmCommittableCollection **templates);
-void __RPC_STUB IFsrmExportImport_ImportQuotaTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmExportImport_INTERFACE_DEFINED__ */
 
@@ -2406,29 +2121,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmObject* This);
+        IFsrmObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmObject* This);
+        IFsrmObject *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2436,7 +2151,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2448,25 +2163,26 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmObject* This,
+        IFsrmObject *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmObject* This);
+        IFsrmObject *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmObject* This);
+        IFsrmObject *This);
 
     END_INTERFACE
 } IFsrmObjectVtbl;
+
 interface IFsrmObject {
     CONST_VTBL IFsrmObjectVtbl* lpVtbl;
 };
@@ -2533,44 +2249,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmObject_get_Id_Proxy(
-    IFsrmObject* This,
-    FSRM_OBJECT_ID *id);
-void __RPC_STUB IFsrmObject_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmObject_get_Description_Proxy(
-    IFsrmObject* This,
-    BSTR *description);
-void __RPC_STUB IFsrmObject_get_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmObject_put_Description_Proxy(
-    IFsrmObject* This,
-    BSTR description);
-void __RPC_STUB IFsrmObject_put_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmObject_Delete_Proxy(
-    IFsrmObject* This);
-void __RPC_STUB IFsrmObject_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmObject_Commit_Proxy(
-    IFsrmObject* This);
-void __RPC_STUB IFsrmObject_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmObject_INTERFACE_DEFINED__ */
 
@@ -2599,29 +2277,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmPathMapper* This,
+        IFsrmPathMapper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmPathMapper* This);
+        IFsrmPathMapper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmPathMapper* This);
+        IFsrmPathMapper *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmPathMapper* This,
+        IFsrmPathMapper *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmPathMapper* This,
+        IFsrmPathMapper *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmPathMapper* This,
+        IFsrmPathMapper *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2629,7 +2307,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmPathMapper* This,
+        IFsrmPathMapper *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2641,12 +2319,13 @@
 
     /*** IFsrmPathMapper methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSharePathsForLocalPath)(
-        IFsrmPathMapper* This,
+        IFsrmPathMapper *This,
         BSTR localPath,
         SAFEARRAY **sharePaths);
 
     END_INTERFACE
 } IFsrmPathMapperVtbl;
+
 interface IFsrmPathMapper {
     CONST_VTBL IFsrmPathMapperVtbl* lpVtbl;
 };
@@ -2697,15 +2376,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmPathMapper_GetSharePathsForLocalPath_Proxy(
-    IFsrmPathMapper* This,
-    BSTR localPath,
-    SAFEARRAY **sharePaths);
-void __RPC_STUB IFsrmPathMapper_GetSharePathsForLocalPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmPathMapper_INTERFACE_DEFINED__ */
 
@@ -2771,29 +2441,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmSetting* This);
+        IFsrmSetting *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmSetting* This);
+        IFsrmSetting *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2801,7 +2471,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2813,61 +2483,62 @@
 
     /*** IFsrmSetting methods ***/
     HRESULT (STDMETHODCALLTYPE *get_SmtpServer)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         BSTR *smtpServer);
 
     HRESULT (STDMETHODCALLTYPE *put_SmtpServer)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         BSTR smtpServer);
 
     HRESULT (STDMETHODCALLTYPE *get_MailFrom)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         BSTR *mailFrom);
 
     HRESULT (STDMETHODCALLTYPE *put_MailFrom)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         BSTR mailFrom);
 
     HRESULT (STDMETHODCALLTYPE *get_AdminEmail)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         BSTR *adminEmail);
 
     HRESULT (STDMETHODCALLTYPE *put_AdminEmail)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         BSTR adminEmail);
 
     HRESULT (STDMETHODCALLTYPE *get_DisableCommandLine)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         VARIANT_BOOL *disableCommandLine);
 
     HRESULT (STDMETHODCALLTYPE *put_DisableCommandLine)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         VARIANT_BOOL disableCommandLine);
 
     HRESULT (STDMETHODCALLTYPE *get_EnableScreeningAudit)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         VARIANT_BOOL *enableScreeningAudit);
 
     HRESULT (STDMETHODCALLTYPE *put_EnableScreeningAudit)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         VARIANT_BOOL enableScreeningAudit);
 
     HRESULT (STDMETHODCALLTYPE *EmailTest)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         BSTR mailTo);
 
     HRESULT (STDMETHODCALLTYPE *SetActionRunLimitInterval)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         FsrmActionType actionType,
         LONG delayTimeMinutes);
 
     HRESULT (STDMETHODCALLTYPE *GetActionRunLimitInterval)(
-        IFsrmSetting* This,
+        IFsrmSetting *This,
         FsrmActionType actionType,
         LONG *delayTimeMinutes);
 
     END_INTERFACE
 } IFsrmSettingVtbl;
+
 interface IFsrmSetting {
     CONST_VTBL IFsrmSettingVtbl* lpVtbl;
 };
@@ -2966,112 +2637,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmSetting_get_SmtpServer_Proxy(
-    IFsrmSetting* This,
-    BSTR *smtpServer);
-void __RPC_STUB IFsrmSetting_get_SmtpServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_put_SmtpServer_Proxy(
-    IFsrmSetting* This,
-    BSTR smtpServer);
-void __RPC_STUB IFsrmSetting_put_SmtpServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_get_MailFrom_Proxy(
-    IFsrmSetting* This,
-    BSTR *mailFrom);
-void __RPC_STUB IFsrmSetting_get_MailFrom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_put_MailFrom_Proxy(
-    IFsrmSetting* This,
-    BSTR mailFrom);
-void __RPC_STUB IFsrmSetting_put_MailFrom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_get_AdminEmail_Proxy(
-    IFsrmSetting* This,
-    BSTR *adminEmail);
-void __RPC_STUB IFsrmSetting_get_AdminEmail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_put_AdminEmail_Proxy(
-    IFsrmSetting* This,
-    BSTR adminEmail);
-void __RPC_STUB IFsrmSetting_put_AdminEmail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_get_DisableCommandLine_Proxy(
-    IFsrmSetting* This,
-    VARIANT_BOOL *disableCommandLine);
-void __RPC_STUB IFsrmSetting_get_DisableCommandLine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_put_DisableCommandLine_Proxy(
-    IFsrmSetting* This,
-    VARIANT_BOOL disableCommandLine);
-void __RPC_STUB IFsrmSetting_put_DisableCommandLine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_get_EnableScreeningAudit_Proxy(
-    IFsrmSetting* This,
-    VARIANT_BOOL *enableScreeningAudit);
-void __RPC_STUB IFsrmSetting_get_EnableScreeningAudit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_put_EnableScreeningAudit_Proxy(
-    IFsrmSetting* This,
-    VARIANT_BOOL enableScreeningAudit);
-void __RPC_STUB IFsrmSetting_put_EnableScreeningAudit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_EmailTest_Proxy(
-    IFsrmSetting* This,
-    BSTR mailTo);
-void __RPC_STUB IFsrmSetting_EmailTest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_SetActionRunLimitInterval_Proxy(
-    IFsrmSetting* This,
-    FsrmActionType actionType,
-    LONG delayTimeMinutes);
-void __RPC_STUB IFsrmSetting_SetActionRunLimitInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmSetting_GetActionRunLimitInterval_Proxy(
-    IFsrmSetting* This,
-    FsrmActionType actionType,
-    LONG *delayTimeMinutes);
-void __RPC_STUB IFsrmSetting_GetActionRunLimitInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmSetting_INTERFACE_DEFINED__ */
 
@@ -3138,29 +2703,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmActionEmail* This);
+        IFsrmActionEmail *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmActionEmail* This);
+        IFsrmActionEmail *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3168,7 +2733,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3180,83 +2745,84 @@
 
     /*** IFsrmAction methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionType)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         FsrmActionType *actionType);
 
     HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         LONG *minutes);
 
     HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         LONG minutes);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmActionEmail* This);
+        IFsrmActionEmail *This);
 
     /*** IFsrmActionEmail methods ***/
     HRESULT (STDMETHODCALLTYPE *get_MailFrom)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR *mailFrom);
 
     HRESULT (STDMETHODCALLTYPE *put_MailFrom)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR mailFrom);
 
     HRESULT (STDMETHODCALLTYPE *get_MailReplyTo)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR *mailReplyTo);
 
     HRESULT (STDMETHODCALLTYPE *put_MailReplyTo)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR mailReplyTo);
 
     HRESULT (STDMETHODCALLTYPE *get_MailTo)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR *mailTo);
 
     HRESULT (STDMETHODCALLTYPE *put_MailTo)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR mailTo);
 
     HRESULT (STDMETHODCALLTYPE *get_MailCc)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR *mailCc);
 
     HRESULT (STDMETHODCALLTYPE *put_MailCc)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR mailCc);
 
     HRESULT (STDMETHODCALLTYPE *get_MailBcc)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR *mailBcc);
 
     HRESULT (STDMETHODCALLTYPE *put_MailBcc)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR mailBcc);
 
     HRESULT (STDMETHODCALLTYPE *get_MailSubject)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR *mailSubject);
 
     HRESULT (STDMETHODCALLTYPE *put_MailSubject)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR mailSubject);
 
     HRESULT (STDMETHODCALLTYPE *get_MessageText)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR *messageText);
 
     HRESULT (STDMETHODCALLTYPE *put_MessageText)(
-        IFsrmActionEmail* This,
+        IFsrmActionEmail *This,
         BSTR messageText);
 
     END_INTERFACE
 } IFsrmActionEmailVtbl;
+
 interface IFsrmActionEmail {
     CONST_VTBL IFsrmActionEmailVtbl* lpVtbl;
 };
@@ -3381,118 +2947,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailFrom_Proxy(
-    IFsrmActionEmail* This,
-    BSTR *mailFrom);
-void __RPC_STUB IFsrmActionEmail_get_MailFrom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailFrom_Proxy(
-    IFsrmActionEmail* This,
-    BSTR mailFrom);
-void __RPC_STUB IFsrmActionEmail_put_MailFrom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailReplyTo_Proxy(
-    IFsrmActionEmail* This,
-    BSTR *mailReplyTo);
-void __RPC_STUB IFsrmActionEmail_get_MailReplyTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailReplyTo_Proxy(
-    IFsrmActionEmail* This,
-    BSTR mailReplyTo);
-void __RPC_STUB IFsrmActionEmail_put_MailReplyTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailTo_Proxy(
-    IFsrmActionEmail* This,
-    BSTR *mailTo);
-void __RPC_STUB IFsrmActionEmail_get_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailTo_Proxy(
-    IFsrmActionEmail* This,
-    BSTR mailTo);
-void __RPC_STUB IFsrmActionEmail_put_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailCc_Proxy(
-    IFsrmActionEmail* This,
-    BSTR *mailCc);
-void __RPC_STUB IFsrmActionEmail_get_MailCc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailCc_Proxy(
-    IFsrmActionEmail* This,
-    BSTR mailCc);
-void __RPC_STUB IFsrmActionEmail_put_MailCc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailBcc_Proxy(
-    IFsrmActionEmail* This,
-    BSTR *mailBcc);
-void __RPC_STUB IFsrmActionEmail_get_MailBcc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailBcc_Proxy(
-    IFsrmActionEmail* This,
-    BSTR mailBcc);
-void __RPC_STUB IFsrmActionEmail_put_MailBcc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MailSubject_Proxy(
-    IFsrmActionEmail* This,
-    BSTR *mailSubject);
-void __RPC_STUB IFsrmActionEmail_get_MailSubject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MailSubject_Proxy(
-    IFsrmActionEmail* This,
-    BSTR mailSubject);
-void __RPC_STUB IFsrmActionEmail_put_MailSubject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_get_MessageText_Proxy(
-    IFsrmActionEmail* This,
-    BSTR *messageText);
-void __RPC_STUB IFsrmActionEmail_get_MessageText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail_put_MessageText_Proxy(
-    IFsrmActionEmail* This,
-    BSTR messageText);
-void __RPC_STUB IFsrmActionEmail_put_MessageText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmActionEmail_INTERFACE_DEFINED__ */
 
@@ -3523,29 +2977,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmActionEmail2* This);
+        IFsrmActionEmail2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmActionEmail2* This);
+        IFsrmActionEmail2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3553,7 +3007,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3565,92 +3019,93 @@
 
     /*** IFsrmAction methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionType)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         FsrmActionType *actionType);
 
     HRESULT (STDMETHODCALLTYPE *get_RunLimitInterval)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         LONG *minutes);
 
     HRESULT (STDMETHODCALLTYPE *put_RunLimitInterval)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         LONG minutes);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmActionEmail2* This);
+        IFsrmActionEmail2 *This);
 
     /*** IFsrmActionEmail methods ***/
     HRESULT (STDMETHODCALLTYPE *get_MailFrom)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR *mailFrom);
 
     HRESULT (STDMETHODCALLTYPE *put_MailFrom)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR mailFrom);
 
     HRESULT (STDMETHODCALLTYPE *get_MailReplyTo)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR *mailReplyTo);
 
     HRESULT (STDMETHODCALLTYPE *put_MailReplyTo)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR mailReplyTo);
 
     HRESULT (STDMETHODCALLTYPE *get_MailTo)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR *mailTo);
 
     HRESULT (STDMETHODCALLTYPE *put_MailTo)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR mailTo);
 
     HRESULT (STDMETHODCALLTYPE *get_MailCc)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR *mailCc);
 
     HRESULT (STDMETHODCALLTYPE *put_MailCc)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR mailCc);
 
     HRESULT (STDMETHODCALLTYPE *get_MailBcc)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR *mailBcc);
 
     HRESULT (STDMETHODCALLTYPE *put_MailBcc)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR mailBcc);
 
     HRESULT (STDMETHODCALLTYPE *get_MailSubject)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR *mailSubject);
 
     HRESULT (STDMETHODCALLTYPE *put_MailSubject)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR mailSubject);
 
     HRESULT (STDMETHODCALLTYPE *get_MessageText)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR *messageText);
 
     HRESULT (STDMETHODCALLTYPE *put_MessageText)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         BSTR messageText);
 
     /*** IFsrmActionEmail2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_AttachmentFileListSize)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         LONG *attachmentFileListSize);
 
     HRESULT (STDMETHODCALLTYPE *put_AttachmentFileListSize)(
-        IFsrmActionEmail2* This,
+        IFsrmActionEmail2 *This,
         LONG attachmentFileListSize);
 
     END_INTERFACE
 } IFsrmActionEmail2Vtbl;
+
 interface IFsrmActionEmail2 {
     CONST_VTBL IFsrmActionEmail2Vtbl* lpVtbl;
 };
@@ -3785,22 +3240,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail2_get_AttachmentFileListSize_Proxy(
-    IFsrmActionEmail2* This,
-    LONG *attachmentFileListSize);
-void __RPC_STUB IFsrmActionEmail2_get_AttachmentFileListSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmActionEmail2_put_AttachmentFileListSize_Proxy(
-    IFsrmActionEmail2* This,
-    LONG attachmentFileListSize);
-void __RPC_STUB IFsrmActionEmail2_put_AttachmentFileListSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmActionEmail2_INTERFACE_DEFINED__ */
 
@@ -3837,29 +3276,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmMutableCollection* This);
+        IFsrmMutableCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmMutableCollection* This);
+        IFsrmMutableCollection *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3867,7 +3306,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3879,54 +3318,55 @@
 
     /*** IFsrmCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         IUnknown **unknown);
 
     HRESULT (STDMETHODCALLTYPE *get_Item)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         LONG index,
         VARIANT *item);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         LONG *count);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         FsrmCollectionState *state);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IFsrmMutableCollection* This);
+        IFsrmMutableCollection *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForCompletion)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         LONG waitSeconds,
         VARIANT_BOOL *completed);
 
     HRESULT (STDMETHODCALLTYPE *GetById)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         FSRM_OBJECT_ID id,
         VARIANT *entry);
 
     /*** IFsrmMutableCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         VARIANT item);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         LONG index);
 
     HRESULT (STDMETHODCALLTYPE *RemoveById)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         FSRM_OBJECT_ID id);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IFsrmMutableCollection* This,
+        IFsrmMutableCollection *This,
         IFsrmMutableCollection **collection);
 
     END_INTERFACE
 } IFsrmMutableCollectionVtbl;
+
 interface IFsrmMutableCollection {
     CONST_VTBL IFsrmMutableCollectionVtbl* lpVtbl;
 };
@@ -4019,38 +3459,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_Add_Proxy(
-    IFsrmMutableCollection* This,
-    VARIANT item);
-void __RPC_STUB IFsrmMutableCollection_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_Remove_Proxy(
-    IFsrmMutableCollection* This,
-    LONG index);
-void __RPC_STUB IFsrmMutableCollection_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_RemoveById_Proxy(
-    IFsrmMutableCollection* This,
-    FSRM_OBJECT_ID id);
-void __RPC_STUB IFsrmMutableCollection_RemoveById_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmMutableCollection_Clone_Proxy(
-    IFsrmMutableCollection* This,
-    IFsrmMutableCollection **collection);
-void __RPC_STUB IFsrmMutableCollection_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmMutableCollection_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/fsrmenums.h b/mingw-w64-headers/include/fsrmenums.h
index b3d81fc..eb08f1f 100644
--- a/mingw-w64-headers/include/fsrmenums.h
+++ b/mingw-w64-headers/include/fsrmenums.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/fsrmenums.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/fsrmenums.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/fsrmquota.h b/mingw-w64-headers/include/fsrmquota.h
index 757790a..1b330a5 100644
--- a/mingw-w64-headers/include/fsrmquota.h
+++ b/mingw-w64-headers/include/fsrmquota.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/fsrmquota.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/fsrmquota.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,46 +20,73 @@
 #ifndef __IFsrmQuotaManager_FWD_DEFINED__
 #define __IFsrmQuotaManager_FWD_DEFINED__
 typedef interface IFsrmQuotaManager IFsrmQuotaManager;
+#ifdef __cplusplus
+interface IFsrmQuotaManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaTemplateManager_FWD_DEFINED__
 #define __IFsrmQuotaTemplateManager_FWD_DEFINED__
 typedef interface IFsrmQuotaTemplateManager IFsrmQuotaTemplateManager;
+#ifdef __cplusplus
+interface IFsrmQuotaTemplateManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaBase_FWD_DEFINED__
 #define __IFsrmQuotaBase_FWD_DEFINED__
 typedef interface IFsrmQuotaBase IFsrmQuotaBase;
+#ifdef __cplusplus
+interface IFsrmQuotaBase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaObject_FWD_DEFINED__
 #define __IFsrmQuotaObject_FWD_DEFINED__
 typedef interface IFsrmQuotaObject IFsrmQuotaObject;
+#ifdef __cplusplus
+interface IFsrmQuotaObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaTemplate_FWD_DEFINED__
 #define __IFsrmQuotaTemplate_FWD_DEFINED__
 typedef interface IFsrmQuotaTemplate IFsrmQuotaTemplate;
+#ifdef __cplusplus
+interface IFsrmQuotaTemplate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuota_FWD_DEFINED__
 #define __IFsrmQuota_FWD_DEFINED__
 typedef interface IFsrmQuota IFsrmQuota;
+#ifdef __cplusplus
+interface IFsrmQuota;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmAutoApplyQuota_FWD_DEFINED__
 #define __IFsrmAutoApplyQuota_FWD_DEFINED__
 typedef interface IFsrmAutoApplyQuota IFsrmAutoApplyQuota;
+#ifdef __cplusplus
+interface IFsrmAutoApplyQuota;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaManagerEx_FWD_DEFINED__
 #define __IFsrmQuotaManagerEx_FWD_DEFINED__
 typedef interface IFsrmQuotaManagerEx IFsrmQuotaManagerEx;
+#ifdef __cplusplus
+interface IFsrmQuotaManagerEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaTemplateImported_FWD_DEFINED__
 #define __IFsrmQuotaTemplateImported_FWD_DEFINED__
 typedef interface IFsrmQuotaTemplateImported IFsrmQuotaTemplateImported;
+#ifdef __cplusplus
+interface IFsrmQuotaTemplateImported;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -78,41 +105,65 @@
 #ifndef __IFsrmAutoApplyQuota_FWD_DEFINED__
 #define __IFsrmAutoApplyQuota_FWD_DEFINED__
 typedef interface IFsrmAutoApplyQuota IFsrmAutoApplyQuota;
+#ifdef __cplusplus
+interface IFsrmAutoApplyQuota;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuota_FWD_DEFINED__
 #define __IFsrmQuota_FWD_DEFINED__
 typedef interface IFsrmQuota IFsrmQuota;
+#ifdef __cplusplus
+interface IFsrmQuota;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaBase_FWD_DEFINED__
 #define __IFsrmQuotaBase_FWD_DEFINED__
 typedef interface IFsrmQuotaBase IFsrmQuotaBase;
+#ifdef __cplusplus
+interface IFsrmQuotaBase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaObject_FWD_DEFINED__
 #define __IFsrmQuotaObject_FWD_DEFINED__
 typedef interface IFsrmQuotaObject IFsrmQuotaObject;
+#ifdef __cplusplus
+interface IFsrmQuotaObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaManager_FWD_DEFINED__
 #define __IFsrmQuotaManager_FWD_DEFINED__
 typedef interface IFsrmQuotaManager IFsrmQuotaManager;
+#ifdef __cplusplus
+interface IFsrmQuotaManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaTemplate_FWD_DEFINED__
 #define __IFsrmQuotaTemplate_FWD_DEFINED__
 typedef interface IFsrmQuotaTemplate IFsrmQuotaTemplate;
+#ifdef __cplusplus
+interface IFsrmQuotaTemplate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaTemplateImported_FWD_DEFINED__
 #define __IFsrmQuotaTemplateImported_FWD_DEFINED__
 typedef interface IFsrmQuotaTemplateImported IFsrmQuotaTemplateImported;
+#ifdef __cplusplus
+interface IFsrmQuotaTemplateImported;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmQuotaTemplateManager_FWD_DEFINED__
 #define __IFsrmQuotaTemplateManager_FWD_DEFINED__
 typedef interface IFsrmQuotaTemplateManager IFsrmQuotaTemplateManager;
+#ifdef __cplusplus
+interface IFsrmQuotaTemplateManager;
+#endif /* __cplusplus */
 #endif
 
 typedef LONG FSRM_QUOTA_THRESHOLD;
@@ -213,29 +264,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuotaManager* This);
+        IFsrmQuotaManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuotaManager* This);
+        IFsrmQuotaManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -243,7 +294,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -255,67 +306,68 @@
 
     /*** IFsrmQuotaManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ActionVariables)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         SAFEARRAY **variables);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         SAFEARRAY **descriptions);
 
     HRESULT (STDMETHODCALLTYPE *CreateQuota)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR path,
         IFsrmQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *CreateAutoApplyQuota)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR quotaTemplateName,
         BSTR path,
         IFsrmAutoApplyQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *GetQuota)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR path,
         IFsrmQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *GetAutoApplyQuota)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR path,
         IFsrmAutoApplyQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *GetRestrictiveQuota)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR path,
         IFsrmQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *EnumQuotas)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **quotas);
 
     HRESULT (STDMETHODCALLTYPE *EnumAutoApplyQuotas)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **quotas);
 
     HRESULT (STDMETHODCALLTYPE *EnumEffectiveQuotas)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **quotas);
 
     HRESULT (STDMETHODCALLTYPE *Scan)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         BSTR strPath);
 
     HRESULT (STDMETHODCALLTYPE *CreateQuotaCollection)(
-        IFsrmQuotaManager* This,
+        IFsrmQuotaManager *This,
         IFsrmCommittableCollection **collection);
 
     END_INTERFACE
 } IFsrmQuotaManagerVtbl;
+
 interface IFsrmQuotaManager {
     CONST_VTBL IFsrmQuotaManagerVtbl* lpVtbl;
 };
@@ -410,114 +462,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_get_ActionVariables_Proxy(
-    IFsrmQuotaManager* This,
-    SAFEARRAY **variables);
-void __RPC_STUB IFsrmQuotaManager_get_ActionVariables_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_get_ActionVariableDescriptions_Proxy(
-    IFsrmQuotaManager* This,
-    SAFEARRAY **descriptions);
-void __RPC_STUB IFsrmQuotaManager_get_ActionVariableDescriptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_CreateQuota_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR path,
-    IFsrmQuota **quota);
-void __RPC_STUB IFsrmQuotaManager_CreateQuota_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_CreateAutoApplyQuota_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR quotaTemplateName,
-    BSTR path,
-    IFsrmAutoApplyQuota **quota);
-void __RPC_STUB IFsrmQuotaManager_CreateAutoApplyQuota_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_GetQuota_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR path,
-    IFsrmQuota **quota);
-void __RPC_STUB IFsrmQuotaManager_GetQuota_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_GetAutoApplyQuota_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR path,
-    IFsrmAutoApplyQuota **quota);
-void __RPC_STUB IFsrmQuotaManager_GetAutoApplyQuota_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_GetRestrictiveQuota_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR path,
-    IFsrmQuota **quota);
-void __RPC_STUB IFsrmQuotaManager_GetRestrictiveQuota_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_EnumQuotas_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR path,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **quotas);
-void __RPC_STUB IFsrmQuotaManager_EnumQuotas_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_EnumAutoApplyQuotas_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR path,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **quotas);
-void __RPC_STUB IFsrmQuotaManager_EnumAutoApplyQuotas_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_EnumEffectiveQuotas_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR path,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **quotas);
-void __RPC_STUB IFsrmQuotaManager_EnumEffectiveQuotas_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_Scan_Proxy(
-    IFsrmQuotaManager* This,
-    BSTR strPath);
-void __RPC_STUB IFsrmQuotaManager_Scan_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManager_CreateQuotaCollection_Proxy(
-    IFsrmQuotaManager* This,
-    IFsrmCommittableCollection **collection);
-void __RPC_STUB IFsrmQuotaManager_CreateQuotaCollection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuotaManager_INTERFACE_DEFINED__ */
 
@@ -562,29 +506,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuotaTemplateManager* This);
+        IFsrmQuotaTemplateManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuotaTemplateManager* This);
+        IFsrmQuotaTemplateManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -592,7 +536,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -604,32 +548,33 @@
 
     /*** IFsrmQuotaTemplateManager methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateTemplate)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         IFsrmQuotaTemplate **quotaTemplate);
 
     HRESULT (STDMETHODCALLTYPE *GetTemplate)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         BSTR name,
         IFsrmQuotaTemplate **quotaTemplate);
 
     HRESULT (STDMETHODCALLTYPE *EnumTemplates)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **quotaTemplates);
 
     HRESULT (STDMETHODCALLTYPE *ExportTemplates)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         VARIANT *quotaTemplateNamesArray,
         BSTR *serializedQuotaTemplates);
 
     HRESULT (STDMETHODCALLTYPE *ImportTemplates)(
-        IFsrmQuotaTemplateManager* This,
+        IFsrmQuotaTemplateManager *This,
         BSTR serializedQuotaTemplates,
         VARIANT *quotaTemplateNamesArray,
         IFsrmCommittableCollection **quotaTemplates);
 
     END_INTERFACE
 } IFsrmQuotaTemplateManagerVtbl;
+
 interface IFsrmQuotaTemplateManager {
     CONST_VTBL IFsrmQuotaTemplateManagerVtbl* lpVtbl;
 };
@@ -696,51 +641,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_CreateTemplate_Proxy(
-    IFsrmQuotaTemplateManager* This,
-    IFsrmQuotaTemplate **quotaTemplate);
-void __RPC_STUB IFsrmQuotaTemplateManager_CreateTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_GetTemplate_Proxy(
-    IFsrmQuotaTemplateManager* This,
-    BSTR name,
-    IFsrmQuotaTemplate **quotaTemplate);
-void __RPC_STUB IFsrmQuotaTemplateManager_GetTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_EnumTemplates_Proxy(
-    IFsrmQuotaTemplateManager* This,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **quotaTemplates);
-void __RPC_STUB IFsrmQuotaTemplateManager_EnumTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_ExportTemplates_Proxy(
-    IFsrmQuotaTemplateManager* This,
-    VARIANT *quotaTemplateNamesArray,
-    BSTR *serializedQuotaTemplates);
-void __RPC_STUB IFsrmQuotaTemplateManager_ExportTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateManager_ImportTemplates_Proxy(
-    IFsrmQuotaTemplateManager* This,
-    BSTR serializedQuotaTemplates,
-    VARIANT *quotaTemplateNamesArray,
-    IFsrmCommittableCollection **quotaTemplates);
-void __RPC_STUB IFsrmQuotaTemplateManager_ImportTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuotaTemplateManager_INTERFACE_DEFINED__ */
 
@@ -799,29 +699,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuotaBase* This);
+        IFsrmQuotaBase *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuotaBase* This);
+        IFsrmQuotaBase *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -829,7 +729,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -841,70 +741,71 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmQuotaBase* This);
+        IFsrmQuotaBase *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmQuotaBase* This);
+        IFsrmQuotaBase *This);
 
     /*** IFsrmQuotaBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         VARIANT *quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         VARIANT quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         LONG *quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         LONG quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_Thresholds)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         SAFEARRAY **thresholds);
 
     HRESULT (STDMETHODCALLTYPE *AddThreshold)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *DeleteThreshold)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *ModifyThreshold)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FSRM_QUOTA_THRESHOLD newThreshold);
 
     HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)(
-        IFsrmQuotaBase* This,
+        IFsrmQuotaBase *This,
         FSRM_QUOTA_THRESHOLD threshold,
         IFsrmCollection **actions);
 
     END_INTERFACE
 } IFsrmQuotaBaseVtbl;
+
 interface IFsrmQuotaBase {
     CONST_VTBL IFsrmQuotaBaseVtbl* lpVtbl;
 };
@@ -1013,90 +914,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_get_QuotaLimit_Proxy(
-    IFsrmQuotaBase* This,
-    VARIANT *quotaLimit);
-void __RPC_STUB IFsrmQuotaBase_get_QuotaLimit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_put_QuotaLimit_Proxy(
-    IFsrmQuotaBase* This,
-    VARIANT quotaLimit);
-void __RPC_STUB IFsrmQuotaBase_put_QuotaLimit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_get_QuotaFlags_Proxy(
-    IFsrmQuotaBase* This,
-    LONG *quotaFlags);
-void __RPC_STUB IFsrmQuotaBase_get_QuotaFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_put_QuotaFlags_Proxy(
-    IFsrmQuotaBase* This,
-    LONG quotaFlags);
-void __RPC_STUB IFsrmQuotaBase_put_QuotaFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_get_Thresholds_Proxy(
-    IFsrmQuotaBase* This,
-    SAFEARRAY **thresholds);
-void __RPC_STUB IFsrmQuotaBase_get_Thresholds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_AddThreshold_Proxy(
-    IFsrmQuotaBase* This,
-    FSRM_QUOTA_THRESHOLD threshold);
-void __RPC_STUB IFsrmQuotaBase_AddThreshold_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_DeleteThreshold_Proxy(
-    IFsrmQuotaBase* This,
-    FSRM_QUOTA_THRESHOLD threshold);
-void __RPC_STUB IFsrmQuotaBase_DeleteThreshold_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_ModifyThreshold_Proxy(
-    IFsrmQuotaBase* This,
-    FSRM_QUOTA_THRESHOLD threshold,
-    FSRM_QUOTA_THRESHOLD newThreshold);
-void __RPC_STUB IFsrmQuotaBase_ModifyThreshold_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_CreateThresholdAction_Proxy(
-    IFsrmQuotaBase* This,
-    FSRM_QUOTA_THRESHOLD threshold,
-    FsrmActionType actionType,
-    IFsrmAction **action);
-void __RPC_STUB IFsrmQuotaBase_CreateThresholdAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaBase_EnumThresholdActions_Proxy(
-    IFsrmQuotaBase* This,
-    FSRM_QUOTA_THRESHOLD threshold,
-    IFsrmCollection **actions);
-void __RPC_STUB IFsrmQuotaBase_EnumThresholdActions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuotaBase_INTERFACE_DEFINED__ */
 
@@ -1139,29 +956,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuotaObject* This);
+        IFsrmQuotaObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuotaObject* This);
+        IFsrmQuotaObject *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1169,7 +986,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1181,95 +998,96 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmQuotaObject* This);
+        IFsrmQuotaObject *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmQuotaObject* This);
+        IFsrmQuotaObject *This);
 
     /*** IFsrmQuotaBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         VARIANT *quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         VARIANT quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         LONG *quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         LONG quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_Thresholds)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         SAFEARRAY **thresholds);
 
     HRESULT (STDMETHODCALLTYPE *AddThreshold)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *DeleteThreshold)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *ModifyThreshold)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FSRM_QUOTA_THRESHOLD newThreshold);
 
     HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         FSRM_QUOTA_THRESHOLD threshold,
         IFsrmCollection **actions);
 
     /*** IFsrmQuotaObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *get_UserSid)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         BSTR *userSid);
 
     HRESULT (STDMETHODCALLTYPE *get_UserAccount)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         BSTR *userAccount);
 
     HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         BSTR *quotaTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         VARIANT_BOOL *matches);
 
     HRESULT (STDMETHODCALLTYPE *ApplyTemplate)(
-        IFsrmQuotaObject* This,
+        IFsrmQuotaObject *This,
         BSTR quotaTemplateName);
 
     END_INTERFACE
 } IFsrmQuotaObjectVtbl;
+
 interface IFsrmQuotaObject {
     CONST_VTBL IFsrmQuotaObjectVtbl* lpVtbl;
 };
@@ -1404,54 +1222,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_Path_Proxy(
-    IFsrmQuotaObject* This,
-    BSTR *path);
-void __RPC_STUB IFsrmQuotaObject_get_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_UserSid_Proxy(
-    IFsrmQuotaObject* This,
-    BSTR *userSid);
-void __RPC_STUB IFsrmQuotaObject_get_UserSid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_UserAccount_Proxy(
-    IFsrmQuotaObject* This,
-    BSTR *userAccount);
-void __RPC_STUB IFsrmQuotaObject_get_UserAccount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_SourceTemplateName_Proxy(
-    IFsrmQuotaObject* This,
-    BSTR *quotaTemplateName);
-void __RPC_STUB IFsrmQuotaObject_get_SourceTemplateName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_get_MatchesSourceTemplate_Proxy(
-    IFsrmQuotaObject* This,
-    VARIANT_BOOL *matches);
-void __RPC_STUB IFsrmQuotaObject_get_MatchesSourceTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaObject_ApplyTemplate_Proxy(
-    IFsrmQuotaObject* This,
-    BSTR quotaTemplateName);
-void __RPC_STUB IFsrmQuotaObject_ApplyTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuotaObject_INTERFACE_DEFINED__ */
 
@@ -1490,29 +1260,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuotaTemplate* This);
+        IFsrmQuotaTemplate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuotaTemplate* This);
+        IFsrmQuotaTemplate *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1520,7 +1290,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1532,89 +1302,90 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmQuotaTemplate* This);
+        IFsrmQuotaTemplate *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmQuotaTemplate* This);
+        IFsrmQuotaTemplate *This);
 
     /*** IFsrmQuotaBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         VARIANT *quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         VARIANT quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         LONG *quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         LONG quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_Thresholds)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         SAFEARRAY **thresholds);
 
     HRESULT (STDMETHODCALLTYPE *AddThreshold)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *DeleteThreshold)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *ModifyThreshold)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FSRM_QUOTA_THRESHOLD newThreshold);
 
     HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         FSRM_QUOTA_THRESHOLD threshold,
         IFsrmCollection **actions);
 
     /*** IFsrmQuotaTemplate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *CopyTemplate)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         BSTR quotaTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)(
-        IFsrmQuotaTemplate* This,
+        IFsrmQuotaTemplate *This,
         FsrmCommitOptions commitOptions,
         FsrmTemplateApplyOptions applyOptions,
         IFsrmDerivedObjectsResult **derivedObjectsResult);
 
     END_INTERFACE
 } IFsrmQuotaTemplateVtbl;
+
 interface IFsrmQuotaTemplate {
     CONST_VTBL IFsrmQuotaTemplateVtbl* lpVtbl;
 };
@@ -1741,40 +1512,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_get_Name_Proxy(
-    IFsrmQuotaTemplate* This,
-    BSTR *name);
-void __RPC_STUB IFsrmQuotaTemplate_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_put_Name_Proxy(
-    IFsrmQuotaTemplate* This,
-    BSTR name);
-void __RPC_STUB IFsrmQuotaTemplate_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_CopyTemplate_Proxy(
-    IFsrmQuotaTemplate* This,
-    BSTR quotaTemplateName);
-void __RPC_STUB IFsrmQuotaTemplate_CopyTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplate_CommitAndUpdateDerived_Proxy(
-    IFsrmQuotaTemplate* This,
-    FsrmCommitOptions commitOptions,
-    FsrmTemplateApplyOptions applyOptions,
-    IFsrmDerivedObjectsResult **derivedObjectsResult);
-void __RPC_STUB IFsrmQuotaTemplate_CommitAndUpdateDerived_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuotaTemplate_INTERFACE_DEFINED__ */
 
@@ -1814,29 +1551,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuota* This);
+        IFsrmQuota *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuota* This);
+        IFsrmQuota *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1844,7 +1581,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1856,114 +1593,115 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmQuota* This);
+        IFsrmQuota *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmQuota* This);
+        IFsrmQuota *This);
 
     /*** IFsrmQuotaBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         VARIANT *quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         VARIANT quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         LONG *quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         LONG quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_Thresholds)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         SAFEARRAY **thresholds);
 
     HRESULT (STDMETHODCALLTYPE *AddThreshold)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *DeleteThreshold)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *ModifyThreshold)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FSRM_QUOTA_THRESHOLD newThreshold);
 
     HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         FSRM_QUOTA_THRESHOLD threshold,
         IFsrmCollection **actions);
 
     /*** IFsrmQuotaObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *get_UserSid)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         BSTR *userSid);
 
     HRESULT (STDMETHODCALLTYPE *get_UserAccount)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         BSTR *userAccount);
 
     HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         BSTR *quotaTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         VARIANT_BOOL *matches);
 
     HRESULT (STDMETHODCALLTYPE *ApplyTemplate)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         BSTR quotaTemplateName);
 
     /*** IFsrmQuota methods ***/
     HRESULT (STDMETHODCALLTYPE *get_QuotaUsed)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         VARIANT *used);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaPeakUsage)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         VARIANT *peakUsage);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaPeakUsageTime)(
-        IFsrmQuota* This,
+        IFsrmQuota *This,
         DATE *peakUsageDateTime);
 
     HRESULT (STDMETHODCALLTYPE *ResetPeakUsage)(
-        IFsrmQuota* This);
+        IFsrmQuota *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshUsageProperties)(
-        IFsrmQuota* This);
+        IFsrmQuota *This);
 
     END_INTERFACE
 } IFsrmQuotaVtbl;
+
 interface IFsrmQuota {
     CONST_VTBL IFsrmQuotaVtbl* lpVtbl;
 };
@@ -2120,44 +1858,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuota_get_QuotaUsed_Proxy(
-    IFsrmQuota* This,
-    VARIANT *used);
-void __RPC_STUB IFsrmQuota_get_QuotaUsed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuota_get_QuotaPeakUsage_Proxy(
-    IFsrmQuota* This,
-    VARIANT *peakUsage);
-void __RPC_STUB IFsrmQuota_get_QuotaPeakUsage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuota_get_QuotaPeakUsageTime_Proxy(
-    IFsrmQuota* This,
-    DATE *peakUsageDateTime);
-void __RPC_STUB IFsrmQuota_get_QuotaPeakUsageTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuota_ResetPeakUsage_Proxy(
-    IFsrmQuota* This);
-void __RPC_STUB IFsrmQuota_ResetPeakUsage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuota_RefreshUsageProperties_Proxy(
-    IFsrmQuota* This);
-void __RPC_STUB IFsrmQuota_RefreshUsageProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuota_INTERFACE_DEFINED__ */
 
@@ -2193,29 +1893,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmAutoApplyQuota* This);
+        IFsrmAutoApplyQuota *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmAutoApplyQuota* This);
+        IFsrmAutoApplyQuota *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2223,7 +1923,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2235,110 +1935,111 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmAutoApplyQuota* This);
+        IFsrmAutoApplyQuota *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmAutoApplyQuota* This);
+        IFsrmAutoApplyQuota *This);
 
     /*** IFsrmQuotaBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         VARIANT *quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         VARIANT quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         LONG *quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         LONG quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_Thresholds)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         SAFEARRAY **thresholds);
 
     HRESULT (STDMETHODCALLTYPE *AddThreshold)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *DeleteThreshold)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *ModifyThreshold)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FSRM_QUOTA_THRESHOLD newThreshold);
 
     HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         FSRM_QUOTA_THRESHOLD threshold,
         IFsrmCollection **actions);
 
     /*** IFsrmQuotaObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *get_UserSid)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         BSTR *userSid);
 
     HRESULT (STDMETHODCALLTYPE *get_UserAccount)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         BSTR *userAccount);
 
     HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         BSTR *quotaTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         VARIANT_BOOL *matches);
 
     HRESULT (STDMETHODCALLTYPE *ApplyTemplate)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         BSTR quotaTemplateName);
 
     /*** IFsrmAutoApplyQuota methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ExcludeFolders)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         SAFEARRAY **folders);
 
     HRESULT (STDMETHODCALLTYPE *put_ExcludeFolders)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         SAFEARRAY *folders);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)(
-        IFsrmAutoApplyQuota* This,
+        IFsrmAutoApplyQuota *This,
         FsrmCommitOptions commitOptions,
         FsrmTemplateApplyOptions applyOptions,
         IFsrmDerivedObjectsResult **derivedObjectsResult);
 
     END_INTERFACE
 } IFsrmAutoApplyQuotaVtbl;
+
 interface IFsrmAutoApplyQuota {
     CONST_VTBL IFsrmAutoApplyQuotaVtbl* lpVtbl;
 };
@@ -2487,32 +2188,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmAutoApplyQuota_get_ExcludeFolders_Proxy(
-    IFsrmAutoApplyQuota* This,
-    SAFEARRAY **folders);
-void __RPC_STUB IFsrmAutoApplyQuota_get_ExcludeFolders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmAutoApplyQuota_put_ExcludeFolders_Proxy(
-    IFsrmAutoApplyQuota* This,
-    SAFEARRAY *folders);
-void __RPC_STUB IFsrmAutoApplyQuota_put_ExcludeFolders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmAutoApplyQuota_CommitAndUpdateDerived_Proxy(
-    IFsrmAutoApplyQuota* This,
-    FsrmCommitOptions commitOptions,
-    FsrmTemplateApplyOptions applyOptions,
-    IFsrmDerivedObjectsResult **derivedObjectsResult);
-void __RPC_STUB IFsrmAutoApplyQuota_CommitAndUpdateDerived_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmAutoApplyQuota_INTERFACE_DEFINED__ */
 
@@ -2542,29 +2217,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuotaManagerEx* This);
+        IFsrmQuotaManagerEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuotaManagerEx* This);
+        IFsrmQuotaManagerEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2572,7 +2247,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2584,74 +2259,75 @@
 
     /*** IFsrmQuotaManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ActionVariables)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         SAFEARRAY **variables);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         SAFEARRAY **descriptions);
 
     HRESULT (STDMETHODCALLTYPE *CreateQuota)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         IFsrmQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *CreateAutoApplyQuota)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR quotaTemplateName,
         BSTR path,
         IFsrmAutoApplyQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *GetQuota)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         IFsrmQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *GetAutoApplyQuota)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         IFsrmAutoApplyQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *GetRestrictiveQuota)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         IFsrmQuota **quota);
 
     HRESULT (STDMETHODCALLTYPE *EnumQuotas)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **quotas);
 
     HRESULT (STDMETHODCALLTYPE *EnumAutoApplyQuotas)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **quotas);
 
     HRESULT (STDMETHODCALLTYPE *EnumEffectiveQuotas)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **quotas);
 
     HRESULT (STDMETHODCALLTYPE *Scan)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR strPath);
 
     HRESULT (STDMETHODCALLTYPE *CreateQuotaCollection)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         IFsrmCommittableCollection **collection);
 
     /*** IFsrmQuotaManagerEx methods ***/
     HRESULT (STDMETHODCALLTYPE *IsAffectedByQuota)(
-        IFsrmQuotaManagerEx* This,
+        IFsrmQuotaManagerEx *This,
         BSTR path,
         FsrmEnumOptions options,
         VARIANT_BOOL *affected);
 
     END_INTERFACE
 } IFsrmQuotaManagerExVtbl;
+
 interface IFsrmQuotaManagerEx {
     CONST_VTBL IFsrmQuotaManagerExVtbl* lpVtbl;
 };
@@ -2752,16 +2428,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuotaManagerEx_IsAffectedByQuota_Proxy(
-    IFsrmQuotaManagerEx* This,
-    BSTR path,
-    FsrmEnumOptions options,
-    VARIANT_BOOL *affected);
-void __RPC_STUB IFsrmQuotaManagerEx_IsAffectedByQuota_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuotaManagerEx_INTERFACE_DEFINED__ */
 
@@ -2792,29 +2458,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmQuotaTemplateImported* This);
+        IFsrmQuotaTemplateImported *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmQuotaTemplateImported* This);
+        IFsrmQuotaTemplateImported *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2822,7 +2488,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2834,98 +2500,99 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmQuotaTemplateImported* This);
+        IFsrmQuotaTemplateImported *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmQuotaTemplateImported* This);
+        IFsrmQuotaTemplateImported *This);
 
     /*** IFsrmQuotaBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_QuotaLimit)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         VARIANT *quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaLimit)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         VARIANT quotaLimit);
 
     HRESULT (STDMETHODCALLTYPE *get_QuotaFlags)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         LONG *quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_QuotaFlags)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         LONG quotaFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_Thresholds)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         SAFEARRAY **thresholds);
 
     HRESULT (STDMETHODCALLTYPE *AddThreshold)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *DeleteThreshold)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         FSRM_QUOTA_THRESHOLD threshold);
 
     HRESULT (STDMETHODCALLTYPE *ModifyThreshold)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FSRM_QUOTA_THRESHOLD newThreshold);
 
     HRESULT (STDMETHODCALLTYPE *CreateThresholdAction)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         FSRM_QUOTA_THRESHOLD threshold,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumThresholdActions)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         FSRM_QUOTA_THRESHOLD threshold,
         IFsrmCollection **actions);
 
     /*** IFsrmQuotaTemplate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *CopyTemplate)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         BSTR quotaTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         FsrmCommitOptions commitOptions,
         FsrmTemplateApplyOptions applyOptions,
         IFsrmDerivedObjectsResult **derivedObjectsResult);
 
     /*** IFsrmQuotaTemplateImported methods ***/
     HRESULT (STDMETHODCALLTYPE *get_OverwriteOnCommit)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         VARIANT_BOOL *overwrite);
 
     HRESULT (STDMETHODCALLTYPE *put_OverwriteOnCommit)(
-        IFsrmQuotaTemplateImported* This,
+        IFsrmQuotaTemplateImported *This,
         VARIANT_BOOL overwrite);
 
     END_INTERFACE
 } IFsrmQuotaTemplateImportedVtbl;
+
 interface IFsrmQuotaTemplateImported {
     CONST_VTBL IFsrmQuotaTemplateImportedVtbl* lpVtbl;
 };
@@ -3062,22 +2729,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateImported_get_OverwriteOnCommit_Proxy(
-    IFsrmQuotaTemplateImported* This,
-    VARIANT_BOOL *overwrite);
-void __RPC_STUB IFsrmQuotaTemplateImported_get_OverwriteOnCommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmQuotaTemplateImported_put_OverwriteOnCommit_Proxy(
-    IFsrmQuotaTemplateImported* This,
-    VARIANT_BOOL overwrite);
-void __RPC_STUB IFsrmQuotaTemplateImported_put_OverwriteOnCommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmQuotaTemplateImported_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/fsrmreports.h b/mingw-w64-headers/include/fsrmreports.h
index eb8c099..b88f19c 100644
--- a/mingw-w64-headers/include/fsrmreports.h
+++ b/mingw-w64-headers/include/fsrmreports.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/fsrmreports.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/fsrmreports.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,46 +20,73 @@
 #ifndef __IFsrmReport_FWD_DEFINED__
 #define __IFsrmReport_FWD_DEFINED__
 typedef interface IFsrmReport IFsrmReport;
+#ifdef __cplusplus
+interface IFsrmReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmReportScheduler_FWD_DEFINED__
 #define __IFsrmReportScheduler_FWD_DEFINED__
 typedef interface IFsrmReportScheduler IFsrmReportScheduler;
+#ifdef __cplusplus
+interface IFsrmReportScheduler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileManagementJobManager_FWD_DEFINED__
 #define __IFsrmFileManagementJobManager_FWD_DEFINED__
 typedef interface IFsrmFileManagementJobManager IFsrmFileManagementJobManager;
+#ifdef __cplusplus
+interface IFsrmFileManagementJobManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmPropertyCondition_FWD_DEFINED__
 #define __IFsrmPropertyCondition_FWD_DEFINED__
 typedef interface IFsrmPropertyCondition IFsrmPropertyCondition;
+#ifdef __cplusplus
+interface IFsrmPropertyCondition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmReportManager_FWD_DEFINED__
 #define __IFsrmReportManager_FWD_DEFINED__
 typedef interface IFsrmReportManager IFsrmReportManager;
+#ifdef __cplusplus
+interface IFsrmReportManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmReportJob_FWD_DEFINED__
 #define __IFsrmReportJob_FWD_DEFINED__
 typedef interface IFsrmReportJob IFsrmReportJob;
+#ifdef __cplusplus
+interface IFsrmReportJob;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileManagementJob_FWD_DEFINED__
 #define __IFsrmFileManagementJob_FWD_DEFINED__
 typedef interface IFsrmFileManagementJob IFsrmFileManagementJob;
+#ifdef __cplusplus
+interface IFsrmFileManagementJob;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileCondition_FWD_DEFINED__
 #define __IFsrmFileCondition_FWD_DEFINED__
 typedef interface IFsrmFileCondition IFsrmFileCondition;
+#ifdef __cplusplus
+interface IFsrmFileCondition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileConditionProperty_FWD_DEFINED__
 #define __IFsrmFileConditionProperty_FWD_DEFINED__
 typedef interface IFsrmFileConditionProperty IFsrmFileConditionProperty;
+#ifdef __cplusplus
+interface IFsrmFileConditionProperty;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -78,31 +105,49 @@
 #ifndef __IFsrmFileManagementJob_FWD_DEFINED__
 #define __IFsrmFileManagementJob_FWD_DEFINED__
 typedef interface IFsrmFileManagementJob IFsrmFileManagementJob;
+#ifdef __cplusplus
+interface IFsrmFileManagementJob;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileManagementJobManager_FWD_DEFINED__
 #define __IFsrmFileManagementJobManager_FWD_DEFINED__
 typedef interface IFsrmFileManagementJobManager IFsrmFileManagementJobManager;
+#ifdef __cplusplus
+interface IFsrmFileManagementJobManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmPropertyCondition_FWD_DEFINED__
 #define __IFsrmPropertyCondition_FWD_DEFINED__
 typedef interface IFsrmPropertyCondition IFsrmPropertyCondition;
+#ifdef __cplusplus
+interface IFsrmPropertyCondition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmReport_FWD_DEFINED__
 #define __IFsrmReport_FWD_DEFINED__
 typedef interface IFsrmReport IFsrmReport;
+#ifdef __cplusplus
+interface IFsrmReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmReportJob_FWD_DEFINED__
 #define __IFsrmReportJob_FWD_DEFINED__
 typedef interface IFsrmReportJob IFsrmReportJob;
+#ifdef __cplusplus
+interface IFsrmReportJob;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmReportManager_FWD_DEFINED__
 #define __IFsrmReportManager_FWD_DEFINED__
 typedef interface IFsrmReportManager IFsrmReportManager;
+#ifdef __cplusplus
+interface IFsrmReportManager;
+#endif /* __cplusplus */
 #endif
 
 #define FSRM_DISPID_REPORT_MANAGER (FSRM_DISPID_FEATURE_REPORTS | 0x100000)
@@ -177,29 +222,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmReport* This);
+        IFsrmReport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmReport* This);
+        IFsrmReport *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -207,7 +252,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -219,44 +264,45 @@
 
     /*** IFsrmReport methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         FsrmReportType *reportType);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *get_LastGeneratedFileNamePrefix)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         BSTR *prefix);
 
     HRESULT (STDMETHODCALLTYPE *GetFilter)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         FsrmReportFilter filter,
         VARIANT *filterValue);
 
     HRESULT (STDMETHODCALLTYPE *SetFilter)(
-        IFsrmReport* This,
+        IFsrmReport *This,
         FsrmReportFilter filter,
         VARIANT filterValue);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmReport* This);
+        IFsrmReport *This);
 
     END_INTERFACE
 } IFsrmReportVtbl;
+
 interface IFsrmReport {
     CONST_VTBL IFsrmReportVtbl* lpVtbl;
 };
@@ -339,79 +385,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmReport_get_Type_Proxy(
-    IFsrmReport* This,
-    FsrmReportType *reportType);
-void __RPC_STUB IFsrmReport_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_get_Name_Proxy(
-    IFsrmReport* This,
-    BSTR *name);
-void __RPC_STUB IFsrmReport_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_put_Name_Proxy(
-    IFsrmReport* This,
-    BSTR name);
-void __RPC_STUB IFsrmReport_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_get_Description_Proxy(
-    IFsrmReport* This,
-    BSTR *description);
-void __RPC_STUB IFsrmReport_get_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_put_Description_Proxy(
-    IFsrmReport* This,
-    BSTR description);
-void __RPC_STUB IFsrmReport_put_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_get_LastGeneratedFileNamePrefix_Proxy(
-    IFsrmReport* This,
-    BSTR *prefix);
-void __RPC_STUB IFsrmReport_get_LastGeneratedFileNamePrefix_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_GetFilter_Proxy(
-    IFsrmReport* This,
-    FsrmReportFilter filter,
-    VARIANT *filterValue);
-void __RPC_STUB IFsrmReport_GetFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_SetFilter_Proxy(
-    IFsrmReport* This,
-    FsrmReportFilter filter,
-    VARIANT filterValue);
-void __RPC_STUB IFsrmReport_SetFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReport_Delete_Proxy(
-    IFsrmReport* This);
-void __RPC_STUB IFsrmReport_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmReport_INTERFACE_DEFINED__ */
 
@@ -452,29 +425,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmReportScheduler* This);
+        IFsrmReportScheduler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmReportScheduler* This);
+        IFsrmReportScheduler *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -482,7 +455,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -494,27 +467,28 @@
 
     /*** IFsrmReportScheduler methods ***/
     HRESULT (STDMETHODCALLTYPE *VerifyNamespaces)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         VARIANT *namespacesSafeArray);
 
     HRESULT (STDMETHODCALLTYPE *CreateScheduleTask)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         BSTR taskName,
         VARIANT *namespacesSafeArray,
         BSTR serializedTask);
 
     HRESULT (STDMETHODCALLTYPE *ModifyScheduleTask)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         BSTR taskName,
         VARIANT *namespacesSafeArray,
         BSTR serializedTask);
 
     HRESULT (STDMETHODCALLTYPE *DeleteScheduleTask)(
-        IFsrmReportScheduler* This,
+        IFsrmReportScheduler *This,
         BSTR taskName);
 
     END_INTERFACE
 } IFsrmReportSchedulerVtbl;
+
 interface IFsrmReportScheduler {
     CONST_VTBL IFsrmReportSchedulerVtbl* lpVtbl;
 };
@@ -577,42 +551,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_VerifyNamespaces_Proxy(
-    IFsrmReportScheduler* This,
-    VARIANT *namespacesSafeArray);
-void __RPC_STUB IFsrmReportScheduler_VerifyNamespaces_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_CreateScheduleTask_Proxy(
-    IFsrmReportScheduler* This,
-    BSTR taskName,
-    VARIANT *namespacesSafeArray,
-    BSTR serializedTask);
-void __RPC_STUB IFsrmReportScheduler_CreateScheduleTask_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_ModifyScheduleTask_Proxy(
-    IFsrmReportScheduler* This,
-    BSTR taskName,
-    VARIANT *namespacesSafeArray,
-    BSTR serializedTask);
-void __RPC_STUB IFsrmReportScheduler_ModifyScheduleTask_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportScheduler_DeleteScheduleTask_Proxy(
-    IFsrmReportScheduler* This,
-    BSTR taskName);
-void __RPC_STUB IFsrmReportScheduler_DeleteScheduleTask_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmReportScheduler_INTERFACE_DEFINED__ */
 
@@ -654,29 +592,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileManagementJobManager* This);
+        IFsrmFileManagementJobManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileManagementJobManager* This);
+        IFsrmFileManagementJobManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -684,7 +622,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -696,29 +634,30 @@
 
     /*** IFsrmFileManagementJobManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ActionVariables)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         SAFEARRAY **variables);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         SAFEARRAY **descriptions);
 
     HRESULT (STDMETHODCALLTYPE *EnumFileManagementJobs)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         FsrmEnumOptions options,
         IFsrmCollection **fileManagementJobs);
 
     HRESULT (STDMETHODCALLTYPE *CreateFileManagementJob)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         IFsrmFileManagementJob **fileManagementJob);
 
     HRESULT (STDMETHODCALLTYPE *GetFileManagementJob)(
-        IFsrmFileManagementJobManager* This,
+        IFsrmFileManagementJobManager *This,
         BSTR name,
         IFsrmFileManagementJob **fileManagementJob);
 
     END_INTERFACE
 } IFsrmFileManagementJobManagerVtbl;
+
 interface IFsrmFileManagementJobManager {
     CONST_VTBL IFsrmFileManagementJobManagerVtbl* lpVtbl;
 };
@@ -785,48 +724,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_get_ActionVariables_Proxy(
-    IFsrmFileManagementJobManager* This,
-    SAFEARRAY **variables);
-void __RPC_STUB IFsrmFileManagementJobManager_get_ActionVariables_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_get_ActionVariableDescriptions_Proxy(
-    IFsrmFileManagementJobManager* This,
-    SAFEARRAY **descriptions);
-void __RPC_STUB IFsrmFileManagementJobManager_get_ActionVariableDescriptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_EnumFileManagementJobs_Proxy(
-    IFsrmFileManagementJobManager* This,
-    FsrmEnumOptions options,
-    IFsrmCollection **fileManagementJobs);
-void __RPC_STUB IFsrmFileManagementJobManager_EnumFileManagementJobs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_CreateFileManagementJob_Proxy(
-    IFsrmFileManagementJobManager* This,
-    IFsrmFileManagementJob **fileManagementJob);
-void __RPC_STUB IFsrmFileManagementJobManager_CreateFileManagementJob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJobManager_GetFileManagementJob_Proxy(
-    IFsrmFileManagementJobManager* This,
-    BSTR name,
-    IFsrmFileManagementJob **fileManagementJob);
-void __RPC_STUB IFsrmFileManagementJobManager_GetFileManagementJob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileManagementJobManager_INTERFACE_DEFINED__ */
 
@@ -872,29 +769,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmPropertyCondition* This);
+        IFsrmPropertyCondition *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmPropertyCondition* This);
+        IFsrmPropertyCondition *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -902,7 +799,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -914,34 +811,35 @@
 
     /*** IFsrmPropertyCondition methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         FsrmPropertyConditionType *type);
 
     HRESULT (STDMETHODCALLTYPE *put_Type)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         FsrmPropertyConditionType type);
 
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         BSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *put_Value)(
-        IFsrmPropertyCondition* This,
+        IFsrmPropertyCondition *This,
         BSTR value);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmPropertyCondition* This);
+        IFsrmPropertyCondition *This);
 
     END_INTERFACE
 } IFsrmPropertyConditionVtbl;
+
 interface IFsrmPropertyCondition {
     CONST_VTBL IFsrmPropertyConditionVtbl* lpVtbl;
 };
@@ -1016,61 +914,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_get_Name_Proxy(
-    IFsrmPropertyCondition* This,
-    BSTR *name);
-void __RPC_STUB IFsrmPropertyCondition_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_put_Name_Proxy(
-    IFsrmPropertyCondition* This,
-    BSTR name);
-void __RPC_STUB IFsrmPropertyCondition_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_get_Type_Proxy(
-    IFsrmPropertyCondition* This,
-    FsrmPropertyConditionType *type);
-void __RPC_STUB IFsrmPropertyCondition_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_put_Type_Proxy(
-    IFsrmPropertyCondition* This,
-    FsrmPropertyConditionType type);
-void __RPC_STUB IFsrmPropertyCondition_put_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_get_Value_Proxy(
-    IFsrmPropertyCondition* This,
-    BSTR *value);
-void __RPC_STUB IFsrmPropertyCondition_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_put_Value_Proxy(
-    IFsrmPropertyCondition* This,
-    BSTR value);
-void __RPC_STUB IFsrmPropertyCondition_put_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmPropertyCondition_Delete_Proxy(
-    IFsrmPropertyCondition* This);
-void __RPC_STUB IFsrmPropertyCondition_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmPropertyCondition_INTERFACE_DEFINED__ */
 
@@ -1137,29 +980,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmReportManager* This);
+        IFsrmReportManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmReportManager* This);
+        IFsrmReportManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1167,7 +1010,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1179,59 +1022,60 @@
 
     /*** IFsrmReportManager methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumReportJobs)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmEnumOptions options,
         IFsrmCollection **reportJobs);
 
     HRESULT (STDMETHODCALLTYPE *CreateReportJob)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         IFsrmReportJob **reportJob);
 
     HRESULT (STDMETHODCALLTYPE *GetReportJob)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         BSTR taskName,
         IFsrmReportJob **reportJob);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputDirectory)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmReportGenerationContext context,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputDirectory)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmReportGenerationContext context,
         BSTR path);
 
     HRESULT (STDMETHODCALLTYPE *IsFilterValidForReportType)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmReportType reportType,
         FsrmReportFilter filter,
         VARIANT_BOOL *valid);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFilter)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmReportType reportType,
         FsrmReportFilter filter,
         VARIANT *filterValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultFilter)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmReportType reportType,
         FsrmReportFilter filter,
         VARIANT filterValue);
 
     HRESULT (STDMETHODCALLTYPE *GetReportSizeLimit)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmReportLimit limit,
         VARIANT *limitValue);
 
     HRESULT (STDMETHODCALLTYPE *SetReportSizeLimit)(
-        IFsrmReportManager* This,
+        IFsrmReportManager *This,
         FsrmReportLimit limit,
         VARIANT limitValue);
 
     END_INTERFACE
 } IFsrmReportManagerVtbl;
+
 interface IFsrmReportManager {
     CONST_VTBL IFsrmReportManagerVtbl* lpVtbl;
 };
@@ -1318,98 +1162,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_EnumReportJobs_Proxy(
-    IFsrmReportManager* This,
-    FsrmEnumOptions options,
-    IFsrmCollection **reportJobs);
-void __RPC_STUB IFsrmReportManager_EnumReportJobs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_CreateReportJob_Proxy(
-    IFsrmReportManager* This,
-    IFsrmReportJob **reportJob);
-void __RPC_STUB IFsrmReportManager_CreateReportJob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetReportJob_Proxy(
-    IFsrmReportManager* This,
-    BSTR taskName,
-    IFsrmReportJob **reportJob);
-void __RPC_STUB IFsrmReportManager_GetReportJob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetOutputDirectory_Proxy(
-    IFsrmReportManager* This,
-    FsrmReportGenerationContext context,
-    BSTR *path);
-void __RPC_STUB IFsrmReportManager_GetOutputDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_SetOutputDirectory_Proxy(
-    IFsrmReportManager* This,
-    FsrmReportGenerationContext context,
-    BSTR path);
-void __RPC_STUB IFsrmReportManager_SetOutputDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_IsFilterValidForReportType_Proxy(
-    IFsrmReportManager* This,
-    FsrmReportType reportType,
-    FsrmReportFilter filter,
-    VARIANT_BOOL *valid);
-void __RPC_STUB IFsrmReportManager_IsFilterValidForReportType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetDefaultFilter_Proxy(
-    IFsrmReportManager* This,
-    FsrmReportType reportType,
-    FsrmReportFilter filter,
-    VARIANT *filterValue);
-void __RPC_STUB IFsrmReportManager_GetDefaultFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_SetDefaultFilter_Proxy(
-    IFsrmReportManager* This,
-    FsrmReportType reportType,
-    FsrmReportFilter filter,
-    VARIANT filterValue);
-void __RPC_STUB IFsrmReportManager_SetDefaultFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_GetReportSizeLimit_Proxy(
-    IFsrmReportManager* This,
-    FsrmReportLimit limit,
-    VARIANT *limitValue);
-void __RPC_STUB IFsrmReportManager_GetReportSizeLimit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportManager_SetReportSizeLimit_Proxy(
-    IFsrmReportManager* This,
-    FsrmReportLimit limit,
-    VARIANT limitValue);
-void __RPC_STUB IFsrmReportManager_SetReportSizeLimit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmReportManager_INTERFACE_DEFINED__ */
 
@@ -1487,29 +1239,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmReportJob* This);
+        IFsrmReportJob *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmReportJob* This);
+        IFsrmReportJob *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1517,7 +1269,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1529,95 +1281,96 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmReportJob* This);
+        IFsrmReportJob *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmReportJob* This);
+        IFsrmReportJob *This);
 
     /*** IFsrmReportJob methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Task)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR *taskName);
 
     HRESULT (STDMETHODCALLTYPE *put_Task)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR taskName);
 
     HRESULT (STDMETHODCALLTYPE *get_NamespaceRoots)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         SAFEARRAY **namespaceRoots);
 
     HRESULT (STDMETHODCALLTYPE *put_NamespaceRoots)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         SAFEARRAY *namespaceRoots);
 
     HRESULT (STDMETHODCALLTYPE *get_Formats)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         SAFEARRAY **formats);
 
     HRESULT (STDMETHODCALLTYPE *put_Formats)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         SAFEARRAY *formats);
 
     HRESULT (STDMETHODCALLTYPE *get_MailTo)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR *mailTo);
 
     HRESULT (STDMETHODCALLTYPE *put_MailTo)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR mailTo);
 
     HRESULT (STDMETHODCALLTYPE *get_RunningStatus)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         FsrmReportRunningStatus *runningStatus);
 
     HRESULT (STDMETHODCALLTYPE *get_LastRun)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         DATE *lastRun);
 
     HRESULT (STDMETHODCALLTYPE *get_LastError)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR *lastError);
 
     HRESULT (STDMETHODCALLTYPE *get_LastGeneratedInDirectory)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *EnumReports)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         IFsrmCollection **reports);
 
     HRESULT (STDMETHODCALLTYPE *CreateReport)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         FsrmReportType reportType,
         IFsrmReport **report);
 
     HRESULT (STDMETHODCALLTYPE *Run)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         FsrmReportGenerationContext context);
 
     HRESULT (STDMETHODCALLTYPE *WaitForCompletion)(
-        IFsrmReportJob* This,
+        IFsrmReportJob *This,
         LONG waitSeconds,
         VARIANT_BOOL *completed);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IFsrmReportJob* This);
+        IFsrmReportJob *This);
 
     END_INTERFACE
 } IFsrmReportJobVtbl;
+
 interface IFsrmReportJob {
     CONST_VTBL IFsrmReportJobVtbl* lpVtbl;
 };
@@ -1754,143 +1507,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_Task_Proxy(
-    IFsrmReportJob* This,
-    BSTR *taskName);
-void __RPC_STUB IFsrmReportJob_get_Task_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_Task_Proxy(
-    IFsrmReportJob* This,
-    BSTR taskName);
-void __RPC_STUB IFsrmReportJob_put_Task_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_NamespaceRoots_Proxy(
-    IFsrmReportJob* This,
-    SAFEARRAY **namespaceRoots);
-void __RPC_STUB IFsrmReportJob_get_NamespaceRoots_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_NamespaceRoots_Proxy(
-    IFsrmReportJob* This,
-    SAFEARRAY *namespaceRoots);
-void __RPC_STUB IFsrmReportJob_put_NamespaceRoots_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_Formats_Proxy(
-    IFsrmReportJob* This,
-    SAFEARRAY **formats);
-void __RPC_STUB IFsrmReportJob_get_Formats_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_Formats_Proxy(
-    IFsrmReportJob* This,
-    SAFEARRAY *formats);
-void __RPC_STUB IFsrmReportJob_put_Formats_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_MailTo_Proxy(
-    IFsrmReportJob* This,
-    BSTR *mailTo);
-void __RPC_STUB IFsrmReportJob_get_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_put_MailTo_Proxy(
-    IFsrmReportJob* This,
-    BSTR mailTo);
-void __RPC_STUB IFsrmReportJob_put_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_RunningStatus_Proxy(
-    IFsrmReportJob* This,
-    FsrmReportRunningStatus *runningStatus);
-void __RPC_STUB IFsrmReportJob_get_RunningStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_LastRun_Proxy(
-    IFsrmReportJob* This,
-    DATE *lastRun);
-void __RPC_STUB IFsrmReportJob_get_LastRun_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_LastError_Proxy(
-    IFsrmReportJob* This,
-    BSTR *lastError);
-void __RPC_STUB IFsrmReportJob_get_LastError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_get_LastGeneratedInDirectory_Proxy(
-    IFsrmReportJob* This,
-    BSTR *path);
-void __RPC_STUB IFsrmReportJob_get_LastGeneratedInDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_EnumReports_Proxy(
-    IFsrmReportJob* This,
-    IFsrmCollection **reports);
-void __RPC_STUB IFsrmReportJob_EnumReports_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_CreateReport_Proxy(
-    IFsrmReportJob* This,
-    FsrmReportType reportType,
-    IFsrmReport **report);
-void __RPC_STUB IFsrmReportJob_CreateReport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_Run_Proxy(
-    IFsrmReportJob* This,
-    FsrmReportGenerationContext context);
-void __RPC_STUB IFsrmReportJob_Run_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_WaitForCompletion_Proxy(
-    IFsrmReportJob* This,
-    LONG waitSeconds,
-    VARIANT_BOOL *completed);
-void __RPC_STUB IFsrmReportJob_WaitForCompletion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmReportJob_Cancel_Proxy(
-    IFsrmReportJob* This);
-void __RPC_STUB IFsrmReportJob_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmReportJob_INTERFACE_DEFINED__ */
 
@@ -2072,29 +1688,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileManagementJob* This);
+        IFsrmFileManagementJob *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileManagementJob* This);
+        IFsrmFileManagementJob *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2102,7 +1718,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2114,227 +1730,228 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileManagementJob* This);
+        IFsrmFileManagementJob *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileManagementJob* This);
+        IFsrmFileManagementJob *This);
 
     /*** IFsrmFileManagementJob methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *get_NamespaceRoots)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         SAFEARRAY **namespaceRoots);
 
     HRESULT (STDMETHODCALLTYPE *put_NamespaceRoots)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         SAFEARRAY *namespaceRoots);
 
     HRESULT (STDMETHODCALLTYPE *get_Enabled)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         VARIANT_BOOL *enabled);
 
     HRESULT (STDMETHODCALLTYPE *put_Enabled)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         VARIANT_BOOL enabled);
 
     HRESULT (STDMETHODCALLTYPE *get_OperationType)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         FsrmFileManagementType *operationType);
 
     HRESULT (STDMETHODCALLTYPE *put_OperationType)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         FsrmFileManagementType operationType);
 
     HRESULT (STDMETHODCALLTYPE *get_ExpirationDirectory)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *expirationDirectory);
 
     HRESULT (STDMETHODCALLTYPE *put_ExpirationDirectory)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR expirationDirectory);
 
     HRESULT (STDMETHODCALLTYPE *get_CustomAction)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         IFsrmActionCommand **action);
 
     HRESULT (STDMETHODCALLTYPE *get_Notifications)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         SAFEARRAY **notifications);
 
     HRESULT (STDMETHODCALLTYPE *get_Logging)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG *loggingFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_Logging)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG loggingFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_ReportEnabled)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         VARIANT_BOOL *reportEnabled);
 
     HRESULT (STDMETHODCALLTYPE *put_ReportEnabled)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         VARIANT_BOOL reportEnabled);
 
     HRESULT (STDMETHODCALLTYPE *get_Formats)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         SAFEARRAY **formats);
 
     HRESULT (STDMETHODCALLTYPE *put_Formats)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         SAFEARRAY *formats);
 
     HRESULT (STDMETHODCALLTYPE *get_MailTo)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *mailTo);
 
     HRESULT (STDMETHODCALLTYPE *put_MailTo)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR mailTo);
 
     HRESULT (STDMETHODCALLTYPE *get_DaysSinceFileCreated)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG *daysSinceCreation);
 
     HRESULT (STDMETHODCALLTYPE *put_DaysSinceFileCreated)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG daysSinceCreation);
 
     HRESULT (STDMETHODCALLTYPE *get_DaysSinceFileLastAccessed)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG *daysSinceAccess);
 
     HRESULT (STDMETHODCALLTYPE *put_DaysSinceFileLastAccessed)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG daysSinceAccess);
 
     HRESULT (STDMETHODCALLTYPE *get_DaysSinceFileLastModified)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG *daysSinceModify);
 
     HRESULT (STDMETHODCALLTYPE *put_DaysSinceFileLastModified)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG daysSinceModify);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyConditions)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         IFsrmCollection **propertyConditions);
 
     HRESULT (STDMETHODCALLTYPE *get_FromDate)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         DATE *fromDate);
 
     HRESULT (STDMETHODCALLTYPE *put_FromDate)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         DATE fromDate);
 
     HRESULT (STDMETHODCALLTYPE *get_Task)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *taskName);
 
     HRESULT (STDMETHODCALLTYPE *put_Task)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR taskName);
 
     HRESULT (STDMETHODCALLTYPE *get_Parameters)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         SAFEARRAY **parameters);
 
     HRESULT (STDMETHODCALLTYPE *put_Parameters)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         SAFEARRAY *parameters);
 
     HRESULT (STDMETHODCALLTYPE *get_RunningStatus)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         FsrmReportRunningStatus *runningStatus);
 
     HRESULT (STDMETHODCALLTYPE *get_LastError)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *lastError);
 
     HRESULT (STDMETHODCALLTYPE *get_LastReportPathWithoutExtension)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *get_LastRun)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         DATE *lastRun);
 
     HRESULT (STDMETHODCALLTYPE *get_FileNamePattern)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR *fileNamePattern);
 
     HRESULT (STDMETHODCALLTYPE *put_FileNamePattern)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR fileNamePattern);
 
     HRESULT (STDMETHODCALLTYPE *Run)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         FsrmReportGenerationContext context);
 
     HRESULT (STDMETHODCALLTYPE *WaitForCompletion)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG waitSeconds,
         VARIANT_BOOL *completed);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IFsrmFileManagementJob* This);
+        IFsrmFileManagementJob *This);
 
     HRESULT (STDMETHODCALLTYPE *AddNotification)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG days);
 
     HRESULT (STDMETHODCALLTYPE *DeleteNotification)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG days);
 
     HRESULT (STDMETHODCALLTYPE *ModifyNotification)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG days,
         LONG newDays);
 
     HRESULT (STDMETHODCALLTYPE *CreateNotificationAction)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG days,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumNotificationActions)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         LONG days,
         IFsrmCollection **actions);
 
     HRESULT (STDMETHODCALLTYPE *CreatePropertyCondition)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         BSTR name,
         IFsrmPropertyCondition **propertyCondition);
 
     HRESULT (STDMETHODCALLTYPE *CreateCustomAction)(
-        IFsrmFileManagementJob* This,
+        IFsrmFileManagementJob *This,
         IFsrmActionCommand **customAction);
 
     END_INTERFACE
 } IFsrmFileManagementJobVtbl;
+
 interface IFsrmFileManagementJob {
     CONST_VTBL IFsrmFileManagementJobVtbl* lpVtbl;
 };
@@ -2599,403 +2216,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Name_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR *name);
-void __RPC_STUB IFsrmFileManagementJob_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Name_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR name);
-void __RPC_STUB IFsrmFileManagementJob_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_NamespaceRoots_Proxy(
-    IFsrmFileManagementJob* This,
-    SAFEARRAY **namespaceRoots);
-void __RPC_STUB IFsrmFileManagementJob_get_NamespaceRoots_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_NamespaceRoots_Proxy(
-    IFsrmFileManagementJob* This,
-    SAFEARRAY *namespaceRoots);
-void __RPC_STUB IFsrmFileManagementJob_put_NamespaceRoots_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Enabled_Proxy(
-    IFsrmFileManagementJob* This,
-    VARIANT_BOOL *enabled);
-void __RPC_STUB IFsrmFileManagementJob_get_Enabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Enabled_Proxy(
-    IFsrmFileManagementJob* This,
-    VARIANT_BOOL enabled);
-void __RPC_STUB IFsrmFileManagementJob_put_Enabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_OperationType_Proxy(
-    IFsrmFileManagementJob* This,
-    FsrmFileManagementType *operationType);
-void __RPC_STUB IFsrmFileManagementJob_get_OperationType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_OperationType_Proxy(
-    IFsrmFileManagementJob* This,
-    FsrmFileManagementType operationType);
-void __RPC_STUB IFsrmFileManagementJob_put_OperationType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_ExpirationDirectory_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR *expirationDirectory);
-void __RPC_STUB IFsrmFileManagementJob_get_ExpirationDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_ExpirationDirectory_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR expirationDirectory);
-void __RPC_STUB IFsrmFileManagementJob_put_ExpirationDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_CustomAction_Proxy(
-    IFsrmFileManagementJob* This,
-    IFsrmActionCommand **action);
-void __RPC_STUB IFsrmFileManagementJob_get_CustomAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Notifications_Proxy(
-    IFsrmFileManagementJob* This,
-    SAFEARRAY **notifications);
-void __RPC_STUB IFsrmFileManagementJob_get_Notifications_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Logging_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG *loggingFlags);
-void __RPC_STUB IFsrmFileManagementJob_get_Logging_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Logging_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG loggingFlags);
-void __RPC_STUB IFsrmFileManagementJob_put_Logging_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_ReportEnabled_Proxy(
-    IFsrmFileManagementJob* This,
-    VARIANT_BOOL *reportEnabled);
-void __RPC_STUB IFsrmFileManagementJob_get_ReportEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_ReportEnabled_Proxy(
-    IFsrmFileManagementJob* This,
-    VARIANT_BOOL reportEnabled);
-void __RPC_STUB IFsrmFileManagementJob_put_ReportEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Formats_Proxy(
-    IFsrmFileManagementJob* This,
-    SAFEARRAY **formats);
-void __RPC_STUB IFsrmFileManagementJob_get_Formats_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Formats_Proxy(
-    IFsrmFileManagementJob* This,
-    SAFEARRAY *formats);
-void __RPC_STUB IFsrmFileManagementJob_put_Formats_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_MailTo_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR *mailTo);
-void __RPC_STUB IFsrmFileManagementJob_get_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_MailTo_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR mailTo);
-void __RPC_STUB IFsrmFileManagementJob_put_MailTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_DaysSinceFileCreated_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG *daysSinceCreation);
-void __RPC_STUB IFsrmFileManagementJob_get_DaysSinceFileCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_DaysSinceFileCreated_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG daysSinceCreation);
-void __RPC_STUB IFsrmFileManagementJob_put_DaysSinceFileCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_DaysSinceFileLastAccessed_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG *daysSinceAccess);
-void __RPC_STUB IFsrmFileManagementJob_get_DaysSinceFileLastAccessed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_DaysSinceFileLastAccessed_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG daysSinceAccess);
-void __RPC_STUB IFsrmFileManagementJob_put_DaysSinceFileLastAccessed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_DaysSinceFileLastModified_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG *daysSinceModify);
-void __RPC_STUB IFsrmFileManagementJob_get_DaysSinceFileLastModified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_DaysSinceFileLastModified_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG daysSinceModify);
-void __RPC_STUB IFsrmFileManagementJob_put_DaysSinceFileLastModified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_PropertyConditions_Proxy(
-    IFsrmFileManagementJob* This,
-    IFsrmCollection **propertyConditions);
-void __RPC_STUB IFsrmFileManagementJob_get_PropertyConditions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_FromDate_Proxy(
-    IFsrmFileManagementJob* This,
-    DATE *fromDate);
-void __RPC_STUB IFsrmFileManagementJob_get_FromDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_FromDate_Proxy(
-    IFsrmFileManagementJob* This,
-    DATE fromDate);
-void __RPC_STUB IFsrmFileManagementJob_put_FromDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Task_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR *taskName);
-void __RPC_STUB IFsrmFileManagementJob_get_Task_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Task_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR taskName);
-void __RPC_STUB IFsrmFileManagementJob_put_Task_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_Parameters_Proxy(
-    IFsrmFileManagementJob* This,
-    SAFEARRAY **parameters);
-void __RPC_STUB IFsrmFileManagementJob_get_Parameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_Parameters_Proxy(
-    IFsrmFileManagementJob* This,
-    SAFEARRAY *parameters);
-void __RPC_STUB IFsrmFileManagementJob_put_Parameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_RunningStatus_Proxy(
-    IFsrmFileManagementJob* This,
-    FsrmReportRunningStatus *runningStatus);
-void __RPC_STUB IFsrmFileManagementJob_get_RunningStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_LastError_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR *lastError);
-void __RPC_STUB IFsrmFileManagementJob_get_LastError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_LastReportPathWithoutExtension_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR *path);
-void __RPC_STUB IFsrmFileManagementJob_get_LastReportPathWithoutExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_LastRun_Proxy(
-    IFsrmFileManagementJob* This,
-    DATE *lastRun);
-void __RPC_STUB IFsrmFileManagementJob_get_LastRun_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_get_FileNamePattern_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR *fileNamePattern);
-void __RPC_STUB IFsrmFileManagementJob_get_FileNamePattern_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_put_FileNamePattern_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR fileNamePattern);
-void __RPC_STUB IFsrmFileManagementJob_put_FileNamePattern_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_Run_Proxy(
-    IFsrmFileManagementJob* This,
-    FsrmReportGenerationContext context);
-void __RPC_STUB IFsrmFileManagementJob_Run_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_WaitForCompletion_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG waitSeconds,
-    VARIANT_BOOL *completed);
-void __RPC_STUB IFsrmFileManagementJob_WaitForCompletion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_Cancel_Proxy(
-    IFsrmFileManagementJob* This);
-void __RPC_STUB IFsrmFileManagementJob_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_AddNotification_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG days);
-void __RPC_STUB IFsrmFileManagementJob_AddNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_DeleteNotification_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG days);
-void __RPC_STUB IFsrmFileManagementJob_DeleteNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_ModifyNotification_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG days,
-    LONG newDays);
-void __RPC_STUB IFsrmFileManagementJob_ModifyNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_CreateNotificationAction_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG days,
-    FsrmActionType actionType,
-    IFsrmAction **action);
-void __RPC_STUB IFsrmFileManagementJob_CreateNotificationAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_EnumNotificationActions_Proxy(
-    IFsrmFileManagementJob* This,
-    LONG days,
-    IFsrmCollection **actions);
-void __RPC_STUB IFsrmFileManagementJob_EnumNotificationActions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_CreatePropertyCondition_Proxy(
-    IFsrmFileManagementJob* This,
-    BSTR name,
-    IFsrmPropertyCondition **propertyCondition);
-void __RPC_STUB IFsrmFileManagementJob_CreatePropertyCondition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileManagementJob_CreateCustomAction_Proxy(
-    IFsrmFileManagementJob* This,
-    IFsrmActionCommand **customAction);
-void __RPC_STUB IFsrmFileManagementJob_CreateCustomAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileManagementJob_INTERFACE_DEFINED__ */
 
@@ -3026,29 +2246,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileCondition* This,
+        IFsrmFileCondition *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileCondition* This);
+        IFsrmFileCondition *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileCondition* This);
+        IFsrmFileCondition *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileCondition* This,
+        IFsrmFileCondition *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileCondition* This,
+        IFsrmFileCondition *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileCondition* This,
+        IFsrmFileCondition *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3056,7 +2276,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileCondition* This,
+        IFsrmFileCondition *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3068,14 +2288,15 @@
 
     /*** IFsrmFileCondition methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IFsrmFileCondition* This,
+        IFsrmFileCondition *This,
         FsrmFileConditionType *pVal);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileCondition* This);
+        IFsrmFileCondition *This);
 
     END_INTERFACE
 } IFsrmFileConditionVtbl;
+
 interface IFsrmFileCondition {
     CONST_VTBL IFsrmFileConditionVtbl* lpVtbl;
 };
@@ -3130,21 +2351,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileCondition_get_Type_Proxy(
-    IFsrmFileCondition* This,
-    FsrmFileConditionType *pVal);
-void __RPC_STUB IFsrmFileCondition_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileCondition_Delete_Proxy(
-    IFsrmFileCondition* This);
-void __RPC_STUB IFsrmFileCondition_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileCondition_INTERFACE_DEFINED__ */
 
@@ -3199,29 +2405,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileConditionProperty* This);
+        IFsrmFileConditionProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileConditionProperty* This);
+        IFsrmFileConditionProperty *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3229,7 +2435,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3241,55 +2447,56 @@
 
     /*** IFsrmFileCondition methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         FsrmFileConditionType *pVal);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileConditionProperty* This);
+        IFsrmFileConditionProperty *This);
 
     /*** IFsrmFileConditionProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *get_PropertyName)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         BSTR *pVal);
 
     HRESULT (STDMETHODCALLTYPE *put_PropertyName)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         BSTR newVal);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyId)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         FsrmFileSystemPropertyId *pVal);
 
     HRESULT (STDMETHODCALLTYPE *put_PropertyId)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         FsrmFileSystemPropertyId newVal);
 
     HRESULT (STDMETHODCALLTYPE *get_Operator)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         FsrmPropertyConditionType *pVal);
 
     HRESULT (STDMETHODCALLTYPE *put_Operator)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         FsrmPropertyConditionType newVal);
 
     HRESULT (STDMETHODCALLTYPE *get_ValueType)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         FsrmPropertyValueType *pVal);
 
     HRESULT (STDMETHODCALLTYPE *put_ValueType)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         FsrmPropertyValueType newVal);
 
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         VARIANT *pVal);
 
     HRESULT (STDMETHODCALLTYPE *put_Value)(
-        IFsrmFileConditionProperty* This,
+        IFsrmFileConditionProperty *This,
         VARIANT newVal);
 
     END_INTERFACE
 } IFsrmFileConditionPropertyVtbl;
+
 interface IFsrmFileConditionProperty {
     CONST_VTBL IFsrmFileConditionPropertyVtbl* lpVtbl;
 };
@@ -3386,86 +2593,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_PropertyName_Proxy(
-    IFsrmFileConditionProperty* This,
-    BSTR *pVal);
-void __RPC_STUB IFsrmFileConditionProperty_get_PropertyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_PropertyName_Proxy(
-    IFsrmFileConditionProperty* This,
-    BSTR newVal);
-void __RPC_STUB IFsrmFileConditionProperty_put_PropertyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_PropertyId_Proxy(
-    IFsrmFileConditionProperty* This,
-    FsrmFileSystemPropertyId *pVal);
-void __RPC_STUB IFsrmFileConditionProperty_get_PropertyId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_PropertyId_Proxy(
-    IFsrmFileConditionProperty* This,
-    FsrmFileSystemPropertyId newVal);
-void __RPC_STUB IFsrmFileConditionProperty_put_PropertyId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_Operator_Proxy(
-    IFsrmFileConditionProperty* This,
-    FsrmPropertyConditionType *pVal);
-void __RPC_STUB IFsrmFileConditionProperty_get_Operator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_Operator_Proxy(
-    IFsrmFileConditionProperty* This,
-    FsrmPropertyConditionType newVal);
-void __RPC_STUB IFsrmFileConditionProperty_put_Operator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_ValueType_Proxy(
-    IFsrmFileConditionProperty* This,
-    FsrmPropertyValueType *pVal);
-void __RPC_STUB IFsrmFileConditionProperty_get_ValueType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_ValueType_Proxy(
-    IFsrmFileConditionProperty* This,
-    FsrmPropertyValueType newVal);
-void __RPC_STUB IFsrmFileConditionProperty_put_ValueType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_get_Value_Proxy(
-    IFsrmFileConditionProperty* This,
-    VARIANT *pVal);
-void __RPC_STUB IFsrmFileConditionProperty_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileConditionProperty_put_Value_Proxy(
-    IFsrmFileConditionProperty* This,
-    VARIANT newVal);
-void __RPC_STUB IFsrmFileConditionProperty_put_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileConditionProperty_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/fsrmscreen.h b/mingw-w64-headers/include/fsrmscreen.h
index 4f01ac9..744b250 100644
--- a/mingw-w64-headers/include/fsrmscreen.h
+++ b/mingw-w64-headers/include/fsrmscreen.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/fsrmscreen.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/fsrmscreen.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IFsrmFileGroupManager_FWD_DEFINED__
 #define __IFsrmFileGroupManager_FWD_DEFINED__
 typedef interface IFsrmFileGroupManager IFsrmFileGroupManager;
+#ifdef __cplusplus
+interface IFsrmFileGroupManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenManager_FWD_DEFINED__
 #define __IFsrmFileScreenManager_FWD_DEFINED__
 typedef interface IFsrmFileScreenManager IFsrmFileScreenManager;
+#ifdef __cplusplus
+interface IFsrmFileScreenManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenTemplateManager_FWD_DEFINED__
 #define __IFsrmFileScreenTemplateManager_FWD_DEFINED__
 typedef interface IFsrmFileScreenTemplateManager IFsrmFileScreenTemplateManager;
+#ifdef __cplusplus
+interface IFsrmFileScreenTemplateManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileGroup_FWD_DEFINED__
 #define __IFsrmFileGroup_FWD_DEFINED__
 typedef interface IFsrmFileGroup IFsrmFileGroup;
+#ifdef __cplusplus
+interface IFsrmFileGroup;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenBase_FWD_DEFINED__
 #define __IFsrmFileScreenBase_FWD_DEFINED__
 typedef interface IFsrmFileScreenBase IFsrmFileScreenBase;
+#ifdef __cplusplus
+interface IFsrmFileScreenBase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenException_FWD_DEFINED__
 #define __IFsrmFileScreenException_FWD_DEFINED__
 typedef interface IFsrmFileScreenException IFsrmFileScreenException;
+#ifdef __cplusplus
+interface IFsrmFileScreenException;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreen_FWD_DEFINED__
 #define __IFsrmFileScreen_FWD_DEFINED__
 typedef interface IFsrmFileScreen IFsrmFileScreen;
+#ifdef __cplusplus
+interface IFsrmFileScreen;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileGroupImported_FWD_DEFINED__
 #define __IFsrmFileGroupImported_FWD_DEFINED__
 typedef interface IFsrmFileGroupImported IFsrmFileGroupImported;
+#ifdef __cplusplus
+interface IFsrmFileGroupImported;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenTemplate_FWD_DEFINED__
 #define __IFsrmFileScreenTemplate_FWD_DEFINED__
 typedef interface IFsrmFileScreenTemplate IFsrmFileScreenTemplate;
+#ifdef __cplusplus
+interface IFsrmFileScreenTemplate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenTemplateImported_FWD_DEFINED__
 #define __IFsrmFileScreenTemplateImported_FWD_DEFINED__
 typedef interface IFsrmFileScreenTemplateImported IFsrmFileScreenTemplateImported;
+#ifdef __cplusplus
+interface IFsrmFileScreenTemplateImported;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -83,51 +113,81 @@
 #ifndef __IFsrmFileGroup_FWD_DEFINED__
 #define __IFsrmFileGroup_FWD_DEFINED__
 typedef interface IFsrmFileGroup IFsrmFileGroup;
+#ifdef __cplusplus
+interface IFsrmFileGroup;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileGroupImported_FWD_DEFINED__
 #define __IFsrmFileGroupImported_FWD_DEFINED__
 typedef interface IFsrmFileGroupImported IFsrmFileGroupImported;
+#ifdef __cplusplus
+interface IFsrmFileGroupImported;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileGroupManager_FWD_DEFINED__
 #define __IFsrmFileGroupManager_FWD_DEFINED__
 typedef interface IFsrmFileGroupManager IFsrmFileGroupManager;
+#ifdef __cplusplus
+interface IFsrmFileGroupManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreen_FWD_DEFINED__
 #define __IFsrmFileScreen_FWD_DEFINED__
 typedef interface IFsrmFileScreen IFsrmFileScreen;
+#ifdef __cplusplus
+interface IFsrmFileScreen;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenBase_FWD_DEFINED__
 #define __IFsrmFileScreenBase_FWD_DEFINED__
 typedef interface IFsrmFileScreenBase IFsrmFileScreenBase;
+#ifdef __cplusplus
+interface IFsrmFileScreenBase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenException_FWD_DEFINED__
 #define __IFsrmFileScreenException_FWD_DEFINED__
 typedef interface IFsrmFileScreenException IFsrmFileScreenException;
+#ifdef __cplusplus
+interface IFsrmFileScreenException;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenManager_FWD_DEFINED__
 #define __IFsrmFileScreenManager_FWD_DEFINED__
 typedef interface IFsrmFileScreenManager IFsrmFileScreenManager;
+#ifdef __cplusplus
+interface IFsrmFileScreenManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenTemplate_FWD_DEFINED__
 #define __IFsrmFileScreenTemplate_FWD_DEFINED__
 typedef interface IFsrmFileScreenTemplate IFsrmFileScreenTemplate;
+#ifdef __cplusplus
+interface IFsrmFileScreenTemplate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenTemplateImported_FWD_DEFINED__
 #define __IFsrmFileScreenTemplateImported_FWD_DEFINED__
 typedef interface IFsrmFileScreenTemplateImported IFsrmFileScreenTemplateImported;
+#ifdef __cplusplus
+interface IFsrmFileScreenTemplateImported;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFsrmFileScreenTemplateManager_FWD_DEFINED__
 #define __IFsrmFileScreenTemplateManager_FWD_DEFINED__
 typedef interface IFsrmFileScreenTemplateManager IFsrmFileScreenTemplateManager;
+#ifdef __cplusplus
+interface IFsrmFileScreenTemplateManager;
+#endif /* __cplusplus */
 #endif
 
 #define FSRM_DISPID_FILEGROUP (FSRM_DISPID_FEATURE_FILESCREEN | 0x100000)
@@ -191,29 +251,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileGroupManager* This);
+        IFsrmFileGroupManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileGroupManager* This);
+        IFsrmFileGroupManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -221,7 +281,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -233,32 +293,33 @@
 
     /*** IFsrmFileGroupManager methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateFileGroup)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         IFsrmFileGroup **fileGroup);
 
     HRESULT (STDMETHODCALLTYPE *GetFileGroup)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         BSTR name,
         IFsrmFileGroup **fileGroup);
 
     HRESULT (STDMETHODCALLTYPE *EnumFileGroups)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **fileGroups);
 
     HRESULT (STDMETHODCALLTYPE *ExportFileGroups)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         VARIANT *fileGroupNamesArray,
         BSTR *serializedFileGroups);
 
     HRESULT (STDMETHODCALLTYPE *ImportFileGroups)(
-        IFsrmFileGroupManager* This,
+        IFsrmFileGroupManager *This,
         BSTR serializedFileGroups,
         VARIANT *fileGroupNamesArray,
         IFsrmCommittableCollection **fileGroups);
 
     END_INTERFACE
 } IFsrmFileGroupManagerVtbl;
+
 interface IFsrmFileGroupManager {
     CONST_VTBL IFsrmFileGroupManagerVtbl* lpVtbl;
 };
@@ -325,51 +386,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_CreateFileGroup_Proxy(
-    IFsrmFileGroupManager* This,
-    IFsrmFileGroup **fileGroup);
-void __RPC_STUB IFsrmFileGroupManager_CreateFileGroup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_GetFileGroup_Proxy(
-    IFsrmFileGroupManager* This,
-    BSTR name,
-    IFsrmFileGroup **fileGroup);
-void __RPC_STUB IFsrmFileGroupManager_GetFileGroup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_EnumFileGroups_Proxy(
-    IFsrmFileGroupManager* This,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **fileGroups);
-void __RPC_STUB IFsrmFileGroupManager_EnumFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_ExportFileGroups_Proxy(
-    IFsrmFileGroupManager* This,
-    VARIANT *fileGroupNamesArray,
-    BSTR *serializedFileGroups);
-void __RPC_STUB IFsrmFileGroupManager_ExportFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroupManager_ImportFileGroups_Proxy(
-    IFsrmFileGroupManager* This,
-    BSTR serializedFileGroups,
-    VARIANT *fileGroupNamesArray,
-    IFsrmCommittableCollection **fileGroups);
-void __RPC_STUB IFsrmFileGroupManager_ImportFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileGroupManager_INTERFACE_DEFINED__ */
 
@@ -429,29 +445,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileScreenManager* This);
+        IFsrmFileScreenManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileScreenManager* This);
+        IFsrmFileScreenManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -459,7 +475,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -471,51 +487,52 @@
 
     /*** IFsrmFileScreenManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ActionVariables)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         SAFEARRAY **variables);
 
     HRESULT (STDMETHODCALLTYPE *get_ActionVariableDescriptions)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         SAFEARRAY **descriptions);
 
     HRESULT (STDMETHODCALLTYPE *CreateFileScreen)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         BSTR path,
         IFsrmFileScreen **fileScreen);
 
     HRESULT (STDMETHODCALLTYPE *GetFileScreen)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         BSTR path,
         IFsrmFileScreen **fileScreen);
 
     HRESULT (STDMETHODCALLTYPE *EnumFileScreens)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **fileScreens);
 
     HRESULT (STDMETHODCALLTYPE *CreateFileScreenException)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         BSTR path,
         IFsrmFileScreenException **fileScreenException);
 
     HRESULT (STDMETHODCALLTYPE *GetFileScreenException)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         BSTR path,
         IFsrmFileScreenException **fileScreenException);
 
     HRESULT (STDMETHODCALLTYPE *EnumFileScreenExceptions)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         BSTR path,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **fileScreenExceptions);
 
     HRESULT (STDMETHODCALLTYPE *CreateFileScreenCollection)(
-        IFsrmFileScreenManager* This,
+        IFsrmFileScreenManager *This,
         IFsrmCommittableCollection **collection);
 
     END_INTERFACE
 } IFsrmFileScreenManagerVtbl;
+
 interface IFsrmFileScreenManager {
     CONST_VTBL IFsrmFileScreenManagerVtbl* lpVtbl;
 };
@@ -598,86 +615,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_get_ActionVariables_Proxy(
-    IFsrmFileScreenManager* This,
-    SAFEARRAY **variables);
-void __RPC_STUB IFsrmFileScreenManager_get_ActionVariables_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_get_ActionVariableDescriptions_Proxy(
-    IFsrmFileScreenManager* This,
-    SAFEARRAY **descriptions);
-void __RPC_STUB IFsrmFileScreenManager_get_ActionVariableDescriptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_CreateFileScreen_Proxy(
-    IFsrmFileScreenManager* This,
-    BSTR path,
-    IFsrmFileScreen **fileScreen);
-void __RPC_STUB IFsrmFileScreenManager_CreateFileScreen_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_GetFileScreen_Proxy(
-    IFsrmFileScreenManager* This,
-    BSTR path,
-    IFsrmFileScreen **fileScreen);
-void __RPC_STUB IFsrmFileScreenManager_GetFileScreen_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_EnumFileScreens_Proxy(
-    IFsrmFileScreenManager* This,
-    BSTR path,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **fileScreens);
-void __RPC_STUB IFsrmFileScreenManager_EnumFileScreens_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_CreateFileScreenException_Proxy(
-    IFsrmFileScreenManager* This,
-    BSTR path,
-    IFsrmFileScreenException **fileScreenException);
-void __RPC_STUB IFsrmFileScreenManager_CreateFileScreenException_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_GetFileScreenException_Proxy(
-    IFsrmFileScreenManager* This,
-    BSTR path,
-    IFsrmFileScreenException **fileScreenException);
-void __RPC_STUB IFsrmFileScreenManager_GetFileScreenException_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_EnumFileScreenExceptions_Proxy(
-    IFsrmFileScreenManager* This,
-    BSTR path,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **fileScreenExceptions);
-void __RPC_STUB IFsrmFileScreenManager_EnumFileScreenExceptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenManager_CreateFileScreenCollection_Proxy(
-    IFsrmFileScreenManager* This,
-    IFsrmCommittableCollection **collection);
-void __RPC_STUB IFsrmFileScreenManager_CreateFileScreenCollection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileScreenManager_INTERFACE_DEFINED__ */
 
@@ -722,29 +659,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileScreenTemplateManager* This);
+        IFsrmFileScreenTemplateManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileScreenTemplateManager* This);
+        IFsrmFileScreenTemplateManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -752,7 +689,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -764,32 +701,33 @@
 
     /*** IFsrmFileScreenTemplateManager methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateTemplate)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         IFsrmFileScreenTemplate **fileScreenTemplate);
 
     HRESULT (STDMETHODCALLTYPE *GetTemplate)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         BSTR name,
         IFsrmFileScreenTemplate **fileScreenTemplate);
 
     HRESULT (STDMETHODCALLTYPE *EnumTemplates)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         FsrmEnumOptions options,
         IFsrmCommittableCollection **fileScreenTemplates);
 
     HRESULT (STDMETHODCALLTYPE *ExportTemplates)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         VARIANT *fileScreenTemplateNamesArray,
         BSTR *serializedFileScreenTemplates);
 
     HRESULT (STDMETHODCALLTYPE *ImportTemplates)(
-        IFsrmFileScreenTemplateManager* This,
+        IFsrmFileScreenTemplateManager *This,
         BSTR serializedFileScreenTemplates,
         VARIANT *fileScreenTemplateNamesArray,
         IFsrmCommittableCollection **fileScreenTemplates);
 
     END_INTERFACE
 } IFsrmFileScreenTemplateManagerVtbl;
+
 interface IFsrmFileScreenTemplateManager {
     CONST_VTBL IFsrmFileScreenTemplateManagerVtbl* lpVtbl;
 };
@@ -856,51 +794,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_CreateTemplate_Proxy(
-    IFsrmFileScreenTemplateManager* This,
-    IFsrmFileScreenTemplate **fileScreenTemplate);
-void __RPC_STUB IFsrmFileScreenTemplateManager_CreateTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_GetTemplate_Proxy(
-    IFsrmFileScreenTemplateManager* This,
-    BSTR name,
-    IFsrmFileScreenTemplate **fileScreenTemplate);
-void __RPC_STUB IFsrmFileScreenTemplateManager_GetTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_EnumTemplates_Proxy(
-    IFsrmFileScreenTemplateManager* This,
-    FsrmEnumOptions options,
-    IFsrmCommittableCollection **fileScreenTemplates);
-void __RPC_STUB IFsrmFileScreenTemplateManager_EnumTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_ExportTemplates_Proxy(
-    IFsrmFileScreenTemplateManager* This,
-    VARIANT *fileScreenTemplateNamesArray,
-    BSTR *serializedFileScreenTemplates);
-void __RPC_STUB IFsrmFileScreenTemplateManager_ExportTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateManager_ImportTemplates_Proxy(
-    IFsrmFileScreenTemplateManager* This,
-    BSTR serializedFileScreenTemplates,
-    VARIANT *fileScreenTemplateNamesArray,
-    IFsrmCommittableCollection **fileScreenTemplates);
-void __RPC_STUB IFsrmFileScreenTemplateManager_ImportTemplates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileScreenTemplateManager_INTERFACE_DEFINED__ */
 
@@ -943,29 +836,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileGroup* This);
+        IFsrmFileGroup *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileGroup* This);
+        IFsrmFileGroup *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -973,7 +866,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -985,50 +878,51 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileGroup* This);
+        IFsrmFileGroup *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileGroup* This);
+        IFsrmFileGroup *This);
 
     /*** IFsrmFileGroup methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *get_Members)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         IFsrmMutableCollection **members);
 
     HRESULT (STDMETHODCALLTYPE *put_Members)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         IFsrmMutableCollection *members);
 
     HRESULT (STDMETHODCALLTYPE *get_NonMembers)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         IFsrmMutableCollection **nonMembers);
 
     HRESULT (STDMETHODCALLTYPE *put_NonMembers)(
-        IFsrmFileGroup* This,
+        IFsrmFileGroup *This,
         IFsrmMutableCollection *nonMembers);
 
     END_INTERFACE
 } IFsrmFileGroupVtbl;
+
 interface IFsrmFileGroup {
     CONST_VTBL IFsrmFileGroupVtbl* lpVtbl;
 };
@@ -1121,54 +1015,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileGroup_get_Name_Proxy(
-    IFsrmFileGroup* This,
-    BSTR *name);
-void __RPC_STUB IFsrmFileGroup_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroup_put_Name_Proxy(
-    IFsrmFileGroup* This,
-    BSTR name);
-void __RPC_STUB IFsrmFileGroup_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroup_get_Members_Proxy(
-    IFsrmFileGroup* This,
-    IFsrmMutableCollection **members);
-void __RPC_STUB IFsrmFileGroup_get_Members_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroup_put_Members_Proxy(
-    IFsrmFileGroup* This,
-    IFsrmMutableCollection *members);
-void __RPC_STUB IFsrmFileGroup_put_Members_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroup_get_NonMembers_Proxy(
-    IFsrmFileGroup* This,
-    IFsrmMutableCollection **nonMembers);
-void __RPC_STUB IFsrmFileGroup_get_NonMembers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroup_put_NonMembers_Proxy(
-    IFsrmFileGroup* This,
-    IFsrmMutableCollection *nonMembers);
-void __RPC_STUB IFsrmFileGroup_put_NonMembers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileGroup_INTERFACE_DEFINED__ */
 
@@ -1212,29 +1058,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileScreenBase* This);
+        IFsrmFileScreenBase *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileScreenBase* This);
+        IFsrmFileScreenBase *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1242,7 +1088,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1254,51 +1100,52 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileScreenBase* This);
+        IFsrmFileScreenBase *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileScreenBase* This);
+        IFsrmFileScreenBase *This);
 
     /*** IFsrmFileScreenBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         IFsrmMutableCollection **blockList);
 
     HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         IFsrmMutableCollection *blockList);
 
     HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         LONG *fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         LONG fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateAction)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumActions)(
-        IFsrmFileScreenBase* This,
+        IFsrmFileScreenBase *This,
         IFsrmCollection **actions);
 
     END_INTERFACE
 } IFsrmFileScreenBaseVtbl;
+
 interface IFsrmFileScreenBase {
     CONST_VTBL IFsrmFileScreenBaseVtbl* lpVtbl;
 };
@@ -1391,55 +1238,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_get_BlockedFileGroups_Proxy(
-    IFsrmFileScreenBase* This,
-    IFsrmMutableCollection **blockList);
-void __RPC_STUB IFsrmFileScreenBase_get_BlockedFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_put_BlockedFileGroups_Proxy(
-    IFsrmFileScreenBase* This,
-    IFsrmMutableCollection *blockList);
-void __RPC_STUB IFsrmFileScreenBase_put_BlockedFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_get_FileScreenFlags_Proxy(
-    IFsrmFileScreenBase* This,
-    LONG *fileScreenFlags);
-void __RPC_STUB IFsrmFileScreenBase_get_FileScreenFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_put_FileScreenFlags_Proxy(
-    IFsrmFileScreenBase* This,
-    LONG fileScreenFlags);
-void __RPC_STUB IFsrmFileScreenBase_put_FileScreenFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_CreateAction_Proxy(
-    IFsrmFileScreenBase* This,
-    FsrmActionType actionType,
-    IFsrmAction **action);
-void __RPC_STUB IFsrmFileScreenBase_CreateAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenBase_EnumActions_Proxy(
-    IFsrmFileScreenBase* This,
-    IFsrmCollection **actions);
-void __RPC_STUB IFsrmFileScreenBase_EnumActions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileScreenBase_INTERFACE_DEFINED__ */
 
@@ -1473,29 +1271,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileScreenException* This);
+        IFsrmFileScreenException *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileScreenException* This);
+        IFsrmFileScreenException *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1503,7 +1301,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1515,38 +1313,39 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileScreenException* This);
+        IFsrmFileScreenException *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileScreenException* This);
+        IFsrmFileScreenException *This);
 
     /*** IFsrmFileScreenException methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowedFileGroups)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         IFsrmMutableCollection **allowList);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowedFileGroups)(
-        IFsrmFileScreenException* This,
+        IFsrmFileScreenException *This,
         IFsrmMutableCollection *allowList);
 
     END_INTERFACE
 } IFsrmFileScreenExceptionVtbl;
+
 interface IFsrmFileScreenException {
     CONST_VTBL IFsrmFileScreenExceptionVtbl* lpVtbl;
 };
@@ -1627,30 +1426,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenException_get_Path_Proxy(
-    IFsrmFileScreenException* This,
-    BSTR *path);
-void __RPC_STUB IFsrmFileScreenException_get_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenException_get_AllowedFileGroups_Proxy(
-    IFsrmFileScreenException* This,
-    IFsrmMutableCollection **allowList);
-void __RPC_STUB IFsrmFileScreenException_get_AllowedFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenException_put_AllowedFileGroups_Proxy(
-    IFsrmFileScreenException* This,
-    IFsrmMutableCollection *allowList);
-void __RPC_STUB IFsrmFileScreenException_put_AllowedFileGroups_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileScreenException_INTERFACE_DEFINED__ */
 
@@ -1693,29 +1468,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileScreen* This);
+        IFsrmFileScreen *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileScreen* This);
+        IFsrmFileScreen *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1723,7 +1498,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1735,76 +1510,77 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileScreen* This);
+        IFsrmFileScreen *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileScreen* This);
+        IFsrmFileScreen *This);
 
     /*** IFsrmFileScreenBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         IFsrmMutableCollection **blockList);
 
     HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         IFsrmMutableCollection *blockList);
 
     HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         LONG *fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         LONG fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateAction)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumActions)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         IFsrmCollection **actions);
 
     /*** IFsrmFileScreen methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         BSTR *path);
 
     HRESULT (STDMETHODCALLTYPE *get_SourceTemplateName)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         BSTR *fileScreenTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *get_MatchesSourceTemplate)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         VARIANT_BOOL *matches);
 
     HRESULT (STDMETHODCALLTYPE *get_UserSid)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         BSTR *userSid);
 
     HRESULT (STDMETHODCALLTYPE *get_UserAccount)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         BSTR *userAccount);
 
     HRESULT (STDMETHODCALLTYPE *ApplyTemplate)(
-        IFsrmFileScreen* This,
+        IFsrmFileScreen *This,
         BSTR fileScreenTemplateName);
 
     END_INTERFACE
 } IFsrmFileScreenVtbl;
+
 interface IFsrmFileScreen {
     CONST_VTBL IFsrmFileScreenVtbl* lpVtbl;
 };
@@ -1923,54 +1699,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_Path_Proxy(
-    IFsrmFileScreen* This,
-    BSTR *path);
-void __RPC_STUB IFsrmFileScreen_get_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_SourceTemplateName_Proxy(
-    IFsrmFileScreen* This,
-    BSTR *fileScreenTemplateName);
-void __RPC_STUB IFsrmFileScreen_get_SourceTemplateName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_MatchesSourceTemplate_Proxy(
-    IFsrmFileScreen* This,
-    VARIANT_BOOL *matches);
-void __RPC_STUB IFsrmFileScreen_get_MatchesSourceTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_UserSid_Proxy(
-    IFsrmFileScreen* This,
-    BSTR *userSid);
-void __RPC_STUB IFsrmFileScreen_get_UserSid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreen_get_UserAccount_Proxy(
-    IFsrmFileScreen* This,
-    BSTR *userAccount);
-void __RPC_STUB IFsrmFileScreen_get_UserAccount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreen_ApplyTemplate_Proxy(
-    IFsrmFileScreen* This,
-    BSTR fileScreenTemplateName);
-void __RPC_STUB IFsrmFileScreen_ApplyTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileScreen_INTERFACE_DEFINED__ */
 
@@ -2001,29 +1729,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileGroupImported* This);
+        IFsrmFileGroupImported *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileGroupImported* This);
+        IFsrmFileGroupImported *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2031,7 +1759,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2043,59 +1771,60 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileGroupImported* This);
+        IFsrmFileGroupImported *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileGroupImported* This);
+        IFsrmFileGroupImported *This);
 
     /*** IFsrmFileGroup methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *get_Members)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         IFsrmMutableCollection **members);
 
     HRESULT (STDMETHODCALLTYPE *put_Members)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         IFsrmMutableCollection *members);
 
     HRESULT (STDMETHODCALLTYPE *get_NonMembers)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         IFsrmMutableCollection **nonMembers);
 
     HRESULT (STDMETHODCALLTYPE *put_NonMembers)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         IFsrmMutableCollection *nonMembers);
 
     /*** IFsrmFileGroupImported methods ***/
     HRESULT (STDMETHODCALLTYPE *get_OverwriteOnCommit)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         VARIANT_BOOL *overwrite);
 
     HRESULT (STDMETHODCALLTYPE *put_OverwriteOnCommit)(
-        IFsrmFileGroupImported* This,
+        IFsrmFileGroupImported *This,
         VARIANT_BOOL overwrite);
 
     END_INTERFACE
 } IFsrmFileGroupImportedVtbl;
+
 interface IFsrmFileGroupImported {
     CONST_VTBL IFsrmFileGroupImportedVtbl* lpVtbl;
 };
@@ -2198,22 +1927,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileGroupImported_get_OverwriteOnCommit_Proxy(
-    IFsrmFileGroupImported* This,
-    VARIANT_BOOL *overwrite);
-void __RPC_STUB IFsrmFileGroupImported_get_OverwriteOnCommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileGroupImported_put_OverwriteOnCommit_Proxy(
-    IFsrmFileGroupImported* This,
-    VARIANT_BOOL overwrite);
-void __RPC_STUB IFsrmFileGroupImported_put_OverwriteOnCommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileGroupImported_INTERFACE_DEFINED__ */
 
@@ -2252,29 +1965,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileScreenTemplate* This);
+        IFsrmFileScreenTemplate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileScreenTemplate* This);
+        IFsrmFileScreenTemplate *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2282,7 +1995,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2294,70 +2007,71 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileScreenTemplate* This);
+        IFsrmFileScreenTemplate *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileScreenTemplate* This);
+        IFsrmFileScreenTemplate *This);
 
     /*** IFsrmFileScreenBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         IFsrmMutableCollection **blockList);
 
     HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         IFsrmMutableCollection *blockList);
 
     HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         LONG *fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         LONG fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateAction)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumActions)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         IFsrmCollection **actions);
 
     /*** IFsrmFileScreenTemplate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *CopyTemplate)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         BSTR fileScreenTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)(
-        IFsrmFileScreenTemplate* This,
+        IFsrmFileScreenTemplate *This,
         FsrmCommitOptions commitOptions,
         FsrmTemplateApplyOptions applyOptions,
         IFsrmDerivedObjectsResult **derivedObjectsResult);
 
     END_INTERFACE
 } IFsrmFileScreenTemplateVtbl;
+
 interface IFsrmFileScreenTemplate {
     CONST_VTBL IFsrmFileScreenTemplateVtbl* lpVtbl;
 };
@@ -2468,40 +2182,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_get_Name_Proxy(
-    IFsrmFileScreenTemplate* This,
-    BSTR *name);
-void __RPC_STUB IFsrmFileScreenTemplate_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_put_Name_Proxy(
-    IFsrmFileScreenTemplate* This,
-    BSTR name);
-void __RPC_STUB IFsrmFileScreenTemplate_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_CopyTemplate_Proxy(
-    IFsrmFileScreenTemplate* This,
-    BSTR fileScreenTemplateName);
-void __RPC_STUB IFsrmFileScreenTemplate_CopyTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplate_CommitAndUpdateDerived_Proxy(
-    IFsrmFileScreenTemplate* This,
-    FsrmCommitOptions commitOptions,
-    FsrmTemplateApplyOptions applyOptions,
-    IFsrmDerivedObjectsResult **derivedObjectsResult);
-void __RPC_STUB IFsrmFileScreenTemplate_CommitAndUpdateDerived_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileScreenTemplate_INTERFACE_DEFINED__ */
 
@@ -2532,29 +2212,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFsrmFileScreenTemplateImported* This);
+        IFsrmFileScreenTemplateImported *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFsrmFileScreenTemplateImported* This);
+        IFsrmFileScreenTemplateImported *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2562,7 +2242,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2574,79 +2254,80 @@
 
     /*** IFsrmObject methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         FSRM_OBJECT_ID *id);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         BSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         BSTR description);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IFsrmFileScreenTemplateImported* This);
+        IFsrmFileScreenTemplateImported *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IFsrmFileScreenTemplateImported* This);
+        IFsrmFileScreenTemplateImported *This);
 
     /*** IFsrmFileScreenBase methods ***/
     HRESULT (STDMETHODCALLTYPE *get_BlockedFileGroups)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         IFsrmMutableCollection **blockList);
 
     HRESULT (STDMETHODCALLTYPE *put_BlockedFileGroups)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         IFsrmMutableCollection *blockList);
 
     HRESULT (STDMETHODCALLTYPE *get_FileScreenFlags)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         LONG *fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_FileScreenFlags)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         LONG fileScreenFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateAction)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         FsrmActionType actionType,
         IFsrmAction **action);
 
     HRESULT (STDMETHODCALLTYPE *EnumActions)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         IFsrmCollection **actions);
 
     /*** IFsrmFileScreenTemplate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *CopyTemplate)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         BSTR fileScreenTemplateName);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndUpdateDerived)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         FsrmCommitOptions commitOptions,
         FsrmTemplateApplyOptions applyOptions,
         IFsrmDerivedObjectsResult **derivedObjectsResult);
 
     /*** IFsrmFileScreenTemplateImported methods ***/
     HRESULT (STDMETHODCALLTYPE *get_OverwriteOnCommit)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         VARIANT_BOOL *overwrite);
 
     HRESULT (STDMETHODCALLTYPE *put_OverwriteOnCommit)(
-        IFsrmFileScreenTemplateImported* This,
+        IFsrmFileScreenTemplateImported *This,
         VARIANT_BOOL overwrite);
 
     END_INTERFACE
 } IFsrmFileScreenTemplateImportedVtbl;
+
 interface IFsrmFileScreenTemplateImported {
     CONST_VTBL IFsrmFileScreenTemplateImportedVtbl* lpVtbl;
 };
@@ -2767,22 +2448,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateImported_get_OverwriteOnCommit_Proxy(
-    IFsrmFileScreenTemplateImported* This,
-    VARIANT_BOOL *overwrite);
-void __RPC_STUB IFsrmFileScreenTemplateImported_get_OverwriteOnCommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFsrmFileScreenTemplateImported_put_OverwriteOnCommit_Proxy(
-    IFsrmFileScreenTemplateImported* This,
-    VARIANT_BOOL overwrite);
-void __RPC_STUB IFsrmFileScreenTemplateImported_put_OverwriteOnCommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFsrmFileScreenTemplateImported_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/fusion.h b/mingw-w64-headers/include/fusion.h
index 1ebe38d..92a45e6 100644
--- a/mingw-w64-headers/include/fusion.h
+++ b/mingw-w64-headers/include/fusion.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/fusion.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/fusion.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/fwptypes.h b/mingw-w64-headers/include/fwptypes.h
index 1742837..0310a65 100644
--- a/mingw-w64-headers/include/fwptypes.h
+++ b/mingw-w64-headers/include/fwptypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/fwptypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/fwptypes.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/hstring.h b/mingw-w64-headers/include/hstring.h
index 54e0ed0..b8ffb2e 100644
--- a/mingw-w64-headers/include/hstring.h
+++ b/mingw-w64-headers/include/hstring.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/hstring.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/hstring.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/icftypes.h b/mingw-w64-headers/include/icftypes.h
index e416069..81b7c16 100644
--- a/mingw-w64-headers/include/icftypes.h
+++ b/mingw-w64-headers/include/icftypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/icftypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/icftypes.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/icodecapi.h b/mingw-w64-headers/include/icodecapi.h
index ce93d4b..79e145f 100644
--- a/mingw-w64-headers/include/icodecapi.h
+++ b/mingw-w64-headers/include/icodecapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/icodecapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/icodecapi.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __ICodecAPI_FWD_DEFINED__
 #define __ICodecAPI_FWD_DEFINED__
 typedef interface ICodecAPI ICodecAPI;
+#ifdef __cplusplus
+interface ICodecAPI;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -46,10 +49,12 @@
     DWORD reserved[3];
 };
 
-
 #ifndef __IStream_FWD_DEFINED__
 #define __IStream_FWD_DEFINED__
 typedef interface IStream IStream;
+#ifdef __cplusplus
+interface IStream;
+#endif /* __cplusplus */
 #endif
 
 
@@ -134,93 +139,94 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICodecAPI* This);
+        ICodecAPI *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICodecAPI* This);
+        ICodecAPI *This);
 
     /*** ICodecAPI methods ***/
     HRESULT (STDMETHODCALLTYPE *IsSupported)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api);
 
     HRESULT (STDMETHODCALLTYPE *IsModifiable)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api);
 
     HRESULT (STDMETHODCALLTYPE *GetParameterRange)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api,
         VARIANT *ValueMin,
         VARIANT *ValueMax,
         VARIANT *SteppingDelta);
 
     HRESULT (STDMETHODCALLTYPE *GetParameterValues)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api,
         VARIANT **Values,
         ULONG *ValuesCount);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultValue)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *SetValue)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *RegisterForEvent)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api,
         LONG_PTR userData);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterForEvent)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api);
 
     HRESULT (STDMETHODCALLTYPE *SetAllDefaults)(
-        ICodecAPI* This);
+        ICodecAPI *This);
 
     HRESULT (STDMETHODCALLTYPE *SetValueWithNotify)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         const GUID *Api,
         VARIANT *Value,
         GUID **ChangedParam,
         ULONG *ChangedParamCount);
 
     HRESULT (STDMETHODCALLTYPE *SetAllDefaultsWithNotify)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         GUID **ChangedParam,
         ULONG *ChangedParamCount);
 
     HRESULT (STDMETHODCALLTYPE *GetAllSettings)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         IStream *a);
 
     HRESULT (STDMETHODCALLTYPE *SetAllSettings)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         IStream *a);
 
     HRESULT (STDMETHODCALLTYPE *SetAllSettingsWithNotify)(
-        ICodecAPI* This,
+        ICodecAPI *This,
         IStream *a,
         GUID **ChangedParam,
         ULONG *ChangedParamCount);
 
     END_INTERFACE
 } ICodecAPIVtbl;
+
 interface ICodecAPI {
     CONST_VTBL ICodecAPIVtbl* lpVtbl;
 };
@@ -309,140 +315,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICodecAPI_IsSupported_Proxy(
-    ICodecAPI* This,
-    const GUID *Api);
-void __RPC_STUB ICodecAPI_IsSupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_IsModifiable_Proxy(
-    ICodecAPI* This,
-    const GUID *Api);
-void __RPC_STUB ICodecAPI_IsModifiable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_GetParameterRange_Proxy(
-    ICodecAPI* This,
-    const GUID *Api,
-    VARIANT *ValueMin,
-    VARIANT *ValueMax,
-    VARIANT *SteppingDelta);
-void __RPC_STUB ICodecAPI_GetParameterRange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_GetParameterValues_Proxy(
-    ICodecAPI* This,
-    const GUID *Api,
-    VARIANT **Values,
-    ULONG *ValuesCount);
-void __RPC_STUB ICodecAPI_GetParameterValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_GetDefaultValue_Proxy(
-    ICodecAPI* This,
-    const GUID *Api,
-    VARIANT *Value);
-void __RPC_STUB ICodecAPI_GetDefaultValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_GetValue_Proxy(
-    ICodecAPI* This,
-    const GUID *Api,
-    VARIANT *Value);
-void __RPC_STUB ICodecAPI_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_SetValue_Proxy(
-    ICodecAPI* This,
-    const GUID *Api,
-    VARIANT *Value);
-void __RPC_STUB ICodecAPI_SetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_RegisterForEvent_Proxy(
-    ICodecAPI* This,
-    const GUID *Api,
-    LONG_PTR userData);
-void __RPC_STUB ICodecAPI_RegisterForEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_UnregisterForEvent_Proxy(
-    ICodecAPI* This,
-    const GUID *Api);
-void __RPC_STUB ICodecAPI_UnregisterForEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllDefaults_Proxy(
-    ICodecAPI* This);
-void __RPC_STUB ICodecAPI_SetAllDefaults_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_SetValueWithNotify_Proxy(
-    ICodecAPI* This,
-    const GUID *Api,
-    VARIANT *Value,
-    GUID **ChangedParam,
-    ULONG *ChangedParamCount);
-void __RPC_STUB ICodecAPI_SetValueWithNotify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllDefaultsWithNotify_Proxy(
-    ICodecAPI* This,
-    GUID **ChangedParam,
-    ULONG *ChangedParamCount);
-void __RPC_STUB ICodecAPI_SetAllDefaultsWithNotify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_GetAllSettings_Proxy(
-    ICodecAPI* This,
-    IStream *a);
-void __RPC_STUB ICodecAPI_GetAllSettings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllSettings_Proxy(
-    ICodecAPI* This,
-    IStream *a);
-void __RPC_STUB ICodecAPI_SetAllSettings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICodecAPI_SetAllSettingsWithNotify_Proxy(
-    ICodecAPI* This,
-    IStream *a,
-    GUID **ChangedParam,
-    ULONG *ChangedParamCount);
-void __RPC_STUB ICodecAPI_SetAllSettingsWithNotify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICodecAPI_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/iketypes.h b/mingw-w64-headers/include/iketypes.h
index 2638e72..5c7f2b1 100644
--- a/mingw-w64-headers/include/iketypes.h
+++ b/mingw-w64-headers/include/iketypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/iketypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/iketypes.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/inputscope.h b/mingw-w64-headers/include/inputscope.h
index 949c389..3e7a9b2 100644
--- a/mingw-w64-headers/include/inputscope.h
+++ b/mingw-w64-headers/include/inputscope.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/inputscope.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/inputscope.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __ITfInputScope_FWD_DEFINED__
 #define __ITfInputScope_FWD_DEFINED__
 typedef interface ITfInputScope ITfInputScope;
+#ifdef __cplusplus
+interface ITfInputScope;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -136,41 +139,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITfInputScope* This,
+        ITfInputScope *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITfInputScope* This);
+        ITfInputScope *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITfInputScope* This);
+        ITfInputScope *This);
 
     /*** ITfInputScope methods ***/
     HRESULT (STDMETHODCALLTYPE *GetInputScopes)(
-        ITfInputScope* This,
+        ITfInputScope *This,
         InputScope **pprgInputScopes,
         UINT *pcCount);
 
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ITfInputScope* This,
+        ITfInputScope *This,
         BSTR **ppbstrPhrases,
         UINT *pcCount);
 
     HRESULT (STDMETHODCALLTYPE *GetRegularExpression)(
-        ITfInputScope* This,
+        ITfInputScope *This,
         BSTR *pbstrRegExp);
 
     HRESULT (STDMETHODCALLTYPE *GetSRGS)(
-        ITfInputScope* This,
+        ITfInputScope *This,
         BSTR *pbstrSRGS);
 
     HRESULT (STDMETHODCALLTYPE *GetXML)(
-        ITfInputScope* This,
+        ITfInputScope *This,
         BSTR *pbstrXML);
 
     END_INTERFACE
 } ITfInputScopeVtbl;
+
 interface ITfInputScope {
     CONST_VTBL ITfInputScopeVtbl* lpVtbl;
 };
@@ -219,48 +223,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITfInputScope_GetInputScopes_Proxy(
-    ITfInputScope* This,
-    InputScope **pprgInputScopes,
-    UINT *pcCount);
-void __RPC_STUB ITfInputScope_GetInputScopes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITfInputScope_GetPhrase_Proxy(
-    ITfInputScope* This,
-    BSTR **ppbstrPhrases,
-    UINT *pcCount);
-void __RPC_STUB ITfInputScope_GetPhrase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITfInputScope_GetRegularExpression_Proxy(
-    ITfInputScope* This,
-    BSTR *pbstrRegExp);
-void __RPC_STUB ITfInputScope_GetRegularExpression_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITfInputScope_GetSRGS_Proxy(
-    ITfInputScope* This,
-    BSTR *pbstrSRGS);
-void __RPC_STUB ITfInputScope_GetSRGS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITfInputScope_GetXML_Proxy(
-    ITfInputScope* This,
-    BSTR *pbstrXML);
-void __RPC_STUB ITfInputScope_GetXML_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITfInputScope_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/inspectable.h b/mingw-w64-headers/include/inspectable.h
index 9d38eca..0fc7e38 100644
--- a/mingw-w64-headers/include/inspectable.h
+++ b/mingw-w64-headers/include/inspectable.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/inspectable.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/inspectable.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IInspectable_FWD_DEFINED__
 #define __IInspectable_FWD_DEFINED__
 typedef interface IInspectable IInspectable;
+#ifdef __cplusplus
+interface IInspectable;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -68,32 +71,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInspectable* This,
+        IInspectable *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInspectable* This);
+        IInspectable *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInspectable* This);
+        IInspectable *This);
 
     /*** IInspectable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetIids)(
-        IInspectable* This,
+        IInspectable *This,
         ULONG *iidCount,
         IID **iids);
 
     HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)(
-        IInspectable* This,
+        IInspectable *This,
         HSTRING *className);
 
     HRESULT (STDMETHODCALLTYPE *GetTrustLevel)(
-        IInspectable* This,
+        IInspectable *This,
         TrustLevel *trustLevel);
 
     END_INTERFACE
 } IInspectableVtbl;
+
 interface IInspectable {
     CONST_VTBL IInspectableVtbl* lpVtbl;
 };
@@ -134,31 +138,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInspectable_GetIids_Proxy(
-    IInspectable* This,
-    ULONG *iidCount,
-    IID **iids);
-void __RPC_STUB IInspectable_GetIids_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInspectable_GetRuntimeClassName_Proxy(
-    IInspectable* This,
-    HSTRING *className);
-void __RPC_STUB IInspectable_GetRuntimeClassName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInspectable_GetTrustLevel_Proxy(
-    IInspectable* This,
-    TrustLevel *trustLevel);
-void __RPC_STUB IInspectable_GetTrustLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInspectable_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/locationapi.h b/mingw-w64-headers/include/locationapi.h
index 55a7dc5..f661f2f 100644
--- a/mingw-w64-headers/include/locationapi.h
+++ b/mingw-w64-headers/include/locationapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/locationapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/locationapi.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,31 +20,49 @@
 #ifndef __ILocationReport_FWD_DEFINED__
 #define __ILocationReport_FWD_DEFINED__
 typedef interface ILocationReport ILocationReport;
+#ifdef __cplusplus
+interface ILocationReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICivicAddressReport_FWD_DEFINED__
 #define __ICivicAddressReport_FWD_DEFINED__
 typedef interface ICivicAddressReport ICivicAddressReport;
+#ifdef __cplusplus
+interface ICivicAddressReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ILatLongReport_FWD_DEFINED__
 #define __ILatLongReport_FWD_DEFINED__
 typedef interface ILatLongReport ILatLongReport;
+#ifdef __cplusplus
+interface ILatLongReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDefaultLocation_FWD_DEFINED__
 #define __IDefaultLocation_FWD_DEFINED__
 typedef interface IDefaultLocation IDefaultLocation;
+#ifdef __cplusplus
+interface IDefaultLocation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ILocationEvents_FWD_DEFINED__
 #define __ILocationEvents_FWD_DEFINED__
 typedef interface ILocationEvents ILocationEvents;
+#ifdef __cplusplus
+interface ILocationEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ILocation_FWD_DEFINED__
 #define __ILocation_FWD_DEFINED__
 typedef interface ILocation ILocation;
+#ifdef __cplusplus
+interface ILocation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __Location_FWD_DEFINED__
@@ -105,32 +123,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ILocationReport* This,
+        ILocationReport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ILocationReport* This);
+        ILocationReport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ILocationReport* This);
+        ILocationReport *This);
 
     /*** ILocationReport methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSensorID)(
-        ILocationReport* This,
+        ILocationReport *This,
         SENSOR_ID *pSensorID);
 
     HRESULT (STDMETHODCALLTYPE *GetTimestamp)(
-        ILocationReport* This,
+        ILocationReport *This,
         SYSTEMTIME *pCreationTime);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        ILocationReport* This,
+        ILocationReport *This,
         REFPROPERTYKEY pKey,
         PROPVARIANT *pValue);
 
     END_INTERFACE
 } ILocationReportVtbl;
+
 interface ILocationReport {
     CONST_VTBL ILocationReportVtbl* lpVtbl;
 };
@@ -171,31 +190,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ILocationReport_GetSensorID_Proxy(
-    ILocationReport* This,
-    SENSOR_ID *pSensorID);
-void __RPC_STUB ILocationReport_GetSensorID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocationReport_GetTimestamp_Proxy(
-    ILocationReport* This,
-    SYSTEMTIME *pCreationTime);
-void __RPC_STUB ILocationReport_GetTimestamp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocationReport_GetValue_Proxy(
-    ILocationReport* This,
-    REFPROPERTYKEY pKey,
-    PROPVARIANT *pValue);
-void __RPC_STUB ILocationReport_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ILocationReport_INTERFACE_DEFINED__ */
 
@@ -241,61 +235,62 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICivicAddressReport* This);
+        ICivicAddressReport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICivicAddressReport* This);
+        ICivicAddressReport *This);
 
     /*** ILocationReport methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSensorID)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         SENSOR_ID *pSensorID);
 
     HRESULT (STDMETHODCALLTYPE *GetTimestamp)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         SYSTEMTIME *pCreationTime);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         REFPROPERTYKEY pKey,
         PROPVARIANT *pValue);
 
     /*** ICivicAddressReport methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAddressLine1)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         BSTR *pbstrAddress1);
 
     HRESULT (STDMETHODCALLTYPE *GetAddressLine2)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         BSTR *pbstrAddress2);
 
     HRESULT (STDMETHODCALLTYPE *GetCity)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         BSTR *pbstrCity);
 
     HRESULT (STDMETHODCALLTYPE *GetStateProvince)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         BSTR *pbstrStateProvince);
 
     HRESULT (STDMETHODCALLTYPE *GetPostalCode)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         BSTR *pbstrPostalCode);
 
     HRESULT (STDMETHODCALLTYPE *GetCountryRegion)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         BSTR *pbstrCountryRegion);
 
     HRESULT (STDMETHODCALLTYPE *GetDetailLevel)(
-        ICivicAddressReport* This,
+        ICivicAddressReport *This,
         DWORD *pDetailLevel);
 
     END_INTERFACE
 } ICivicAddressReportVtbl;
+
 interface ICivicAddressReport {
     CONST_VTBL ICivicAddressReportVtbl* lpVtbl;
 };
@@ -366,62 +361,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetAddressLine1_Proxy(
-    ICivicAddressReport* This,
-    BSTR *pbstrAddress1);
-void __RPC_STUB ICivicAddressReport_GetAddressLine1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetAddressLine2_Proxy(
-    ICivicAddressReport* This,
-    BSTR *pbstrAddress2);
-void __RPC_STUB ICivicAddressReport_GetAddressLine2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetCity_Proxy(
-    ICivicAddressReport* This,
-    BSTR *pbstrCity);
-void __RPC_STUB ICivicAddressReport_GetCity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetStateProvince_Proxy(
-    ICivicAddressReport* This,
-    BSTR *pbstrStateProvince);
-void __RPC_STUB ICivicAddressReport_GetStateProvince_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetPostalCode_Proxy(
-    ICivicAddressReport* This,
-    BSTR *pbstrPostalCode);
-void __RPC_STUB ICivicAddressReport_GetPostalCode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetCountryRegion_Proxy(
-    ICivicAddressReport* This,
-    BSTR *pbstrCountryRegion);
-void __RPC_STUB ICivicAddressReport_GetCountryRegion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICivicAddressReport_GetDetailLevel_Proxy(
-    ICivicAddressReport* This,
-    DWORD *pDetailLevel);
-void __RPC_STUB ICivicAddressReport_GetDetailLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICivicAddressReport_INTERFACE_DEFINED__ */
 
@@ -461,53 +400,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ILatLongReport* This);
+        ILatLongReport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ILatLongReport* This);
+        ILatLongReport *This);
 
     /*** ILocationReport methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSensorID)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         SENSOR_ID *pSensorID);
 
     HRESULT (STDMETHODCALLTYPE *GetTimestamp)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         SYSTEMTIME *pCreationTime);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         REFPROPERTYKEY pKey,
         PROPVARIANT *pValue);
 
     /*** ILatLongReport methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLatitude)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         DOUBLE *pLatitude);
 
     HRESULT (STDMETHODCALLTYPE *GetLongitude)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         DOUBLE *pLongitude);
 
     HRESULT (STDMETHODCALLTYPE *GetErrorRadius)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         DOUBLE *pErrorRadius);
 
     HRESULT (STDMETHODCALLTYPE *GetAltitude)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         DOUBLE *pAltitude);
 
     HRESULT (STDMETHODCALLTYPE *GetAltitudeError)(
-        ILatLongReport* This,
+        ILatLongReport *This,
         DOUBLE *pAltitudeError);
 
     END_INTERFACE
 } ILatLongReportVtbl;
+
 interface ILatLongReport {
     CONST_VTBL ILatLongReportVtbl* lpVtbl;
 };
@@ -570,46 +510,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ILatLongReport_GetLatitude_Proxy(
-    ILatLongReport* This,
-    DOUBLE *pLatitude);
-void __RPC_STUB ILatLongReport_GetLatitude_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILatLongReport_GetLongitude_Proxy(
-    ILatLongReport* This,
-    DOUBLE *pLongitude);
-void __RPC_STUB ILatLongReport_GetLongitude_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILatLongReport_GetErrorRadius_Proxy(
-    ILatLongReport* This,
-    DOUBLE *pErrorRadius);
-void __RPC_STUB ILatLongReport_GetErrorRadius_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILatLongReport_GetAltitude_Proxy(
-    ILatLongReport* This,
-    DOUBLE *pAltitude);
-void __RPC_STUB ILatLongReport_GetAltitude_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILatLongReport_GetAltitudeError_Proxy(
-    ILatLongReport* This,
-    DOUBLE *pAltitudeError);
-void __RPC_STUB ILatLongReport_GetAltitudeError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ILatLongReport_INTERFACE_DEFINED__ */
 
@@ -642,29 +542,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDefaultLocation* This,
+        IDefaultLocation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDefaultLocation* This);
+        IDefaultLocation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDefaultLocation* This);
+        IDefaultLocation *This);
 
     /*** IDefaultLocation methods ***/
     HRESULT (STDMETHODCALLTYPE *SetReport)(
-        IDefaultLocation* This,
+        IDefaultLocation *This,
         REFIID reportType,
         ILocationReport *pLocationReport);
 
     HRESULT (STDMETHODCALLTYPE *GetReport)(
-        IDefaultLocation* This,
+        IDefaultLocation *This,
         REFIID reportType,
         ILocationReport **ppLocationReport);
 
     END_INTERFACE
 } IDefaultLocationVtbl;
+
 interface IDefaultLocation {
     CONST_VTBL IDefaultLocationVtbl* lpVtbl;
 };
@@ -701,24 +602,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDefaultLocation_SetReport_Proxy(
-    IDefaultLocation* This,
-    REFIID reportType,
-    ILocationReport *pLocationReport);
-void __RPC_STUB IDefaultLocation_SetReport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultLocation_GetReport_Proxy(
-    IDefaultLocation* This,
-    REFIID reportType,
-    ILocationReport **ppLocationReport);
-void __RPC_STUB IDefaultLocation_GetReport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDefaultLocation_INTERFACE_DEFINED__ */
 
@@ -751,29 +634,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ILocationEvents* This,
+        ILocationEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ILocationEvents* This);
+        ILocationEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ILocationEvents* This);
+        ILocationEvents *This);
 
     /*** ILocationEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnLocationChanged)(
-        ILocationEvents* This,
+        ILocationEvents *This,
         REFIID reportType,
         ILocationReport *pLocationReport);
 
     HRESULT (STDMETHODCALLTYPE *OnStatusChanged)(
-        ILocationEvents* This,
+        ILocationEvents *This,
         REFIID reportType,
         LOCATION_REPORT_STATUS newStatus);
 
     END_INTERFACE
 } ILocationEventsVtbl;
+
 interface ILocationEvents {
     CONST_VTBL ILocationEventsVtbl* lpVtbl;
 };
@@ -810,24 +694,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ILocationEvents_OnLocationChanged_Proxy(
-    ILocationEvents* This,
-    REFIID reportType,
-    ILocationReport *pLocationReport);
-void __RPC_STUB ILocationEvents_OnLocationChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocationEvents_OnStatusChanged_Proxy(
-    ILocationEvents* This,
-    REFIID reportType,
-    LOCATION_REPORT_STATUS newStatus);
-void __RPC_STUB ILocationEvents_OnStatusChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ILocationEvents_INTERFACE_DEFINED__ */
 
@@ -890,59 +756,59 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ILocation* This,
+        ILocation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ILocation* This);
+        ILocation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ILocation* This);
+        ILocation *This);
 
     /*** ILocation methods ***/
     HRESULT (STDMETHODCALLTYPE *RegisterForReport)(
-        ILocation* This,
+        ILocation *This,
         ILocationEvents *pEvents,
         REFIID reportType,
         DWORD dwRequestedReportInterval);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterForReport)(
-        ILocation* This,
+        ILocation *This,
         REFIID reportType);
 
     HRESULT (STDMETHODCALLTYPE *GetReport)(
-        ILocation* This,
+        ILocation *This,
         REFIID reportType,
         ILocationReport **ppLocationReport);
 
     HRESULT (STDMETHODCALLTYPE *GetReportStatus)(
-        ILocation* This,
+        ILocation *This,
         REFIID reportType,
         LOCATION_REPORT_STATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetReportInterval)(
-        ILocation* This,
+        ILocation *This,
         REFIID reportType,
         DWORD *pMilliseconds);
 
     HRESULT (STDMETHODCALLTYPE *SetReportInterval)(
-        ILocation* This,
+        ILocation *This,
         REFIID reportType,
         DWORD millisecondsRequested);
 
     HRESULT (STDMETHODCALLTYPE *GetDesiredAccuracy)(
-        ILocation* This,
+        ILocation *This,
         REFIID reportType,
         LOCATION_DESIRED_ACCURACY *pDesiredAccuracy);
 
     HRESULT (STDMETHODCALLTYPE *SetDesiredAccuracy)(
-        ILocation* This,
+        ILocation *This,
         REFIID reportType,
         LOCATION_DESIRED_ACCURACY desiredAccuracy);
 
     HRESULT (STDMETHODCALLTYPE *RequestPermissions)(
-        ILocation* This,
+        ILocation *This,
         HWND hParent,
         IID pReportTypes[],
         ULONG count,
@@ -950,6 +816,7 @@
 
     END_INTERFACE
 } ILocationVtbl;
+
 interface ILocation {
     CONST_VTBL ILocationVtbl* lpVtbl;
 };
@@ -1014,89 +881,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ILocation_RegisterForReport_Proxy(
-    ILocation* This,
-    ILocationEvents *pEvents,
-    REFIID reportType,
-    DWORD dwRequestedReportInterval);
-void __RPC_STUB ILocation_RegisterForReport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_UnregisterForReport_Proxy(
-    ILocation* This,
-    REFIID reportType);
-void __RPC_STUB ILocation_UnregisterForReport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_GetReport_Proxy(
-    ILocation* This,
-    REFIID reportType,
-    ILocationReport **ppLocationReport);
-void __RPC_STUB ILocation_GetReport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_GetReportStatus_Proxy(
-    ILocation* This,
-    REFIID reportType,
-    LOCATION_REPORT_STATUS *pStatus);
-void __RPC_STUB ILocation_GetReportStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_GetReportInterval_Proxy(
-    ILocation* This,
-    REFIID reportType,
-    DWORD *pMilliseconds);
-void __RPC_STUB ILocation_GetReportInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_SetReportInterval_Proxy(
-    ILocation* This,
-    REFIID reportType,
-    DWORD millisecondsRequested);
-void __RPC_STUB ILocation_SetReportInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_GetDesiredAccuracy_Proxy(
-    ILocation* This,
-    REFIID reportType,
-    LOCATION_DESIRED_ACCURACY *pDesiredAccuracy);
-void __RPC_STUB ILocation_GetDesiredAccuracy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_SetDesiredAccuracy_Proxy(
-    ILocation* This,
-    REFIID reportType,
-    LOCATION_DESIRED_ACCURACY desiredAccuracy);
-void __RPC_STUB ILocation_SetDesiredAccuracy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ILocation_RequestPermissions_Proxy(
-    ILocation* This,
-    HWND hParent,
-    IID pReportTypes[],
-    ULONG count,
-    WINBOOL fModal);
-void __RPC_STUB ILocation_RequestPermissions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ILocation_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/mediaobj.h b/mingw-w64-headers/include/mediaobj.h
index 14b2748..6348cce 100644
--- a/mingw-w64-headers/include/mediaobj.h
+++ b/mingw-w64-headers/include/mediaobj.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/mediaobj.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mediaobj.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,31 +20,49 @@
 #ifndef __IMediaBuffer_FWD_DEFINED__
 #define __IMediaBuffer_FWD_DEFINED__
 typedef interface IMediaBuffer IMediaBuffer;
+#ifdef __cplusplus
+interface IMediaBuffer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaObject_FWD_DEFINED__
 #define __IMediaObject_FWD_DEFINED__
 typedef interface IMediaObject IMediaObject;
+#ifdef __cplusplus
+interface IMediaObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumDMO_FWD_DEFINED__
 #define __IEnumDMO_FWD_DEFINED__
 typedef interface IEnumDMO IEnumDMO;
+#ifdef __cplusplus
+interface IEnumDMO;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaObjectInPlace_FWD_DEFINED__
 #define __IMediaObjectInPlace_FWD_DEFINED__
 typedef interface IMediaObjectInPlace IMediaObjectInPlace;
+#ifdef __cplusplus
+interface IMediaObjectInPlace;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDMOQualityControl_FWD_DEFINED__
 #define __IDMOQualityControl_FWD_DEFINED__
 typedef interface IDMOQualityControl IDMOQualityControl;
+#ifdef __cplusplus
+interface IDMOQualityControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDMOVideoOutputOptimizations_FWD_DEFINED__
 #define __IDMOVideoOutputOptimizations_FWD_DEFINED__
 typedef interface IDMOVideoOutputOptimizations IDMOVideoOutputOptimizations;
+#ifdef __cplusplus
+interface IDMOVideoOutputOptimizations;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -89,7 +107,6 @@
     DMO_INPUT_DATA_BUFFERF_DISCONTINUITY = 0x8
 };
 
-
 enum _DMO_OUTPUT_DATA_BUFFER_FLAGS {
     DMO_OUTPUT_DATA_BUFFERF_SYNCPOINT = 0x1,
     DMO_OUTPUT_DATA_BUFFERF_TIME = 0x2,
@@ -98,12 +115,10 @@
     DMO_OUTPUT_DATA_BUFFERF_INCOMPLETE = 0x1000000
 };
 
-
 enum _DMO_INPUT_STATUS_FLAGS {
     DMO_INPUT_STATUSF_ACCEPT_DATA = 0x1
 };
 
-
 enum _DMO_INPUT_STREAM_INFO_FLAGS {
     DMO_INPUT_STREAMF_WHOLE_SAMPLES = 0x1,
     DMO_INPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x2,
@@ -111,7 +126,6 @@
     DMO_INPUT_STREAMF_HOLDS_BUFFERS = 0x8
 };
 
-
 enum _DMO_OUTPUT_STREAM_INFO_FLAGS {
     DMO_OUTPUT_STREAMF_WHOLE_SAMPLES = 0x1,
     DMO_OUTPUT_STREAMF_SINGLE_SAMPLE_PER_BUFFER = 0x2,
@@ -120,35 +134,29 @@
     DMO_OUTPUT_STREAMF_OPTIONAL = 0x10
 };
 
-
 enum _DMO_SET_TYPE_FLAGS {
     DMO_SET_TYPEF_TEST_ONLY = 0x1,
     DMO_SET_TYPEF_CLEAR = 0x2
 };
 
-
 enum _DMO_PROCESS_OUTPUT_FLAGS {
     DMO_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x1
 };
 
-
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP)
 enum _DMO_INPLACE_PROCESS_FLAGS {
     DMO_INPLACE_NORMAL = 0x0,
     DMO_INPLACE_ZERO = 0x1
 };
 
-
 enum _DMO_QUALITY_STATUS_FLAGS {
     DMO_QUALITY_STATUS_ENABLED = 0x1
 };
 
-
 enum _DMO_VIDEO_OUTPUT_STREAM_FLAGS {
     DMO_VOSF_NEEDS_PREVIOUS_SAMPLE = 0x1
 };
 
-
 /*****************************************************************************
  * IMediaBuffer interface
  */
@@ -180,32 +188,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaBuffer* This,
+        IMediaBuffer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaBuffer* This);
+        IMediaBuffer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaBuffer* This);
+        IMediaBuffer *This);
 
     /*** IMediaBuffer methods ***/
     HRESULT (STDMETHODCALLTYPE *SetLength)(
-        IMediaBuffer* This,
+        IMediaBuffer *This,
         DWORD cbLength);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxLength)(
-        IMediaBuffer* This,
+        IMediaBuffer *This,
         DWORD *pcbMaxLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferAndLength)(
-        IMediaBuffer* This,
+        IMediaBuffer *This,
         BYTE **ppBuffer,
         DWORD *pcbLength);
 
     END_INTERFACE
 } IMediaBufferVtbl;
+
 interface IMediaBuffer {
     CONST_VTBL IMediaBufferVtbl* lpVtbl;
 };
@@ -246,31 +255,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaBuffer_SetLength_Proxy(
-    IMediaBuffer* This,
-    DWORD cbLength);
-void __RPC_STUB IMediaBuffer_SetLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaBuffer_GetMaxLength_Proxy(
-    IMediaBuffer* This,
-    DWORD *pcbMaxLength);
-void __RPC_STUB IMediaBuffer_GetMaxLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaBuffer_GetBufferAndLength_Proxy(
-    IMediaBuffer* This,
-    BYTE **ppBuffer,
-    DWORD *pcbLength);
-void __RPC_STUB IMediaBuffer_GetBufferAndLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaBuffer_INTERFACE_DEFINED__ */
 
@@ -395,109 +379,109 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaObject* This,
+        IMediaObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaObject* This);
+        IMediaObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaObject* This);
+        IMediaObject *This);
 
     /*** IMediaObject methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStreamCount)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD *pcInputStreams,
         DWORD *pcOutputStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStreamInfo)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStreamInfo)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwOutputStreamIndex,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetInputType)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         DWORD dwTypeIndex,
         DMO_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputType)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwOutputStreamIndex,
         DWORD dwTypeIndex,
         DMO_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *SetInputType)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         const DMO_MEDIA_TYPE *pmt,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputType)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwOutputStreamIndex,
         const DMO_MEDIA_TYPE *pmt,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetInputCurrentType)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         DMO_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputCurrentType)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwOutputStreamIndex,
         DMO_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetInputSizeInfo)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         DWORD *pcbSize,
         DWORD *pcbMaxLookahead,
         DWORD *pcbAlignment);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputSizeInfo)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwOutputStreamIndex,
         DWORD *pcbSize,
         DWORD *pcbAlignment);
 
     HRESULT (STDMETHODCALLTYPE *GetInputMaxLatency)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         REFERENCE_TIME *prtMaxLatency);
 
     HRESULT (STDMETHODCALLTYPE *SetInputMaxLatency)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         REFERENCE_TIME rtMaxLatency);
 
     HRESULT (STDMETHODCALLTYPE *Flush)(
-        IMediaObject* This);
+        IMediaObject *This);
 
     HRESULT (STDMETHODCALLTYPE *Discontinuity)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex);
 
     HRESULT (STDMETHODCALLTYPE *AllocateStreamingResources)(
-        IMediaObject* This);
+        IMediaObject *This);
 
     HRESULT (STDMETHODCALLTYPE *FreeStreamingResources)(
-        IMediaObject* This);
+        IMediaObject *This);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStatus)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         DWORD *dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *ProcessInput)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwInputStreamIndex,
         IMediaBuffer *pBuffer,
         DWORD dwFlags,
@@ -505,18 +489,19 @@
         REFERENCE_TIME rtTimelength);
 
     HRESULT (STDMETHODCALLTYPE *ProcessOutput)(
-        IMediaObject* This,
+        IMediaObject *This,
         DWORD dwFlags,
         DWORD cOutputBufferCount,
         DMO_OUTPUT_DATA_BUFFER *pOutputBuffers,
         DWORD *pdwStatus);
 
     HRESULT (STDMETHODCALLTYPE *Lock)(
-        IMediaObject* This,
+        IMediaObject *This,
         LONG bLock);
 
     END_INTERFACE
 } IMediaObjectVtbl;
+
 interface IMediaObject {
     CONST_VTBL IMediaObjectVtbl* lpVtbl;
 };
@@ -629,199 +614,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaObject_GetStreamCount_Proxy(
-    IMediaObject* This,
-    DWORD *pcInputStreams,
-    DWORD *pcOutputStreams);
-void __RPC_STUB IMediaObject_GetStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetInputStreamInfo_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    DWORD *pdwFlags);
-void __RPC_STUB IMediaObject_GetInputStreamInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetOutputStreamInfo_Proxy(
-    IMediaObject* This,
-    DWORD dwOutputStreamIndex,
-    DWORD *pdwFlags);
-void __RPC_STUB IMediaObject_GetOutputStreamInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetInputType_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    DWORD dwTypeIndex,
-    DMO_MEDIA_TYPE *pmt);
-void __RPC_STUB IMediaObject_GetInputType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetOutputType_Proxy(
-    IMediaObject* This,
-    DWORD dwOutputStreamIndex,
-    DWORD dwTypeIndex,
-    DMO_MEDIA_TYPE *pmt);
-void __RPC_STUB IMediaObject_GetOutputType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_SetInputType_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    const DMO_MEDIA_TYPE *pmt,
-    DWORD dwFlags);
-void __RPC_STUB IMediaObject_SetInputType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_SetOutputType_Proxy(
-    IMediaObject* This,
-    DWORD dwOutputStreamIndex,
-    const DMO_MEDIA_TYPE *pmt,
-    DWORD dwFlags);
-void __RPC_STUB IMediaObject_SetOutputType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetInputCurrentType_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    DMO_MEDIA_TYPE *pmt);
-void __RPC_STUB IMediaObject_GetInputCurrentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetOutputCurrentType_Proxy(
-    IMediaObject* This,
-    DWORD dwOutputStreamIndex,
-    DMO_MEDIA_TYPE *pmt);
-void __RPC_STUB IMediaObject_GetOutputCurrentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetInputSizeInfo_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    DWORD *pcbSize,
-    DWORD *pcbMaxLookahead,
-    DWORD *pcbAlignment);
-void __RPC_STUB IMediaObject_GetInputSizeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetOutputSizeInfo_Proxy(
-    IMediaObject* This,
-    DWORD dwOutputStreamIndex,
-    DWORD *pcbSize,
-    DWORD *pcbAlignment);
-void __RPC_STUB IMediaObject_GetOutputSizeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetInputMaxLatency_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    REFERENCE_TIME *prtMaxLatency);
-void __RPC_STUB IMediaObject_GetInputMaxLatency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_SetInputMaxLatency_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    REFERENCE_TIME rtMaxLatency);
-void __RPC_STUB IMediaObject_SetInputMaxLatency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_Flush_Proxy(
-    IMediaObject* This);
-void __RPC_STUB IMediaObject_Flush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_Discontinuity_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex);
-void __RPC_STUB IMediaObject_Discontinuity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_AllocateStreamingResources_Proxy(
-    IMediaObject* This);
-void __RPC_STUB IMediaObject_AllocateStreamingResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_FreeStreamingResources_Proxy(
-    IMediaObject* This);
-void __RPC_STUB IMediaObject_FreeStreamingResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_GetInputStatus_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    DWORD *dwFlags);
-void __RPC_STUB IMediaObject_GetInputStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_ProcessInput_Proxy(
-    IMediaObject* This,
-    DWORD dwInputStreamIndex,
-    IMediaBuffer *pBuffer,
-    DWORD dwFlags,
-    REFERENCE_TIME rtTimestamp,
-    REFERENCE_TIME rtTimelength);
-void __RPC_STUB IMediaObject_ProcessInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_ProcessOutput_Proxy(
-    IMediaObject* This,
-    DWORD dwFlags,
-    DWORD cOutputBufferCount,
-    DMO_OUTPUT_DATA_BUFFER *pOutputBuffers,
-    DWORD *pdwStatus);
-void __RPC_STUB IMediaObject_ProcessOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObject_Lock_Proxy(
-    IMediaObject* This,
-    LONG bLock);
-void __RPC_STUB IMediaObject_Lock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaObject_INTERFACE_DEFINED__ */
 
@@ -862,37 +654,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumDMO* This,
+        IEnumDMO *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumDMO* This);
+        IEnumDMO *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumDMO* This);
+        IEnumDMO *This);
 
     /*** IEnumDMO methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumDMO* This,
+        IEnumDMO *This,
         DWORD cItemsToFetch,
         CLSID *pCLSID,
         LPWSTR *Names,
         DWORD *pcItemsFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumDMO* This,
+        IEnumDMO *This,
         DWORD cItemsToSkip);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumDMO* This);
+        IEnumDMO *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumDMO* This,
+        IEnumDMO *This,
         IEnumDMO **ppEnum);
 
     END_INTERFACE
 } IEnumDMOVtbl;
+
 interface IEnumDMO {
     CONST_VTBL IEnumDMOVtbl* lpVtbl;
 };
@@ -937,40 +730,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumDMO_Next_Proxy(
-    IEnumDMO* This,
-    DWORD cItemsToFetch,
-    CLSID *pCLSID,
-    LPWSTR *Names,
-    DWORD *pcItemsFetched);
-void __RPC_STUB IEnumDMO_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDMO_Skip_Proxy(
-    IEnumDMO* This,
-    DWORD cItemsToSkip);
-void __RPC_STUB IEnumDMO_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDMO_Reset_Proxy(
-    IEnumDMO* This);
-void __RPC_STUB IEnumDMO_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumDMO_Clone_Proxy(
-    IEnumDMO* This,
-    IEnumDMO **ppEnum);
-void __RPC_STUB IEnumDMO_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumDMO_INTERFACE_DEFINED__ */
 
@@ -1008,34 +767,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaObjectInPlace* This,
+        IMediaObjectInPlace *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaObjectInPlace* This);
+        IMediaObjectInPlace *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaObjectInPlace* This);
+        IMediaObjectInPlace *This);
 
     /*** IMediaObjectInPlace methods ***/
     HRESULT (STDMETHODCALLTYPE *Process)(
-        IMediaObjectInPlace* This,
+        IMediaObjectInPlace *This,
         ULONG ulSize,
         BYTE *pData,
         REFERENCE_TIME refTimeStart,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IMediaObjectInPlace* This,
+        IMediaObjectInPlace *This,
         IMediaObjectInPlace **ppMediaObject);
 
     HRESULT (STDMETHODCALLTYPE *GetLatency)(
-        IMediaObjectInPlace* This,
+        IMediaObjectInPlace *This,
         REFERENCE_TIME *pLatencyTime);
 
     END_INTERFACE
 } IMediaObjectInPlaceVtbl;
+
 interface IMediaObjectInPlace {
     CONST_VTBL IMediaObjectInPlaceVtbl* lpVtbl;
 };
@@ -1076,33 +836,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaObjectInPlace_Process_Proxy(
-    IMediaObjectInPlace* This,
-    ULONG ulSize,
-    BYTE *pData,
-    REFERENCE_TIME refTimeStart,
-    DWORD dwFlags);
-void __RPC_STUB IMediaObjectInPlace_Process_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObjectInPlace_Clone_Proxy(
-    IMediaObjectInPlace* This,
-    IMediaObjectInPlace **ppMediaObject);
-void __RPC_STUB IMediaObjectInPlace_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaObjectInPlace_GetLatency_Proxy(
-    IMediaObjectInPlace* This,
-    REFERENCE_TIME *pLatencyTime);
-void __RPC_STUB IMediaObjectInPlace_GetLatency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaObjectInPlace_INTERFACE_DEFINED__ */
 
@@ -1137,31 +870,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDMOQualityControl* This,
+        IDMOQualityControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDMOQualityControl* This);
+        IDMOQualityControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDMOQualityControl* This);
+        IDMOQualityControl *This);
 
     /*** IDMOQualityControl methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNow)(
-        IDMOQualityControl* This,
+        IDMOQualityControl *This,
         REFERENCE_TIME rtNow);
 
     HRESULT (STDMETHODCALLTYPE *SetStatus)(
-        IDMOQualityControl* This,
+        IDMOQualityControl *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        IDMOQualityControl* This,
+        IDMOQualityControl *This,
         DWORD *pdwFlags);
 
     END_INTERFACE
 } IDMOQualityControlVtbl;
+
 interface IDMOQualityControl {
     CONST_VTBL IDMOQualityControlVtbl* lpVtbl;
 };
@@ -1202,30 +936,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDMOQualityControl_SetNow_Proxy(
-    IDMOQualityControl* This,
-    REFERENCE_TIME rtNow);
-void __RPC_STUB IDMOQualityControl_SetNow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDMOQualityControl_SetStatus_Proxy(
-    IDMOQualityControl* This,
-    DWORD dwFlags);
-void __RPC_STUB IDMOQualityControl_SetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDMOQualityControl_GetStatus_Proxy(
-    IDMOQualityControl* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IDMOQualityControl_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDMOQualityControl_INTERFACE_DEFINED__ */
 
@@ -1267,39 +977,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDMOVideoOutputOptimizations* This,
+        IDMOVideoOutputOptimizations *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDMOVideoOutputOptimizations* This);
+        IDMOVideoOutputOptimizations *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDMOVideoOutputOptimizations* This);
+        IDMOVideoOutputOptimizations *This);
 
     /*** IDMOVideoOutputOptimizations methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryOperationModePreferences)(
-        IDMOVideoOutputOptimizations* This,
+        IDMOVideoOutputOptimizations *This,
         ULONG ulOutputStreamIndex,
         DWORD *pdwRequestedCapabilities);
 
     HRESULT (STDMETHODCALLTYPE *SetOperationMode)(
-        IDMOVideoOutputOptimizations* This,
+        IDMOVideoOutputOptimizations *This,
         ULONG ulOutputStreamIndex,
         DWORD dwEnabledFeatures);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentOperationMode)(
-        IDMOVideoOutputOptimizations* This,
+        IDMOVideoOutputOptimizations *This,
         ULONG ulOutputStreamIndex,
         DWORD *pdwEnabledFeatures);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentSampleRequirements)(
-        IDMOVideoOutputOptimizations* This,
+        IDMOVideoOutputOptimizations *This,
         ULONG ulOutputStreamIndex,
         DWORD *pdwRequestedFeatures);
 
     END_INTERFACE
 } IDMOVideoOutputOptimizationsVtbl;
+
 interface IDMOVideoOutputOptimizations {
     CONST_VTBL IDMOVideoOutputOptimizationsVtbl* lpVtbl;
 };
@@ -1344,42 +1055,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDMOVideoOutputOptimizations_QueryOperationModePreferences_Proxy(
-    IDMOVideoOutputOptimizations* This,
-    ULONG ulOutputStreamIndex,
-    DWORD *pdwRequestedCapabilities);
-void __RPC_STUB IDMOVideoOutputOptimizations_QueryOperationModePreferences_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDMOVideoOutputOptimizations_SetOperationMode_Proxy(
-    IDMOVideoOutputOptimizations* This,
-    ULONG ulOutputStreamIndex,
-    DWORD dwEnabledFeatures);
-void __RPC_STUB IDMOVideoOutputOptimizations_SetOperationMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDMOVideoOutputOptimizations_GetCurrentOperationMode_Proxy(
-    IDMOVideoOutputOptimizations* This,
-    ULONG ulOutputStreamIndex,
-    DWORD *pdwEnabledFeatures);
-void __RPC_STUB IDMOVideoOutputOptimizations_GetCurrentOperationMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDMOVideoOutputOptimizations_GetCurrentSampleRequirements_Proxy(
-    IDMOVideoOutputOptimizations* This,
-    ULONG ulOutputStreamIndex,
-    DWORD *pdwRequestedFeatures);
-void __RPC_STUB IDMOVideoOutputOptimizations_GetCurrentSampleRequirements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDMOVideoOutputOptimizations_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/mfidl.h b/mingw-w64-headers/include/mfidl.h
index e6f66f3..f4269ab 100644
--- a/mingw-w64-headers/include/mfidl.h
+++ b/mingw-w64-headers/include/mfidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.1 from include/mfidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mfidl.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/mfobjects.h b/mingw-w64-headers/include/mfobjects.h
index fabd2bb..4c1e62f 100644
--- a/mingw-w64-headers/include/mfobjects.h
+++ b/mingw-w64-headers/include/mfobjects.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/mfobjects.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mfobjects.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,121 +20,193 @@
 #ifndef __IMFAttributes_FWD_DEFINED__
 #define __IMFAttributes_FWD_DEFINED__
 typedef interface IMFAttributes IMFAttributes;
+#ifdef __cplusplus
+interface IMFAttributes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFMediaBuffer_FWD_DEFINED__
 #define __IMFMediaBuffer_FWD_DEFINED__
 typedef interface IMFMediaBuffer IMFMediaBuffer;
+#ifdef __cplusplus
+interface IMFMediaBuffer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFSample_FWD_DEFINED__
 #define __IMFSample_FWD_DEFINED__
 typedef interface IMFSample IMFSample;
+#ifdef __cplusplus
+interface IMFSample;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMF2DBuffer_FWD_DEFINED__
 #define __IMF2DBuffer_FWD_DEFINED__
 typedef interface IMF2DBuffer IMF2DBuffer;
+#ifdef __cplusplus
+interface IMF2DBuffer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMF2DBuffer2_FWD_DEFINED__
 #define __IMF2DBuffer2_FWD_DEFINED__
 typedef interface IMF2DBuffer2 IMF2DBuffer2;
+#ifdef __cplusplus
+interface IMF2DBuffer2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFDXGIBuffer_FWD_DEFINED__
 #define __IMFDXGIBuffer_FWD_DEFINED__
 typedef interface IMFDXGIBuffer IMFDXGIBuffer;
+#ifdef __cplusplus
+interface IMFDXGIBuffer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFMediaType_FWD_DEFINED__
 #define __IMFMediaType_FWD_DEFINED__
 typedef interface IMFMediaType IMFMediaType;
+#ifdef __cplusplus
+interface IMFMediaType;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFAudioMediaType_FWD_DEFINED__
 #define __IMFAudioMediaType_FWD_DEFINED__
 typedef interface IMFAudioMediaType IMFAudioMediaType;
+#ifdef __cplusplus
+interface IMFAudioMediaType;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFVideoMediaType_FWD_DEFINED__
 #define __IMFVideoMediaType_FWD_DEFINED__
 typedef interface IMFVideoMediaType IMFVideoMediaType;
+#ifdef __cplusplus
+interface IMFVideoMediaType;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFAsyncResult_FWD_DEFINED__
 #define __IMFAsyncResult_FWD_DEFINED__
 typedef interface IMFAsyncResult IMFAsyncResult;
+#ifdef __cplusplus
+interface IMFAsyncResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFAsyncCallback_FWD_DEFINED__
 #define __IMFAsyncCallback_FWD_DEFINED__
 typedef interface IMFAsyncCallback IMFAsyncCallback;
+#ifdef __cplusplus
+interface IMFAsyncCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFAsyncCallbackLogging_FWD_DEFINED__
 #define __IMFAsyncCallbackLogging_FWD_DEFINED__
 typedef interface IMFAsyncCallbackLogging IMFAsyncCallbackLogging;
+#ifdef __cplusplus
+interface IMFAsyncCallbackLogging;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFMediaEvent_FWD_DEFINED__
 #define __IMFMediaEvent_FWD_DEFINED__
 typedef interface IMFMediaEvent IMFMediaEvent;
+#ifdef __cplusplus
+interface IMFMediaEvent;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFMediaEventGenerator_FWD_DEFINED__
 #define __IMFMediaEventGenerator_FWD_DEFINED__
 typedef interface IMFMediaEventGenerator IMFMediaEventGenerator;
+#ifdef __cplusplus
+interface IMFMediaEventGenerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFRemoteAsyncCallback_FWD_DEFINED__
 #define __IMFRemoteAsyncCallback_FWD_DEFINED__
 typedef interface IMFRemoteAsyncCallback IMFRemoteAsyncCallback;
+#ifdef __cplusplus
+interface IMFRemoteAsyncCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFByteStream_FWD_DEFINED__
 #define __IMFByteStream_FWD_DEFINED__
 typedef interface IMFByteStream IMFByteStream;
+#ifdef __cplusplus
+interface IMFByteStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFByteStreamProxyClassFactory_FWD_DEFINED__
 #define __IMFByteStreamProxyClassFactory_FWD_DEFINED__
 typedef interface IMFByteStreamProxyClassFactory IMFByteStreamProxyClassFactory;
+#ifdef __cplusplus
+interface IMFByteStreamProxyClassFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFSampleOutputStream_FWD_DEFINED__
 #define __IMFSampleOutputStream_FWD_DEFINED__
 typedef interface IMFSampleOutputStream IMFSampleOutputStream;
+#ifdef __cplusplus
+interface IMFSampleOutputStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFCollection_FWD_DEFINED__
 #define __IMFCollection_FWD_DEFINED__
 typedef interface IMFCollection IMFCollection;
+#ifdef __cplusplus
+interface IMFCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFMediaEventQueue_FWD_DEFINED__
 #define __IMFMediaEventQueue_FWD_DEFINED__
 typedef interface IMFMediaEventQueue IMFMediaEventQueue;
+#ifdef __cplusplus
+interface IMFMediaEventQueue;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFActivate_FWD_DEFINED__
 #define __IMFActivate_FWD_DEFINED__
 typedef interface IMFActivate IMFActivate;
+#ifdef __cplusplus
+interface IMFActivate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFPluginControl_FWD_DEFINED__
 #define __IMFPluginControl_FWD_DEFINED__
 typedef interface IMFPluginControl IMFPluginControl;
+#ifdef __cplusplus
+interface IMFPluginControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFPluginControl2_FWD_DEFINED__
 #define __IMFPluginControl2_FWD_DEFINED__
 typedef interface IMFPluginControl2 IMFPluginControl2;
+#ifdef __cplusplus
+interface IMFPluginControl2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFDXGIDeviceManager_FWD_DEFINED__
 #define __IMFDXGIDeviceManager_FWD_DEFINED__
 typedef interface IMFDXGIDeviceManager IMFDXGIDeviceManager;
+#ifdef __cplusplus
+interface IMFDXGIDeviceManager;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -352,171 +424,172 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFAttributes* This);
+        IMFAttributes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFAttributes* This);
+        IMFAttributes *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFAttributes* This);
+        IMFAttributes *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFAttributes* This);
+        IMFAttributes *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFAttributes* This);
+        IMFAttributes *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFAttributes* This,
+        IMFAttributes *This,
         IMFAttributes *pDest);
 
     END_INTERFACE
 } IMFAttributesVtbl;
+
 interface IMFAttributes {
     CONST_VTBL IMFAttributesVtbl* lpVtbl;
 };
@@ -665,278 +738,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetItem_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    PROPVARIANT *pValue);
-void __RPC_STUB IMFAttributes_GetItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetItemType_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    MF_ATTRIBUTE_TYPE *pType);
-void __RPC_STUB IMFAttributes_GetItemType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_CompareItem_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    REFPROPVARIANT Value,
-    WINBOOL *pbResult);
-void __RPC_STUB IMFAttributes_CompareItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_Compare_Proxy(
-    IMFAttributes* This,
-    IMFAttributes *pTheirs,
-    MF_ATTRIBUTES_MATCH_TYPE MatchType,
-    WINBOOL *pbResult);
-void __RPC_STUB IMFAttributes_Compare_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetUINT32_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT32 *punValue);
-void __RPC_STUB IMFAttributes_GetUINT32_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetUINT64_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT64 *punValue);
-void __RPC_STUB IMFAttributes_GetUINT64_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetDouble_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    double *pfValue);
-void __RPC_STUB IMFAttributes_GetDouble_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetGUID_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    GUID *pguidValue);
-void __RPC_STUB IMFAttributes_GetGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetStringLength_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT32 *pcchLength);
-void __RPC_STUB IMFAttributes_GetStringLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetString_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    LPWSTR pwszValue,
-    UINT32 cchBufSize,
-    UINT32 *pcchLength);
-void __RPC_STUB IMFAttributes_GetString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetAllocatedString_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    LPWSTR *ppwszValue,
-    UINT32 *pcchLength);
-void __RPC_STUB IMFAttributes_GetAllocatedString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetBlobSize_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT32 *pcbBlobSize);
-void __RPC_STUB IMFAttributes_GetBlobSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetBlob_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT8 *pBuf,
-    UINT32 cbBufSize,
-    UINT32 *pcbBlobSize);
-void __RPC_STUB IMFAttributes_GetBlob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetAllocatedBlob_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT8 **ppBuf,
-    UINT32 *pcbSize);
-void __RPC_STUB IMFAttributes_GetAllocatedBlob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetUnknown_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    REFIID riid,
-    LPVOID *ppv);
-void __RPC_STUB IMFAttributes_GetUnknown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetItem_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    REFPROPVARIANT Value);
-void __RPC_STUB IMFAttributes_SetItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_DeleteItem_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey);
-void __RPC_STUB IMFAttributes_DeleteItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_DeleteAllItems_Proxy(
-    IMFAttributes* This);
-void __RPC_STUB IMFAttributes_DeleteAllItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetUINT32_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT32 unValue);
-void __RPC_STUB IMFAttributes_SetUINT32_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetUINT64_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    UINT64 unValue);
-void __RPC_STUB IMFAttributes_SetUINT64_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetDouble_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    double fValue);
-void __RPC_STUB IMFAttributes_SetDouble_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetGUID_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    REFGUID guidValue);
-void __RPC_STUB IMFAttributes_SetGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetString_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    LPCWSTR wszValue);
-void __RPC_STUB IMFAttributes_SetString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetBlob_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    const UINT8 *pBuf,
-    UINT32 cbBufSize);
-void __RPC_STUB IMFAttributes_SetBlob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_SetUnknown_Proxy(
-    IMFAttributes* This,
-    REFGUID guidKey,
-    IUnknown *pUnknown);
-void __RPC_STUB IMFAttributes_SetUnknown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_LockStore_Proxy(
-    IMFAttributes* This);
-void __RPC_STUB IMFAttributes_LockStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_UnlockStore_Proxy(
-    IMFAttributes* This);
-void __RPC_STUB IMFAttributes_UnlockStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetCount_Proxy(
-    IMFAttributes* This,
-    UINT32 *pcItems);
-void __RPC_STUB IMFAttributes_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_GetItemByIndex_Proxy(
-    IMFAttributes* This,
-    UINT32 unIndex,
-    GUID *pguidKey,
-    PROPVARIANT *pValue);
-void __RPC_STUB IMFAttributes_GetItemByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAttributes_CopyAllItems_Proxy(
-    IMFAttributes* This,
-    IMFAttributes *pDest);
-void __RPC_STUB IMFAttributes_CopyAllItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFAttributes_INTERFACE_DEFINED__ */
 
@@ -945,7 +746,6 @@
     MF_ATTRIBUTE_SERIALIZE_UNKNOWN_BYREF = 0x1
 };
 
-
 STDAPI MFSerializeAttributesToStream(IMFAttributes *pAttr, DWORD dwOptions, IStream *pStm);
 STDAPI MFDeserializeAttributesFromStream(IMFAttributes *pAttr, DWORD dwOptions, IStream *pStm);
 
@@ -987,40 +787,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFMediaBuffer* This,
+        IMFMediaBuffer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFMediaBuffer* This);
+        IMFMediaBuffer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFMediaBuffer* This);
+        IMFMediaBuffer *This);
 
     /*** IMFMediaBuffer methods ***/
     HRESULT (STDMETHODCALLTYPE *Lock)(
-        IMFMediaBuffer* This,
+        IMFMediaBuffer *This,
         BYTE **ppbBuffer,
         DWORD *pcbMaxLength,
         DWORD *pcbCurrentLength);
 
     HRESULT (STDMETHODCALLTYPE *Unlock)(
-        IMFMediaBuffer* This);
+        IMFMediaBuffer *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentLength)(
-        IMFMediaBuffer* This,
+        IMFMediaBuffer *This,
         DWORD *pcbCurrentLength);
 
     HRESULT (STDMETHODCALLTYPE *SetCurrentLength)(
-        IMFMediaBuffer* This,
+        IMFMediaBuffer *This,
         DWORD cbCurrentLength);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxLength)(
-        IMFMediaBuffer* This,
+        IMFMediaBuffer *This,
         DWORD *pcbMaxLength);
 
     END_INTERFACE
 } IMFMediaBufferVtbl;
+
 interface IMFMediaBuffer {
     CONST_VTBL IMFMediaBufferVtbl* lpVtbl;
 };
@@ -1069,47 +870,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFMediaBuffer_Lock_Proxy(
-    IMFMediaBuffer* This,
-    BYTE **ppbBuffer,
-    DWORD *pcbMaxLength,
-    DWORD *pcbCurrentLength);
-void __RPC_STUB IMFMediaBuffer_Lock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaBuffer_Unlock_Proxy(
-    IMFMediaBuffer* This);
-void __RPC_STUB IMFMediaBuffer_Unlock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaBuffer_GetCurrentLength_Proxy(
-    IMFMediaBuffer* This,
-    DWORD *pcbCurrentLength);
-void __RPC_STUB IMFMediaBuffer_GetCurrentLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaBuffer_SetCurrentLength_Proxy(
-    IMFMediaBuffer* This,
-    DWORD cbCurrentLength);
-void __RPC_STUB IMFMediaBuffer_SetCurrentLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaBuffer_GetMaxLength_Proxy(
-    IMFMediaBuffer* This,
-    DWORD *pcbMaxLength);
-void __RPC_STUB IMFMediaBuffer_GetMaxLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFMediaBuffer_INTERFACE_DEFINED__ */
 
@@ -1178,228 +938,229 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFSample* This,
+        IMFSample *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFSample* This);
+        IMFSample *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFSample* This);
+        IMFSample *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFSample* This,
+        IMFSample *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFSample* This);
+        IMFSample *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFSample* This,
+        IMFSample *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFSample* This);
+        IMFSample *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFSample* This);
+        IMFSample *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFSample* This,
+        IMFSample *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFSample* This,
+        IMFSample *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFSample* This,
+        IMFSample *This,
         IMFAttributes *pDest);
 
     /*** IMFSample methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSampleFlags)(
-        IMFSample* This,
+        IMFSample *This,
         DWORD *pdwSampleFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetSampleFlags)(
-        IMFSample* This,
+        IMFSample *This,
         DWORD dwSampleFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSampleTime)(
-        IMFSample* This,
+        IMFSample *This,
         LONGLONG *phnsSampleTime);
 
     HRESULT (STDMETHODCALLTYPE *SetSampleTime)(
-        IMFSample* This,
+        IMFSample *This,
         LONGLONG hnsSampleTime);
 
     HRESULT (STDMETHODCALLTYPE *GetSampleDuration)(
-        IMFSample* This,
+        IMFSample *This,
         LONGLONG *phnsSampleDuration);
 
     HRESULT (STDMETHODCALLTYPE *SetSampleDuration)(
-        IMFSample* This,
+        IMFSample *This,
         LONGLONG hnsSampleDuration);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferCount)(
-        IMFSample* This,
+        IMFSample *This,
         DWORD *pdwBufferCount);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferByIndex)(
-        IMFSample* This,
+        IMFSample *This,
         DWORD dwIndex,
         IMFMediaBuffer **ppBuffer);
 
     HRESULT (STDMETHODCALLTYPE *ConvertToContiguousBuffer)(
-        IMFSample* This,
+        IMFSample *This,
         IMFMediaBuffer **ppBuffer);
 
     HRESULT (STDMETHODCALLTYPE *AddBuffer)(
-        IMFSample* This,
+        IMFSample *This,
         IMFMediaBuffer *pBuffer);
 
     HRESULT (STDMETHODCALLTYPE *RemoveBufferByIndex)(
-        IMFSample* This,
+        IMFSample *This,
         DWORD dwIndex);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAllBuffers)(
-        IMFSample* This);
+        IMFSample *This);
 
     HRESULT (STDMETHODCALLTYPE *GetTotalLength)(
-        IMFSample* This,
+        IMFSample *This,
         DWORD *pcbTotalLength);
 
     HRESULT (STDMETHODCALLTYPE *CopyToBuffer)(
-        IMFSample* This,
+        IMFSample *This,
         IMFMediaBuffer *pBuffer);
 
     END_INTERFACE
 } IMFSampleVtbl;
+
 interface IMFSample {
     CONST_VTBL IMFSampleVtbl* lpVtbl;
 };
@@ -1606,118 +1367,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFSample_GetSampleFlags_Proxy(
-    IMFSample* This,
-    DWORD *pdwSampleFlags);
-void __RPC_STUB IMFSample_GetSampleFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_SetSampleFlags_Proxy(
-    IMFSample* This,
-    DWORD dwSampleFlags);
-void __RPC_STUB IMFSample_SetSampleFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_GetSampleTime_Proxy(
-    IMFSample* This,
-    LONGLONG *phnsSampleTime);
-void __RPC_STUB IMFSample_GetSampleTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_SetSampleTime_Proxy(
-    IMFSample* This,
-    LONGLONG hnsSampleTime);
-void __RPC_STUB IMFSample_SetSampleTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_GetSampleDuration_Proxy(
-    IMFSample* This,
-    LONGLONG *phnsSampleDuration);
-void __RPC_STUB IMFSample_GetSampleDuration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_SetSampleDuration_Proxy(
-    IMFSample* This,
-    LONGLONG hnsSampleDuration);
-void __RPC_STUB IMFSample_SetSampleDuration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_GetBufferCount_Proxy(
-    IMFSample* This,
-    DWORD *pdwBufferCount);
-void __RPC_STUB IMFSample_GetBufferCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_GetBufferByIndex_Proxy(
-    IMFSample* This,
-    DWORD dwIndex,
-    IMFMediaBuffer **ppBuffer);
-void __RPC_STUB IMFSample_GetBufferByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_ConvertToContiguousBuffer_Proxy(
-    IMFSample* This,
-    IMFMediaBuffer **ppBuffer);
-void __RPC_STUB IMFSample_ConvertToContiguousBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_AddBuffer_Proxy(
-    IMFSample* This,
-    IMFMediaBuffer *pBuffer);
-void __RPC_STUB IMFSample_AddBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_RemoveBufferByIndex_Proxy(
-    IMFSample* This,
-    DWORD dwIndex);
-void __RPC_STUB IMFSample_RemoveBufferByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_RemoveAllBuffers_Proxy(
-    IMFSample* This);
-void __RPC_STUB IMFSample_RemoveAllBuffers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_GetTotalLength_Proxy(
-    IMFSample* This,
-    DWORD *pcbTotalLength);
-void __RPC_STUB IMFSample_GetTotalLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSample_CopyToBuffer_Proxy(
-    IMFSample* This,
-    IMFMediaBuffer *pBuffer);
-void __RPC_STUB IMFSample_CopyToBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFSample_INTERFACE_DEFINED__ */
 
@@ -1768,50 +1417,51 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMF2DBuffer* This,
+        IMF2DBuffer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMF2DBuffer* This);
+        IMF2DBuffer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMF2DBuffer* This);
+        IMF2DBuffer *This);
 
     /*** IMF2DBuffer methods ***/
     HRESULT (STDMETHODCALLTYPE *Lock2D)(
-        IMF2DBuffer* This,
+        IMF2DBuffer *This,
         BYTE **ppbScanline0,
         LONG *plPitch);
 
     HRESULT (STDMETHODCALLTYPE *Unlock2D)(
-        IMF2DBuffer* This);
+        IMF2DBuffer *This);
 
     HRESULT (STDMETHODCALLTYPE *GetScanline0AndPitch)(
-        IMF2DBuffer* This,
+        IMF2DBuffer *This,
         BYTE **pbScanline0,
         LONG *plPitch);
 
     HRESULT (STDMETHODCALLTYPE *IsContiguousFormat)(
-        IMF2DBuffer* This,
+        IMF2DBuffer *This,
         WINBOOL *pfIsContiguous);
 
     HRESULT (STDMETHODCALLTYPE *GetContiguousLength)(
-        IMF2DBuffer* This,
+        IMF2DBuffer *This,
         DWORD *pcbLength);
 
     HRESULT (STDMETHODCALLTYPE *ContiguousCopyTo)(
-        IMF2DBuffer* This,
+        IMF2DBuffer *This,
         BYTE *pbDestBuffer,
         DWORD cbDestBuffer);
 
     HRESULT (STDMETHODCALLTYPE *ContiguousCopyFrom)(
-        IMF2DBuffer* This,
+        IMF2DBuffer *This,
         const BYTE *pbSrcBuffer,
         DWORD cbSrcBuffer);
 
     END_INTERFACE
 } IMF2DBufferVtbl;
+
 interface IMF2DBuffer {
     CONST_VTBL IMF2DBufferVtbl* lpVtbl;
 };
@@ -1868,65 +1518,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMF2DBuffer_Lock2D_Proxy(
-    IMF2DBuffer* This,
-    BYTE **ppbScanline0,
-    LONG *plPitch);
-void __RPC_STUB IMF2DBuffer_Lock2D_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMF2DBuffer_Unlock2D_Proxy(
-    IMF2DBuffer* This);
-void __RPC_STUB IMF2DBuffer_Unlock2D_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMF2DBuffer_GetScanline0AndPitch_Proxy(
-    IMF2DBuffer* This,
-    BYTE **pbScanline0,
-    LONG *plPitch);
-void __RPC_STUB IMF2DBuffer_GetScanline0AndPitch_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMF2DBuffer_IsContiguousFormat_Proxy(
-    IMF2DBuffer* This,
-    WINBOOL *pfIsContiguous);
-void __RPC_STUB IMF2DBuffer_IsContiguousFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMF2DBuffer_GetContiguousLength_Proxy(
-    IMF2DBuffer* This,
-    DWORD *pcbLength);
-void __RPC_STUB IMF2DBuffer_GetContiguousLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMF2DBuffer_ContiguousCopyTo_Proxy(
-    IMF2DBuffer* This,
-    BYTE *pbDestBuffer,
-    DWORD cbDestBuffer);
-void __RPC_STUB IMF2DBuffer_ContiguousCopyTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMF2DBuffer_ContiguousCopyFrom_Proxy(
-    IMF2DBuffer* This,
-    const BYTE *pbSrcBuffer,
-    DWORD cbSrcBuffer);
-void __RPC_STUB IMF2DBuffer_ContiguousCopyFrom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMF2DBuffer_INTERFACE_DEFINED__ */
 
@@ -1970,51 +1561,51 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMF2DBuffer2* This);
+        IMF2DBuffer2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMF2DBuffer2* This);
+        IMF2DBuffer2 *This);
 
     /*** IMF2DBuffer methods ***/
     HRESULT (STDMETHODCALLTYPE *Lock2D)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         BYTE **ppbScanline0,
         LONG *plPitch);
 
     HRESULT (STDMETHODCALLTYPE *Unlock2D)(
-        IMF2DBuffer2* This);
+        IMF2DBuffer2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetScanline0AndPitch)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         BYTE **pbScanline0,
         LONG *plPitch);
 
     HRESULT (STDMETHODCALLTYPE *IsContiguousFormat)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         WINBOOL *pfIsContiguous);
 
     HRESULT (STDMETHODCALLTYPE *GetContiguousLength)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         DWORD *pcbLength);
 
     HRESULT (STDMETHODCALLTYPE *ContiguousCopyTo)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         BYTE *pbDestBuffer,
         DWORD cbDestBuffer);
 
     HRESULT (STDMETHODCALLTYPE *ContiguousCopyFrom)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         const BYTE *pbSrcBuffer,
         DWORD cbSrcBuffer);
 
     /*** IMF2DBuffer2 methods ***/
     HRESULT (STDMETHODCALLTYPE *Lock2DSize)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         MF2DBuffer_LockFlags lockFlags,
         BYTE **ppbScanline0,
         LONG *plPitch,
@@ -2022,11 +1613,12 @@
         DWORD *pcbBufferLength);
 
     HRESULT (STDMETHODCALLTYPE *Copy2DTo)(
-        IMF2DBuffer2* This,
+        IMF2DBuffer2 *This,
         IMF2DBuffer2 *pDestBuffer);
 
     END_INTERFACE
 } IMF2DBuffer2Vtbl;
+
 interface IMF2DBuffer2 {
     CONST_VTBL IMF2DBuffer2Vtbl* lpVtbl;
 };
@@ -2093,26 +1685,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMF2DBuffer2_Lock2DSize_Proxy(
-    IMF2DBuffer2* This,
-    MF2DBuffer_LockFlags lockFlags,
-    BYTE **ppbScanline0,
-    LONG *plPitch,
-    BYTE **ppbBufferStart,
-    DWORD *pcbBufferLength);
-void __RPC_STUB IMF2DBuffer2_Lock2DSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMF2DBuffer2_Copy2DTo_Proxy(
-    IMF2DBuffer2* This,
-    IMF2DBuffer2 *pDestBuffer);
-void __RPC_STUB IMF2DBuffer2_Copy2DTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMF2DBuffer2_INTERFACE_DEFINED__ */
 
@@ -2154,39 +1726,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFDXGIBuffer* This,
+        IMFDXGIBuffer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFDXGIBuffer* This);
+        IMFDXGIBuffer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFDXGIBuffer* This);
+        IMFDXGIBuffer *This);
 
     /*** IMFDXGIBuffer methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResource)(
-        IMFDXGIBuffer* This,
+        IMFDXGIBuffer *This,
         REFIID riid,
         LPVOID *ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetSubresourceIndex)(
-        IMFDXGIBuffer* This,
+        IMFDXGIBuffer *This,
         UINT *puSubresource);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFDXGIBuffer* This,
+        IMFDXGIBuffer *This,
         REFIID guid,
         REFIID riid,
         LPVOID *ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFDXGIBuffer* This,
+        IMFDXGIBuffer *This,
         REFIID guid,
         IUnknown *pUnkData);
 
     END_INTERFACE
 } IMFDXGIBufferVtbl;
+
 interface IMFDXGIBuffer {
     CONST_VTBL IMFDXGIBufferVtbl* lpVtbl;
 };
@@ -2231,42 +1804,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_GetResource_Proxy(
-    IMFDXGIBuffer* This,
-    REFIID riid,
-    LPVOID *ppvObject);
-void __RPC_STUB IMFDXGIBuffer_GetResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_GetSubresourceIndex_Proxy(
-    IMFDXGIBuffer* This,
-    UINT *puSubresource);
-void __RPC_STUB IMFDXGIBuffer_GetSubresourceIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_GetUnknown_Proxy(
-    IMFDXGIBuffer* This,
-    REFIID guid,
-    REFIID riid,
-    LPVOID *ppvObject);
-void __RPC_STUB IMFDXGIBuffer_GetUnknown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIBuffer_SetUnknown_Proxy(
-    IMFDXGIBuffer* This,
-    REFIID guid,
-    IUnknown *pUnkData);
-void __RPC_STUB IMFDXGIBuffer_SetUnknown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFDXGIBuffer_INTERFACE_DEFINED__ */
 
@@ -2310,195 +1847,196 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFMediaType* This);
+        IMFMediaType *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFMediaType* This);
+        IMFMediaType *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFMediaType* This);
+        IMFMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFMediaType* This);
+        IMFMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFMediaType* This);
+        IMFMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         IMFAttributes *pDest);
 
     /*** IMFMediaType methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMajorType)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         GUID *pguidMajorType);
 
     HRESULT (STDMETHODCALLTYPE *IsCompressedFormat)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         WINBOOL *pfCompressed);
 
     HRESULT (STDMETHODCALLTYPE *IsEqual)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         IMFMediaType *pIMediaType,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetRepresentation)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         GUID guidRepresentation,
         LPVOID *ppvRepresentation);
 
     HRESULT (STDMETHODCALLTYPE *FreeRepresentation)(
-        IMFMediaType* This,
+        IMFMediaType *This,
         GUID guidRepresentation,
         LPVOID pvRepresentation);
 
     END_INTERFACE
 } IMFMediaTypeVtbl;
+
 interface IMFMediaType {
     CONST_VTBL IMFMediaTypeVtbl* lpVtbl;
 };
@@ -2669,49 +2207,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFMediaType_GetMajorType_Proxy(
-    IMFMediaType* This,
-    GUID *pguidMajorType);
-void __RPC_STUB IMFMediaType_GetMajorType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaType_IsCompressedFormat_Proxy(
-    IMFMediaType* This,
-    WINBOOL *pfCompressed);
-void __RPC_STUB IMFMediaType_IsCompressedFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaType_IsEqual_Proxy(
-    IMFMediaType* This,
-    IMFMediaType *pIMediaType,
-    DWORD *pdwFlags);
-void __RPC_STUB IMFMediaType_IsEqual_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaType_GetRepresentation_Proxy(
-    IMFMediaType* This,
-    GUID guidRepresentation,
-    LPVOID *ppvRepresentation);
-void __RPC_STUB IMFMediaType_GetRepresentation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaType_FreeRepresentation_Proxy(
-    IMFMediaType* This,
-    GUID guidRepresentation,
-    LPVOID pvRepresentation);
-void __RPC_STUB IMFMediaType_FreeRepresentation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFMediaType_INTERFACE_DEFINED__ */
 
@@ -2747,199 +2242,200 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFAudioMediaType* This);
+        IMFAudioMediaType *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFAudioMediaType* This);
+        IMFAudioMediaType *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFAudioMediaType* This);
+        IMFAudioMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFAudioMediaType* This);
+        IMFAudioMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFAudioMediaType* This);
+        IMFAudioMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         IMFAttributes *pDest);
 
     /*** IMFMediaType methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMajorType)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         GUID *pguidMajorType);
 
     HRESULT (STDMETHODCALLTYPE *IsCompressedFormat)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         WINBOOL *pfCompressed);
 
     HRESULT (STDMETHODCALLTYPE *IsEqual)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         IMFMediaType *pIMediaType,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetRepresentation)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         GUID guidRepresentation,
         LPVOID *ppvRepresentation);
 
     HRESULT (STDMETHODCALLTYPE *FreeRepresentation)(
-        IMFAudioMediaType* This,
+        IMFAudioMediaType *This,
         GUID guidRepresentation,
         LPVOID pvRepresentation);
 
     /*** IMFAudioMediaType methods ***/
     const WAVEFORMATEX * (STDMETHODCALLTYPE *GetAudioFormat)(
-        IMFAudioMediaType* This);
+        IMFAudioMediaType *This);
 
     END_INTERFACE
 } IMFAudioMediaTypeVtbl;
+
 interface IMFAudioMediaType {
     CONST_VTBL IMFAudioMediaTypeVtbl* lpVtbl;
 };
@@ -3116,13 +2612,6 @@
 
 #endif
 
-const WAVEFORMATEX * STDMETHODCALLTYPE IMFAudioMediaType_GetAudioFormat_Proxy(
-    IMFAudioMediaType* This);
-void __RPC_STUB IMFAudioMediaType_GetAudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFAudioMediaType_INTERFACE_DEFINED__ */
 
@@ -3396,205 +2885,206 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFVideoMediaType* This);
+        IMFVideoMediaType *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFVideoMediaType* This);
+        IMFVideoMediaType *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFVideoMediaType* This);
+        IMFVideoMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFVideoMediaType* This);
+        IMFVideoMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFVideoMediaType* This);
+        IMFVideoMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         IMFAttributes *pDest);
 
     /*** IMFMediaType methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMajorType)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         GUID *pguidMajorType);
 
     HRESULT (STDMETHODCALLTYPE *IsCompressedFormat)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         WINBOOL *pfCompressed);
 
     HRESULT (STDMETHODCALLTYPE *IsEqual)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         IMFMediaType *pIMediaType,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetRepresentation)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         GUID guidRepresentation,
         LPVOID *ppvRepresentation);
 
     HRESULT (STDMETHODCALLTYPE *FreeRepresentation)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         GUID guidRepresentation,
         LPVOID pvRepresentation);
 
     /*** IMFVideoMediaType methods ***/
     const MFVIDEOFORMAT * (STDMETHODCALLTYPE *GetVideoFormat)(
-        IMFVideoMediaType* This);
+        IMFVideoMediaType *This);
 
     HRESULT (STDMETHODCALLTYPE *GetVideoRepresentation)(
-        IMFVideoMediaType* This,
+        IMFVideoMediaType *This,
         GUID guidRepresentation,
         LPVOID *ppvRepresentation,
         LONG lStride);
 
     END_INTERFACE
 } IMFVideoMediaTypeVtbl;
+
 interface IMFVideoMediaType {
     CONST_VTBL IMFVideoMediaTypeVtbl* lpVtbl;
 };
@@ -3775,23 +3265,6 @@
 
 #endif
 
-const MFVIDEOFORMAT * STDMETHODCALLTYPE IMFVideoMediaType_GetVideoFormat_Proxy(
-    IMFVideoMediaType* This);
-void __RPC_STUB IMFVideoMediaType_GetVideoFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFVideoMediaType_GetVideoRepresentation_Proxy(
-    IMFVideoMediaType* This,
-    GUID guidRepresentation,
-    LPVOID *ppvRepresentation,
-    LONG lStride);
-void __RPC_STUB IMFVideoMediaType_GetVideoRepresentation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFVideoMediaType_INTERFACE_DEFINED__ */
 
@@ -3834,37 +3307,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFAsyncResult* This,
+        IMFAsyncResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFAsyncResult* This);
+        IMFAsyncResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFAsyncResult* This);
+        IMFAsyncResult *This);
 
     /*** IMFAsyncResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IMFAsyncResult* This,
+        IMFAsyncResult *This,
         IUnknown **ppunkState);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        IMFAsyncResult* This);
+        IMFAsyncResult *This);
 
     HRESULT (STDMETHODCALLTYPE *SetStatus)(
-        IMFAsyncResult* This,
+        IMFAsyncResult *This,
         HRESULT hrStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetObject)(
-        IMFAsyncResult* This,
+        IMFAsyncResult *This,
         IUnknown **ppObject);
 
     IUnknown * (STDMETHODCALLTYPE *GetStateNoAddRef)(
-        IMFAsyncResult* This);
+        IMFAsyncResult *This);
 
     END_INTERFACE
 } IMFAsyncResultVtbl;
+
 interface IMFAsyncResult {
     CONST_VTBL IMFAsyncResultVtbl* lpVtbl;
 };
@@ -3913,37 +3387,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFAsyncResult_GetState_Proxy(
-    IMFAsyncResult* This,
-    IUnknown **ppunkState);
-void __RPC_STUB IMFAsyncResult_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAsyncResult_GetStatus_Proxy(
-    IMFAsyncResult* This);
-void __RPC_STUB IMFAsyncResult_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAsyncResult_SetStatus_Proxy(
-    IMFAsyncResult* This,
-    HRESULT hrStatus);
-void __RPC_STUB IMFAsyncResult_SetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAsyncResult_GetObject_Proxy(
-    IMFAsyncResult* This,
-    IUnknown **ppObject);
-void __RPC_STUB IMFAsyncResult_GetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFAsyncResult_INTERFACE_DEFINED__ */
 
@@ -3976,28 +3419,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFAsyncCallback* This,
+        IMFAsyncCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFAsyncCallback* This);
+        IMFAsyncCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFAsyncCallback* This);
+        IMFAsyncCallback *This);
 
     /*** IMFAsyncCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *GetParameters)(
-        IMFAsyncCallback* This,
+        IMFAsyncCallback *This,
         DWORD *pdwFlags,
         DWORD *pdwQueue);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IMFAsyncCallback* This,
+        IMFAsyncCallback *This,
         IMFAsyncResult *pAsyncResult);
 
     END_INTERFACE
 } IMFAsyncCallbackVtbl;
+
 interface IMFAsyncCallback {
     CONST_VTBL IMFAsyncCallbackVtbl* lpVtbl;
 };
@@ -4034,23 +3478,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFAsyncCallback_GetParameters_Proxy(
-    IMFAsyncCallback* This,
-    DWORD *pdwFlags,
-    DWORD *pdwQueue);
-void __RPC_STUB IMFAsyncCallback_GetParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFAsyncCallback_Invoke_Proxy(
-    IMFAsyncCallback* This,
-    IMFAsyncResult *pAsyncResult);
-void __RPC_STUB IMFAsyncCallback_Invoke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFAsyncCallback_INTERFACE_DEFINED__ */
 
@@ -4084,35 +3511,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFAsyncCallbackLogging* This,
+        IMFAsyncCallbackLogging *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFAsyncCallbackLogging* This);
+        IMFAsyncCallbackLogging *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFAsyncCallbackLogging* This);
+        IMFAsyncCallbackLogging *This);
 
     /*** IMFAsyncCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *GetParameters)(
-        IMFAsyncCallbackLogging* This,
+        IMFAsyncCallbackLogging *This,
         DWORD *pdwFlags,
         DWORD *pdwQueue);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IMFAsyncCallbackLogging* This,
+        IMFAsyncCallbackLogging *This,
         IMFAsyncResult *pAsyncResult);
 
     /*** IMFAsyncCallbackLogging methods ***/
     void * (STDMETHODCALLTYPE *GetObjectPointer)(
-        IMFAsyncCallbackLogging* This);
+        IMFAsyncCallbackLogging *This);
 
     DWORD (STDMETHODCALLTYPE *GetObjectTag)(
-        IMFAsyncCallbackLogging* This);
+        IMFAsyncCallbackLogging *This);
 
     END_INTERFACE
 } IMFAsyncCallbackLoggingVtbl;
+
 interface IMFAsyncCallbackLogging {
     CONST_VTBL IMFAsyncCallbackLoggingVtbl* lpVtbl;
 };
@@ -4159,20 +3587,6 @@
 
 #endif
 
-void * STDMETHODCALLTYPE IMFAsyncCallbackLogging_GetObjectPointer_Proxy(
-    IMFAsyncCallbackLogging* This);
-void __RPC_STUB IMFAsyncCallbackLogging_GetObjectPointer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-DWORD STDMETHODCALLTYPE IMFAsyncCallbackLogging_GetObjectTag_Proxy(
-    IMFAsyncCallbackLogging* This);
-void __RPC_STUB IMFAsyncCallbackLogging_GetObjectTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFAsyncCallbackLogging_INTERFACE_DEFINED__ */
 
@@ -4298,7 +3712,6 @@
     MEReservedMax = 10000
 };
 
-
 typedef DWORD MediaEventType;
 
 /*****************************************************************************
@@ -4334,188 +3747,189 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFMediaEvent* This);
+        IMFMediaEvent *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFMediaEvent* This);
+        IMFMediaEvent *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFMediaEvent* This);
+        IMFMediaEvent *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFMediaEvent* This);
+        IMFMediaEvent *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFMediaEvent* This);
+        IMFMediaEvent *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         IMFAttributes *pDest);
 
     /*** IMFMediaEvent methods ***/
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         MediaEventType *pmet);
 
     HRESULT (STDMETHODCALLTYPE *GetExtendedType)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         GUID *pguidExtendedType);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         HRESULT *phrStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IMFMediaEvent* This,
+        IMFMediaEvent *This,
         PROPVARIANT *pvValue);
 
     END_INTERFACE
 } IMFMediaEventVtbl;
+
 interface IMFMediaEvent {
     CONST_VTBL IMFMediaEventVtbl* lpVtbl;
 };
@@ -4682,38 +4096,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetType_Proxy(
-    IMFMediaEvent* This,
-    MediaEventType *pmet);
-void __RPC_STUB IMFMediaEvent_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetExtendedType_Proxy(
-    IMFMediaEvent* This,
-    GUID *pguidExtendedType);
-void __RPC_STUB IMFMediaEvent_GetExtendedType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetStatus_Proxy(
-    IMFMediaEvent* This,
-    HRESULT *phrStatus);
-void __RPC_STUB IMFMediaEvent_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEvent_GetValue_Proxy(
-    IMFMediaEvent* This,
-    PROPVARIANT *pvValue);
-void __RPC_STUB IMFMediaEvent_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFMediaEvent_INTERFACE_DEFINED__ */
 
@@ -4723,6 +4105,9 @@
 #ifndef __IMFRemoteAsyncCallback_FWD_DEFINED__
 #define __IMFRemoteAsyncCallback_FWD_DEFINED__
 typedef interface IMFRemoteAsyncCallback IMFRemoteAsyncCallback;
+#ifdef __cplusplus
+interface IMFRemoteAsyncCallback;
+#endif /* __cplusplus */
 #endif
 
 
@@ -4765,34 +4150,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFMediaEventGenerator* This,
+        IMFMediaEventGenerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFMediaEventGenerator* This);
+        IMFMediaEventGenerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFMediaEventGenerator* This);
+        IMFMediaEventGenerator *This);
 
     /*** IMFMediaEventGenerator methods ***/
     HRESULT (STDMETHODCALLTYPE *GetEvent)(
-        IMFMediaEventGenerator* This,
+        IMFMediaEventGenerator *This,
         DWORD dwFlags,
         IMFMediaEvent **ppEvent);
 
     HRESULT (STDMETHODCALLTYPE *BeginGetEvent)(
-        IMFMediaEventGenerator* This,
+        IMFMediaEventGenerator *This,
         IMFAsyncCallback *pCallback,
         IUnknown *punkState);
 
     HRESULT (STDMETHODCALLTYPE *EndGetEvent)(
-        IMFMediaEventGenerator* This,
+        IMFMediaEventGenerator *This,
         IMFAsyncResult *pResult,
         IMFMediaEvent **ppEvent);
 
     HRESULT (STDMETHODCALLTYPE *QueueEvent)(
-        IMFMediaEventGenerator* This,
+        IMFMediaEventGenerator *This,
         MediaEventType met,
         REFGUID guidExtendedType,
         HRESULT hrStatus,
@@ -4800,6 +4185,7 @@
 
     END_INTERFACE
 } IMFMediaEventGeneratorVtbl;
+
 interface IMFMediaEventGenerator {
     CONST_VTBL IMFMediaEventGeneratorVtbl* lpVtbl;
 };
@@ -4844,15 +4230,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFMediaEventGenerator_GetEvent_Proxy(
-    IMFMediaEventGenerator* This,
-    DWORD dwFlags,
-    IMFMediaEvent **ppEvent);
-void __RPC_STUB IMFMediaEventGenerator_GetEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IMFMediaEventGenerator_RemoteBeginGetEvent_Proxy(
     IMFMediaEventGenerator* This,
     IMFRemoteAsyncCallback *pCallback);
@@ -4871,17 +4248,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEventGenerator_QueueEvent_Proxy(
-    IMFMediaEventGenerator* This,
-    MediaEventType met,
-    REFGUID guidExtendedType,
-    HRESULT hrStatus,
-    const PROPVARIANT *pvValue);
-void __RPC_STUB IMFMediaEventGenerator_QueueEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IMFMediaEventGenerator_BeginGetEvent_Proxy(
     IMFMediaEventGenerator* This,
     IMFAsyncCallback *pCallback,
@@ -4929,24 +4295,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFRemoteAsyncCallback* This,
+        IMFRemoteAsyncCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFRemoteAsyncCallback* This);
+        IMFRemoteAsyncCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFRemoteAsyncCallback* This);
+        IMFRemoteAsyncCallback *This);
 
     /*** IMFRemoteAsyncCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IMFRemoteAsyncCallback* This,
+        IMFRemoteAsyncCallback *This,
         HRESULT hr,
         IUnknown *pRemoteResult);
 
     END_INTERFACE
 } IMFRemoteAsyncCallbackVtbl;
+
 interface IMFRemoteAsyncCallback {
     CONST_VTBL IMFRemoteAsyncCallbackVtbl* lpVtbl;
 };
@@ -4979,15 +4346,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFRemoteAsyncCallback_Invoke_Proxy(
-    IMFRemoteAsyncCallback* This,
-    HRESULT hr,
-    IUnknown *pRemoteResult);
-void __RPC_STUB IMFRemoteAsyncCallback_Invoke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFRemoteAsyncCallback_INTERFACE_DEFINED__ */
 
@@ -5081,92 +4439,93 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFByteStream* This);
+        IMFByteStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFByteStream* This);
+        IMFByteStream *This);
 
     /*** IMFByteStream methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCapabilities)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         DWORD *pdwCapabilities);
 
     HRESULT (STDMETHODCALLTYPE *GetLength)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         QWORD *pqwLength);
 
     HRESULT (STDMETHODCALLTYPE *SetLength)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         QWORD qwLength);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentPosition)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         QWORD *pqwPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetCurrentPosition)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         QWORD qwPosition);
 
     HRESULT (STDMETHODCALLTYPE *IsEndOfStream)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         WINBOOL *pfEndOfStream);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         BYTE *pb,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *BeginRead)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         BYTE *pb,
         ULONG cb,
         IMFAsyncCallback *pCallback,
         IUnknown *punkState);
 
     HRESULT (STDMETHODCALLTYPE *EndRead)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         IMFAsyncResult *pResult,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         const BYTE *pb,
         ULONG cb,
         ULONG *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *BeginWrite)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         const BYTE *pb,
         ULONG cb,
         IMFAsyncCallback *pCallback,
         IUnknown *punkState);
 
     HRESULT (STDMETHODCALLTYPE *EndWrite)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         IMFAsyncResult *pResult,
         ULONG *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        IMFByteStream* This,
+        IMFByteStream *This,
         MFBYTESTREAM_SEEK_ORIGIN SeekOrigin,
         LONGLONG llSeekOffset,
         DWORD dwSeekFlags,
         QWORD *pqwCurrentPosition);
 
     HRESULT (STDMETHODCALLTYPE *Flush)(
-        IMFByteStream* This);
+        IMFByteStream *This);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IMFByteStream* This);
+        IMFByteStream *This);
 
     END_INTERFACE
 } IMFByteStreamVtbl;
+
 interface IMFByteStream {
     CONST_VTBL IMFByteStreamVtbl* lpVtbl;
 };
@@ -5255,64 +4614,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFByteStream_GetCapabilities_Proxy(
-    IMFByteStream* This,
-    DWORD *pdwCapabilities);
-void __RPC_STUB IMFByteStream_GetCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_GetLength_Proxy(
-    IMFByteStream* This,
-    QWORD *pqwLength);
-void __RPC_STUB IMFByteStream_GetLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_SetLength_Proxy(
-    IMFByteStream* This,
-    QWORD qwLength);
-void __RPC_STUB IMFByteStream_SetLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_GetCurrentPosition_Proxy(
-    IMFByteStream* This,
-    QWORD *pqwPosition);
-void __RPC_STUB IMFByteStream_GetCurrentPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_SetCurrentPosition_Proxy(
-    IMFByteStream* This,
-    QWORD qwPosition);
-void __RPC_STUB IMFByteStream_SetCurrentPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_IsEndOfStream_Proxy(
-    IMFByteStream* This,
-    WINBOOL *pfEndOfStream);
-void __RPC_STUB IMFByteStream_IsEndOfStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_Read_Proxy(
-    IMFByteStream* This,
-    BYTE *pb,
-    ULONG cb,
-    ULONG *pcbRead);
-void __RPC_STUB IMFByteStream_Read_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IMFByteStream_RemoteBeginRead_Proxy(
     IMFByteStream* This,
     ULONG cb,
@@ -5333,16 +4634,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_Write_Proxy(
-    IMFByteStream* This,
-    const BYTE *pb,
-    ULONG cb,
-    ULONG *pcbWritten);
-void __RPC_STUB IMFByteStream_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IMFByteStream_RemoteBeginWrite_Proxy(
     IMFByteStream* This,
     const BYTE *pb,
@@ -5362,31 +4653,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_Seek_Proxy(
-    IMFByteStream* This,
-    MFBYTESTREAM_SEEK_ORIGIN SeekOrigin,
-    LONGLONG llSeekOffset,
-    DWORD dwSeekFlags,
-    QWORD *pqwCurrentPosition);
-void __RPC_STUB IMFByteStream_Seek_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_Flush_Proxy(
-    IMFByteStream* This);
-void __RPC_STUB IMFByteStream_Flush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFByteStream_Close_Proxy(
-    IMFByteStream* This);
-void __RPC_STUB IMFByteStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IMFByteStream_BeginRead_Proxy(
     IMFByteStream* This,
     BYTE *pb,
@@ -5488,19 +4754,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFByteStreamProxyClassFactory* This,
+        IMFByteStreamProxyClassFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFByteStreamProxyClassFactory* This);
+        IMFByteStreamProxyClassFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFByteStreamProxyClassFactory* This);
+        IMFByteStreamProxyClassFactory *This);
 
     /*** IMFByteStreamProxyClassFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateByteStreamProxy)(
-        IMFByteStreamProxyClassFactory* This,
+        IMFByteStreamProxyClassFactory *This,
         IMFByteStream *pByteStream,
         IMFAttributes *pAttributes,
         REFIID riid,
@@ -5508,6 +4774,7 @@
 
     END_INTERFACE
 } IMFByteStreamProxyClassFactoryVtbl;
+
 interface IMFByteStreamProxyClassFactory {
     CONST_VTBL IMFByteStreamProxyClassFactoryVtbl* lpVtbl;
 };
@@ -5540,17 +4807,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFByteStreamProxyClassFactory_CreateByteStreamProxy_Proxy(
-    IMFByteStreamProxyClassFactory* This,
-    IMFByteStream *pByteStream,
-    IMFAttributes *pAttributes,
-    REFIID riid,
-    LPVOID *ppvObject);
-void __RPC_STUB IMFByteStreamProxyClassFactory_CreateByteStreamProxy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFByteStreamProxyClassFactory_INTERFACE_DEFINED__ */
 
@@ -5608,32 +4864,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFSampleOutputStream* This,
+        IMFSampleOutputStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFSampleOutputStream* This);
+        IMFSampleOutputStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFSampleOutputStream* This);
+        IMFSampleOutputStream *This);
 
     /*** IMFSampleOutputStream methods ***/
     HRESULT (STDMETHODCALLTYPE *BeginWriteSample)(
-        IMFSampleOutputStream* This,
+        IMFSampleOutputStream *This,
         IMFSample *pSample,
         IMFAsyncCallback *pCallback,
         IUnknown *punkState);
 
     HRESULT (STDMETHODCALLTYPE *EndWriteSample)(
-        IMFSampleOutputStream* This,
+        IMFSampleOutputStream *This,
         IMFAsyncResult *pResult);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IMFSampleOutputStream* This);
+        IMFSampleOutputStream *This);
 
     END_INTERFACE
 } IMFSampleOutputStreamVtbl;
+
 interface IMFSampleOutputStream {
     CONST_VTBL IMFSampleOutputStreamVtbl* lpVtbl;
 };
@@ -5674,31 +4931,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFSampleOutputStream_BeginWriteSample_Proxy(
-    IMFSampleOutputStream* This,
-    IMFSample *pSample,
-    IMFAsyncCallback *pCallback,
-    IUnknown *punkState);
-void __RPC_STUB IMFSampleOutputStream_BeginWriteSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSampleOutputStream_EndWriteSample_Proxy(
-    IMFSampleOutputStream* This,
-    IMFAsyncResult *pResult);
-void __RPC_STUB IMFSampleOutputStream_EndWriteSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSampleOutputStream_Close_Proxy(
-    IMFSampleOutputStream* This);
-void __RPC_STUB IMFSampleOutputStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFSampleOutputStream_INTERFACE_DEFINED__ */
 
@@ -5745,45 +4977,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFCollection* This,
+        IMFCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFCollection* This);
+        IMFCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFCollection* This);
+        IMFCollection *This);
 
     /*** IMFCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetElementCount)(
-        IMFCollection* This,
+        IMFCollection *This,
         DWORD *pcElements);
 
     HRESULT (STDMETHODCALLTYPE *GetElement)(
-        IMFCollection* This,
+        IMFCollection *This,
         DWORD dwElementIndex,
         IUnknown **ppUnkElement);
 
     HRESULT (STDMETHODCALLTYPE *AddElement)(
-        IMFCollection* This,
+        IMFCollection *This,
         IUnknown *pUnkElement);
 
     HRESULT (STDMETHODCALLTYPE *RemoveElement)(
-        IMFCollection* This,
+        IMFCollection *This,
         DWORD dwElementIndex,
         IUnknown **ppUnkElement);
 
     HRESULT (STDMETHODCALLTYPE *InsertElementAt)(
-        IMFCollection* This,
+        IMFCollection *This,
         DWORD dwIndex,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAllElements)(
-        IMFCollection* This);
+        IMFCollection *This);
 
     END_INTERFACE
 } IMFCollectionVtbl;
+
 interface IMFCollection {
     CONST_VTBL IMFCollectionVtbl* lpVtbl;
 };
@@ -5836,56 +5069,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFCollection_GetElementCount_Proxy(
-    IMFCollection* This,
-    DWORD *pcElements);
-void __RPC_STUB IMFCollection_GetElementCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFCollection_GetElement_Proxy(
-    IMFCollection* This,
-    DWORD dwElementIndex,
-    IUnknown **ppUnkElement);
-void __RPC_STUB IMFCollection_GetElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFCollection_AddElement_Proxy(
-    IMFCollection* This,
-    IUnknown *pUnkElement);
-void __RPC_STUB IMFCollection_AddElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFCollection_RemoveElement_Proxy(
-    IMFCollection* This,
-    DWORD dwElementIndex,
-    IUnknown **ppUnkElement);
-void __RPC_STUB IMFCollection_RemoveElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFCollection_InsertElementAt_Proxy(
-    IMFCollection* This,
-    DWORD dwIndex,
-    IUnknown *pUnknown);
-void __RPC_STUB IMFCollection_InsertElementAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFCollection_RemoveAllElements_Proxy(
-    IMFCollection* This);
-void __RPC_STUB IMFCollection_RemoveAllElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFCollection_INTERFACE_DEFINED__ */
 
@@ -5941,55 +5124,56 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFMediaEventQueue* This,
+        IMFMediaEventQueue *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFMediaEventQueue* This);
+        IMFMediaEventQueue *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFMediaEventQueue* This);
+        IMFMediaEventQueue *This);
 
     /*** IMFMediaEventQueue methods ***/
     HRESULT (STDMETHODCALLTYPE *GetEvent)(
-        IMFMediaEventQueue* This,
+        IMFMediaEventQueue *This,
         DWORD dwFlags,
         IMFMediaEvent **ppEvent);
 
     HRESULT (STDMETHODCALLTYPE *BeginGetEvent)(
-        IMFMediaEventQueue* This,
+        IMFMediaEventQueue *This,
         IMFAsyncCallback *pCallback,
         IUnknown *punkState);
 
     HRESULT (STDMETHODCALLTYPE *EndGetEvent)(
-        IMFMediaEventQueue* This,
+        IMFMediaEventQueue *This,
         IMFAsyncResult *pResult,
         IMFMediaEvent **ppEvent);
 
     HRESULT (STDMETHODCALLTYPE *QueueEvent)(
-        IMFMediaEventQueue* This,
+        IMFMediaEventQueue *This,
         IMFMediaEvent *pEvent);
 
     HRESULT (STDMETHODCALLTYPE *QueueEventParamVar)(
-        IMFMediaEventQueue* This,
+        IMFMediaEventQueue *This,
         MediaEventType met,
         REFGUID guidExtendedType,
         HRESULT hrStatus,
         const PROPVARIANT *pvValue);
 
     HRESULT (STDMETHODCALLTYPE *QueueEventParamUnk)(
-        IMFMediaEventQueue* This,
+        IMFMediaEventQueue *This,
         MediaEventType met,
         REFGUID guidExtendedType,
         HRESULT hrStatus,
         IUnknown *pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Shutdown)(
-        IMFMediaEventQueue* This);
+        IMFMediaEventQueue *This);
 
     END_INTERFACE
 } IMFMediaEventQueueVtbl;
+
 interface IMFMediaEventQueue {
     CONST_VTBL IMFMediaEventQueueVtbl* lpVtbl;
 };
@@ -6046,70 +5230,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_GetEvent_Proxy(
-    IMFMediaEventQueue* This,
-    DWORD dwFlags,
-    IMFMediaEvent **ppEvent);
-void __RPC_STUB IMFMediaEventQueue_GetEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_BeginGetEvent_Proxy(
-    IMFMediaEventQueue* This,
-    IMFAsyncCallback *pCallback,
-    IUnknown *punkState);
-void __RPC_STUB IMFMediaEventQueue_BeginGetEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_EndGetEvent_Proxy(
-    IMFMediaEventQueue* This,
-    IMFAsyncResult *pResult,
-    IMFMediaEvent **ppEvent);
-void __RPC_STUB IMFMediaEventQueue_EndGetEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_QueueEvent_Proxy(
-    IMFMediaEventQueue* This,
-    IMFMediaEvent *pEvent);
-void __RPC_STUB IMFMediaEventQueue_QueueEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_QueueEventParamVar_Proxy(
-    IMFMediaEventQueue* This,
-    MediaEventType met,
-    REFGUID guidExtendedType,
-    HRESULT hrStatus,
-    const PROPVARIANT *pvValue);
-void __RPC_STUB IMFMediaEventQueue_QueueEventParamVar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_QueueEventParamUnk_Proxy(
-    IMFMediaEventQueue* This,
-    MediaEventType met,
-    REFGUID guidExtendedType,
-    HRESULT hrStatus,
-    IUnknown *pUnk);
-void __RPC_STUB IMFMediaEventQueue_QueueEventParamUnk_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFMediaEventQueue_Shutdown_Proxy(
-    IMFMediaEventQueue* This);
-void __RPC_STUB IMFMediaEventQueue_Shutdown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFMediaEventQueue_INTERFACE_DEFINED__ */
 
@@ -6145,183 +5265,184 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFActivate* This);
+        IMFActivate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFActivate* This);
+        IMFActivate *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFActivate* This,
+        IMFActivate *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFActivate* This);
+        IMFActivate *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFActivate* This);
+        IMFActivate *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFActivate* This);
+        IMFActivate *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFActivate* This,
+        IMFActivate *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFActivate* This,
+        IMFActivate *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFActivate* This,
+        IMFActivate *This,
         IMFAttributes *pDest);
 
     /*** IMFActivate methods ***/
     HRESULT (STDMETHODCALLTYPE *ActivateObject)(
-        IMFActivate* This,
+        IMFActivate *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownObject)(
-        IMFActivate* This);
+        IMFActivate *This);
 
     HRESULT (STDMETHODCALLTYPE *DetachObject)(
-        IMFActivate* This);
+        IMFActivate *This);
 
     END_INTERFACE
 } IMFActivateVtbl;
+
 interface IMFActivate {
     CONST_VTBL IMFActivateVtbl* lpVtbl;
 };
@@ -6484,29 +5605,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFActivate_ActivateObject_Proxy(
-    IMFActivate* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IMFActivate_ActivateObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFActivate_ShutdownObject_Proxy(
-    IMFActivate* This);
-void __RPC_STUB IMFActivate_ShutdownObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFActivate_DetachObject_Proxy(
-    IMFActivate* This);
-void __RPC_STUB IMFActivate_DetachObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFActivate_INTERFACE_DEFINED__ */
 
@@ -6572,55 +5670,56 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFPluginControl* This,
+        IMFPluginControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFPluginControl* This);
+        IMFPluginControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFPluginControl* This);
+        IMFPluginControl *This);
 
     /*** IMFPluginControl methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPreferredClsid)(
-        IMFPluginControl* This,
+        IMFPluginControl *This,
         DWORD pluginType,
         LPCWSTR selector,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *GetPreferredClsidByIndex)(
-        IMFPluginControl* This,
+        IMFPluginControl *This,
         DWORD pluginType,
         DWORD index,
         LPWSTR *selector,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *SetPreferredClsid)(
-        IMFPluginControl* This,
+        IMFPluginControl *This,
         DWORD pluginType,
         LPCWSTR selector,
         const CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *IsDisabled)(
-        IMFPluginControl* This,
+        IMFPluginControl *This,
         DWORD pluginType,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *GetDisabledByIndex)(
-        IMFPluginControl* This,
+        IMFPluginControl *This,
         DWORD pluginType,
         DWORD index,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *SetDisabled)(
-        IMFPluginControl* This,
+        IMFPluginControl *This,
         DWORD pluginType,
         REFCLSID clsid,
         WINBOOL disabled);
 
     END_INTERFACE
 } IMFPluginControlVtbl;
+
 interface IMFPluginControl {
     CONST_VTBL IMFPluginControlVtbl* lpVtbl;
 };
@@ -6673,66 +5772,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFPluginControl_GetPreferredClsid_Proxy(
-    IMFPluginControl* This,
-    DWORD pluginType,
-    LPCWSTR selector,
-    CLSID *clsid);
-void __RPC_STUB IMFPluginControl_GetPreferredClsid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFPluginControl_GetPreferredClsidByIndex_Proxy(
-    IMFPluginControl* This,
-    DWORD pluginType,
-    DWORD index,
-    LPWSTR *selector,
-    CLSID *clsid);
-void __RPC_STUB IMFPluginControl_GetPreferredClsidByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFPluginControl_SetPreferredClsid_Proxy(
-    IMFPluginControl* This,
-    DWORD pluginType,
-    LPCWSTR selector,
-    const CLSID *clsid);
-void __RPC_STUB IMFPluginControl_SetPreferredClsid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFPluginControl_IsDisabled_Proxy(
-    IMFPluginControl* This,
-    DWORD pluginType,
-    REFCLSID clsid);
-void __RPC_STUB IMFPluginControl_IsDisabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFPluginControl_GetDisabledByIndex_Proxy(
-    IMFPluginControl* This,
-    DWORD pluginType,
-    DWORD index,
-    CLSID *clsid);
-void __RPC_STUB IMFPluginControl_GetDisabledByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFPluginControl_SetDisabled_Proxy(
-    IMFPluginControl* This,
-    DWORD pluginType,
-    REFCLSID clsid,
-    WINBOOL disabled);
-void __RPC_STUB IMFPluginControl_SetDisabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFPluginControl_INTERFACE_DEFINED__ */
 
@@ -6767,60 +5806,61 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFPluginControl2* This);
+        IMFPluginControl2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFPluginControl2* This);
+        IMFPluginControl2 *This);
 
     /*** IMFPluginControl methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPreferredClsid)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         DWORD pluginType,
         LPCWSTR selector,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *GetPreferredClsidByIndex)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         DWORD pluginType,
         DWORD index,
         LPWSTR *selector,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *SetPreferredClsid)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         DWORD pluginType,
         LPCWSTR selector,
         const CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *IsDisabled)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         DWORD pluginType,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *GetDisabledByIndex)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         DWORD pluginType,
         DWORD index,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *SetDisabled)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         DWORD pluginType,
         REFCLSID clsid,
         WINBOOL disabled);
 
     /*** IMFPluginControl2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPolicy)(
-        IMFPluginControl2* This,
+        IMFPluginControl2 *This,
         MF_PLUGIN_CONTROL_POLICY policy);
 
     END_INTERFACE
 } IMFPluginControl2Vtbl;
+
 interface IMFPluginControl2 {
     CONST_VTBL IMFPluginControl2Vtbl* lpVtbl;
 };
@@ -6879,14 +5919,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFPluginControl2_SetPolicy_Proxy(
-    IMFPluginControl2* This,
-    MF_PLUGIN_CONTROL_POLICY policy);
-void __RPC_STUB IMFPluginControl2_SetPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFPluginControl2_INTERFACE_DEFINED__ */
 
@@ -6942,54 +5974,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFDXGIDeviceManager* This);
+        IMFDXGIDeviceManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFDXGIDeviceManager* This);
+        IMFDXGIDeviceManager *This);
 
     /*** IMFDXGIDeviceManager methods ***/
     HRESULT (STDMETHODCALLTYPE *CloseDeviceHandle)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         HANDLE hDevice);
 
     HRESULT (STDMETHODCALLTYPE *GetVideoService)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         HANDLE hDevice,
         REFIID riid,
         void **ppService);
 
     HRESULT (STDMETHODCALLTYPE *LockDevice)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         HANDLE hDevice,
         REFIID riid,
         void **ppUnkDevice,
         WINBOOL fBlock);
 
     HRESULT (STDMETHODCALLTYPE *OpenDeviceHandle)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         HANDLE *phDevice);
 
     HRESULT (STDMETHODCALLTYPE *ResetDevice)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         IUnknown *pUnkDevice,
         UINT resetToken);
 
     HRESULT (STDMETHODCALLTYPE *TestDevice)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         HANDLE hDevice);
 
     HRESULT (STDMETHODCALLTYPE *UnlockDevice)(
-        IMFDXGIDeviceManager* This,
+        IMFDXGIDeviceManager *This,
         HANDLE hDevice,
         WINBOOL fSaveState);
 
     END_INTERFACE
 } IMFDXGIDeviceManagerVtbl;
+
 interface IMFDXGIDeviceManager {
     CONST_VTBL IMFDXGIDeviceManagerVtbl* lpVtbl;
 };
@@ -7046,69 +6079,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_CloseDeviceHandle_Proxy(
-    IMFDXGIDeviceManager* This,
-    HANDLE hDevice);
-void __RPC_STUB IMFDXGIDeviceManager_CloseDeviceHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_GetVideoService_Proxy(
-    IMFDXGIDeviceManager* This,
-    HANDLE hDevice,
-    REFIID riid,
-    void **ppService);
-void __RPC_STUB IMFDXGIDeviceManager_GetVideoService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_LockDevice_Proxy(
-    IMFDXGIDeviceManager* This,
-    HANDLE hDevice,
-    REFIID riid,
-    void **ppUnkDevice,
-    WINBOOL fBlock);
-void __RPC_STUB IMFDXGIDeviceManager_LockDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_OpenDeviceHandle_Proxy(
-    IMFDXGIDeviceManager* This,
-    HANDLE *phDevice);
-void __RPC_STUB IMFDXGIDeviceManager_OpenDeviceHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_ResetDevice_Proxy(
-    IMFDXGIDeviceManager* This,
-    IUnknown *pUnkDevice,
-    UINT resetToken);
-void __RPC_STUB IMFDXGIDeviceManager_ResetDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_TestDevice_Proxy(
-    IMFDXGIDeviceManager* This,
-    HANDLE hDevice);
-void __RPC_STUB IMFDXGIDeviceManager_TestDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDXGIDeviceManager_UnlockDevice_Proxy(
-    IMFDXGIDeviceManager* This,
-    HANDLE hDevice,
-    WINBOOL fSaveState);
-void __RPC_STUB IMFDXGIDeviceManager_UnlockDevice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFDXGIDeviceManager_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/mfplay.h b/mingw-w64-headers/include/mfplay.h
index 088a78b..eb0aa51 100644
--- a/mingw-w64-headers/include/mfplay.h
+++ b/mingw-w64-headers/include/mfplay.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.1 from include/mfplay.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mfplay.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/mfreadwrite.h b/mingw-w64-headers/include/mfreadwrite.h
index 73d2581..ec0e2e2 100644
--- a/mingw-w64-headers/include/mfreadwrite.h
+++ b/mingw-w64-headers/include/mfreadwrite.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/mfreadwrite.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mfreadwrite.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,16 +20,25 @@
 #ifndef __IMFSourceReader_FWD_DEFINED__
 #define __IMFSourceReader_FWD_DEFINED__
 typedef interface IMFSourceReader IMFSourceReader;
+#ifdef __cplusplus
+interface IMFSourceReader;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFSinkWriter_FWD_DEFINED__
 #define __IMFSinkWriter_FWD_DEFINED__
 typedef interface IMFSinkWriter IMFSinkWriter;
+#ifdef __cplusplus
+interface IMFSinkWriter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFSourceReaderCallback_FWD_DEFINED__
 #define __IMFSourceReaderCallback_FWD_DEFINED__
 typedef interface IMFSourceReaderCallback IMFSourceReaderCallback;
+#ifdef __cplusplus
+interface IMFSourceReaderCallback;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -81,7 +90,6 @@
     MF_SOURCE_READER_FIRST_VIDEO_STREAM = 0xfffffffc,
     MF_SOURCE_READER_MEDIASOURCE = 0xffffffff
 };
-
 /*****************************************************************************
  * IMFSourceReader interface
  */
@@ -151,51 +159,51 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFSourceReader* This);
+        IMFSourceReader *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFSourceReader* This);
+        IMFSourceReader *This);
 
     /*** IMFSourceReader methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStreamSelection)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         WINBOOL *pfSelected);
 
     HRESULT (STDMETHODCALLTYPE *SetStreamSelection)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         WINBOOL fSelected);
 
     HRESULT (STDMETHODCALLTYPE *GetNativeMediaType)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         DWORD dwMediaTypeIndex,
         IMFMediaType **ppMediaType);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentMediaType)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         IMFMediaType **ppMediaType);
 
     HRESULT (STDMETHODCALLTYPE *SetCurrentMediaType)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         DWORD *pdwReserved,
         IMFMediaType *pMediaType);
 
     HRESULT (STDMETHODCALLTYPE *SetCurrentPosition)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         REFGUID guidTimeFormat,
         REFPROPVARIANT varPosition);
 
     HRESULT (STDMETHODCALLTYPE *ReadSample)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         DWORD dwControlFlags,
         DWORD *pdwActualStreamIndex,
@@ -204,24 +212,25 @@
         IMFSample **ppSample);
 
     HRESULT (STDMETHODCALLTYPE *Flush)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetServiceForStream)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         REFGUID guidService,
         REFIID riid,
         LPVOID *ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetPresentationAttribute)(
-        IMFSourceReader* This,
+        IMFSourceReader *This,
         DWORD dwStreamIndex,
         REFGUID guidAttribute,
         PROPVARIANT *pvarAttribute);
 
     END_INTERFACE
 } IMFSourceReaderVtbl;
+
 interface IMFSourceReader {
     CONST_VTBL IMFSourceReaderVtbl* lpVtbl;
 };
@@ -290,104 +299,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFSourceReader_GetStreamSelection_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    WINBOOL *pfSelected);
-void __RPC_STUB IMFSourceReader_GetStreamSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_SetStreamSelection_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    WINBOOL fSelected);
-void __RPC_STUB IMFSourceReader_SetStreamSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_GetNativeMediaType_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    DWORD dwMediaTypeIndex,
-    IMFMediaType **ppMediaType);
-void __RPC_STUB IMFSourceReader_GetNativeMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_GetCurrentMediaType_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    IMFMediaType **ppMediaType);
-void __RPC_STUB IMFSourceReader_GetCurrentMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_SetCurrentMediaType_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    DWORD *pdwReserved,
-    IMFMediaType *pMediaType);
-void __RPC_STUB IMFSourceReader_SetCurrentMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_SetCurrentPosition_Proxy(
-    IMFSourceReader* This,
-    REFGUID guidTimeFormat,
-    REFPROPVARIANT varPosition);
-void __RPC_STUB IMFSourceReader_SetCurrentPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_ReadSample_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    DWORD dwControlFlags,
-    DWORD *pdwActualStreamIndex,
-    DWORD *pdwStreamFlags,
-    LONGLONG *pllTimestamp,
-    IMFSample **ppSample);
-void __RPC_STUB IMFSourceReader_ReadSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_Flush_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex);
-void __RPC_STUB IMFSourceReader_Flush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_GetServiceForStream_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    REFGUID guidService,
-    REFIID riid,
-    LPVOID *ppvObject);
-void __RPC_STUB IMFSourceReader_GetServiceForStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReader_GetPresentationAttribute_Proxy(
-    IMFSourceReader* This,
-    DWORD dwStreamIndex,
-    REFGUID guidAttribute,
-    PROPVARIANT *pvarAttribute);
-void __RPC_STUB IMFSourceReader_GetPresentationAttribute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFSourceReader_INTERFACE_DEFINED__ */
 
@@ -455,71 +366,72 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFSinkWriter* This);
+        IMFSinkWriter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFSinkWriter* This);
+        IMFSinkWriter *This);
 
     /*** IMFSinkWriter methods ***/
     HRESULT (STDMETHODCALLTYPE *AddStream)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         IMFMediaType *pTargetMediaType,
         DWORD *pdwStreamIndex);
 
     HRESULT (STDMETHODCALLTYPE *SetInputMediaType)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex,
         IMFMediaType *pInputMediaType,
         IMFAttributes *pEncodingParameters);
 
     HRESULT (STDMETHODCALLTYPE *BeginWriting)(
-        IMFSinkWriter* This);
+        IMFSinkWriter *This);
 
     HRESULT (STDMETHODCALLTYPE *WriteSample)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex,
         IMFSample *pSample);
 
     HRESULT (STDMETHODCALLTYPE *SendStreamTick)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex,
         LONGLONG llTimestamp);
 
     HRESULT (STDMETHODCALLTYPE *PlaceMarker)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex,
         LPVOID pvContext);
 
     HRESULT (STDMETHODCALLTYPE *NotifyEndOfSegment)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex);
 
     HRESULT (STDMETHODCALLTYPE *Flush)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex);
 
     HRESULT (STDMETHODCALLTYPE *Finalize)(
-        IMFSinkWriter* This);
+        IMFSinkWriter *This);
 
     HRESULT (STDMETHODCALLTYPE *GetServiceForStream)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex,
         REFGUID guidService,
         REFIID riid,
         LPVOID *ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetStatistics)(
-        IMFSinkWriter* This,
+        IMFSinkWriter *This,
         DWORD dwStreamIndex,
         MF_SINK_WRITER_STATISTICS *pStats);
 
     END_INTERFACE
 } IMFSinkWriterVtbl;
+
 interface IMFSinkWriter {
     CONST_VTBL IMFSinkWriterVtbl* lpVtbl;
 };
@@ -592,102 +504,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_AddStream_Proxy(
-    IMFSinkWriter* This,
-    IMFMediaType *pTargetMediaType,
-    DWORD *pdwStreamIndex);
-void __RPC_STUB IMFSinkWriter_AddStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_SetInputMediaType_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex,
-    IMFMediaType *pInputMediaType,
-    IMFAttributes *pEncodingParameters);
-void __RPC_STUB IMFSinkWriter_SetInputMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_BeginWriting_Proxy(
-    IMFSinkWriter* This);
-void __RPC_STUB IMFSinkWriter_BeginWriting_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_WriteSample_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex,
-    IMFSample *pSample);
-void __RPC_STUB IMFSinkWriter_WriteSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_SendStreamTick_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex,
-    LONGLONG llTimestamp);
-void __RPC_STUB IMFSinkWriter_SendStreamTick_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_PlaceMarker_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex,
-    LPVOID pvContext);
-void __RPC_STUB IMFSinkWriter_PlaceMarker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_NotifyEndOfSegment_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex);
-void __RPC_STUB IMFSinkWriter_NotifyEndOfSegment_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_Flush_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex);
-void __RPC_STUB IMFSinkWriter_Flush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_Finalize_Proxy(
-    IMFSinkWriter* This);
-void __RPC_STUB IMFSinkWriter_Finalize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_GetServiceForStream_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex,
-    REFGUID guidService,
-    REFIID riid,
-    LPVOID *ppvObject);
-void __RPC_STUB IMFSinkWriter_GetServiceForStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSinkWriter_GetStatistics_Proxy(
-    IMFSinkWriter* This,
-    DWORD dwStreamIndex,
-    MF_SINK_WRITER_STATISTICS *pStats);
-void __RPC_STUB IMFSinkWriter_GetStatistics_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFSinkWriter_INTERFACE_DEFINED__ */
 
@@ -726,19 +542,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFSourceReaderCallback* This,
+        IMFSourceReaderCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFSourceReaderCallback* This);
+        IMFSourceReaderCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFSourceReaderCallback* This);
+        IMFSourceReaderCallback *This);
 
     /*** IMFSourceReaderCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *OnReadSample)(
-        IMFSourceReaderCallback* This,
+        IMFSourceReaderCallback *This,
         HRESULT hrStatus,
         DWORD dwStreamIndex,
         DWORD dwStreamFlags,
@@ -746,16 +562,17 @@
         IMFSample *pSample);
 
     HRESULT (STDMETHODCALLTYPE *OnFlush)(
-        IMFSourceReaderCallback* This,
+        IMFSourceReaderCallback *This,
         DWORD dwStreamIndex);
 
     HRESULT (STDMETHODCALLTYPE *OnEvent)(
-        IMFSourceReaderCallback* This,
+        IMFSourceReaderCallback *This,
         DWORD dwStreamIndex,
         IMFMediaEvent *pEvent);
 
     END_INTERFACE
 } IMFSourceReaderCallbackVtbl;
+
 interface IMFSourceReaderCallback {
     CONST_VTBL IMFSourceReaderCallbackVtbl* lpVtbl;
 };
@@ -796,35 +613,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFSourceReaderCallback_OnReadSample_Proxy(
-    IMFSourceReaderCallback* This,
-    HRESULT hrStatus,
-    DWORD dwStreamIndex,
-    DWORD dwStreamFlags,
-    LONGLONG llTimestamp,
-    IMFSample *pSample);
-void __RPC_STUB IMFSourceReaderCallback_OnReadSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReaderCallback_OnFlush_Proxy(
-    IMFSourceReaderCallback* This,
-    DWORD dwStreamIndex);
-void __RPC_STUB IMFSourceReaderCallback_OnFlush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFSourceReaderCallback_OnEvent_Proxy(
-    IMFSourceReaderCallback* This,
-    DWORD dwStreamIndex,
-    IMFMediaEvent *pEvent);
-void __RPC_STUB IMFSourceReaderCallback_OnEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFSourceReaderCallback_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/mftransform.h b/mingw-w64-headers/include/mftransform.h
index 954c861..022c7cf 100644
--- a/mingw-w64-headers/include/mftransform.h
+++ b/mingw-w64-headers/include/mftransform.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/mftransform.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mftransform.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IMFTransform_FWD_DEFINED__
 #define __IMFTransform_FWD_DEFINED__
 typedef interface IMFTransform IMFTransform;
+#ifdef __cplusplus
+interface IMFTransform;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -90,15 +93,12 @@
 enum _MFT_SET_TYPE_FLAGS {
     MFT_SET_TYPE_TEST_ONLY = 0x1
 };
-
 enum _MFT_PROCESS_OUTPUT_STATUS {
     MFT_PROCESS_OUTPUT_STATUS_NEW_STREAMS = 0x100
 };
-
 enum _MFT_PROCESS_OUTPUT_FLAGS {
     MFT_PROCESS_OUTPUT_DISCARD_WHEN_NO_BUFFER = 0x1
 };
-
 typedef enum _MFT_MESSAGE_TYPE {
     MFT_MESSAGE_COMMAND_FLUSH = 0x0,
     MFT_MESSAGE_COMMAND_DRAIN = 0x1,
@@ -248,135 +248,135 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFTransform* This,
+        IMFTransform *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFTransform* This);
+        IMFTransform *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFTransform* This);
+        IMFTransform *This);
 
     /*** IMFTransform methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStreamLimits)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD *pdwInputMinimum,
         DWORD *pdwInputMaximum,
         DWORD *pdwOutputMinimum,
         DWORD *pdwOutputMaximum);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamCount)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD *pcInputStreams,
         DWORD *pcOutputStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamIDs)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputIDArraySize,
         DWORD *pdwInputIDs,
         DWORD dwOutputIDArraySize,
         DWORD *pdwOutputIDs);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStreamInfo)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         MFT_INPUT_STREAM_INFO *pStreamInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStreamInfo)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwOutputStreamID,
         MFT_OUTPUT_STREAM_INFO *pStreamInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetAttributes)(
-        IMFTransform* This,
+        IMFTransform *This,
         IMFAttributes **pAttributes);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStreamAttributes)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         IMFAttributes **pAttributes);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStreamAttributes)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwOutputStreamID,
         IMFAttributes **pAttributes);
 
     HRESULT (STDMETHODCALLTYPE *DeleteInputStream)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwStreamID);
 
     HRESULT (STDMETHODCALLTYPE *AddInputStreams)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD cStreams,
         DWORD *adwStreamIDs);
 
     HRESULT (STDMETHODCALLTYPE *GetInputAvailableType)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         DWORD dwTypeIndex,
         IMFMediaType **ppType);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputAvailableType)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwOutputStreamID,
         DWORD dwTypeIndex,
         IMFMediaType **ppType);
 
     HRESULT (STDMETHODCALLTYPE *SetInputType)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         IMFMediaType *pType,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputType)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwOutputStreamID,
         IMFMediaType *pType,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetInputCurrentType)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         IMFMediaType **ppType);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputCurrentType)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwOutputStreamID,
         IMFMediaType **ppType);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStatus)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStatus)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputBounds)(
-        IMFTransform* This,
+        IMFTransform *This,
         LONGLONG hnsLowerBound,
         LONGLONG hnsUpperBound);
 
     HRESULT (STDMETHODCALLTYPE *ProcessEvent)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         IMFMediaEvent *pEvent);
 
     HRESULT (STDMETHODCALLTYPE *ProcessMessage)(
-        IMFTransform* This,
+        IMFTransform *This,
         MFT_MESSAGE_TYPE eMessage,
         ULONG_PTR ulParam);
 
     HRESULT (STDMETHODCALLTYPE *ProcessInput)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwInputStreamID,
         IMFSample *pSample,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *ProcessOutput)(
-        IMFTransform* This,
+        IMFTransform *This,
         DWORD dwFlags,
         DWORD cOutputBufferCount,
         MFT_OUTPUT_DATA_BUFFER *pOutputSamples,
@@ -384,6 +384,7 @@
 
     END_INTERFACE
 } IMFTransformVtbl;
+
 interface IMFTransform {
     CONST_VTBL IMFTransformVtbl* lpVtbl;
 };
@@ -504,200 +505,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFTransform_GetStreamLimits_Proxy(
-    IMFTransform* This,
-    DWORD *pdwInputMinimum,
-    DWORD *pdwInputMaximum,
-    DWORD *pdwOutputMinimum,
-    DWORD *pdwOutputMaximum);
-void __RPC_STUB IMFTransform_GetStreamLimits_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetStreamCount_Proxy(
-    IMFTransform* This,
-    DWORD *pcInputStreams,
-    DWORD *pcOutputStreams);
-void __RPC_STUB IMFTransform_GetStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetStreamIDs_Proxy(
-    IMFTransform* This,
-    DWORD dwInputIDArraySize,
-    DWORD *pdwInputIDs,
-    DWORD dwOutputIDArraySize,
-    DWORD *pdwOutputIDs);
-void __RPC_STUB IMFTransform_GetStreamIDs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetInputStreamInfo_Proxy(
-    IMFTransform* This,
-    DWORD dwInputStreamID,
-    MFT_INPUT_STREAM_INFO *pStreamInfo);
-void __RPC_STUB IMFTransform_GetInputStreamInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputStreamInfo_Proxy(
-    IMFTransform* This,
-    DWORD dwOutputStreamID,
-    MFT_OUTPUT_STREAM_INFO *pStreamInfo);
-void __RPC_STUB IMFTransform_GetOutputStreamInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetAttributes_Proxy(
-    IMFTransform* This,
-    IMFAttributes **pAttributes);
-void __RPC_STUB IMFTransform_GetAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetInputStreamAttributes_Proxy(
-    IMFTransform* This,
-    DWORD dwInputStreamID,
-    IMFAttributes **pAttributes);
-void __RPC_STUB IMFTransform_GetInputStreamAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputStreamAttributes_Proxy(
-    IMFTransform* This,
-    DWORD dwOutputStreamID,
-    IMFAttributes **pAttributes);
-void __RPC_STUB IMFTransform_GetOutputStreamAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_DeleteInputStream_Proxy(
-    IMFTransform* This,
-    DWORD dwStreamID);
-void __RPC_STUB IMFTransform_DeleteInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_AddInputStreams_Proxy(
-    IMFTransform* This,
-    DWORD cStreams,
-    DWORD *adwStreamIDs);
-void __RPC_STUB IMFTransform_AddInputStreams_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetInputAvailableType_Proxy(
-    IMFTransform* This,
-    DWORD dwInputStreamID,
-    DWORD dwTypeIndex,
-    IMFMediaType **ppType);
-void __RPC_STUB IMFTransform_GetInputAvailableType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputAvailableType_Proxy(
-    IMFTransform* This,
-    DWORD dwOutputStreamID,
-    DWORD dwTypeIndex,
-    IMFMediaType **ppType);
-void __RPC_STUB IMFTransform_GetOutputAvailableType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_SetInputType_Proxy(
-    IMFTransform* This,
-    DWORD dwInputStreamID,
-    IMFMediaType *pType,
-    DWORD dwFlags);
-void __RPC_STUB IMFTransform_SetInputType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_SetOutputType_Proxy(
-    IMFTransform* This,
-    DWORD dwOutputStreamID,
-    IMFMediaType *pType,
-    DWORD dwFlags);
-void __RPC_STUB IMFTransform_SetOutputType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetInputCurrentType_Proxy(
-    IMFTransform* This,
-    DWORD dwInputStreamID,
-    IMFMediaType **ppType);
-void __RPC_STUB IMFTransform_GetInputCurrentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputCurrentType_Proxy(
-    IMFTransform* This,
-    DWORD dwOutputStreamID,
-    IMFMediaType **ppType);
-void __RPC_STUB IMFTransform_GetOutputCurrentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetInputStatus_Proxy(
-    IMFTransform* This,
-    DWORD dwInputStreamID,
-    DWORD *pdwFlags);
-void __RPC_STUB IMFTransform_GetInputStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_GetOutputStatus_Proxy(
-    IMFTransform* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IMFTransform_GetOutputStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_SetOutputBounds_Proxy(
-    IMFTransform* This,
-    LONGLONG hnsLowerBound,
-    LONGLONG hnsUpperBound);
-void __RPC_STUB IMFTransform_SetOutputBounds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_ProcessEvent_Proxy(
-    IMFTransform* This,
-    DWORD dwInputStreamID,
-    IMFMediaEvent *pEvent);
-void __RPC_STUB IMFTransform_ProcessEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFTransform_ProcessMessage_Proxy(
-    IMFTransform* This,
-    MFT_MESSAGE_TYPE eMessage,
-    ULONG_PTR ulParam);
-void __RPC_STUB IMFTransform_ProcessMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFTransform_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/mmdeviceapi.h b/mingw-w64-headers/include/mmdeviceapi.h
index 15f25d0..07ee574 100644
--- a/mingw-w64-headers/include/mmdeviceapi.h
+++ b/mingw-w64-headers/include/mmdeviceapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/mmdeviceapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mmdeviceapi.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/mscoree.h b/mingw-w64-headers/include/mscoree.h
index 0190426..18f37a1 100644
--- a/mingw-w64-headers/include/mscoree.h
+++ b/mingw-w64-headers/include/mscoree.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/mscoree.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mscoree.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/msctf.h b/mingw-w64-headers/include/msctf.h
index 9aa6a2b..036443a 100644
--- a/mingw-w64-headers/include/msctf.h
+++ b/mingw-w64-headers/include/msctf.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/msctf.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/msctf.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/mshtmhst.h b/mingw-w64-headers/include/mshtmhst.h
index f730bbe..9daa526 100644
--- a/mingw-w64-headers/include/mshtmhst.h
+++ b/mingw-w64-headers/include/mshtmhst.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/mshtmhst.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/mshtmhst.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IHostDialogHelper_FWD_DEFINED__
 #define __IHostDialogHelper_FWD_DEFINED__
 typedef interface IHostDialogHelper IHostDialogHelper;
+#ifdef __cplusplus
+interface IHostDialogHelper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __HostDialogHelper_FWD_DEFINED__
@@ -34,31 +37,49 @@
 #ifndef __IDocHostUIHandler_FWD_DEFINED__
 #define __IDocHostUIHandler_FWD_DEFINED__
 typedef interface IDocHostUIHandler IDocHostUIHandler;
+#ifdef __cplusplus
+interface IDocHostUIHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDocHostUIHandler2_FWD_DEFINED__
 #define __IDocHostUIHandler2_FWD_DEFINED__
 typedef interface IDocHostUIHandler2 IDocHostUIHandler2;
+#ifdef __cplusplus
+interface IDocHostUIHandler2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICustomDoc_FWD_DEFINED__
 #define __ICustomDoc_FWD_DEFINED__
 typedef interface ICustomDoc ICustomDoc;
+#ifdef __cplusplus
+interface ICustomDoc;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDocHostShowUI_FWD_DEFINED__
 #define __IDocHostShowUI_FWD_DEFINED__
 typedef interface IDocHostShowUI IDocHostShowUI;
+#ifdef __cplusplus
+interface IDocHostShowUI;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IClassFactoryEx_FWD_DEFINED__
 #define __IClassFactoryEx_FWD_DEFINED__
 typedef interface IClassFactoryEx IClassFactoryEx;
+#ifdef __cplusplus
+interface IClassFactoryEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHTMLOMWindowServices_FWD_DEFINED__
 #define __IHTMLOMWindowServices_FWD_DEFINED__
 typedef interface IHTMLOMWindowServices IHTMLOMWindowServices;
+#ifdef __cplusplus
+interface IHTMLOMWindowServices;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -224,19 +245,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHostDialogHelper* This,
+        IHostDialogHelper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHostDialogHelper* This);
+        IHostDialogHelper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHostDialogHelper* This);
+        IHostDialogHelper *This);
 
     /*** IHostDialogHelper methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowHTMLDialog)(
-        IHostDialogHelper* This,
+        IHostDialogHelper *This,
         HWND hwndParent,
         IMoniker *pMk,
         VARIANT *pvarArgIn,
@@ -246,6 +267,7 @@
 
     END_INTERFACE
 } IHostDialogHelperVtbl;
+
 interface IHostDialogHelper {
     CONST_VTBL IHostDialogHelperVtbl* lpVtbl;
 };
@@ -278,19 +300,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHostDialogHelper_ShowHTMLDialog_Proxy(
-    IHostDialogHelper* This,
-    HWND hwndParent,
-    IMoniker *pMk,
-    VARIANT *pvarArgIn,
-    WCHAR *pchOptions,
-    VARIANT *pvarArgOut,
-    IUnknown *punkHost);
-void __RPC_STUB IHostDialogHelper_ShowHTMLDialog_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHostDialogHelper_INTERFACE_DEFINED__ */
 
@@ -389,30 +398,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDocHostUIHandler* This);
+        IDocHostUIHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDocHostUIHandler* This);
+        IDocHostUIHandler *This);
 
     /*** IDocHostUIHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowContextMenu)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         DWORD dwID,
         POINT *ppt,
         IUnknown *pcmdtReserved,
         IDispatch *pdispReserved);
 
     HRESULT (STDMETHODCALLTYPE *GetHostInfo)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         DOCHOSTUIINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *ShowUI)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         DWORD dwID,
         IOleInPlaceActiveObject *pActiveObject,
         IOleCommandTarget *pCommandTarget,
@@ -420,62 +429,63 @@
         IOleInPlaceUIWindow *pDoc);
 
     HRESULT (STDMETHODCALLTYPE *HideUI)(
-        IDocHostUIHandler* This);
+        IDocHostUIHandler *This);
 
     HRESULT (STDMETHODCALLTYPE *UpdateUI)(
-        IDocHostUIHandler* This);
+        IDocHostUIHandler *This);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         WINBOOL fEnable);
 
     HRESULT (STDMETHODCALLTYPE *OnDocWindowActivate)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         WINBOOL fActivate);
 
     HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         WINBOOL fActivate);
 
     HRESULT (STDMETHODCALLTYPE *ResizeBorder)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         LPCRECT prcBorder,
         IOleInPlaceUIWindow *pUIWindow,
         WINBOOL fRameWindow);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         LPMSG lpMsg,
         const GUID *pguidCmdGroup,
         DWORD nCmdID);
 
     HRESULT (STDMETHODCALLTYPE *GetOptionKeyPath)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         LPOLESTR *pchKey,
         DWORD dw);
 
     HRESULT (STDMETHODCALLTYPE *GetDropTarget)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         IDropTarget *pDropTarget,
         IDropTarget **ppDropTarget);
 
     HRESULT (STDMETHODCALLTYPE *GetExternal)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         IDispatch **ppDispatch);
 
     HRESULT (STDMETHODCALLTYPE *TranslateUrl)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         DWORD dwTranslate,
         LPWSTR pchURLIn,
         LPWSTR *ppchURLOut);
 
     HRESULT (STDMETHODCALLTYPE *FilterDataObject)(
-        IDocHostUIHandler* This,
+        IDocHostUIHandler *This,
         IDataObject *pDO,
         IDataObject **ppDORet);
 
     END_INTERFACE
 } IDocHostUIHandlerVtbl;
+
 interface IDocHostUIHandler {
     CONST_VTBL IDocHostUIHandlerVtbl* lpVtbl;
 };
@@ -564,140 +574,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_ShowContextMenu_Proxy(
-    IDocHostUIHandler* This,
-    DWORD dwID,
-    POINT *ppt,
-    IUnknown *pcmdtReserved,
-    IDispatch *pdispReserved);
-void __RPC_STUB IDocHostUIHandler_ShowContextMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetHostInfo_Proxy(
-    IDocHostUIHandler* This,
-    DOCHOSTUIINFO *pInfo);
-void __RPC_STUB IDocHostUIHandler_GetHostInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_ShowUI_Proxy(
-    IDocHostUIHandler* This,
-    DWORD dwID,
-    IOleInPlaceActiveObject *pActiveObject,
-    IOleCommandTarget *pCommandTarget,
-    IOleInPlaceFrame *pFrame,
-    IOleInPlaceUIWindow *pDoc);
-void __RPC_STUB IDocHostUIHandler_ShowUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_HideUI_Proxy(
-    IDocHostUIHandler* This);
-void __RPC_STUB IDocHostUIHandler_HideUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_UpdateUI_Proxy(
-    IDocHostUIHandler* This);
-void __RPC_STUB IDocHostUIHandler_UpdateUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_EnableModeless_Proxy(
-    IDocHostUIHandler* This,
-    WINBOOL fEnable);
-void __RPC_STUB IDocHostUIHandler_EnableModeless_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_OnDocWindowActivate_Proxy(
-    IDocHostUIHandler* This,
-    WINBOOL fActivate);
-void __RPC_STUB IDocHostUIHandler_OnDocWindowActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_OnFrameWindowActivate_Proxy(
-    IDocHostUIHandler* This,
-    WINBOOL fActivate);
-void __RPC_STUB IDocHostUIHandler_OnFrameWindowActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_ResizeBorder_Proxy(
-    IDocHostUIHandler* This,
-    LPCRECT prcBorder,
-    IOleInPlaceUIWindow *pUIWindow,
-    WINBOOL fRameWindow);
-void __RPC_STUB IDocHostUIHandler_ResizeBorder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_TranslateAccelerator_Proxy(
-    IDocHostUIHandler* This,
-    LPMSG lpMsg,
-    const GUID *pguidCmdGroup,
-    DWORD nCmdID);
-void __RPC_STUB IDocHostUIHandler_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetOptionKeyPath_Proxy(
-    IDocHostUIHandler* This,
-    LPOLESTR *pchKey,
-    DWORD dw);
-void __RPC_STUB IDocHostUIHandler_GetOptionKeyPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetDropTarget_Proxy(
-    IDocHostUIHandler* This,
-    IDropTarget *pDropTarget,
-    IDropTarget **ppDropTarget);
-void __RPC_STUB IDocHostUIHandler_GetDropTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_GetExternal_Proxy(
-    IDocHostUIHandler* This,
-    IDispatch **ppDispatch);
-void __RPC_STUB IDocHostUIHandler_GetExternal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_TranslateUrl_Proxy(
-    IDocHostUIHandler* This,
-    DWORD dwTranslate,
-    LPWSTR pchURLIn,
-    LPWSTR *ppchURLOut);
-void __RPC_STUB IDocHostUIHandler_TranslateUrl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler_FilterDataObject_Proxy(
-    IDocHostUIHandler* This,
-    IDataObject *pDO,
-    IDataObject **ppDORet);
-void __RPC_STUB IDocHostUIHandler_FilterDataObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDocHostUIHandler_INTERFACE_DEFINED__ */
 
@@ -726,30 +602,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDocHostUIHandler2* This);
+        IDocHostUIHandler2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDocHostUIHandler2* This);
+        IDocHostUIHandler2 *This);
 
     /*** IDocHostUIHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowContextMenu)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         DWORD dwID,
         POINT *ppt,
         IUnknown *pcmdtReserved,
         IDispatch *pdispReserved);
 
     HRESULT (STDMETHODCALLTYPE *GetHostInfo)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         DOCHOSTUIINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *ShowUI)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         DWORD dwID,
         IOleInPlaceActiveObject *pActiveObject,
         IOleCommandTarget *pCommandTarget,
@@ -757,68 +633,69 @@
         IOleInPlaceUIWindow *pDoc);
 
     HRESULT (STDMETHODCALLTYPE *HideUI)(
-        IDocHostUIHandler2* This);
+        IDocHostUIHandler2 *This);
 
     HRESULT (STDMETHODCALLTYPE *UpdateUI)(
-        IDocHostUIHandler2* This);
+        IDocHostUIHandler2 *This);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         WINBOOL fEnable);
 
     HRESULT (STDMETHODCALLTYPE *OnDocWindowActivate)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         WINBOOL fActivate);
 
     HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         WINBOOL fActivate);
 
     HRESULT (STDMETHODCALLTYPE *ResizeBorder)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         LPCRECT prcBorder,
         IOleInPlaceUIWindow *pUIWindow,
         WINBOOL fRameWindow);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         LPMSG lpMsg,
         const GUID *pguidCmdGroup,
         DWORD nCmdID);
 
     HRESULT (STDMETHODCALLTYPE *GetOptionKeyPath)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         LPOLESTR *pchKey,
         DWORD dw);
 
     HRESULT (STDMETHODCALLTYPE *GetDropTarget)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         IDropTarget *pDropTarget,
         IDropTarget **ppDropTarget);
 
     HRESULT (STDMETHODCALLTYPE *GetExternal)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         IDispatch **ppDispatch);
 
     HRESULT (STDMETHODCALLTYPE *TranslateUrl)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         DWORD dwTranslate,
         LPWSTR pchURLIn,
         LPWSTR *ppchURLOut);
 
     HRESULT (STDMETHODCALLTYPE *FilterDataObject)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         IDataObject *pDO,
         IDataObject **ppDORet);
 
     /*** IDocHostUIHandler2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOverrideKeyPath)(
-        IDocHostUIHandler2* This,
+        IDocHostUIHandler2 *This,
         LPOLESTR *pchKey,
         DWORD dw);
 
     END_INTERFACE
 } IDocHostUIHandler2Vtbl;
+
 interface IDocHostUIHandler2 {
     CONST_VTBL IDocHostUIHandler2Vtbl* lpVtbl;
 };
@@ -913,15 +790,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDocHostUIHandler2_GetOverrideKeyPath_Proxy(
-    IDocHostUIHandler2* This,
-    LPOLESTR *pchKey,
-    DWORD dw);
-void __RPC_STUB IDocHostUIHandler2_GetOverrideKeyPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDocHostUIHandler2_INTERFACE_DEFINED__ */
 
@@ -949,23 +817,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICustomDoc* This,
+        ICustomDoc *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICustomDoc* This);
+        ICustomDoc *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICustomDoc* This);
+        ICustomDoc *This);
 
     /*** ICustomDoc methods ***/
     HRESULT (STDMETHODCALLTYPE *SetUIHandler)(
-        ICustomDoc* This,
+        ICustomDoc *This,
         IDocHostUIHandler *pUIHandler);
 
     END_INTERFACE
 } ICustomDocVtbl;
+
 interface ICustomDoc {
     CONST_VTBL ICustomDocVtbl* lpVtbl;
 };
@@ -998,14 +867,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICustomDoc_SetUIHandler_Proxy(
-    ICustomDoc* This,
-    IDocHostUIHandler *pUIHandler);
-void __RPC_STUB ICustomDoc_SetUIHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICustomDoc_INTERFACE_DEFINED__ */
 
@@ -1047,19 +908,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDocHostShowUI* This,
+        IDocHostShowUI *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDocHostShowUI* This);
+        IDocHostShowUI *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDocHostShowUI* This);
+        IDocHostShowUI *This);
 
     /*** IDocHostShowUI methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowMessage)(
-        IDocHostShowUI* This,
+        IDocHostShowUI *This,
         HWND hwnd,
         LPOLESTR lpstrText,
         LPOLESTR lpstrCaption,
@@ -1069,7 +930,7 @@
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *ShowHelp)(
-        IDocHostShowUI* This,
+        IDocHostShowUI *This,
         HWND hwnd,
         LPOLESTR pszHelpFile,
         UINT uCommand,
@@ -1079,6 +940,7 @@
 
     END_INTERFACE
 } IDocHostShowUIVtbl;
+
 interface IDocHostShowUI {
     CONST_VTBL IDocHostShowUIVtbl* lpVtbl;
 };
@@ -1115,33 +977,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDocHostShowUI_ShowMessage_Proxy(
-    IDocHostShowUI* This,
-    HWND hwnd,
-    LPOLESTR lpstrText,
-    LPOLESTR lpstrCaption,
-    DWORD dwType,
-    LPOLESTR lpstrHelpFile,
-    DWORD dwHelpContext,
-    LRESULT *plResult);
-void __RPC_STUB IDocHostShowUI_ShowMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDocHostShowUI_ShowHelp_Proxy(
-    IDocHostShowUI* This,
-    HWND hwnd,
-    LPOLESTR pszHelpFile,
-    UINT uCommand,
-    DWORD dwData,
-    POINT ptMouse,
-    IDispatch *pDispatchObjectHit);
-void __RPC_STUB IDocHostShowUI_ShowHelp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDocHostShowUI_INTERFACE_DEFINED__ */
 
@@ -1175,30 +1010,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IClassFactoryEx* This,
+        IClassFactoryEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IClassFactoryEx* This);
+        IClassFactoryEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IClassFactoryEx* This);
+        IClassFactoryEx *This);
 
     /*** IClassFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        IClassFactoryEx* This,
+        IClassFactoryEx *This,
         IUnknown *pUnkOuter,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *LockServer)(
-        IClassFactoryEx* This,
+        IClassFactoryEx *This,
         WINBOOL fLock);
 
     /*** IClassFactoryEx methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateInstanceWithContext)(
-        IClassFactoryEx* This,
+        IClassFactoryEx *This,
         IUnknown *punkContext,
         IUnknown *punkOuter,
         REFIID riid,
@@ -1206,6 +1041,7 @@
 
     END_INTERFACE
 } IClassFactoryExVtbl;
+
 interface IClassFactoryEx {
     CONST_VTBL IClassFactoryExVtbl* lpVtbl;
 };
@@ -1248,17 +1084,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IClassFactoryEx_CreateInstanceWithContext_Proxy(
-    IClassFactoryEx* This,
-    IUnknown *punkContext,
-    IUnknown *punkOuter,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IClassFactoryEx_CreateInstanceWithContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IClassFactoryEx_INTERFACE_DEFINED__ */
 
@@ -1299,39 +1124,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHTMLOMWindowServices* This,
+        IHTMLOMWindowServices *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHTMLOMWindowServices* This);
+        IHTMLOMWindowServices *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHTMLOMWindowServices* This);
+        IHTMLOMWindowServices *This);
 
     /*** IHTMLOMWindowServices methods ***/
     HRESULT (STDMETHODCALLTYPE *moveTo)(
-        IHTMLOMWindowServices* This,
+        IHTMLOMWindowServices *This,
         LONG x,
         LONG y);
 
     HRESULT (STDMETHODCALLTYPE *moveBy)(
-        IHTMLOMWindowServices* This,
+        IHTMLOMWindowServices *This,
         LONG x,
         LONG y);
 
     HRESULT (STDMETHODCALLTYPE *resizeTo)(
-        IHTMLOMWindowServices* This,
+        IHTMLOMWindowServices *This,
         LONG x,
         LONG y);
 
     HRESULT (STDMETHODCALLTYPE *resizeBy)(
-        IHTMLOMWindowServices* This,
+        IHTMLOMWindowServices *This,
         LONG x,
         LONG y);
 
     END_INTERFACE
 } IHTMLOMWindowServicesVtbl;
+
 interface IHTMLOMWindowServices {
     CONST_VTBL IHTMLOMWindowServicesVtbl* lpVtbl;
 };
@@ -1376,42 +1202,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_moveTo_Proxy(
-    IHTMLOMWindowServices* This,
-    LONG x,
-    LONG y);
-void __RPC_STUB IHTMLOMWindowServices_moveTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_moveBy_Proxy(
-    IHTMLOMWindowServices* This,
-    LONG x,
-    LONG y);
-void __RPC_STUB IHTMLOMWindowServices_moveBy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_resizeTo_Proxy(
-    IHTMLOMWindowServices* This,
-    LONG x,
-    LONG y);
-void __RPC_STUB IHTMLOMWindowServices_resizeTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHTMLOMWindowServices_resizeBy_Proxy(
-    IHTMLOMWindowServices* This,
-    LONG x,
-    LONG y);
-void __RPC_STUB IHTMLOMWindowServices_resizeBy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHTMLOMWindowServices_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/msinkaut.h b/mingw-w64-headers/include/msinkaut.h
index fadab56..ee3d414 100644
--- a/mingw-w64-headers/include/msinkaut.h
+++ b/mingw-w64-headers/include/msinkaut.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/msinkaut.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/msinkaut.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,101 +20,161 @@
 #ifndef __IInkExtendedProperty_FWD_DEFINED__
 #define __IInkExtendedProperty_FWD_DEFINED__
 typedef interface IInkExtendedProperty IInkExtendedProperty;
+#ifdef __cplusplus
+interface IInkExtendedProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkExtendedProperties_FWD_DEFINED__
 #define __IInkExtendedProperties_FWD_DEFINED__
 typedef interface IInkExtendedProperties IInkExtendedProperties;
+#ifdef __cplusplus
+interface IInkExtendedProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkDrawingAttributes_FWD_DEFINED__
 #define __IInkDrawingAttributes_FWD_DEFINED__
 typedef interface IInkDrawingAttributes IInkDrawingAttributes;
+#ifdef __cplusplus
+interface IInkDrawingAttributes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkRectangle_FWD_DEFINED__
 #define __IInkRectangle_FWD_DEFINED__
 typedef interface IInkRectangle IInkRectangle;
+#ifdef __cplusplus
+interface IInkRectangle;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkTablet_FWD_DEFINED__
 #define __IInkTablet_FWD_DEFINED__
 typedef interface IInkTablet IInkTablet;
+#ifdef __cplusplus
+interface IInkTablet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkCursorButton_FWD_DEFINED__
 #define __IInkCursorButton_FWD_DEFINED__
 typedef interface IInkCursorButton IInkCursorButton;
+#ifdef __cplusplus
+interface IInkCursorButton;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkCursorButtons_FWD_DEFINED__
 #define __IInkCursorButtons_FWD_DEFINED__
 typedef interface IInkCursorButtons IInkCursorButtons;
+#ifdef __cplusplus
+interface IInkCursorButtons;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkCursor_FWD_DEFINED__
 #define __IInkCursor_FWD_DEFINED__
 typedef interface IInkCursor IInkCursor;
+#ifdef __cplusplus
+interface IInkCursor;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkTransform_FWD_DEFINED__
 #define __IInkTransform_FWD_DEFINED__
 typedef interface IInkTransform IInkTransform;
+#ifdef __cplusplus
+interface IInkTransform;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkRecognitionAlternates_FWD_DEFINED__
 #define __IInkRecognitionAlternates_FWD_DEFINED__
 typedef interface IInkRecognitionAlternates IInkRecognitionAlternates;
+#ifdef __cplusplus
+interface IInkRecognitionAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkRecognitionAlternate_FWD_DEFINED__
 #define __IInkRecognitionAlternate_FWD_DEFINED__
 typedef interface IInkRecognitionAlternate IInkRecognitionAlternate;
+#ifdef __cplusplus
+interface IInkRecognitionAlternate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkRecognitionResult_FWD_DEFINED__
 #define __IInkRecognitionResult_FWD_DEFINED__
 typedef interface IInkRecognitionResult IInkRecognitionResult;
+#ifdef __cplusplus
+interface IInkRecognitionResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkStrokeDisp_FWD_DEFINED__
 #define __IInkStrokeDisp_FWD_DEFINED__
 typedef interface IInkStrokeDisp IInkStrokeDisp;
+#ifdef __cplusplus
+interface IInkStrokeDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkCustomStrokes_FWD_DEFINED__
 #define __IInkCustomStrokes_FWD_DEFINED__
 typedef interface IInkCustomStrokes IInkCustomStrokes;
+#ifdef __cplusplus
+interface IInkCustomStrokes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkDisp_FWD_DEFINED__
 #define __IInkDisp_FWD_DEFINED__
 typedef interface IInkDisp IInkDisp;
+#ifdef __cplusplus
+interface IInkDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkStrokes_FWD_DEFINED__
 #define __IInkStrokes_FWD_DEFINED__
 typedef interface IInkStrokes IInkStrokes;
+#ifdef __cplusplus
+interface IInkStrokes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkRenderer_FWD_DEFINED__
 #define __IInkRenderer_FWD_DEFINED__
 typedef interface IInkRenderer IInkRenderer;
+#ifdef __cplusplus
+interface IInkRenderer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkCursors_FWD_DEFINED__
 #define __IInkCursors_FWD_DEFINED__
 typedef interface IInkCursors IInkCursors;
+#ifdef __cplusplus
+interface IInkCursors;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkCollector_FWD_DEFINED__
 #define __IInkCollector_FWD_DEFINED__
 typedef interface IInkCollector IInkCollector;
+#ifdef __cplusplus
+interface IInkCollector;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___IInkCollectorEvents_FWD_DEFINED__
 #define ___IInkCollectorEvents_FWD_DEFINED__
 typedef interface _IInkCollectorEvents _IInkCollectorEvents;
+#ifdef __cplusplus
+interface _IInkCollectorEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __InkCollector_FWD_DEFINED__
@@ -361,16 +421,25 @@
 #ifndef __IInkDisp_FWD_DEFINED__
 #define __IInkDisp_FWD_DEFINED__
 typedef interface IInkDisp IInkDisp;
+#ifdef __cplusplus
+interface IInkDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkStrokes_FWD_DEFINED__
 #define __IInkStrokes_FWD_DEFINED__
 typedef interface IInkStrokes IInkStrokes;
+#ifdef __cplusplus
+interface IInkStrokes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInkRecognitionAlternate_FWD_DEFINED__
 #define __IInkRecognitionAlternate_FWD_DEFINED__
 typedef interface IInkRecognitionAlternate IInkRecognitionAlternate;
+#ifdef __cplusplus
+interface IInkRecognitionAlternate;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -403,29 +472,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkExtendedProperty* This);
+        IInkExtendedProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkExtendedProperty* This);
+        IInkExtendedProperty *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -433,7 +502,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -445,19 +514,20 @@
 
     /*** IInkExtendedProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Guid)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         BSTR *Guid);
 
     HRESULT (STDMETHODCALLTYPE *get_Data)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         VARIANT *Data);
 
     HRESULT (STDMETHODCALLTYPE *put_Data)(
-        IInkExtendedProperty* This,
+        IInkExtendedProperty *This,
         VARIANT Data);
 
     END_INTERFACE
 } IInkExtendedPropertyVtbl;
+
 interface IInkExtendedProperty {
     CONST_VTBL IInkExtendedPropertyVtbl* lpVtbl;
 };
@@ -516,30 +586,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkExtendedProperty_get_Guid_Proxy(
-    IInkExtendedProperty* This,
-    BSTR *Guid);
-void __RPC_STUB IInkExtendedProperty_get_Guid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperty_get_Data_Proxy(
-    IInkExtendedProperty* This,
-    VARIANT *Data);
-void __RPC_STUB IInkExtendedProperty_get_Data_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperty_put_Data_Proxy(
-    IInkExtendedProperty* This,
-    VARIANT Data);
-void __RPC_STUB IInkExtendedProperty_put_Data_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkExtendedProperty_INTERFACE_DEFINED__ */
 
@@ -589,29 +635,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkExtendedProperties* This);
+        IInkExtendedProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkExtendedProperties* This);
+        IInkExtendedProperties *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -619,7 +665,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -631,38 +677,39 @@
 
     /*** IInkExtendedProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         IUnknown **_NewEnum);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         VARIANT Identifier,
         IInkExtendedProperty **Item);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         BSTR Guid,
         VARIANT Data,
         IInkExtendedProperty **InkExtendedProperty);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         VARIANT Identifier);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        IInkExtendedProperties* This);
+        IInkExtendedProperties *This);
 
     HRESULT (STDMETHODCALLTYPE *DoesPropertyExist)(
-        IInkExtendedProperties* This,
+        IInkExtendedProperties *This,
         BSTR Guid,
         VARIANT_BOOL *DoesPropertyExist);
 
     END_INTERFACE
 } IInkExtendedPropertiesVtbl;
+
 interface IInkExtendedProperties {
     CONST_VTBL IInkExtendedPropertiesVtbl* lpVtbl;
 };
@@ -737,65 +784,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkExtendedProperties_get_Count_Proxy(
-    IInkExtendedProperties* This,
-    LONG *Count);
-void __RPC_STUB IInkExtendedProperties_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperties_get__NewEnum_Proxy(
-    IInkExtendedProperties* This,
-    IUnknown **_NewEnum);
-void __RPC_STUB IInkExtendedProperties_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Item_Proxy(
-    IInkExtendedProperties* This,
-    VARIANT Identifier,
-    IInkExtendedProperty **Item);
-void __RPC_STUB IInkExtendedProperties_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Add_Proxy(
-    IInkExtendedProperties* This,
-    BSTR Guid,
-    VARIANT Data,
-    IInkExtendedProperty **InkExtendedProperty);
-void __RPC_STUB IInkExtendedProperties_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Remove_Proxy(
-    IInkExtendedProperties* This,
-    VARIANT Identifier);
-void __RPC_STUB IInkExtendedProperties_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperties_Clear_Proxy(
-    IInkExtendedProperties* This);
-void __RPC_STUB IInkExtendedProperties_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkExtendedProperties_DoesPropertyExist_Proxy(
-    IInkExtendedProperties* This,
-    BSTR Guid,
-    VARIANT_BOOL *DoesPropertyExist);
-void __RPC_STUB IInkExtendedProperties_DoesPropertyExist_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkExtendedProperties_INTERFACE_DEFINED__ */
 
@@ -880,29 +868,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkDrawingAttributes* This);
+        IInkDrawingAttributes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkDrawingAttributes* This);
+        IInkDrawingAttributes *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -910,7 +898,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -922,87 +910,88 @@
 
     /*** IInkDrawingAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Color)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         LONG *CurrentColor);
 
     HRESULT (STDMETHODCALLTYPE *put_Color)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         LONG NewColor);
 
     HRESULT (STDMETHODCALLTYPE *get_Width)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         float *CurrentWidth);
 
     HRESULT (STDMETHODCALLTYPE *put_Width)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         float NewWidth);
 
     HRESULT (STDMETHODCALLTYPE *get_Height)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         float *CurrentHeight);
 
     HRESULT (STDMETHODCALLTYPE *put_Height)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         float NewHeight);
 
     HRESULT (STDMETHODCALLTYPE *get_FitToCurve)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         VARIANT_BOOL *Flag);
 
     HRESULT (STDMETHODCALLTYPE *put_FitToCurve)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         VARIANT_BOOL Flag);
 
     HRESULT (STDMETHODCALLTYPE *get_IgnorePressure)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         VARIANT_BOOL *Flag);
 
     HRESULT (STDMETHODCALLTYPE *put_IgnorePressure)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         VARIANT_BOOL Flag);
 
     HRESULT (STDMETHODCALLTYPE *get_AntiAliased)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         VARIANT_BOOL *Flag);
 
     HRESULT (STDMETHODCALLTYPE *put_AntiAliased)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         VARIANT_BOOL Flag);
 
     HRESULT (STDMETHODCALLTYPE *get_Transparency)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         LONG *CurrentTransparency);
 
     HRESULT (STDMETHODCALLTYPE *put_Transparency)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         LONG NewTransparency);
 
     HRESULT (STDMETHODCALLTYPE *get_RasterOperation)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         InkRasterOperation *CurrentRasterOperation);
 
     HRESULT (STDMETHODCALLTYPE *put_RasterOperation)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         InkRasterOperation NewRasterOperation);
 
     HRESULT (STDMETHODCALLTYPE *get_PenTip)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         InkPenTip *CurrentPenTip);
 
     HRESULT (STDMETHODCALLTYPE *put_PenTip)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         InkPenTip NewPenTip);
 
     HRESULT (STDMETHODCALLTYPE *get_ExtendedProperties)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         IInkExtendedProperties **Properties);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IInkDrawingAttributes* This,
+        IInkDrawingAttributes *This,
         IInkDrawingAttributes **DrawingAttributes);
 
     END_INTERFACE
 } IInkDrawingAttributesVtbl;
+
 interface IInkDrawingAttributes {
     CONST_VTBL IInkDrawingAttributesVtbl* lpVtbl;
 };
@@ -1129,166 +1118,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Color_Proxy(
-    IInkDrawingAttributes* This,
-    LONG *CurrentColor);
-void __RPC_STUB IInkDrawingAttributes_get_Color_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Color_Proxy(
-    IInkDrawingAttributes* This,
-    LONG NewColor);
-void __RPC_STUB IInkDrawingAttributes_put_Color_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Width_Proxy(
-    IInkDrawingAttributes* This,
-    float *CurrentWidth);
-void __RPC_STUB IInkDrawingAttributes_get_Width_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Width_Proxy(
-    IInkDrawingAttributes* This,
-    float NewWidth);
-void __RPC_STUB IInkDrawingAttributes_put_Width_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Height_Proxy(
-    IInkDrawingAttributes* This,
-    float *CurrentHeight);
-void __RPC_STUB IInkDrawingAttributes_get_Height_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Height_Proxy(
-    IInkDrawingAttributes* This,
-    float NewHeight);
-void __RPC_STUB IInkDrawingAttributes_put_Height_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_FitToCurve_Proxy(
-    IInkDrawingAttributes* This,
-    VARIANT_BOOL *Flag);
-void __RPC_STUB IInkDrawingAttributes_get_FitToCurve_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_FitToCurve_Proxy(
-    IInkDrawingAttributes* This,
-    VARIANT_BOOL Flag);
-void __RPC_STUB IInkDrawingAttributes_put_FitToCurve_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_IgnorePressure_Proxy(
-    IInkDrawingAttributes* This,
-    VARIANT_BOOL *Flag);
-void __RPC_STUB IInkDrawingAttributes_get_IgnorePressure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_IgnorePressure_Proxy(
-    IInkDrawingAttributes* This,
-    VARIANT_BOOL Flag);
-void __RPC_STUB IInkDrawingAttributes_put_IgnorePressure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_AntiAliased_Proxy(
-    IInkDrawingAttributes* This,
-    VARIANT_BOOL *Flag);
-void __RPC_STUB IInkDrawingAttributes_get_AntiAliased_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_AntiAliased_Proxy(
-    IInkDrawingAttributes* This,
-    VARIANT_BOOL Flag);
-void __RPC_STUB IInkDrawingAttributes_put_AntiAliased_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_Transparency_Proxy(
-    IInkDrawingAttributes* This,
-    LONG *CurrentTransparency);
-void __RPC_STUB IInkDrawingAttributes_get_Transparency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_Transparency_Proxy(
-    IInkDrawingAttributes* This,
-    LONG NewTransparency);
-void __RPC_STUB IInkDrawingAttributes_put_Transparency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_RasterOperation_Proxy(
-    IInkDrawingAttributes* This,
-    InkRasterOperation *CurrentRasterOperation);
-void __RPC_STUB IInkDrawingAttributes_get_RasterOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_RasterOperation_Proxy(
-    IInkDrawingAttributes* This,
-    InkRasterOperation NewRasterOperation);
-void __RPC_STUB IInkDrawingAttributes_put_RasterOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_PenTip_Proxy(
-    IInkDrawingAttributes* This,
-    InkPenTip *CurrentPenTip);
-void __RPC_STUB IInkDrawingAttributes_get_PenTip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_put_PenTip_Proxy(
-    IInkDrawingAttributes* This,
-    InkPenTip NewPenTip);
-void __RPC_STUB IInkDrawingAttributes_put_PenTip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_get_ExtendedProperties_Proxy(
-    IInkDrawingAttributes* This,
-    IInkExtendedProperties **Properties);
-void __RPC_STUB IInkDrawingAttributes_get_ExtendedProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDrawingAttributes_Clone_Proxy(
-    IInkDrawingAttributes* This,
-    IInkDrawingAttributes **DrawingAttributes);
-void __RPC_STUB IInkDrawingAttributes_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkDrawingAttributes_INTERFACE_DEFINED__ */
 
@@ -1355,29 +1184,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkRectangle* This);
+        IInkRectangle *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkRectangle* This);
+        IInkRectangle *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1385,7 +1214,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1397,54 +1226,54 @@
 
     /*** IInkRectangle methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Top)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG *Units);
 
     HRESULT (STDMETHODCALLTYPE *put_Top)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG Units);
 
     HRESULT (STDMETHODCALLTYPE *get_Left)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG *Units);
 
     HRESULT (STDMETHODCALLTYPE *put_Left)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG Units);
 
     HRESULT (STDMETHODCALLTYPE *get_Bottom)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG *Units);
 
     HRESULT (STDMETHODCALLTYPE *put_Bottom)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG Units);
 
     HRESULT (STDMETHODCALLTYPE *get_Right)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG *Units);
 
     HRESULT (STDMETHODCALLTYPE *put_Right)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG Units);
 
     HRESULT (STDMETHODCALLTYPE *get_Data)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         RECT *Rect);
 
     HRESULT (STDMETHODCALLTYPE *put_Data)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         RECT Rect);
 
     HRESULT (STDMETHODCALLTYPE *GetRectangle)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG *Top,
         LONG *Left,
         LONG *Bottom,
         LONG *Right);
 
     HRESULT (STDMETHODCALLTYPE *SetRectangle)(
-        IInkRectangle* This,
+        IInkRectangle *This,
         LONG Top,
         LONG Left,
         LONG Bottom,
@@ -1452,6 +1281,7 @@
 
     END_INTERFACE
 } IInkRectangleVtbl;
+
 interface IInkRectangle {
     CONST_VTBL IInkRectangleVtbl* lpVtbl;
 };
@@ -1546,108 +1376,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkRectangle_get_Top_Proxy(
-    IInkRectangle* This,
-    LONG *Units);
-void __RPC_STUB IInkRectangle_get_Top_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_put_Top_Proxy(
-    IInkRectangle* This,
-    LONG Units);
-void __RPC_STUB IInkRectangle_put_Top_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_get_Left_Proxy(
-    IInkRectangle* This,
-    LONG *Units);
-void __RPC_STUB IInkRectangle_get_Left_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_put_Left_Proxy(
-    IInkRectangle* This,
-    LONG Units);
-void __RPC_STUB IInkRectangle_put_Left_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_get_Bottom_Proxy(
-    IInkRectangle* This,
-    LONG *Units);
-void __RPC_STUB IInkRectangle_get_Bottom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_put_Bottom_Proxy(
-    IInkRectangle* This,
-    LONG Units);
-void __RPC_STUB IInkRectangle_put_Bottom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_get_Right_Proxy(
-    IInkRectangle* This,
-    LONG *Units);
-void __RPC_STUB IInkRectangle_get_Right_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_put_Right_Proxy(
-    IInkRectangle* This,
-    LONG Units);
-void __RPC_STUB IInkRectangle_put_Right_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_get_Data_Proxy(
-    IInkRectangle* This,
-    RECT *Rect);
-void __RPC_STUB IInkRectangle_get_Data_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_put_Data_Proxy(
-    IInkRectangle* This,
-    RECT Rect);
-void __RPC_STUB IInkRectangle_put_Data_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_GetRectangle_Proxy(
-    IInkRectangle* This,
-    LONG *Top,
-    LONG *Left,
-    LONG *Bottom,
-    LONG *Right);
-void __RPC_STUB IInkRectangle_GetRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRectangle_SetRectangle_Proxy(
-    IInkRectangle* This,
-    LONG Top,
-    LONG Left,
-    LONG Bottom,
-    LONG Right);
-void __RPC_STUB IInkRectangle_SetRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkRectangle_INTERFACE_DEFINED__ */
 
@@ -1695,29 +1423,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkTablet* This,
+        IInkTablet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkTablet* This);
+        IInkTablet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkTablet* This);
+        IInkTablet *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkTablet* This,
+        IInkTablet *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkTablet* This,
+        IInkTablet *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkTablet* This,
+        IInkTablet *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1725,7 +1453,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkTablet* This,
+        IInkTablet *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1737,28 +1465,28 @@
 
     /*** IInkTablet methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IInkTablet* This,
+        IInkTablet *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_PlugAndPlayId)(
-        IInkTablet* This,
+        IInkTablet *This,
         BSTR *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_MaximumInputRectangle)(
-        IInkTablet* This,
+        IInkTablet *This,
         IInkRectangle **Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *get_HardwareCapabilities)(
-        IInkTablet* This,
+        IInkTablet *This,
         TabletHardwareCapabilities *Capabilities);
 
     HRESULT (STDMETHODCALLTYPE *IsPacketPropertySupported)(
-        IInkTablet* This,
+        IInkTablet *This,
         BSTR packetPropertyName,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyMetrics)(
-        IInkTablet* This,
+        IInkTablet *This,
         BSTR propertyName,
         LONG *Minimum,
         LONG *Maximum,
@@ -1767,6 +1495,7 @@
 
     END_INTERFACE
 } IInkTabletVtbl;
+
 interface IInkTablet {
     CONST_VTBL IInkTabletVtbl* lpVtbl;
 };
@@ -1837,59 +1566,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkTablet_get_Name_Proxy(
-    IInkTablet* This,
-    BSTR *Name);
-void __RPC_STUB IInkTablet_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTablet_get_PlugAndPlayId_Proxy(
-    IInkTablet* This,
-    BSTR *Id);
-void __RPC_STUB IInkTablet_get_PlugAndPlayId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTablet_get_MaximumInputRectangle_Proxy(
-    IInkTablet* This,
-    IInkRectangle **Rectangle);
-void __RPC_STUB IInkTablet_get_MaximumInputRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTablet_get_HardwareCapabilities_Proxy(
-    IInkTablet* This,
-    TabletHardwareCapabilities *Capabilities);
-void __RPC_STUB IInkTablet_get_HardwareCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTablet_IsPacketPropertySupported_Proxy(
-    IInkTablet* This,
-    BSTR packetPropertyName,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB IInkTablet_IsPacketPropertySupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTablet_GetPropertyMetrics_Proxy(
-    IInkTablet* This,
-    BSTR propertyName,
-    LONG *Minimum,
-    LONG *Maximum,
-    TabletPropertyMetricUnit *Units,
-    float *Resolution);
-void __RPC_STUB IInkTablet_GetPropertyMetrics_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkTablet_INTERFACE_DEFINED__ */
 
@@ -1923,29 +1599,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkCursorButton* This);
+        IInkCursorButton *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkCursorButton* This);
+        IInkCursorButton *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1953,7 +1629,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1965,19 +1641,20 @@
 
     /*** IInkCursorButton methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         BSTR *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        IInkCursorButton* This,
+        IInkCursorButton *This,
         InkCursorButtonState *CurrentState);
 
     END_INTERFACE
 } IInkCursorButtonVtbl;
+
 interface IInkCursorButton {
     CONST_VTBL IInkCursorButtonVtbl* lpVtbl;
 };
@@ -2036,30 +1713,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkCursorButton_get_Name_Proxy(
-    IInkCursorButton* This,
-    BSTR *Name);
-void __RPC_STUB IInkCursorButton_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursorButton_get_Id_Proxy(
-    IInkCursorButton* This,
-    BSTR *Id);
-void __RPC_STUB IInkCursorButton_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursorButton_get_State_Proxy(
-    IInkCursorButton* This,
-    InkCursorButtonState *CurrentState);
-void __RPC_STUB IInkCursorButton_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkCursorButton_INTERFACE_DEFINED__ */
 
@@ -2094,29 +1747,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkCursorButtons* This);
+        IInkCursorButtons *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkCursorButtons* This);
+        IInkCursorButtons *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2124,7 +1777,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2136,20 +1789,21 @@
 
     /*** IInkCursorButtons methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         IUnknown **_NewEnum);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IInkCursorButtons* This,
+        IInkCursorButtons *This,
         VARIANT Identifier,
         IInkCursorButton **Button);
 
     END_INTERFACE
 } IInkCursorButtonsVtbl;
+
 interface IInkCursorButtons {
     CONST_VTBL IInkCursorButtonsVtbl* lpVtbl;
 };
@@ -2208,31 +1862,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkCursorButtons_get_Count_Proxy(
-    IInkCursorButtons* This,
-    LONG *Count);
-void __RPC_STUB IInkCursorButtons_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursorButtons_get__NewEnum_Proxy(
-    IInkCursorButtons* This,
-    IUnknown **_NewEnum);
-void __RPC_STUB IInkCursorButtons_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursorButtons_Item_Proxy(
-    IInkCursorButtons* This,
-    VARIANT Identifier,
-    IInkCursorButton **Button);
-void __RPC_STUB IInkCursorButtons_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkCursorButtons_INTERFACE_DEFINED__ */
 
@@ -2278,29 +1907,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkCursor* This,
+        IInkCursor *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkCursor* This);
+        IInkCursor *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkCursor* This);
+        IInkCursor *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkCursor* This,
+        IInkCursor *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkCursor* This,
+        IInkCursor *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkCursor* This,
+        IInkCursor *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2308,7 +1937,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkCursor* This,
+        IInkCursor *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2320,35 +1949,36 @@
 
     /*** IInkCursor methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IInkCursor* This,
+        IInkCursor *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IInkCursor* This,
+        IInkCursor *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_Inverted)(
-        IInkCursor* This,
+        IInkCursor *This,
         VARIANT_BOOL *Status);
 
     HRESULT (STDMETHODCALLTYPE *get_DrawingAttributes)(
-        IInkCursor* This,
+        IInkCursor *This,
         IInkDrawingAttributes **Attributes);
 
     HRESULT (STDMETHODCALLTYPE *putref_DrawingAttributes)(
-        IInkCursor* This,
+        IInkCursor *This,
         IInkDrawingAttributes *Attributes);
 
     HRESULT (STDMETHODCALLTYPE *get_Tablet)(
-        IInkCursor* This,
+        IInkCursor *This,
         IInkTablet **Tablet);
 
     HRESULT (STDMETHODCALLTYPE *get_Buttons)(
-        IInkCursor* This,
+        IInkCursor *This,
         IInkCursorButtons **Buttons);
 
     END_INTERFACE
 } IInkCursorVtbl;
+
 interface IInkCursor {
     CONST_VTBL IInkCursorVtbl* lpVtbl;
 };
@@ -2423,62 +2053,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkCursor_get_Name_Proxy(
-    IInkCursor* This,
-    BSTR *Name);
-void __RPC_STUB IInkCursor_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursor_get_Id_Proxy(
-    IInkCursor* This,
-    LONG *Id);
-void __RPC_STUB IInkCursor_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursor_get_Inverted_Proxy(
-    IInkCursor* This,
-    VARIANT_BOOL *Status);
-void __RPC_STUB IInkCursor_get_Inverted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursor_get_DrawingAttributes_Proxy(
-    IInkCursor* This,
-    IInkDrawingAttributes **Attributes);
-void __RPC_STUB IInkCursor_get_DrawingAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursor_putref_DrawingAttributes_Proxy(
-    IInkCursor* This,
-    IInkDrawingAttributes *Attributes);
-void __RPC_STUB IInkCursor_putref_DrawingAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursor_get_Tablet_Proxy(
-    IInkCursor* This,
-    IInkTablet **Tablet);
-void __RPC_STUB IInkCursor_get_Tablet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursor_get_Buttons_Proxy(
-    IInkCursor* This,
-    IInkCursorButtons **Buttons);
-void __RPC_STUB IInkCursor_get_Buttons_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkCursor_INTERFACE_DEFINED__ */
 
@@ -2585,29 +2159,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkTransform* This,
+        IInkTransform *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkTransform* This);
+        IInkTransform *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkTransform* This);
+        IInkTransform *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkTransform* This,
+        IInkTransform *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkTransform* This,
+        IInkTransform *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkTransform* This,
+        IInkTransform *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2615,7 +2189,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkTransform* This,
+        IInkTransform *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2627,36 +2201,36 @@
 
     /*** IInkTransform methods ***/
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IInkTransform* This);
+        IInkTransform *This);
 
     HRESULT (STDMETHODCALLTYPE *Translate)(
-        IInkTransform* This,
+        IInkTransform *This,
         float HorizontalComponent,
         float VerticalComponent);
 
     HRESULT (STDMETHODCALLTYPE *Rotate)(
-        IInkTransform* This,
+        IInkTransform *This,
         float Degrees,
         float x,
         float y);
 
     HRESULT (STDMETHODCALLTYPE *Reflect)(
-        IInkTransform* This,
+        IInkTransform *This,
         VARIANT_BOOL Horizontally,
         VARIANT_BOOL Vertically);
 
     HRESULT (STDMETHODCALLTYPE *Shear)(
-        IInkTransform* This,
+        IInkTransform *This,
         float HorizontalComponent,
         float VerticalComponent);
 
     HRESULT (STDMETHODCALLTYPE *ScaleTransform)(
-        IInkTransform* This,
+        IInkTransform *This,
         float HorizontalMultiplier,
         float VerticalMultiplier);
 
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IInkTransform* This,
+        IInkTransform *This,
         float *eM11,
         float *eM12,
         float *eM21,
@@ -2665,7 +2239,7 @@
         float *eDy);
 
     HRESULT (STDMETHODCALLTYPE *SetTransform)(
-        IInkTransform* This,
+        IInkTransform *This,
         float eM11,
         float eM12,
         float eM21,
@@ -2674,63 +2248,64 @@
         float eDy);
 
     HRESULT (STDMETHODCALLTYPE *get_eM11)(
-        IInkTransform* This,
+        IInkTransform *This,
         float *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_eM11)(
-        IInkTransform* This,
+        IInkTransform *This,
         float Value);
 
     HRESULT (STDMETHODCALLTYPE *get_eM12)(
-        IInkTransform* This,
+        IInkTransform *This,
         float *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_eM12)(
-        IInkTransform* This,
+        IInkTransform *This,
         float Value);
 
     HRESULT (STDMETHODCALLTYPE *get_eM21)(
-        IInkTransform* This,
+        IInkTransform *This,
         float *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_eM21)(
-        IInkTransform* This,
+        IInkTransform *This,
         float Value);
 
     HRESULT (STDMETHODCALLTYPE *get_eM22)(
-        IInkTransform* This,
+        IInkTransform *This,
         float *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_eM22)(
-        IInkTransform* This,
+        IInkTransform *This,
         float Value);
 
     HRESULT (STDMETHODCALLTYPE *get_eDx)(
-        IInkTransform* This,
+        IInkTransform *This,
         float *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_eDx)(
-        IInkTransform* This,
+        IInkTransform *This,
         float Value);
 
     HRESULT (STDMETHODCALLTYPE *get_eDy)(
-        IInkTransform* This,
+        IInkTransform *This,
         float *Value);
 
     HRESULT (STDMETHODCALLTYPE *put_eDy)(
-        IInkTransform* This,
+        IInkTransform *This,
         float Value);
 
     HRESULT (STDMETHODCALLTYPE *get_Data)(
-        IInkTransform* This,
+        IInkTransform *This,
         XFORM *XForm);
 
     HRESULT (STDMETHODCALLTYPE *put_Data)(
-        IInkTransform* This,
+        IInkTransform *This,
         XFORM XForm);
 
     END_INTERFACE
 } IInkTransformVtbl;
+
 interface IInkTransform {
     CONST_VTBL IInkTransformVtbl* lpVtbl;
 };
@@ -2865,197 +2440,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkTransform_Reset_Proxy(
-    IInkTransform* This);
-void __RPC_STUB IInkTransform_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_Translate_Proxy(
-    IInkTransform* This,
-    float HorizontalComponent,
-    float VerticalComponent);
-void __RPC_STUB IInkTransform_Translate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_Rotate_Proxy(
-    IInkTransform* This,
-    float Degrees,
-    float x,
-    float y);
-void __RPC_STUB IInkTransform_Rotate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_Reflect_Proxy(
-    IInkTransform* This,
-    VARIANT_BOOL Horizontally,
-    VARIANT_BOOL Vertically);
-void __RPC_STUB IInkTransform_Reflect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_Shear_Proxy(
-    IInkTransform* This,
-    float HorizontalComponent,
-    float VerticalComponent);
-void __RPC_STUB IInkTransform_Shear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_ScaleTransform_Proxy(
-    IInkTransform* This,
-    float HorizontalMultiplier,
-    float VerticalMultiplier);
-void __RPC_STUB IInkTransform_ScaleTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_GetTransform_Proxy(
-    IInkTransform* This,
-    float *eM11,
-    float *eM12,
-    float *eM21,
-    float *eM22,
-    float *eDx,
-    float *eDy);
-void __RPC_STUB IInkTransform_GetTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_SetTransform_Proxy(
-    IInkTransform* This,
-    float eM11,
-    float eM12,
-    float eM21,
-    float eM22,
-    float eDx,
-    float eDy);
-void __RPC_STUB IInkTransform_SetTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_get_eM11_Proxy(
-    IInkTransform* This,
-    float *Value);
-void __RPC_STUB IInkTransform_get_eM11_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_put_eM11_Proxy(
-    IInkTransform* This,
-    float Value);
-void __RPC_STUB IInkTransform_put_eM11_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_get_eM12_Proxy(
-    IInkTransform* This,
-    float *Value);
-void __RPC_STUB IInkTransform_get_eM12_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_put_eM12_Proxy(
-    IInkTransform* This,
-    float Value);
-void __RPC_STUB IInkTransform_put_eM12_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_get_eM21_Proxy(
-    IInkTransform* This,
-    float *Value);
-void __RPC_STUB IInkTransform_get_eM21_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_put_eM21_Proxy(
-    IInkTransform* This,
-    float Value);
-void __RPC_STUB IInkTransform_put_eM21_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_get_eM22_Proxy(
-    IInkTransform* This,
-    float *Value);
-void __RPC_STUB IInkTransform_get_eM22_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_put_eM22_Proxy(
-    IInkTransform* This,
-    float Value);
-void __RPC_STUB IInkTransform_put_eM22_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_get_eDx_Proxy(
-    IInkTransform* This,
-    float *Value);
-void __RPC_STUB IInkTransform_get_eDx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_put_eDx_Proxy(
-    IInkTransform* This,
-    float Value);
-void __RPC_STUB IInkTransform_put_eDx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_get_eDy_Proxy(
-    IInkTransform* This,
-    float *Value);
-void __RPC_STUB IInkTransform_get_eDy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_put_eDy_Proxy(
-    IInkTransform* This,
-    float Value);
-void __RPC_STUB IInkTransform_put_eDy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_get_Data_Proxy(
-    IInkTransform* This,
-    XFORM *XForm);
-void __RPC_STUB IInkTransform_get_Data_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkTransform_put_Data_Proxy(
-    IInkTransform* This,
-    XFORM XForm);
-void __RPC_STUB IInkTransform_put_Data_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkTransform_INTERFACE_DEFINED__ */
 
@@ -3093,29 +2477,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkRecognitionAlternates* This);
+        IInkRecognitionAlternates *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkRecognitionAlternates* This);
+        IInkRecognitionAlternates *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3123,7 +2507,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3135,24 +2519,25 @@
 
     /*** IInkRecognitionAlternates methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         IUnknown **_NewEnum);
 
     HRESULT (STDMETHODCALLTYPE *get_Strokes)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IInkRecognitionAlternates* This,
+        IInkRecognitionAlternates *This,
         LONG Index,
         IInkRecognitionAlternate **InkRecoAlternate);
 
     END_INTERFACE
 } IInkRecognitionAlternatesVtbl;
+
 interface IInkRecognitionAlternates {
     CONST_VTBL IInkRecognitionAlternatesVtbl* lpVtbl;
 };
@@ -3215,39 +2600,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_get_Count_Proxy(
-    IInkRecognitionAlternates* This,
-    LONG *Count);
-void __RPC_STUB IInkRecognitionAlternates_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_get__NewEnum_Proxy(
-    IInkRecognitionAlternates* This,
-    IUnknown **_NewEnum);
-void __RPC_STUB IInkRecognitionAlternates_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_get_Strokes_Proxy(
-    IInkRecognitionAlternates* This,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkRecognitionAlternates_get_Strokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternates_Item_Proxy(
-    IInkRecognitionAlternates* This,
-    LONG Index,
-    IInkRecognitionAlternate **InkRecoAlternate);
-void __RPC_STUB IInkRecognitionAlternates_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkRecognitionAlternates_INTERFACE_DEFINED__ */
 
@@ -3324,29 +2676,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkRecognitionAlternate* This);
+        IInkRecognitionAlternate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkRecognitionAlternate* This);
+        IInkRecognitionAlternate *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3354,7 +2706,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3366,74 +2718,75 @@
 
     /*** IInkRecognitionAlternate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_String)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         BSTR *RecoString);
 
     HRESULT (STDMETHODCALLTYPE *get_Confidence)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         InkRecognitionConfidence *Confidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Baseline)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         VARIANT *Baseline);
 
     HRESULT (STDMETHODCALLTYPE *get_Midline)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         VARIANT *Midline);
 
     HRESULT (STDMETHODCALLTYPE *get_Ascender)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         VARIANT *Ascender);
 
     HRESULT (STDMETHODCALLTYPE *get_Descender)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         VARIANT *Descender);
 
     HRESULT (STDMETHODCALLTYPE *get_LineNumber)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         LONG *LineNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_Strokes)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *get_LineAlternates)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         IInkRecognitionAlternates **LineAlternates);
 
     HRESULT (STDMETHODCALLTYPE *get_ConfidenceAlternates)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         IInkRecognitionAlternates **ConfidenceAlternates);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokesFromStrokeRanges)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         IInkStrokes *Strokes,
         IInkStrokes **GetStrokesFromStrokeRanges);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokesFromTextRange)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         LONG *selectionStart,
         LONG *selectionLength,
         IInkStrokes **GetStrokesFromTextRange);
 
     HRESULT (STDMETHODCALLTYPE *GetTextRangeFromStrokes)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         IInkStrokes *Strokes,
         LONG *selectionStart,
         LONG *selectionLength);
 
     HRESULT (STDMETHODCALLTYPE *AlternatesWithConstantPropertyValues)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         BSTR PropertyType,
         IInkRecognitionAlternates **AlternatesWithConstantPropertyValues);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyValue)(
-        IInkRecognitionAlternate* This,
+        IInkRecognitionAlternate *This,
         BSTR PropertyType,
         VARIANT *PropertyValue);
 
     END_INTERFACE
 } IInkRecognitionAlternateVtbl;
+
 interface IInkRecognitionAlternate {
     CONST_VTBL IInkRecognitionAlternateVtbl* lpVtbl;
 };
@@ -3540,133 +2893,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_String_Proxy(
-    IInkRecognitionAlternate* This,
-    BSTR *RecoString);
-void __RPC_STUB IInkRecognitionAlternate_get_String_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Confidence_Proxy(
-    IInkRecognitionAlternate* This,
-    InkRecognitionConfidence *Confidence);
-void __RPC_STUB IInkRecognitionAlternate_get_Confidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Baseline_Proxy(
-    IInkRecognitionAlternate* This,
-    VARIANT *Baseline);
-void __RPC_STUB IInkRecognitionAlternate_get_Baseline_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Midline_Proxy(
-    IInkRecognitionAlternate* This,
-    VARIANT *Midline);
-void __RPC_STUB IInkRecognitionAlternate_get_Midline_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Ascender_Proxy(
-    IInkRecognitionAlternate* This,
-    VARIANT *Ascender);
-void __RPC_STUB IInkRecognitionAlternate_get_Ascender_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Descender_Proxy(
-    IInkRecognitionAlternate* This,
-    VARIANT *Descender);
-void __RPC_STUB IInkRecognitionAlternate_get_Descender_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_LineNumber_Proxy(
-    IInkRecognitionAlternate* This,
-    LONG *LineNumber);
-void __RPC_STUB IInkRecognitionAlternate_get_LineNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_Strokes_Proxy(
-    IInkRecognitionAlternate* This,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkRecognitionAlternate_get_Strokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_LineAlternates_Proxy(
-    IInkRecognitionAlternate* This,
-    IInkRecognitionAlternates **LineAlternates);
-void __RPC_STUB IInkRecognitionAlternate_get_LineAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_get_ConfidenceAlternates_Proxy(
-    IInkRecognitionAlternate* This,
-    IInkRecognitionAlternates **ConfidenceAlternates);
-void __RPC_STUB IInkRecognitionAlternate_get_ConfidenceAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetStrokesFromStrokeRanges_Proxy(
-    IInkRecognitionAlternate* This,
-    IInkStrokes *Strokes,
-    IInkStrokes **GetStrokesFromStrokeRanges);
-void __RPC_STUB IInkRecognitionAlternate_GetStrokesFromStrokeRanges_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetStrokesFromTextRange_Proxy(
-    IInkRecognitionAlternate* This,
-    LONG *selectionStart,
-    LONG *selectionLength,
-    IInkStrokes **GetStrokesFromTextRange);
-void __RPC_STUB IInkRecognitionAlternate_GetStrokesFromTextRange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetTextRangeFromStrokes_Proxy(
-    IInkRecognitionAlternate* This,
-    IInkStrokes *Strokes,
-    LONG *selectionStart,
-    LONG *selectionLength);
-void __RPC_STUB IInkRecognitionAlternate_GetTextRangeFromStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_AlternatesWithConstantPropertyValues_Proxy(
-    IInkRecognitionAlternate* This,
-    BSTR PropertyType,
-    IInkRecognitionAlternates **AlternatesWithConstantPropertyValues);
-void __RPC_STUB IInkRecognitionAlternate_AlternatesWithConstantPropertyValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionAlternate_GetPropertyValue_Proxy(
-    IInkRecognitionAlternate* This,
-    BSTR PropertyType,
-    VARIANT *PropertyValue);
-void __RPC_STUB IInkRecognitionAlternate_GetPropertyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkRecognitionAlternate_INTERFACE_DEFINED__ */
 
@@ -3715,29 +2941,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkRecognitionResult* This);
+        IInkRecognitionResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkRecognitionResult* This);
+        IInkRecognitionResult *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3745,7 +2971,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3757,37 +2983,38 @@
 
     /*** IInkRecognitionResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_TopString)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         BSTR *TopString);
 
     HRESULT (STDMETHODCALLTYPE *get_TopAlternate)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         IInkRecognitionAlternate **TopAlternate);
 
     HRESULT (STDMETHODCALLTYPE *get_TopConfidence)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         InkRecognitionConfidence *TopConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Strokes)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *AlternatesFromSelection)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         LONG selectionStart,
         LONG selectionLength,
         LONG maximumAlternates,
         IInkRecognitionAlternates **AlternatesFromSelection);
 
     HRESULT (STDMETHODCALLTYPE *ModifyTopAlternate)(
-        IInkRecognitionResult* This,
+        IInkRecognitionResult *This,
         IInkRecognitionAlternate *Alternate);
 
     HRESULT (STDMETHODCALLTYPE *SetResultOnStrokes)(
-        IInkRecognitionResult* This);
+        IInkRecognitionResult *This);
 
     END_INTERFACE
 } IInkRecognitionResultVtbl;
+
 interface IInkRecognitionResult {
     CONST_VTBL IInkRecognitionResultVtbl* lpVtbl;
 };
@@ -3862,64 +3089,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_TopString_Proxy(
-    IInkRecognitionResult* This,
-    BSTR *TopString);
-void __RPC_STUB IInkRecognitionResult_get_TopString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_TopAlternate_Proxy(
-    IInkRecognitionResult* This,
-    IInkRecognitionAlternate **TopAlternate);
-void __RPC_STUB IInkRecognitionResult_get_TopAlternate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_TopConfidence_Proxy(
-    IInkRecognitionResult* This,
-    InkRecognitionConfidence *TopConfidence);
-void __RPC_STUB IInkRecognitionResult_get_TopConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionResult_get_Strokes_Proxy(
-    IInkRecognitionResult* This,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkRecognitionResult_get_Strokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionResult_AlternatesFromSelection_Proxy(
-    IInkRecognitionResult* This,
-    LONG selectionStart,
-    LONG selectionLength,
-    LONG maximumAlternates,
-    IInkRecognitionAlternates **AlternatesFromSelection);
-void __RPC_STUB IInkRecognitionResult_AlternatesFromSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionResult_ModifyTopAlternate_Proxy(
-    IInkRecognitionResult* This,
-    IInkRecognitionAlternate *Alternate);
-void __RPC_STUB IInkRecognitionResult_ModifyTopAlternate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRecognitionResult_SetResultOnStrokes_Proxy(
-    IInkRecognitionResult* This);
-void __RPC_STUB IInkRecognitionResult_SetResultOnStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkRecognitionResult_INTERFACE_DEFINED__ */
 
@@ -4078,29 +3247,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkStrokeDisp* This);
+        IInkStrokeDisp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkStrokeDisp* This);
+        IInkStrokeDisp *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4108,7 +3277,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4120,97 +3289,97 @@
 
     /*** IInkStrokeDisp methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ID)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG *ID);
 
     HRESULT (STDMETHODCALLTYPE *get_BezierPoints)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         VARIANT *Points);
 
     HRESULT (STDMETHODCALLTYPE *get_DrawingAttributes)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkDrawingAttributes **DrawAttrs);
 
     HRESULT (STDMETHODCALLTYPE *putref_DrawingAttributes)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkDrawingAttributes *DrawAttrs);
 
     HRESULT (STDMETHODCALLTYPE *get_Ink)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkDisp **Ink);
 
     HRESULT (STDMETHODCALLTYPE *get_ExtendedProperties)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkExtendedProperties **Properties);
 
     HRESULT (STDMETHODCALLTYPE *get_PolylineCusps)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         VARIANT *Cusps);
 
     HRESULT (STDMETHODCALLTYPE *get_BezierCusps)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         VARIANT *Cusps);
 
     HRESULT (STDMETHODCALLTYPE *get_SelfIntersections)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         VARIANT *Intersections);
 
     HRESULT (STDMETHODCALLTYPE *get_PacketCount)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG *plCount);
 
     HRESULT (STDMETHODCALLTYPE *get_PacketSize)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG *plSize);
 
     HRESULT (STDMETHODCALLTYPE *get_PacketDescription)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         VARIANT *PacketDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_Deleted)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         VARIANT_BOOL *Deleted);
 
     HRESULT (STDMETHODCALLTYPE *GetBoundingBox)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         InkBoundingBoxMode BoundingBoxMode,
         IInkRectangle **Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *FindIntersections)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkStrokes *Strokes,
         VARIANT *Intersections);
 
     HRESULT (STDMETHODCALLTYPE *GetRectangleIntersections)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkRectangle *Rectangle,
         VARIANT *Intersections);
 
     HRESULT (STDMETHODCALLTYPE *Clip)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkRectangle *Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *HitTestCircle)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG X,
         LONG Y,
         float Radius,
         VARIANT_BOOL *Intersects);
 
     HRESULT (STDMETHODCALLTYPE *NearestPoint)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG X,
         LONG Y,
         float *Distance,
         float *Point);
 
     HRESULT (STDMETHODCALLTYPE *Split)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         float SplitAt,
         IInkStrokeDisp **NewStroke);
 
     HRESULT (STDMETHODCALLTYPE *GetPacketDescriptionPropertyMetrics)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         BSTR PropertyName,
         LONG *Minimum,
         LONG *Maximum,
@@ -4218,33 +3387,33 @@
         float *Resolution);
 
     HRESULT (STDMETHODCALLTYPE *GetPoints)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG Index,
         LONG Count,
         VARIANT *Points);
 
     HRESULT (STDMETHODCALLTYPE *SetPoints)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         VARIANT Points,
         LONG Index,
         LONG Count,
         LONG *NumberOfPointsSet);
 
     HRESULT (STDMETHODCALLTYPE *GetPacketData)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG Index,
         LONG Count,
         VARIANT *PacketData);
 
     HRESULT (STDMETHODCALLTYPE *GetPacketValuesByProperty)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         BSTR PropertyName,
         LONG Index,
         LONG Count,
         VARIANT *PacketValues);
 
     HRESULT (STDMETHODCALLTYPE *SetPacketValuesByProperty)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         BSTR bstrPropertyName,
         VARIANT PacketValues,
         LONG Index,
@@ -4252,42 +3421,43 @@
         LONG *NumberOfPacketsSet);
 
     HRESULT (STDMETHODCALLTYPE *GetFlattenedBezierPoints)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         LONG FittingError,
         VARIANT *FlattenedBezierPoints);
 
     HRESULT (STDMETHODCALLTYPE *Transform)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkTransform *Transform,
         VARIANT_BOOL ApplyOnPenWidth);
 
     HRESULT (STDMETHODCALLTYPE *ScaleToRectangle)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         IInkRectangle *Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *Move)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         float HorizontalComponent,
         float VerticalComponent);
 
     HRESULT (STDMETHODCALLTYPE *Rotate)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         float Degrees,
         float x,
         float y);
 
     HRESULT (STDMETHODCALLTYPE *Shear)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         float HorizontalMultiplier,
         float VerticalMultiplier);
 
     HRESULT (STDMETHODCALLTYPE *ScaleTransform)(
-        IInkStrokeDisp* This,
+        IInkStrokeDisp *This,
         float HorizontalMultiplier,
         float VerticalMultiplier);
 
     END_INTERFACE
 } IInkStrokeDispVtbl;
+
 interface IInkStrokeDisp {
     CONST_VTBL IInkStrokeDispVtbl* lpVtbl;
 };
@@ -4466,305 +3636,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_ID_Proxy(
-    IInkStrokeDisp* This,
-    LONG *ID);
-void __RPC_STUB IInkStrokeDisp_get_ID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_BezierPoints_Proxy(
-    IInkStrokeDisp* This,
-    VARIANT *Points);
-void __RPC_STUB IInkStrokeDisp_get_BezierPoints_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_DrawingAttributes_Proxy(
-    IInkStrokeDisp* This,
-    IInkDrawingAttributes **DrawAttrs);
-void __RPC_STUB IInkStrokeDisp_get_DrawingAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_putref_DrawingAttributes_Proxy(
-    IInkStrokeDisp* This,
-    IInkDrawingAttributes *DrawAttrs);
-void __RPC_STUB IInkStrokeDisp_putref_DrawingAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_Ink_Proxy(
-    IInkStrokeDisp* This,
-    IInkDisp **Ink);
-void __RPC_STUB IInkStrokeDisp_get_Ink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_ExtendedProperties_Proxy(
-    IInkStrokeDisp* This,
-    IInkExtendedProperties **Properties);
-void __RPC_STUB IInkStrokeDisp_get_ExtendedProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PolylineCusps_Proxy(
-    IInkStrokeDisp* This,
-    VARIANT *Cusps);
-void __RPC_STUB IInkStrokeDisp_get_PolylineCusps_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_BezierCusps_Proxy(
-    IInkStrokeDisp* This,
-    VARIANT *Cusps);
-void __RPC_STUB IInkStrokeDisp_get_BezierCusps_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_SelfIntersections_Proxy(
-    IInkStrokeDisp* This,
-    VARIANT *Intersections);
-void __RPC_STUB IInkStrokeDisp_get_SelfIntersections_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PacketCount_Proxy(
-    IInkStrokeDisp* This,
-    LONG *plCount);
-void __RPC_STUB IInkStrokeDisp_get_PacketCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PacketSize_Proxy(
-    IInkStrokeDisp* This,
-    LONG *plSize);
-void __RPC_STUB IInkStrokeDisp_get_PacketSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_PacketDescription_Proxy(
-    IInkStrokeDisp* This,
-    VARIANT *PacketDescription);
-void __RPC_STUB IInkStrokeDisp_get_PacketDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_get_Deleted_Proxy(
-    IInkStrokeDisp* This,
-    VARIANT_BOOL *Deleted);
-void __RPC_STUB IInkStrokeDisp_get_Deleted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetBoundingBox_Proxy(
-    IInkStrokeDisp* This,
-    InkBoundingBoxMode BoundingBoxMode,
-    IInkRectangle **Rectangle);
-void __RPC_STUB IInkStrokeDisp_GetBoundingBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_FindIntersections_Proxy(
-    IInkStrokeDisp* This,
-    IInkStrokes *Strokes,
-    VARIANT *Intersections);
-void __RPC_STUB IInkStrokeDisp_FindIntersections_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetRectangleIntersections_Proxy(
-    IInkStrokeDisp* This,
-    IInkRectangle *Rectangle,
-    VARIANT *Intersections);
-void __RPC_STUB IInkStrokeDisp_GetRectangleIntersections_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Clip_Proxy(
-    IInkStrokeDisp* This,
-    IInkRectangle *Rectangle);
-void __RPC_STUB IInkStrokeDisp_Clip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_HitTestCircle_Proxy(
-    IInkStrokeDisp* This,
-    LONG X,
-    LONG Y,
-    float Radius,
-    VARIANT_BOOL *Intersects);
-void __RPC_STUB IInkStrokeDisp_HitTestCircle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_NearestPoint_Proxy(
-    IInkStrokeDisp* This,
-    LONG X,
-    LONG Y,
-    float *Distance,
-    float *Point);
-void __RPC_STUB IInkStrokeDisp_NearestPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Split_Proxy(
-    IInkStrokeDisp* This,
-    float SplitAt,
-    IInkStrokeDisp **NewStroke);
-void __RPC_STUB IInkStrokeDisp_Split_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPacketDescriptionPropertyMetrics_Proxy(
-    IInkStrokeDisp* This,
-    BSTR PropertyName,
-    LONG *Minimum,
-    LONG *Maximum,
-    TabletPropertyMetricUnit *Units,
-    float *Resolution);
-void __RPC_STUB IInkStrokeDisp_GetPacketDescriptionPropertyMetrics_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPoints_Proxy(
-    IInkStrokeDisp* This,
-    LONG Index,
-    LONG Count,
-    VARIANT *Points);
-void __RPC_STUB IInkStrokeDisp_GetPoints_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_SetPoints_Proxy(
-    IInkStrokeDisp* This,
-    VARIANT Points,
-    LONG Index,
-    LONG Count,
-    LONG *NumberOfPointsSet);
-void __RPC_STUB IInkStrokeDisp_SetPoints_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPacketData_Proxy(
-    IInkStrokeDisp* This,
-    LONG Index,
-    LONG Count,
-    VARIANT *PacketData);
-void __RPC_STUB IInkStrokeDisp_GetPacketData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetPacketValuesByProperty_Proxy(
-    IInkStrokeDisp* This,
-    BSTR PropertyName,
-    LONG Index,
-    LONG Count,
-    VARIANT *PacketValues);
-void __RPC_STUB IInkStrokeDisp_GetPacketValuesByProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_SetPacketValuesByProperty_Proxy(
-    IInkStrokeDisp* This,
-    BSTR bstrPropertyName,
-    VARIANT PacketValues,
-    LONG Index,
-    LONG Count,
-    LONG *NumberOfPacketsSet);
-void __RPC_STUB IInkStrokeDisp_SetPacketValuesByProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_GetFlattenedBezierPoints_Proxy(
-    IInkStrokeDisp* This,
-    LONG FittingError,
-    VARIANT *FlattenedBezierPoints);
-void __RPC_STUB IInkStrokeDisp_GetFlattenedBezierPoints_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Transform_Proxy(
-    IInkStrokeDisp* This,
-    IInkTransform *Transform,
-    VARIANT_BOOL ApplyOnPenWidth);
-void __RPC_STUB IInkStrokeDisp_Transform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_ScaleToRectangle_Proxy(
-    IInkStrokeDisp* This,
-    IInkRectangle *Rectangle);
-void __RPC_STUB IInkStrokeDisp_ScaleToRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Move_Proxy(
-    IInkStrokeDisp* This,
-    float HorizontalComponent,
-    float VerticalComponent);
-void __RPC_STUB IInkStrokeDisp_Move_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Rotate_Proxy(
-    IInkStrokeDisp* This,
-    float Degrees,
-    float x,
-    float y);
-void __RPC_STUB IInkStrokeDisp_Rotate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_Shear_Proxy(
-    IInkStrokeDisp* This,
-    float HorizontalMultiplier,
-    float VerticalMultiplier);
-void __RPC_STUB IInkStrokeDisp_Shear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokeDisp_ScaleTransform_Proxy(
-    IInkStrokeDisp* This,
-    float HorizontalMultiplier,
-    float VerticalMultiplier);
-void __RPC_STUB IInkStrokeDisp_ScaleTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkStrokeDisp_INTERFACE_DEFINED__ */
 
@@ -4809,29 +3680,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkCustomStrokes* This);
+        IInkCustomStrokes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkCustomStrokes* This);
+        IInkCustomStrokes *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4839,7 +3710,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4851,32 +3722,33 @@
 
     /*** IInkCustomStrokes methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         IUnknown **_NewEnum);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         VARIANT Identifier,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         BSTR Name,
         IInkStrokes *Strokes);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IInkCustomStrokes* This,
+        IInkCustomStrokes *This,
         VARIANT Identifier);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        IInkCustomStrokes* This);
+        IInkCustomStrokes *This);
 
     END_INTERFACE
 } IInkCustomStrokesVtbl;
+
 interface IInkCustomStrokes {
     CONST_VTBL IInkCustomStrokesVtbl* lpVtbl;
 };
@@ -4947,55 +3819,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkCustomStrokes_get_Count_Proxy(
-    IInkCustomStrokes* This,
-    LONG *Count);
-void __RPC_STUB IInkCustomStrokes_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCustomStrokes_get__NewEnum_Proxy(
-    IInkCustomStrokes* This,
-    IUnknown **_NewEnum);
-void __RPC_STUB IInkCustomStrokes_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Item_Proxy(
-    IInkCustomStrokes* This,
-    VARIANT Identifier,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkCustomStrokes_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Add_Proxy(
-    IInkCustomStrokes* This,
-    BSTR Name,
-    IInkStrokes *Strokes);
-void __RPC_STUB IInkCustomStrokes_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Remove_Proxy(
-    IInkCustomStrokes* This,
-    VARIANT Identifier);
-void __RPC_STUB IInkCustomStrokes_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCustomStrokes_Clear_Proxy(
-    IInkCustomStrokes* This);
-void __RPC_STUB IInkCustomStrokes_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkCustomStrokes_INTERFACE_DEFINED__ */
 
@@ -5128,29 +3951,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkDisp* This,
+        IInkDisp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkDisp* This);
+        IInkDisp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkDisp* This);
+        IInkDisp *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkDisp* This,
+        IInkDisp *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkDisp* This,
+        IInkDisp *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkDisp* This,
+        IInkDisp *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5158,7 +3981,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkDisp* This,
+        IInkDisp *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5170,80 +3993,80 @@
 
     /*** IInkDisp methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Strokes)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *get_ExtendedProperties)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkExtendedProperties **Properties);
 
     HRESULT (STDMETHODCALLTYPE *get_Dirty)(
-        IInkDisp* This,
+        IInkDisp *This,
         VARIANT_BOOL *Dirty);
 
     HRESULT (STDMETHODCALLTYPE *put_Dirty)(
-        IInkDisp* This,
+        IInkDisp *This,
         VARIANT_BOOL Dirty);
 
     HRESULT (STDMETHODCALLTYPE *get_CustomStrokes)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkCustomStrokes **ppunkInkCustomStrokes);
 
     HRESULT (STDMETHODCALLTYPE *GetBoundingBox)(
-        IInkDisp* This,
+        IInkDisp *This,
         InkBoundingBoxMode BoundingBoxMode,
         IInkRectangle **Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *DeleteStrokes)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkStrokes *Strokes);
 
     HRESULT (STDMETHODCALLTYPE *DeleteStroke)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkStrokeDisp *Stroke);
 
     HRESULT (STDMETHODCALLTYPE *ExtractStrokes)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkStrokes *Strokes,
         InkExtractFlags ExtractFlags,
         IInkDisp **ExtractedInk);
 
     HRESULT (STDMETHODCALLTYPE *ExtractWithRectangle)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkRectangle *Rectangle,
         InkExtractFlags extractFlags,
         IInkDisp **ExtractedInk);
 
     HRESULT (STDMETHODCALLTYPE *Clip)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkRectangle *Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkDisp **NewInk);
 
     HRESULT (STDMETHODCALLTYPE *HitTestCircle)(
-        IInkDisp* This,
+        IInkDisp *This,
         LONG X,
         LONG Y,
         float radius,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *HitTestWithRectangle)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkRectangle *SelectionRectangle,
         float IntersectPercent,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *HitTestWithLasso)(
-        IInkDisp* This,
+        IInkDisp *This,
         VARIANT Points,
         float IntersectPercent,
         VARIANT *LassoPoints,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *NearestPoint)(
-        IInkDisp* This,
+        IInkDisp *This,
         LONG X,
         LONG Y,
         float *PointOnStroke,
@@ -5251,52 +4074,52 @@
         IInkStrokeDisp **Stroke);
 
     HRESULT (STDMETHODCALLTYPE *CreateStrokes)(
-        IInkDisp* This,
+        IInkDisp *This,
         VARIANT StrokeIds,
         IInkStrokes **Strokes);
 
     HRESULT (STDMETHODCALLTYPE *AddStrokesAtRectangle)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkStrokes *SourceStrokes,
         IInkRectangle *TargetRectangle);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IInkDisp* This,
+        IInkDisp *This,
         InkPersistenceFormat PersistenceFormat,
         InkPersistenceCompressionMode CompressionMode,
         VARIANT *Data);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IInkDisp* This,
+        IInkDisp *This,
         VARIANT Data);
 
     HRESULT (STDMETHODCALLTYPE *CreateStroke)(
-        IInkDisp* This,
+        IInkDisp *This,
         VARIANT PacketData,
         VARIANT PacketDescription,
         IInkStrokeDisp **Stroke);
 
     HRESULT (STDMETHODCALLTYPE *ClipboardCopyWithRectangle)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkRectangle *Rectangle,
         InkClipboardFormats ClipboardFormats,
         InkClipboardModes ClipboardModes,
         IDataObject **DataObject);
 
     HRESULT (STDMETHODCALLTYPE *ClipboardCopy)(
-        IInkDisp* This,
+        IInkDisp *This,
         IInkStrokes *strokes,
         InkClipboardFormats ClipboardFormats,
         InkClipboardModes ClipboardModes,
         IDataObject **DataObject);
 
     HRESULT (STDMETHODCALLTYPE *CanPaste)(
-        IInkDisp* This,
+        IInkDisp *This,
         IDataObject *DataObject,
         VARIANT_BOOL *CanPaste);
 
     HRESULT (STDMETHODCALLTYPE *ClipboardPaste)(
-        IInkDisp* This,
+        IInkDisp *This,
         LONG x,
         LONG y,
         IDataObject *DataObject,
@@ -5304,6 +4127,7 @@
 
     END_INTERFACE
 } IInkDispVtbl;
+
 interface IInkDisp {
     CONST_VTBL IInkDispVtbl* lpVtbl;
 };
@@ -5450,239 +4274,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkDisp_get_Strokes_Proxy(
-    IInkDisp* This,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkDisp_get_Strokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_get_ExtendedProperties_Proxy(
-    IInkDisp* This,
-    IInkExtendedProperties **Properties);
-void __RPC_STUB IInkDisp_get_ExtendedProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_get_Dirty_Proxy(
-    IInkDisp* This,
-    VARIANT_BOOL *Dirty);
-void __RPC_STUB IInkDisp_get_Dirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_put_Dirty_Proxy(
-    IInkDisp* This,
-    VARIANT_BOOL Dirty);
-void __RPC_STUB IInkDisp_put_Dirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_get_CustomStrokes_Proxy(
-    IInkDisp* This,
-    IInkCustomStrokes **ppunkInkCustomStrokes);
-void __RPC_STUB IInkDisp_get_CustomStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_GetBoundingBox_Proxy(
-    IInkDisp* This,
-    InkBoundingBoxMode BoundingBoxMode,
-    IInkRectangle **Rectangle);
-void __RPC_STUB IInkDisp_GetBoundingBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_DeleteStrokes_Proxy(
-    IInkDisp* This,
-    IInkStrokes *Strokes);
-void __RPC_STUB IInkDisp_DeleteStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_DeleteStroke_Proxy(
-    IInkDisp* This,
-    IInkStrokeDisp *Stroke);
-void __RPC_STUB IInkDisp_DeleteStroke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_ExtractStrokes_Proxy(
-    IInkDisp* This,
-    IInkStrokes *Strokes,
-    InkExtractFlags ExtractFlags,
-    IInkDisp **ExtractedInk);
-void __RPC_STUB IInkDisp_ExtractStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_ExtractWithRectangle_Proxy(
-    IInkDisp* This,
-    IInkRectangle *Rectangle,
-    InkExtractFlags extractFlags,
-    IInkDisp **ExtractedInk);
-void __RPC_STUB IInkDisp_ExtractWithRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_Clip_Proxy(
-    IInkDisp* This,
-    IInkRectangle *Rectangle);
-void __RPC_STUB IInkDisp_Clip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_Clone_Proxy(
-    IInkDisp* This,
-    IInkDisp **NewInk);
-void __RPC_STUB IInkDisp_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_HitTestCircle_Proxy(
-    IInkDisp* This,
-    LONG X,
-    LONG Y,
-    float radius,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkDisp_HitTestCircle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_HitTestWithRectangle_Proxy(
-    IInkDisp* This,
-    IInkRectangle *SelectionRectangle,
-    float IntersectPercent,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkDisp_HitTestWithRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_HitTestWithLasso_Proxy(
-    IInkDisp* This,
-    VARIANT Points,
-    float IntersectPercent,
-    VARIANT *LassoPoints,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkDisp_HitTestWithLasso_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_NearestPoint_Proxy(
-    IInkDisp* This,
-    LONG X,
-    LONG Y,
-    float *PointOnStroke,
-    float *DistanceFromPacket,
-    IInkStrokeDisp **Stroke);
-void __RPC_STUB IInkDisp_NearestPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_CreateStrokes_Proxy(
-    IInkDisp* This,
-    VARIANT StrokeIds,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkDisp_CreateStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_AddStrokesAtRectangle_Proxy(
-    IInkDisp* This,
-    IInkStrokes *SourceStrokes,
-    IInkRectangle *TargetRectangle);
-void __RPC_STUB IInkDisp_AddStrokesAtRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_Save_Proxy(
-    IInkDisp* This,
-    InkPersistenceFormat PersistenceFormat,
-    InkPersistenceCompressionMode CompressionMode,
-    VARIANT *Data);
-void __RPC_STUB IInkDisp_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_Load_Proxy(
-    IInkDisp* This,
-    VARIANT Data);
-void __RPC_STUB IInkDisp_Load_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_CreateStroke_Proxy(
-    IInkDisp* This,
-    VARIANT PacketData,
-    VARIANT PacketDescription,
-    IInkStrokeDisp **Stroke);
-void __RPC_STUB IInkDisp_CreateStroke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_ClipboardCopyWithRectangle_Proxy(
-    IInkDisp* This,
-    IInkRectangle *Rectangle,
-    InkClipboardFormats ClipboardFormats,
-    InkClipboardModes ClipboardModes,
-    IDataObject **DataObject);
-void __RPC_STUB IInkDisp_ClipboardCopyWithRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_ClipboardCopy_Proxy(
-    IInkDisp* This,
-    IInkStrokes *strokes,
-    InkClipboardFormats ClipboardFormats,
-    InkClipboardModes ClipboardModes,
-    IDataObject **DataObject);
-void __RPC_STUB IInkDisp_ClipboardCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_CanPaste_Proxy(
-    IInkDisp* This,
-    IDataObject *DataObject,
-    VARIANT_BOOL *CanPaste);
-void __RPC_STUB IInkDisp_CanPaste_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkDisp_ClipboardPaste_Proxy(
-    IInkDisp* This,
-    LONG x,
-    LONG y,
-    IDataObject *DataObject,
-    IInkStrokes **Strokes);
-void __RPC_STUB IInkDisp_ClipboardPaste_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkDisp_INTERFACE_DEFINED__ */
 
@@ -5775,29 +4366,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkStrokes* This);
+        IInkStrokes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkStrokes* This);
+        IInkStrokes *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5805,7 +4396,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5817,94 +4408,95 @@
 
     /*** IInkStrokes methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IUnknown **_NewEnum);
 
     HRESULT (STDMETHODCALLTYPE *get_Ink)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkDisp **Ink);
 
     HRESULT (STDMETHODCALLTYPE *get_RecognitionResult)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkRecognitionResult **RecognitionResult);
 
     HRESULT (STDMETHODCALLTYPE *ToString)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         BSTR *ToString);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         LONG Index,
         IInkStrokeDisp **Stroke);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkStrokeDisp *InkStroke);
 
     HRESULT (STDMETHODCALLTYPE *AddStrokes)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkStrokes *InkStrokes);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkStrokeDisp *InkStroke);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStrokes)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkStrokes *InkStrokes);
 
     HRESULT (STDMETHODCALLTYPE *ModifyDrawingAttributes)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkDrawingAttributes *DrawAttrs);
 
     HRESULT (STDMETHODCALLTYPE *GetBoundingBox)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         InkBoundingBoxMode BoundingBoxMode,
         IInkRectangle **BoundingBox);
 
     HRESULT (STDMETHODCALLTYPE *Transform)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkTransform *Transform,
         VARIANT_BOOL ApplyOnPenWidth);
 
     HRESULT (STDMETHODCALLTYPE *ScaleToRectangle)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkRectangle *Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *Move)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         float HorizontalComponent,
         float VerticalComponent);
 
     HRESULT (STDMETHODCALLTYPE *Rotate)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         float Degrees,
         float x,
         float y);
 
     HRESULT (STDMETHODCALLTYPE *Shear)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         float HorizontalMultiplier,
         float VerticalMultiplier);
 
     HRESULT (STDMETHODCALLTYPE *ScaleTransform)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         float HorizontalMultiplier,
         float VerticalMultiplier);
 
     HRESULT (STDMETHODCALLTYPE *Clip)(
-        IInkStrokes* This,
+        IInkStrokes *This,
         IInkRectangle *Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *RemoveRecognitionResult)(
-        IInkStrokes* This);
+        IInkStrokes *This);
 
     END_INTERFACE
 } IInkStrokesVtbl;
+
 interface IInkStrokes {
     CONST_VTBL IInkStrokesVtbl* lpVtbl;
 };
@@ -6031,173 +4623,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkStrokes_get_Count_Proxy(
-    IInkStrokes* This,
-    LONG *Count);
-void __RPC_STUB IInkStrokes_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_get__NewEnum_Proxy(
-    IInkStrokes* This,
-    IUnknown **_NewEnum);
-void __RPC_STUB IInkStrokes_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_get_Ink_Proxy(
-    IInkStrokes* This,
-    IInkDisp **Ink);
-void __RPC_STUB IInkStrokes_get_Ink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_get_RecognitionResult_Proxy(
-    IInkStrokes* This,
-    IInkRecognitionResult **RecognitionResult);
-void __RPC_STUB IInkStrokes_get_RecognitionResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_ToString_Proxy(
-    IInkStrokes* This,
-    BSTR *ToString);
-void __RPC_STUB IInkStrokes_ToString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Item_Proxy(
-    IInkStrokes* This,
-    LONG Index,
-    IInkStrokeDisp **Stroke);
-void __RPC_STUB IInkStrokes_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Add_Proxy(
-    IInkStrokes* This,
-    IInkStrokeDisp *InkStroke);
-void __RPC_STUB IInkStrokes_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_AddStrokes_Proxy(
-    IInkStrokes* This,
-    IInkStrokes *InkStrokes);
-void __RPC_STUB IInkStrokes_AddStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Remove_Proxy(
-    IInkStrokes* This,
-    IInkStrokeDisp *InkStroke);
-void __RPC_STUB IInkStrokes_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_RemoveStrokes_Proxy(
-    IInkStrokes* This,
-    IInkStrokes *InkStrokes);
-void __RPC_STUB IInkStrokes_RemoveStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_ModifyDrawingAttributes_Proxy(
-    IInkStrokes* This,
-    IInkDrawingAttributes *DrawAttrs);
-void __RPC_STUB IInkStrokes_ModifyDrawingAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_GetBoundingBox_Proxy(
-    IInkStrokes* This,
-    InkBoundingBoxMode BoundingBoxMode,
-    IInkRectangle **BoundingBox);
-void __RPC_STUB IInkStrokes_GetBoundingBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Transform_Proxy(
-    IInkStrokes* This,
-    IInkTransform *Transform,
-    VARIANT_BOOL ApplyOnPenWidth);
-void __RPC_STUB IInkStrokes_Transform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_ScaleToRectangle_Proxy(
-    IInkStrokes* This,
-    IInkRectangle *Rectangle);
-void __RPC_STUB IInkStrokes_ScaleToRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Move_Proxy(
-    IInkStrokes* This,
-    float HorizontalComponent,
-    float VerticalComponent);
-void __RPC_STUB IInkStrokes_Move_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Rotate_Proxy(
-    IInkStrokes* This,
-    float Degrees,
-    float x,
-    float y);
-void __RPC_STUB IInkStrokes_Rotate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Shear_Proxy(
-    IInkStrokes* This,
-    float HorizontalMultiplier,
-    float VerticalMultiplier);
-void __RPC_STUB IInkStrokes_Shear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_ScaleTransform_Proxy(
-    IInkStrokes* This,
-    float HorizontalMultiplier,
-    float VerticalMultiplier);
-void __RPC_STUB IInkStrokes_ScaleTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_Clip_Proxy(
-    IInkStrokes* This,
-    IInkRectangle *Rectangle);
-void __RPC_STUB IInkStrokes_Clip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkStrokes_RemoveRecognitionResult_Proxy(
-    IInkStrokes* This);
-void __RPC_STUB IInkStrokes_RemoveRecognitionResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkStrokes_INTERFACE_DEFINED__ */
 
@@ -6284,29 +4709,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkRenderer* This);
+        IInkRenderer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkRenderer* This);
+        IInkRenderer *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6314,7 +4739,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6326,84 +4751,85 @@
 
     /*** IInkRenderer methods ***/
     HRESULT (STDMETHODCALLTYPE *GetViewTransform)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         IInkTransform *ViewTransform);
 
     HRESULT (STDMETHODCALLTYPE *SetViewTransform)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         IInkTransform *ViewTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectTransform)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         IInkTransform *ObjectTransform);
 
     HRESULT (STDMETHODCALLTYPE *SetObjectTransform)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         IInkTransform *ObjectTransform);
 
     HRESULT (STDMETHODCALLTYPE *Draw)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         LONG_PTR hDC,
         IInkStrokes *Strokes);
 
     HRESULT (STDMETHODCALLTYPE *DrawStroke)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         LONG_PTR hDC,
         IInkStrokeDisp *Stroke,
         IInkDrawingAttributes *DrawingAttributes);
 
     HRESULT (STDMETHODCALLTYPE *PixelToInkSpace)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         LONG_PTR hDC,
         LONG *x,
         LONG *y);
 
     HRESULT (STDMETHODCALLTYPE *InkSpaceToPixel)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         LONG_PTR hdcDisplay,
         LONG *x,
         LONG *y);
 
     HRESULT (STDMETHODCALLTYPE *PixelToInkSpaceFromPoints)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         LONG_PTR hDC,
         VARIANT *Points);
 
     HRESULT (STDMETHODCALLTYPE *InkSpaceToPixelFromPoints)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         LONG_PTR hDC,
         VARIANT *Points);
 
     HRESULT (STDMETHODCALLTYPE *Measure)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         IInkStrokes *Strokes,
         IInkRectangle **Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *MeasureStroke)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         IInkStrokeDisp *Stroke,
         IInkDrawingAttributes *DrawingAttributes,
         IInkRectangle **Rectangle);
 
     HRESULT (STDMETHODCALLTYPE *Move)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         float HorizontalComponent,
         float VerticalComponent);
 
     HRESULT (STDMETHODCALLTYPE *Rotate)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         float Degrees,
         float x,
         float y);
 
     HRESULT (STDMETHODCALLTYPE *ScaleTransform)(
-        IInkRenderer* This,
+        IInkRenderer *This,
         float HorizontalMultiplier,
         float VerticalMultiplier,
         VARIANT_BOOL ApplyOnPenWidth);
 
     END_INTERFACE
 } IInkRendererVtbl;
+
 interface IInkRenderer {
     CONST_VTBL IInkRendererVtbl* lpVtbl;
 };
@@ -6510,143 +4936,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkRenderer_GetViewTransform_Proxy(
-    IInkRenderer* This,
-    IInkTransform *ViewTransform);
-void __RPC_STUB IInkRenderer_GetViewTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_SetViewTransform_Proxy(
-    IInkRenderer* This,
-    IInkTransform *ViewTransform);
-void __RPC_STUB IInkRenderer_SetViewTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_GetObjectTransform_Proxy(
-    IInkRenderer* This,
-    IInkTransform *ObjectTransform);
-void __RPC_STUB IInkRenderer_GetObjectTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_SetObjectTransform_Proxy(
-    IInkRenderer* This,
-    IInkTransform *ObjectTransform);
-void __RPC_STUB IInkRenderer_SetObjectTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_Draw_Proxy(
-    IInkRenderer* This,
-    LONG_PTR hDC,
-    IInkStrokes *Strokes);
-void __RPC_STUB IInkRenderer_Draw_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_DrawStroke_Proxy(
-    IInkRenderer* This,
-    LONG_PTR hDC,
-    IInkStrokeDisp *Stroke,
-    IInkDrawingAttributes *DrawingAttributes);
-void __RPC_STUB IInkRenderer_DrawStroke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_PixelToInkSpace_Proxy(
-    IInkRenderer* This,
-    LONG_PTR hDC,
-    LONG *x,
-    LONG *y);
-void __RPC_STUB IInkRenderer_PixelToInkSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_InkSpaceToPixel_Proxy(
-    IInkRenderer* This,
-    LONG_PTR hdcDisplay,
-    LONG *x,
-    LONG *y);
-void __RPC_STUB IInkRenderer_InkSpaceToPixel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_PixelToInkSpaceFromPoints_Proxy(
-    IInkRenderer* This,
-    LONG_PTR hDC,
-    VARIANT *Points);
-void __RPC_STUB IInkRenderer_PixelToInkSpaceFromPoints_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_InkSpaceToPixelFromPoints_Proxy(
-    IInkRenderer* This,
-    LONG_PTR hDC,
-    VARIANT *Points);
-void __RPC_STUB IInkRenderer_InkSpaceToPixelFromPoints_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_Measure_Proxy(
-    IInkRenderer* This,
-    IInkStrokes *Strokes,
-    IInkRectangle **Rectangle);
-void __RPC_STUB IInkRenderer_Measure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_MeasureStroke_Proxy(
-    IInkRenderer* This,
-    IInkStrokeDisp *Stroke,
-    IInkDrawingAttributes *DrawingAttributes,
-    IInkRectangle **Rectangle);
-void __RPC_STUB IInkRenderer_MeasureStroke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_Move_Proxy(
-    IInkRenderer* This,
-    float HorizontalComponent,
-    float VerticalComponent);
-void __RPC_STUB IInkRenderer_Move_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_Rotate_Proxy(
-    IInkRenderer* This,
-    float Degrees,
-    float x,
-    float y);
-void __RPC_STUB IInkRenderer_Rotate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkRenderer_ScaleTransform_Proxy(
-    IInkRenderer* This,
-    float HorizontalMultiplier,
-    float VerticalMultiplier,
-    VARIANT_BOOL ApplyOnPenWidth);
-void __RPC_STUB IInkRenderer_ScaleTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkRenderer_INTERFACE_DEFINED__ */
 
@@ -6681,29 +4970,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkCursors* This,
+        IInkCursors *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkCursors* This);
+        IInkCursors *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkCursors* This);
+        IInkCursors *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkCursors* This,
+        IInkCursors *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkCursors* This,
+        IInkCursors *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkCursors* This,
+        IInkCursors *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6711,7 +5000,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkCursors* This,
+        IInkCursors *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6723,20 +5012,21 @@
 
     /*** IInkCursors methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IInkCursors* This,
+        IInkCursors *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IInkCursors* This,
+        IInkCursors *This,
         IUnknown **_NewEnum);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IInkCursors* This,
+        IInkCursors *This,
         LONG Index,
         IInkCursor **Cursor);
 
     END_INTERFACE
 } IInkCursorsVtbl;
+
 interface IInkCursors {
     CONST_VTBL IInkCursorsVtbl* lpVtbl;
 };
@@ -6795,31 +5085,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkCursors_get_Count_Proxy(
-    IInkCursors* This,
-    LONG *Count);
-void __RPC_STUB IInkCursors_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursors_get__NewEnum_Proxy(
-    IInkCursors* This,
-    IUnknown **_NewEnum);
-void __RPC_STUB IInkCursors_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCursors_Item_Proxy(
-    IInkCursors* This,
-    LONG Index,
-    IInkCursor **Cursor);
-void __RPC_STUB IInkCursors_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkCursors_INTERFACE_DEFINED__ */
 
@@ -6968,29 +5233,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInkCollector* This,
+        IInkCollector *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInkCollector* This);
+        IInkCollector *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInkCollector* This);
+        IInkCollector *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IInkCollector* This,
+        IInkCollector *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IInkCollector* This,
+        IInkCollector *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IInkCollector* This,
+        IInkCollector *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6998,7 +5263,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IInkCollector* This,
+        IInkCollector *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7010,171 +5275,172 @@
 
     /*** IInkCollector methods ***/
     HRESULT (STDMETHODCALLTYPE *get_hWnd)(
-        IInkCollector* This,
+        IInkCollector *This,
         LONG_PTR *CurrentWindow);
 
     HRESULT (STDMETHODCALLTYPE *put_hWnd)(
-        IInkCollector* This,
+        IInkCollector *This,
         LONG_PTR NewWindow);
 
     HRESULT (STDMETHODCALLTYPE *get_Enabled)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL *Collecting);
 
     HRESULT (STDMETHODCALLTYPE *put_Enabled)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL Collecting);
 
     HRESULT (STDMETHODCALLTYPE *get_DefaultDrawingAttributes)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkDrawingAttributes **CurrentAttributes);
 
     HRESULT (STDMETHODCALLTYPE *putref_DefaultDrawingAttributes)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkDrawingAttributes *NewAttributes);
 
     HRESULT (STDMETHODCALLTYPE *get_Renderer)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkRenderer **CurrentInkRenderer);
 
     HRESULT (STDMETHODCALLTYPE *putref_Renderer)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkRenderer *NewInkRenderer);
 
     HRESULT (STDMETHODCALLTYPE *get_Ink)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkDisp **Ink);
 
     HRESULT (STDMETHODCALLTYPE *putref_Ink)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkDisp *NewInk);
 
     HRESULT (STDMETHODCALLTYPE *get_AutoRedraw)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL *AutoRedraw);
 
     HRESULT (STDMETHODCALLTYPE *put_AutoRedraw)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL AutoRedraw);
 
     HRESULT (STDMETHODCALLTYPE *get_CollectingInk)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL *Collecting);
 
     HRESULT (STDMETHODCALLTYPE *get_CollectionMode)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkCollectionMode *Mode);
 
     HRESULT (STDMETHODCALLTYPE *put_CollectionMode)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkCollectionMode Mode);
 
     HRESULT (STDMETHODCALLTYPE *get_DynamicRendering)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL *Enabled);
 
     HRESULT (STDMETHODCALLTYPE *put_DynamicRendering)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL Enabled);
 
     HRESULT (STDMETHODCALLTYPE *get_DesiredPacketDescription)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT *PacketGuids);
 
     HRESULT (STDMETHODCALLTYPE *put_DesiredPacketDescription)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT PacketGuids);
 
     HRESULT (STDMETHODCALLTYPE *get_MouseIcon)(
-        IInkCollector* This,
+        IInkCollector *This,
         IPictureDisp **MouseIcon);
 
     HRESULT (STDMETHODCALLTYPE *put_MouseIcon)(
-        IInkCollector* This,
+        IInkCollector *This,
         IPictureDisp *MouseIcon);
 
     HRESULT (STDMETHODCALLTYPE *putref_MouseIcon)(
-        IInkCollector* This,
+        IInkCollector *This,
         IPictureDisp *MouseIcon);
 
     HRESULT (STDMETHODCALLTYPE *get_MousePointer)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkMousePointer *MousePointer);
 
     HRESULT (STDMETHODCALLTYPE *put_MousePointer)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkMousePointer MousePointer);
 
     HRESULT (STDMETHODCALLTYPE *get_Cursors)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkCursors **Cursors);
 
     HRESULT (STDMETHODCALLTYPE *get_MarginX)(
-        IInkCollector* This,
+        IInkCollector *This,
         LONG *MarginX);
 
     HRESULT (STDMETHODCALLTYPE *put_MarginX)(
-        IInkCollector* This,
+        IInkCollector *This,
         LONG MarginX);
 
     HRESULT (STDMETHODCALLTYPE *get_MarginY)(
-        IInkCollector* This,
+        IInkCollector *This,
         LONG *MarginY);
 
     HRESULT (STDMETHODCALLTYPE *put_MarginY)(
-        IInkCollector* This,
+        IInkCollector *This,
         LONG MarginY);
 
     HRESULT (STDMETHODCALLTYPE *get_Tablet)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkTablet **SingleTablet);
 
     HRESULT (STDMETHODCALLTYPE *get_SupportHighContrastInk)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL *Support);
 
     HRESULT (STDMETHODCALLTYPE *put_SupportHighContrastInk)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL Support);
 
     HRESULT (STDMETHODCALLTYPE *SetGestureStatus)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkApplicationGesture Gesture,
         VARIANT_BOOL Listen);
 
     HRESULT (STDMETHODCALLTYPE *GetGestureStatus)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkApplicationGesture Gesture,
         VARIANT_BOOL *Listening);
 
     HRESULT (STDMETHODCALLTYPE *GetWindowInputRectangle)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkRectangle **WindowInputRectangle);
 
     HRESULT (STDMETHODCALLTYPE *SetWindowInputRectangle)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkRectangle *WindowInputRectangle);
 
     HRESULT (STDMETHODCALLTYPE *SetAllTabletsMode)(
-        IInkCollector* This,
+        IInkCollector *This,
         VARIANT_BOOL UseMouseForInput);
 
     HRESULT (STDMETHODCALLTYPE *SetSingleTabletIntegratedMode)(
-        IInkCollector* This,
+        IInkCollector *This,
         IInkTablet *Tablet);
 
     HRESULT (STDMETHODCALLTYPE *GetEventInterest)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkCollectorEventInterest EventId,
         VARIANT_BOOL *Listen);
 
     HRESULT (STDMETHODCALLTYPE *SetEventInterest)(
-        IInkCollector* This,
+        IInkCollector *This,
         InkCollectorEventInterest EventId,
         VARIANT_BOOL Listen);
 
     END_INTERFACE
 } IInkCollectorVtbl;
+
 interface IInkCollector {
     CONST_VTBL IInkCollectorVtbl* lpVtbl;
 };
@@ -7381,330 +5647,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInkCollector_get_hWnd_Proxy(
-    IInkCollector* This,
-    LONG_PTR *CurrentWindow);
-void __RPC_STUB IInkCollector_get_hWnd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_hWnd_Proxy(
-    IInkCollector* This,
-    LONG_PTR NewWindow);
-void __RPC_STUB IInkCollector_put_hWnd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_Enabled_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL *Collecting);
-void __RPC_STUB IInkCollector_get_Enabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_Enabled_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL Collecting);
-void __RPC_STUB IInkCollector_put_Enabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_DefaultDrawingAttributes_Proxy(
-    IInkCollector* This,
-    IInkDrawingAttributes **CurrentAttributes);
-void __RPC_STUB IInkCollector_get_DefaultDrawingAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_putref_DefaultDrawingAttributes_Proxy(
-    IInkCollector* This,
-    IInkDrawingAttributes *NewAttributes);
-void __RPC_STUB IInkCollector_putref_DefaultDrawingAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_Renderer_Proxy(
-    IInkCollector* This,
-    IInkRenderer **CurrentInkRenderer);
-void __RPC_STUB IInkCollector_get_Renderer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_putref_Renderer_Proxy(
-    IInkCollector* This,
-    IInkRenderer *NewInkRenderer);
-void __RPC_STUB IInkCollector_putref_Renderer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_Ink_Proxy(
-    IInkCollector* This,
-    IInkDisp **Ink);
-void __RPC_STUB IInkCollector_get_Ink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_putref_Ink_Proxy(
-    IInkCollector* This,
-    IInkDisp *NewInk);
-void __RPC_STUB IInkCollector_putref_Ink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_AutoRedraw_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL *AutoRedraw);
-void __RPC_STUB IInkCollector_get_AutoRedraw_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_AutoRedraw_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL AutoRedraw);
-void __RPC_STUB IInkCollector_put_AutoRedraw_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_CollectingInk_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL *Collecting);
-void __RPC_STUB IInkCollector_get_CollectingInk_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_CollectionMode_Proxy(
-    IInkCollector* This,
-    InkCollectionMode *Mode);
-void __RPC_STUB IInkCollector_get_CollectionMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_CollectionMode_Proxy(
-    IInkCollector* This,
-    InkCollectionMode Mode);
-void __RPC_STUB IInkCollector_put_CollectionMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_DynamicRendering_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL *Enabled);
-void __RPC_STUB IInkCollector_get_DynamicRendering_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_DynamicRendering_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL Enabled);
-void __RPC_STUB IInkCollector_put_DynamicRendering_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_DesiredPacketDescription_Proxy(
-    IInkCollector* This,
-    VARIANT *PacketGuids);
-void __RPC_STUB IInkCollector_get_DesiredPacketDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_DesiredPacketDescription_Proxy(
-    IInkCollector* This,
-    VARIANT PacketGuids);
-void __RPC_STUB IInkCollector_put_DesiredPacketDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_MouseIcon_Proxy(
-    IInkCollector* This,
-    IPictureDisp **MouseIcon);
-void __RPC_STUB IInkCollector_get_MouseIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_MouseIcon_Proxy(
-    IInkCollector* This,
-    IPictureDisp *MouseIcon);
-void __RPC_STUB IInkCollector_put_MouseIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_putref_MouseIcon_Proxy(
-    IInkCollector* This,
-    IPictureDisp *MouseIcon);
-void __RPC_STUB IInkCollector_putref_MouseIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_MousePointer_Proxy(
-    IInkCollector* This,
-    InkMousePointer *MousePointer);
-void __RPC_STUB IInkCollector_get_MousePointer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_MousePointer_Proxy(
-    IInkCollector* This,
-    InkMousePointer MousePointer);
-void __RPC_STUB IInkCollector_put_MousePointer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_Cursors_Proxy(
-    IInkCollector* This,
-    IInkCursors **Cursors);
-void __RPC_STUB IInkCollector_get_Cursors_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_MarginX_Proxy(
-    IInkCollector* This,
-    LONG *MarginX);
-void __RPC_STUB IInkCollector_get_MarginX_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_MarginX_Proxy(
-    IInkCollector* This,
-    LONG MarginX);
-void __RPC_STUB IInkCollector_put_MarginX_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_MarginY_Proxy(
-    IInkCollector* This,
-    LONG *MarginY);
-void __RPC_STUB IInkCollector_get_MarginY_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_MarginY_Proxy(
-    IInkCollector* This,
-    LONG MarginY);
-void __RPC_STUB IInkCollector_put_MarginY_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_Tablet_Proxy(
-    IInkCollector* This,
-    IInkTablet **SingleTablet);
-void __RPC_STUB IInkCollector_get_Tablet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_get_SupportHighContrastInk_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL *Support);
-void __RPC_STUB IInkCollector_get_SupportHighContrastInk_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_put_SupportHighContrastInk_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL Support);
-void __RPC_STUB IInkCollector_put_SupportHighContrastInk_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_SetGestureStatus_Proxy(
-    IInkCollector* This,
-    InkApplicationGesture Gesture,
-    VARIANT_BOOL Listen);
-void __RPC_STUB IInkCollector_SetGestureStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_GetGestureStatus_Proxy(
-    IInkCollector* This,
-    InkApplicationGesture Gesture,
-    VARIANT_BOOL *Listening);
-void __RPC_STUB IInkCollector_GetGestureStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_GetWindowInputRectangle_Proxy(
-    IInkCollector* This,
-    IInkRectangle **WindowInputRectangle);
-void __RPC_STUB IInkCollector_GetWindowInputRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_SetWindowInputRectangle_Proxy(
-    IInkCollector* This,
-    IInkRectangle *WindowInputRectangle);
-void __RPC_STUB IInkCollector_SetWindowInputRectangle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_SetAllTabletsMode_Proxy(
-    IInkCollector* This,
-    VARIANT_BOOL UseMouseForInput);
-void __RPC_STUB IInkCollector_SetAllTabletsMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_SetSingleTabletIntegratedMode_Proxy(
-    IInkCollector* This,
-    IInkTablet *Tablet);
-void __RPC_STUB IInkCollector_SetSingleTabletIntegratedMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_GetEventInterest_Proxy(
-    IInkCollector* This,
-    InkCollectorEventInterest EventId,
-    VARIANT_BOOL *Listen);
-void __RPC_STUB IInkCollector_GetEventInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInkCollector_SetEventInterest_Proxy(
-    IInkCollector* This,
-    InkCollectorEventInterest EventId,
-    VARIANT_BOOL Listen);
-void __RPC_STUB IInkCollector_SetEventInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInkCollector_INTERFACE_DEFINED__ */
 
@@ -7729,29 +5671,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _IInkCollectorEvents* This,
+        _IInkCollectorEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _IInkCollectorEvents* This);
+        _IInkCollectorEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _IInkCollectorEvents* This);
+        _IInkCollectorEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _IInkCollectorEvents* This,
+        _IInkCollectorEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _IInkCollectorEvents* This,
+        _IInkCollectorEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _IInkCollectorEvents* This,
+        _IInkCollectorEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7759,7 +5701,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _IInkCollectorEvents* This,
+        _IInkCollectorEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7771,6 +5713,7 @@
 
     END_INTERFACE
 } _IInkCollectorEventsVtbl;
+
 interface _IInkCollectorEvents {
     CONST_VTBL _IInkCollectorEventsVtbl* lpVtbl;
 };
diff --git a/mingw-w64-headers/include/msopc.h b/mingw-w64-headers/include/msopc.h
index 3fd118f..8b8364c 100644
--- a/mingw-w64-headers/include/msopc.h
+++ b/mingw-w64-headers/include/msopc.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/msopc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/msopc.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,156 +20,249 @@
 #ifndef __IOpcUri_FWD_DEFINED__
 #define __IOpcUri_FWD_DEFINED__
 typedef interface IOpcUri IOpcUri;
+#ifdef __cplusplus
+interface IOpcUri;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPartUri_FWD_DEFINED__
 #define __IOpcPartUri_FWD_DEFINED__
 typedef interface IOpcPartUri IOpcPartUri;
+#ifdef __cplusplus
+interface IOpcPartUri;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPart_FWD_DEFINED__
 #define __IOpcPart_FWD_DEFINED__
 typedef interface IOpcPart IOpcPart;
+#ifdef __cplusplus
+interface IOpcPart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPartEnumerator_FWD_DEFINED__
 #define __IOpcPartEnumerator_FWD_DEFINED__
 typedef interface IOpcPartEnumerator IOpcPartEnumerator;
+#ifdef __cplusplus
+interface IOpcPartEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPartSet_FWD_DEFINED__
 #define __IOpcPartSet_FWD_DEFINED__
 typedef interface IOpcPartSet IOpcPartSet;
+#ifdef __cplusplus
+interface IOpcPartSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPackage_FWD_DEFINED__
 #define __IOpcPackage_FWD_DEFINED__
 typedef interface IOpcPackage IOpcPackage;
+#ifdef __cplusplus
+interface IOpcPackage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationship_FWD_DEFINED__
 #define __IOpcRelationship_FWD_DEFINED__
 typedef interface IOpcRelationship IOpcRelationship;
+#ifdef __cplusplus
+interface IOpcRelationship;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipEnumerator_FWD_DEFINED__
 #define __IOpcRelationshipEnumerator_FWD_DEFINED__
 typedef interface IOpcRelationshipEnumerator IOpcRelationshipEnumerator;
+#ifdef __cplusplus
+interface IOpcRelationshipEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSelector_FWD_DEFINED__
 #define __IOpcRelationshipSelector_FWD_DEFINED__
 typedef interface IOpcRelationshipSelector IOpcRelationshipSelector;
+#ifdef __cplusplus
+interface IOpcRelationshipSelector;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSet_FWD_DEFINED__
 #define __IOpcRelationshipSet_FWD_DEFINED__
 typedef interface IOpcRelationshipSet IOpcRelationshipSet;
+#ifdef __cplusplus
+interface IOpcRelationshipSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureCustomObject_FWD_DEFINED__
 #define __IOpcSignatureCustomObject_FWD_DEFINED__
 typedef interface IOpcSignatureCustomObject IOpcSignatureCustomObject;
+#ifdef __cplusplus
+interface IOpcSignatureCustomObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__
 #define __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__
 typedef interface IOpcSignatureCustomObjectEnumerator IOpcSignatureCustomObjectEnumerator;
+#ifdef __cplusplus
+interface IOpcSignatureCustomObjectEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignaturePartReference_FWD_DEFINED__
 #define __IOpcSignaturePartReference_FWD_DEFINED__
 typedef interface IOpcSignaturePartReference IOpcSignaturePartReference;
+#ifdef __cplusplus
+interface IOpcSignaturePartReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__
 #define __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__
 typedef interface IOpcSignaturePartReferenceEnumerator IOpcSignaturePartReferenceEnumerator;
+#ifdef __cplusplus
+interface IOpcSignaturePartReferenceEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureReference_FWD_DEFINED__
 #define __IOpcSignatureReference_FWD_DEFINED__
 typedef interface IOpcSignatureReference IOpcSignatureReference;
+#ifdef __cplusplus
+interface IOpcSignatureReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureReferenceEnumerator_FWD_DEFINED__
 #define __IOpcSignatureReferenceEnumerator_FWD_DEFINED__
 typedef interface IOpcSignatureReferenceEnumerator IOpcSignatureReferenceEnumerator;
+#ifdef __cplusplus
+interface IOpcSignatureReferenceEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__
 #define __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__
 typedef interface IOpcSignatureRelationshipReferenceEnumerator IOpcSignatureRelationshipReferenceEnumerator;
+#ifdef __cplusplus
+interface IOpcSignatureRelationshipReferenceEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureRelationshipReference_FWD_DEFINED__
 #define __IOpcSignatureRelationshipReference_FWD_DEFINED__
 typedef interface IOpcSignatureRelationshipReference IOpcSignatureRelationshipReference;
+#ifdef __cplusplus
+interface IOpcSignatureRelationshipReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__
 #define __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__
 typedef interface IOpcRelationshipSelectorEnumerator IOpcRelationshipSelectorEnumerator;
+#ifdef __cplusplus
+interface IOpcRelationshipSelectorEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcCertificateEnumerator_FWD_DEFINED__
 #define __IOpcCertificateEnumerator_FWD_DEFINED__
 typedef interface IOpcCertificateEnumerator IOpcCertificateEnumerator;
+#ifdef __cplusplus
+interface IOpcCertificateEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcCertificateSet_FWD_DEFINED__
 #define __IOpcCertificateSet_FWD_DEFINED__
 typedef interface IOpcCertificateSet IOpcCertificateSet;
+#ifdef __cplusplus
+interface IOpcCertificateSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcDigitalSignatureEnumerator_FWD_DEFINED__
 #define __IOpcDigitalSignatureEnumerator_FWD_DEFINED__
 typedef interface IOpcDigitalSignatureEnumerator IOpcDigitalSignatureEnumerator;
+#ifdef __cplusplus
+interface IOpcDigitalSignatureEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcDigitalSignatureManager_FWD_DEFINED__
 #define __IOpcDigitalSignatureManager_FWD_DEFINED__
 typedef interface IOpcDigitalSignatureManager IOpcDigitalSignatureManager;
+#ifdef __cplusplus
+interface IOpcDigitalSignatureManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignaturePartReferenceSet_FWD_DEFINED__
 #define __IOpcSignaturePartReferenceSet_FWD_DEFINED__
 typedef interface IOpcSignaturePartReferenceSet IOpcSignaturePartReferenceSet;
+#ifdef __cplusplus
+interface IOpcSignaturePartReferenceSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSelectorSet_FWD_DEFINED__
 #define __IOpcRelationshipSelectorSet_FWD_DEFINED__
 typedef interface IOpcRelationshipSelectorSet IOpcRelationshipSelectorSet;
+#ifdef __cplusplus
+interface IOpcRelationshipSelectorSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__
 #define __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__
 typedef interface IOpcSignatureRelationshipReferenceSet IOpcSignatureRelationshipReferenceSet;
+#ifdef __cplusplus
+interface IOpcSignatureRelationshipReferenceSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureReferenceSet_FWD_DEFINED__
 #define __IOpcSignatureReferenceSet_FWD_DEFINED__
 typedef interface IOpcSignatureReferenceSet IOpcSignatureReferenceSet;
+#ifdef __cplusplus
+interface IOpcSignatureReferenceSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureCustomObjectSet_FWD_DEFINED__
 #define __IOpcSignatureCustomObjectSet_FWD_DEFINED__
 typedef interface IOpcSignatureCustomObjectSet IOpcSignatureCustomObjectSet;
+#ifdef __cplusplus
+interface IOpcSignatureCustomObjectSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcDigitalSignature_FWD_DEFINED__
 #define __IOpcDigitalSignature_FWD_DEFINED__
 typedef interface IOpcDigitalSignature IOpcDigitalSignature;
+#ifdef __cplusplus
+interface IOpcDigitalSignature;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSigningOptions_FWD_DEFINED__
 #define __IOpcSigningOptions_FWD_DEFINED__
 typedef interface IOpcSigningOptions IOpcSigningOptions;
+#ifdef __cplusplus
+interface IOpcSigningOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcFactory_FWD_DEFINED__
 #define __IOpcFactory_FWD_DEFINED__
 typedef interface IOpcFactory IOpcFactory;
+#ifdef __cplusplus
+interface IOpcFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __OpcFactory_FWD_DEFINED__
@@ -197,11 +290,17 @@
 #ifndef __IOpcUri_FWD_DEFINED__
 #define __IOpcUri_FWD_DEFINED__
 typedef interface IOpcUri IOpcUri;
+#ifdef __cplusplus
+interface IOpcUri;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPartUri_FWD_DEFINED__
 #define __IOpcPartUri_FWD_DEFINED__
 typedef interface IOpcPartUri IOpcPartUri;
+#ifdef __cplusplus
+interface IOpcPartUri;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -236,142 +335,143 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcUri* This,
+        IOpcUri *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcUri* This);
+        IOpcUri *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcUri* This);
+        IOpcUri *This);
 
     /*** IUri methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyBSTR)(
-        IOpcUri* This,
+        IOpcUri *This,
         Uri_PROPERTY uriProp,
         BSTR *pbstrProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyLength)(
-        IOpcUri* This,
+        IOpcUri *This,
         Uri_PROPERTY uriProp,
         DWORD *pcchProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDWORD)(
-        IOpcUri* This,
+        IOpcUri *This,
         Uri_PROPERTY uriProp,
         DWORD *pdwProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *HasProperty)(
-        IOpcUri* This,
+        IOpcUri *This,
         Uri_PROPERTY uriProp,
         WINBOOL *pfHasProperty);
 
     HRESULT (STDMETHODCALLTYPE *GetAbsoluteUri)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrAbsoluteUri);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthority)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrAuthority);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayUri)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrDisplayString);
 
     HRESULT (STDMETHODCALLTYPE *GetDomain)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrDomain);
 
     HRESULT (STDMETHODCALLTYPE *GetExtension)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrExtension);
 
     HRESULT (STDMETHODCALLTYPE *GetFragment)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrFragment);
 
     HRESULT (STDMETHODCALLTYPE *GetHost)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrHost);
 
     HRESULT (STDMETHODCALLTYPE *GetPassword)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrPassword);
 
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrPath);
 
     HRESULT (STDMETHODCALLTYPE *GetPathAndQuery)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrPathAndQuery);
 
     HRESULT (STDMETHODCALLTYPE *GetQuery)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrQuery);
 
     HRESULT (STDMETHODCALLTYPE *GetRawUri)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrRawUri);
 
     HRESULT (STDMETHODCALLTYPE *GetSchemeName)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrSchemeName);
 
     HRESULT (STDMETHODCALLTYPE *GetUserInfo)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrUserInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetUserName)(
-        IOpcUri* This,
+        IOpcUri *This,
         BSTR *pbstrUserName);
 
     HRESULT (STDMETHODCALLTYPE *GetHostType)(
-        IOpcUri* This,
+        IOpcUri *This,
         DWORD *pdwHostType);
 
     HRESULT (STDMETHODCALLTYPE *GetPort)(
-        IOpcUri* This,
+        IOpcUri *This,
         DWORD *pdwPort);
 
     HRESULT (STDMETHODCALLTYPE *GetScheme)(
-        IOpcUri* This,
+        IOpcUri *This,
         DWORD *pdwScheme);
 
     HRESULT (STDMETHODCALLTYPE *GetZone)(
-        IOpcUri* This,
+        IOpcUri *This,
         DWORD *pdwZone);
 
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        IOpcUri* This,
+        IOpcUri *This,
         LPDWORD pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *IsEqual)(
-        IOpcUri* This,
+        IOpcUri *This,
         IUri *pUri,
         WINBOOL *pfEqual);
 
     /*** IOpcUri methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRelationshipsPartUri)(
-        IOpcUri* This,
+        IOpcUri *This,
         IOpcPartUri **relationshipPartUri);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeUri)(
-        IOpcUri* This,
+        IOpcUri *This,
         IOpcPartUri *targetPartUri,
         IUri **relativeUri);
 
     HRESULT (STDMETHODCALLTYPE *CombinePartUri)(
-        IOpcUri* This,
+        IOpcUri *This,
         IUri *relativeUri,
         IOpcPartUri **combinedUri);
 
     END_INTERFACE
 } IOpcUriVtbl;
+
 interface IOpcUri {
     CONST_VTBL IOpcUriVtbl* lpVtbl;
 };
@@ -514,32 +614,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcUri_GetRelationshipsPartUri_Proxy(
-    IOpcUri* This,
-    IOpcPartUri **relationshipPartUri);
-void __RPC_STUB IOpcUri_GetRelationshipsPartUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcUri_GetRelativeUri_Proxy(
-    IOpcUri* This,
-    IOpcPartUri *targetPartUri,
-    IUri **relativeUri);
-void __RPC_STUB IOpcUri_GetRelativeUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcUri_CombinePartUri_Proxy(
-    IOpcUri* This,
-    IUri *relativeUri,
-    IOpcPartUri **combinedUri);
-void __RPC_STUB IOpcUri_CombinePartUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcUri_INTERFACE_DEFINED__ */
 
@@ -574,156 +648,157 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcPartUri* This);
+        IOpcPartUri *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcPartUri* This);
+        IOpcPartUri *This);
 
     /*** IUri methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyBSTR)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         Uri_PROPERTY uriProp,
         BSTR *pbstrProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyLength)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         Uri_PROPERTY uriProp,
         DWORD *pcchProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDWORD)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         Uri_PROPERTY uriProp,
         DWORD *pdwProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *HasProperty)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         Uri_PROPERTY uriProp,
         WINBOOL *pfHasProperty);
 
     HRESULT (STDMETHODCALLTYPE *GetAbsoluteUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrAbsoluteUri);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthority)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrAuthority);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrDisplayString);
 
     HRESULT (STDMETHODCALLTYPE *GetDomain)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrDomain);
 
     HRESULT (STDMETHODCALLTYPE *GetExtension)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrExtension);
 
     HRESULT (STDMETHODCALLTYPE *GetFragment)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrFragment);
 
     HRESULT (STDMETHODCALLTYPE *GetHost)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrHost);
 
     HRESULT (STDMETHODCALLTYPE *GetPassword)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrPassword);
 
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrPath);
 
     HRESULT (STDMETHODCALLTYPE *GetPathAndQuery)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrPathAndQuery);
 
     HRESULT (STDMETHODCALLTYPE *GetQuery)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrQuery);
 
     HRESULT (STDMETHODCALLTYPE *GetRawUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrRawUri);
 
     HRESULT (STDMETHODCALLTYPE *GetSchemeName)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrSchemeName);
 
     HRESULT (STDMETHODCALLTYPE *GetUserInfo)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrUserInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetUserName)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         BSTR *pbstrUserName);
 
     HRESULT (STDMETHODCALLTYPE *GetHostType)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         DWORD *pdwHostType);
 
     HRESULT (STDMETHODCALLTYPE *GetPort)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         DWORD *pdwPort);
 
     HRESULT (STDMETHODCALLTYPE *GetScheme)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         DWORD *pdwScheme);
 
     HRESULT (STDMETHODCALLTYPE *GetZone)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         DWORD *pdwZone);
 
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         LPDWORD pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *IsEqual)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         IUri *pUri,
         WINBOOL *pfEqual);
 
     /*** IOpcUri methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRelationshipsPartUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         IOpcPartUri **relationshipPartUri);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         IOpcPartUri *targetPartUri,
         IUri **relativeUri);
 
     HRESULT (STDMETHODCALLTYPE *CombinePartUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         IUri *relativeUri,
         IOpcPartUri **combinedUri);
 
     /*** IOpcPartUri methods ***/
     HRESULT (STDMETHODCALLTYPE *ComparePartUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         IOpcPartUri *partUri,
         INT32 *comparisonResult);
 
     HRESULT (STDMETHODCALLTYPE *GetSourceUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         IOpcUri **sourceUri);
 
     HRESULT (STDMETHODCALLTYPE *IsRelationshipsPartUri)(
-        IOpcPartUri* This,
+        IOpcPartUri *This,
         WINBOOL *isRelationshipUri);
 
     END_INTERFACE
 } IOpcPartUriVtbl;
+
 interface IOpcPartUri {
     CONST_VTBL IOpcPartUriVtbl* lpVtbl;
 };
@@ -880,31 +955,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcPartUri_ComparePartUri_Proxy(
-    IOpcPartUri* This,
-    IOpcPartUri *partUri,
-    INT32 *comparisonResult);
-void __RPC_STUB IOpcPartUri_ComparePartUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartUri_GetSourceUri_Proxy(
-    IOpcPartUri* This,
-    IOpcUri **sourceUri);
-void __RPC_STUB IOpcPartUri_GetSourceUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartUri_IsRelationshipsPartUri_Proxy(
-    IOpcPartUri* This,
-    WINBOOL *isRelationshipUri);
-void __RPC_STUB IOpcPartUri_IsRelationshipsPartUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcPartUri_INTERFACE_DEFINED__ */
 
@@ -1019,151 +1069,241 @@
 #ifndef __IOpcCertificateEnumerator_FWD_DEFINED__
 #define __IOpcCertificateEnumerator_FWD_DEFINED__
 typedef interface IOpcCertificateEnumerator IOpcCertificateEnumerator;
+#ifdef __cplusplus
+interface IOpcCertificateEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcCertificateSet_FWD_DEFINED__
 #define __IOpcCertificateSet_FWD_DEFINED__
 typedef interface IOpcCertificateSet IOpcCertificateSet;
+#ifdef __cplusplus
+interface IOpcCertificateSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcDigitalSignature_FWD_DEFINED__
 #define __IOpcDigitalSignature_FWD_DEFINED__
 typedef interface IOpcDigitalSignature IOpcDigitalSignature;
+#ifdef __cplusplus
+interface IOpcDigitalSignature;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcDigitalSignatureEnumerator_FWD_DEFINED__
 #define __IOpcDigitalSignatureEnumerator_FWD_DEFINED__
 typedef interface IOpcDigitalSignatureEnumerator IOpcDigitalSignatureEnumerator;
+#ifdef __cplusplus
+interface IOpcDigitalSignatureEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcDigitalSignatureManager_FWD_DEFINED__
 #define __IOpcDigitalSignatureManager_FWD_DEFINED__
 typedef interface IOpcDigitalSignatureManager IOpcDigitalSignatureManager;
+#ifdef __cplusplus
+interface IOpcDigitalSignatureManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPackage_FWD_DEFINED__
 #define __IOpcPackage_FWD_DEFINED__
 typedef interface IOpcPackage IOpcPackage;
+#ifdef __cplusplus
+interface IOpcPackage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPart_FWD_DEFINED__
 #define __IOpcPart_FWD_DEFINED__
 typedef interface IOpcPart IOpcPart;
+#ifdef __cplusplus
+interface IOpcPart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPartEnumerator_FWD_DEFINED__
 #define __IOpcPartEnumerator_FWD_DEFINED__
 typedef interface IOpcPartEnumerator IOpcPartEnumerator;
+#ifdef __cplusplus
+interface IOpcPartEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPartSet_FWD_DEFINED__
 #define __IOpcPartSet_FWD_DEFINED__
 typedef interface IOpcPartSet IOpcPartSet;
+#ifdef __cplusplus
+interface IOpcPartSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcPartUri_FWD_DEFINED__
 #define __IOpcPartUri_FWD_DEFINED__
 typedef interface IOpcPartUri IOpcPartUri;
+#ifdef __cplusplus
+interface IOpcPartUri;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationship_FWD_DEFINED__
 #define __IOpcRelationship_FWD_DEFINED__
 typedef interface IOpcRelationship IOpcRelationship;
+#ifdef __cplusplus
+interface IOpcRelationship;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipEnumerator_FWD_DEFINED__
 #define __IOpcRelationshipEnumerator_FWD_DEFINED__
 typedef interface IOpcRelationshipEnumerator IOpcRelationshipEnumerator;
+#ifdef __cplusplus
+interface IOpcRelationshipEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSelector_FWD_DEFINED__
 #define __IOpcRelationshipSelector_FWD_DEFINED__
 typedef interface IOpcRelationshipSelector IOpcRelationshipSelector;
+#ifdef __cplusplus
+interface IOpcRelationshipSelector;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSelectorSet_FWD_DEFINED__
 #define __IOpcRelationshipSelectorSet_FWD_DEFINED__
 typedef interface IOpcRelationshipSelectorSet IOpcRelationshipSelectorSet;
+#ifdef __cplusplus
+interface IOpcRelationshipSelectorSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSet_FWD_DEFINED__
 #define __IOpcRelationshipSet_FWD_DEFINED__
 typedef interface IOpcRelationshipSet IOpcRelationshipSet;
+#ifdef __cplusplus
+interface IOpcRelationshipSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSigningOptions_FWD_DEFINED__
 #define __IOpcSigningOptions_FWD_DEFINED__
 typedef interface IOpcSigningOptions IOpcSigningOptions;
+#ifdef __cplusplus
+interface IOpcSigningOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureCustomObject_FWD_DEFINED__
 #define __IOpcSignatureCustomObject_FWD_DEFINED__
 typedef interface IOpcSignatureCustomObject IOpcSignatureCustomObject;
+#ifdef __cplusplus
+interface IOpcSignatureCustomObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureCustomObjectSet_FWD_DEFINED__
 #define __IOpcSignatureCustomObjectSet_FWD_DEFINED__
 typedef interface IOpcSignatureCustomObjectSet IOpcSignatureCustomObjectSet;
+#ifdef __cplusplus
+interface IOpcSignatureCustomObjectSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignaturePartReference_FWD_DEFINED__
 #define __IOpcSignaturePartReference_FWD_DEFINED__
 typedef interface IOpcSignaturePartReference IOpcSignaturePartReference;
+#ifdef __cplusplus
+interface IOpcSignaturePartReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__
 #define __IOpcSignaturePartReferenceEnumerator_FWD_DEFINED__
 typedef interface IOpcSignaturePartReferenceEnumerator IOpcSignaturePartReferenceEnumerator;
+#ifdef __cplusplus
+interface IOpcSignaturePartReferenceEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignaturePartReferenceSet_FWD_DEFINED__
 #define __IOpcSignaturePartReferenceSet_FWD_DEFINED__
 typedef interface IOpcSignaturePartReferenceSet IOpcSignaturePartReferenceSet;
+#ifdef __cplusplus
+interface IOpcSignaturePartReferenceSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureReference_FWD_DEFINED__
 #define __IOpcSignatureReference_FWD_DEFINED__
 typedef interface IOpcSignatureReference IOpcSignatureReference;
+#ifdef __cplusplus
+interface IOpcSignatureReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureReferenceSet_FWD_DEFINED__
 #define __IOpcSignatureReferenceSet_FWD_DEFINED__
 typedef interface IOpcSignatureReferenceSet IOpcSignatureReferenceSet;
+#ifdef __cplusplus
+interface IOpcSignatureReferenceSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureRelationshipReference_FWD_DEFINED__
 #define __IOpcSignatureRelationshipReference_FWD_DEFINED__
 typedef interface IOpcSignatureRelationshipReference IOpcSignatureRelationshipReference;
+#ifdef __cplusplus
+interface IOpcSignatureRelationshipReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__
 #define __IOpcSignatureRelationshipReferenceEnumerator_FWD_DEFINED__
 typedef interface IOpcSignatureRelationshipReferenceEnumerator IOpcSignatureRelationshipReferenceEnumerator;
+#ifdef __cplusplus
+interface IOpcSignatureRelationshipReferenceEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__
 #define __IOpcSignatureRelationshipReferenceSet_FWD_DEFINED__
 typedef interface IOpcSignatureRelationshipReferenceSet IOpcSignatureRelationshipReferenceSet;
+#ifdef __cplusplus
+interface IOpcSignatureRelationshipReferenceSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__
 #define __IOpcRelationshipSelectorEnumerator_FWD_DEFINED__
 typedef interface IOpcRelationshipSelectorEnumerator IOpcRelationshipSelectorEnumerator;
+#ifdef __cplusplus
+interface IOpcRelationshipSelectorEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureReferenceEnumerator_FWD_DEFINED__
 #define __IOpcSignatureReferenceEnumerator_FWD_DEFINED__
 typedef interface IOpcSignatureReferenceEnumerator IOpcSignatureReferenceEnumerator;
+#ifdef __cplusplus
+interface IOpcSignatureReferenceEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__
 #define __IOpcSignatureCustomObjectEnumerator_FWD_DEFINED__
 typedef interface IOpcSignatureCustomObjectEnumerator IOpcSignatureCustomObjectEnumerator;
+#ifdef __cplusplus
+interface IOpcSignatureCustomObjectEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpcUri_FWD_DEFINED__
 #define __IOpcUri_FWD_DEFINED__
 typedef interface IOpcUri IOpcUri;
+#ifdef __cplusplus
+interface IOpcUri;
+#endif /* __cplusplus */
 #endif
 
 typedef enum __WIDL_msopc_generated_name_00000016 {
@@ -1258,39 +1398,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcPart* This,
+        IOpcPart *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcPart* This);
+        IOpcPart *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcPart* This);
+        IOpcPart *This);
 
     /*** IOpcPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRelationshipSet)(
-        IOpcPart* This,
+        IOpcPart *This,
         IOpcRelationshipSet **relationshipSet);
 
     HRESULT (STDMETHODCALLTYPE *GetContentStream)(
-        IOpcPart* This,
+        IOpcPart *This,
         IStream **stream);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IOpcPart* This,
+        IOpcPart *This,
         IOpcPartUri **name);
 
     HRESULT (STDMETHODCALLTYPE *GetContentType)(
-        IOpcPart* This,
+        IOpcPart *This,
         LPWSTR *contentType);
 
     HRESULT (STDMETHODCALLTYPE *GetCompressionOptions)(
-        IOpcPart* This,
+        IOpcPart *This,
         OPC_COMPRESSION_OPTIONS *compressionOptions);
 
     END_INTERFACE
 } IOpcPartVtbl;
+
 interface IOpcPart {
     CONST_VTBL IOpcPartVtbl* lpVtbl;
 };
@@ -1339,46 +1480,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcPart_GetRelationshipSet_Proxy(
-    IOpcPart* This,
-    IOpcRelationshipSet **relationshipSet);
-void __RPC_STUB IOpcPart_GetRelationshipSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPart_GetContentStream_Proxy(
-    IOpcPart* This,
-    IStream **stream);
-void __RPC_STUB IOpcPart_GetContentStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPart_GetName_Proxy(
-    IOpcPart* This,
-    IOpcPartUri **name);
-void __RPC_STUB IOpcPart_GetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPart_GetContentType_Proxy(
-    IOpcPart* This,
-    LPWSTR *contentType);
-void __RPC_STUB IOpcPart_GetContentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPart_GetCompressionOptions_Proxy(
-    IOpcPart* This,
-    OPC_COMPRESSION_OPTIONS *compressionOptions);
-void __RPC_STUB IOpcPart_GetCompressionOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcPart_INTERFACE_DEFINED__ */
 
@@ -1415,35 +1516,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcPartEnumerator* This,
+        IOpcPartEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcPartEnumerator* This);
+        IOpcPartEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcPartEnumerator* This);
+        IOpcPartEnumerator *This);
 
     /*** IOpcPartEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcPartEnumerator* This,
+        IOpcPartEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcPartEnumerator* This,
+        IOpcPartEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcPartEnumerator* This,
+        IOpcPartEnumerator *This,
         IOpcPart **part);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcPartEnumerator* This,
+        IOpcPartEnumerator *This,
         IOpcPartEnumerator **copy);
 
     END_INTERFACE
 } IOpcPartEnumeratorVtbl;
+
 interface IOpcPartEnumerator {
     CONST_VTBL IOpcPartEnumeratorVtbl* lpVtbl;
 };
@@ -1488,38 +1590,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_MoveNext_Proxy(
-    IOpcPartEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcPartEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_MovePrevious_Proxy(
-    IOpcPartEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcPartEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_GetCurrent_Proxy(
-    IOpcPartEnumerator* This,
-    IOpcPart **part);
-void __RPC_STUB IOpcPartEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartEnumerator_Clone_Proxy(
-    IOpcPartEnumerator* This,
-    IOpcPartEnumerator **copy);
-void __RPC_STUB IOpcPartEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcPartEnumerator_INTERFACE_DEFINED__ */
 
@@ -1564,44 +1634,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcPartSet* This,
+        IOpcPartSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcPartSet* This);
+        IOpcPartSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcPartSet* This);
+        IOpcPartSet *This);
 
     /*** IOpcPartSet methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPart)(
-        IOpcPartSet* This,
+        IOpcPartSet *This,
         IOpcPartUri *name,
         IOpcPart **part);
 
     HRESULT (STDMETHODCALLTYPE *CreatePart)(
-        IOpcPartSet* This,
+        IOpcPartSet *This,
         IOpcPartUri *name,
         LPCWSTR contentType,
         OPC_COMPRESSION_OPTIONS compressionOptions,
         IOpcPart **part);
 
     HRESULT (STDMETHODCALLTYPE *DeletePart)(
-        IOpcPartSet* This,
+        IOpcPartSet *This,
         IOpcPartUri *name);
 
     HRESULT (STDMETHODCALLTYPE *PartExists)(
-        IOpcPartSet* This,
+        IOpcPartSet *This,
         IOpcPartUri *name,
         WINBOOL *partExists);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcPartSet* This,
+        IOpcPartSet *This,
         IOpcPartEnumerator **partEnumerator);
 
     END_INTERFACE
 } IOpcPartSetVtbl;
+
 interface IOpcPartSet {
     CONST_VTBL IOpcPartSetVtbl* lpVtbl;
 };
@@ -1650,51 +1721,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcPartSet_GetPart_Proxy(
-    IOpcPartSet* This,
-    IOpcPartUri *name,
-    IOpcPart **part);
-void __RPC_STUB IOpcPartSet_GetPart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartSet_CreatePart_Proxy(
-    IOpcPartSet* This,
-    IOpcPartUri *name,
-    LPCWSTR contentType,
-    OPC_COMPRESSION_OPTIONS compressionOptions,
-    IOpcPart **part);
-void __RPC_STUB IOpcPartSet_CreatePart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartSet_DeletePart_Proxy(
-    IOpcPartSet* This,
-    IOpcPartUri *name);
-void __RPC_STUB IOpcPartSet_DeletePart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartSet_PartExists_Proxy(
-    IOpcPartSet* This,
-    IOpcPartUri *name,
-    WINBOOL *partExists);
-void __RPC_STUB IOpcPartSet_PartExists_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPartSet_GetEnumerator_Proxy(
-    IOpcPartSet* This,
-    IOpcPartEnumerator **partEnumerator);
-void __RPC_STUB IOpcPartSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcPartSet_INTERFACE_DEFINED__ */
 
@@ -1725,27 +1751,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcPackage* This,
+        IOpcPackage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcPackage* This);
+        IOpcPackage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcPackage* This);
+        IOpcPackage *This);
 
     /*** IOpcPackage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartSet)(
-        IOpcPackage* This,
+        IOpcPackage *This,
         IOpcPartSet **partSet);
 
     HRESULT (STDMETHODCALLTYPE *GetRelationshipSet)(
-        IOpcPackage* This,
+        IOpcPackage *This,
         IOpcRelationshipSet **relationshipSet);
 
     END_INTERFACE
 } IOpcPackageVtbl;
+
 interface IOpcPackage {
     CONST_VTBL IOpcPackageVtbl* lpVtbl;
 };
@@ -1782,22 +1809,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcPackage_GetPartSet_Proxy(
-    IOpcPackage* This,
-    IOpcPartSet **partSet);
-void __RPC_STUB IOpcPackage_GetPartSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcPackage_GetRelationshipSet_Proxy(
-    IOpcPackage* This,
-    IOpcRelationshipSet **relationshipSet);
-void __RPC_STUB IOpcPackage_GetRelationshipSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcPackage_INTERFACE_DEFINED__ */
 
@@ -1837,39 +1848,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcRelationship* This,
+        IOpcRelationship *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcRelationship* This);
+        IOpcRelationship *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcRelationship* This);
+        IOpcRelationship *This);
 
     /*** IOpcRelationship methods ***/
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        IOpcRelationship* This,
+        IOpcRelationship *This,
         LPWSTR *relationshipIdentifier);
 
     HRESULT (STDMETHODCALLTYPE *GetRelationshipType)(
-        IOpcRelationship* This,
+        IOpcRelationship *This,
         LPWSTR *relationshipType);
 
     HRESULT (STDMETHODCALLTYPE *GetSourceUri)(
-        IOpcRelationship* This,
+        IOpcRelationship *This,
         IOpcUri **sourceUri);
 
     HRESULT (STDMETHODCALLTYPE *GetTargetUri)(
-        IOpcRelationship* This,
+        IOpcRelationship *This,
         IUri **targetUri);
 
     HRESULT (STDMETHODCALLTYPE *GetTargetMode)(
-        IOpcRelationship* This,
+        IOpcRelationship *This,
         OPC_URI_TARGET_MODE *targetMode);
 
     END_INTERFACE
 } IOpcRelationshipVtbl;
+
 interface IOpcRelationship {
     CONST_VTBL IOpcRelationshipVtbl* lpVtbl;
 };
@@ -1918,46 +1930,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcRelationship_GetId_Proxy(
-    IOpcRelationship* This,
-    LPWSTR *relationshipIdentifier);
-void __RPC_STUB IOpcRelationship_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationship_GetRelationshipType_Proxy(
-    IOpcRelationship* This,
-    LPWSTR *relationshipType);
-void __RPC_STUB IOpcRelationship_GetRelationshipType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationship_GetSourceUri_Proxy(
-    IOpcRelationship* This,
-    IOpcUri **sourceUri);
-void __RPC_STUB IOpcRelationship_GetSourceUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationship_GetTargetUri_Proxy(
-    IOpcRelationship* This,
-    IUri **targetUri);
-void __RPC_STUB IOpcRelationship_GetTargetUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationship_GetTargetMode_Proxy(
-    IOpcRelationship* This,
-    OPC_URI_TARGET_MODE *targetMode);
-void __RPC_STUB IOpcRelationship_GetTargetMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcRelationship_INTERFACE_DEFINED__ */
 
@@ -1994,35 +1966,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcRelationshipEnumerator* This,
+        IOpcRelationshipEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcRelationshipEnumerator* This);
+        IOpcRelationshipEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcRelationshipEnumerator* This);
+        IOpcRelationshipEnumerator *This);
 
     /*** IOpcRelationshipEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcRelationshipEnumerator* This,
+        IOpcRelationshipEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcRelationshipEnumerator* This,
+        IOpcRelationshipEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcRelationshipEnumerator* This,
+        IOpcRelationshipEnumerator *This,
         IOpcRelationship **relationship);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcRelationshipEnumerator* This,
+        IOpcRelationshipEnumerator *This,
         IOpcRelationshipEnumerator **copy);
 
     END_INTERFACE
 } IOpcRelationshipEnumeratorVtbl;
+
 interface IOpcRelationshipEnumerator {
     CONST_VTBL IOpcRelationshipEnumeratorVtbl* lpVtbl;
 };
@@ -2067,38 +2040,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_MoveNext_Proxy(
-    IOpcRelationshipEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcRelationshipEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_MovePrevious_Proxy(
-    IOpcRelationshipEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcRelationshipEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_GetCurrent_Proxy(
-    IOpcRelationshipEnumerator* This,
-    IOpcRelationship **relationship);
-void __RPC_STUB IOpcRelationshipEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipEnumerator_Clone_Proxy(
-    IOpcRelationshipEnumerator* This,
-    IOpcRelationshipEnumerator **copy);
-void __RPC_STUB IOpcRelationshipEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcRelationshipEnumerator_INTERFACE_DEFINED__ */
 
@@ -2129,27 +2070,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcRelationshipSelector* This,
+        IOpcRelationshipSelector *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcRelationshipSelector* This);
+        IOpcRelationshipSelector *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcRelationshipSelector* This);
+        IOpcRelationshipSelector *This);
 
     /*** IOpcRelationshipSelector methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSelectorType)(
-        IOpcRelationshipSelector* This,
+        IOpcRelationshipSelector *This,
         OPC_RELATIONSHIP_SELECTOR *selector);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectionCriterion)(
-        IOpcRelationshipSelector* This,
+        IOpcRelationshipSelector *This,
         LPWSTR *selectionCriterion);
 
     END_INTERFACE
 } IOpcRelationshipSelectorVtbl;
+
 interface IOpcRelationshipSelector {
     CONST_VTBL IOpcRelationshipSelectorVtbl* lpVtbl;
 };
@@ -2186,22 +2128,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelector_GetSelectorType_Proxy(
-    IOpcRelationshipSelector* This,
-    OPC_RELATIONSHIP_SELECTOR *selector);
-void __RPC_STUB IOpcRelationshipSelector_GetSelectorType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelector_GetSelectionCriterion_Proxy(
-    IOpcRelationshipSelector* This,
-    LPWSTR *selectionCriterion);
-void __RPC_STUB IOpcRelationshipSelector_GetSelectionCriterion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcRelationshipSelector_INTERFACE_DEFINED__ */
 
@@ -2254,24 +2180,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcRelationshipSet* This);
+        IOpcRelationshipSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcRelationshipSet* This);
+        IOpcRelationshipSet *This);
 
     /*** IOpcRelationshipSet methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRelationship)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         LPCWSTR relationshipIdentifier,
         IOpcRelationship **relationship);
 
     HRESULT (STDMETHODCALLTYPE *CreateRelationship)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         LPCWSTR relationshipIdentifier,
         LPCWSTR relationshipType,
         IUri *targetUri,
@@ -2279,29 +2205,30 @@
         IOpcRelationship **relationship);
 
     HRESULT (STDMETHODCALLTYPE *DeleteRelationship)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         LPCWSTR relationshipIdentifier);
 
     HRESULT (STDMETHODCALLTYPE *RelationshipExists)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         LPCWSTR relationshipIdentifier,
         WINBOOL *relationshipExists);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         IOpcRelationshipEnumerator **relationshipEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumeratorForType)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         LPCWSTR relationshipType,
         IOpcRelationshipEnumerator **relationshipEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetRelationshipsContentStream)(
-        IOpcRelationshipSet* This,
+        IOpcRelationshipSet *This,
         IStream **contents);
 
     END_INTERFACE
 } IOpcRelationshipSetVtbl;
+
 interface IOpcRelationshipSet {
     CONST_VTBL IOpcRelationshipSetVtbl* lpVtbl;
 };
@@ -2358,69 +2285,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetRelationship_Proxy(
-    IOpcRelationshipSet* This,
-    LPCWSTR relationshipIdentifier,
-    IOpcRelationship **relationship);
-void __RPC_STUB IOpcRelationshipSet_GetRelationship_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_CreateRelationship_Proxy(
-    IOpcRelationshipSet* This,
-    LPCWSTR relationshipIdentifier,
-    LPCWSTR relationshipType,
-    IUri *targetUri,
-    OPC_URI_TARGET_MODE targetMode,
-    IOpcRelationship **relationship);
-void __RPC_STUB IOpcRelationshipSet_CreateRelationship_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_DeleteRelationship_Proxy(
-    IOpcRelationshipSet* This,
-    LPCWSTR relationshipIdentifier);
-void __RPC_STUB IOpcRelationshipSet_DeleteRelationship_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_RelationshipExists_Proxy(
-    IOpcRelationshipSet* This,
-    LPCWSTR relationshipIdentifier,
-    WINBOOL *relationshipExists);
-void __RPC_STUB IOpcRelationshipSet_RelationshipExists_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetEnumerator_Proxy(
-    IOpcRelationshipSet* This,
-    IOpcRelationshipEnumerator **relationshipEnumerator);
-void __RPC_STUB IOpcRelationshipSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetEnumeratorForType_Proxy(
-    IOpcRelationshipSet* This,
-    LPCWSTR relationshipType,
-    IOpcRelationshipEnumerator **relationshipEnumerator);
-void __RPC_STUB IOpcRelationshipSet_GetEnumeratorForType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSet_GetRelationshipsContentStream_Proxy(
-    IOpcRelationshipSet* This,
-    IStream **contents);
-void __RPC_STUB IOpcRelationshipSet_GetRelationshipsContentStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcRelationshipSet_INTERFACE_DEFINED__ */
 
@@ -2449,24 +2313,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureCustomObject* This,
+        IOpcSignatureCustomObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureCustomObject* This);
+        IOpcSignatureCustomObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureCustomObject* This);
+        IOpcSignatureCustomObject *This);
 
     /*** IOpcSignatureCustomObject methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXml)(
-        IOpcSignatureCustomObject* This,
+        IOpcSignatureCustomObject *This,
         UINT8 **xmlMarkup,
         UINT32 *count);
 
     END_INTERFACE
 } IOpcSignatureCustomObjectVtbl;
+
 interface IOpcSignatureCustomObject {
     CONST_VTBL IOpcSignatureCustomObjectVtbl* lpVtbl;
 };
@@ -2499,15 +2364,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObject_GetXml_Proxy(
-    IOpcSignatureCustomObject* This,
-    UINT8 **xmlMarkup,
-    UINT32 *count);
-void __RPC_STUB IOpcSignatureCustomObject_GetXml_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureCustomObject_INTERFACE_DEFINED__ */
 
@@ -2544,35 +2400,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureCustomObjectEnumerator* This,
+        IOpcSignatureCustomObjectEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureCustomObjectEnumerator* This);
+        IOpcSignatureCustomObjectEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureCustomObjectEnumerator* This);
+        IOpcSignatureCustomObjectEnumerator *This);
 
     /*** IOpcSignatureCustomObjectEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcSignatureCustomObjectEnumerator* This,
+        IOpcSignatureCustomObjectEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcSignatureCustomObjectEnumerator* This,
+        IOpcSignatureCustomObjectEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcSignatureCustomObjectEnumerator* This,
+        IOpcSignatureCustomObjectEnumerator *This,
         IOpcSignatureCustomObject **customObject);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcSignatureCustomObjectEnumerator* This,
+        IOpcSignatureCustomObjectEnumerator *This,
         IOpcSignatureCustomObjectEnumerator **copy);
 
     END_INTERFACE
 } IOpcSignatureCustomObjectEnumeratorVtbl;
+
 interface IOpcSignatureCustomObjectEnumerator {
     CONST_VTBL IOpcSignatureCustomObjectEnumeratorVtbl* lpVtbl;
 };
@@ -2617,38 +2474,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_MoveNext_Proxy(
-    IOpcSignatureCustomObjectEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcSignatureCustomObjectEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_MovePrevious_Proxy(
-    IOpcSignatureCustomObjectEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcSignatureCustomObjectEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_GetCurrent_Proxy(
-    IOpcSignatureCustomObjectEnumerator* This,
-    IOpcSignatureCustomObject **customObject);
-void __RPC_STUB IOpcSignatureCustomObjectEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectEnumerator_Clone_Proxy(
-    IOpcSignatureCustomObjectEnumerator* This,
-    IOpcSignatureCustomObjectEnumerator **copy);
-void __RPC_STUB IOpcSignatureCustomObjectEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureCustomObjectEnumerator_INTERFACE_DEFINED__ */
 
@@ -2689,40 +2514,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignaturePartReference* This,
+        IOpcSignaturePartReference *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignaturePartReference* This);
+        IOpcSignaturePartReference *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignaturePartReference* This);
+        IOpcSignaturePartReference *This);
 
     /*** IOpcSignaturePartReference methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IOpcSignaturePartReference* This,
+        IOpcSignaturePartReference *This,
         IOpcPartUri **partName);
 
     HRESULT (STDMETHODCALLTYPE *GetContentType)(
-        IOpcSignaturePartReference* This,
+        IOpcSignaturePartReference *This,
         LPWSTR *contentType);
 
     HRESULT (STDMETHODCALLTYPE *GetDigestMethod)(
-        IOpcSignaturePartReference* This,
+        IOpcSignaturePartReference *This,
         LPWSTR *digestMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetDigestValue)(
-        IOpcSignaturePartReference* This,
+        IOpcSignaturePartReference *This,
         UINT8 **digestValue,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformMethod)(
-        IOpcSignaturePartReference* This,
+        IOpcSignaturePartReference *This,
         OPC_CANONICALIZATION_METHOD *transformMethod);
 
     END_INTERFACE
 } IOpcSignaturePartReferenceVtbl;
+
 interface IOpcSignaturePartReference {
     CONST_VTBL IOpcSignaturePartReferenceVtbl* lpVtbl;
 };
@@ -2771,47 +2597,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetPartName_Proxy(
-    IOpcSignaturePartReference* This,
-    IOpcPartUri **partName);
-void __RPC_STUB IOpcSignaturePartReference_GetPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetContentType_Proxy(
-    IOpcSignaturePartReference* This,
-    LPWSTR *contentType);
-void __RPC_STUB IOpcSignaturePartReference_GetContentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetDigestMethod_Proxy(
-    IOpcSignaturePartReference* This,
-    LPWSTR *digestMethod);
-void __RPC_STUB IOpcSignaturePartReference_GetDigestMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetDigestValue_Proxy(
-    IOpcSignaturePartReference* This,
-    UINT8 **digestValue,
-    UINT32 *count);
-void __RPC_STUB IOpcSignaturePartReference_GetDigestValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReference_GetTransformMethod_Proxy(
-    IOpcSignaturePartReference* This,
-    OPC_CANONICALIZATION_METHOD *transformMethod);
-void __RPC_STUB IOpcSignaturePartReference_GetTransformMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignaturePartReference_INTERFACE_DEFINED__ */
 
@@ -2848,35 +2633,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignaturePartReferenceEnumerator* This,
+        IOpcSignaturePartReferenceEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignaturePartReferenceEnumerator* This);
+        IOpcSignaturePartReferenceEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignaturePartReferenceEnumerator* This);
+        IOpcSignaturePartReferenceEnumerator *This);
 
     /*** IOpcSignaturePartReferenceEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcSignaturePartReferenceEnumerator* This,
+        IOpcSignaturePartReferenceEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcSignaturePartReferenceEnumerator* This,
+        IOpcSignaturePartReferenceEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcSignaturePartReferenceEnumerator* This,
+        IOpcSignaturePartReferenceEnumerator *This,
         IOpcSignaturePartReference **partReference);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcSignaturePartReferenceEnumerator* This,
+        IOpcSignaturePartReferenceEnumerator *This,
         IOpcSignaturePartReferenceEnumerator **copy);
 
     END_INTERFACE
 } IOpcSignaturePartReferenceEnumeratorVtbl;
+
 interface IOpcSignaturePartReferenceEnumerator {
     CONST_VTBL IOpcSignaturePartReferenceEnumeratorVtbl* lpVtbl;
 };
@@ -2921,38 +2707,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_MoveNext_Proxy(
-    IOpcSignaturePartReferenceEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcSignaturePartReferenceEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_MovePrevious_Proxy(
-    IOpcSignaturePartReferenceEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcSignaturePartReferenceEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_GetCurrent_Proxy(
-    IOpcSignaturePartReferenceEnumerator* This,
-    IOpcSignaturePartReference **partReference);
-void __RPC_STUB IOpcSignaturePartReferenceEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceEnumerator_Clone_Proxy(
-    IOpcSignaturePartReferenceEnumerator* This,
-    IOpcSignaturePartReferenceEnumerator **copy);
-void __RPC_STUB IOpcSignaturePartReferenceEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignaturePartReferenceEnumerator_INTERFACE_DEFINED__ */
 
@@ -2996,44 +2750,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureReference* This,
+        IOpcSignatureReference *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureReference* This);
+        IOpcSignatureReference *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureReference* This);
+        IOpcSignatureReference *This);
 
     /*** IOpcSignatureReference methods ***/
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        IOpcSignatureReference* This,
+        IOpcSignatureReference *This,
         LPWSTR *referenceId);
 
     HRESULT (STDMETHODCALLTYPE *GetUri)(
-        IOpcSignatureReference* This,
+        IOpcSignatureReference *This,
         IUri **referenceUri);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IOpcSignatureReference* This,
+        IOpcSignatureReference *This,
         LPWSTR *type);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformMethod)(
-        IOpcSignatureReference* This,
+        IOpcSignatureReference *This,
         OPC_CANONICALIZATION_METHOD *transformMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetDigestMethod)(
-        IOpcSignatureReference* This,
+        IOpcSignatureReference *This,
         LPWSTR *digestMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetDigestValue)(
-        IOpcSignatureReference* This,
+        IOpcSignatureReference *This,
         UINT8 **digestValue,
         UINT32 *count);
 
     END_INTERFACE
 } IOpcSignatureReferenceVtbl;
+
 interface IOpcSignatureReference {
     CONST_VTBL IOpcSignatureReferenceVtbl* lpVtbl;
 };
@@ -3086,55 +2841,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetId_Proxy(
-    IOpcSignatureReference* This,
-    LPWSTR *referenceId);
-void __RPC_STUB IOpcSignatureReference_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetUri_Proxy(
-    IOpcSignatureReference* This,
-    IUri **referenceUri);
-void __RPC_STUB IOpcSignatureReference_GetUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetType_Proxy(
-    IOpcSignatureReference* This,
-    LPWSTR *type);
-void __RPC_STUB IOpcSignatureReference_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetTransformMethod_Proxy(
-    IOpcSignatureReference* This,
-    OPC_CANONICALIZATION_METHOD *transformMethod);
-void __RPC_STUB IOpcSignatureReference_GetTransformMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetDigestMethod_Proxy(
-    IOpcSignatureReference* This,
-    LPWSTR *digestMethod);
-void __RPC_STUB IOpcSignatureReference_GetDigestMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReference_GetDigestValue_Proxy(
-    IOpcSignatureReference* This,
-    UINT8 **digestValue,
-    UINT32 *count);
-void __RPC_STUB IOpcSignatureReference_GetDigestValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureReference_INTERFACE_DEFINED__ */
 
@@ -3171,35 +2877,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureReferenceEnumerator* This,
+        IOpcSignatureReferenceEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureReferenceEnumerator* This);
+        IOpcSignatureReferenceEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureReferenceEnumerator* This);
+        IOpcSignatureReferenceEnumerator *This);
 
     /*** IOpcSignatureReferenceEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcSignatureReferenceEnumerator* This,
+        IOpcSignatureReferenceEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcSignatureReferenceEnumerator* This,
+        IOpcSignatureReferenceEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcSignatureReferenceEnumerator* This,
+        IOpcSignatureReferenceEnumerator *This,
         IOpcSignatureReference **reference);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcSignatureReferenceEnumerator* This,
+        IOpcSignatureReferenceEnumerator *This,
         IOpcSignatureReferenceEnumerator **copy);
 
     END_INTERFACE
 } IOpcSignatureReferenceEnumeratorVtbl;
+
 interface IOpcSignatureReferenceEnumerator {
     CONST_VTBL IOpcSignatureReferenceEnumeratorVtbl* lpVtbl;
 };
@@ -3244,38 +2951,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_MoveNext_Proxy(
-    IOpcSignatureReferenceEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcSignatureReferenceEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_MovePrevious_Proxy(
-    IOpcSignatureReferenceEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcSignatureReferenceEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_GetCurrent_Proxy(
-    IOpcSignatureReferenceEnumerator* This,
-    IOpcSignatureReference **reference);
-void __RPC_STUB IOpcSignatureReferenceEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceEnumerator_Clone_Proxy(
-    IOpcSignatureReferenceEnumerator* This,
-    IOpcSignatureReferenceEnumerator **copy);
-void __RPC_STUB IOpcSignatureReferenceEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureReferenceEnumerator_INTERFACE_DEFINED__ */
 
@@ -3312,35 +2987,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureRelationshipReferenceEnumerator* This,
+        IOpcSignatureRelationshipReferenceEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureRelationshipReferenceEnumerator* This);
+        IOpcSignatureRelationshipReferenceEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureRelationshipReferenceEnumerator* This);
+        IOpcSignatureRelationshipReferenceEnumerator *This);
 
     /*** IOpcSignatureRelationshipReferenceEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcSignatureRelationshipReferenceEnumerator* This,
+        IOpcSignatureRelationshipReferenceEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcSignatureRelationshipReferenceEnumerator* This,
+        IOpcSignatureRelationshipReferenceEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcSignatureRelationshipReferenceEnumerator* This,
+        IOpcSignatureRelationshipReferenceEnumerator *This,
         IOpcSignatureRelationshipReference **relationshipReference);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcSignatureRelationshipReferenceEnumerator* This,
+        IOpcSignatureRelationshipReferenceEnumerator *This,
         IOpcSignatureRelationshipReferenceEnumerator **copy);
 
     END_INTERFACE
 } IOpcSignatureRelationshipReferenceEnumeratorVtbl;
+
 interface IOpcSignatureRelationshipReferenceEnumerator {
     CONST_VTBL IOpcSignatureRelationshipReferenceEnumeratorVtbl* lpVtbl;
 };
@@ -3385,38 +3061,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_MoveNext_Proxy(
-    IOpcSignatureRelationshipReferenceEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_MovePrevious_Proxy(
-    IOpcSignatureRelationshipReferenceEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_GetCurrent_Proxy(
-    IOpcSignatureRelationshipReferenceEnumerator* This,
-    IOpcSignatureRelationshipReference **relationshipReference);
-void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceEnumerator_Clone_Proxy(
-    IOpcSignatureRelationshipReferenceEnumerator* This,
-    IOpcSignatureRelationshipReferenceEnumerator **copy);
-void __RPC_STUB IOpcSignatureRelationshipReferenceEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureRelationshipReferenceEnumerator_INTERFACE_DEFINED__ */
 
@@ -3460,44 +3104,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureRelationshipReference* This,
+        IOpcSignatureRelationshipReference *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureRelationshipReference* This);
+        IOpcSignatureRelationshipReference *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureRelationshipReference* This);
+        IOpcSignatureRelationshipReference *This);
 
     /*** IOpcSignatureRelationshipReference methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSourceUri)(
-        IOpcSignatureRelationshipReference* This,
+        IOpcSignatureRelationshipReference *This,
         IOpcUri **sourceUri);
 
     HRESULT (STDMETHODCALLTYPE *GetDigestMethod)(
-        IOpcSignatureRelationshipReference* This,
+        IOpcSignatureRelationshipReference *This,
         LPWSTR *digestMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetDigestValue)(
-        IOpcSignatureRelationshipReference* This,
+        IOpcSignatureRelationshipReference *This,
         UINT8 **digestValue,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformMethod)(
-        IOpcSignatureRelationshipReference* This,
+        IOpcSignatureRelationshipReference *This,
         OPC_CANONICALIZATION_METHOD *transformMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetRelationshipSigningOption)(
-        IOpcSignatureRelationshipReference* This,
+        IOpcSignatureRelationshipReference *This,
         OPC_RELATIONSHIPS_SIGNING_OPTION *relationshipSigningOption);
 
     HRESULT (STDMETHODCALLTYPE *GetRelationshipSelectorEnumerator)(
-        IOpcSignatureRelationshipReference* This,
+        IOpcSignatureRelationshipReference *This,
         IOpcRelationshipSelectorEnumerator **selectorEnumerator);
 
     END_INTERFACE
 } IOpcSignatureRelationshipReferenceVtbl;
+
 interface IOpcSignatureRelationshipReference {
     CONST_VTBL IOpcSignatureRelationshipReferenceVtbl* lpVtbl;
 };
@@ -3550,55 +3195,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetSourceUri_Proxy(
-    IOpcSignatureRelationshipReference* This,
-    IOpcUri **sourceUri);
-void __RPC_STUB IOpcSignatureRelationshipReference_GetSourceUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetDigestMethod_Proxy(
-    IOpcSignatureRelationshipReference* This,
-    LPWSTR *digestMethod);
-void __RPC_STUB IOpcSignatureRelationshipReference_GetDigestMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetDigestValue_Proxy(
-    IOpcSignatureRelationshipReference* This,
-    UINT8 **digestValue,
-    UINT32 *count);
-void __RPC_STUB IOpcSignatureRelationshipReference_GetDigestValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetTransformMethod_Proxy(
-    IOpcSignatureRelationshipReference* This,
-    OPC_CANONICALIZATION_METHOD *transformMethod);
-void __RPC_STUB IOpcSignatureRelationshipReference_GetTransformMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetRelationshipSigningOption_Proxy(
-    IOpcSignatureRelationshipReference* This,
-    OPC_RELATIONSHIPS_SIGNING_OPTION *relationshipSigningOption);
-void __RPC_STUB IOpcSignatureRelationshipReference_GetRelationshipSigningOption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReference_GetRelationshipSelectorEnumerator_Proxy(
-    IOpcSignatureRelationshipReference* This,
-    IOpcRelationshipSelectorEnumerator **selectorEnumerator);
-void __RPC_STUB IOpcSignatureRelationshipReference_GetRelationshipSelectorEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureRelationshipReference_INTERFACE_DEFINED__ */
 
@@ -3635,35 +3231,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcRelationshipSelectorEnumerator* This,
+        IOpcRelationshipSelectorEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcRelationshipSelectorEnumerator* This);
+        IOpcRelationshipSelectorEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcRelationshipSelectorEnumerator* This);
+        IOpcRelationshipSelectorEnumerator *This);
 
     /*** IOpcRelationshipSelectorEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcRelationshipSelectorEnumerator* This,
+        IOpcRelationshipSelectorEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcRelationshipSelectorEnumerator* This,
+        IOpcRelationshipSelectorEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcRelationshipSelectorEnumerator* This,
+        IOpcRelationshipSelectorEnumerator *This,
         IOpcRelationshipSelector **relationshipSelector);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcRelationshipSelectorEnumerator* This,
+        IOpcRelationshipSelectorEnumerator *This,
         IOpcRelationshipSelectorEnumerator **copy);
 
     END_INTERFACE
 } IOpcRelationshipSelectorEnumeratorVtbl;
+
 interface IOpcRelationshipSelectorEnumerator {
     CONST_VTBL IOpcRelationshipSelectorEnumeratorVtbl* lpVtbl;
 };
@@ -3708,38 +3305,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_MoveNext_Proxy(
-    IOpcRelationshipSelectorEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcRelationshipSelectorEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_MovePrevious_Proxy(
-    IOpcRelationshipSelectorEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcRelationshipSelectorEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_GetCurrent_Proxy(
-    IOpcRelationshipSelectorEnumerator* This,
-    IOpcRelationshipSelector **relationshipSelector);
-void __RPC_STUB IOpcRelationshipSelectorEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorEnumerator_Clone_Proxy(
-    IOpcRelationshipSelectorEnumerator* This,
-    IOpcRelationshipSelectorEnumerator **copy);
-void __RPC_STUB IOpcRelationshipSelectorEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcRelationshipSelectorEnumerator_INTERFACE_DEFINED__ */
 
@@ -3776,35 +3341,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcCertificateEnumerator* This,
+        IOpcCertificateEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcCertificateEnumerator* This);
+        IOpcCertificateEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcCertificateEnumerator* This);
+        IOpcCertificateEnumerator *This);
 
     /*** IOpcCertificateEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcCertificateEnumerator* This,
+        IOpcCertificateEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcCertificateEnumerator* This,
+        IOpcCertificateEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcCertificateEnumerator* This,
+        IOpcCertificateEnumerator *This,
         const CERT_CONTEXT **certificate);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcCertificateEnumerator* This,
+        IOpcCertificateEnumerator *This,
         IOpcCertificateEnumerator **copy);
 
     END_INTERFACE
 } IOpcCertificateEnumeratorVtbl;
+
 interface IOpcCertificateEnumerator {
     CONST_VTBL IOpcCertificateEnumeratorVtbl* lpVtbl;
 };
@@ -3849,38 +3415,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_MoveNext_Proxy(
-    IOpcCertificateEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcCertificateEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_MovePrevious_Proxy(
-    IOpcCertificateEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcCertificateEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_GetCurrent_Proxy(
-    IOpcCertificateEnumerator* This,
-    const CERT_CONTEXT **certificate);
-void __RPC_STUB IOpcCertificateEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcCertificateEnumerator_Clone_Proxy(
-    IOpcCertificateEnumerator* This,
-    IOpcCertificateEnumerator **copy);
-void __RPC_STUB IOpcCertificateEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcCertificateEnumerator_INTERFACE_DEFINED__ */
 
@@ -3914,31 +3448,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcCertificateSet* This,
+        IOpcCertificateSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcCertificateSet* This);
+        IOpcCertificateSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcCertificateSet* This);
+        IOpcCertificateSet *This);
 
     /*** IOpcCertificateSet methods ***/
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IOpcCertificateSet* This,
+        IOpcCertificateSet *This,
         const CERT_CONTEXT *certificate);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IOpcCertificateSet* This,
+        IOpcCertificateSet *This,
         const CERT_CONTEXT *certificate);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcCertificateSet* This,
+        IOpcCertificateSet *This,
         IOpcCertificateEnumerator **certificateEnumerator);
 
     END_INTERFACE
 } IOpcCertificateSetVtbl;
+
 interface IOpcCertificateSet {
     CONST_VTBL IOpcCertificateSetVtbl* lpVtbl;
 };
@@ -3979,30 +3514,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcCertificateSet_Add_Proxy(
-    IOpcCertificateSet* This,
-    const CERT_CONTEXT *certificate);
-void __RPC_STUB IOpcCertificateSet_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcCertificateSet_Remove_Proxy(
-    IOpcCertificateSet* This,
-    const CERT_CONTEXT *certificate);
-void __RPC_STUB IOpcCertificateSet_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcCertificateSet_GetEnumerator_Proxy(
-    IOpcCertificateSet* This,
-    IOpcCertificateEnumerator **certificateEnumerator);
-void __RPC_STUB IOpcCertificateSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcCertificateSet_INTERFACE_DEFINED__ */
 
@@ -4039,35 +3550,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcDigitalSignatureEnumerator* This,
+        IOpcDigitalSignatureEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcDigitalSignatureEnumerator* This);
+        IOpcDigitalSignatureEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcDigitalSignatureEnumerator* This);
+        IOpcDigitalSignatureEnumerator *This);
 
     /*** IOpcDigitalSignatureEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *MoveNext)(
-        IOpcDigitalSignatureEnumerator* This,
+        IOpcDigitalSignatureEnumerator *This,
         WINBOOL *hasNext);
 
     HRESULT (STDMETHODCALLTYPE *MovePrevious)(
-        IOpcDigitalSignatureEnumerator* This,
+        IOpcDigitalSignatureEnumerator *This,
         WINBOOL *hasPrevious);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrent)(
-        IOpcDigitalSignatureEnumerator* This,
+        IOpcDigitalSignatureEnumerator *This,
         IOpcDigitalSignature **digitalSignature);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IOpcDigitalSignatureEnumerator* This,
+        IOpcDigitalSignatureEnumerator *This,
         IOpcDigitalSignatureEnumerator **copy);
 
     END_INTERFACE
 } IOpcDigitalSignatureEnumeratorVtbl;
+
 interface IOpcDigitalSignatureEnumerator {
     CONST_VTBL IOpcDigitalSignatureEnumeratorVtbl* lpVtbl;
 };
@@ -4112,38 +3624,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_MoveNext_Proxy(
-    IOpcDigitalSignatureEnumerator* This,
-    WINBOOL *hasNext);
-void __RPC_STUB IOpcDigitalSignatureEnumerator_MoveNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_MovePrevious_Proxy(
-    IOpcDigitalSignatureEnumerator* This,
-    WINBOOL *hasPrevious);
-void __RPC_STUB IOpcDigitalSignatureEnumerator_MovePrevious_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_GetCurrent_Proxy(
-    IOpcDigitalSignatureEnumerator* This,
-    IOpcDigitalSignature **digitalSignature);
-void __RPC_STUB IOpcDigitalSignatureEnumerator_GetCurrent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureEnumerator_Clone_Proxy(
-    IOpcDigitalSignatureEnumerator* This,
-    IOpcDigitalSignatureEnumerator **copy);
-void __RPC_STUB IOpcDigitalSignatureEnumerator_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcDigitalSignatureEnumerator_INTERFACE_DEFINED__ */
 
@@ -4199,51 +3679,51 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcDigitalSignatureManager* This);
+        IOpcDigitalSignatureManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcDigitalSignatureManager* This);
+        IOpcDigitalSignatureManager *This);
 
     /*** IOpcDigitalSignatureManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSignatureOriginPartName)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         IOpcPartUri **signatureOriginPartName);
 
     HRESULT (STDMETHODCALLTYPE *SetSignatureOriginPartName)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         IOpcPartUri *signatureOriginPartName);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureEnumerator)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         IOpcDigitalSignatureEnumerator **signatureEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *RemoveSignature)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         IOpcPartUri *signaturePartName);
 
     HRESULT (STDMETHODCALLTYPE *CreateSigningOptions)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         IOpcSigningOptions **signingOptions);
 
     HRESULT (STDMETHODCALLTYPE *Validate)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         IOpcDigitalSignature *signature,
         const CERT_CONTEXT *certificate,
         OPC_SIGNATURE_VALIDATION_RESULT *validationResult);
 
     HRESULT (STDMETHODCALLTYPE *Sign)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         const CERT_CONTEXT *certificate,
         IOpcSigningOptions *signingOptions,
         IOpcDigitalSignature **digitalSignature);
 
     HRESULT (STDMETHODCALLTYPE *ReplaceSignatureXml)(
-        IOpcDigitalSignatureManager* This,
+        IOpcDigitalSignatureManager *This,
         IOpcPartUri *signaturePartName,
         const UINT8 *newSignatureXml,
         UINT32 count,
@@ -4251,6 +3731,7 @@
 
     END_INTERFACE
 } IOpcDigitalSignatureManagerVtbl;
+
 interface IOpcDigitalSignatureManager {
     CONST_VTBL IOpcDigitalSignatureManagerVtbl* lpVtbl;
 };
@@ -4311,77 +3792,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_GetSignatureOriginPartName_Proxy(
-    IOpcDigitalSignatureManager* This,
-    IOpcPartUri **signatureOriginPartName);
-void __RPC_STUB IOpcDigitalSignatureManager_GetSignatureOriginPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_SetSignatureOriginPartName_Proxy(
-    IOpcDigitalSignatureManager* This,
-    IOpcPartUri *signatureOriginPartName);
-void __RPC_STUB IOpcDigitalSignatureManager_SetSignatureOriginPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_GetSignatureEnumerator_Proxy(
-    IOpcDigitalSignatureManager* This,
-    IOpcDigitalSignatureEnumerator **signatureEnumerator);
-void __RPC_STUB IOpcDigitalSignatureManager_GetSignatureEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_RemoveSignature_Proxy(
-    IOpcDigitalSignatureManager* This,
-    IOpcPartUri *signaturePartName);
-void __RPC_STUB IOpcDigitalSignatureManager_RemoveSignature_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_CreateSigningOptions_Proxy(
-    IOpcDigitalSignatureManager* This,
-    IOpcSigningOptions **signingOptions);
-void __RPC_STUB IOpcDigitalSignatureManager_CreateSigningOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_Validate_Proxy(
-    IOpcDigitalSignatureManager* This,
-    IOpcDigitalSignature *signature,
-    const CERT_CONTEXT *certificate,
-    OPC_SIGNATURE_VALIDATION_RESULT *validationResult);
-void __RPC_STUB IOpcDigitalSignatureManager_Validate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_Sign_Proxy(
-    IOpcDigitalSignatureManager* This,
-    const CERT_CONTEXT *certificate,
-    IOpcSigningOptions *signingOptions,
-    IOpcDigitalSignature **digitalSignature);
-void __RPC_STUB IOpcDigitalSignatureManager_Sign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignatureManager_ReplaceSignatureXml_Proxy(
-    IOpcDigitalSignatureManager* This,
-    IOpcPartUri *signaturePartName,
-    const UINT8 *newSignatureXml,
-    UINT32 count,
-    IOpcDigitalSignature **digitalSignature);
-void __RPC_STUB IOpcDigitalSignatureManager_ReplaceSignatureXml_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcDigitalSignatureManager_INTERFACE_DEFINED__ */
 
@@ -4418,34 +3828,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignaturePartReferenceSet* This,
+        IOpcSignaturePartReferenceSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignaturePartReferenceSet* This);
+        IOpcSignaturePartReferenceSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignaturePartReferenceSet* This);
+        IOpcSignaturePartReferenceSet *This);
 
     /*** IOpcSignaturePartReferenceSet methods ***/
     HRESULT (STDMETHODCALLTYPE *Create)(
-        IOpcSignaturePartReferenceSet* This,
+        IOpcSignaturePartReferenceSet *This,
         IOpcPartUri *partUri,
         LPCWSTR digestMethod,
         OPC_CANONICALIZATION_METHOD transformMethod,
         IOpcSignaturePartReference **partReference);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IOpcSignaturePartReferenceSet* This,
+        IOpcSignaturePartReferenceSet *This,
         IOpcSignaturePartReference *partReference);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcSignaturePartReferenceSet* This,
+        IOpcSignaturePartReferenceSet *This,
         IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator);
 
     END_INTERFACE
 } IOpcSignaturePartReferenceSetVtbl;
+
 interface IOpcSignaturePartReferenceSet {
     CONST_VTBL IOpcSignaturePartReferenceSetVtbl* lpVtbl;
 };
@@ -4486,33 +3897,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceSet_Create_Proxy(
-    IOpcSignaturePartReferenceSet* This,
-    IOpcPartUri *partUri,
-    LPCWSTR digestMethod,
-    OPC_CANONICALIZATION_METHOD transformMethod,
-    IOpcSignaturePartReference **partReference);
-void __RPC_STUB IOpcSignaturePartReferenceSet_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceSet_Delete_Proxy(
-    IOpcSignaturePartReferenceSet* This,
-    IOpcSignaturePartReference *partReference);
-void __RPC_STUB IOpcSignaturePartReferenceSet_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignaturePartReferenceSet_GetEnumerator_Proxy(
-    IOpcSignaturePartReferenceSet* This,
-    IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator);
-void __RPC_STUB IOpcSignaturePartReferenceSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignaturePartReferenceSet_INTERFACE_DEFINED__ */
 
@@ -4548,33 +3932,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcRelationshipSelectorSet* This,
+        IOpcRelationshipSelectorSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcRelationshipSelectorSet* This);
+        IOpcRelationshipSelectorSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcRelationshipSelectorSet* This);
+        IOpcRelationshipSelectorSet *This);
 
     /*** IOpcRelationshipSelectorSet methods ***/
     HRESULT (STDMETHODCALLTYPE *Create)(
-        IOpcRelationshipSelectorSet* This,
+        IOpcRelationshipSelectorSet *This,
         OPC_RELATIONSHIP_SELECTOR selector,
         LPCWSTR selectionCriterion,
         IOpcRelationshipSelector **relationshipSelector);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IOpcRelationshipSelectorSet* This,
+        IOpcRelationshipSelectorSet *This,
         IOpcRelationshipSelector *relationshipSelector);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcRelationshipSelectorSet* This,
+        IOpcRelationshipSelectorSet *This,
         IOpcRelationshipSelectorEnumerator **relationshipSelectorEnumerator);
 
     END_INTERFACE
 } IOpcRelationshipSelectorSetVtbl;
+
 interface IOpcRelationshipSelectorSet {
     CONST_VTBL IOpcRelationshipSelectorSetVtbl* lpVtbl;
 };
@@ -4615,32 +4000,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorSet_Create_Proxy(
-    IOpcRelationshipSelectorSet* This,
-    OPC_RELATIONSHIP_SELECTOR selector,
-    LPCWSTR selectionCriterion,
-    IOpcRelationshipSelector **relationshipSelector);
-void __RPC_STUB IOpcRelationshipSelectorSet_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorSet_Delete_Proxy(
-    IOpcRelationshipSelectorSet* This,
-    IOpcRelationshipSelector *relationshipSelector);
-void __RPC_STUB IOpcRelationshipSelectorSet_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcRelationshipSelectorSet_GetEnumerator_Proxy(
-    IOpcRelationshipSelectorSet* This,
-    IOpcRelationshipSelectorEnumerator **relationshipSelectorEnumerator);
-void __RPC_STUB IOpcRelationshipSelectorSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcRelationshipSelectorSet_INTERFACE_DEFINED__ */
 
@@ -4682,19 +4041,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureRelationshipReferenceSet* This,
+        IOpcSignatureRelationshipReferenceSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureRelationshipReferenceSet* This);
+        IOpcSignatureRelationshipReferenceSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureRelationshipReferenceSet* This);
+        IOpcSignatureRelationshipReferenceSet *This);
 
     /*** IOpcSignatureRelationshipReferenceSet methods ***/
     HRESULT (STDMETHODCALLTYPE *Create)(
-        IOpcSignatureRelationshipReferenceSet* This,
+        IOpcSignatureRelationshipReferenceSet *This,
         IOpcUri *sourceUri,
         LPCWSTR digestMethod,
         OPC_RELATIONSHIPS_SIGNING_OPTION relationshipSigningOption,
@@ -4703,19 +4062,20 @@
         IOpcSignatureRelationshipReference **relationshipReference);
 
     HRESULT (STDMETHODCALLTYPE *CreateRelationshipSelectorSet)(
-        IOpcSignatureRelationshipReferenceSet* This,
+        IOpcSignatureRelationshipReferenceSet *This,
         IOpcRelationshipSelectorSet **selectorSet);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IOpcSignatureRelationshipReferenceSet* This,
+        IOpcSignatureRelationshipReferenceSet *This,
         IOpcSignatureRelationshipReference *relationshipReference);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcSignatureRelationshipReferenceSet* This,
+        IOpcSignatureRelationshipReferenceSet *This,
         IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator);
 
     END_INTERFACE
 } IOpcSignatureRelationshipReferenceSetVtbl;
+
 interface IOpcSignatureRelationshipReferenceSet {
     CONST_VTBL IOpcSignatureRelationshipReferenceSetVtbl* lpVtbl;
 };
@@ -4760,43 +4120,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_Create_Proxy(
-    IOpcSignatureRelationshipReferenceSet* This,
-    IOpcUri *sourceUri,
-    LPCWSTR digestMethod,
-    OPC_RELATIONSHIPS_SIGNING_OPTION relationshipSigningOption,
-    IOpcRelationshipSelectorSet *selectorSet,
-    OPC_CANONICALIZATION_METHOD transformMethod,
-    IOpcSignatureRelationshipReference **relationshipReference);
-void __RPC_STUB IOpcSignatureRelationshipReferenceSet_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_CreateRelationshipSelectorSet_Proxy(
-    IOpcSignatureRelationshipReferenceSet* This,
-    IOpcRelationshipSelectorSet **selectorSet);
-void __RPC_STUB IOpcSignatureRelationshipReferenceSet_CreateRelationshipSelectorSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_Delete_Proxy(
-    IOpcSignatureRelationshipReferenceSet* This,
-    IOpcSignatureRelationshipReference *relationshipReference);
-void __RPC_STUB IOpcSignatureRelationshipReferenceSet_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureRelationshipReferenceSet_GetEnumerator_Proxy(
-    IOpcSignatureRelationshipReferenceSet* This,
-    IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator);
-void __RPC_STUB IOpcSignatureRelationshipReferenceSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureRelationshipReferenceSet_INTERFACE_DEFINED__ */
 
@@ -4835,19 +4158,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureReferenceSet* This,
+        IOpcSignatureReferenceSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureReferenceSet* This);
+        IOpcSignatureReferenceSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureReferenceSet* This);
+        IOpcSignatureReferenceSet *This);
 
     /*** IOpcSignatureReferenceSet methods ***/
     HRESULT (STDMETHODCALLTYPE *Create)(
-        IOpcSignatureReferenceSet* This,
+        IOpcSignatureReferenceSet *This,
         IUri *referenceUri,
         LPCWSTR referenceId,
         LPCWSTR type,
@@ -4856,15 +4179,16 @@
         IOpcSignatureReference **reference);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IOpcSignatureReferenceSet* This,
+        IOpcSignatureReferenceSet *This,
         IOpcSignatureReference *reference);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcSignatureReferenceSet* This,
+        IOpcSignatureReferenceSet *This,
         IOpcSignatureReferenceEnumerator **referenceEnumerator);
 
     END_INTERFACE
 } IOpcSignatureReferenceSetVtbl;
+
 interface IOpcSignatureReferenceSet {
     CONST_VTBL IOpcSignatureReferenceSetVtbl* lpVtbl;
 };
@@ -4905,35 +4229,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceSet_Create_Proxy(
-    IOpcSignatureReferenceSet* This,
-    IUri *referenceUri,
-    LPCWSTR referenceId,
-    LPCWSTR type,
-    LPCWSTR digestMethod,
-    OPC_CANONICALIZATION_METHOD transformMethod,
-    IOpcSignatureReference **reference);
-void __RPC_STUB IOpcSignatureReferenceSet_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceSet_Delete_Proxy(
-    IOpcSignatureReferenceSet* This,
-    IOpcSignatureReference *reference);
-void __RPC_STUB IOpcSignatureReferenceSet_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureReferenceSet_GetEnumerator_Proxy(
-    IOpcSignatureReferenceSet* This,
-    IOpcSignatureReferenceEnumerator **referenceEnumerator);
-void __RPC_STUB IOpcSignatureReferenceSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureReferenceSet_INTERFACE_DEFINED__ */
 
@@ -4969,33 +4264,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSignatureCustomObjectSet* This,
+        IOpcSignatureCustomObjectSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSignatureCustomObjectSet* This);
+        IOpcSignatureCustomObjectSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSignatureCustomObjectSet* This);
+        IOpcSignatureCustomObjectSet *This);
 
     /*** IOpcSignatureCustomObjectSet methods ***/
     HRESULT (STDMETHODCALLTYPE *Create)(
-        IOpcSignatureCustomObjectSet* This,
+        IOpcSignatureCustomObjectSet *This,
         const UINT8 *xmlMarkup,
         UINT32 count,
         IOpcSignatureCustomObject **customObject);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IOpcSignatureCustomObjectSet* This,
+        IOpcSignatureCustomObjectSet *This,
         IOpcSignatureCustomObject *customObject);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IOpcSignatureCustomObjectSet* This,
+        IOpcSignatureCustomObjectSet *This,
         IOpcSignatureCustomObjectEnumerator **customObjectEnumerator);
 
     END_INTERFACE
 } IOpcSignatureCustomObjectSetVtbl;
+
 interface IOpcSignatureCustomObjectSet {
     CONST_VTBL IOpcSignatureCustomObjectSetVtbl* lpVtbl;
 };
@@ -5036,32 +4332,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectSet_Create_Proxy(
-    IOpcSignatureCustomObjectSet* This,
-    const UINT8 *xmlMarkup,
-    UINT32 count,
-    IOpcSignatureCustomObject **customObject);
-void __RPC_STUB IOpcSignatureCustomObjectSet_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectSet_Delete_Proxy(
-    IOpcSignatureCustomObjectSet* This,
-    IOpcSignatureCustomObject *customObject);
-void __RPC_STUB IOpcSignatureCustomObjectSet_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSignatureCustomObjectSet_GetEnumerator_Proxy(
-    IOpcSignatureCustomObjectSet* This,
-    IOpcSignatureCustomObjectEnumerator **customObjectEnumerator);
-void __RPC_STUB IOpcSignatureCustomObjectSet_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSignatureCustomObjectSet_INTERFACE_DEFINED__ */
 
@@ -5135,83 +4405,84 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcDigitalSignature* This);
+        IOpcDigitalSignature *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcDigitalSignature* This);
+        IOpcDigitalSignature *This);
 
     /*** IOpcDigitalSignature methods ***/
     HRESULT (STDMETHODCALLTYPE *GetNamespaces)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         LPWSTR **prefixes,
         LPWSTR **namespaces,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureId)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         LPWSTR *signatureId);
 
     HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         IOpcPartUri **signaturePartName);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureMethod)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         LPWSTR *signatureMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetCanonicalizationMethod)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         OPC_CANONICALIZATION_METHOD *canonicalizationMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureValue)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         UINT8 **signatureValue,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetSignaturePartReferenceEnumerator)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureRelationshipReferenceEnumerator)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningTime)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         LPWSTR *signingTime);
 
     HRESULT (STDMETHODCALLTYPE *GetTimeFormat)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         OPC_SIGNATURE_TIME_FORMAT *timeFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetPackageObjectReference)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         IOpcSignatureReference **packageObjectReference);
 
     HRESULT (STDMETHODCALLTYPE *GetCertificateEnumerator)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         IOpcCertificateEnumerator **certificateEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomReferenceEnumerator)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         IOpcSignatureReferenceEnumerator **customReferenceEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomObjectEnumerator)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         IOpcSignatureCustomObjectEnumerator **customObjectEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureXml)(
-        IOpcDigitalSignature* This,
+        IOpcDigitalSignature *This,
         UINT8 **signatureXml,
         UINT32 *count);
 
     END_INTERFACE
 } IOpcDigitalSignatureVtbl;
+
 interface IOpcDigitalSignature {
     CONST_VTBL IOpcDigitalSignatureVtbl* lpVtbl;
 };
@@ -5300,130 +4571,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetNamespaces_Proxy(
-    IOpcDigitalSignature* This,
-    LPWSTR **prefixes,
-    LPWSTR **namespaces,
-    UINT32 *count);
-void __RPC_STUB IOpcDigitalSignature_GetNamespaces_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureId_Proxy(
-    IOpcDigitalSignature* This,
-    LPWSTR *signatureId);
-void __RPC_STUB IOpcDigitalSignature_GetSignatureId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignaturePartName_Proxy(
-    IOpcDigitalSignature* This,
-    IOpcPartUri **signaturePartName);
-void __RPC_STUB IOpcDigitalSignature_GetSignaturePartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureMethod_Proxy(
-    IOpcDigitalSignature* This,
-    LPWSTR *signatureMethod);
-void __RPC_STUB IOpcDigitalSignature_GetSignatureMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCanonicalizationMethod_Proxy(
-    IOpcDigitalSignature* This,
-    OPC_CANONICALIZATION_METHOD *canonicalizationMethod);
-void __RPC_STUB IOpcDigitalSignature_GetCanonicalizationMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureValue_Proxy(
-    IOpcDigitalSignature* This,
-    UINT8 **signatureValue,
-    UINT32 *count);
-void __RPC_STUB IOpcDigitalSignature_GetSignatureValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignaturePartReferenceEnumerator_Proxy(
-    IOpcDigitalSignature* This,
-    IOpcSignaturePartReferenceEnumerator **partReferenceEnumerator);
-void __RPC_STUB IOpcDigitalSignature_GetSignaturePartReferenceEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureRelationshipReferenceEnumerator_Proxy(
-    IOpcDigitalSignature* This,
-    IOpcSignatureRelationshipReferenceEnumerator **relationshipReferenceEnumerator);
-void __RPC_STUB IOpcDigitalSignature_GetSignatureRelationshipReferenceEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSigningTime_Proxy(
-    IOpcDigitalSignature* This,
-    LPWSTR *signingTime);
-void __RPC_STUB IOpcDigitalSignature_GetSigningTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetTimeFormat_Proxy(
-    IOpcDigitalSignature* This,
-    OPC_SIGNATURE_TIME_FORMAT *timeFormat);
-void __RPC_STUB IOpcDigitalSignature_GetTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetPackageObjectReference_Proxy(
-    IOpcDigitalSignature* This,
-    IOpcSignatureReference **packageObjectReference);
-void __RPC_STUB IOpcDigitalSignature_GetPackageObjectReference_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCertificateEnumerator_Proxy(
-    IOpcDigitalSignature* This,
-    IOpcCertificateEnumerator **certificateEnumerator);
-void __RPC_STUB IOpcDigitalSignature_GetCertificateEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCustomReferenceEnumerator_Proxy(
-    IOpcDigitalSignature* This,
-    IOpcSignatureReferenceEnumerator **customReferenceEnumerator);
-void __RPC_STUB IOpcDigitalSignature_GetCustomReferenceEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetCustomObjectEnumerator_Proxy(
-    IOpcDigitalSignature* This,
-    IOpcSignatureCustomObjectEnumerator **customObjectEnumerator);
-void __RPC_STUB IOpcDigitalSignature_GetCustomObjectEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcDigitalSignature_GetSignatureXml_Proxy(
-    IOpcDigitalSignature* This,
-    UINT8 **signatureXml,
-    UINT32 *count);
-void __RPC_STUB IOpcDigitalSignature_GetSignatureXml_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcDigitalSignature_INTERFACE_DEFINED__ */
 
@@ -5499,87 +4646,88 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcSigningOptions* This);
+        IOpcSigningOptions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcSigningOptions* This);
+        IOpcSigningOptions *This);
 
     /*** IOpcSigningOptions methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSignatureId)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         LPWSTR *signatureId);
 
     HRESULT (STDMETHODCALLTYPE *SetSignatureId)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         LPCWSTR signatureId);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureMethod)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         LPWSTR *signatureMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetSignatureMethod)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         LPCWSTR signatureMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultDigestMethod)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         LPWSTR *digestMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultDigestMethod)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         LPCWSTR digestMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetCertificateEmbeddingOption)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         OPC_CERTIFICATE_EMBEDDING_OPTION *embeddingOption);
 
     HRESULT (STDMETHODCALLTYPE *SetCertificateEmbeddingOption)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         OPC_CERTIFICATE_EMBEDDING_OPTION embeddingOption);
 
     HRESULT (STDMETHODCALLTYPE *GetTimeFormat)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         OPC_SIGNATURE_TIME_FORMAT *timeFormat);
 
     HRESULT (STDMETHODCALLTYPE *SetTimeFormat)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         OPC_SIGNATURE_TIME_FORMAT timeFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetSignaturePartReferenceSet)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         IOpcSignaturePartReferenceSet **partReferenceSet);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureRelationshipReferenceSet)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         IOpcSignatureRelationshipReferenceSet **relationshipReferenceSet);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomObjectSet)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         IOpcSignatureCustomObjectSet **customObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomReferenceSet)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         IOpcSignatureReferenceSet **customReferenceSet);
 
     HRESULT (STDMETHODCALLTYPE *GetCertificateSet)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         IOpcCertificateSet **certificateSet);
 
     HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         IOpcPartUri **signaturePartName);
 
     HRESULT (STDMETHODCALLTYPE *SetSignaturePartName)(
-        IOpcSigningOptions* This,
+        IOpcSigningOptions *This,
         IOpcPartUri *signaturePartName);
 
     END_INTERFACE
 } IOpcSigningOptionsVtbl;
+
 interface IOpcSigningOptions {
     CONST_VTBL IOpcSigningOptionsVtbl* lpVtbl;
 };
@@ -5676,142 +4824,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignatureId_Proxy(
-    IOpcSigningOptions* This,
-    LPWSTR *signatureId);
-void __RPC_STUB IOpcSigningOptions_GetSignatureId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetSignatureId_Proxy(
-    IOpcSigningOptions* This,
-    LPCWSTR signatureId);
-void __RPC_STUB IOpcSigningOptions_SetSignatureId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignatureMethod_Proxy(
-    IOpcSigningOptions* This,
-    LPWSTR *signatureMethod);
-void __RPC_STUB IOpcSigningOptions_GetSignatureMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetSignatureMethod_Proxy(
-    IOpcSigningOptions* This,
-    LPCWSTR signatureMethod);
-void __RPC_STUB IOpcSigningOptions_SetSignatureMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetDefaultDigestMethod_Proxy(
-    IOpcSigningOptions* This,
-    LPWSTR *digestMethod);
-void __RPC_STUB IOpcSigningOptions_GetDefaultDigestMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetDefaultDigestMethod_Proxy(
-    IOpcSigningOptions* This,
-    LPCWSTR digestMethod);
-void __RPC_STUB IOpcSigningOptions_SetDefaultDigestMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCertificateEmbeddingOption_Proxy(
-    IOpcSigningOptions* This,
-    OPC_CERTIFICATE_EMBEDDING_OPTION *embeddingOption);
-void __RPC_STUB IOpcSigningOptions_GetCertificateEmbeddingOption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetCertificateEmbeddingOption_Proxy(
-    IOpcSigningOptions* This,
-    OPC_CERTIFICATE_EMBEDDING_OPTION embeddingOption);
-void __RPC_STUB IOpcSigningOptions_SetCertificateEmbeddingOption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetTimeFormat_Proxy(
-    IOpcSigningOptions* This,
-    OPC_SIGNATURE_TIME_FORMAT *timeFormat);
-void __RPC_STUB IOpcSigningOptions_GetTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetTimeFormat_Proxy(
-    IOpcSigningOptions* This,
-    OPC_SIGNATURE_TIME_FORMAT timeFormat);
-void __RPC_STUB IOpcSigningOptions_SetTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignaturePartReferenceSet_Proxy(
-    IOpcSigningOptions* This,
-    IOpcSignaturePartReferenceSet **partReferenceSet);
-void __RPC_STUB IOpcSigningOptions_GetSignaturePartReferenceSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignatureRelationshipReferenceSet_Proxy(
-    IOpcSigningOptions* This,
-    IOpcSignatureRelationshipReferenceSet **relationshipReferenceSet);
-void __RPC_STUB IOpcSigningOptions_GetSignatureRelationshipReferenceSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCustomObjectSet_Proxy(
-    IOpcSigningOptions* This,
-    IOpcSignatureCustomObjectSet **customObjectSet);
-void __RPC_STUB IOpcSigningOptions_GetCustomObjectSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCustomReferenceSet_Proxy(
-    IOpcSigningOptions* This,
-    IOpcSignatureReferenceSet **customReferenceSet);
-void __RPC_STUB IOpcSigningOptions_GetCustomReferenceSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetCertificateSet_Proxy(
-    IOpcSigningOptions* This,
-    IOpcCertificateSet **certificateSet);
-void __RPC_STUB IOpcSigningOptions_GetCertificateSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_GetSignaturePartName_Proxy(
-    IOpcSigningOptions* This,
-    IOpcPartUri **signaturePartName);
-void __RPC_STUB IOpcSigningOptions_GetSignaturePartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcSigningOptions_SetSignaturePartName_Proxy(
-    IOpcSigningOptions* This,
-    IOpcPartUri *signaturePartName);
-void __RPC_STUB IOpcSigningOptions_SetSignaturePartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcSigningOptions_INTERFACE_DEFINED__ */
 
@@ -5867,28 +4879,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpcFactory* This);
+        IOpcFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpcFactory* This);
+        IOpcFactory *This);
 
     /*** IOpcFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreatePackageRootUri)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         IOpcUri **rootUri);
 
     HRESULT (STDMETHODCALLTYPE *CreatePartUri)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         LPCWSTR pwzUri,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *CreateStreamOnFile)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         LPCWSTR filename,
         OPC_STREAM_IO_MODE ioMode,
         LPSECURITY_ATTRIBUTES securityAttributes,
@@ -5896,28 +4908,29 @@
         IStream **stream);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackage)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         IOpcPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *ReadPackageFromStream)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         IStream *stream,
         OPC_READ_FLAGS flags,
         IOpcPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *WritePackageToStream)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         IOpcPackage *package,
         OPC_WRITE_FLAGS flags,
         IStream *stream);
 
     HRESULT (STDMETHODCALLTYPE *CreateDigitalSignatureManager)(
-        IOpcFactory* This,
+        IOpcFactory *This,
         IOpcPackage *package,
         IOpcDigitalSignatureManager **signatureManager);
 
     END_INTERFACE
 } IOpcFactoryVtbl;
+
 interface IOpcFactory {
     CONST_VTBL IOpcFactoryVtbl* lpVtbl;
 };
@@ -5974,60 +4987,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpcFactory_CreatePackageRootUri_Proxy(
-    IOpcFactory* This,
-    IOpcUri **rootUri);
-void __RPC_STUB IOpcFactory_CreatePackageRootUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcFactory_CreatePartUri_Proxy(
-    IOpcFactory* This,
-    LPCWSTR pwzUri,
-    IOpcPartUri **partUri);
-void __RPC_STUB IOpcFactory_CreatePartUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcFactory_CreatePackage_Proxy(
-    IOpcFactory* This,
-    IOpcPackage **package);
-void __RPC_STUB IOpcFactory_CreatePackage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcFactory_ReadPackageFromStream_Proxy(
-    IOpcFactory* This,
-    IStream *stream,
-    OPC_READ_FLAGS flags,
-    IOpcPackage **package);
-void __RPC_STUB IOpcFactory_ReadPackageFromStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcFactory_WritePackageToStream_Proxy(
-    IOpcFactory* This,
-    IOpcPackage *package,
-    OPC_WRITE_FLAGS flags,
-    IStream *stream);
-void __RPC_STUB IOpcFactory_WritePackageToStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpcFactory_CreateDigitalSignatureManager_Proxy(
-    IOpcFactory* This,
-    IOpcPackage *package,
-    IOpcDigitalSignatureManager **signatureManager);
-void __RPC_STUB IOpcFactory_CreateDigitalSignatureManager_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpcFactory_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/msxml.h b/mingw-w64-headers/include/msxml.h
index 13f1286..16778d1 100644
--- a/mingw-w64-headers/include/msxml.h
+++ b/mingw-w64-headers/include/msxml.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/msxml.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/msxml.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/napcertrelyingparty.h b/mingw-w64-headers/include/napcertrelyingparty.h
index ae904ab..28dd283 100644
--- a/mingw-w64-headers/include/napcertrelyingparty.h
+++ b/mingw-w64-headers/include/napcertrelyingparty.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/napcertrelyingparty.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/napcertrelyingparty.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __INapCertRelyingParty_FWD_DEFINED__
 #define __INapCertRelyingParty_FWD_DEFINED__
 typedef interface INapCertRelyingParty INapCertRelyingParty;
+#ifdef __cplusplus
+interface INapCertRelyingParty;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -76,36 +79,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapCertRelyingParty* This,
+        INapCertRelyingParty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapCertRelyingParty* This);
+        INapCertRelyingParty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapCertRelyingParty* This);
+        INapCertRelyingParty *This);
 
     /*** INapCertRelyingParty methods ***/
     HRESULT (STDMETHODCALLTYPE *SubscribeCertByGroup)(
-        INapCertRelyingParty* This,
+        INapCertRelyingParty *This,
         EnforcementEntityId id,
         const BSTR subscriberName,
         const VARIANT *reserved,
         WINBOOL *certExists);
 
     HRESULT (STDMETHODCALLTYPE *UnSubscribeCertByGroup)(
-        INapCertRelyingParty* This,
+        INapCertRelyingParty *This,
         EnforcementEntityId id,
         const VARIANT *reserved);
 
     HRESULT (STDMETHODCALLTYPE *GetSubscribedRelyingParties)(
-        INapCertRelyingParty* This,
+        INapCertRelyingParty *This,
         EnforcementEntityCount *count,
         EnforcementEntityId **relyingParties);
 
     END_INTERFACE
 } INapCertRelyingPartyVtbl;
+
 interface INapCertRelyingParty {
     CONST_VTBL INapCertRelyingPartyVtbl* lpVtbl;
 };
@@ -146,35 +150,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapCertRelyingParty_SubscribeCertByGroup_Proxy(
-    INapCertRelyingParty* This,
-    EnforcementEntityId id,
-    const BSTR subscriberName,
-    const VARIANT *reserved,
-    WINBOOL *certExists);
-void __RPC_STUB INapCertRelyingParty_SubscribeCertByGroup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapCertRelyingParty_UnSubscribeCertByGroup_Proxy(
-    INapCertRelyingParty* This,
-    EnforcementEntityId id,
-    const VARIANT *reserved);
-void __RPC_STUB INapCertRelyingParty_UnSubscribeCertByGroup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapCertRelyingParty_GetSubscribedRelyingParties_Proxy(
-    INapCertRelyingParty* This,
-    EnforcementEntityCount *count,
-    EnforcementEntityId **relyingParties);
-void __RPC_STUB INapCertRelyingParty_GetSubscribedRelyingParties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapCertRelyingParty_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/napcommon.h b/mingw-w64-headers/include/napcommon.h
index 9b5c790..d0b5bfe 100644
--- a/mingw-w64-headers/include/napcommon.h
+++ b/mingw-w64-headers/include/napcommon.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/napcommon.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/napcommon.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __INapComponentConfig_FWD_DEFINED__
 #define __INapComponentConfig_FWD_DEFINED__
 typedef interface INapComponentConfig INapComponentConfig;
+#ifdef __cplusplus
+interface INapComponentConfig;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapComponentInfo_FWD_DEFINED__
 #define __INapComponentInfo_FWD_DEFINED__
 typedef interface INapComponentInfo INapComponentInfo;
+#ifdef __cplusplus
+interface INapComponentInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapComponentConfig2_FWD_DEFINED__
 #define __INapComponentConfig2_FWD_DEFINED__
 typedef interface INapComponentConfig2 INapComponentConfig2;
+#ifdef __cplusplus
+interface INapComponentConfig2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapComponentConfig3_FWD_DEFINED__
 #define __INapComponentConfig3_FWD_DEFINED__
 typedef interface INapComponentConfig3 INapComponentConfig3;
+#ifdef __cplusplus
+interface INapComponentConfig3;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -84,37 +96,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapComponentConfig* This,
+        INapComponentConfig *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapComponentConfig* This);
+        INapComponentConfig *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapComponentConfig* This);
+        INapComponentConfig *This);
 
     /*** INapComponentConfig methods ***/
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        INapComponentConfig* This,
+        INapComponentConfig *This,
         WINBOOL *isSupported);
 
     HRESULT (STDMETHODCALLTYPE *InvokeUI)(
-        INapComponentConfig* This,
+        INapComponentConfig *This,
         HWND hwndParent);
 
     HRESULT (STDMETHODCALLTYPE *GetConfig)(
-        INapComponentConfig* This,
+        INapComponentConfig *This,
         UINT16 *bCount,
         BYTE **data);
 
     HRESULT (STDMETHODCALLTYPE *SetConfig)(
-        INapComponentConfig* This,
+        INapComponentConfig *This,
         UINT16 bCount,
         BYTE *data);
 
     END_INTERFACE
 } INapComponentConfigVtbl;
+
 interface INapComponentConfig {
     CONST_VTBL INapComponentConfigVtbl* lpVtbl;
 };
@@ -159,40 +172,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapComponentConfig_IsUISupported_Proxy(
-    INapComponentConfig* This,
-    WINBOOL *isSupported);
-void __RPC_STUB INapComponentConfig_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig_InvokeUI_Proxy(
-    INapComponentConfig* This,
-    HWND hwndParent);
-void __RPC_STUB INapComponentConfig_InvokeUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig_GetConfig_Proxy(
-    INapComponentConfig* This,
-    UINT16 *bCount,
-    BYTE **data);
-void __RPC_STUB INapComponentConfig_GetConfig_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig_SetConfig_Proxy(
-    INapComponentConfig* This,
-    UINT16 bCount,
-    BYTE *data);
-void __RPC_STUB INapComponentConfig_SetConfig_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapComponentConfig_INTERFACE_DEFINED__ */
 
@@ -241,50 +220,51 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapComponentInfo* This);
+        INapComponentInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapComponentInfo* This);
+        INapComponentInfo *This);
 
     /*** INapComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         MessageId *friendlyName);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         MessageId *description);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorName)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         MessageId *vendorName);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         MessageId *version);
 
     HRESULT (STDMETHODCALLTYPE *GetIcon)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         CountedString **dllFilePath,
         UINT32 *iconResourceId);
 
     HRESULT (STDMETHODCALLTYPE *ConvertErrorCodeToMessageId)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         HRESULT errorCode,
         MessageId *msgId);
 
     HRESULT (STDMETHODCALLTYPE *GetLocalizedString)(
-        INapComponentInfo* This,
+        INapComponentInfo *This,
         MessageId msgId,
         CountedString **string);
 
     END_INTERFACE
 } INapComponentInfoVtbl;
+
 interface INapComponentInfo {
     CONST_VTBL INapComponentInfoVtbl* lpVtbl;
 };
@@ -341,65 +321,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapComponentInfo_GetFriendlyName_Proxy(
-    INapComponentInfo* This,
-    MessageId *friendlyName);
-void __RPC_STUB INapComponentInfo_GetFriendlyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentInfo_GetDescription_Proxy(
-    INapComponentInfo* This,
-    MessageId *description);
-void __RPC_STUB INapComponentInfo_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentInfo_GetVendorName_Proxy(
-    INapComponentInfo* This,
-    MessageId *vendorName);
-void __RPC_STUB INapComponentInfo_GetVendorName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentInfo_GetVersion_Proxy(
-    INapComponentInfo* This,
-    MessageId *version);
-void __RPC_STUB INapComponentInfo_GetVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentInfo_GetIcon_Proxy(
-    INapComponentInfo* This,
-    CountedString **dllFilePath,
-    UINT32 *iconResourceId);
-void __RPC_STUB INapComponentInfo_GetIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentInfo_ConvertErrorCodeToMessageId_Proxy(
-    INapComponentInfo* This,
-    HRESULT errorCode,
-    MessageId *msgId);
-void __RPC_STUB INapComponentInfo_ConvertErrorCodeToMessageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentInfo_GetLocalizedString_Proxy(
-    INapComponentInfo* This,
-    MessageId msgId,
-    CountedString **string);
-void __RPC_STUB INapComponentInfo_GetLocalizedString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapComponentInfo_INTERFACE_DEFINED__ */
 
@@ -440,48 +361,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapComponentConfig2* This);
+        INapComponentConfig2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapComponentConfig2* This);
+        INapComponentConfig2 *This);
 
     /*** INapComponentConfig methods ***/
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         WINBOOL *isSupported);
 
     HRESULT (STDMETHODCALLTYPE *InvokeUI)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         HWND hwndParent);
 
     HRESULT (STDMETHODCALLTYPE *GetConfig)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         UINT16 *bCount,
         BYTE **data);
 
     HRESULT (STDMETHODCALLTYPE *SetConfig)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         UINT16 bCount,
         BYTE *data);
 
     /*** INapComponentConfig2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsRemoteConfigSupported)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         WINBOOL *isSupported,
         UINT8 *remoteConfigType);
 
     HRESULT (STDMETHODCALLTYPE *InvokeUIForMachine)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         HWND hwndParent,
         CountedString *machineName);
 
     HRESULT (STDMETHODCALLTYPE *InvokeUIFromConfigBlob)(
-        INapComponentConfig2* This,
+        INapComponentConfig2 *This,
         HWND hwndParent,
         UINT16 inbCount,
         BYTE *inData,
@@ -491,6 +412,7 @@
 
     END_INTERFACE
 } INapComponentConfig2Vtbl;
+
 interface INapComponentConfig2 {
     CONST_VTBL INapComponentConfig2Vtbl* lpVtbl;
 };
@@ -549,37 +471,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapComponentConfig2_IsRemoteConfigSupported_Proxy(
-    INapComponentConfig2* This,
-    WINBOOL *isSupported,
-    UINT8 *remoteConfigType);
-void __RPC_STUB INapComponentConfig2_IsRemoteConfigSupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig2_InvokeUIForMachine_Proxy(
-    INapComponentConfig2* This,
-    HWND hwndParent,
-    CountedString *machineName);
-void __RPC_STUB INapComponentConfig2_InvokeUIForMachine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig2_InvokeUIFromConfigBlob_Proxy(
-    INapComponentConfig2* This,
-    HWND hwndParent,
-    UINT16 inbCount,
-    BYTE *inData,
-    UINT16 *outbCount,
-    BYTE **outdata,
-    WINBOOL *fConfigChanged);
-void __RPC_STUB INapComponentConfig2_InvokeUIFromConfigBlob_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapComponentConfig2_INTERFACE_DEFINED__ */
 
@@ -623,48 +514,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapComponentConfig3* This);
+        INapComponentConfig3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapComponentConfig3* This);
+        INapComponentConfig3 *This);
 
     /*** INapComponentConfig methods ***/
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         WINBOOL *isSupported);
 
     HRESULT (STDMETHODCALLTYPE *InvokeUI)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         HWND hwndParent);
 
     HRESULT (STDMETHODCALLTYPE *GetConfig)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         UINT16 *bCount,
         BYTE **data);
 
     HRESULT (STDMETHODCALLTYPE *SetConfig)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         UINT16 bCount,
         BYTE *data);
 
     /*** INapComponentConfig2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsRemoteConfigSupported)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         WINBOOL *isSupported,
         UINT8 *remoteConfigType);
 
     HRESULT (STDMETHODCALLTYPE *InvokeUIForMachine)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         HWND hwndParent,
         CountedString *machineName);
 
     HRESULT (STDMETHODCALLTYPE *InvokeUIFromConfigBlob)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         HWND hwndParent,
         UINT16 inbCount,
         BYTE *inData,
@@ -674,30 +565,31 @@
 
     /*** INapComponentConfig3 methods ***/
     HRESULT (STDMETHODCALLTYPE *NewConfig)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         UINT32 configID);
 
     HRESULT (STDMETHODCALLTYPE *DeleteConfig)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         UINT32 configID);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllConfig)(
-        INapComponentConfig3* This);
+        INapComponentConfig3 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetConfigFromID)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         UINT32 configID,
         UINT16 *count,
         BYTE **outdata);
 
     HRESULT (STDMETHODCALLTYPE *SetConfigToID)(
-        INapComponentConfig3* This,
+        INapComponentConfig3 *This,
         UINT32 configID,
         UINT16 count,
         BYTE *data);
 
     END_INTERFACE
 } INapComponentConfig3Vtbl;
+
 interface INapComponentConfig3 {
     CONST_VTBL INapComponentConfig3Vtbl* lpVtbl;
 };
@@ -778,49 +670,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapComponentConfig3_NewConfig_Proxy(
-    INapComponentConfig3* This,
-    UINT32 configID);
-void __RPC_STUB INapComponentConfig3_NewConfig_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig3_DeleteConfig_Proxy(
-    INapComponentConfig3* This,
-    UINT32 configID);
-void __RPC_STUB INapComponentConfig3_DeleteConfig_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig3_DeleteAllConfig_Proxy(
-    INapComponentConfig3* This);
-void __RPC_STUB INapComponentConfig3_DeleteAllConfig_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig3_GetConfigFromID_Proxy(
-    INapComponentConfig3* This,
-    UINT32 configID,
-    UINT16 *count,
-    BYTE **outdata);
-void __RPC_STUB INapComponentConfig3_GetConfigFromID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapComponentConfig3_SetConfigToID_Proxy(
-    INapComponentConfig3* This,
-    UINT32 configID,
-    UINT16 count,
-    BYTE *data);
-void __RPC_STUB INapComponentConfig3_SetConfigToID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapComponentConfig3_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/napenforcementclient.h b/mingw-w64-headers/include/napenforcementclient.h
index 7e822e8..5a66566 100644
--- a/mingw-w64-headers/include/napenforcementclient.h
+++ b/mingw-w64-headers/include/napenforcementclient.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/napenforcementclient.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/napenforcementclient.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __INapEnforcementClientBinding_FWD_DEFINED__
 #define __INapEnforcementClientBinding_FWD_DEFINED__
 typedef interface INapEnforcementClientBinding INapEnforcementClientBinding;
+#ifdef __cplusplus
+interface INapEnforcementClientBinding;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapEnforcementClientCallback_FWD_DEFINED__
 #define __INapEnforcementClientCallback_FWD_DEFINED__
 typedef interface INapEnforcementClientCallback INapEnforcementClientCallback;
+#ifdef __cplusplus
+interface INapEnforcementClientCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapEnforcementClientConnection_FWD_DEFINED__
 #define __INapEnforcementClientConnection_FWD_DEFINED__
 typedef interface INapEnforcementClientConnection INapEnforcementClientConnection;
+#ifdef __cplusplus
+interface INapEnforcementClientConnection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapEnforcementClientConnection2_FWD_DEFINED__
 #define __INapEnforcementClientConnection2_FWD_DEFINED__
 typedef interface INapEnforcementClientConnection2 INapEnforcementClientConnection2;
+#ifdef __cplusplus
+interface INapEnforcementClientConnection2;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -52,21 +64,33 @@
 #ifndef __INapEnforcementClientBinding_FWD_DEFINED__
 #define __INapEnforcementClientBinding_FWD_DEFINED__
 typedef interface INapEnforcementClientBinding INapEnforcementClientBinding;
+#ifdef __cplusplus
+interface INapEnforcementClientBinding;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapEnforcementClientCallback_FWD_DEFINED__
 #define __INapEnforcementClientCallback_FWD_DEFINED__
 typedef interface INapEnforcementClientCallback INapEnforcementClientCallback;
+#ifdef __cplusplus
+interface INapEnforcementClientCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapEnforcementClientConnection_FWD_DEFINED__
 #define __INapEnforcementClientConnection_FWD_DEFINED__
 typedef interface INapEnforcementClientConnection INapEnforcementClientConnection;
+#ifdef __cplusplus
+interface INapEnforcementClientConnection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapEnforcementClientConnection2_FWD_DEFINED__
 #define __INapEnforcementClientConnection2_FWD_DEFINED__
 typedef interface INapEnforcementClientConnection2 INapEnforcementClientConnection2;
+#ifdef __cplusplus
+interface INapEnforcementClientConnection2;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -113,47 +137,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapEnforcementClientBinding* This,
+        INapEnforcementClientBinding *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapEnforcementClientBinding* This);
+        INapEnforcementClientBinding *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapEnforcementClientBinding* This);
+        INapEnforcementClientBinding *This);
 
     /*** INapEnforcementClientBinding methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        INapEnforcementClientBinding* This,
+        INapEnforcementClientBinding *This,
         EnforcementEntityId id,
         INapEnforcementClientCallback *callback);
 
     HRESULT (STDMETHODCALLTYPE *Uninitialize)(
-        INapEnforcementClientBinding* This);
+        INapEnforcementClientBinding *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateConnection)(
-        INapEnforcementClientBinding* This,
+        INapEnforcementClientBinding *This,
         INapEnforcementClientConnection **connection);
 
     HRESULT (STDMETHODCALLTYPE *GetSoHRequest)(
-        INapEnforcementClientBinding* This,
+        INapEnforcementClientBinding *This,
         INapEnforcementClientConnection *connection,
         WINBOOL *retriggerHint);
 
     HRESULT (STDMETHODCALLTYPE *ProcessSoHResponse)(
-        INapEnforcementClientBinding* This,
+        INapEnforcementClientBinding *This,
         INapEnforcementClientConnection *connection);
 
     HRESULT (STDMETHODCALLTYPE *NotifyConnectionStateDown)(
-        INapEnforcementClientBinding* This,
+        INapEnforcementClientBinding *This,
         INapEnforcementClientConnection *downCxn);
 
     HRESULT (STDMETHODCALLTYPE *NotifySoHChangeFailure)(
-        INapEnforcementClientBinding* This);
+        INapEnforcementClientBinding *This);
 
     END_INTERFACE
 } INapEnforcementClientBindingVtbl;
+
 interface INapEnforcementClientBinding {
     CONST_VTBL INapEnforcementClientBindingVtbl* lpVtbl;
 };
@@ -210,62 +235,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_Initialize_Proxy(
-    INapEnforcementClientBinding* This,
-    EnforcementEntityId id,
-    INapEnforcementClientCallback *callback);
-void __RPC_STUB INapEnforcementClientBinding_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_Uninitialize_Proxy(
-    INapEnforcementClientBinding* This);
-void __RPC_STUB INapEnforcementClientBinding_Uninitialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_CreateConnection_Proxy(
-    INapEnforcementClientBinding* This,
-    INapEnforcementClientConnection **connection);
-void __RPC_STUB INapEnforcementClientBinding_CreateConnection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_GetSoHRequest_Proxy(
-    INapEnforcementClientBinding* This,
-    INapEnforcementClientConnection *connection,
-    WINBOOL *retriggerHint);
-void __RPC_STUB INapEnforcementClientBinding_GetSoHRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_ProcessSoHResponse_Proxy(
-    INapEnforcementClientBinding* This,
-    INapEnforcementClientConnection *connection);
-void __RPC_STUB INapEnforcementClientBinding_ProcessSoHResponse_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_NotifyConnectionStateDown_Proxy(
-    INapEnforcementClientBinding* This,
-    INapEnforcementClientConnection *downCxn);
-void __RPC_STUB INapEnforcementClientBinding_NotifyConnectionStateDown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientBinding_NotifySoHChangeFailure_Proxy(
-    INapEnforcementClientBinding* This);
-void __RPC_STUB INapEnforcementClientBinding_NotifySoHChangeFailure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapEnforcementClientBinding_INTERFACE_DEFINED__ */
 
@@ -300,26 +269,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapEnforcementClientCallback* This,
+        INapEnforcementClientCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapEnforcementClientCallback* This);
+        INapEnforcementClientCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapEnforcementClientCallback* This);
+        INapEnforcementClientCallback *This);
 
     /*** INapEnforcementClientCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *NotifySoHChange)(
-        INapEnforcementClientCallback* This);
+        INapEnforcementClientCallback *This);
 
     HRESULT (STDMETHODCALLTYPE *GetConnections)(
-        INapEnforcementClientCallback* This,
+        INapEnforcementClientCallback *This,
         Connections **connections);
 
     END_INTERFACE
 } INapEnforcementClientCallbackVtbl;
+
 interface INapEnforcementClientCallback {
     CONST_VTBL INapEnforcementClientCallbackVtbl* lpVtbl;
 };
@@ -356,21 +326,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapEnforcementClientCallback_NotifySoHChange_Proxy(
-    INapEnforcementClientCallback* This);
-void __RPC_STUB INapEnforcementClientCallback_NotifySoHChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientCallback_GetConnections_Proxy(
-    INapEnforcementClientCallback* This,
-    Connections **connections);
-void __RPC_STUB INapEnforcementClientCallback_GetConnections_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapEnforcementClientCallback_INTERFACE_DEFINED__ */
 
@@ -462,99 +417,100 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapEnforcementClientConnection* This);
+        INapEnforcementClientConnection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapEnforcementClientConnection* This);
+        INapEnforcementClientConnection *This);
 
     /*** INapEnforcementClientConnection methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         EnforcementEntityId id);
 
     HRESULT (STDMETHODCALLTYPE *SetMaxSize)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         ProtocolMaxSize maxSize);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxSize)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         ProtocolMaxSize *maxSize);
 
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         UINT8 flags);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         UINT8 *flags);
 
     HRESULT (STDMETHODCALLTYPE *SetConnectionId)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         const ConnectionId *connectionId);
 
     HRESULT (STDMETHODCALLTYPE *GetConnectionId)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         ConnectionId **connectionId);
 
     HRESULT (STDMETHODCALLTYPE *GetCorrelationId)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         CorrelationId *correlationId);
 
     HRESULT (STDMETHODCALLTYPE *GetStringCorrelationId)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         StringCorrelationId **correlationId);
 
     HRESULT (STDMETHODCALLTYPE *SetCorrelationId)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         CorrelationId correlationId);
 
     HRESULT (STDMETHODCALLTYPE *SetSoHRequest)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         const NetworkSoHRequest *sohRequest);
 
     HRESULT (STDMETHODCALLTYPE *GetSoHRequest)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         NetworkSoHRequest **sohRequest);
 
     HRESULT (STDMETHODCALLTYPE *SetSoHResponse)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         const NetworkSoHResponse *sohResponse);
 
     HRESULT (STDMETHODCALLTYPE *GetSoHResponse)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         NetworkSoHResponse **sohResponse);
 
     HRESULT (STDMETHODCALLTYPE *SetIsolationInfo)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         const IsolationInfo *isolationInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIsolationInfo)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         IsolationInfo **isolationInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetPrivateData)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         const PrivateData *privateData);
 
     HRESULT (STDMETHODCALLTYPE *GetPrivateData)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         PrivateData **privateData);
 
     HRESULT (STDMETHODCALLTYPE *SetEnforcerPrivateData)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         const PrivateData *privateData);
 
     HRESULT (STDMETHODCALLTYPE *GetEnforcerPrivateData)(
-        INapEnforcementClientConnection* This,
+        INapEnforcementClientConnection *This,
         PrivateData **privateData);
 
     END_INTERFACE
 } INapEnforcementClientConnectionVtbl;
+
 interface INapEnforcementClientConnection {
     CONST_VTBL INapEnforcementClientConnectionVtbl* lpVtbl;
 };
@@ -663,166 +619,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_Initialize_Proxy(
-    INapEnforcementClientConnection* This,
-    EnforcementEntityId id);
-void __RPC_STUB INapEnforcementClientConnection_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetMaxSize_Proxy(
-    INapEnforcementClientConnection* This,
-    ProtocolMaxSize maxSize);
-void __RPC_STUB INapEnforcementClientConnection_SetMaxSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetMaxSize_Proxy(
-    INapEnforcementClientConnection* This,
-    ProtocolMaxSize *maxSize);
-void __RPC_STUB INapEnforcementClientConnection_GetMaxSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetFlags_Proxy(
-    INapEnforcementClientConnection* This,
-    UINT8 flags);
-void __RPC_STUB INapEnforcementClientConnection_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetFlags_Proxy(
-    INapEnforcementClientConnection* This,
-    UINT8 *flags);
-void __RPC_STUB INapEnforcementClientConnection_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetConnectionId_Proxy(
-    INapEnforcementClientConnection* This,
-    const ConnectionId *connectionId);
-void __RPC_STUB INapEnforcementClientConnection_SetConnectionId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetConnectionId_Proxy(
-    INapEnforcementClientConnection* This,
-    ConnectionId **connectionId);
-void __RPC_STUB INapEnforcementClientConnection_GetConnectionId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetCorrelationId_Proxy(
-    INapEnforcementClientConnection* This,
-    CorrelationId *correlationId);
-void __RPC_STUB INapEnforcementClientConnection_GetCorrelationId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetStringCorrelationId_Proxy(
-    INapEnforcementClientConnection* This,
-    StringCorrelationId **correlationId);
-void __RPC_STUB INapEnforcementClientConnection_GetStringCorrelationId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetCorrelationId_Proxy(
-    INapEnforcementClientConnection* This,
-    CorrelationId correlationId);
-void __RPC_STUB INapEnforcementClientConnection_SetCorrelationId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetSoHRequest_Proxy(
-    INapEnforcementClientConnection* This,
-    const NetworkSoHRequest *sohRequest);
-void __RPC_STUB INapEnforcementClientConnection_SetSoHRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetSoHRequest_Proxy(
-    INapEnforcementClientConnection* This,
-    NetworkSoHRequest **sohRequest);
-void __RPC_STUB INapEnforcementClientConnection_GetSoHRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetSoHResponse_Proxy(
-    INapEnforcementClientConnection* This,
-    const NetworkSoHResponse *sohResponse);
-void __RPC_STUB INapEnforcementClientConnection_SetSoHResponse_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetSoHResponse_Proxy(
-    INapEnforcementClientConnection* This,
-    NetworkSoHResponse **sohResponse);
-void __RPC_STUB INapEnforcementClientConnection_GetSoHResponse_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetIsolationInfo_Proxy(
-    INapEnforcementClientConnection* This,
-    const IsolationInfo *isolationInfo);
-void __RPC_STUB INapEnforcementClientConnection_SetIsolationInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetIsolationInfo_Proxy(
-    INapEnforcementClientConnection* This,
-    IsolationInfo **isolationInfo);
-void __RPC_STUB INapEnforcementClientConnection_GetIsolationInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetPrivateData_Proxy(
-    INapEnforcementClientConnection* This,
-    const PrivateData *privateData);
-void __RPC_STUB INapEnforcementClientConnection_SetPrivateData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetPrivateData_Proxy(
-    INapEnforcementClientConnection* This,
-    PrivateData **privateData);
-void __RPC_STUB INapEnforcementClientConnection_GetPrivateData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_SetEnforcerPrivateData_Proxy(
-    INapEnforcementClientConnection* This,
-    const PrivateData *privateData);
-void __RPC_STUB INapEnforcementClientConnection_SetEnforcerPrivateData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection_GetEnforcerPrivateData_Proxy(
-    INapEnforcementClientConnection* This,
-    PrivateData **privateData);
-void __RPC_STUB INapEnforcementClientConnection_GetEnforcerPrivateData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapEnforcementClientConnection_INTERFACE_DEFINED__ */
 
@@ -861,118 +657,119 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapEnforcementClientConnection2* This);
+        INapEnforcementClientConnection2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapEnforcementClientConnection2* This);
+        INapEnforcementClientConnection2 *This);
 
     /*** INapEnforcementClientConnection methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         EnforcementEntityId id);
 
     HRESULT (STDMETHODCALLTYPE *SetMaxSize)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         ProtocolMaxSize maxSize);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxSize)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         ProtocolMaxSize *maxSize);
 
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         UINT8 flags);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         UINT8 *flags);
 
     HRESULT (STDMETHODCALLTYPE *SetConnectionId)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         const ConnectionId *connectionId);
 
     HRESULT (STDMETHODCALLTYPE *GetConnectionId)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         ConnectionId **connectionId);
 
     HRESULT (STDMETHODCALLTYPE *GetCorrelationId)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         CorrelationId *correlationId);
 
     HRESULT (STDMETHODCALLTYPE *GetStringCorrelationId)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         StringCorrelationId **correlationId);
 
     HRESULT (STDMETHODCALLTYPE *SetCorrelationId)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         CorrelationId correlationId);
 
     HRESULT (STDMETHODCALLTYPE *SetSoHRequest)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         const NetworkSoHRequest *sohRequest);
 
     HRESULT (STDMETHODCALLTYPE *GetSoHRequest)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         NetworkSoHRequest **sohRequest);
 
     HRESULT (STDMETHODCALLTYPE *SetSoHResponse)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         const NetworkSoHResponse *sohResponse);
 
     HRESULT (STDMETHODCALLTYPE *GetSoHResponse)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         NetworkSoHResponse **sohResponse);
 
     HRESULT (STDMETHODCALLTYPE *SetIsolationInfo)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         const IsolationInfo *isolationInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIsolationInfo)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         IsolationInfo **isolationInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetPrivateData)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         const PrivateData *privateData);
 
     HRESULT (STDMETHODCALLTYPE *GetPrivateData)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         PrivateData **privateData);
 
     HRESULT (STDMETHODCALLTYPE *SetEnforcerPrivateData)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         const PrivateData *privateData);
 
     HRESULT (STDMETHODCALLTYPE *GetEnforcerPrivateData)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         PrivateData **privateData);
 
     /*** INapEnforcementClientConnection2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetIsolationInfoEx)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         const IsolationInfoEx *isolationInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIsolationInfoEx)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         IsolationInfoEx **isolationInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetInstalledShvs)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         SystemHealthEntityCount *count,
         SystemHealthEntityId **ids);
 
     HRESULT (STDMETHODCALLTYPE *SetInstalledShvs)(
-        INapEnforcementClientConnection2* This,
+        INapEnforcementClientConnection2 *This,
         SystemHealthEntityCount count,
         SystemHealthEntityId *ids);
 
     END_INTERFACE
 } INapEnforcementClientConnection2Vtbl;
+
 interface INapEnforcementClientConnection2 {
     CONST_VTBL INapEnforcementClientConnection2Vtbl* lpVtbl;
 };
@@ -1099,40 +896,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_SetIsolationInfoEx_Proxy(
-    INapEnforcementClientConnection2* This,
-    const IsolationInfoEx *isolationInfo);
-void __RPC_STUB INapEnforcementClientConnection2_SetIsolationInfoEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_GetIsolationInfoEx_Proxy(
-    INapEnforcementClientConnection2* This,
-    IsolationInfoEx **isolationInfo);
-void __RPC_STUB INapEnforcementClientConnection2_GetIsolationInfoEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_GetInstalledShvs_Proxy(
-    INapEnforcementClientConnection2* This,
-    SystemHealthEntityCount *count,
-    SystemHealthEntityId **ids);
-void __RPC_STUB INapEnforcementClientConnection2_GetInstalledShvs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapEnforcementClientConnection2_SetInstalledShvs_Proxy(
-    INapEnforcementClientConnection2* This,
-    SystemHealthEntityCount count,
-    SystemHealthEntityId *ids);
-void __RPC_STUB INapEnforcementClientConnection2_SetInstalledShvs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapEnforcementClientConnection2_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/napmanagement.h b/mingw-w64-headers/include/napmanagement.h
index dfdbfb8..5509b3d 100644
--- a/mingw-w64-headers/include/napmanagement.h
+++ b/mingw-w64-headers/include/napmanagement.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/napmanagement.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/napmanagement.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,11 +20,17 @@
 #ifndef __INapClientManagement_FWD_DEFINED__
 #define __INapClientManagement_FWD_DEFINED__
 typedef interface INapClientManagement INapClientManagement;
+#ifdef __cplusplus
+interface INapClientManagement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapClientManagement2_FWD_DEFINED__
 #define __INapClientManagement2_FWD_DEFINED__
 typedef interface INapClientManagement2 INapClientManagement2;
+#ifdef __cplusplus
+interface INapClientManagement2;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -91,57 +97,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapClientManagement* This);
+        INapClientManagement *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapClientManagement* This);
+        INapClientManagement *This);
 
     /*** INapClientManagement methods ***/
     HRESULT (STDMETHODCALLTYPE *GetNapClientInfo)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         WINBOOL *isNapEnabled,
         CountedString **clientName,
         CountedString **clientDescription,
         CountedString **protocolVersion);
 
     HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfo)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         IsolationInfo **isolationInfo,
         WINBOOL *unknownConnections);
 
     HRESULT (STDMETHODCALLTYPE *RegisterSystemHealthAgent)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         const NapComponentRegistrationInfo *agent);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterSystemHealthAgent)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         SystemHealthEntityId id);
 
     HRESULT (STDMETHODCALLTYPE *RegisterEnforcementClient)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         const NapComponentRegistrationInfo *enforcer);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterEnforcementClient)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         EnforcementEntityId id);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisteredSystemHealthAgents)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         SystemHealthEntityCount *count,
         NapComponentRegistrationInfo **agents);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisteredEnforcementClients)(
-        INapClientManagement* This,
+        INapClientManagement *This,
         EnforcementEntityCount *count,
         NapComponentRegistrationInfo **enforcers);
 
     END_INTERFACE
 } INapClientManagementVtbl;
+
 interface INapClientManagement {
     CONST_VTBL INapClientManagementVtbl* lpVtbl;
 };
@@ -202,76 +209,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapClientManagement_GetNapClientInfo_Proxy(
-    INapClientManagement* This,
-    WINBOOL *isNapEnabled,
-    CountedString **clientName,
-    CountedString **clientDescription,
-    CountedString **protocolVersion);
-void __RPC_STUB INapClientManagement_GetNapClientInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapClientManagement_GetSystemIsolationInfo_Proxy(
-    INapClientManagement* This,
-    IsolationInfo **isolationInfo,
-    WINBOOL *unknownConnections);
-void __RPC_STUB INapClientManagement_GetSystemIsolationInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapClientManagement_RegisterSystemHealthAgent_Proxy(
-    INapClientManagement* This,
-    const NapComponentRegistrationInfo *agent);
-void __RPC_STUB INapClientManagement_RegisterSystemHealthAgent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapClientManagement_UnregisterSystemHealthAgent_Proxy(
-    INapClientManagement* This,
-    SystemHealthEntityId id);
-void __RPC_STUB INapClientManagement_UnregisterSystemHealthAgent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapClientManagement_RegisterEnforcementClient_Proxy(
-    INapClientManagement* This,
-    const NapComponentRegistrationInfo *enforcer);
-void __RPC_STUB INapClientManagement_RegisterEnforcementClient_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapClientManagement_UnregisterEnforcementClient_Proxy(
-    INapClientManagement* This,
-    EnforcementEntityId id);
-void __RPC_STUB INapClientManagement_UnregisterEnforcementClient_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapClientManagement_GetRegisteredSystemHealthAgents_Proxy(
-    INapClientManagement* This,
-    SystemHealthEntityCount *count,
-    NapComponentRegistrationInfo **agents);
-void __RPC_STUB INapClientManagement_GetRegisteredSystemHealthAgents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapClientManagement_GetRegisteredEnforcementClients_Proxy(
-    INapClientManagement* This,
-    EnforcementEntityCount *count,
-    NapComponentRegistrationInfo **enforcers);
-void __RPC_STUB INapClientManagement_GetRegisteredEnforcementClients_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapClientManagement_INTERFACE_DEFINED__ */
 
@@ -300,63 +237,64 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapClientManagement2* This);
+        INapClientManagement2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapClientManagement2* This);
+        INapClientManagement2 *This);
 
     /*** INapClientManagement methods ***/
     HRESULT (STDMETHODCALLTYPE *GetNapClientInfo)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         WINBOOL *isNapEnabled,
         CountedString **clientName,
         CountedString **clientDescription,
         CountedString **protocolVersion);
 
     HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfo)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         IsolationInfo **isolationInfo,
         WINBOOL *unknownConnections);
 
     HRESULT (STDMETHODCALLTYPE *RegisterSystemHealthAgent)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         const NapComponentRegistrationInfo *agent);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterSystemHealthAgent)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         SystemHealthEntityId id);
 
     HRESULT (STDMETHODCALLTYPE *RegisterEnforcementClient)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         const NapComponentRegistrationInfo *enforcer);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterEnforcementClient)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         EnforcementEntityId id);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisteredSystemHealthAgents)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         SystemHealthEntityCount *count,
         NapComponentRegistrationInfo **agents);
 
     HRESULT (STDMETHODCALLTYPE *GetRegisteredEnforcementClients)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         EnforcementEntityCount *count,
         NapComponentRegistrationInfo **enforcers);
 
     /*** INapClientManagement2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSystemIsolationInfoEx)(
-        INapClientManagement2* This,
+        INapClientManagement2 *This,
         IsolationInfoEx **isolationInfo,
         WINBOOL *unknownConnections);
 
     END_INTERFACE
 } INapClientManagement2Vtbl;
+
 interface INapClientManagement2 {
     CONST_VTBL INapClientManagement2Vtbl* lpVtbl;
 };
@@ -423,15 +361,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapClientManagement2_GetSystemIsolationInfoEx_Proxy(
-    INapClientManagement2* This,
-    IsolationInfoEx **isolationInfo,
-    WINBOOL *unknownConnections);
-void __RPC_STUB INapClientManagement2_GetSystemIsolationInfoEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapClientManagement2_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/napprotocol.h b/mingw-w64-headers/include/napprotocol.h
index 65df536..e9de5c9 100644
--- a/mingw-w64-headers/include/napprotocol.h
+++ b/mingw-w64-headers/include/napprotocol.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/napprotocol.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/napprotocol.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,11 +20,17 @@
 #ifndef __INapSoHConstructor_FWD_DEFINED__
 #define __INapSoHConstructor_FWD_DEFINED__
 typedef interface INapSoHConstructor INapSoHConstructor;
+#ifdef __cplusplus
+interface INapSoHConstructor;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INapSoHProcessor_FWD_DEFINED__
 #define __INapSoHProcessor_FWD_DEFINED__
 typedef interface INapSoHProcessor INapSoHProcessor;
+#ifdef __cplusplus
+interface INapSoHProcessor;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -133,38 +139,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapSoHConstructor* This,
+        INapSoHConstructor *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapSoHConstructor* This);
+        INapSoHConstructor *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapSoHConstructor* This);
+        INapSoHConstructor *This);
 
     /*** INapSoHConstructor methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        INapSoHConstructor* This,
+        INapSoHConstructor *This,
         SystemHealthEntityId id,
         WINBOOL isRequest);
 
     HRESULT (STDMETHODCALLTYPE *AppendAttribute)(
-        INapSoHConstructor* This,
+        INapSoHConstructor *This,
         SoHAttributeType type,
         const SoHAttributeValue *value);
 
     HRESULT (STDMETHODCALLTYPE *GetSoH)(
-        INapSoHConstructor* This,
+        INapSoHConstructor *This,
         SoH **soh);
 
     HRESULT (STDMETHODCALLTYPE *Validate)(
-        INapSoHConstructor* This,
+        INapSoHConstructor *This,
         const SoH *soh,
         WINBOOL isRequest);
 
     END_INTERFACE
 } INapSoHConstructorVtbl;
+
 interface INapSoHConstructor {
     CONST_VTBL INapSoHConstructorVtbl* lpVtbl;
 };
@@ -209,41 +216,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapSoHConstructor_Initialize_Proxy(
-    INapSoHConstructor* This,
-    SystemHealthEntityId id,
-    WINBOOL isRequest);
-void __RPC_STUB INapSoHConstructor_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapSoHConstructor_AppendAttribute_Proxy(
-    INapSoHConstructor* This,
-    SoHAttributeType type,
-    const SoHAttributeValue *value);
-void __RPC_STUB INapSoHConstructor_AppendAttribute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapSoHConstructor_GetSoH_Proxy(
-    INapSoHConstructor* This,
-    SoH **soh);
-void __RPC_STUB INapSoHConstructor_GetSoH_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapSoHConstructor_Validate_Proxy(
-    INapSoHConstructor* This,
-    const SoH *soh,
-    WINBOOL isRequest);
-void __RPC_STUB INapSoHConstructor_Validate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapSoHConstructor_INTERFACE_DEFINED__ */
 
@@ -286,41 +258,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INapSoHProcessor* This,
+        INapSoHProcessor *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INapSoHProcessor* This);
+        INapSoHProcessor *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INapSoHProcessor* This);
+        INapSoHProcessor *This);
 
     /*** INapSoHProcessor methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        INapSoHProcessor* This,
+        INapSoHProcessor *This,
         const SoH *soh,
         WINBOOL isRequest,
         SystemHealthEntityId *id);
 
     HRESULT (STDMETHODCALLTYPE *FindNextAttribute)(
-        INapSoHProcessor* This,
+        INapSoHProcessor *This,
         UINT16 fromLocation,
         SoHAttributeType type,
         UINT16 *attributeLocation);
 
     HRESULT (STDMETHODCALLTYPE *GetAttribute)(
-        INapSoHProcessor* This,
+        INapSoHProcessor *This,
         UINT16 attributeLocation,
         SoHAttributeType *type,
         SoHAttributeValue **value);
 
     HRESULT (STDMETHODCALLTYPE *GetNumberOfAttributes)(
-        INapSoHProcessor* This,
+        INapSoHProcessor *This,
         UINT16 *attributeCount);
 
     END_INTERFACE
 } INapSoHProcessorVtbl;
+
 interface INapSoHProcessor {
     CONST_VTBL INapSoHProcessorVtbl* lpVtbl;
 };
@@ -365,44 +338,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INapSoHProcessor_Initialize_Proxy(
-    INapSoHProcessor* This,
-    const SoH *soh,
-    WINBOOL isRequest,
-    SystemHealthEntityId *id);
-void __RPC_STUB INapSoHProcessor_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapSoHProcessor_FindNextAttribute_Proxy(
-    INapSoHProcessor* This,
-    UINT16 fromLocation,
-    SoHAttributeType type,
-    UINT16 *attributeLocation);
-void __RPC_STUB INapSoHProcessor_FindNextAttribute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapSoHProcessor_GetAttribute_Proxy(
-    INapSoHProcessor* This,
-    UINT16 attributeLocation,
-    SoHAttributeType *type,
-    SoHAttributeValue **value);
-void __RPC_STUB INapSoHProcessor_GetAttribute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INapSoHProcessor_GetNumberOfAttributes_Proxy(
-    INapSoHProcessor* This,
-    UINT16 *attributeCount);
-void __RPC_STUB INapSoHProcessor_GetNumberOfAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INapSoHProcessor_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/naptypes.h b/mingw-w64-headers/include/naptypes.h
index 2f2a026..846cd56 100644
--- a/mingw-w64-headers/include/naptypes.h
+++ b/mingw-w64-headers/include/naptypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/naptypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/naptypes.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/netfw.h b/mingw-w64-headers/include/netfw.h
index 9c02a12..80c136b 100644
--- a/mingw-w64-headers/include/netfw.h
+++ b/mingw-w64-headers/include/netfw.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/netfw.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/netfw.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/oaidl.h b/mingw-w64-headers/include/oaidl.h
index 5ecfe51..e7fd2e1 100644
--- a/mingw-w64-headers/include/oaidl.h
+++ b/mingw-w64-headers/include/oaidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/oaidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/oaidl.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,101 +20,161 @@
 #ifndef __ICreateTypeInfo_FWD_DEFINED__
 #define __ICreateTypeInfo_FWD_DEFINED__
 typedef interface ICreateTypeInfo ICreateTypeInfo;
+#ifdef __cplusplus
+interface ICreateTypeInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateTypeInfo2_FWD_DEFINED__
 #define __ICreateTypeInfo2_FWD_DEFINED__
 typedef interface ICreateTypeInfo2 ICreateTypeInfo2;
+#ifdef __cplusplus
+interface ICreateTypeInfo2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateTypeLib_FWD_DEFINED__
 #define __ICreateTypeLib_FWD_DEFINED__
 typedef interface ICreateTypeLib ICreateTypeLib;
+#ifdef __cplusplus
+interface ICreateTypeLib;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateTypeLib2_FWD_DEFINED__
 #define __ICreateTypeLib2_FWD_DEFINED__
 typedef interface ICreateTypeLib2 ICreateTypeLib2;
+#ifdef __cplusplus
+interface ICreateTypeLib2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDispatch_FWD_DEFINED__
 #define __IDispatch_FWD_DEFINED__
 typedef interface IDispatch IDispatch;
+#ifdef __cplusplus
+interface IDispatch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumVARIANT_FWD_DEFINED__
 #define __IEnumVARIANT_FWD_DEFINED__
 typedef interface IEnumVARIANT IEnumVARIANT;
+#ifdef __cplusplus
+interface IEnumVARIANT;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeComp_FWD_DEFINED__
 #define __ITypeComp_FWD_DEFINED__
 typedef interface ITypeComp ITypeComp;
+#ifdef __cplusplus
+interface ITypeComp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeInfo_FWD_DEFINED__
 #define __ITypeInfo_FWD_DEFINED__
 typedef interface ITypeInfo ITypeInfo;
+#ifdef __cplusplus
+interface ITypeInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeInfo2_FWD_DEFINED__
 #define __ITypeInfo2_FWD_DEFINED__
 typedef interface ITypeInfo2 ITypeInfo2;
+#ifdef __cplusplus
+interface ITypeInfo2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeLib_FWD_DEFINED__
 #define __ITypeLib_FWD_DEFINED__
 typedef interface ITypeLib ITypeLib;
+#ifdef __cplusplus
+interface ITypeLib;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeLib2_FWD_DEFINED__
 #define __ITypeLib2_FWD_DEFINED__
 typedef interface ITypeLib2 ITypeLib2;
+#ifdef __cplusplus
+interface ITypeLib2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeChangeEvents_FWD_DEFINED__
 #define __ITypeChangeEvents_FWD_DEFINED__
 typedef interface ITypeChangeEvents ITypeChangeEvents;
+#ifdef __cplusplus
+interface ITypeChangeEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IErrorInfo_FWD_DEFINED__
 #define __IErrorInfo_FWD_DEFINED__
 typedef interface IErrorInfo IErrorInfo;
+#ifdef __cplusplus
+interface IErrorInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateErrorInfo_FWD_DEFINED__
 #define __ICreateErrorInfo_FWD_DEFINED__
 typedef interface ICreateErrorInfo ICreateErrorInfo;
+#ifdef __cplusplus
+interface ICreateErrorInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISupportErrorInfo_FWD_DEFINED__
 #define __ISupportErrorInfo_FWD_DEFINED__
 typedef interface ISupportErrorInfo ISupportErrorInfo;
+#ifdef __cplusplus
+interface ISupportErrorInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeFactory_FWD_DEFINED__
 #define __ITypeFactory_FWD_DEFINED__
 typedef interface ITypeFactory ITypeFactory;
+#ifdef __cplusplus
+interface ITypeFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeMarshal_FWD_DEFINED__
 #define __ITypeMarshal_FWD_DEFINED__
 typedef interface ITypeMarshal ITypeMarshal;
+#ifdef __cplusplus
+interface ITypeMarshal;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRecordInfo_FWD_DEFINED__
 #define __IRecordInfo_FWD_DEFINED__
 typedef interface IRecordInfo IRecordInfo;
+#ifdef __cplusplus
+interface IRecordInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IErrorLog_FWD_DEFINED__
 #define __IErrorLog_FWD_DEFINED__
 typedef interface IErrorLog IErrorLog;
+#ifdef __cplusplus
+interface IErrorLog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyBag_FWD_DEFINED__
 #define __IPropertyBag_FWD_DEFINED__
 typedef interface IPropertyBag IPropertyBag;
+#ifdef __cplusplus
+interface IPropertyBag;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -136,21 +196,33 @@
 #ifndef __ICreateTypeInfo_FWD_DEFINED__
 #define __ICreateTypeInfo_FWD_DEFINED__
 typedef interface ICreateTypeInfo ICreateTypeInfo;
+#ifdef __cplusplus
+interface ICreateTypeInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateTypeInfo2_FWD_DEFINED__
 #define __ICreateTypeInfo2_FWD_DEFINED__
 typedef interface ICreateTypeInfo2 ICreateTypeInfo2;
+#ifdef __cplusplus
+interface ICreateTypeInfo2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateTypeLib_FWD_DEFINED__
 #define __ICreateTypeLib_FWD_DEFINED__
 typedef interface ICreateTypeLib ICreateTypeLib;
+#ifdef __cplusplus
+interface ICreateTypeLib;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateTypeLib2_FWD_DEFINED__
 #define __ICreateTypeLib2_FWD_DEFINED__
 typedef interface ICreateTypeLib2 ICreateTypeLib2;
+#ifdef __cplusplus
+interface ICreateTypeLib2;
+#endif /* __cplusplus */
 #endif
 
 #endif
@@ -159,16 +231,25 @@
 #ifndef __IDispatch_FWD_DEFINED__
 #define __IDispatch_FWD_DEFINED__
 typedef interface IDispatch IDispatch;
+#ifdef __cplusplus
+interface IDispatch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumVARIANT_FWD_DEFINED__
 #define __IEnumVARIANT_FWD_DEFINED__
 typedef interface IEnumVARIANT IEnumVARIANT;
+#ifdef __cplusplus
+interface IEnumVARIANT;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeComp_FWD_DEFINED__
 #define __ITypeComp_FWD_DEFINED__
 typedef interface ITypeComp ITypeComp;
+#ifdef __cplusplus
+interface ITypeComp;
+#endif /* __cplusplus */
 #endif
 
 #endif
@@ -177,56 +258,89 @@
 #ifndef __ITypeInfo_FWD_DEFINED__
 #define __ITypeInfo_FWD_DEFINED__
 typedef interface ITypeInfo ITypeInfo;
+#ifdef __cplusplus
+interface ITypeInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeInfo2_FWD_DEFINED__
 #define __ITypeInfo2_FWD_DEFINED__
 typedef interface ITypeInfo2 ITypeInfo2;
+#ifdef __cplusplus
+interface ITypeInfo2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeLib_FWD_DEFINED__
 #define __ITypeLib_FWD_DEFINED__
 typedef interface ITypeLib ITypeLib;
+#ifdef __cplusplus
+interface ITypeLib;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeLib2_FWD_DEFINED__
 #define __ITypeLib2_FWD_DEFINED__
 typedef interface ITypeLib2 ITypeLib2;
+#ifdef __cplusplus
+interface ITypeLib2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeChangeEvents_FWD_DEFINED__
 #define __ITypeChangeEvents_FWD_DEFINED__
 typedef interface ITypeChangeEvents ITypeChangeEvents;
+#ifdef __cplusplus
+interface ITypeChangeEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IErrorInfo_FWD_DEFINED__
 #define __IErrorInfo_FWD_DEFINED__
 typedef interface IErrorInfo IErrorInfo;
+#ifdef __cplusplus
+interface IErrorInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateErrorInfo_FWD_DEFINED__
 #define __ICreateErrorInfo_FWD_DEFINED__
 typedef interface ICreateErrorInfo ICreateErrorInfo;
+#ifdef __cplusplus
+interface ICreateErrorInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISupportErrorInfo_FWD_DEFINED__
 #define __ISupportErrorInfo_FWD_DEFINED__
 typedef interface ISupportErrorInfo ISupportErrorInfo;
+#ifdef __cplusplus
+interface ISupportErrorInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeFactory_FWD_DEFINED__
 #define __ITypeFactory_FWD_DEFINED__
 typedef interface ITypeFactory ITypeFactory;
+#ifdef __cplusplus
+interface ITypeFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITypeMarshal_FWD_DEFINED__
 #define __ITypeMarshal_FWD_DEFINED__
 typedef interface ITypeMarshal ITypeMarshal;
+#ifdef __cplusplus
+interface ITypeMarshal;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRecordInfo_FWD_DEFINED__
 #define __IRecordInfo_FWD_DEFINED__
 typedef interface IRecordInfo IRecordInfo;
+#ifdef __cplusplus
+interface IRecordInfo;
+#endif /* __cplusplus */
 #endif
 
 #endif
@@ -440,7 +554,6 @@
     } __VARIANT_NAME_1;
 };
 
-
 typedef VARIANT *LPVARIANT;
 typedef VARIANT VARIANTARG;
 typedef VARIANT *LPVARIANTARG;
@@ -465,7 +578,6 @@
     byte *pRecord;
 };
 
-
 struct _wireVARIANT {
     DWORD clSize;
     DWORD rpcReserved;
@@ -521,7 +633,6 @@
     } __C89_NAMELESSUNIONNAME;
 };
 
-
 typedef LONG DISPID;
 typedef DISPID MEMBERID;
 typedef DWORD HREFTYPE;
@@ -924,126 +1035,127 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreateTypeInfo* This);
+        ICreateTypeInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreateTypeInfo* This);
+        ICreateTypeInfo *This);
 
     /*** ICreateTypeInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *SetGuid)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *SetTypeFlags)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT uTypeFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetDocString)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         LPOLESTR pStrDoc);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpContext)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetVersion)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         WORD wMajorVerNum,
         WORD wMinorVerNum);
 
     HRESULT (STDMETHODCALLTYPE *AddRefTypeInfo)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         ITypeInfo *pTInfo,
         HREFTYPE *phRefType);
 
     HRESULT (STDMETHODCALLTYPE *AddFuncDesc)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         FUNCDESC *pFuncDesc);
 
     HRESULT (STDMETHODCALLTYPE *AddImplType)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         HREFTYPE hRefType);
 
     HRESULT (STDMETHODCALLTYPE *SetImplTypeFlags)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         INT implTypeFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetAlignment)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         WORD cbAlignment);
 
     HRESULT (STDMETHODCALLTYPE *SetSchema)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         LPOLESTR pStrSchema);
 
     HRESULT (STDMETHODCALLTYPE *AddVarDesc)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         VARDESC *pVarDesc);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncAndParamNames)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         LPOLESTR *rgszNames,
         UINT cNames);
 
     HRESULT (STDMETHODCALLTYPE *SetVarName)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         LPOLESTR szName);
 
     HRESULT (STDMETHODCALLTYPE *SetTypeDescAlias)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         TYPEDESC *pTDescAlias);
 
     HRESULT (STDMETHODCALLTYPE *DefineFuncAsDllEntry)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         LPOLESTR szDllName,
         LPOLESTR szProcName);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncDocString)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         LPOLESTR szDocString);
 
     HRESULT (STDMETHODCALLTYPE *SetVarDocString)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         LPOLESTR szDocString);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncHelpContext)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetVarHelpContext)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetMops)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         UINT index,
         BSTR bstrMops);
 
     HRESULT (STDMETHODCALLTYPE *SetTypeIdldesc)(
-        ICreateTypeInfo* This,
+        ICreateTypeInfo *This,
         IDLDESC *pIdlDesc);
 
     HRESULT (STDMETHODCALLTYPE *LayOut)(
-        ICreateTypeInfo* This);
+        ICreateTypeInfo *This);
 
     END_INTERFACE
 } ICreateTypeInfoVtbl;
+
 interface ICreateTypeInfo {
     CONST_VTBL ICreateTypeInfoVtbl* lpVtbl;
 };
@@ -1164,205 +1276,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetGuid_Proxy(
-    ICreateTypeInfo* This,
-    REFGUID guid);
-void __RPC_STUB ICreateTypeInfo_SetGuid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetTypeFlags_Proxy(
-    ICreateTypeInfo* This,
-    UINT uTypeFlags);
-void __RPC_STUB ICreateTypeInfo_SetTypeFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetDocString_Proxy(
-    ICreateTypeInfo* This,
-    LPOLESTR pStrDoc);
-void __RPC_STUB ICreateTypeInfo_SetDocString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetHelpContext_Proxy(
-    ICreateTypeInfo* This,
-    DWORD dwHelpContext);
-void __RPC_STUB ICreateTypeInfo_SetHelpContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVersion_Proxy(
-    ICreateTypeInfo* This,
-    WORD wMajorVerNum,
-    WORD wMinorVerNum);
-void __RPC_STUB ICreateTypeInfo_SetVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddRefTypeInfo_Proxy(
-    ICreateTypeInfo* This,
-    ITypeInfo *pTInfo,
-    HREFTYPE *phRefType);
-void __RPC_STUB ICreateTypeInfo_AddRefTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddFuncDesc_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    FUNCDESC *pFuncDesc);
-void __RPC_STUB ICreateTypeInfo_AddFuncDesc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddImplType_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    HREFTYPE hRefType);
-void __RPC_STUB ICreateTypeInfo_AddImplType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetImplTypeFlags_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    INT implTypeFlags);
-void __RPC_STUB ICreateTypeInfo_SetImplTypeFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetAlignment_Proxy(
-    ICreateTypeInfo* This,
-    WORD cbAlignment);
-void __RPC_STUB ICreateTypeInfo_SetAlignment_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetSchema_Proxy(
-    ICreateTypeInfo* This,
-    LPOLESTR pStrSchema);
-void __RPC_STUB ICreateTypeInfo_SetSchema_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_AddVarDesc_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    VARDESC *pVarDesc);
-void __RPC_STUB ICreateTypeInfo_AddVarDesc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetFuncAndParamNames_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    LPOLESTR *rgszNames,
-    UINT cNames);
-void __RPC_STUB ICreateTypeInfo_SetFuncAndParamNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVarName_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    LPOLESTR szName);
-void __RPC_STUB ICreateTypeInfo_SetVarName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetTypeDescAlias_Proxy(
-    ICreateTypeInfo* This,
-    TYPEDESC *pTDescAlias);
-void __RPC_STUB ICreateTypeInfo_SetTypeDescAlias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_DefineFuncAsDllEntry_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    LPOLESTR szDllName,
-    LPOLESTR szProcName);
-void __RPC_STUB ICreateTypeInfo_DefineFuncAsDllEntry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetFuncDocString_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    LPOLESTR szDocString);
-void __RPC_STUB ICreateTypeInfo_SetFuncDocString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVarDocString_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    LPOLESTR szDocString);
-void __RPC_STUB ICreateTypeInfo_SetVarDocString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetFuncHelpContext_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    DWORD dwHelpContext);
-void __RPC_STUB ICreateTypeInfo_SetFuncHelpContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetVarHelpContext_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    DWORD dwHelpContext);
-void __RPC_STUB ICreateTypeInfo_SetVarHelpContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetMops_Proxy(
-    ICreateTypeInfo* This,
-    UINT index,
-    BSTR bstrMops);
-void __RPC_STUB ICreateTypeInfo_SetMops_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_SetTypeIdldesc_Proxy(
-    ICreateTypeInfo* This,
-    IDLDESC *pIdlDesc);
-void __RPC_STUB ICreateTypeInfo_SetTypeIdldesc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo_LayOut_Proxy(
-    ICreateTypeInfo* This);
-void __RPC_STUB ICreateTypeInfo_LayOut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreateTypeInfo_INTERFACE_DEFINED__ */
 
@@ -1448,199 +1361,200 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreateTypeInfo2* This);
+        ICreateTypeInfo2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreateTypeInfo2* This);
+        ICreateTypeInfo2 *This);
 
     /*** ICreateTypeInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *SetGuid)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *SetTypeFlags)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT uTypeFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetDocString)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         LPOLESTR pStrDoc);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpContext)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetVersion)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         WORD wMajorVerNum,
         WORD wMinorVerNum);
 
     HRESULT (STDMETHODCALLTYPE *AddRefTypeInfo)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         ITypeInfo *pTInfo,
         HREFTYPE *phRefType);
 
     HRESULT (STDMETHODCALLTYPE *AddFuncDesc)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         FUNCDESC *pFuncDesc);
 
     HRESULT (STDMETHODCALLTYPE *AddImplType)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         HREFTYPE hRefType);
 
     HRESULT (STDMETHODCALLTYPE *SetImplTypeFlags)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         INT implTypeFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetAlignment)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         WORD cbAlignment);
 
     HRESULT (STDMETHODCALLTYPE *SetSchema)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         LPOLESTR pStrSchema);
 
     HRESULT (STDMETHODCALLTYPE *AddVarDesc)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         VARDESC *pVarDesc);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncAndParamNames)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         LPOLESTR *rgszNames,
         UINT cNames);
 
     HRESULT (STDMETHODCALLTYPE *SetVarName)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         LPOLESTR szName);
 
     HRESULT (STDMETHODCALLTYPE *SetTypeDescAlias)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         TYPEDESC *pTDescAlias);
 
     HRESULT (STDMETHODCALLTYPE *DefineFuncAsDllEntry)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         LPOLESTR szDllName,
         LPOLESTR szProcName);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncDocString)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         LPOLESTR szDocString);
 
     HRESULT (STDMETHODCALLTYPE *SetVarDocString)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         LPOLESTR szDocString);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncHelpContext)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetVarHelpContext)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetMops)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         BSTR bstrMops);
 
     HRESULT (STDMETHODCALLTYPE *SetTypeIdldesc)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         IDLDESC *pIdlDesc);
 
     HRESULT (STDMETHODCALLTYPE *LayOut)(
-        ICreateTypeInfo2* This);
+        ICreateTypeInfo2 *This);
 
     /*** ICreateTypeInfo2 methods ***/
     HRESULT (STDMETHODCALLTYPE *DeleteFuncDesc)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index);
 
     HRESULT (STDMETHODCALLTYPE *DeleteFuncDescByMemId)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         MEMBERID memid,
         INVOKEKIND invKind);
 
     HRESULT (STDMETHODCALLTYPE *DeleteVarDesc)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index);
 
     HRESULT (STDMETHODCALLTYPE *DeleteVarDescByMemId)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         MEMBERID memid);
 
     HRESULT (STDMETHODCALLTYPE *DeleteImplType)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index);
 
     HRESULT (STDMETHODCALLTYPE *SetCustData)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncCustData)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *SetParamCustData)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT indexFunc,
         UINT indexParam,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *SetVarCustData)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *SetImplTypeCustData)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpStringContext)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         ULONG dwHelpStringContext);
 
     HRESULT (STDMETHODCALLTYPE *SetFuncHelpStringContext)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         ULONG dwHelpStringContext);
 
     HRESULT (STDMETHODCALLTYPE *SetVarHelpStringContext)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         UINT index,
         ULONG dwHelpStringContext);
 
     HRESULT (STDMETHODCALLTYPE *Invalidate)(
-        ICreateTypeInfo2* This);
+        ICreateTypeInfo2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        ICreateTypeInfo2* This,
+        ICreateTypeInfo2 *This,
         LPOLESTR szName);
 
     END_INTERFACE
 } ICreateTypeInfo2Vtbl;
+
 interface ICreateTypeInfo2 {
     CONST_VTBL ICreateTypeInfo2Vtbl* lpVtbl;
 };
@@ -1823,138 +1737,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteFuncDesc_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index);
-void __RPC_STUB ICreateTypeInfo2_DeleteFuncDesc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteFuncDescByMemId_Proxy(
-    ICreateTypeInfo2* This,
-    MEMBERID memid,
-    INVOKEKIND invKind);
-void __RPC_STUB ICreateTypeInfo2_DeleteFuncDescByMemId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteVarDesc_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index);
-void __RPC_STUB ICreateTypeInfo2_DeleteVarDesc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteVarDescByMemId_Proxy(
-    ICreateTypeInfo2* This,
-    MEMBERID memid);
-void __RPC_STUB ICreateTypeInfo2_DeleteVarDescByMemId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_DeleteImplType_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index);
-void __RPC_STUB ICreateTypeInfo2_DeleteImplType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetCustData_Proxy(
-    ICreateTypeInfo2* This,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ICreateTypeInfo2_SetCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetFuncCustData_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ICreateTypeInfo2_SetFuncCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetParamCustData_Proxy(
-    ICreateTypeInfo2* This,
-    UINT indexFunc,
-    UINT indexParam,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ICreateTypeInfo2_SetParamCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetVarCustData_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ICreateTypeInfo2_SetVarCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetImplTypeCustData_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ICreateTypeInfo2_SetImplTypeCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetHelpStringContext_Proxy(
-    ICreateTypeInfo2* This,
-    ULONG dwHelpStringContext);
-void __RPC_STUB ICreateTypeInfo2_SetHelpStringContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetFuncHelpStringContext_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index,
-    ULONG dwHelpStringContext);
-void __RPC_STUB ICreateTypeInfo2_SetFuncHelpStringContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetVarHelpStringContext_Proxy(
-    ICreateTypeInfo2* This,
-    UINT index,
-    ULONG dwHelpStringContext);
-void __RPC_STUB ICreateTypeInfo2_SetVarHelpStringContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_Invalidate_Proxy(
-    ICreateTypeInfo2* This);
-void __RPC_STUB ICreateTypeInfo2_Invalidate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeInfo2_SetName_Proxy(
-    ICreateTypeInfo2* This,
-    LPOLESTR szName);
-void __RPC_STUB ICreateTypeInfo2_SetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreateTypeInfo2_INTERFACE_DEFINED__ */
 
@@ -2015,61 +1797,62 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreateTypeLib* This);
+        ICreateTypeLib *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreateTypeLib* This);
+        ICreateTypeLib *This);
 
     /*** ICreateTypeLib methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateTypeInfo)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         LPOLESTR szName,
         TYPEKIND tkind,
         ICreateTypeInfo **ppCTInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         LPOLESTR szName);
 
     HRESULT (STDMETHODCALLTYPE *SetVersion)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         WORD wMajorVerNum,
         WORD wMinorVerNum);
 
     HRESULT (STDMETHODCALLTYPE *SetGuid)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *SetDocString)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         LPOLESTR szDoc);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpFileName)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         LPOLESTR szHelpFileName);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpContext)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetLcid)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         LCID lcid);
 
     HRESULT (STDMETHODCALLTYPE *SetLibFlags)(
-        ICreateTypeLib* This,
+        ICreateTypeLib *This,
         UINT uLibFlags);
 
     HRESULT (STDMETHODCALLTYPE *SaveAllChanges)(
-        ICreateTypeLib* This);
+        ICreateTypeLib *This);
 
     END_INTERFACE
 } ICreateTypeLibVtbl;
+
 interface ICreateTypeLib {
     CONST_VTBL ICreateTypeLibVtbl* lpVtbl;
 };
@@ -2138,88 +1921,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_CreateTypeInfo_Proxy(
-    ICreateTypeLib* This,
-    LPOLESTR szName,
-    TYPEKIND tkind,
-    ICreateTypeInfo **ppCTInfo);
-void __RPC_STUB ICreateTypeLib_CreateTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetName_Proxy(
-    ICreateTypeLib* This,
-    LPOLESTR szName);
-void __RPC_STUB ICreateTypeLib_SetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetVersion_Proxy(
-    ICreateTypeLib* This,
-    WORD wMajorVerNum,
-    WORD wMinorVerNum);
-void __RPC_STUB ICreateTypeLib_SetVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetGuid_Proxy(
-    ICreateTypeLib* This,
-    REFGUID guid);
-void __RPC_STUB ICreateTypeLib_SetGuid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetDocString_Proxy(
-    ICreateTypeLib* This,
-    LPOLESTR szDoc);
-void __RPC_STUB ICreateTypeLib_SetDocString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetHelpFileName_Proxy(
-    ICreateTypeLib* This,
-    LPOLESTR szHelpFileName);
-void __RPC_STUB ICreateTypeLib_SetHelpFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetHelpContext_Proxy(
-    ICreateTypeLib* This,
-    DWORD dwHelpContext);
-void __RPC_STUB ICreateTypeLib_SetHelpContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetLcid_Proxy(
-    ICreateTypeLib* This,
-    LCID lcid);
-void __RPC_STUB ICreateTypeLib_SetLcid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SetLibFlags_Proxy(
-    ICreateTypeLib* This,
-    UINT uLibFlags);
-void __RPC_STUB ICreateTypeLib_SetLibFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib_SaveAllChanges_Proxy(
-    ICreateTypeLib* This);
-void __RPC_STUB ICreateTypeLib_SaveAllChanges_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreateTypeLib_INTERFACE_DEFINED__ */
 
@@ -2259,79 +1960,80 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreateTypeLib2* This);
+        ICreateTypeLib2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreateTypeLib2* This);
+        ICreateTypeLib2 *This);
 
     /*** ICreateTypeLib methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateTypeInfo)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         LPOLESTR szName,
         TYPEKIND tkind,
         ICreateTypeInfo **ppCTInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         LPOLESTR szName);
 
     HRESULT (STDMETHODCALLTYPE *SetVersion)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         WORD wMajorVerNum,
         WORD wMinorVerNum);
 
     HRESULT (STDMETHODCALLTYPE *SetGuid)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *SetDocString)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         LPOLESTR szDoc);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpFileName)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         LPOLESTR szHelpFileName);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpContext)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         DWORD dwHelpContext);
 
     HRESULT (STDMETHODCALLTYPE *SetLcid)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         LCID lcid);
 
     HRESULT (STDMETHODCALLTYPE *SetLibFlags)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         UINT uLibFlags);
 
     HRESULT (STDMETHODCALLTYPE *SaveAllChanges)(
-        ICreateTypeLib2* This);
+        ICreateTypeLib2 *This);
 
     /*** ICreateTypeLib2 methods ***/
     HRESULT (STDMETHODCALLTYPE *DeleteTypeInfo)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         LPOLESTR szName);
 
     HRESULT (STDMETHODCALLTYPE *SetCustData)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpStringContext)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         ULONG dwHelpStringContext);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpStringDll)(
-        ICreateTypeLib2* This,
+        ICreateTypeLib2 *This,
         LPOLESTR szFileName);
 
     END_INTERFACE
 } ICreateTypeLib2Vtbl;
+
 interface ICreateTypeLib2 {
     CONST_VTBL ICreateTypeLib2Vtbl* lpVtbl;
 };
@@ -2418,39 +2120,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreateTypeLib2_DeleteTypeInfo_Proxy(
-    ICreateTypeLib2* This,
-    LPOLESTR szName);
-void __RPC_STUB ICreateTypeLib2_DeleteTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib2_SetCustData_Proxy(
-    ICreateTypeLib2* This,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ICreateTypeLib2_SetCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib2_SetHelpStringContext_Proxy(
-    ICreateTypeLib2* This,
-    ULONG dwHelpStringContext);
-void __RPC_STUB ICreateTypeLib2_SetHelpStringContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateTypeLib2_SetHelpStringDll_Proxy(
-    ICreateTypeLib2* This,
-    LPOLESTR szFileName);
-void __RPC_STUB ICreateTypeLib2_SetHelpStringDll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreateTypeLib2_INTERFACE_DEFINED__ */
 
@@ -2523,29 +2192,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDispatch* This,
+        IDispatch *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDispatch* This);
+        IDispatch *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDispatch* This);
+        IDispatch *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IDispatch* This,
+        IDispatch *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IDispatch* This,
+        IDispatch *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IDispatch* This,
+        IDispatch *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2553,7 +2222,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IDispatch* This,
+        IDispatch *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2565,6 +2234,7 @@
 
     END_INTERFACE
 } IDispatchVtbl;
+
 interface IDispatch {
     CONST_VTBL IDispatchVtbl* lpVtbl;
 };
@@ -2609,36 +2279,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDispatch_GetTypeInfoCount_Proxy(
-    IDispatch* This,
-    UINT *pctinfo);
-void __RPC_STUB IDispatch_GetTypeInfoCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatch_GetTypeInfo_Proxy(
-    IDispatch* This,
-    UINT iTInfo,
-    LCID lcid,
-    ITypeInfo **ppTInfo);
-void __RPC_STUB IDispatch_GetTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDispatch_GetIDsOfNames_Proxy(
-    IDispatch* This,
-    REFIID riid,
-    LPOLESTR *rgszNames,
-    UINT cNames,
-    LCID lcid,
-    DISPID *rgDispId);
-void __RPC_STUB IDispatch_GetIDsOfNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IDispatch_RemoteInvoke_Proxy(
     IDispatch* This,
     DISPID dispIdMember,
@@ -2721,36 +2361,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumVARIANT* This,
+        IEnumVARIANT *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumVARIANT* This);
+        IEnumVARIANT *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumVARIANT* This);
+        IEnumVARIANT *This);
 
     /*** IEnumVARIANT methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumVARIANT* This,
+        IEnumVARIANT *This,
         ULONG celt,
         VARIANT *rgVar,
         ULONG *pCeltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumVARIANT* This,
+        IEnumVARIANT *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumVARIANT* This);
+        IEnumVARIANT *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumVARIANT* This,
+        IEnumVARIANT *This,
         IEnumVARIANT **ppEnum);
 
     END_INTERFACE
 } IEnumVARIANTVtbl;
+
 interface IEnumVARIANT {
     CONST_VTBL IEnumVARIANTVtbl* lpVtbl;
 };
@@ -2805,29 +2446,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumVARIANT_Skip_Proxy(
-    IEnumVARIANT* This,
-    ULONG celt);
-void __RPC_STUB IEnumVARIANT_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumVARIANT_Reset_Proxy(
-    IEnumVARIANT* This);
-void __RPC_STUB IEnumVARIANT_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumVARIANT_Clone_Proxy(
-    IEnumVARIANT* This,
-    IEnumVARIANT **ppEnum);
-void __RPC_STUB IEnumVARIANT_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumVARIANT_Next_Proxy(
     IEnumVARIANT* This,
     ULONG celt,
@@ -2895,19 +2513,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeComp* This,
+        ITypeComp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeComp* This);
+        ITypeComp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeComp* This);
+        ITypeComp *This);
 
     /*** ITypeComp methods ***/
     HRESULT (STDMETHODCALLTYPE *Bind)(
-        ITypeComp* This,
+        ITypeComp *This,
         LPOLESTR szName,
         ULONG lHashVal,
         WORD wFlags,
@@ -2916,7 +2534,7 @@
         BINDPTR *pBindPtr);
 
     HRESULT (STDMETHODCALLTYPE *BindType)(
-        ITypeComp* This,
+        ITypeComp *This,
         LPOLESTR szName,
         ULONG lHashVal,
         ITypeInfo **ppTInfo,
@@ -2924,6 +2542,7 @@
 
     END_INTERFACE
 } ITypeCompVtbl;
+
 interface ITypeComp {
     CONST_VTBL ITypeCompVtbl* lpVtbl;
 };
@@ -3132,60 +2751,60 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeInfo* This);
+        ITypeInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeInfo* This);
+        ITypeInfo *This);
 
     /*** ITypeInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeAttr)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         TYPEATTR **ppTypeAttr);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeComp)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         ITypeComp **ppTComp);
 
     HRESULT (STDMETHODCALLTYPE *GetFuncDesc)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         UINT index,
         FUNCDESC **ppFuncDesc);
 
     HRESULT (STDMETHODCALLTYPE *GetVarDesc)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         UINT index,
         VARDESC **ppVarDesc);
 
     HRESULT (STDMETHODCALLTYPE *GetNames)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         MEMBERID memid,
         BSTR *rgBstrNames,
         UINT cMaxNames,
         UINT *pcNames);
 
     HRESULT (STDMETHODCALLTYPE *GetRefTypeOfImplType)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         UINT index,
         HREFTYPE *pRefType);
 
     HRESULT (STDMETHODCALLTYPE *GetImplTypeFlags)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         UINT index,
         INT *pImplTypeFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         LPOLESTR *rgszNames,
         UINT cNames,
         MEMBERID *pMemId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         PVOID pvInstance,
         MEMBERID memid,
         WORD wFlags,
@@ -3195,7 +2814,7 @@
         UINT *puArgErr);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentation)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         MEMBERID memid,
         BSTR *pBstrName,
         BSTR *pBstrDocString,
@@ -3203,7 +2822,7 @@
         BSTR *pBstrHelpFile);
 
     HRESULT (STDMETHODCALLTYPE *GetDllEntry)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         MEMBERID memid,
         INVOKEKIND invKind,
         BSTR *pBstrDllName,
@@ -3211,46 +2830,47 @@
         WORD *pwOrdinal);
 
     HRESULT (STDMETHODCALLTYPE *GetRefTypeInfo)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         HREFTYPE hRefType,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddressOfMember)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         MEMBERID memid,
         INVOKEKIND invKind,
         PVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         IUnknown *pUnkOuter,
         REFIID riid,
         PVOID *ppvObj);
 
     HRESULT (STDMETHODCALLTYPE *GetMops)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         MEMBERID memid,
         BSTR *pBstrMops);
 
     HRESULT (STDMETHODCALLTYPE *GetContainingTypeLib)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         ITypeLib **ppTLib,
         UINT *pIndex);
 
     void (STDMETHODCALLTYPE *ReleaseTypeAttr)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         TYPEATTR *pTypeAttr);
 
     void (STDMETHODCALLTYPE *ReleaseFuncDesc)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         FUNCDESC *pFuncDesc);
 
     void (STDMETHODCALLTYPE *ReleaseVarDesc)(
-        ITypeInfo* This,
+        ITypeInfo *This,
         VARDESC *pVarDesc);
 
     END_INTERFACE
 } ITypeInfoVtbl;
+
 interface ITypeInfo {
     CONST_VTBL ITypeInfoVtbl* lpVtbl;
 };
@@ -3364,14 +2984,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo_GetTypeComp_Proxy(
-    ITypeInfo* This,
-    ITypeComp **ppTComp);
-void __RPC_STUB ITypeInfo_GetTypeComp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeInfo_RemoteGetFuncDesc_Proxy(
     ITypeInfo* This,
     UINT index,
@@ -3403,24 +3015,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo_GetRefTypeOfImplType_Proxy(
-    ITypeInfo* This,
-    UINT index,
-    HREFTYPE *pRefType);
-void __RPC_STUB ITypeInfo_GetRefTypeOfImplType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo_GetImplTypeFlags_Proxy(
-    ITypeInfo* This,
-    UINT index,
-    INT *pImplTypeFlags);
-void __RPC_STUB ITypeInfo_GetImplTypeFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeInfo_LocalGetIDsOfNames_Proxy(
     ITypeInfo* This);
 void __RPC_STUB ITypeInfo_LocalGetIDsOfNames_Stub(
@@ -3461,15 +3055,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo_GetRefTypeInfo_Proxy(
-    ITypeInfo* This,
-    HREFTYPE hRefType,
-    ITypeInfo **ppTInfo);
-void __RPC_STUB ITypeInfo_GetRefTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeInfo_LocalAddressOfMember_Proxy(
     ITypeInfo* This);
 void __RPC_STUB ITypeInfo_LocalAddressOfMember_Stub(
@@ -3486,15 +3071,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo_GetMops_Proxy(
-    ITypeInfo* This,
-    MEMBERID memid,
-    BSTR *pBstrMops);
-void __RPC_STUB ITypeInfo_GetMops_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeInfo_RemoteGetContainingTypeLib_Proxy(
     ITypeInfo* This,
     ITypeLib **ppTLib,
@@ -3743,60 +3319,60 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeInfo2* This);
+        ITypeInfo2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeInfo2* This);
+        ITypeInfo2 *This);
 
     /*** ITypeInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeAttr)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         TYPEATTR **ppTypeAttr);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeComp)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         ITypeComp **ppTComp);
 
     HRESULT (STDMETHODCALLTYPE *GetFuncDesc)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         FUNCDESC **ppFuncDesc);
 
     HRESULT (STDMETHODCALLTYPE *GetVarDesc)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         VARDESC **ppVarDesc);
 
     HRESULT (STDMETHODCALLTYPE *GetNames)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         BSTR *rgBstrNames,
         UINT cMaxNames,
         UINT *pcNames);
 
     HRESULT (STDMETHODCALLTYPE *GetRefTypeOfImplType)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         HREFTYPE *pRefType);
 
     HRESULT (STDMETHODCALLTYPE *GetImplTypeFlags)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         INT *pImplTypeFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         LPOLESTR *rgszNames,
         UINT cNames,
         MEMBERID *pMemId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         PVOID pvInstance,
         MEMBERID memid,
         WORD wFlags,
@@ -3806,7 +3382,7 @@
         UINT *puArgErr);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentation)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         BSTR *pBstrName,
         BSTR *pBstrDocString,
@@ -3814,7 +3390,7 @@
         BSTR *pBstrHelpFile);
 
     HRESULT (STDMETHODCALLTYPE *GetDllEntry)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         INVOKEKIND invKind,
         BSTR *pBstrDllName,
@@ -3822,96 +3398,96 @@
         WORD *pwOrdinal);
 
     HRESULT (STDMETHODCALLTYPE *GetRefTypeInfo)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         HREFTYPE hRefType,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddressOfMember)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         INVOKEKIND invKind,
         PVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         IUnknown *pUnkOuter,
         REFIID riid,
         PVOID *ppvObj);
 
     HRESULT (STDMETHODCALLTYPE *GetMops)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         BSTR *pBstrMops);
 
     HRESULT (STDMETHODCALLTYPE *GetContainingTypeLib)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         ITypeLib **ppTLib,
         UINT *pIndex);
 
     void (STDMETHODCALLTYPE *ReleaseTypeAttr)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         TYPEATTR *pTypeAttr);
 
     void (STDMETHODCALLTYPE *ReleaseFuncDesc)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         FUNCDESC *pFuncDesc);
 
     void (STDMETHODCALLTYPE *ReleaseVarDesc)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         VARDESC *pVarDesc);
 
     /*** ITypeInfo2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeKind)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         TYPEKIND *pTypeKind);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeFlags)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         ULONG *pTypeFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetFuncIndexOfMemId)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         INVOKEKIND invKind,
         UINT *pFuncIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetVarIndexOfMemId)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         UINT *pVarIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *GetFuncCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *GetParamCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT indexFunc,
         UINT indexParam,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *GetVarCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *GetImplTypeCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentation2)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         MEMBERID memid,
         LCID lcid,
         BSTR *pbstrHelpString,
@@ -3919,32 +3495,33 @@
         BSTR *pbstrHelpStringDll);
 
     HRESULT (STDMETHODCALLTYPE *GetAllCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         CUSTDATA *pCustData);
 
     HRESULT (STDMETHODCALLTYPE *GetAllFuncCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         CUSTDATA *pCustData);
 
     HRESULT (STDMETHODCALLTYPE *GetAllParamCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT indexFunc,
         UINT indexParam,
         CUSTDATA *pCustData);
 
     HRESULT (STDMETHODCALLTYPE *GetAllVarCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         CUSTDATA *pCustData);
 
     HRESULT (STDMETHODCALLTYPE *GetAllImplTypeCustData)(
-        ITypeInfo2* This,
+        ITypeInfo2 *This,
         UINT index,
         CUSTDATA *pCustData);
 
     END_INTERFACE
 } ITypeInfo2Vtbl;
+
 interface ITypeInfo2 {
     CONST_VTBL ITypeInfo2Vtbl* lpVtbl;
 };
@@ -4111,91 +3688,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetTypeKind_Proxy(
-    ITypeInfo2* This,
-    TYPEKIND *pTypeKind);
-void __RPC_STUB ITypeInfo2_GetTypeKind_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetTypeFlags_Proxy(
-    ITypeInfo2* This,
-    ULONG *pTypeFlags);
-void __RPC_STUB ITypeInfo2_GetTypeFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetFuncIndexOfMemId_Proxy(
-    ITypeInfo2* This,
-    MEMBERID memid,
-    INVOKEKIND invKind,
-    UINT *pFuncIndex);
-void __RPC_STUB ITypeInfo2_GetFuncIndexOfMemId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetVarIndexOfMemId_Proxy(
-    ITypeInfo2* This,
-    MEMBERID memid,
-    UINT *pVarIndex);
-void __RPC_STUB ITypeInfo2_GetVarIndexOfMemId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetCustData_Proxy(
-    ITypeInfo2* This,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ITypeInfo2_GetCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetFuncCustData_Proxy(
-    ITypeInfo2* This,
-    UINT index,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ITypeInfo2_GetFuncCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetParamCustData_Proxy(
-    ITypeInfo2* This,
-    UINT indexFunc,
-    UINT indexParam,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ITypeInfo2_GetParamCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetVarCustData_Proxy(
-    ITypeInfo2* This,
-    UINT index,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ITypeInfo2_GetVarCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetImplTypeCustData_Proxy(
-    ITypeInfo2* This,
-    UINT index,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ITypeInfo2_GetImplTypeCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeInfo2_RemoteGetDocumentation2_Proxy(
     ITypeInfo2* This,
     MEMBERID memid,
@@ -4209,51 +3701,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllCustData_Proxy(
-    ITypeInfo2* This,
-    CUSTDATA *pCustData);
-void __RPC_STUB ITypeInfo2_GetAllCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllFuncCustData_Proxy(
-    ITypeInfo2* This,
-    UINT index,
-    CUSTDATA *pCustData);
-void __RPC_STUB ITypeInfo2_GetAllFuncCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllParamCustData_Proxy(
-    ITypeInfo2* This,
-    UINT indexFunc,
-    UINT indexParam,
-    CUSTDATA *pCustData);
-void __RPC_STUB ITypeInfo2_GetAllParamCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllVarCustData_Proxy(
-    ITypeInfo2* This,
-    UINT index,
-    CUSTDATA *pCustData);
-void __RPC_STUB ITypeInfo2_GetAllVarCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeInfo2_GetAllImplTypeCustData_Proxy(
-    ITypeInfo2* This,
-    UINT index,
-    CUSTDATA *pCustData);
-void __RPC_STUB ITypeInfo2_GetAllImplTypeCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK ITypeInfo2_GetDocumentation2_Proxy(
     ITypeInfo2* This,
     MEMBERID memid,
@@ -4365,45 +3812,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeLib* This,
+        ITypeLib *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeLib* This);
+        ITypeLib *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeLib* This);
+        ITypeLib *This);
 
     /*** ITypeLib methods ***/
     UINT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ITypeLib* This);
+        ITypeLib *This);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ITypeLib* This,
+        ITypeLib *This,
         UINT index,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoType)(
-        ITypeLib* This,
+        ITypeLib *This,
         UINT index,
         TYPEKIND *pTKind);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoOfGuid)(
-        ITypeLib* This,
+        ITypeLib *This,
         REFGUID guid,
         ITypeInfo **ppTinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetLibAttr)(
-        ITypeLib* This,
+        ITypeLib *This,
         TLIBATTR **ppTLibAttr);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeComp)(
-        ITypeLib* This,
+        ITypeLib *This,
         ITypeComp **ppTComp);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentation)(
-        ITypeLib* This,
+        ITypeLib *This,
         INT index,
         BSTR *pBstrName,
         BSTR *pBstrDocString,
@@ -4411,13 +3858,13 @@
         BSTR *pBstrHelpFile);
 
     HRESULT (STDMETHODCALLTYPE *IsName)(
-        ITypeLib* This,
+        ITypeLib *This,
         LPOLESTR szNameBuf,
         ULONG lHashVal,
         WINBOOL *pfName);
 
     HRESULT (STDMETHODCALLTYPE *FindName)(
-        ITypeLib* This,
+        ITypeLib *This,
         LPOLESTR szNameBuf,
         ULONG lHashVal,
         ITypeInfo **ppTInfo,
@@ -4425,11 +3872,12 @@
         USHORT *pcFound);
 
     void (STDMETHODCALLTYPE *ReleaseTLibAttr)(
-        ITypeLib* This,
+        ITypeLib *This,
         TLIBATTR *pTLibAttr);
 
     END_INTERFACE
 } ITypeLibVtbl;
+
 interface ITypeLib {
     CONST_VTBL ITypeLibVtbl* lpVtbl;
 };
@@ -4506,33 +3954,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeInfo_Proxy(
-    ITypeLib* This,
-    UINT index,
-    ITypeInfo **ppTInfo);
-void __RPC_STUB ITypeLib_GetTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeInfoType_Proxy(
-    ITypeLib* This,
-    UINT index,
-    TYPEKIND *pTKind);
-void __RPC_STUB ITypeLib_GetTypeInfoType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeInfoOfGuid_Proxy(
-    ITypeLib* This,
-    REFGUID guid,
-    ITypeInfo **ppTinfo);
-void __RPC_STUB ITypeLib_GetTypeInfoOfGuid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeLib_RemoteGetLibAttr_Proxy(
     ITypeLib* This,
     LPTLIBATTR *ppTLibAttr,
@@ -4542,14 +3963,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeLib_GetTypeComp_Proxy(
-    ITypeLib* This,
-    ITypeComp **ppTComp);
-void __RPC_STUB ITypeLib_GetTypeComp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeLib_RemoteGetDocumentation_Proxy(
     ITypeLib* This,
     INT index,
@@ -4699,45 +4112,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeLib2* This);
+        ITypeLib2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeLib2* This);
+        ITypeLib2 *This);
 
     /*** ITypeLib methods ***/
     UINT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ITypeLib2* This);
+        ITypeLib2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         UINT index,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoType)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         UINT index,
         TYPEKIND *pTKind);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoOfGuid)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         REFGUID guid,
         ITypeInfo **ppTinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetLibAttr)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         TLIBATTR **ppTLibAttr);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeComp)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         ITypeComp **ppTComp);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentation)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         INT index,
         BSTR *pBstrName,
         BSTR *pBstrDocString,
@@ -4745,13 +4158,13 @@
         BSTR *pBstrHelpFile);
 
     HRESULT (STDMETHODCALLTYPE *IsName)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         LPOLESTR szNameBuf,
         ULONG lHashVal,
         WINBOOL *pfName);
 
     HRESULT (STDMETHODCALLTYPE *FindName)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         LPOLESTR szNameBuf,
         ULONG lHashVal,
         ITypeInfo **ppTInfo,
@@ -4759,22 +4172,22 @@
         USHORT *pcFound);
 
     void (STDMETHODCALLTYPE *ReleaseTLibAttr)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         TLIBATTR *pTLibAttr);
 
     /*** ITypeLib2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCustData)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         REFGUID guid,
         VARIANT *pVarVal);
 
     HRESULT (STDMETHODCALLTYPE *GetLibStatistics)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         ULONG *pcUniqueNames,
         ULONG *pcchUniqueNames);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentation2)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         INT index,
         LCID lcid,
         BSTR *pbstrHelpString,
@@ -4782,11 +4195,12 @@
         BSTR *pbstrHelpStringDll);
 
     HRESULT (STDMETHODCALLTYPE *GetAllCustData)(
-        ITypeLib2* This,
+        ITypeLib2 *This,
         CUSTDATA *pCustData);
 
     END_INTERFACE
 } ITypeLib2Vtbl;
+
 interface ITypeLib2 {
     CONST_VTBL ITypeLib2Vtbl* lpVtbl;
 };
@@ -4873,15 +4287,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITypeLib2_GetCustData_Proxy(
-    ITypeLib2* This,
-    REFGUID guid,
-    VARIANT *pVarVal);
-void __RPC_STUB ITypeLib2_GetCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ITypeLib2_RemoteGetLibStatistics_Proxy(
     ITypeLib2* This,
     ULONG *pcUniqueNames,
@@ -4904,14 +4309,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeLib2_GetAllCustData_Proxy(
-    ITypeLib2* This,
-    CUSTDATA *pCustData);
-void __RPC_STUB ITypeLib2_GetAllCustData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK ITypeLib2_GetLibStatistics_Proxy(
     ITypeLib2* This,
     ULONG *pcUniqueNames,
@@ -4984,32 +4381,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeChangeEvents* This,
+        ITypeChangeEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeChangeEvents* This);
+        ITypeChangeEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeChangeEvents* This);
+        ITypeChangeEvents *This);
 
     /*** ITypeChangeEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *RequestTypeChange)(
-        ITypeChangeEvents* This,
+        ITypeChangeEvents *This,
         CHANGEKIND changeKind,
         ITypeInfo *pTInfoBefore,
         LPOLESTR pStrName,
         INT *pfCancel);
 
     HRESULT (STDMETHODCALLTYPE *AfterTypeChange)(
-        ITypeChangeEvents* This,
+        ITypeChangeEvents *This,
         CHANGEKIND changeKind,
         ITypeInfo *pTInfoAfter,
         LPOLESTR pStrName);
 
     END_INTERFACE
 } ITypeChangeEventsVtbl;
+
 interface ITypeChangeEvents {
     CONST_VTBL ITypeChangeEventsVtbl* lpVtbl;
 };
@@ -5046,27 +4444,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITypeChangeEvents_RequestTypeChange_Proxy(
-    ITypeChangeEvents* This,
-    CHANGEKIND changeKind,
-    ITypeInfo *pTInfoBefore,
-    LPOLESTR pStrName,
-    INT *pfCancel);
-void __RPC_STUB ITypeChangeEvents_RequestTypeChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeChangeEvents_AfterTypeChange_Proxy(
-    ITypeChangeEvents* This,
-    CHANGEKIND changeKind,
-    ITypeInfo *pTInfoAfter,
-    LPOLESTR pStrName);
-void __RPC_STUB ITypeChangeEvents_AfterTypeChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITypeChangeEvents_INTERFACE_DEFINED__ */
 
@@ -5109,39 +4486,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IErrorInfo* This,
+        IErrorInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IErrorInfo* This);
+        IErrorInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IErrorInfo* This);
+        IErrorInfo *This);
 
     /*** IErrorInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IErrorInfo* This,
+        IErrorInfo *This,
         GUID *pGUID);
 
     HRESULT (STDMETHODCALLTYPE *GetSource)(
-        IErrorInfo* This,
+        IErrorInfo *This,
         BSTR *pBstrSource);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IErrorInfo* This,
+        IErrorInfo *This,
         BSTR *pBstrDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetHelpFile)(
-        IErrorInfo* This,
+        IErrorInfo *This,
         BSTR *pBstrHelpFile);
 
     HRESULT (STDMETHODCALLTYPE *GetHelpContext)(
-        IErrorInfo* This,
+        IErrorInfo *This,
         DWORD *pdwHelpContext);
 
     END_INTERFACE
 } IErrorInfoVtbl;
+
 interface IErrorInfo {
     CONST_VTBL IErrorInfoVtbl* lpVtbl;
 };
@@ -5190,46 +4568,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IErrorInfo_GetGUID_Proxy(
-    IErrorInfo* This,
-    GUID *pGUID);
-void __RPC_STUB IErrorInfo_GetGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IErrorInfo_GetSource_Proxy(
-    IErrorInfo* This,
-    BSTR *pBstrSource);
-void __RPC_STUB IErrorInfo_GetSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IErrorInfo_GetDescription_Proxy(
-    IErrorInfo* This,
-    BSTR *pBstrDescription);
-void __RPC_STUB IErrorInfo_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IErrorInfo_GetHelpFile_Proxy(
-    IErrorInfo* This,
-    BSTR *pBstrHelpFile);
-void __RPC_STUB IErrorInfo_GetHelpFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IErrorInfo_GetHelpContext_Proxy(
-    IErrorInfo* This,
-    DWORD *pdwHelpContext);
-void __RPC_STUB IErrorInfo_GetHelpContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IErrorInfo_INTERFACE_DEFINED__ */
 
@@ -5272,39 +4610,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreateErrorInfo* This,
+        ICreateErrorInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreateErrorInfo* This);
+        ICreateErrorInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreateErrorInfo* This);
+        ICreateErrorInfo *This);
 
     /*** ICreateErrorInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        ICreateErrorInfo* This,
+        ICreateErrorInfo *This,
         REFGUID rguid);
 
     HRESULT (STDMETHODCALLTYPE *SetSource)(
-        ICreateErrorInfo* This,
+        ICreateErrorInfo *This,
         LPOLESTR szSource);
 
     HRESULT (STDMETHODCALLTYPE *SetDescription)(
-        ICreateErrorInfo* This,
+        ICreateErrorInfo *This,
         LPOLESTR szDescription);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpFile)(
-        ICreateErrorInfo* This,
+        ICreateErrorInfo *This,
         LPOLESTR szHelpFile);
 
     HRESULT (STDMETHODCALLTYPE *SetHelpContext)(
-        ICreateErrorInfo* This,
+        ICreateErrorInfo *This,
         DWORD dwHelpContext);
 
     END_INTERFACE
 } ICreateErrorInfoVtbl;
+
 interface ICreateErrorInfo {
     CONST_VTBL ICreateErrorInfoVtbl* lpVtbl;
 };
@@ -5353,46 +4692,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetGUID_Proxy(
-    ICreateErrorInfo* This,
-    REFGUID rguid);
-void __RPC_STUB ICreateErrorInfo_SetGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetSource_Proxy(
-    ICreateErrorInfo* This,
-    LPOLESTR szSource);
-void __RPC_STUB ICreateErrorInfo_SetSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetDescription_Proxy(
-    ICreateErrorInfo* This,
-    LPOLESTR szDescription);
-void __RPC_STUB ICreateErrorInfo_SetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetHelpFile_Proxy(
-    ICreateErrorInfo* This,
-    LPOLESTR szHelpFile);
-void __RPC_STUB ICreateErrorInfo_SetHelpFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICreateErrorInfo_SetHelpContext_Proxy(
-    ICreateErrorInfo* This,
-    DWORD dwHelpContext);
-void __RPC_STUB ICreateErrorInfo_SetHelpContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreateErrorInfo_INTERFACE_DEFINED__ */
 
@@ -5423,23 +4722,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISupportErrorInfo* This,
+        ISupportErrorInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISupportErrorInfo* This);
+        ISupportErrorInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISupportErrorInfo* This);
+        ISupportErrorInfo *This);
 
     /*** ISupportErrorInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *InterfaceSupportsErrorInfo)(
-        ISupportErrorInfo* This,
+        ISupportErrorInfo *This,
         REFIID riid);
 
     END_INTERFACE
 } ISupportErrorInfoVtbl;
+
 interface ISupportErrorInfo {
     CONST_VTBL ISupportErrorInfoVtbl* lpVtbl;
 };
@@ -5472,14 +4772,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISupportErrorInfo_InterfaceSupportsErrorInfo_Proxy(
-    ISupportErrorInfo* This,
-    REFIID riid);
-void __RPC_STUB ISupportErrorInfo_InterfaceSupportsErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISupportErrorInfo_INTERFACE_DEFINED__ */
 
@@ -5510,25 +4802,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeFactory* This,
+        ITypeFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeFactory* This);
+        ITypeFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeFactory* This);
+        ITypeFactory *This);
 
     /*** ITypeFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateFromTypeInfo)(
-        ITypeFactory* This,
+        ITypeFactory *This,
         ITypeInfo *pTypeInfo,
         REFIID riid,
         IUnknown **ppv);
 
     END_INTERFACE
 } ITypeFactoryVtbl;
+
 interface ITypeFactory {
     CONST_VTBL ITypeFactoryVtbl* lpVtbl;
 };
@@ -5561,16 +4854,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITypeFactory_CreateFromTypeInfo_Proxy(
-    ITypeFactory* This,
-    ITypeInfo *pTypeInfo,
-    REFIID riid,
-    IUnknown **ppv);
-void __RPC_STUB ITypeFactory_CreateFromTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITypeFactory_INTERFACE_DEFINED__ */
 
@@ -5620,26 +4903,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeMarshal* This,
+        ITypeMarshal *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeMarshal* This);
+        ITypeMarshal *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeMarshal* This);
+        ITypeMarshal *This);
 
     /*** ITypeMarshal methods ***/
     HRESULT (STDMETHODCALLTYPE *Size)(
-        ITypeMarshal* This,
+        ITypeMarshal *This,
         PVOID pvType,
         DWORD dwDestContext,
         PVOID pvDestContext,
         ULONG *pSize);
 
     HRESULT (STDMETHODCALLTYPE *Marshal)(
-        ITypeMarshal* This,
+        ITypeMarshal *This,
         PVOID pvType,
         DWORD dwDestContext,
         PVOID pvDestContext,
@@ -5648,7 +4931,7 @@
         ULONG *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Unmarshal)(
-        ITypeMarshal* This,
+        ITypeMarshal *This,
         PVOID pvType,
         DWORD dwFlags,
         ULONG cbBufferLength,
@@ -5656,11 +4939,12 @@
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Free)(
-        ITypeMarshal* This,
+        ITypeMarshal *This,
         PVOID pvType);
 
     END_INTERFACE
 } ITypeMarshalVtbl;
+
 interface ITypeMarshal {
     CONST_VTBL ITypeMarshalVtbl* lpVtbl;
 };
@@ -5705,50 +4989,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITypeMarshal_Size_Proxy(
-    ITypeMarshal* This,
-    PVOID pvType,
-    DWORD dwDestContext,
-    PVOID pvDestContext,
-    ULONG *pSize);
-void __RPC_STUB ITypeMarshal_Size_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeMarshal_Marshal_Proxy(
-    ITypeMarshal* This,
-    PVOID pvType,
-    DWORD dwDestContext,
-    PVOID pvDestContext,
-    ULONG cbBufferLength,
-    BYTE *pBuffer,
-    ULONG *pcbWritten);
-void __RPC_STUB ITypeMarshal_Marshal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeMarshal_Unmarshal_Proxy(
-    ITypeMarshal* This,
-    PVOID pvType,
-    DWORD dwFlags,
-    ULONG cbBufferLength,
-    BYTE *pBuffer,
-    ULONG *pcbRead);
-void __RPC_STUB ITypeMarshal_Unmarshal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITypeMarshal_Free_Proxy(
-    ITypeMarshal* This,
-    PVOID pvType);
-void __RPC_STUB ITypeMarshal_Free_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITypeMarshal_INTERFACE_DEFINED__ */
 
@@ -5838,96 +5078,97 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRecordInfo* This);
+        IRecordInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRecordInfo* This);
+        IRecordInfo *This);
 
     /*** IRecordInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *RecordInit)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         PVOID pvNew);
 
     HRESULT (STDMETHODCALLTYPE *RecordClear)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         PVOID pvExisting);
 
     HRESULT (STDMETHODCALLTYPE *RecordCopy)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         PVOID pvExisting,
         PVOID pvNew);
 
     HRESULT (STDMETHODCALLTYPE *GetGuid)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         GUID *pguid);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         BSTR *pbstrName);
 
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         ULONG *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         ITypeInfo **ppTypeInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetField)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         PVOID pvData,
         LPCOLESTR szFieldName,
         VARIANT *pvarField);
 
     HRESULT (STDMETHODCALLTYPE *GetFieldNoCopy)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         PVOID pvData,
         LPCOLESTR szFieldName,
         VARIANT *pvarField,
         PVOID *ppvDataCArray);
 
     HRESULT (STDMETHODCALLTYPE *PutField)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         ULONG wFlags,
         PVOID pvData,
         LPCOLESTR szFieldName,
         VARIANT *pvarField);
 
     HRESULT (STDMETHODCALLTYPE *PutFieldNoCopy)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         ULONG wFlags,
         PVOID pvData,
         LPCOLESTR szFieldName,
         VARIANT *pvarField);
 
     HRESULT (STDMETHODCALLTYPE *GetFieldNames)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         ULONG *pcNames,
         BSTR *rgBstrNames);
 
     WINBOOL (STDMETHODCALLTYPE *IsMatchingType)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         IRecordInfo *pRecordInfo);
 
     PVOID (STDMETHODCALLTYPE *RecordCreate)(
-        IRecordInfo* This);
+        IRecordInfo *This);
 
     HRESULT (STDMETHODCALLTYPE *RecordCreateCopy)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         PVOID pvSource,
         PVOID *ppvDest);
 
     HRESULT (STDMETHODCALLTYPE *RecordDestroy)(
-        IRecordInfo* This,
+        IRecordInfo *This,
         PVOID pvRecord);
 
     END_INTERFACE
 } IRecordInfoVtbl;
+
 interface IRecordInfo {
     CONST_VTBL IRecordInfoVtbl* lpVtbl;
 };
@@ -6020,147 +5261,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IRecordInfo_RecordInit_Proxy(
-    IRecordInfo* This,
-    PVOID pvNew);
-void __RPC_STUB IRecordInfo_RecordInit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_RecordClear_Proxy(
-    IRecordInfo* This,
-    PVOID pvExisting);
-void __RPC_STUB IRecordInfo_RecordClear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_RecordCopy_Proxy(
-    IRecordInfo* This,
-    PVOID pvExisting,
-    PVOID pvNew);
-void __RPC_STUB IRecordInfo_RecordCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_GetGuid_Proxy(
-    IRecordInfo* This,
-    GUID *pguid);
-void __RPC_STUB IRecordInfo_GetGuid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_GetName_Proxy(
-    IRecordInfo* This,
-    BSTR *pbstrName);
-void __RPC_STUB IRecordInfo_GetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_GetSize_Proxy(
-    IRecordInfo* This,
-    ULONG *pcbSize);
-void __RPC_STUB IRecordInfo_GetSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_GetTypeInfo_Proxy(
-    IRecordInfo* This,
-    ITypeInfo **ppTypeInfo);
-void __RPC_STUB IRecordInfo_GetTypeInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_GetField_Proxy(
-    IRecordInfo* This,
-    PVOID pvData,
-    LPCOLESTR szFieldName,
-    VARIANT *pvarField);
-void __RPC_STUB IRecordInfo_GetField_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_GetFieldNoCopy_Proxy(
-    IRecordInfo* This,
-    PVOID pvData,
-    LPCOLESTR szFieldName,
-    VARIANT *pvarField,
-    PVOID *ppvDataCArray);
-void __RPC_STUB IRecordInfo_GetFieldNoCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_PutField_Proxy(
-    IRecordInfo* This,
-    ULONG wFlags,
-    PVOID pvData,
-    LPCOLESTR szFieldName,
-    VARIANT *pvarField);
-void __RPC_STUB IRecordInfo_PutField_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_PutFieldNoCopy_Proxy(
-    IRecordInfo* This,
-    ULONG wFlags,
-    PVOID pvData,
-    LPCOLESTR szFieldName,
-    VARIANT *pvarField);
-void __RPC_STUB IRecordInfo_PutFieldNoCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_GetFieldNames_Proxy(
-    IRecordInfo* This,
-    ULONG *pcNames,
-    BSTR *rgBstrNames);
-void __RPC_STUB IRecordInfo_GetFieldNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-WINBOOL STDMETHODCALLTYPE IRecordInfo_IsMatchingType_Proxy(
-    IRecordInfo* This,
-    IRecordInfo *pRecordInfo);
-void __RPC_STUB IRecordInfo_IsMatchingType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-PVOID STDMETHODCALLTYPE IRecordInfo_RecordCreate_Proxy(
-    IRecordInfo* This);
-void __RPC_STUB IRecordInfo_RecordCreate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_RecordCreateCopy_Proxy(
-    IRecordInfo* This,
-    PVOID pvSource,
-    PVOID *ppvDest);
-void __RPC_STUB IRecordInfo_RecordCreateCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRecordInfo_RecordDestroy_Proxy(
-    IRecordInfo* This,
-    PVOID pvRecord);
-void __RPC_STUB IRecordInfo_RecordDestroy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IRecordInfo_INTERFACE_DEFINED__ */
 
@@ -6192,24 +5292,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IErrorLog* This,
+        IErrorLog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IErrorLog* This);
+        IErrorLog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IErrorLog* This);
+        IErrorLog *This);
 
     /*** IErrorLog methods ***/
     HRESULT (STDMETHODCALLTYPE *AddError)(
-        IErrorLog* This,
+        IErrorLog *This,
         LPCOLESTR pszPropName,
         EXCEPINFO *pExcepInfo);
 
     END_INTERFACE
 } IErrorLogVtbl;
+
 interface IErrorLog {
     CONST_VTBL IErrorLogVtbl* lpVtbl;
 };
@@ -6242,15 +5343,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IErrorLog_AddError_Proxy(
-    IErrorLog* This,
-    LPCOLESTR pszPropName,
-    EXCEPINFO *pExcepInfo);
-void __RPC_STUB IErrorLog_AddError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IErrorLog_INTERFACE_DEFINED__ */
 
@@ -6287,30 +5379,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyBag* This,
+        IPropertyBag *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyBag* This);
+        IPropertyBag *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyBag* This);
+        IPropertyBag *This);
 
     /*** IPropertyBag methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IPropertyBag* This,
+        IPropertyBag *This,
         LPCOLESTR pszPropName,
         VARIANT *pVar,
         IErrorLog *pErrorLog);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IPropertyBag* This,
+        IPropertyBag *This,
         LPCOLESTR pszPropName,
         VARIANT *pVar);
 
     END_INTERFACE
 } IPropertyBagVtbl;
+
 interface IPropertyBag {
     CONST_VTBL IPropertyBagVtbl* lpVtbl;
 };
@@ -6359,15 +5452,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyBag_Write_Proxy(
-    IPropertyBag* This,
-    LPCOLESTR pszPropName,
-    VARIANT *pVar);
-void __RPC_STUB IPropertyBag_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IPropertyBag_Read_Proxy(
     IPropertyBag* This,
     LPCOLESTR pszPropName,
diff --git a/mingw-w64-headers/include/objectarray.h b/mingw-w64-headers/include/objectarray.h
index c45030e..a696374 100644
--- a/mingw-w64-headers/include/objectarray.h
+++ b/mingw-w64-headers/include/objectarray.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/objectarray.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/objectarray.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/ocidl.h b/mingw-w64-headers/include/ocidl.h
index 60218ea..6df64e5 100644
--- a/mingw-w64-headers/include/ocidl.h
+++ b/mingw-w64-headers/include/ocidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/ocidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/ocidl.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,201 +20,321 @@
 #ifndef __IEnumConnections_FWD_DEFINED__
 #define __IEnumConnections_FWD_DEFINED__
 typedef interface IEnumConnections IEnumConnections;
+#ifdef __cplusplus
+interface IEnumConnections;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConnectionPoint_FWD_DEFINED__
 #define __IConnectionPoint_FWD_DEFINED__
 typedef interface IConnectionPoint IConnectionPoint;
+#ifdef __cplusplus
+interface IConnectionPoint;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumConnectionPoints_FWD_DEFINED__
 #define __IEnumConnectionPoints_FWD_DEFINED__
 typedef interface IEnumConnectionPoints IEnumConnectionPoints;
+#ifdef __cplusplus
+interface IEnumConnectionPoints;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConnectionPointContainer_FWD_DEFINED__
 #define __IConnectionPointContainer_FWD_DEFINED__
 typedef interface IConnectionPointContainer IConnectionPointContainer;
+#ifdef __cplusplus
+interface IConnectionPointContainer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IClassFactory2_FWD_DEFINED__
 #define __IClassFactory2_FWD_DEFINED__
 typedef interface IClassFactory2 IClassFactory2;
+#ifdef __cplusplus
+interface IClassFactory2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProvideClassInfo_FWD_DEFINED__
 #define __IProvideClassInfo_FWD_DEFINED__
 typedef interface IProvideClassInfo IProvideClassInfo;
+#ifdef __cplusplus
+interface IProvideClassInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProvideClassInfo2_FWD_DEFINED__
 #define __IProvideClassInfo2_FWD_DEFINED__
 typedef interface IProvideClassInfo2 IProvideClassInfo2;
+#ifdef __cplusplus
+interface IProvideClassInfo2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProvideMultipleClassInfo_FWD_DEFINED__
 #define __IProvideMultipleClassInfo_FWD_DEFINED__
 typedef interface IProvideMultipleClassInfo IProvideMultipleClassInfo;
+#ifdef __cplusplus
+interface IProvideMultipleClassInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleControl_FWD_DEFINED__
 #define __IOleControl_FWD_DEFINED__
 typedef interface IOleControl IOleControl;
+#ifdef __cplusplus
+interface IOleControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleControlSite_FWD_DEFINED__
 #define __IOleControlSite_FWD_DEFINED__
 typedef interface IOleControlSite IOleControlSite;
+#ifdef __cplusplus
+interface IOleControlSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyPage_FWD_DEFINED__
 #define __IPropertyPage_FWD_DEFINED__
 typedef interface IPropertyPage IPropertyPage;
+#ifdef __cplusplus
+interface IPropertyPage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyPage2_FWD_DEFINED__
 #define __IPropertyPage2_FWD_DEFINED__
 typedef interface IPropertyPage2 IPropertyPage2;
+#ifdef __cplusplus
+interface IPropertyPage2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyPageSite_FWD_DEFINED__
 #define __IPropertyPageSite_FWD_DEFINED__
 typedef interface IPropertyPageSite IPropertyPageSite;
+#ifdef __cplusplus
+interface IPropertyPageSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyNotifySink_FWD_DEFINED__
 #define __IPropertyNotifySink_FWD_DEFINED__
 typedef interface IPropertyNotifySink IPropertyNotifySink;
+#ifdef __cplusplus
+interface IPropertyNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpecifyPropertyPages_FWD_DEFINED__
 #define __ISpecifyPropertyPages_FWD_DEFINED__
 typedef interface ISpecifyPropertyPages ISpecifyPropertyPages;
+#ifdef __cplusplus
+interface ISpecifyPropertyPages;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistMemory_FWD_DEFINED__
 #define __IPersistMemory_FWD_DEFINED__
 typedef interface IPersistMemory IPersistMemory;
+#ifdef __cplusplus
+interface IPersistMemory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistStreamInit_FWD_DEFINED__
 #define __IPersistStreamInit_FWD_DEFINED__
 typedef interface IPersistStreamInit IPersistStreamInit;
+#ifdef __cplusplus
+interface IPersistStreamInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistPropertyBag_FWD_DEFINED__
 #define __IPersistPropertyBag_FWD_DEFINED__
 typedef interface IPersistPropertyBag IPersistPropertyBag;
+#ifdef __cplusplus
+interface IPersistPropertyBag;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISimpleFrameSite_FWD_DEFINED__
 #define __ISimpleFrameSite_FWD_DEFINED__
 typedef interface ISimpleFrameSite ISimpleFrameSite;
+#ifdef __cplusplus
+interface ISimpleFrameSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFont_FWD_DEFINED__
 #define __IFont_FWD_DEFINED__
 typedef interface IFont IFont;
+#ifdef __cplusplus
+interface IFont;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPicture_FWD_DEFINED__
 #define __IPicture_FWD_DEFINED__
 typedef interface IPicture IPicture;
+#ifdef __cplusplus
+interface IPicture;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPicture2_FWD_DEFINED__
 #define __IPicture2_FWD_DEFINED__
 typedef interface IPicture2 IPicture2;
+#ifdef __cplusplus
+interface IPicture2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFontEventsDisp_FWD_DEFINED__
 #define __IFontEventsDisp_FWD_DEFINED__
 typedef interface IFontEventsDisp IFontEventsDisp;
+#ifdef __cplusplus
+interface IFontEventsDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFontDisp_FWD_DEFINED__
 #define __IFontDisp_FWD_DEFINED__
 typedef interface IFontDisp IFontDisp;
+#ifdef __cplusplus
+interface IFontDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPictureDisp_FWD_DEFINED__
 #define __IPictureDisp_FWD_DEFINED__
 typedef interface IPictureDisp IPictureDisp;
+#ifdef __cplusplus
+interface IPictureDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceObjectWindowless_FWD_DEFINED__
 #define __IOleInPlaceObjectWindowless_FWD_DEFINED__
 typedef interface IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless;
+#ifdef __cplusplus
+interface IOleInPlaceObjectWindowless;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceSiteEx_FWD_DEFINED__
 #define __IOleInPlaceSiteEx_FWD_DEFINED__
 typedef interface IOleInPlaceSiteEx IOleInPlaceSiteEx;
+#ifdef __cplusplus
+interface IOleInPlaceSiteEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceSiteWindowless_FWD_DEFINED__
 #define __IOleInPlaceSiteWindowless_FWD_DEFINED__
 typedef interface IOleInPlaceSiteWindowless IOleInPlaceSiteWindowless;
+#ifdef __cplusplus
+interface IOleInPlaceSiteWindowless;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IViewObjectEx_FWD_DEFINED__
 #define __IViewObjectEx_FWD_DEFINED__
 typedef interface IViewObjectEx IViewObjectEx;
+#ifdef __cplusplus
+interface IViewObjectEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleUndoUnit_FWD_DEFINED__
 #define __IOleUndoUnit_FWD_DEFINED__
 typedef interface IOleUndoUnit IOleUndoUnit;
+#ifdef __cplusplus
+interface IOleUndoUnit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleParentUndoUnit_FWD_DEFINED__
 #define __IOleParentUndoUnit_FWD_DEFINED__
 typedef interface IOleParentUndoUnit IOleParentUndoUnit;
+#ifdef __cplusplus
+interface IOleParentUndoUnit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumOleUndoUnits_FWD_DEFINED__
 #define __IEnumOleUndoUnits_FWD_DEFINED__
 typedef interface IEnumOleUndoUnits IEnumOleUndoUnits;
+#ifdef __cplusplus
+interface IEnumOleUndoUnits;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleUndoManager_FWD_DEFINED__
 #define __IOleUndoManager_FWD_DEFINED__
 typedef interface IOleUndoManager IOleUndoManager;
+#ifdef __cplusplus
+interface IOleUndoManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPointerInactive_FWD_DEFINED__
 #define __IPointerInactive_FWD_DEFINED__
 typedef interface IPointerInactive IPointerInactive;
+#ifdef __cplusplus
+interface IPointerInactive;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithSite_FWD_DEFINED__
 #define __IObjectWithSite_FWD_DEFINED__
 typedef interface IObjectWithSite IObjectWithSite;
+#ifdef __cplusplus
+interface IObjectWithSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPerPropertyBrowsing_FWD_DEFINED__
 #define __IPerPropertyBrowsing_FWD_DEFINED__
 typedef interface IPerPropertyBrowsing IPerPropertyBrowsing;
+#ifdef __cplusplus
+interface IPerPropertyBrowsing;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyBag2_FWD_DEFINED__
 #define __IPropertyBag2_FWD_DEFINED__
 typedef interface IPropertyBag2 IPropertyBag2;
+#ifdef __cplusplus
+interface IPropertyBag2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistPropertyBag2_FWD_DEFINED__
 #define __IPersistPropertyBag2_FWD_DEFINED__
 typedef interface IPersistPropertyBag2 IPersistPropertyBag2;
+#ifdef __cplusplus
+interface IPersistPropertyBag2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAdviseSinkEx_FWD_DEFINED__
 #define __IAdviseSinkEx_FWD_DEFINED__
 typedef interface IAdviseSinkEx IAdviseSinkEx;
+#ifdef __cplusplus
+interface IAdviseSinkEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IQuickActivate_FWD_DEFINED__
 #define __IQuickActivate_FWD_DEFINED__
 typedef interface IQuickActivate IQuickActivate;
+#ifdef __cplusplus
+interface IQuickActivate;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -241,21 +361,33 @@
 #ifndef __IEnumConnections_FWD_DEFINED__
 #define __IEnumConnections_FWD_DEFINED__
 typedef interface IEnumConnections IEnumConnections;
+#ifdef __cplusplus
+interface IEnumConnections;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumConnectionPoints_FWD_DEFINED__
 #define __IEnumConnectionPoints_FWD_DEFINED__
 typedef interface IEnumConnectionPoints IEnumConnectionPoints;
+#ifdef __cplusplus
+interface IEnumConnectionPoints;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConnectionPoint_FWD_DEFINED__
 #define __IConnectionPoint_FWD_DEFINED__
 typedef interface IConnectionPoint IConnectionPoint;
+#ifdef __cplusplus
+interface IConnectionPoint;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConnectionPointContainer_FWD_DEFINED__
 #define __IConnectionPointContainer_FWD_DEFINED__
 typedef interface IConnectionPointContainer IConnectionPointContainer;
+#ifdef __cplusplus
+interface IConnectionPointContainer;
+#endif /* __cplusplus */
 #endif
 
 #endif
@@ -264,211 +396,337 @@
 #ifndef __IBindHost_FWD_DEFINED__
 #define __IBindHost_FWD_DEFINED__
 typedef interface IBindHost IBindHost;
+#ifdef __cplusplus
+interface IBindHost;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IClassFactory2_FWD_DEFINED__
 #define __IClassFactory2_FWD_DEFINED__
 typedef interface IClassFactory2 IClassFactory2;
+#ifdef __cplusplus
+interface IClassFactory2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDropTarget_FWD_DEFINED__
 #define __IDropTarget_FWD_DEFINED__
 typedef interface IDropTarget IDropTarget;
+#ifdef __cplusplus
+interface IDropTarget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProvideClassInfo_FWD_DEFINED__
 #define __IProvideClassInfo_FWD_DEFINED__
 typedef interface IProvideClassInfo IProvideClassInfo;
+#ifdef __cplusplus
+interface IProvideClassInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProvideClassInfo2_FWD_DEFINED__
 #define __IProvideClassInfo2_FWD_DEFINED__
 typedef interface IProvideClassInfo2 IProvideClassInfo2;
+#ifdef __cplusplus
+interface IProvideClassInfo2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProvideMultipleClassInfo_FWD_DEFINED__
 #define __IProvideMultipleClassInfo_FWD_DEFINED__
 typedef interface IProvideMultipleClassInfo IProvideMultipleClassInfo;
+#ifdef __cplusplus
+interface IProvideMultipleClassInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleClientSite_FWD_DEFINED__
 #define __IOleClientSite_FWD_DEFINED__
 typedef interface IOleClientSite IOleClientSite;
+#ifdef __cplusplus
+interface IOleClientSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleControl_FWD_DEFINED__
 #define __IOleControl_FWD_DEFINED__
 typedef interface IOleControl IOleControl;
+#ifdef __cplusplus
+interface IOleControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleControlSite_FWD_DEFINED__
 #define __IOleControlSite_FWD_DEFINED__
 typedef interface IOleControlSite IOleControlSite;
+#ifdef __cplusplus
+interface IOleControlSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyPage_FWD_DEFINED__
 #define __IPropertyPage_FWD_DEFINED__
 typedef interface IPropertyPage IPropertyPage;
+#ifdef __cplusplus
+interface IPropertyPage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyPage2_FWD_DEFINED__
 #define __IPropertyPage2_FWD_DEFINED__
 typedef interface IPropertyPage2 IPropertyPage2;
+#ifdef __cplusplus
+interface IPropertyPage2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyPageSite_FWD_DEFINED__
 #define __IPropertyPageSite_FWD_DEFINED__
 typedef interface IPropertyPageSite IPropertyPageSite;
+#ifdef __cplusplus
+interface IPropertyPageSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyNotifySink_FWD_DEFINED__
 #define __IPropertyNotifySink_FWD_DEFINED__
 typedef interface IPropertyNotifySink IPropertyNotifySink;
+#ifdef __cplusplus
+interface IPropertyNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpecifyPropertyPages_FWD_DEFINED__
 #define __ISpecifyPropertyPages_FWD_DEFINED__
 typedef interface ISpecifyPropertyPages ISpecifyPropertyPages;
+#ifdef __cplusplus
+interface ISpecifyPropertyPages;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistMemory_FWD_DEFINED__
 #define __IPersistMemory_FWD_DEFINED__
 typedef interface IPersistMemory IPersistMemory;
+#ifdef __cplusplus
+interface IPersistMemory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistStreamInit_FWD_DEFINED__
 #define __IPersistStreamInit_FWD_DEFINED__
 typedef interface IPersistStreamInit IPersistStreamInit;
+#ifdef __cplusplus
+interface IPersistStreamInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistPropertyBag_FWD_DEFINED__
 #define __IPersistPropertyBag_FWD_DEFINED__
 typedef interface IPersistPropertyBag IPersistPropertyBag;
+#ifdef __cplusplus
+interface IPersistPropertyBag;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISimpleFrameSite_FWD_DEFINED__
 #define __ISimpleFrameSite_FWD_DEFINED__
 typedef interface ISimpleFrameSite ISimpleFrameSite;
+#ifdef __cplusplus
+interface ISimpleFrameSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFont_FWD_DEFINED__
 #define __IFont_FWD_DEFINED__
 typedef interface IFont IFont;
+#ifdef __cplusplus
+interface IFont;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPicture_FWD_DEFINED__
 #define __IPicture_FWD_DEFINED__
 typedef interface IPicture IPicture;
+#ifdef __cplusplus
+interface IPicture;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFontEventsDisp_FWD_DEFINED__
 #define __IFontEventsDisp_FWD_DEFINED__
 typedef interface IFontEventsDisp IFontEventsDisp;
+#ifdef __cplusplus
+interface IFontEventsDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFontDisp_FWD_DEFINED__
 #define __IFontDisp_FWD_DEFINED__
 typedef interface IFontDisp IFontDisp;
+#ifdef __cplusplus
+interface IFontDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPictureDisp_FWD_DEFINED__
 #define __IPictureDisp_FWD_DEFINED__
 typedef interface IPictureDisp IPictureDisp;
+#ifdef __cplusplus
+interface IPictureDisp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAdviseSinkEx_FWD_DEFINED__
 #define __IAdviseSinkEx_FWD_DEFINED__
 typedef interface IAdviseSinkEx IAdviseSinkEx;
+#ifdef __cplusplus
+interface IAdviseSinkEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceObjectWindowless_FWD_DEFINED__
 #define __IOleInPlaceObjectWindowless_FWD_DEFINED__
 typedef interface IOleInPlaceObjectWindowless IOleInPlaceObjectWindowless;
+#ifdef __cplusplus
+interface IOleInPlaceObjectWindowless;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceSite_FWD_DEFINED__
 #define __IOleInPlaceSite_FWD_DEFINED__
 typedef interface IOleInPlaceSite IOleInPlaceSite;
+#ifdef __cplusplus
+interface IOleInPlaceSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceSiteEx_FWD_DEFINED__
 #define __IOleInPlaceSiteEx_FWD_DEFINED__
 typedef interface IOleInPlaceSiteEx IOleInPlaceSiteEx;
+#ifdef __cplusplus
+interface IOleInPlaceSiteEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceSiteWindowless_FWD_DEFINED__
 #define __IOleInPlaceSiteWindowless_FWD_DEFINED__
 typedef interface IOleInPlaceSiteWindowless IOleInPlaceSiteWindowless;
+#ifdef __cplusplus
+interface IOleInPlaceSiteWindowless;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IViewObject2_FWD_DEFINED__
 #define __IViewObject2_FWD_DEFINED__
 typedef interface IViewObject2 IViewObject2;
+#ifdef __cplusplus
+interface IViewObject2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IViewObjectEx_FWD_DEFINED__
 #define __IViewObjectEx_FWD_DEFINED__
 typedef interface IViewObjectEx IViewObjectEx;
+#ifdef __cplusplus
+interface IViewObjectEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleUndoUnit_FWD_DEFINED__
 #define __IOleUndoUnit_FWD_DEFINED__
 typedef interface IOleUndoUnit IOleUndoUnit;
+#ifdef __cplusplus
+interface IOleUndoUnit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleParentUndoUnit_FWD_DEFINED__
 #define __IOleParentUndoUnit_FWD_DEFINED__
 typedef interface IOleParentUndoUnit IOleParentUndoUnit;
+#ifdef __cplusplus
+interface IOleParentUndoUnit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumOleUndoUnits_FWD_DEFINED__
 #define __IEnumOleUndoUnits_FWD_DEFINED__
 typedef interface IEnumOleUndoUnits IEnumOleUndoUnits;
+#ifdef __cplusplus
+interface IEnumOleUndoUnits;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleUndoManager_FWD_DEFINED__
 #define __IOleUndoManager_FWD_DEFINED__
 typedef interface IOleUndoManager IOleUndoManager;
+#ifdef __cplusplus
+interface IOleUndoManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPointerInactive_FWD_DEFINED__
 #define __IPointerInactive_FWD_DEFINED__
 typedef interface IPointerInactive IPointerInactive;
+#ifdef __cplusplus
+interface IPointerInactive;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithSite_FWD_DEFINED__
 #define __IObjectWithSite_FWD_DEFINED__
 typedef interface IObjectWithSite IObjectWithSite;
+#ifdef __cplusplus
+interface IObjectWithSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IErrorLog_FWD_DEFINED__
 #define __IErrorLog_FWD_DEFINED__
 typedef interface IErrorLog IErrorLog;
+#ifdef __cplusplus
+interface IErrorLog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyBag_FWD_DEFINED__
 #define __IPropertyBag_FWD_DEFINED__
 typedef interface IPropertyBag IPropertyBag;
+#ifdef __cplusplus
+interface IPropertyBag;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPerPropertyBrowsing_FWD_DEFINED__
 #define __IPerPropertyBrowsing_FWD_DEFINED__
 typedef interface IPerPropertyBrowsing IPerPropertyBrowsing;
+#ifdef __cplusplus
+interface IPerPropertyBrowsing;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyBag2_FWD_DEFINED__
 #define __IPropertyBag2_FWD_DEFINED__
 typedef interface IPropertyBag2 IPropertyBag2;
+#ifdef __cplusplus
+interface IPropertyBag2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistPropertyBag2_FWD_DEFINED__
 #define __IPersistPropertyBag2_FWD_DEFINED__
 typedef interface IPersistPropertyBag2 IPersistPropertyBag2;
+#ifdef __cplusplus
+interface IPersistPropertyBag2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IQuickActivate_FWD_DEFINED__
 #define __IQuickActivate_FWD_DEFINED__
 typedef interface IQuickActivate IQuickActivate;
+#ifdef __cplusplus
+interface IQuickActivate;
+#endif /* __cplusplus */
 #endif
 
 #endif
@@ -547,36 +805,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumConnections* This,
+        IEnumConnections *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumConnections* This);
+        IEnumConnections *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumConnections* This);
+        IEnumConnections *This);
 
     /*** IEnumConnections methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumConnections* This,
+        IEnumConnections *This,
         ULONG cConnections,
         LPCONNECTDATA rgcd,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumConnections* This,
+        IEnumConnections *This,
         ULONG cConnections);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumConnections* This);
+        IEnumConnections *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumConnections* This,
+        IEnumConnections *This,
         IEnumConnections **ppEnum);
 
     END_INTERFACE
 } IEnumConnectionsVtbl;
+
 interface IEnumConnections {
     CONST_VTBL IEnumConnectionsVtbl* lpVtbl;
 };
@@ -631,29 +890,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumConnections_Skip_Proxy(
-    IEnumConnections* This,
-    ULONG cConnections);
-void __RPC_STUB IEnumConnections_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumConnections_Reset_Proxy(
-    IEnumConnections* This);
-void __RPC_STUB IEnumConnections_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumConnections_Clone_Proxy(
-    IEnumConnections* This,
-    IEnumConnections **ppEnum);
-void __RPC_STUB IEnumConnections_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumConnections_Next_Proxy(
     IEnumConnections* This,
     ULONG cConnections,
@@ -708,40 +944,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IConnectionPoint* This,
+        IConnectionPoint *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IConnectionPoint* This);
+        IConnectionPoint *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IConnectionPoint* This);
+        IConnectionPoint *This);
 
     /*** IConnectionPoint methods ***/
     HRESULT (STDMETHODCALLTYPE *GetConnectionInterface)(
-        IConnectionPoint* This,
+        IConnectionPoint *This,
         IID *pIID);
 
     HRESULT (STDMETHODCALLTYPE *GetConnectionPointContainer)(
-        IConnectionPoint* This,
+        IConnectionPoint *This,
         IConnectionPointContainer **ppCPC);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IConnectionPoint* This,
+        IConnectionPoint *This,
         IUnknown *pUnkSink,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IConnectionPoint* This,
+        IConnectionPoint *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *EnumConnections)(
-        IConnectionPoint* This,
+        IConnectionPoint *This,
         IEnumConnections **ppEnum);
 
     END_INTERFACE
 } IConnectionPointVtbl;
+
 interface IConnectionPoint {
     CONST_VTBL IConnectionPointVtbl* lpVtbl;
 };
@@ -790,47 +1027,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IConnectionPoint_GetConnectionInterface_Proxy(
-    IConnectionPoint* This,
-    IID *pIID);
-void __RPC_STUB IConnectionPoint_GetConnectionInterface_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConnectionPoint_GetConnectionPointContainer_Proxy(
-    IConnectionPoint* This,
-    IConnectionPointContainer **ppCPC);
-void __RPC_STUB IConnectionPoint_GetConnectionPointContainer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConnectionPoint_Advise_Proxy(
-    IConnectionPoint* This,
-    IUnknown *pUnkSink,
-    DWORD *pdwCookie);
-void __RPC_STUB IConnectionPoint_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConnectionPoint_Unadvise_Proxy(
-    IConnectionPoint* This,
-    DWORD dwCookie);
-void __RPC_STUB IConnectionPoint_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConnectionPoint_EnumConnections_Proxy(
-    IConnectionPoint* This,
-    IEnumConnections **ppEnum);
-void __RPC_STUB IConnectionPoint_EnumConnections_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IConnectionPoint_INTERFACE_DEFINED__ */
 
@@ -873,36 +1069,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumConnectionPoints* This,
+        IEnumConnectionPoints *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumConnectionPoints* This);
+        IEnumConnectionPoints *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumConnectionPoints* This);
+        IEnumConnectionPoints *This);
 
     /*** IEnumConnectionPoints methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumConnectionPoints* This,
+        IEnumConnectionPoints *This,
         ULONG cConnections,
         LPCONNECTIONPOINT *ppCP,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumConnectionPoints* This,
+        IEnumConnectionPoints *This,
         ULONG cConnections);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumConnectionPoints* This);
+        IEnumConnectionPoints *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumConnectionPoints* This,
+        IEnumConnectionPoints *This,
         IEnumConnectionPoints **ppEnum);
 
     END_INTERFACE
 } IEnumConnectionPointsVtbl;
+
 interface IEnumConnectionPoints {
     CONST_VTBL IEnumConnectionPointsVtbl* lpVtbl;
 };
@@ -957,29 +1154,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumConnectionPoints_Skip_Proxy(
-    IEnumConnectionPoints* This,
-    ULONG cConnections);
-void __RPC_STUB IEnumConnectionPoints_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumConnectionPoints_Reset_Proxy(
-    IEnumConnectionPoints* This);
-void __RPC_STUB IEnumConnectionPoints_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumConnectionPoints_Clone_Proxy(
-    IEnumConnectionPoints* This,
-    IEnumConnectionPoints **ppEnum);
-void __RPC_STUB IEnumConnectionPoints_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumConnectionPoints_Next_Proxy(
     IEnumConnectionPoints* This,
     ULONG cConnections,
@@ -1025,28 +1199,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IConnectionPointContainer* This,
+        IConnectionPointContainer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IConnectionPointContainer* This);
+        IConnectionPointContainer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IConnectionPointContainer* This);
+        IConnectionPointContainer *This);
 
     /*** IConnectionPointContainer methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumConnectionPoints)(
-        IConnectionPointContainer* This,
+        IConnectionPointContainer *This,
         IEnumConnectionPoints **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *FindConnectionPoint)(
-        IConnectionPointContainer* This,
+        IConnectionPointContainer *This,
         REFIID riid,
         IConnectionPoint **ppCP);
 
     END_INTERFACE
 } IConnectionPointContainerVtbl;
+
 interface IConnectionPointContainer {
     CONST_VTBL IConnectionPointContainerVtbl* lpVtbl;
 };
@@ -1083,23 +1258,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IConnectionPointContainer_EnumConnectionPoints_Proxy(
-    IConnectionPointContainer* This,
-    IEnumConnectionPoints **ppEnum);
-void __RPC_STUB IConnectionPointContainer_EnumConnectionPoints_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConnectionPointContainer_FindConnectionPoint_Proxy(
-    IConnectionPointContainer* This,
-    REFIID riid,
-    IConnectionPoint **ppCP);
-void __RPC_STUB IConnectionPointContainer_FindConnectionPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IConnectionPointContainer_INTERFACE_DEFINED__ */
 
@@ -1151,39 +1309,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IClassFactory2* This,
+        IClassFactory2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IClassFactory2* This);
+        IClassFactory2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IClassFactory2* This);
+        IClassFactory2 *This);
 
     /*** IClassFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        IClassFactory2* This,
+        IClassFactory2 *This,
         IUnknown *pUnkOuter,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *LockServer)(
-        IClassFactory2* This,
+        IClassFactory2 *This,
         WINBOOL fLock);
 
     /*** IClassFactory2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLicInfo)(
-        IClassFactory2* This,
+        IClassFactory2 *This,
         LICINFO *pLicInfo);
 
     HRESULT (STDMETHODCALLTYPE *RequestLicKey)(
-        IClassFactory2* This,
+        IClassFactory2 *This,
         DWORD dwReserved,
         BSTR *pBstrKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstanceLic)(
-        IClassFactory2* This,
+        IClassFactory2 *This,
         IUnknown *pUnkOuter,
         IUnknown *pUnkReserved,
         REFIID riid,
@@ -1192,6 +1350,7 @@
 
     END_INTERFACE
 } IClassFactory2Vtbl;
+
 interface IClassFactory2 {
     CONST_VTBL IClassFactory2Vtbl* lpVtbl;
 };
@@ -1242,23 +1401,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IClassFactory2_GetLicInfo_Proxy(
-    IClassFactory2* This,
-    LICINFO *pLicInfo);
-void __RPC_STUB IClassFactory2_GetLicInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IClassFactory2_RequestLicKey_Proxy(
-    IClassFactory2* This,
-    DWORD dwReserved,
-    BSTR *pBstrKey);
-void __RPC_STUB IClassFactory2_RequestLicKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IClassFactory2_RemoteCreateInstanceLic_Proxy(
     IClassFactory2* This,
     REFIID riid,
@@ -1311,23 +1453,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IProvideClassInfo* This,
+        IProvideClassInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IProvideClassInfo* This);
+        IProvideClassInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IProvideClassInfo* This);
+        IProvideClassInfo *This);
 
     /*** IProvideClassInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassInfo)(
-        IProvideClassInfo* This,
+        IProvideClassInfo *This,
         ITypeInfo **ppTI);
 
     END_INTERFACE
 } IProvideClassInfoVtbl;
+
 interface IProvideClassInfo {
     CONST_VTBL IProvideClassInfoVtbl* lpVtbl;
 };
@@ -1360,14 +1503,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IProvideClassInfo_GetClassInfo_Proxy(
-    IProvideClassInfo* This,
-    ITypeInfo **ppTI);
-void __RPC_STUB IProvideClassInfo_GetClassInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IProvideClassInfo_INTERFACE_DEFINED__ */
 
@@ -1403,29 +1538,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IProvideClassInfo2* This,
+        IProvideClassInfo2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IProvideClassInfo2* This);
+        IProvideClassInfo2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IProvideClassInfo2* This);
+        IProvideClassInfo2 *This);
 
     /*** IProvideClassInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassInfo)(
-        IProvideClassInfo2* This,
+        IProvideClassInfo2 *This,
         ITypeInfo **ppTI);
 
     /*** IProvideClassInfo2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IProvideClassInfo2* This,
+        IProvideClassInfo2 *This,
         DWORD dwGuidKind,
         GUID *pGUID);
 
     END_INTERFACE
 } IProvideClassInfo2Vtbl;
+
 interface IProvideClassInfo2 {
     CONST_VTBL IProvideClassInfo2Vtbl* lpVtbl;
 };
@@ -1464,15 +1600,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IProvideClassInfo2_GetGUID_Proxy(
-    IProvideClassInfo2* This,
-    DWORD dwGuidKind,
-    GUID *pGUID);
-void __RPC_STUB IProvideClassInfo2_GetGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IProvideClassInfo2_INTERFACE_DEFINED__ */
 
@@ -1519,34 +1646,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IProvideMultipleClassInfo* This,
+        IProvideMultipleClassInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IProvideMultipleClassInfo* This);
+        IProvideMultipleClassInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IProvideMultipleClassInfo* This);
+        IProvideMultipleClassInfo *This);
 
     /*** IProvideClassInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassInfo)(
-        IProvideMultipleClassInfo* This,
+        IProvideMultipleClassInfo *This,
         ITypeInfo **ppTI);
 
     /*** IProvideClassInfo2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IProvideMultipleClassInfo* This,
+        IProvideMultipleClassInfo *This,
         DWORD dwGuidKind,
         GUID *pGUID);
 
     /*** IProvideMultipleClassInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMultiTypeInfoCount)(
-        IProvideMultipleClassInfo* This,
+        IProvideMultipleClassInfo *This,
         ULONG *pcti);
 
     HRESULT (STDMETHODCALLTYPE *GetInfoOfIndex)(
-        IProvideMultipleClassInfo* This,
+        IProvideMultipleClassInfo *This,
         ULONG iti,
         DWORD dwFlags,
         ITypeInfo **pptiCoClass,
@@ -1557,6 +1684,7 @@
 
     END_INTERFACE
 } IProvideMultipleClassInfoVtbl;
+
 interface IProvideMultipleClassInfo {
     CONST_VTBL IProvideMultipleClassInfoVtbl* lpVtbl;
 };
@@ -1605,28 +1733,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IProvideMultipleClassInfo_GetMultiTypeInfoCount_Proxy(
-    IProvideMultipleClassInfo* This,
-    ULONG *pcti);
-void __RPC_STUB IProvideMultipleClassInfo_GetMultiTypeInfoCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IProvideMultipleClassInfo_GetInfoOfIndex_Proxy(
-    IProvideMultipleClassInfo* This,
-    ULONG iti,
-    DWORD dwFlags,
-    ITypeInfo **pptiCoClass,
-    DWORD *pdwTIFlags,
-    ULONG *pcdispidReserved,
-    IID *piidPrimary,
-    IID *piidSource);
-void __RPC_STUB IProvideMultipleClassInfo_GetInfoOfIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IProvideMultipleClassInfo_INTERFACE_DEFINED__ */
 
@@ -1680,35 +1786,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleControl* This,
+        IOleControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleControl* This);
+        IOleControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleControl* This);
+        IOleControl *This);
 
     /*** IOleControl methods ***/
     HRESULT (STDMETHODCALLTYPE *GetControlInfo)(
-        IOleControl* This,
+        IOleControl *This,
         CONTROLINFO *pCI);
 
     HRESULT (STDMETHODCALLTYPE *OnMnemonic)(
-        IOleControl* This,
+        IOleControl *This,
         MSG *pMsg);
 
     HRESULT (STDMETHODCALLTYPE *OnAmbientPropertyChange)(
-        IOleControl* This,
+        IOleControl *This,
         DISPID dispID);
 
     HRESULT (STDMETHODCALLTYPE *FreezeEvents)(
-        IOleControl* This,
+        IOleControl *This,
         WINBOOL bFreeze);
 
     END_INTERFACE
 } IOleControlVtbl;
+
 interface IOleControl {
     CONST_VTBL IOleControlVtbl* lpVtbl;
 };
@@ -1753,38 +1860,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleControl_GetControlInfo_Proxy(
-    IOleControl* This,
-    CONTROLINFO *pCI);
-void __RPC_STUB IOleControl_GetControlInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControl_OnMnemonic_Proxy(
-    IOleControl* This,
-    MSG *pMsg);
-void __RPC_STUB IOleControl_OnMnemonic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControl_OnAmbientPropertyChange_Proxy(
-    IOleControl* This,
-    DISPID dispID);
-void __RPC_STUB IOleControl_OnAmbientPropertyChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControl_FreezeEvents_Proxy(
-    IOleControl* This,
-    WINBOOL bFreeze);
-void __RPC_STUB IOleControl_FreezeEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleControl_INTERFACE_DEFINED__ */
 
@@ -1851,48 +1926,49 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleControlSite* This,
+        IOleControlSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleControlSite* This);
+        IOleControlSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleControlSite* This);
+        IOleControlSite *This);
 
     /*** IOleControlSite methods ***/
     HRESULT (STDMETHODCALLTYPE *OnControlInfoChanged)(
-        IOleControlSite* This);
+        IOleControlSite *This);
 
     HRESULT (STDMETHODCALLTYPE *LockInPlaceActive)(
-        IOleControlSite* This,
+        IOleControlSite *This,
         WINBOOL fLock);
 
     HRESULT (STDMETHODCALLTYPE *GetExtendedControl)(
-        IOleControlSite* This,
+        IOleControlSite *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *TransformCoords)(
-        IOleControlSite* This,
+        IOleControlSite *This,
         POINTL *pPtlHimetric,
         POINTF *pPtfContainer,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IOleControlSite* This,
+        IOleControlSite *This,
         MSG *pMsg,
         DWORD grfModifiers);
 
     HRESULT (STDMETHODCALLTYPE *OnFocus)(
-        IOleControlSite* This,
+        IOleControlSite *This,
         WINBOOL fGotFocus);
 
     HRESULT (STDMETHODCALLTYPE *ShowPropertyFrame)(
-        IOleControlSite* This);
+        IOleControlSite *This);
 
     END_INTERFACE
 } IOleControlSiteVtbl;
+
 interface IOleControlSite {
     CONST_VTBL IOleControlSiteVtbl* lpVtbl;
 };
@@ -1949,63 +2025,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleControlSite_OnControlInfoChanged_Proxy(
-    IOleControlSite* This);
-void __RPC_STUB IOleControlSite_OnControlInfoChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControlSite_LockInPlaceActive_Proxy(
-    IOleControlSite* This,
-    WINBOOL fLock);
-void __RPC_STUB IOleControlSite_LockInPlaceActive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControlSite_GetExtendedControl_Proxy(
-    IOleControlSite* This,
-    IDispatch **ppDisp);
-void __RPC_STUB IOleControlSite_GetExtendedControl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControlSite_TransformCoords_Proxy(
-    IOleControlSite* This,
-    POINTL *pPtlHimetric,
-    POINTF *pPtfContainer,
-    DWORD dwFlags);
-void __RPC_STUB IOleControlSite_TransformCoords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControlSite_TranslateAccelerator_Proxy(
-    IOleControlSite* This,
-    MSG *pMsg,
-    DWORD grfModifiers);
-void __RPC_STUB IOleControlSite_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControlSite_OnFocus_Proxy(
-    IOleControlSite* This,
-    WINBOOL fGotFocus);
-void __RPC_STUB IOleControlSite_OnFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleControlSite_ShowPropertyFrame_Proxy(
-    IOleControlSite* This);
-void __RPC_STUB IOleControlSite_ShowPropertyFrame_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleControlSite_INTERFACE_DEFINED__ */
 
@@ -2080,63 +2099,64 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyPage* This);
+        IPropertyPage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyPage* This);
+        IPropertyPage *This);
 
     /*** IPropertyPage methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPageSite)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         IPropertyPageSite *pPageSite);
 
     HRESULT (STDMETHODCALLTYPE *Activate)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         HWND hWndParent,
         LPCRECT pRect,
         WINBOOL bModal);
 
     HRESULT (STDMETHODCALLTYPE *Deactivate)(
-        IPropertyPage* This);
+        IPropertyPage *This);
 
     HRESULT (STDMETHODCALLTYPE *GetPageInfo)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         PROPPAGEINFO *pPageInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetObjects)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         ULONG cObjects,
         IUnknown **ppUnk);
 
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         UINT nCmdShow);
 
     HRESULT (STDMETHODCALLTYPE *Move)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         LPCRECT pRect);
 
     HRESULT (STDMETHODCALLTYPE *IsPageDirty)(
-        IPropertyPage* This);
+        IPropertyPage *This);
 
     HRESULT (STDMETHODCALLTYPE *Apply)(
-        IPropertyPage* This);
+        IPropertyPage *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         LPCOLESTR pszHelpDir);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IPropertyPage* This,
+        IPropertyPage *This,
         MSG *pMsg);
 
     END_INTERFACE
 } IPropertyPageVtbl;
+
 interface IPropertyPage {
     CONST_VTBL IPropertyPageVtbl* lpVtbl;
 };
@@ -2209,94 +2229,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyPage_SetPageSite_Proxy(
-    IPropertyPage* This,
-    IPropertyPageSite *pPageSite);
-void __RPC_STUB IPropertyPage_SetPageSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_Activate_Proxy(
-    IPropertyPage* This,
-    HWND hWndParent,
-    LPCRECT pRect,
-    WINBOOL bModal);
-void __RPC_STUB IPropertyPage_Activate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_Deactivate_Proxy(
-    IPropertyPage* This);
-void __RPC_STUB IPropertyPage_Deactivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_GetPageInfo_Proxy(
-    IPropertyPage* This,
-    PROPPAGEINFO *pPageInfo);
-void __RPC_STUB IPropertyPage_GetPageInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_SetObjects_Proxy(
-    IPropertyPage* This,
-    ULONG cObjects,
-    IUnknown **ppUnk);
-void __RPC_STUB IPropertyPage_SetObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_Show_Proxy(
-    IPropertyPage* This,
-    UINT nCmdShow);
-void __RPC_STUB IPropertyPage_Show_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_Move_Proxy(
-    IPropertyPage* This,
-    LPCRECT pRect);
-void __RPC_STUB IPropertyPage_Move_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_IsPageDirty_Proxy(
-    IPropertyPage* This);
-void __RPC_STUB IPropertyPage_IsPageDirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_Apply_Proxy(
-    IPropertyPage* This);
-void __RPC_STUB IPropertyPage_Apply_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_Help_Proxy(
-    IPropertyPage* This,
-    LPCOLESTR pszHelpDir);
-void __RPC_STUB IPropertyPage_Help_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPage_TranslateAccelerator_Proxy(
-    IPropertyPage* This,
-    MSG *pMsg);
-void __RPC_STUB IPropertyPage_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyPage_INTERFACE_DEFINED__ */
 
@@ -2327,68 +2259,69 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyPage2* This);
+        IPropertyPage2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyPage2* This);
+        IPropertyPage2 *This);
 
     /*** IPropertyPage methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPageSite)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         IPropertyPageSite *pPageSite);
 
     HRESULT (STDMETHODCALLTYPE *Activate)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         HWND hWndParent,
         LPCRECT pRect,
         WINBOOL bModal);
 
     HRESULT (STDMETHODCALLTYPE *Deactivate)(
-        IPropertyPage2* This);
+        IPropertyPage2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetPageInfo)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         PROPPAGEINFO *pPageInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetObjects)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         ULONG cObjects,
         IUnknown **ppUnk);
 
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         UINT nCmdShow);
 
     HRESULT (STDMETHODCALLTYPE *Move)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         LPCRECT pRect);
 
     HRESULT (STDMETHODCALLTYPE *IsPageDirty)(
-        IPropertyPage2* This);
+        IPropertyPage2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Apply)(
-        IPropertyPage2* This);
+        IPropertyPage2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         LPCOLESTR pszHelpDir);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         MSG *pMsg);
 
     /*** IPropertyPage2 methods ***/
     HRESULT (STDMETHODCALLTYPE *EditProperty)(
-        IPropertyPage2* This,
+        IPropertyPage2 *This,
         DISPID dispID);
 
     END_INTERFACE
 } IPropertyPage2Vtbl;
+
 interface IPropertyPage2 {
     CONST_VTBL IPropertyPage2Vtbl* lpVtbl;
 };
@@ -2467,14 +2400,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyPage2_EditProperty_Proxy(
-    IPropertyPage2* This,
-    DISPID dispID);
-void __RPC_STUB IPropertyPage2_EditProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyPage2_INTERFACE_DEFINED__ */
 
@@ -2520,35 +2445,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyPageSite* This,
+        IPropertyPageSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyPageSite* This);
+        IPropertyPageSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyPageSite* This);
+        IPropertyPageSite *This);
 
     /*** IPropertyPageSite methods ***/
     HRESULT (STDMETHODCALLTYPE *OnStatusChange)(
-        IPropertyPageSite* This,
+        IPropertyPageSite *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetLocaleID)(
-        IPropertyPageSite* This,
+        IPropertyPageSite *This,
         LCID *pLocaleID);
 
     HRESULT (STDMETHODCALLTYPE *GetPageContainer)(
-        IPropertyPageSite* This,
+        IPropertyPageSite *This,
         IUnknown **ppUnk);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IPropertyPageSite* This,
+        IPropertyPageSite *This,
         MSG *pMsg);
 
     END_INTERFACE
 } IPropertyPageSiteVtbl;
+
 interface IPropertyPageSite {
     CONST_VTBL IPropertyPageSiteVtbl* lpVtbl;
 };
@@ -2593,38 +2519,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyPageSite_OnStatusChange_Proxy(
-    IPropertyPageSite* This,
-    DWORD dwFlags);
-void __RPC_STUB IPropertyPageSite_OnStatusChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPageSite_GetLocaleID_Proxy(
-    IPropertyPageSite* This,
-    LCID *pLocaleID);
-void __RPC_STUB IPropertyPageSite_GetLocaleID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPageSite_GetPageContainer_Proxy(
-    IPropertyPageSite* This,
-    IUnknown **ppUnk);
-void __RPC_STUB IPropertyPageSite_GetPageContainer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyPageSite_TranslateAccelerator_Proxy(
-    IPropertyPageSite* This,
-    MSG *pMsg);
-void __RPC_STUB IPropertyPageSite_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyPageSite_INTERFACE_DEFINED__ */
 
@@ -2658,27 +2552,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyNotifySink* This,
+        IPropertyNotifySink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyNotifySink* This);
+        IPropertyNotifySink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyNotifySink* This);
+        IPropertyNotifySink *This);
 
     /*** IPropertyNotifySink methods ***/
     HRESULT (STDMETHODCALLTYPE *OnChanged)(
-        IPropertyNotifySink* This,
+        IPropertyNotifySink *This,
         DISPID dispID);
 
     HRESULT (STDMETHODCALLTYPE *OnRequestEdit)(
-        IPropertyNotifySink* This,
+        IPropertyNotifySink *This,
         DISPID dispID);
 
     END_INTERFACE
 } IPropertyNotifySinkVtbl;
+
 interface IPropertyNotifySink {
     CONST_VTBL IPropertyNotifySinkVtbl* lpVtbl;
 };
@@ -2715,22 +2610,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyNotifySink_OnChanged_Proxy(
-    IPropertyNotifySink* This,
-    DISPID dispID);
-void __RPC_STUB IPropertyNotifySink_OnChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyNotifySink_OnRequestEdit_Proxy(
-    IPropertyNotifySink* This,
-    DISPID dispID);
-void __RPC_STUB IPropertyNotifySink_OnRequestEdit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyNotifySink_INTERFACE_DEFINED__ */
 
@@ -2768,23 +2647,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpecifyPropertyPages* This,
+        ISpecifyPropertyPages *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpecifyPropertyPages* This);
+        ISpecifyPropertyPages *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpecifyPropertyPages* This);
+        ISpecifyPropertyPages *This);
 
     /*** ISpecifyPropertyPages methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPages)(
-        ISpecifyPropertyPages* This,
+        ISpecifyPropertyPages *This,
         CAUUID *pPages);
 
     END_INTERFACE
 } ISpecifyPropertyPagesVtbl;
+
 interface ISpecifyPropertyPages {
     CONST_VTBL ISpecifyPropertyPagesVtbl* lpVtbl;
 };
@@ -2817,14 +2697,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpecifyPropertyPages_GetPages_Proxy(
-    ISpecifyPropertyPages* This,
-    CAUUID *pPages);
-void __RPC_STUB ISpecifyPropertyPages_GetPages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpecifyPropertyPages_INTERFACE_DEFINED__ */
 
@@ -2870,45 +2742,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistMemory* This,
+        IPersistMemory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistMemory* This);
+        IPersistMemory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistMemory* This);
+        IPersistMemory *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistMemory* This,
+        IPersistMemory *This,
         CLSID *pClassID);
 
     /*** IPersistMemory methods ***/
     HRESULT (STDMETHODCALLTYPE *IsDirty)(
-        IPersistMemory* This);
+        IPersistMemory *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IPersistMemory* This,
+        IPersistMemory *This,
         LPVOID pMem,
         ULONG cbSize);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IPersistMemory* This,
+        IPersistMemory *This,
         LPVOID pMem,
         WINBOOL fClearDirty,
         ULONG cbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetSizeMax)(
-        IPersistMemory* This,
+        IPersistMemory *This,
         ULONG *pCbSize);
 
     HRESULT (STDMETHODCALLTYPE *InitNew)(
-        IPersistMemory* This);
+        IPersistMemory *This);
 
     END_INTERFACE
 } IPersistMemoryVtbl;
+
 interface IPersistMemory {
     CONST_VTBL IPersistMemoryVtbl* lpVtbl;
 };
@@ -2963,13 +2836,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistMemory_IsDirty_Proxy(
-    IPersistMemory* This);
-void __RPC_STUB IPersistMemory_IsDirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IPersistMemory_RemoteLoad_Proxy(
     IPersistMemory* This,
     BYTE *pMem,
@@ -2989,21 +2855,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMemory_GetSizeMax_Proxy(
-    IPersistMemory* This,
-    ULONG *pCbSize);
-void __RPC_STUB IPersistMemory_GetSizeMax_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMemory_InitNew_Proxy(
-    IPersistMemory* This);
-void __RPC_STUB IPersistMemory_InitNew_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IPersistMemory_Load_Proxy(
     IPersistMemory* This,
     LPVOID pMem,
@@ -3065,43 +2916,44 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistStreamInit* This,
+        IPersistStreamInit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistStreamInit* This);
+        IPersistStreamInit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistStreamInit* This);
+        IPersistStreamInit *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistStreamInit* This,
+        IPersistStreamInit *This,
         CLSID *pClassID);
 
     /*** IPersistStreamInit methods ***/
     HRESULT (STDMETHODCALLTYPE *IsDirty)(
-        IPersistStreamInit* This);
+        IPersistStreamInit *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IPersistStreamInit* This,
+        IPersistStreamInit *This,
         LPSTREAM pStm);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IPersistStreamInit* This,
+        IPersistStreamInit *This,
         LPSTREAM pStm,
         WINBOOL fClearDirty);
 
     HRESULT (STDMETHODCALLTYPE *GetSizeMax)(
-        IPersistStreamInit* This,
+        IPersistStreamInit *This,
         ULARGE_INTEGER *pCbSize);
 
     HRESULT (STDMETHODCALLTYPE *InitNew)(
-        IPersistStreamInit* This);
+        IPersistStreamInit *This);
 
     END_INTERFACE
 } IPersistStreamInitVtbl;
+
 interface IPersistStreamInit {
     CONST_VTBL IPersistStreamInitVtbl* lpVtbl;
 };
@@ -3156,45 +3008,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistStreamInit_IsDirty_Proxy(
-    IPersistStreamInit* This);
-void __RPC_STUB IPersistStreamInit_IsDirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistStreamInit_Load_Proxy(
-    IPersistStreamInit* This,
-    LPSTREAM pStm);
-void __RPC_STUB IPersistStreamInit_Load_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistStreamInit_Save_Proxy(
-    IPersistStreamInit* This,
-    LPSTREAM pStm,
-    WINBOOL fClearDirty);
-void __RPC_STUB IPersistStreamInit_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistStreamInit_GetSizeMax_Proxy(
-    IPersistStreamInit* This,
-    ULARGE_INTEGER *pCbSize);
-void __RPC_STUB IPersistStreamInit_GetSizeMax_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistStreamInit_InitNew_Proxy(
-    IPersistStreamInit* This);
-void __RPC_STUB IPersistStreamInit_InitNew_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistStreamInit_INTERFACE_DEFINED__ */
 
@@ -3234,38 +3047,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistPropertyBag* This,
+        IPersistPropertyBag *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistPropertyBag* This);
+        IPersistPropertyBag *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistPropertyBag* This);
+        IPersistPropertyBag *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistPropertyBag* This,
+        IPersistPropertyBag *This,
         CLSID *pClassID);
 
     /*** IPersistPropertyBag methods ***/
     HRESULT (STDMETHODCALLTYPE *InitNew)(
-        IPersistPropertyBag* This);
+        IPersistPropertyBag *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IPersistPropertyBag* This,
+        IPersistPropertyBag *This,
         IPropertyBag *pPropBag,
         IErrorLog *pErrorLog);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IPersistPropertyBag* This,
+        IPersistPropertyBag *This,
         IPropertyBag *pPropBag,
         WINBOOL fClearDirty,
         WINBOOL fSaveAllProperties);
 
     END_INTERFACE
 } IPersistPropertyBagVtbl;
+
 interface IPersistPropertyBag {
     CONST_VTBL IPersistPropertyBagVtbl* lpVtbl;
 };
@@ -3312,32 +3126,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistPropertyBag_InitNew_Proxy(
-    IPersistPropertyBag* This);
-void __RPC_STUB IPersistPropertyBag_InitNew_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistPropertyBag_Load_Proxy(
-    IPersistPropertyBag* This,
-    IPropertyBag *pPropBag,
-    IErrorLog *pErrorLog);
-void __RPC_STUB IPersistPropertyBag_Load_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistPropertyBag_Save_Proxy(
-    IPersistPropertyBag* This,
-    IPropertyBag *pPropBag,
-    WINBOOL fClearDirty,
-    WINBOOL fSaveAllProperties);
-void __RPC_STUB IPersistPropertyBag_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistPropertyBag_INTERFACE_DEFINED__ */
 
@@ -3381,19 +3169,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISimpleFrameSite* This,
+        ISimpleFrameSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISimpleFrameSite* This);
+        ISimpleFrameSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISimpleFrameSite* This);
+        ISimpleFrameSite *This);
 
     /*** ISimpleFrameSite methods ***/
     HRESULT (STDMETHODCALLTYPE *PreMessageFilter)(
-        ISimpleFrameSite* This,
+        ISimpleFrameSite *This,
         HWND hWnd,
         UINT msg,
         WPARAM wp,
@@ -3402,7 +3190,7 @@
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *PostMessageFilter)(
-        ISimpleFrameSite* This,
+        ISimpleFrameSite *This,
         HWND hWnd,
         UINT msg,
         WPARAM wp,
@@ -3412,6 +3200,7 @@
 
     END_INTERFACE
 } ISimpleFrameSiteVtbl;
+
 interface ISimpleFrameSite {
     CONST_VTBL ISimpleFrameSiteVtbl* lpVtbl;
 };
@@ -3448,32 +3237,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISimpleFrameSite_PreMessageFilter_Proxy(
-    ISimpleFrameSite* This,
-    HWND hWnd,
-    UINT msg,
-    WPARAM wp,
-    LPARAM lp,
-    LRESULT *plResult,
-    DWORD *pdwCookie);
-void __RPC_STUB ISimpleFrameSite_PreMessageFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISimpleFrameSite_PostMessageFilter_Proxy(
-    ISimpleFrameSite* This,
-    HWND hWnd,
-    UINT msg,
-    WPARAM wp,
-    LPARAM lp,
-    LRESULT *plResult,
-    DWORD dwCookie);
-void __RPC_STUB ISimpleFrameSite_PostMessageFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISimpleFrameSite_INTERFACE_DEFINED__ */
 
@@ -3582,116 +3345,117 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFont* This,
+        IFont *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFont* This);
+        IFont *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFont* This);
+        IFont *This);
 
     /*** IFont methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IFont* This,
+        IFont *This,
         BSTR *pName);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IFont* This,
+        IFont *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *get_Size)(
-        IFont* This,
+        IFont *This,
         CY *pSize);
 
     HRESULT (STDMETHODCALLTYPE *put_Size)(
-        IFont* This,
+        IFont *This,
         CY size);
 
     HRESULT (STDMETHODCALLTYPE *get_Bold)(
-        IFont* This,
+        IFont *This,
         WINBOOL *pBold);
 
     HRESULT (STDMETHODCALLTYPE *put_Bold)(
-        IFont* This,
+        IFont *This,
         WINBOOL bold);
 
     HRESULT (STDMETHODCALLTYPE *get_Italic)(
-        IFont* This,
+        IFont *This,
         WINBOOL *pItalic);
 
     HRESULT (STDMETHODCALLTYPE *put_Italic)(
-        IFont* This,
+        IFont *This,
         WINBOOL italic);
 
     HRESULT (STDMETHODCALLTYPE *get_Underline)(
-        IFont* This,
+        IFont *This,
         WINBOOL *pUnderline);
 
     HRESULT (STDMETHODCALLTYPE *put_Underline)(
-        IFont* This,
+        IFont *This,
         WINBOOL underline);
 
     HRESULT (STDMETHODCALLTYPE *get_Strikethrough)(
-        IFont* This,
+        IFont *This,
         WINBOOL *pStrikethrough);
 
     HRESULT (STDMETHODCALLTYPE *put_Strikethrough)(
-        IFont* This,
+        IFont *This,
         WINBOOL strikethrough);
 
     HRESULT (STDMETHODCALLTYPE *get_Weight)(
-        IFont* This,
+        IFont *This,
         SHORT *pWeight);
 
     HRESULT (STDMETHODCALLTYPE *put_Weight)(
-        IFont* This,
+        IFont *This,
         SHORT weight);
 
     HRESULT (STDMETHODCALLTYPE *get_Charset)(
-        IFont* This,
+        IFont *This,
         SHORT *pCharset);
 
     HRESULT (STDMETHODCALLTYPE *put_Charset)(
-        IFont* This,
+        IFont *This,
         SHORT charset);
 
     HRESULT (STDMETHODCALLTYPE *get_hFont)(
-        IFont* This,
+        IFont *This,
         HFONT *phFont);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IFont* This,
+        IFont *This,
         IFont **ppFont);
 
     HRESULT (STDMETHODCALLTYPE *IsEqual)(
-        IFont* This,
+        IFont *This,
         IFont *pFontOther);
 
     HRESULT (STDMETHODCALLTYPE *SetRatio)(
-        IFont* This,
+        IFont *This,
         LONG cyLogical,
         LONG cyHimetric);
 
     HRESULT (STDMETHODCALLTYPE *QueryTextMetrics)(
-        IFont* This,
+        IFont *This,
         TEXTMETRICOLE *pTM);
 
     HRESULT (STDMETHODCALLTYPE *AddRefHfont)(
-        IFont* This,
+        IFont *This,
         HFONT hFont);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseHfont)(
-        IFont* This,
+        IFont *This,
         HFONT hFont);
 
     HRESULT (STDMETHODCALLTYPE *SetHdc)(
-        IFont* This,
+        IFont *This,
         HDC hDC);
 
     END_INTERFACE
 } IFontVtbl;
+
 interface IFont {
     CONST_VTBL IFontVtbl* lpVtbl;
 };
@@ -3816,199 +3580,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFont_get_Name_Proxy(
-    IFont* This,
-    BSTR *pName);
-void __RPC_STUB IFont_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Name_Proxy(
-    IFont* This,
-    BSTR name);
-void __RPC_STUB IFont_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_Size_Proxy(
-    IFont* This,
-    CY *pSize);
-void __RPC_STUB IFont_get_Size_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Size_Proxy(
-    IFont* This,
-    CY size);
-void __RPC_STUB IFont_put_Size_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_Bold_Proxy(
-    IFont* This,
-    WINBOOL *pBold);
-void __RPC_STUB IFont_get_Bold_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Bold_Proxy(
-    IFont* This,
-    WINBOOL bold);
-void __RPC_STUB IFont_put_Bold_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_Italic_Proxy(
-    IFont* This,
-    WINBOOL *pItalic);
-void __RPC_STUB IFont_get_Italic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Italic_Proxy(
-    IFont* This,
-    WINBOOL italic);
-void __RPC_STUB IFont_put_Italic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_Underline_Proxy(
-    IFont* This,
-    WINBOOL *pUnderline);
-void __RPC_STUB IFont_get_Underline_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Underline_Proxy(
-    IFont* This,
-    WINBOOL underline);
-void __RPC_STUB IFont_put_Underline_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_Strikethrough_Proxy(
-    IFont* This,
-    WINBOOL *pStrikethrough);
-void __RPC_STUB IFont_get_Strikethrough_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Strikethrough_Proxy(
-    IFont* This,
-    WINBOOL strikethrough);
-void __RPC_STUB IFont_put_Strikethrough_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_Weight_Proxy(
-    IFont* This,
-    SHORT *pWeight);
-void __RPC_STUB IFont_get_Weight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Weight_Proxy(
-    IFont* This,
-    SHORT weight);
-void __RPC_STUB IFont_put_Weight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_Charset_Proxy(
-    IFont* This,
-    SHORT *pCharset);
-void __RPC_STUB IFont_get_Charset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_put_Charset_Proxy(
-    IFont* This,
-    SHORT charset);
-void __RPC_STUB IFont_put_Charset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_get_hFont_Proxy(
-    IFont* This,
-    HFONT *phFont);
-void __RPC_STUB IFont_get_hFont_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_Clone_Proxy(
-    IFont* This,
-    IFont **ppFont);
-void __RPC_STUB IFont_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_IsEqual_Proxy(
-    IFont* This,
-    IFont *pFontOther);
-void __RPC_STUB IFont_IsEqual_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_SetRatio_Proxy(
-    IFont* This,
-    LONG cyLogical,
-    LONG cyHimetric);
-void __RPC_STUB IFont_SetRatio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_QueryTextMetrics_Proxy(
-    IFont* This,
-    TEXTMETRICOLE *pTM);
-void __RPC_STUB IFont_QueryTextMetrics_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_AddRefHfont_Proxy(
-    IFont* This,
-    HFONT hFont);
-void __RPC_STUB IFont_AddRefHfont_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_ReleaseHfont_Proxy(
-    IFont* This,
-    HFONT hFont);
-void __RPC_STUB IFont_ReleaseHfont_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFont_SetHdc_Proxy(
-    IFont* This,
-    HDC hDC);
-void __RPC_STUB IFont_SetHdc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFont_INTERFACE_DEFINED__ */
 
@@ -4102,39 +3673,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPicture* This,
+        IPicture *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPicture* This);
+        IPicture *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPicture* This);
+        IPicture *This);
 
     /*** IPicture methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Handle)(
-        IPicture* This,
+        IPicture *This,
         OLE_HANDLE *pHandle);
 
     HRESULT (STDMETHODCALLTYPE *get_hPal)(
-        IPicture* This,
+        IPicture *This,
         OLE_HANDLE *phPal);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IPicture* This,
+        IPicture *This,
         SHORT *pType);
 
     HRESULT (STDMETHODCALLTYPE *get_Width)(
-        IPicture* This,
+        IPicture *This,
         OLE_XSIZE_HIMETRIC *pWidth);
 
     HRESULT (STDMETHODCALLTYPE *get_Height)(
-        IPicture* This,
+        IPicture *This,
         OLE_YSIZE_HIMETRIC *pHeight);
 
     HRESULT (STDMETHODCALLTYPE *Render)(
-        IPicture* This,
+        IPicture *This,
         HDC hDC,
         LONG x,
         LONG y,
@@ -4147,42 +3718,43 @@
         LPCRECT pRcWBounds);
 
     HRESULT (STDMETHODCALLTYPE *set_hPal)(
-        IPicture* This,
+        IPicture *This,
         OLE_HANDLE hPal);
 
     HRESULT (STDMETHODCALLTYPE *get_CurDC)(
-        IPicture* This,
+        IPicture *This,
         HDC *phDC);
 
     HRESULT (STDMETHODCALLTYPE *SelectPicture)(
-        IPicture* This,
+        IPicture *This,
         HDC hDCIn,
         HDC *phDCOut,
         OLE_HANDLE *phBmpOut);
 
     HRESULT (STDMETHODCALLTYPE *get_KeepOriginalFormat)(
-        IPicture* This,
+        IPicture *This,
         WINBOOL *pKeep);
 
     HRESULT (STDMETHODCALLTYPE *put_KeepOriginalFormat)(
-        IPicture* This,
+        IPicture *This,
         WINBOOL keep);
 
     HRESULT (STDMETHODCALLTYPE *PictureChanged)(
-        IPicture* This);
+        IPicture *This);
 
     HRESULT (STDMETHODCALLTYPE *SaveAsFile)(
-        IPicture* This,
+        IPicture *This,
         LPSTREAM pStream,
         WINBOOL fSaveMemCopy,
         LONG *pCbSize);
 
     HRESULT (STDMETHODCALLTYPE *get_Attributes)(
-        IPicture* This,
+        IPicture *This,
         DWORD *pDwAttr);
 
     END_INTERFACE
 } IPictureVtbl;
+
 interface IPicture {
     CONST_VTBL IPictureVtbl* lpVtbl;
 };
@@ -4267,130 +3839,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPicture_get_Handle_Proxy(
-    IPicture* This,
-    OLE_HANDLE *pHandle);
-void __RPC_STUB IPicture_get_Handle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_get_hPal_Proxy(
-    IPicture* This,
-    OLE_HANDLE *phPal);
-void __RPC_STUB IPicture_get_hPal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_get_Type_Proxy(
-    IPicture* This,
-    SHORT *pType);
-void __RPC_STUB IPicture_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_get_Width_Proxy(
-    IPicture* This,
-    OLE_XSIZE_HIMETRIC *pWidth);
-void __RPC_STUB IPicture_get_Width_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_get_Height_Proxy(
-    IPicture* This,
-    OLE_YSIZE_HIMETRIC *pHeight);
-void __RPC_STUB IPicture_get_Height_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_Render_Proxy(
-    IPicture* This,
-    HDC hDC,
-    LONG x,
-    LONG y,
-    LONG cx,
-    LONG cy,
-    OLE_XPOS_HIMETRIC xSrc,
-    OLE_YPOS_HIMETRIC ySrc,
-    OLE_XSIZE_HIMETRIC cxSrc,
-    OLE_YSIZE_HIMETRIC cySrc,
-    LPCRECT pRcWBounds);
-void __RPC_STUB IPicture_Render_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_set_hPal_Proxy(
-    IPicture* This,
-    OLE_HANDLE hPal);
-void __RPC_STUB IPicture_set_hPal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_get_CurDC_Proxy(
-    IPicture* This,
-    HDC *phDC);
-void __RPC_STUB IPicture_get_CurDC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_SelectPicture_Proxy(
-    IPicture* This,
-    HDC hDCIn,
-    HDC *phDCOut,
-    OLE_HANDLE *phBmpOut);
-void __RPC_STUB IPicture_SelectPicture_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_get_KeepOriginalFormat_Proxy(
-    IPicture* This,
-    WINBOOL *pKeep);
-void __RPC_STUB IPicture_get_KeepOriginalFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_put_KeepOriginalFormat_Proxy(
-    IPicture* This,
-    WINBOOL keep);
-void __RPC_STUB IPicture_put_KeepOriginalFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_PictureChanged_Proxy(
-    IPicture* This);
-void __RPC_STUB IPicture_PictureChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_SaveAsFile_Proxy(
-    IPicture* This,
-    LPSTREAM pStream,
-    WINBOOL fSaveMemCopy,
-    LONG *pCbSize);
-void __RPC_STUB IPicture_SaveAsFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture_get_Attributes_Proxy(
-    IPicture* This,
-    DWORD *pDwAttr);
-void __RPC_STUB IPicture_get_Attributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPicture_INTERFACE_DEFINED__ */
 
@@ -4474,39 +3922,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPicture2* This,
+        IPicture2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPicture2* This);
+        IPicture2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPicture2* This);
+        IPicture2 *This);
 
     /*** IPicture2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Handle)(
-        IPicture2* This,
+        IPicture2 *This,
         HHANDLE *pHandle);
 
     HRESULT (STDMETHODCALLTYPE *get_hPal)(
-        IPicture2* This,
+        IPicture2 *This,
         HHANDLE *phPal);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IPicture2* This,
+        IPicture2 *This,
         SHORT *pType);
 
     HRESULT (STDMETHODCALLTYPE *get_Width)(
-        IPicture2* This,
+        IPicture2 *This,
         OLE_XSIZE_HIMETRIC *pWidth);
 
     HRESULT (STDMETHODCALLTYPE *get_Height)(
-        IPicture2* This,
+        IPicture2 *This,
         OLE_YSIZE_HIMETRIC *pHeight);
 
     HRESULT (STDMETHODCALLTYPE *Render)(
-        IPicture2* This,
+        IPicture2 *This,
         HDC hDC,
         LONG x,
         LONG y,
@@ -4519,42 +3967,43 @@
         LPCRECT pRcWBounds);
 
     HRESULT (STDMETHODCALLTYPE *set_hPal)(
-        IPicture2* This,
+        IPicture2 *This,
         HHANDLE hPal);
 
     HRESULT (STDMETHODCALLTYPE *get_CurDC)(
-        IPicture2* This,
+        IPicture2 *This,
         HDC *phDC);
 
     HRESULT (STDMETHODCALLTYPE *SelectPicture)(
-        IPicture2* This,
+        IPicture2 *This,
         HDC hDCIn,
         HDC *phDCOut,
         HHANDLE *phBmpOut);
 
     HRESULT (STDMETHODCALLTYPE *get_KeepOriginalFormat)(
-        IPicture2* This,
+        IPicture2 *This,
         WINBOOL *pKeep);
 
     HRESULT (STDMETHODCALLTYPE *put_KeepOriginalFormat)(
-        IPicture2* This,
+        IPicture2 *This,
         WINBOOL keep);
 
     HRESULT (STDMETHODCALLTYPE *PictureChanged)(
-        IPicture2* This);
+        IPicture2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SaveAsFile)(
-        IPicture2* This,
+        IPicture2 *This,
         LPSTREAM pStream,
         WINBOOL fSaveMemCopy,
         LONG *pCbSize);
 
     HRESULT (STDMETHODCALLTYPE *get_Attributes)(
-        IPicture2* This,
+        IPicture2 *This,
         DWORD *pDwAttr);
 
     END_INTERFACE
 } IPicture2Vtbl;
+
 interface IPicture2 {
     CONST_VTBL IPicture2Vtbl* lpVtbl;
 };
@@ -4639,130 +4088,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPicture2_get_Handle_Proxy(
-    IPicture2* This,
-    HHANDLE *pHandle);
-void __RPC_STUB IPicture2_get_Handle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_get_hPal_Proxy(
-    IPicture2* This,
-    HHANDLE *phPal);
-void __RPC_STUB IPicture2_get_hPal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_get_Type_Proxy(
-    IPicture2* This,
-    SHORT *pType);
-void __RPC_STUB IPicture2_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_get_Width_Proxy(
-    IPicture2* This,
-    OLE_XSIZE_HIMETRIC *pWidth);
-void __RPC_STUB IPicture2_get_Width_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_get_Height_Proxy(
-    IPicture2* This,
-    OLE_YSIZE_HIMETRIC *pHeight);
-void __RPC_STUB IPicture2_get_Height_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_Render_Proxy(
-    IPicture2* This,
-    HDC hDC,
-    LONG x,
-    LONG y,
-    LONG cx,
-    LONG cy,
-    OLE_XPOS_HIMETRIC xSrc,
-    OLE_YPOS_HIMETRIC ySrc,
-    OLE_XSIZE_HIMETRIC cxSrc,
-    OLE_YSIZE_HIMETRIC cySrc,
-    LPCRECT pRcWBounds);
-void __RPC_STUB IPicture2_Render_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_set_hPal_Proxy(
-    IPicture2* This,
-    HHANDLE hPal);
-void __RPC_STUB IPicture2_set_hPal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_get_CurDC_Proxy(
-    IPicture2* This,
-    HDC *phDC);
-void __RPC_STUB IPicture2_get_CurDC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_SelectPicture_Proxy(
-    IPicture2* This,
-    HDC hDCIn,
-    HDC *phDCOut,
-    HHANDLE *phBmpOut);
-void __RPC_STUB IPicture2_SelectPicture_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_get_KeepOriginalFormat_Proxy(
-    IPicture2* This,
-    WINBOOL *pKeep);
-void __RPC_STUB IPicture2_get_KeepOriginalFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_put_KeepOriginalFormat_Proxy(
-    IPicture2* This,
-    WINBOOL keep);
-void __RPC_STUB IPicture2_put_KeepOriginalFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_PictureChanged_Proxy(
-    IPicture2* This);
-void __RPC_STUB IPicture2_PictureChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_SaveAsFile_Proxy(
-    IPicture2* This,
-    LPSTREAM pStream,
-    WINBOOL fSaveMemCopy,
-    LONG *pCbSize);
-void __RPC_STUB IPicture2_SaveAsFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPicture2_get_Attributes_Proxy(
-    IPicture2* This,
-    DWORD *pDwAttr);
-void __RPC_STUB IPicture2_get_Attributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPicture2_INTERFACE_DEFINED__ */
 
@@ -4789,29 +4114,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFontEventsDisp* This,
+        IFontEventsDisp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFontEventsDisp* This);
+        IFontEventsDisp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFontEventsDisp* This);
+        IFontEventsDisp *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFontEventsDisp* This,
+        IFontEventsDisp *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFontEventsDisp* This,
+        IFontEventsDisp *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFontEventsDisp* This,
+        IFontEventsDisp *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4819,7 +4144,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFontEventsDisp* This,
+        IFontEventsDisp *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4831,6 +4156,7 @@
 
     END_INTERFACE
 } IFontEventsDispVtbl;
+
 interface IFontEventsDisp {
     CONST_VTBL IFontEventsDispVtbl* lpVtbl;
 };
@@ -4901,29 +4227,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFontDisp* This,
+        IFontDisp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFontDisp* This);
+        IFontDisp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFontDisp* This);
+        IFontDisp *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFontDisp* This,
+        IFontDisp *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFontDisp* This,
+        IFontDisp *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFontDisp* This,
+        IFontDisp *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4931,7 +4257,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFontDisp* This,
+        IFontDisp *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4943,6 +4269,7 @@
 
     END_INTERFACE
 } IFontDispVtbl;
+
 interface IFontDisp {
     CONST_VTBL IFontDispVtbl* lpVtbl;
 };
@@ -5013,29 +4340,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPictureDisp* This,
+        IPictureDisp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPictureDisp* This);
+        IPictureDisp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPictureDisp* This);
+        IPictureDisp *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IPictureDisp* This,
+        IPictureDisp *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IPictureDisp* This,
+        IPictureDisp *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IPictureDisp* This,
+        IPictureDisp *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5043,7 +4370,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IPictureDisp* This,
+        IPictureDisp *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5055,6 +4382,7 @@
 
     END_INTERFACE
 } IPictureDispVtbl;
+
 interface IPictureDisp {
     CONST_VTBL IPictureDispVtbl* lpVtbl;
 };
@@ -5135,54 +4463,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceObjectWindowless* This,
+        IOleInPlaceObjectWindowless *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceObjectWindowless* This);
+        IOleInPlaceObjectWindowless *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceObjectWindowless* This);
+        IOleInPlaceObjectWindowless *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceObjectWindowless* This,
+        IOleInPlaceObjectWindowless *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceObjectWindowless* This,
+        IOleInPlaceObjectWindowless *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceObject methods ***/
     HRESULT (STDMETHODCALLTYPE *InPlaceDeactivate)(
-        IOleInPlaceObjectWindowless* This);
+        IOleInPlaceObjectWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *UIDeactivate)(
-        IOleInPlaceObjectWindowless* This);
+        IOleInPlaceObjectWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *SetObjectRects)(
-        IOleInPlaceObjectWindowless* This,
+        IOleInPlaceObjectWindowless *This,
         LPCRECT lprcPosRect,
         LPCRECT lprcClipRect);
 
     HRESULT (STDMETHODCALLTYPE *ReactivateAndUndo)(
-        IOleInPlaceObjectWindowless* This);
+        IOleInPlaceObjectWindowless *This);
 
     /*** IOleInPlaceObjectWindowless methods ***/
     HRESULT (STDMETHODCALLTYPE *OnWindowMessage)(
-        IOleInPlaceObjectWindowless* This,
+        IOleInPlaceObjectWindowless *This,
         UINT msg,
         WPARAM wParam,
         LPARAM lParam,
         LRESULT *plResult);
 
     HRESULT (STDMETHODCALLTYPE *GetDropTarget)(
-        IOleInPlaceObjectWindowless* This,
+        IOleInPlaceObjectWindowless *This,
         IDropTarget **ppDropTarget);
 
     END_INTERFACE
 } IOleInPlaceObjectWindowlessVtbl;
+
 interface IOleInPlaceObjectWindowless {
     CONST_VTBL IOleInPlaceObjectWindowlessVtbl* lpVtbl;
 };
@@ -5247,25 +4576,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleInPlaceObjectWindowless_OnWindowMessage_Proxy(
-    IOleInPlaceObjectWindowless* This,
-    UINT msg,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IOleInPlaceObjectWindowless_OnWindowMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceObjectWindowless_GetDropTarget_Proxy(
-    IOleInPlaceObjectWindowless* This,
-    IDropTarget **ppDropTarget);
-void __RPC_STUB IOleInPlaceObjectWindowless_GetDropTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleInPlaceObjectWindowless_INTERFACE_DEFINED__ */
 
@@ -5307,37 +4617,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceSite methods ***/
     HRESULT (STDMETHODCALLTYPE *CanInPlaceActivate)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceActivate)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     HRESULT (STDMETHODCALLTYPE *OnUIActivate)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     HRESULT (STDMETHODCALLTYPE *GetWindowContext)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         IOleInPlaceFrame **ppFrame,
         IOleInPlaceUIWindow **ppDoc,
         LPRECT lprcPosRect,
@@ -5345,41 +4655,42 @@
         LPOLEINPLACEFRAMEINFO lpFrameInfo);
 
     HRESULT (STDMETHODCALLTYPE *Scroll)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         SIZE scrollExtant);
 
     HRESULT (STDMETHODCALLTYPE *OnUIDeactivate)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         WINBOOL fUndoable);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivate)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     HRESULT (STDMETHODCALLTYPE *DiscardUndoState)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     HRESULT (STDMETHODCALLTYPE *DeactivateAndUndo)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     HRESULT (STDMETHODCALLTYPE *OnPosRectChange)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         LPCRECT lprcPosRect);
 
     /*** IOleInPlaceSiteEx methods ***/
     HRESULT (STDMETHODCALLTYPE *OnInPlaceActivateEx)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         WINBOOL *pfNoRedraw,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivateEx)(
-        IOleInPlaceSiteEx* This,
+        IOleInPlaceSiteEx *This,
         WINBOOL fNoRedraw);
 
     HRESULT (STDMETHODCALLTYPE *RequestUIActivate)(
-        IOleInPlaceSiteEx* This);
+        IOleInPlaceSiteEx *This);
 
     END_INTERFACE
 } IOleInPlaceSiteExVtbl;
+
 interface IOleInPlaceSiteEx {
     CONST_VTBL IOleInPlaceSiteExVtbl* lpVtbl;
 };
@@ -5472,30 +4783,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteEx_OnInPlaceActivateEx_Proxy(
-    IOleInPlaceSiteEx* This,
-    WINBOOL *pfNoRedraw,
-    DWORD dwFlags);
-void __RPC_STUB IOleInPlaceSiteEx_OnInPlaceActivateEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteEx_OnInPlaceDeactivateEx_Proxy(
-    IOleInPlaceSiteEx* This,
-    WINBOOL fNoRedraw);
-void __RPC_STUB IOleInPlaceSiteEx_OnInPlaceDeactivateEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteEx_RequestUIActivate_Proxy(
-    IOleInPlaceSiteEx* This);
-void __RPC_STUB IOleInPlaceSiteEx_RequestUIActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleInPlaceSiteEx_INTERFACE_DEFINED__ */
 
@@ -5575,37 +4862,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceSite methods ***/
     HRESULT (STDMETHODCALLTYPE *CanInPlaceActivate)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceActivate)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *OnUIActivate)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *GetWindowContext)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         IOleInPlaceFrame **ppFrame,
         IOleInPlaceUIWindow **ppDoc,
         LPRECT lprcPosRect,
@@ -5613,90 +4900,90 @@
         LPOLEINPLACEFRAMEINFO lpFrameInfo);
 
     HRESULT (STDMETHODCALLTYPE *Scroll)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         SIZE scrollExtant);
 
     HRESULT (STDMETHODCALLTYPE *OnUIDeactivate)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         WINBOOL fUndoable);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivate)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *DiscardUndoState)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *DeactivateAndUndo)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *OnPosRectChange)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         LPCRECT lprcPosRect);
 
     /*** IOleInPlaceSiteEx methods ***/
     HRESULT (STDMETHODCALLTYPE *OnInPlaceActivateEx)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         WINBOOL *pfNoRedraw,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivateEx)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         WINBOOL fNoRedraw);
 
     HRESULT (STDMETHODCALLTYPE *RequestUIActivate)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     /*** IOleInPlaceSiteWindowless methods ***/
     HRESULT (STDMETHODCALLTYPE *CanWindowlessActivate)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCapture)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *SetCapture)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         WINBOOL fCapture);
 
     HRESULT (STDMETHODCALLTYPE *GetFocus)(
-        IOleInPlaceSiteWindowless* This);
+        IOleInPlaceSiteWindowless *This);
 
     HRESULT (STDMETHODCALLTYPE *SetFocus)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         WINBOOL fFocus);
 
     HRESULT (STDMETHODCALLTYPE *GetDC)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         LPCRECT pRect,
         DWORD grfFlags,
         HDC *phDC);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseDC)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         HDC hDC);
 
     HRESULT (STDMETHODCALLTYPE *InvalidateRect)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         LPCRECT pRect,
         WINBOOL fErase);
 
     HRESULT (STDMETHODCALLTYPE *InvalidateRgn)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         HRGN hRGN,
         WINBOOL fErase);
 
     HRESULT (STDMETHODCALLTYPE *ScrollRect)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         INT dx,
         INT dy,
         LPCRECT pRectScroll,
         LPCRECT pRectClip);
 
     HRESULT (STDMETHODCALLTYPE *AdjustRect)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         LPRECT prc);
 
     HRESULT (STDMETHODCALLTYPE *OnDefWindowMessage)(
-        IOleInPlaceSiteWindowless* This,
+        IOleInPlaceSiteWindowless *This,
         UINT msg,
         WPARAM wParam,
         LPARAM lParam,
@@ -5704,6 +4991,7 @@
 
     END_INTERFACE
 } IOleInPlaceSiteWindowlessVtbl;
+
 interface IOleInPlaceSiteWindowless {
     CONST_VTBL IOleInPlaceSiteWindowlessVtbl* lpVtbl;
 };
@@ -5846,109 +5134,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_CanWindowlessActivate_Proxy(
-    IOleInPlaceSiteWindowless* This);
-void __RPC_STUB IOleInPlaceSiteWindowless_CanWindowlessActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_GetCapture_Proxy(
-    IOleInPlaceSiteWindowless* This);
-void __RPC_STUB IOleInPlaceSiteWindowless_GetCapture_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_SetCapture_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    WINBOOL fCapture);
-void __RPC_STUB IOleInPlaceSiteWindowless_SetCapture_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_GetFocus_Proxy(
-    IOleInPlaceSiteWindowless* This);
-void __RPC_STUB IOleInPlaceSiteWindowless_GetFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_SetFocus_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    WINBOOL fFocus);
-void __RPC_STUB IOleInPlaceSiteWindowless_SetFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_GetDC_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    LPCRECT pRect,
-    DWORD grfFlags,
-    HDC *phDC);
-void __RPC_STUB IOleInPlaceSiteWindowless_GetDC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_ReleaseDC_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    HDC hDC);
-void __RPC_STUB IOleInPlaceSiteWindowless_ReleaseDC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_InvalidateRect_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    LPCRECT pRect,
-    WINBOOL fErase);
-void __RPC_STUB IOleInPlaceSiteWindowless_InvalidateRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_InvalidateRgn_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    HRGN hRGN,
-    WINBOOL fErase);
-void __RPC_STUB IOleInPlaceSiteWindowless_InvalidateRgn_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_ScrollRect_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    INT dx,
-    INT dy,
-    LPCRECT pRectScroll,
-    LPCRECT pRectClip);
-void __RPC_STUB IOleInPlaceSiteWindowless_ScrollRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_AdjustRect_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    LPRECT prc);
-void __RPC_STUB IOleInPlaceSiteWindowless_AdjustRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSiteWindowless_OnDefWindowMessage_Proxy(
-    IOleInPlaceSiteWindowless* This,
-    UINT msg,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IOleInPlaceSiteWindowless_OnDefWindowMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleInPlaceSiteWindowless_INTERFACE_DEFINED__ */
 
@@ -6046,19 +5231,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IViewObjectEx* This);
+        IViewObjectEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IViewObjectEx* This);
+        IViewObjectEx *This);
 
     /*** IViewObject methods ***/
     HRESULT (STDMETHODCALLTYPE *Draw)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
@@ -6071,7 +5256,7 @@
         ULONG_PTR dwContinue);
 
     HRESULT (STDMETHODCALLTYPE *GetColorSet)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
@@ -6080,31 +5265,31 @@
         LOGPALETTE **ppColorSet);
 
     HRESULT (STDMETHODCALLTYPE *Freeze)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
         DWORD *pdwFreeze);
 
     HRESULT (STDMETHODCALLTYPE *Unfreeze)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwFreeze);
 
     HRESULT (STDMETHODCALLTYPE *SetAdvise)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD aspects,
         DWORD advf,
         IAdviseSink *pAdvSink);
 
     HRESULT (STDMETHODCALLTYPE *GetAdvise)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD *pAspects,
         DWORD *pAdvf,
         IAdviseSink **ppAdvSink);
 
     /*** IViewObject2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetExtent)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwDrawAspect,
         LONG lindex,
         DVTARGETDEVICE *ptd,
@@ -6112,16 +5297,16 @@
 
     /*** IViewObjectEx methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRect)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwAspect,
         LPRECTL pRect);
 
     HRESULT (STDMETHODCALLTYPE *GetViewStatus)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD *pdwStatus);
 
     HRESULT (STDMETHODCALLTYPE *QueryHitPoint)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwAspect,
         LPCRECT pRectBounds,
         POINT ptlLoc,
@@ -6129,7 +5314,7 @@
         DWORD *pHitResult);
 
     HRESULT (STDMETHODCALLTYPE *QueryHitRect)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwAspect,
         LPCRECT pRectBounds,
         LPCRECT pRectLoc,
@@ -6137,7 +5322,7 @@
         DWORD *pHitResult);
 
     HRESULT (STDMETHODCALLTYPE *GetNaturalExtent)(
-        IViewObjectEx* This,
+        IViewObjectEx *This,
         DWORD dwAspect,
         LONG lindex,
         DVTARGETDEVICE *ptd,
@@ -6147,6 +5332,7 @@
 
     END_INTERFACE
 } IViewObjectExVtbl;
+
 interface IViewObjectEx {
     CONST_VTBL IViewObjectExVtbl* lpVtbl;
 };
@@ -6227,60 +5413,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IViewObjectEx_GetRect_Proxy(
-    IViewObjectEx* This,
-    DWORD dwAspect,
-    LPRECTL pRect);
-void __RPC_STUB IViewObjectEx_GetRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IViewObjectEx_GetViewStatus_Proxy(
-    IViewObjectEx* This,
-    DWORD *pdwStatus);
-void __RPC_STUB IViewObjectEx_GetViewStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IViewObjectEx_QueryHitPoint_Proxy(
-    IViewObjectEx* This,
-    DWORD dwAspect,
-    LPCRECT pRectBounds,
-    POINT ptlLoc,
-    LONG lCloseHint,
-    DWORD *pHitResult);
-void __RPC_STUB IViewObjectEx_QueryHitPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IViewObjectEx_QueryHitRect_Proxy(
-    IViewObjectEx* This,
-    DWORD dwAspect,
-    LPCRECT pRectBounds,
-    LPCRECT pRectLoc,
-    LONG lCloseHint,
-    DWORD *pHitResult);
-void __RPC_STUB IViewObjectEx_QueryHitRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IViewObjectEx_GetNaturalExtent_Proxy(
-    IViewObjectEx* This,
-    DWORD dwAspect,
-    LONG lindex,
-    DVTARGETDEVICE *ptd,
-    HDC hicTargetDev,
-    DVEXTENTINFO *pExtentInfo,
-    LPSIZEL pSizel);
-void __RPC_STUB IViewObjectEx_GetNaturalExtent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IViewObjectEx_INTERFACE_DEFINED__ */
 
@@ -6321,35 +5453,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleUndoUnit* This,
+        IOleUndoUnit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleUndoUnit* This);
+        IOleUndoUnit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleUndoUnit* This);
+        IOleUndoUnit *This);
 
     /*** IOleUndoUnit methods ***/
     HRESULT (STDMETHODCALLTYPE *Do)(
-        IOleUndoUnit* This,
+        IOleUndoUnit *This,
         IOleUndoManager *pUndoManager);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IOleUndoUnit* This,
+        IOleUndoUnit *This,
         BSTR *pBstr);
 
     HRESULT (STDMETHODCALLTYPE *GetUnitType)(
-        IOleUndoUnit* This,
+        IOleUndoUnit *This,
         CLSID *pClsid,
         LONG *plID);
 
     HRESULT (STDMETHODCALLTYPE *OnNextAdd)(
-        IOleUndoUnit* This);
+        IOleUndoUnit *This);
 
     END_INTERFACE
 } IOleUndoUnitVtbl;
+
 interface IOleUndoUnit {
     CONST_VTBL IOleUndoUnitVtbl* lpVtbl;
 };
@@ -6394,38 +5527,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleUndoUnit_Do_Proxy(
-    IOleUndoUnit* This,
-    IOleUndoManager *pUndoManager);
-void __RPC_STUB IOleUndoUnit_Do_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoUnit_GetDescription_Proxy(
-    IOleUndoUnit* This,
-    BSTR *pBstr);
-void __RPC_STUB IOleUndoUnit_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoUnit_GetUnitType_Proxy(
-    IOleUndoUnit* This,
-    CLSID *pClsid,
-    LONG *plID);
-void __RPC_STUB IOleUndoUnit_GetUnitType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoUnit_OnNextAdd_Proxy(
-    IOleUndoUnit* This);
-void __RPC_STUB IOleUndoUnit_OnNextAdd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleUndoUnit_INTERFACE_DEFINED__ */
 
@@ -6469,57 +5570,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleParentUndoUnit* This);
+        IOleParentUndoUnit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleParentUndoUnit* This);
+        IOleParentUndoUnit *This);
 
     /*** IOleUndoUnit methods ***/
     HRESULT (STDMETHODCALLTYPE *Do)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         IOleUndoManager *pUndoManager);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         BSTR *pBstr);
 
     HRESULT (STDMETHODCALLTYPE *GetUnitType)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         CLSID *pClsid,
         LONG *plID);
 
     HRESULT (STDMETHODCALLTYPE *OnNextAdd)(
-        IOleParentUndoUnit* This);
+        IOleParentUndoUnit *This);
 
     /*** IOleParentUndoUnit methods ***/
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         IOleParentUndoUnit *pPUU);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         IOleParentUndoUnit *pPUU,
         WINBOOL fCommit);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         IOleUndoUnit *pUU);
 
     HRESULT (STDMETHODCALLTYPE *FindUnit)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         IOleUndoUnit *pUU);
 
     HRESULT (STDMETHODCALLTYPE *GetParentState)(
-        IOleParentUndoUnit* This,
+        IOleParentUndoUnit *This,
         DWORD *pdwState);
 
     END_INTERFACE
 } IOleParentUndoUnitVtbl;
+
 interface IOleParentUndoUnit {
     CONST_VTBL IOleParentUndoUnitVtbl* lpVtbl;
 };
@@ -6586,47 +5688,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_Open_Proxy(
-    IOleParentUndoUnit* This,
-    IOleParentUndoUnit *pPUU);
-void __RPC_STUB IOleParentUndoUnit_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_Close_Proxy(
-    IOleParentUndoUnit* This,
-    IOleParentUndoUnit *pPUU,
-    WINBOOL fCommit);
-void __RPC_STUB IOleParentUndoUnit_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_Add_Proxy(
-    IOleParentUndoUnit* This,
-    IOleUndoUnit *pUU);
-void __RPC_STUB IOleParentUndoUnit_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_FindUnit_Proxy(
-    IOleParentUndoUnit* This,
-    IOleUndoUnit *pUU);
-void __RPC_STUB IOleParentUndoUnit_FindUnit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleParentUndoUnit_GetParentState_Proxy(
-    IOleParentUndoUnit* This,
-    DWORD *pdwState);
-void __RPC_STUB IOleParentUndoUnit_GetParentState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleParentUndoUnit_INTERFACE_DEFINED__ */
 
@@ -6668,36 +5729,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumOleUndoUnits* This,
+        IEnumOleUndoUnits *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumOleUndoUnits* This);
+        IEnumOleUndoUnits *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumOleUndoUnits* This);
+        IEnumOleUndoUnits *This);
 
     /*** IEnumOleUndoUnits methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumOleUndoUnits* This,
+        IEnumOleUndoUnits *This,
         ULONG cElt,
         IOleUndoUnit **rgElt,
         ULONG *pcEltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumOleUndoUnits* This,
+        IEnumOleUndoUnits *This,
         ULONG cElt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumOleUndoUnits* This);
+        IEnumOleUndoUnits *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumOleUndoUnits* This,
+        IEnumOleUndoUnits *This,
         IEnumOleUndoUnits **ppEnum);
 
     END_INTERFACE
 } IEnumOleUndoUnitsVtbl;
+
 interface IEnumOleUndoUnits {
     CONST_VTBL IEnumOleUndoUnitsVtbl* lpVtbl;
 };
@@ -6752,29 +5814,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOleUndoUnits_Skip_Proxy(
-    IEnumOleUndoUnits* This,
-    ULONG cElt);
-void __RPC_STUB IEnumOleUndoUnits_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOleUndoUnits_Reset_Proxy(
-    IEnumOleUndoUnits* This);
-void __RPC_STUB IEnumOleUndoUnits_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOleUndoUnits_Clone_Proxy(
-    IEnumOleUndoUnits* This,
-    IEnumOleUndoUnits **ppEnum);
-void __RPC_STUB IEnumOleUndoUnits_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumOleUndoUnits_Next_Proxy(
     IEnumOleUndoUnits* This,
     ULONG cElt,
@@ -6851,68 +5890,69 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleUndoManager* This);
+        IOleUndoManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleUndoManager* This);
+        IOleUndoManager *This);
 
     /*** IOleUndoManager methods ***/
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IOleParentUndoUnit *pPUU);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IOleParentUndoUnit *pPUU,
         WINBOOL fCommit);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IOleUndoUnit *pUU);
 
     HRESULT (STDMETHODCALLTYPE *GetOpenParentState)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         DWORD *pdwState);
 
     HRESULT (STDMETHODCALLTYPE *DiscardFrom)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IOleUndoUnit *pUU);
 
     HRESULT (STDMETHODCALLTYPE *UndoTo)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IOleUndoUnit *pUU);
 
     HRESULT (STDMETHODCALLTYPE *RedoTo)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IOleUndoUnit *pUU);
 
     HRESULT (STDMETHODCALLTYPE *EnumUndoable)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IEnumOleUndoUnits **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *EnumRedoable)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         IEnumOleUndoUnits **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *GetLastUndoDescription)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         BSTR *pBstr);
 
     HRESULT (STDMETHODCALLTYPE *GetLastRedoDescription)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         BSTR *pBstr);
 
     HRESULT (STDMETHODCALLTYPE *Enable)(
-        IOleUndoManager* This,
+        IOleUndoManager *This,
         WINBOOL fEnable);
 
     END_INTERFACE
 } IOleUndoManagerVtbl;
+
 interface IOleUndoManager {
     CONST_VTBL IOleUndoManagerVtbl* lpVtbl;
 };
@@ -6989,103 +6029,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleUndoManager_Open_Proxy(
-    IOleUndoManager* This,
-    IOleParentUndoUnit *pPUU);
-void __RPC_STUB IOleUndoManager_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_Close_Proxy(
-    IOleUndoManager* This,
-    IOleParentUndoUnit *pPUU,
-    WINBOOL fCommit);
-void __RPC_STUB IOleUndoManager_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_Add_Proxy(
-    IOleUndoManager* This,
-    IOleUndoUnit *pUU);
-void __RPC_STUB IOleUndoManager_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_GetOpenParentState_Proxy(
-    IOleUndoManager* This,
-    DWORD *pdwState);
-void __RPC_STUB IOleUndoManager_GetOpenParentState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_DiscardFrom_Proxy(
-    IOleUndoManager* This,
-    IOleUndoUnit *pUU);
-void __RPC_STUB IOleUndoManager_DiscardFrom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_UndoTo_Proxy(
-    IOleUndoManager* This,
-    IOleUndoUnit *pUU);
-void __RPC_STUB IOleUndoManager_UndoTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_RedoTo_Proxy(
-    IOleUndoManager* This,
-    IOleUndoUnit *pUU);
-void __RPC_STUB IOleUndoManager_RedoTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_EnumUndoable_Proxy(
-    IOleUndoManager* This,
-    IEnumOleUndoUnits **ppEnum);
-void __RPC_STUB IOleUndoManager_EnumUndoable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_EnumRedoable_Proxy(
-    IOleUndoManager* This,
-    IEnumOleUndoUnits **ppEnum);
-void __RPC_STUB IOleUndoManager_EnumRedoable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_GetLastUndoDescription_Proxy(
-    IOleUndoManager* This,
-    BSTR *pBstr);
-void __RPC_STUB IOleUndoManager_GetLastUndoDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_GetLastRedoDescription_Proxy(
-    IOleUndoManager* This,
-    BSTR *pBstr);
-void __RPC_STUB IOleUndoManager_GetLastRedoDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleUndoManager_Enable_Proxy(
-    IOleUndoManager* This,
-    WINBOOL fEnable);
-void __RPC_STUB IOleUndoManager_Enable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleUndoManager_INTERFACE_DEFINED__ */
 
@@ -7135,30 +6078,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPointerInactive* This,
+        IPointerInactive *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPointerInactive* This);
+        IPointerInactive *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPointerInactive* This);
+        IPointerInactive *This);
 
     /*** IPointerInactive methods ***/
     HRESULT (STDMETHODCALLTYPE *GetActivationPolicy)(
-        IPointerInactive* This,
+        IPointerInactive *This,
         DWORD *pdwPolicy);
 
     HRESULT (STDMETHODCALLTYPE *OnInactiveMouseMove)(
-        IPointerInactive* This,
+        IPointerInactive *This,
         LPCRECT pRectBounds,
         LONG x,
         LONG y,
         DWORD grfKeyState);
 
     HRESULT (STDMETHODCALLTYPE *OnInactiveSetCursor)(
-        IPointerInactive* This,
+        IPointerInactive *This,
         LPCRECT pRectBounds,
         LONG x,
         LONG y,
@@ -7167,6 +6110,7 @@
 
     END_INTERFACE
 } IPointerInactiveVtbl;
+
 interface IPointerInactive {
     CONST_VTBL IPointerInactiveVtbl* lpVtbl;
 };
@@ -7207,37 +6151,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPointerInactive_GetActivationPolicy_Proxy(
-    IPointerInactive* This,
-    DWORD *pdwPolicy);
-void __RPC_STUB IPointerInactive_GetActivationPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPointerInactive_OnInactiveMouseMove_Proxy(
-    IPointerInactive* This,
-    LPCRECT pRectBounds,
-    LONG x,
-    LONG y,
-    DWORD grfKeyState);
-void __RPC_STUB IPointerInactive_OnInactiveMouseMove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPointerInactive_OnInactiveSetCursor_Proxy(
-    IPointerInactive* This,
-    LPCRECT pRectBounds,
-    LONG x,
-    LONG y,
-    DWORD dwMouseMsg,
-    WINBOOL fSetAlways);
-void __RPC_STUB IPointerInactive_OnInactiveSetCursor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPointerInactive_INTERFACE_DEFINED__ */
 
@@ -7272,28 +6185,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithSite* This,
+        IObjectWithSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithSite* This);
+        IObjectWithSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithSite* This);
+        IObjectWithSite *This);
 
     /*** IObjectWithSite methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSite)(
-        IObjectWithSite* This,
+        IObjectWithSite *This,
         IUnknown *pUnkSite);
 
     HRESULT (STDMETHODCALLTYPE *GetSite)(
-        IObjectWithSite* This,
+        IObjectWithSite *This,
         REFIID riid,
         void **ppvSite);
 
     END_INTERFACE
 } IObjectWithSiteVtbl;
+
 interface IObjectWithSite {
     CONST_VTBL IObjectWithSiteVtbl* lpVtbl;
 };
@@ -7330,23 +6244,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithSite_SetSite_Proxy(
-    IObjectWithSite* This,
-    IUnknown *pUnkSite);
-void __RPC_STUB IObjectWithSite_SetSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IObjectWithSite_GetSite_Proxy(
-    IObjectWithSite* This,
-    REFIID riid,
-    void **ppvSite);
-void __RPC_STUB IObjectWithSite_GetSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithSite_INTERFACE_DEFINED__ */
 
@@ -7408,41 +6305,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPerPropertyBrowsing* This,
+        IPerPropertyBrowsing *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPerPropertyBrowsing* This);
+        IPerPropertyBrowsing *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPerPropertyBrowsing* This);
+        IPerPropertyBrowsing *This);
 
     /*** IPerPropertyBrowsing methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDisplayString)(
-        IPerPropertyBrowsing* This,
+        IPerPropertyBrowsing *This,
         DISPID dispID,
         BSTR *pBstr);
 
     HRESULT (STDMETHODCALLTYPE *MapPropertyToPage)(
-        IPerPropertyBrowsing* This,
+        IPerPropertyBrowsing *This,
         DISPID dispID,
         CLSID *pClsid);
 
     HRESULT (STDMETHODCALLTYPE *GetPredefinedStrings)(
-        IPerPropertyBrowsing* This,
+        IPerPropertyBrowsing *This,
         DISPID dispID,
         CALPOLESTR *pCaStringsOut,
         CADWORD *pCaCookiesOut);
 
     HRESULT (STDMETHODCALLTYPE *GetPredefinedValue)(
-        IPerPropertyBrowsing* This,
+        IPerPropertyBrowsing *This,
         DISPID dispID,
         DWORD dwCookie,
         VARIANT *pVarOut);
 
     END_INTERFACE
 } IPerPropertyBrowsingVtbl;
+
 interface IPerPropertyBrowsing {
     CONST_VTBL IPerPropertyBrowsingVtbl* lpVtbl;
 };
@@ -7487,44 +6385,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_GetDisplayString_Proxy(
-    IPerPropertyBrowsing* This,
-    DISPID dispID,
-    BSTR *pBstr);
-void __RPC_STUB IPerPropertyBrowsing_GetDisplayString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_MapPropertyToPage_Proxy(
-    IPerPropertyBrowsing* This,
-    DISPID dispID,
-    CLSID *pClsid);
-void __RPC_STUB IPerPropertyBrowsing_MapPropertyToPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_GetPredefinedStrings_Proxy(
-    IPerPropertyBrowsing* This,
-    DISPID dispID,
-    CALPOLESTR *pCaStringsOut,
-    CADWORD *pCaCookiesOut);
-void __RPC_STUB IPerPropertyBrowsing_GetPredefinedStrings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPerPropertyBrowsing_GetPredefinedValue_Proxy(
-    IPerPropertyBrowsing* This,
-    DISPID dispID,
-    DWORD dwCookie,
-    VARIANT *pVarOut);
-void __RPC_STUB IPerPropertyBrowsing_GetPredefinedValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPerPropertyBrowsing_INTERFACE_DEFINED__ */
 
@@ -7600,19 +6460,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyBag2* This,
+        IPropertyBag2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyBag2* This);
+        IPropertyBag2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyBag2* This);
+        IPropertyBag2 *This);
 
     /*** IPropertyBag2 methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IPropertyBag2* This,
+        IPropertyBag2 *This,
         ULONG cProperties,
         PROPBAG2 *pPropBag,
         IErrorLog *pErrLog,
@@ -7620,24 +6480,24 @@
         HRESULT *phrError);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IPropertyBag2* This,
+        IPropertyBag2 *This,
         ULONG cProperties,
         PROPBAG2 *pPropBag,
         VARIANT *pvarValue);
 
     HRESULT (STDMETHODCALLTYPE *CountProperties)(
-        IPropertyBag2* This,
+        IPropertyBag2 *This,
         ULONG *pcProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyInfo)(
-        IPropertyBag2* This,
+        IPropertyBag2 *This,
         ULONG iProperty,
         ULONG cProperties,
         PROPBAG2 *pPropBag,
         ULONG *pcProperties);
 
     HRESULT (STDMETHODCALLTYPE *LoadObject)(
-        IPropertyBag2* This,
+        IPropertyBag2 *This,
         LPCOLESTR pstrName,
         DWORD dwHint,
         IUnknown *pUnkObject,
@@ -7645,6 +6505,7 @@
 
     END_INTERFACE
 } IPropertyBag2Vtbl;
+
 interface IPropertyBag2 {
     CONST_VTBL IPropertyBag2Vtbl* lpVtbl;
 };
@@ -7693,58 +6554,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyBag2_Read_Proxy(
-    IPropertyBag2* This,
-    ULONG cProperties,
-    PROPBAG2 *pPropBag,
-    IErrorLog *pErrLog,
-    VARIANT *pvarValue,
-    HRESULT *phrError);
-void __RPC_STUB IPropertyBag2_Read_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyBag2_Write_Proxy(
-    IPropertyBag2* This,
-    ULONG cProperties,
-    PROPBAG2 *pPropBag,
-    VARIANT *pvarValue);
-void __RPC_STUB IPropertyBag2_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyBag2_CountProperties_Proxy(
-    IPropertyBag2* This,
-    ULONG *pcProperties);
-void __RPC_STUB IPropertyBag2_CountProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyBag2_GetPropertyInfo_Proxy(
-    IPropertyBag2* This,
-    ULONG iProperty,
-    ULONG cProperties,
-    PROPBAG2 *pPropBag,
-    ULONG *pcProperties);
-void __RPC_STUB IPropertyBag2_GetPropertyInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyBag2_LoadObject_Proxy(
-    IPropertyBag2* This,
-    LPCOLESTR pstrName,
-    DWORD dwHint,
-    IUnknown *pUnkObject,
-    IErrorLog *pErrLog);
-void __RPC_STUB IPropertyBag2_LoadObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyBag2_INTERFACE_DEFINED__ */
 
@@ -7789,41 +6598,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistPropertyBag2* This,
+        IPersistPropertyBag2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistPropertyBag2* This);
+        IPersistPropertyBag2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistPropertyBag2* This);
+        IPersistPropertyBag2 *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistPropertyBag2* This,
+        IPersistPropertyBag2 *This,
         CLSID *pClassID);
 
     /*** IPersistPropertyBag2 methods ***/
     HRESULT (STDMETHODCALLTYPE *InitNew)(
-        IPersistPropertyBag2* This);
+        IPersistPropertyBag2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IPersistPropertyBag2* This,
+        IPersistPropertyBag2 *This,
         IPropertyBag2 *pPropBag,
         IErrorLog *pErrLog);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IPersistPropertyBag2* This,
+        IPersistPropertyBag2 *This,
         IPropertyBag2 *pPropBag,
         WINBOOL fClearDirty,
         WINBOOL fSaveAllProperties);
 
     HRESULT (STDMETHODCALLTYPE *IsDirty)(
-        IPersistPropertyBag2* This);
+        IPersistPropertyBag2 *This);
 
     END_INTERFACE
 } IPersistPropertyBag2Vtbl;
+
 interface IPersistPropertyBag2 {
     CONST_VTBL IPersistPropertyBag2Vtbl* lpVtbl;
 };
@@ -7874,39 +6684,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_InitNew_Proxy(
-    IPersistPropertyBag2* This);
-void __RPC_STUB IPersistPropertyBag2_InitNew_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_Load_Proxy(
-    IPersistPropertyBag2* This,
-    IPropertyBag2 *pPropBag,
-    IErrorLog *pErrLog);
-void __RPC_STUB IPersistPropertyBag2_Load_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_Save_Proxy(
-    IPersistPropertyBag2* This,
-    IPropertyBag2 *pPropBag,
-    WINBOOL fClearDirty,
-    WINBOOL fSaveAllProperties);
-void __RPC_STUB IPersistPropertyBag2_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistPropertyBag2_IsDirty_Proxy(
-    IPersistPropertyBag2* This);
-void __RPC_STUB IPersistPropertyBag2_IsDirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistPropertyBag2_INTERFACE_DEFINED__ */
 
@@ -7939,44 +6716,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAdviseSinkEx* This,
+        IAdviseSinkEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAdviseSinkEx* This);
+        IAdviseSinkEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAdviseSinkEx* This);
+        IAdviseSinkEx *This);
 
     /*** IAdviseSink methods ***/
     void (STDMETHODCALLTYPE *OnDataChange)(
-        IAdviseSinkEx* This,
+        IAdviseSinkEx *This,
         FORMATETC *pFormatetc,
         STGMEDIUM *pStgmed);
 
     void (STDMETHODCALLTYPE *OnViewChange)(
-        IAdviseSinkEx* This,
+        IAdviseSinkEx *This,
         DWORD dwAspect,
         LONG lindex);
 
     void (STDMETHODCALLTYPE *OnRename)(
-        IAdviseSinkEx* This,
+        IAdviseSinkEx *This,
         IMoniker *pmk);
 
     void (STDMETHODCALLTYPE *OnSave)(
-        IAdviseSinkEx* This);
+        IAdviseSinkEx *This);
 
     void (STDMETHODCALLTYPE *OnClose)(
-        IAdviseSinkEx* This);
+        IAdviseSinkEx *This);
 
     /*** IAdviseSinkEx methods ***/
     void (STDMETHODCALLTYPE *OnViewStatusChange)(
-        IAdviseSinkEx* This,
+        IAdviseSinkEx *This,
         DWORD dwViewStatus);
 
     END_INTERFACE
 } IAdviseSinkExVtbl;
+
 interface IAdviseSinkEx {
     CONST_VTBL IAdviseSinkExVtbl* lpVtbl;
 };
@@ -8125,32 +6903,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IQuickActivate* This,
+        IQuickActivate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IQuickActivate* This);
+        IQuickActivate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IQuickActivate* This);
+        IQuickActivate *This);
 
     /*** IQuickActivate methods ***/
     HRESULT (STDMETHODCALLTYPE *QuickActivate)(
-        IQuickActivate* This,
+        IQuickActivate *This,
         QACONTAINER *pQaContainer,
         QACONTROL *pQaControl);
 
     HRESULT (STDMETHODCALLTYPE *SetContentExtent)(
-        IQuickActivate* This,
+        IQuickActivate *This,
         LPSIZEL pSizel);
 
     HRESULT (STDMETHODCALLTYPE *GetContentExtent)(
-        IQuickActivate* This,
+        IQuickActivate *This,
         LPSIZEL pSizel);
 
     END_INTERFACE
 } IQuickActivateVtbl;
+
 interface IQuickActivate {
     CONST_VTBL IQuickActivateVtbl* lpVtbl;
 };
@@ -8200,22 +6979,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IQuickActivate_SetContentExtent_Proxy(
-    IQuickActivate* This,
-    LPSIZEL pSizel);
-void __RPC_STUB IQuickActivate_SetContentExtent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IQuickActivate_GetContentExtent_Proxy(
-    IQuickActivate* This,
-    LPSIZEL pSizel);
-void __RPC_STUB IQuickActivate_GetContentExtent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IQuickActivate_QuickActivate_Proxy(
     IQuickActivate* This,
     QACONTAINER *pQaContainer,
diff --git a/mingw-w64-headers/include/oleacc.h b/mingw-w64-headers/include/oleacc.h
index 36b5318..f462ae2 100644
--- a/mingw-w64-headers/include/oleacc.h
+++ b/mingw-w64-headers/include/oleacc.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/oleacc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/oleacc.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IAccessible_FWD_DEFINED__
 #define __IAccessible_FWD_DEFINED__
 typedef interface IAccessible IAccessible;
+#ifdef __cplusplus
+interface IAccessible;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -422,29 +425,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAccessible* This,
+        IAccessible *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAccessible* This);
+        IAccessible *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAccessible* This);
+        IAccessible *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IAccessible* This,
+        IAccessible *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IAccessible* This,
+        IAccessible *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IAccessible* This,
+        IAccessible *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -452,7 +455,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IAccessible* This,
+        IAccessible *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -464,79 +467,79 @@
 
     /*** IAccessible methods ***/
     HRESULT (STDMETHODCALLTYPE *get_accParent)(
-        IAccessible* This,
+        IAccessible *This,
         IDispatch **ppdispParent);
 
     HRESULT (STDMETHODCALLTYPE *get_accChildCount)(
-        IAccessible* This,
+        IAccessible *This,
         LONG *pcountChildren);
 
     HRESULT (STDMETHODCALLTYPE *get_accChild)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varChildID,
         IDispatch **ppdispChild);
 
     HRESULT (STDMETHODCALLTYPE *get_accName)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR *pszName);
 
     HRESULT (STDMETHODCALLTYPE *get_accValue)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR *pszValue);
 
     HRESULT (STDMETHODCALLTYPE *get_accDescription)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR *pszDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_accRole)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         VARIANT *pvarRole);
 
     HRESULT (STDMETHODCALLTYPE *get_accState)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         VARIANT *pvarState);
 
     HRESULT (STDMETHODCALLTYPE *get_accHelp)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR *pszHelp);
 
     HRESULT (STDMETHODCALLTYPE *get_accHelpTopic)(
-        IAccessible* This,
+        IAccessible *This,
         BSTR *pszHelpFile,
         VARIANT varID,
         LONG *pidTopic);
 
     HRESULT (STDMETHODCALLTYPE *get_accKeyboardShortcut)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR *pszKeyboardShortcut);
 
     HRESULT (STDMETHODCALLTYPE *get_accFocus)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT *pvarID);
 
     HRESULT (STDMETHODCALLTYPE *get_accSelection)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT *pvarID);
 
     HRESULT (STDMETHODCALLTYPE *get_accDefaultAction)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR *pszDefaultAction);
 
     HRESULT (STDMETHODCALLTYPE *accSelect)(
-        IAccessible* This,
+        IAccessible *This,
         LONG flagsSelect,
         VARIANT varID);
 
     HRESULT (STDMETHODCALLTYPE *accLocation)(
-        IAccessible* This,
+        IAccessible *This,
         LONG *pxLeft,
         LONG *pyTop,
         LONG *pcxWidth,
@@ -544,33 +547,34 @@
         VARIANT varID);
 
     HRESULT (STDMETHODCALLTYPE *accNavigate)(
-        IAccessible* This,
+        IAccessible *This,
         LONG navDir,
         VARIANT varStart,
         VARIANT *pvarEnd);
 
     HRESULT (STDMETHODCALLTYPE *accHitTest)(
-        IAccessible* This,
+        IAccessible *This,
         LONG xLeft,
         LONG yTop,
         VARIANT *pvarID);
 
     HRESULT (STDMETHODCALLTYPE *accDoDefaultAction)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID);
 
     HRESULT (STDMETHODCALLTYPE *put_accName)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *put_accValue)(
-        IAccessible* This,
+        IAccessible *This,
         VARIANT varID,
         BSTR pszValue);
 
     END_INTERFACE
 } IAccessibleVtbl;
+
 interface IAccessible {
     CONST_VTBL IAccessibleVtbl* lpVtbl;
 };
@@ -701,196 +705,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAccessible_get_accParent_Proxy(
-    IAccessible* This,
-    IDispatch **ppdispParent);
-void __RPC_STUB IAccessible_get_accParent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accChildCount_Proxy(
-    IAccessible* This,
-    LONG *pcountChildren);
-void __RPC_STUB IAccessible_get_accChildCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accChild_Proxy(
-    IAccessible* This,
-    VARIANT varChildID,
-    IDispatch **ppdispChild);
-void __RPC_STUB IAccessible_get_accChild_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accName_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR *pszName);
-void __RPC_STUB IAccessible_get_accName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accValue_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR *pszValue);
-void __RPC_STUB IAccessible_get_accValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accDescription_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR *pszDescription);
-void __RPC_STUB IAccessible_get_accDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accRole_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    VARIANT *pvarRole);
-void __RPC_STUB IAccessible_get_accRole_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accState_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    VARIANT *pvarState);
-void __RPC_STUB IAccessible_get_accState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accHelp_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR *pszHelp);
-void __RPC_STUB IAccessible_get_accHelp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accHelpTopic_Proxy(
-    IAccessible* This,
-    BSTR *pszHelpFile,
-    VARIANT varID,
-    LONG *pidTopic);
-void __RPC_STUB IAccessible_get_accHelpTopic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accKeyboardShortcut_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR *pszKeyboardShortcut);
-void __RPC_STUB IAccessible_get_accKeyboardShortcut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accFocus_Proxy(
-    IAccessible* This,
-    VARIANT *pvarID);
-void __RPC_STUB IAccessible_get_accFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accSelection_Proxy(
-    IAccessible* This,
-    VARIANT *pvarID);
-void __RPC_STUB IAccessible_get_accSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_get_accDefaultAction_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR *pszDefaultAction);
-void __RPC_STUB IAccessible_get_accDefaultAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_accSelect_Proxy(
-    IAccessible* This,
-    LONG flagsSelect,
-    VARIANT varID);
-void __RPC_STUB IAccessible_accSelect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_accLocation_Proxy(
-    IAccessible* This,
-    LONG *pxLeft,
-    LONG *pyTop,
-    LONG *pcxWidth,
-    LONG *pcyHeight,
-    VARIANT varID);
-void __RPC_STUB IAccessible_accLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_accNavigate_Proxy(
-    IAccessible* This,
-    LONG navDir,
-    VARIANT varStart,
-    VARIANT *pvarEnd);
-void __RPC_STUB IAccessible_accNavigate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_accHitTest_Proxy(
-    IAccessible* This,
-    LONG xLeft,
-    LONG yTop,
-    VARIANT *pvarID);
-void __RPC_STUB IAccessible_accHitTest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_accDoDefaultAction_Proxy(
-    IAccessible* This,
-    VARIANT varID);
-void __RPC_STUB IAccessible_accDoDefaultAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_put_accName_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR pszName);
-void __RPC_STUB IAccessible_put_accName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessible_put_accValue_Proxy(
-    IAccessible* This,
-    VARIANT varID,
-    BSTR pszValue);
-void __RPC_STUB IAccessible_put_accValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAccessible_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/oleidl.h b/mingw-w64-headers/include/oleidl.h
index ffb815f..4a664e1 100644
--- a/mingw-w64-headers/include/oleidl.h
+++ b/mingw-w64-headers/include/oleidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/oleidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/oleidl.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,116 +20,185 @@
 #ifndef __IOleAdviseHolder_FWD_DEFINED__
 #define __IOleAdviseHolder_FWD_DEFINED__
 typedef interface IOleAdviseHolder IOleAdviseHolder;
+#ifdef __cplusplus
+interface IOleAdviseHolder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleCache_FWD_DEFINED__
 #define __IOleCache_FWD_DEFINED__
 typedef interface IOleCache IOleCache;
+#ifdef __cplusplus
+interface IOleCache;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleCache2_FWD_DEFINED__
 #define __IOleCache2_FWD_DEFINED__
 typedef interface IOleCache2 IOleCache2;
+#ifdef __cplusplus
+interface IOleCache2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleCacheControl_FWD_DEFINED__
 #define __IOleCacheControl_FWD_DEFINED__
 typedef interface IOleCacheControl IOleCacheControl;
+#ifdef __cplusplus
+interface IOleCacheControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IParseDisplayName_FWD_DEFINED__
 #define __IParseDisplayName_FWD_DEFINED__
 typedef interface IParseDisplayName IParseDisplayName;
+#ifdef __cplusplus
+interface IParseDisplayName;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleContainer_FWD_DEFINED__
 #define __IOleContainer_FWD_DEFINED__
 typedef interface IOleContainer IOleContainer;
+#ifdef __cplusplus
+interface IOleContainer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleClientSite_FWD_DEFINED__
 #define __IOleClientSite_FWD_DEFINED__
 typedef interface IOleClientSite IOleClientSite;
+#ifdef __cplusplus
+interface IOleClientSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleObject_FWD_DEFINED__
 #define __IOleObject_FWD_DEFINED__
 typedef interface IOleObject IOleObject;
+#ifdef __cplusplus
+interface IOleObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleWindow_FWD_DEFINED__
 #define __IOleWindow_FWD_DEFINED__
 typedef interface IOleWindow IOleWindow;
+#ifdef __cplusplus
+interface IOleWindow;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleLink_FWD_DEFINED__
 #define __IOleLink_FWD_DEFINED__
 typedef interface IOleLink IOleLink;
+#ifdef __cplusplus
+interface IOleLink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleItemContainer_FWD_DEFINED__
 #define __IOleItemContainer_FWD_DEFINED__
 typedef interface IOleItemContainer IOleItemContainer;
+#ifdef __cplusplus
+interface IOleItemContainer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceUIWindow_FWD_DEFINED__
 #define __IOleInPlaceUIWindow_FWD_DEFINED__
 typedef interface IOleInPlaceUIWindow IOleInPlaceUIWindow;
+#ifdef __cplusplus
+interface IOleInPlaceUIWindow;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceActiveObject_FWD_DEFINED__
 #define __IOleInPlaceActiveObject_FWD_DEFINED__
 typedef interface IOleInPlaceActiveObject IOleInPlaceActiveObject;
+#ifdef __cplusplus
+interface IOleInPlaceActiveObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceFrame_FWD_DEFINED__
 #define __IOleInPlaceFrame_FWD_DEFINED__
 typedef interface IOleInPlaceFrame IOleInPlaceFrame;
+#ifdef __cplusplus
+interface IOleInPlaceFrame;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceObject_FWD_DEFINED__
 #define __IOleInPlaceObject_FWD_DEFINED__
 typedef interface IOleInPlaceObject IOleInPlaceObject;
+#ifdef __cplusplus
+interface IOleInPlaceObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOleInPlaceSite_FWD_DEFINED__
 #define __IOleInPlaceSite_FWD_DEFINED__
 typedef interface IOleInPlaceSite IOleInPlaceSite;
+#ifdef __cplusplus
+interface IOleInPlaceSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IContinue_FWD_DEFINED__
 #define __IContinue_FWD_DEFINED__
 typedef interface IContinue IContinue;
+#ifdef __cplusplus
+interface IContinue;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IViewObject_FWD_DEFINED__
 #define __IViewObject_FWD_DEFINED__
 typedef interface IViewObject IViewObject;
+#ifdef __cplusplus
+interface IViewObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IViewObject2_FWD_DEFINED__
 #define __IViewObject2_FWD_DEFINED__
 typedef interface IViewObject2 IViewObject2;
+#ifdef __cplusplus
+interface IViewObject2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDropSource_FWD_DEFINED__
 #define __IDropSource_FWD_DEFINED__
 typedef interface IDropSource IDropSource;
+#ifdef __cplusplus
+interface IDropSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDropTarget_FWD_DEFINED__
 #define __IDropTarget_FWD_DEFINED__
 typedef interface IDropTarget IDropTarget;
+#ifdef __cplusplus
+interface IDropTarget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDropSourceNotify_FWD_DEFINED__
 #define __IDropSourceNotify_FWD_DEFINED__
 typedef interface IDropSourceNotify IDropSourceNotify;
+#ifdef __cplusplus
+interface IDropSourceNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumOLEVERB_FWD_DEFINED__
 #define __IEnumOLEVERB_FWD_DEFINED__
 typedef interface IEnumOLEVERB IEnumOLEVERB;
+#ifdef __cplusplus
+interface IEnumOLEVERB;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -152,11 +221,17 @@
 #ifndef __IOleInPlaceActiveObject_FWD_DEFINED__
 #define __IOleInPlaceActiveObject_FWD_DEFINED__
 typedef interface IOleInPlaceActiveObject IOleInPlaceActiveObject;
+#ifdef __cplusplus
+interface IOleInPlaceActiveObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumOLEVERB_FWD_DEFINED__
 #define __IEnumOLEVERB_FWD_DEFINED__
 typedef interface IEnumOLEVERB IEnumOLEVERB;
+#ifdef __cplusplus
+interface IEnumOLEVERB;
+#endif /* __cplusplus */
 #endif
 
 
@@ -202,42 +277,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleAdviseHolder* This,
+        IOleAdviseHolder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleAdviseHolder* This);
+        IOleAdviseHolder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleAdviseHolder* This);
+        IOleAdviseHolder *This);
 
     /*** IOleAdviseHolder methods ***/
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IOleAdviseHolder* This,
+        IOleAdviseHolder *This,
         IAdviseSink *pAdvise,
         DWORD *pdwConnection);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IOleAdviseHolder* This,
+        IOleAdviseHolder *This,
         DWORD dwConnection);
 
     HRESULT (STDMETHODCALLTYPE *EnumAdvise)(
-        IOleAdviseHolder* This,
+        IOleAdviseHolder *This,
         IEnumSTATDATA **ppenumAdvise);
 
     HRESULT (STDMETHODCALLTYPE *SendOnRename)(
-        IOleAdviseHolder* This,
+        IOleAdviseHolder *This,
         IMoniker *pmk);
 
     HRESULT (STDMETHODCALLTYPE *SendOnSave)(
-        IOleAdviseHolder* This);
+        IOleAdviseHolder *This);
 
     HRESULT (STDMETHODCALLTYPE *SendOnClose)(
-        IOleAdviseHolder* This);
+        IOleAdviseHolder *This);
 
     END_INTERFACE
 } IOleAdviseHolderVtbl;
+
 interface IOleAdviseHolder {
     CONST_VTBL IOleAdviseHolderVtbl* lpVtbl;
 };
@@ -290,53 +366,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleAdviseHolder_Advise_Proxy(
-    IOleAdviseHolder* This,
-    IAdviseSink *pAdvise,
-    DWORD *pdwConnection);
-void __RPC_STUB IOleAdviseHolder_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleAdviseHolder_Unadvise_Proxy(
-    IOleAdviseHolder* This,
-    DWORD dwConnection);
-void __RPC_STUB IOleAdviseHolder_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleAdviseHolder_EnumAdvise_Proxy(
-    IOleAdviseHolder* This,
-    IEnumSTATDATA **ppenumAdvise);
-void __RPC_STUB IOleAdviseHolder_EnumAdvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleAdviseHolder_SendOnRename_Proxy(
-    IOleAdviseHolder* This,
-    IMoniker *pmk);
-void __RPC_STUB IOleAdviseHolder_SendOnRename_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleAdviseHolder_SendOnSave_Proxy(
-    IOleAdviseHolder* This);
-void __RPC_STUB IOleAdviseHolder_SendOnSave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleAdviseHolder_SendOnClose_Proxy(
-    IOleAdviseHolder* This);
-void __RPC_STUB IOleAdviseHolder_SendOnClose_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleAdviseHolder_INTERFACE_DEFINED__ */
 
@@ -385,43 +414,44 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleCache* This,
+        IOleCache *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleCache* This);
+        IOleCache *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleCache* This);
+        IOleCache *This);
 
     /*** IOleCache methods ***/
     HRESULT (STDMETHODCALLTYPE *Cache)(
-        IOleCache* This,
+        IOleCache *This,
         FORMATETC *pformatetc,
         DWORD advf,
         DWORD *pdwConnection);
 
     HRESULT (STDMETHODCALLTYPE *Uncache)(
-        IOleCache* This,
+        IOleCache *This,
         DWORD dwConnection);
 
     HRESULT (STDMETHODCALLTYPE *EnumCache)(
-        IOleCache* This,
+        IOleCache *This,
         IEnumSTATDATA **ppenumSTATDATA);
 
     HRESULT (STDMETHODCALLTYPE *InitCache)(
-        IOleCache* This,
+        IOleCache *This,
         IDataObject *pDataObject);
 
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        IOleCache* This,
+        IOleCache *This,
         FORMATETC *pformatetc,
         STGMEDIUM *pmedium,
         WINBOOL fRelease);
 
     END_INTERFACE
 } IOleCacheVtbl;
+
 interface IOleCache {
     CONST_VTBL IOleCacheVtbl* lpVtbl;
 };
@@ -470,50 +500,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleCache_Cache_Proxy(
-    IOleCache* This,
-    FORMATETC *pformatetc,
-    DWORD advf,
-    DWORD *pdwConnection);
-void __RPC_STUB IOleCache_Cache_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleCache_Uncache_Proxy(
-    IOleCache* This,
-    DWORD dwConnection);
-void __RPC_STUB IOleCache_Uncache_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleCache_EnumCache_Proxy(
-    IOleCache* This,
-    IEnumSTATDATA **ppenumSTATDATA);
-void __RPC_STUB IOleCache_EnumCache_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleCache_InitCache_Proxy(
-    IOleCache* This,
-    IDataObject *pDataObject);
-void __RPC_STUB IOleCache_InitCache_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleCache_SetData_Proxy(
-    IOleCache* This,
-    FORMATETC *pformatetc,
-    STGMEDIUM *pmedium,
-    WINBOOL fRelease);
-void __RPC_STUB IOleCache_SetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleCache_INTERFACE_DEFINED__ */
 
@@ -573,54 +559,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleCache2* This,
+        IOleCache2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleCache2* This);
+        IOleCache2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleCache2* This);
+        IOleCache2 *This);
 
     /*** IOleCache methods ***/
     HRESULT (STDMETHODCALLTYPE *Cache)(
-        IOleCache2* This,
+        IOleCache2 *This,
         FORMATETC *pformatetc,
         DWORD advf,
         DWORD *pdwConnection);
 
     HRESULT (STDMETHODCALLTYPE *Uncache)(
-        IOleCache2* This,
+        IOleCache2 *This,
         DWORD dwConnection);
 
     HRESULT (STDMETHODCALLTYPE *EnumCache)(
-        IOleCache2* This,
+        IOleCache2 *This,
         IEnumSTATDATA **ppenumSTATDATA);
 
     HRESULT (STDMETHODCALLTYPE *InitCache)(
-        IOleCache2* This,
+        IOleCache2 *This,
         IDataObject *pDataObject);
 
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        IOleCache2* This,
+        IOleCache2 *This,
         FORMATETC *pformatetc,
         STGMEDIUM *pmedium,
         WINBOOL fRelease);
 
     /*** IOleCache2 methods ***/
     HRESULT (STDMETHODCALLTYPE *UpdateCache)(
-        IOleCache2* This,
+        IOleCache2 *This,
         LPDATAOBJECT pDataObject,
         DWORD grfUpdf,
         LPVOID pReserved);
 
     HRESULT (STDMETHODCALLTYPE *DiscardCache)(
-        IOleCache2* This,
+        IOleCache2 *This,
         DWORD dwDiscardOptions);
 
     END_INTERFACE
 } IOleCache2Vtbl;
+
 interface IOleCache2 {
     CONST_VTBL IOleCache2Vtbl* lpVtbl;
 };
@@ -689,14 +676,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleCache2_DiscardCache_Proxy(
-    IOleCache2* This,
-    DWORD dwDiscardOptions);
-void __RPC_STUB IOleCache2_DiscardCache_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IOleCache2_UpdateCache_Proxy(
     IOleCache2* This,
     LPDATAOBJECT pDataObject,
@@ -742,26 +721,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleCacheControl* This,
+        IOleCacheControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleCacheControl* This);
+        IOleCacheControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleCacheControl* This);
+        IOleCacheControl *This);
 
     /*** IOleCacheControl methods ***/
     HRESULT (STDMETHODCALLTYPE *OnRun)(
-        IOleCacheControl* This,
+        IOleCacheControl *This,
         LPDATAOBJECT pDataObject);
 
     HRESULT (STDMETHODCALLTYPE *OnStop)(
-        IOleCacheControl* This);
+        IOleCacheControl *This);
 
     END_INTERFACE
 } IOleCacheControlVtbl;
+
 interface IOleCacheControl {
     CONST_VTBL IOleCacheControlVtbl* lpVtbl;
 };
@@ -798,21 +778,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleCacheControl_OnRun_Proxy(
-    IOleCacheControl* This,
-    LPDATAOBJECT pDataObject);
-void __RPC_STUB IOleCacheControl_OnRun_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleCacheControl_OnStop_Proxy(
-    IOleCacheControl* This);
-void __RPC_STUB IOleCacheControl_OnStop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleCacheControl_INTERFACE_DEFINED__ */
 
@@ -846,19 +811,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IParseDisplayName* This,
+        IParseDisplayName *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IParseDisplayName* This);
+        IParseDisplayName *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IParseDisplayName* This);
+        IParseDisplayName *This);
 
     /*** IParseDisplayName methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseDisplayName)(
-        IParseDisplayName* This,
+        IParseDisplayName *This,
         IBindCtx *pbc,
         LPOLESTR pszDisplayName,
         ULONG *pchEaten,
@@ -866,6 +831,7 @@
 
     END_INTERFACE
 } IParseDisplayNameVtbl;
+
 interface IParseDisplayName {
     CONST_VTBL IParseDisplayNameVtbl* lpVtbl;
 };
@@ -898,17 +864,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IParseDisplayName_ParseDisplayName_Proxy(
-    IParseDisplayName* This,
-    IBindCtx *pbc,
-    LPOLESTR pszDisplayName,
-    ULONG *pchEaten,
-    IMoniker **ppmkOut);
-void __RPC_STUB IParseDisplayName_ParseDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IParseDisplayName_INTERFACE_DEFINED__ */
 
@@ -943,19 +898,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleContainer* This,
+        IOleContainer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleContainer* This);
+        IOleContainer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleContainer* This);
+        IOleContainer *This);
 
     /*** IParseDisplayName methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseDisplayName)(
-        IOleContainer* This,
+        IOleContainer *This,
         IBindCtx *pbc,
         LPOLESTR pszDisplayName,
         ULONG *pchEaten,
@@ -963,16 +918,17 @@
 
     /*** IOleContainer methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumObjects)(
-        IOleContainer* This,
+        IOleContainer *This,
         DWORD grfFlags,
         IEnumUnknown **ppenum);
 
     HRESULT (STDMETHODCALLTYPE *LockContainer)(
-        IOleContainer* This,
+        IOleContainer *This,
         WINBOOL fLock);
 
     END_INTERFACE
 } IOleContainerVtbl;
+
 interface IOleContainer {
     CONST_VTBL IOleContainerVtbl* lpVtbl;
 };
@@ -1015,23 +971,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleContainer_EnumObjects_Proxy(
-    IOleContainer* This,
-    DWORD grfFlags,
-    IEnumUnknown **ppenum);
-void __RPC_STUB IOleContainer_EnumObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleContainer_LockContainer_Proxy(
-    IOleContainer* This,
-    WINBOOL fLock);
-void __RPC_STUB IOleContainer_LockContainer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleContainer_INTERFACE_DEFINED__ */
 
@@ -1079,42 +1018,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleClientSite* This,
+        IOleClientSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleClientSite* This);
+        IOleClientSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleClientSite* This);
+        IOleClientSite *This);
 
     /*** IOleClientSite methods ***/
     HRESULT (STDMETHODCALLTYPE *SaveObject)(
-        IOleClientSite* This);
+        IOleClientSite *This);
 
     HRESULT (STDMETHODCALLTYPE *GetMoniker)(
-        IOleClientSite* This,
+        IOleClientSite *This,
         DWORD dwAssign,
         DWORD dwWhichMoniker,
         IMoniker **ppmk);
 
     HRESULT (STDMETHODCALLTYPE *GetContainer)(
-        IOleClientSite* This,
+        IOleClientSite *This,
         IOleContainer **ppContainer);
 
     HRESULT (STDMETHODCALLTYPE *ShowObject)(
-        IOleClientSite* This);
+        IOleClientSite *This);
 
     HRESULT (STDMETHODCALLTYPE *OnShowWindow)(
-        IOleClientSite* This,
+        IOleClientSite *This,
         WINBOOL fShow);
 
     HRESULT (STDMETHODCALLTYPE *RequestNewObjectLayout)(
-        IOleClientSite* This);
+        IOleClientSite *This);
 
     END_INTERFACE
 } IOleClientSiteVtbl;
+
 interface IOleClientSite {
     CONST_VTBL IOleClientSiteVtbl* lpVtbl;
 };
@@ -1167,53 +1107,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleClientSite_SaveObject_Proxy(
-    IOleClientSite* This);
-void __RPC_STUB IOleClientSite_SaveObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleClientSite_GetMoniker_Proxy(
-    IOleClientSite* This,
-    DWORD dwAssign,
-    DWORD dwWhichMoniker,
-    IMoniker **ppmk);
-void __RPC_STUB IOleClientSite_GetMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleClientSite_GetContainer_Proxy(
-    IOleClientSite* This,
-    IOleContainer **ppContainer);
-void __RPC_STUB IOleClientSite_GetContainer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleClientSite_ShowObject_Proxy(
-    IOleClientSite* This);
-void __RPC_STUB IOleClientSite_ShowObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleClientSite_OnShowWindow_Proxy(
-    IOleClientSite* This,
-    WINBOOL fShow);
-void __RPC_STUB IOleClientSite_OnShowWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleClientSite_RequestNewObjectLayout_Proxy(
-    IOleClientSite* This);
-void __RPC_STUB IOleClientSite_RequestNewObjectLayout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleClientSite_INTERFACE_DEFINED__ */
 
@@ -1370,58 +1263,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleObject* This,
+        IOleObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleObject* This);
+        IOleObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleObject* This);
+        IOleObject *This);
 
     /*** IOleObject methods ***/
     HRESULT (STDMETHODCALLTYPE *SetClientSite)(
-        IOleObject* This,
+        IOleObject *This,
         IOleClientSite *pClientSite);
 
     HRESULT (STDMETHODCALLTYPE *GetClientSite)(
-        IOleObject* This,
+        IOleObject *This,
         IOleClientSite **ppClientSite);
 
     HRESULT (STDMETHODCALLTYPE *SetHostNames)(
-        IOleObject* This,
+        IOleObject *This,
         LPCOLESTR szContainerApp,
         LPCOLESTR szContainerObj);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwSaveOption);
 
     HRESULT (STDMETHODCALLTYPE *SetMoniker)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwWhichMoniker,
         IMoniker *pmk);
 
     HRESULT (STDMETHODCALLTYPE *GetMoniker)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwAssign,
         DWORD dwWhichMoniker,
         IMoniker **ppmk);
 
     HRESULT (STDMETHODCALLTYPE *InitFromData)(
-        IOleObject* This,
+        IOleObject *This,
         IDataObject *pDataObject,
         WINBOOL fCreation,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *GetClipboardData)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwReserved,
         IDataObject **ppDataObject);
 
     HRESULT (STDMETHODCALLTYPE *DoVerb)(
-        IOleObject* This,
+        IOleObject *This,
         LONG iVerb,
         LPMSG lpmsg,
         IOleClientSite *pActiveSite,
@@ -1430,58 +1323,59 @@
         LPCRECT lprcPosRect);
 
     HRESULT (STDMETHODCALLTYPE *EnumVerbs)(
-        IOleObject* This,
+        IOleObject *This,
         IEnumOLEVERB **ppEnumOleVerb);
 
     HRESULT (STDMETHODCALLTYPE *Update)(
-        IOleObject* This);
+        IOleObject *This);
 
     HRESULT (STDMETHODCALLTYPE *IsUpToDate)(
-        IOleObject* This);
+        IOleObject *This);
 
     HRESULT (STDMETHODCALLTYPE *GetUserClassID)(
-        IOleObject* This,
+        IOleObject *This,
         CLSID *pClsid);
 
     HRESULT (STDMETHODCALLTYPE *GetUserType)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwFormOfType,
         LPOLESTR *pszUserType);
 
     HRESULT (STDMETHODCALLTYPE *SetExtent)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwDrawAspect,
         SIZEL *psizel);
 
     HRESULT (STDMETHODCALLTYPE *GetExtent)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwDrawAspect,
         SIZEL *psizel);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IOleObject* This,
+        IOleObject *This,
         IAdviseSink *pAdvSink,
         DWORD *pdwConnection);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwConnection);
 
     HRESULT (STDMETHODCALLTYPE *EnumAdvise)(
-        IOleObject* This,
+        IOleObject *This,
         IEnumSTATDATA **ppenumAdvise);
 
     HRESULT (STDMETHODCALLTYPE *GetMiscStatus)(
-        IOleObject* This,
+        IOleObject *This,
         DWORD dwAspect,
         DWORD *pdwStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetColorScheme)(
-        IOleObject* This,
+        IOleObject *This,
         LOGPALETTE *pLogpal);
 
     END_INTERFACE
 } IOleObjectVtbl;
+
 interface IOleObject {
     CONST_VTBL IOleObjectVtbl* lpVtbl;
 };
@@ -1594,189 +1488,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleObject_SetClientSite_Proxy(
-    IOleObject* This,
-    IOleClientSite *pClientSite);
-void __RPC_STUB IOleObject_SetClientSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_GetClientSite_Proxy(
-    IOleObject* This,
-    IOleClientSite **ppClientSite);
-void __RPC_STUB IOleObject_GetClientSite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_SetHostNames_Proxy(
-    IOleObject* This,
-    LPCOLESTR szContainerApp,
-    LPCOLESTR szContainerObj);
-void __RPC_STUB IOleObject_SetHostNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_Close_Proxy(
-    IOleObject* This,
-    DWORD dwSaveOption);
-void __RPC_STUB IOleObject_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_SetMoniker_Proxy(
-    IOleObject* This,
-    DWORD dwWhichMoniker,
-    IMoniker *pmk);
-void __RPC_STUB IOleObject_SetMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_GetMoniker_Proxy(
-    IOleObject* This,
-    DWORD dwAssign,
-    DWORD dwWhichMoniker,
-    IMoniker **ppmk);
-void __RPC_STUB IOleObject_GetMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_InitFromData_Proxy(
-    IOleObject* This,
-    IDataObject *pDataObject,
-    WINBOOL fCreation,
-    DWORD dwReserved);
-void __RPC_STUB IOleObject_InitFromData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_GetClipboardData_Proxy(
-    IOleObject* This,
-    DWORD dwReserved,
-    IDataObject **ppDataObject);
-void __RPC_STUB IOleObject_GetClipboardData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_DoVerb_Proxy(
-    IOleObject* This,
-    LONG iVerb,
-    LPMSG lpmsg,
-    IOleClientSite *pActiveSite,
-    LONG lindex,
-    HWND hwndParent,
-    LPCRECT lprcPosRect);
-void __RPC_STUB IOleObject_DoVerb_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_EnumVerbs_Proxy(
-    IOleObject* This,
-    IEnumOLEVERB **ppEnumOleVerb);
-void __RPC_STUB IOleObject_EnumVerbs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_Update_Proxy(
-    IOleObject* This);
-void __RPC_STUB IOleObject_Update_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_IsUpToDate_Proxy(
-    IOleObject* This);
-void __RPC_STUB IOleObject_IsUpToDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_GetUserClassID_Proxy(
-    IOleObject* This,
-    CLSID *pClsid);
-void __RPC_STUB IOleObject_GetUserClassID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_GetUserType_Proxy(
-    IOleObject* This,
-    DWORD dwFormOfType,
-    LPOLESTR *pszUserType);
-void __RPC_STUB IOleObject_GetUserType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_SetExtent_Proxy(
-    IOleObject* This,
-    DWORD dwDrawAspect,
-    SIZEL *psizel);
-void __RPC_STUB IOleObject_SetExtent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_GetExtent_Proxy(
-    IOleObject* This,
-    DWORD dwDrawAspect,
-    SIZEL *psizel);
-void __RPC_STUB IOleObject_GetExtent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_Advise_Proxy(
-    IOleObject* This,
-    IAdviseSink *pAdvSink,
-    DWORD *pdwConnection);
-void __RPC_STUB IOleObject_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_Unadvise_Proxy(
-    IOleObject* This,
-    DWORD dwConnection);
-void __RPC_STUB IOleObject_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_EnumAdvise_Proxy(
-    IOleObject* This,
-    IEnumSTATDATA **ppenumAdvise);
-void __RPC_STUB IOleObject_EnumAdvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_GetMiscStatus_Proxy(
-    IOleObject* This,
-    DWORD dwAspect,
-    DWORD *pdwStatus);
-void __RPC_STUB IOleObject_GetMiscStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleObject_SetColorScheme_Proxy(
-    IOleObject* This,
-    LOGPALETTE *pLogpal);
-void __RPC_STUB IOleObject_SetColorScheme_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleObject_INTERFACE_DEFINED__ */
 
@@ -1846,27 +1557,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleWindow* This,
+        IOleWindow *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleWindow* This);
+        IOleWindow *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleWindow* This);
+        IOleWindow *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleWindow* This,
+        IOleWindow *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleWindow* This,
+        IOleWindow *This,
         WINBOOL fEnterMode);
 
     END_INTERFACE
 } IOleWindowVtbl;
+
 interface IOleWindow {
     CONST_VTBL IOleWindowVtbl* lpVtbl;
 };
@@ -1903,22 +1615,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleWindow_GetWindow_Proxy(
-    IOleWindow* This,
-    HWND *phwnd);
-void __RPC_STUB IOleWindow_GetWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleWindow_ContextSensitiveHelp_Proxy(
-    IOleWindow* This,
-    WINBOOL fEnterMode);
-void __RPC_STUB IOleWindow_ContextSensitiveHelp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleWindow_INTERFACE_DEFINED__ */
 
@@ -1993,63 +1689,64 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleLink* This,
+        IOleLink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleLink* This);
+        IOleLink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleLink* This);
+        IOleLink *This);
 
     /*** IOleLink methods ***/
     HRESULT (STDMETHODCALLTYPE *SetUpdateOptions)(
-        IOleLink* This,
+        IOleLink *This,
         DWORD dwUpdateOpt);
 
     HRESULT (STDMETHODCALLTYPE *GetUpdateOptions)(
-        IOleLink* This,
+        IOleLink *This,
         DWORD *pdwUpdateOpt);
 
     HRESULT (STDMETHODCALLTYPE *SetSourceMoniker)(
-        IOleLink* This,
+        IOleLink *This,
         IMoniker *pmk,
         REFCLSID rclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSourceMoniker)(
-        IOleLink* This,
+        IOleLink *This,
         IMoniker **ppmk);
 
     HRESULT (STDMETHODCALLTYPE *SetSourceDisplayName)(
-        IOleLink* This,
+        IOleLink *This,
         LPCOLESTR pszStatusText);
 
     HRESULT (STDMETHODCALLTYPE *GetSourceDisplayName)(
-        IOleLink* This,
+        IOleLink *This,
         LPOLESTR *ppszDisplayName);
 
     HRESULT (STDMETHODCALLTYPE *BindToSource)(
-        IOleLink* This,
+        IOleLink *This,
         DWORD bindflags,
         IBindCtx *pbc);
 
     HRESULT (STDMETHODCALLTYPE *BindIfRunning)(
-        IOleLink* This);
+        IOleLink *This);
 
     HRESULT (STDMETHODCALLTYPE *GetBoundSource)(
-        IOleLink* This,
+        IOleLink *This,
         IUnknown **ppunk);
 
     HRESULT (STDMETHODCALLTYPE *UnbindSource)(
-        IOleLink* This);
+        IOleLink *This);
 
     HRESULT (STDMETHODCALLTYPE *Update)(
-        IOleLink* This,
+        IOleLink *This,
         IBindCtx *pbc);
 
     END_INTERFACE
 } IOleLinkVtbl;
+
 interface IOleLink {
     CONST_VTBL IOleLinkVtbl* lpVtbl;
 };
@@ -2122,94 +1819,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleLink_SetUpdateOptions_Proxy(
-    IOleLink* This,
-    DWORD dwUpdateOpt);
-void __RPC_STUB IOleLink_SetUpdateOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_GetUpdateOptions_Proxy(
-    IOleLink* This,
-    DWORD *pdwUpdateOpt);
-void __RPC_STUB IOleLink_GetUpdateOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_SetSourceMoniker_Proxy(
-    IOleLink* This,
-    IMoniker *pmk,
-    REFCLSID rclsid);
-void __RPC_STUB IOleLink_SetSourceMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_GetSourceMoniker_Proxy(
-    IOleLink* This,
-    IMoniker **ppmk);
-void __RPC_STUB IOleLink_GetSourceMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_SetSourceDisplayName_Proxy(
-    IOleLink* This,
-    LPCOLESTR pszStatusText);
-void __RPC_STUB IOleLink_SetSourceDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_GetSourceDisplayName_Proxy(
-    IOleLink* This,
-    LPOLESTR *ppszDisplayName);
-void __RPC_STUB IOleLink_GetSourceDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_BindToSource_Proxy(
-    IOleLink* This,
-    DWORD bindflags,
-    IBindCtx *pbc);
-void __RPC_STUB IOleLink_BindToSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_BindIfRunning_Proxy(
-    IOleLink* This);
-void __RPC_STUB IOleLink_BindIfRunning_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_GetBoundSource_Proxy(
-    IOleLink* This,
-    IUnknown **ppunk);
-void __RPC_STUB IOleLink_GetBoundSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_UnbindSource_Proxy(
-    IOleLink* This);
-void __RPC_STUB IOleLink_UnbindSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleLink_Update_Proxy(
-    IOleLink* This,
-    IBindCtx *pbc);
-void __RPC_STUB IOleLink_Update_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleLink_INTERFACE_DEFINED__ */
 
@@ -2267,19 +1876,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleItemContainer* This,
+        IOleItemContainer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleItemContainer* This);
+        IOleItemContainer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleItemContainer* This);
+        IOleItemContainer *This);
 
     /*** IParseDisplayName methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseDisplayName)(
-        IOleItemContainer* This,
+        IOleItemContainer *This,
         IBindCtx *pbc,
         LPOLESTR pszDisplayName,
         ULONG *pchEaten,
@@ -2287,17 +1896,17 @@
 
     /*** IOleContainer methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumObjects)(
-        IOleItemContainer* This,
+        IOleItemContainer *This,
         DWORD grfFlags,
         IEnumUnknown **ppenum);
 
     HRESULT (STDMETHODCALLTYPE *LockContainer)(
-        IOleItemContainer* This,
+        IOleItemContainer *This,
         WINBOOL fLock);
 
     /*** IOleItemContainer methods ***/
     HRESULT (STDMETHODCALLTYPE *GetObject)(
-        IOleItemContainer* This,
+        IOleItemContainer *This,
         LPOLESTR pszItem,
         DWORD dwSpeedNeeded,
         IBindCtx *pbc,
@@ -2305,18 +1914,19 @@
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectStorage)(
-        IOleItemContainer* This,
+        IOleItemContainer *This,
         LPOLESTR pszItem,
         IBindCtx *pbc,
         REFIID riid,
         void **ppvStorage);
 
     HRESULT (STDMETHODCALLTYPE *IsRunning)(
-        IOleItemContainer* This,
+        IOleItemContainer *This,
         LPOLESTR pszItem);
 
     END_INTERFACE
 } IOleItemContainerVtbl;
+
 interface IOleItemContainer {
     CONST_VTBL IOleItemContainerVtbl* lpVtbl;
 };
@@ -2373,37 +1983,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleItemContainer_GetObject_Proxy(
-    IOleItemContainer* This,
-    LPOLESTR pszItem,
-    DWORD dwSpeedNeeded,
-    IBindCtx *pbc,
-    REFIID riid,
-    void **ppvObject);
-void __RPC_STUB IOleItemContainer_GetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleItemContainer_GetObjectStorage_Proxy(
-    IOleItemContainer* This,
-    LPOLESTR pszItem,
-    IBindCtx *pbc,
-    REFIID riid,
-    void **ppvStorage);
-void __RPC_STUB IOleItemContainer_GetObjectStorage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleItemContainer_IsRunning_Proxy(
-    IOleItemContainer* This,
-    LPOLESTR pszItem);
-void __RPC_STUB IOleItemContainer_IsRunning_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleItemContainer_INTERFACE_DEFINED__ */
 
@@ -2447,45 +2026,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceUIWindow* This,
+        IOleInPlaceUIWindow *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceUIWindow* This);
+        IOleInPlaceUIWindow *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceUIWindow* This);
+        IOleInPlaceUIWindow *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceUIWindow* This,
+        IOleInPlaceUIWindow *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceUIWindow* This,
+        IOleInPlaceUIWindow *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceUIWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBorder)(
-        IOleInPlaceUIWindow* This,
+        IOleInPlaceUIWindow *This,
         LPRECT lprectBorder);
 
     HRESULT (STDMETHODCALLTYPE *RequestBorderSpace)(
-        IOleInPlaceUIWindow* This,
+        IOleInPlaceUIWindow *This,
         LPCBORDERWIDTHS pborderwidths);
 
     HRESULT (STDMETHODCALLTYPE *SetBorderSpace)(
-        IOleInPlaceUIWindow* This,
+        IOleInPlaceUIWindow *This,
         LPCBORDERWIDTHS pborderwidths);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveObject)(
-        IOleInPlaceUIWindow* This,
+        IOleInPlaceUIWindow *This,
         IOleInPlaceActiveObject *pActiveObject,
         LPCOLESTR pszObjName);
 
     END_INTERFACE
 } IOleInPlaceUIWindowVtbl;
+
 interface IOleInPlaceUIWindow {
     CONST_VTBL IOleInPlaceUIWindowVtbl* lpVtbl;
 };
@@ -2540,39 +2120,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_GetBorder_Proxy(
-    IOleInPlaceUIWindow* This,
-    LPRECT lprectBorder);
-void __RPC_STUB IOleInPlaceUIWindow_GetBorder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_RequestBorderSpace_Proxy(
-    IOleInPlaceUIWindow* This,
-    LPCBORDERWIDTHS pborderwidths);
-void __RPC_STUB IOleInPlaceUIWindow_RequestBorderSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_SetBorderSpace_Proxy(
-    IOleInPlaceUIWindow* This,
-    LPCBORDERWIDTHS pborderwidths);
-void __RPC_STUB IOleInPlaceUIWindow_SetBorderSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceUIWindow_SetActiveObject_Proxy(
-    IOleInPlaceUIWindow* This,
-    IOleInPlaceActiveObject *pActiveObject,
-    LPCOLESTR pszObjName);
-void __RPC_STUB IOleInPlaceUIWindow_SetActiveObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleInPlaceUIWindow_INTERFACE_DEFINED__ */
 
@@ -2617,50 +2164,51 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceActiveObject* This);
+        IOleInPlaceActiveObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceActiveObject* This);
+        IOleInPlaceActiveObject *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceActiveObject methods ***/
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         LPMSG lpmsg);
 
     HRESULT (STDMETHODCALLTYPE *OnFrameWindowActivate)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         WINBOOL fActivate);
 
     HRESULT (STDMETHODCALLTYPE *OnDocWindowActivate)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         WINBOOL fActivate);
 
     HRESULT (STDMETHODCALLTYPE *ResizeBorder)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         LPCRECT prcBorder,
         IOleInPlaceUIWindow *pUIWindow,
         WINBOOL fFrameWindow);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IOleInPlaceActiveObject* This,
+        IOleInPlaceActiveObject *This,
         WINBOOL fEnable);
 
     END_INTERFACE
 } IOleInPlaceActiveObjectVtbl;
+
 interface IOleInPlaceActiveObject {
     CONST_VTBL IOleInPlaceActiveObjectVtbl* lpVtbl;
 };
@@ -2726,22 +2274,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_OnFrameWindowActivate_Proxy(
-    IOleInPlaceActiveObject* This,
-    WINBOOL fActivate);
-void __RPC_STUB IOleInPlaceActiveObject_OnFrameWindowActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_OnDocWindowActivate_Proxy(
-    IOleInPlaceActiveObject* This,
-    WINBOOL fActivate);
-void __RPC_STUB IOleInPlaceActiveObject_OnDocWindowActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_RemoteResizeBorder_Proxy(
     IOleInPlaceActiveObject* This,
     LPCRECT prcBorder,
@@ -2753,14 +2285,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceActiveObject_EnableModeless_Proxy(
-    IOleInPlaceActiveObject* This,
-    WINBOOL fEnable);
-void __RPC_STUB IOleInPlaceActiveObject_EnableModeless_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IOleInPlaceActiveObject_TranslateAccelerator_Proxy(
     IOleInPlaceActiveObject* This,
     LPMSG lpmsg);
@@ -2842,74 +2366,75 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceFrame* This);
+        IOleInPlaceFrame *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceFrame* This);
+        IOleInPlaceFrame *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceUIWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBorder)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         LPRECT lprectBorder);
 
     HRESULT (STDMETHODCALLTYPE *RequestBorderSpace)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         LPCBORDERWIDTHS pborderwidths);
 
     HRESULT (STDMETHODCALLTYPE *SetBorderSpace)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         LPCBORDERWIDTHS pborderwidths);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveObject)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         IOleInPlaceActiveObject *pActiveObject,
         LPCOLESTR pszObjName);
 
     /*** IOleInPlaceFrame methods ***/
     HRESULT (STDMETHODCALLTYPE *InsertMenus)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         HMENU hmenuShared,
         LPOLEMENUGROUPWIDTHS lpMenuWidths);
 
     HRESULT (STDMETHODCALLTYPE *SetMenu)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         HMENU hmenuShared,
         HOLEMENU holemenu,
         HWND hwndActiveObject);
 
     HRESULT (STDMETHODCALLTYPE *RemoveMenus)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         HMENU hmenuShared);
 
     HRESULT (STDMETHODCALLTYPE *SetStatusText)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         LPCOLESTR pszStatusText);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         WINBOOL fEnable);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IOleInPlaceFrame* This,
+        IOleInPlaceFrame *This,
         LPMSG lpmsg,
         WORD wID);
 
     END_INTERFACE
 } IOleInPlaceFrameVtbl;
+
 interface IOleInPlaceFrame {
     CONST_VTBL IOleInPlaceFrameVtbl* lpVtbl;
 };
@@ -2990,58 +2515,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_InsertMenus_Proxy(
-    IOleInPlaceFrame* This,
-    HMENU hmenuShared,
-    LPOLEMENUGROUPWIDTHS lpMenuWidths);
-void __RPC_STUB IOleInPlaceFrame_InsertMenus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_SetMenu_Proxy(
-    IOleInPlaceFrame* This,
-    HMENU hmenuShared,
-    HOLEMENU holemenu,
-    HWND hwndActiveObject);
-void __RPC_STUB IOleInPlaceFrame_SetMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_RemoveMenus_Proxy(
-    IOleInPlaceFrame* This,
-    HMENU hmenuShared);
-void __RPC_STUB IOleInPlaceFrame_RemoveMenus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_SetStatusText_Proxy(
-    IOleInPlaceFrame* This,
-    LPCOLESTR pszStatusText);
-void __RPC_STUB IOleInPlaceFrame_SetStatusText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_EnableModeless_Proxy(
-    IOleInPlaceFrame* This,
-    WINBOOL fEnable);
-void __RPC_STUB IOleInPlaceFrame_EnableModeless_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceFrame_TranslateAccelerator_Proxy(
-    IOleInPlaceFrame* This,
-    LPMSG lpmsg,
-    WORD wID);
-void __RPC_STUB IOleInPlaceFrame_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleInPlaceFrame_INTERFACE_DEFINED__ */
 
@@ -3082,42 +2555,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceObject* This,
+        IOleInPlaceObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceObject* This);
+        IOleInPlaceObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceObject* This);
+        IOleInPlaceObject *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceObject* This,
+        IOleInPlaceObject *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceObject* This,
+        IOleInPlaceObject *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceObject methods ***/
     HRESULT (STDMETHODCALLTYPE *InPlaceDeactivate)(
-        IOleInPlaceObject* This);
+        IOleInPlaceObject *This);
 
     HRESULT (STDMETHODCALLTYPE *UIDeactivate)(
-        IOleInPlaceObject* This);
+        IOleInPlaceObject *This);
 
     HRESULT (STDMETHODCALLTYPE *SetObjectRects)(
-        IOleInPlaceObject* This,
+        IOleInPlaceObject *This,
         LPCRECT lprcPosRect,
         LPCRECT lprcClipRect);
 
     HRESULT (STDMETHODCALLTYPE *ReactivateAndUndo)(
-        IOleInPlaceObject* This);
+        IOleInPlaceObject *This);
 
     END_INTERFACE
 } IOleInPlaceObjectVtbl;
+
 interface IOleInPlaceObject {
     CONST_VTBL IOleInPlaceObjectVtbl* lpVtbl;
 };
@@ -3172,36 +2646,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleInPlaceObject_InPlaceDeactivate_Proxy(
-    IOleInPlaceObject* This);
-void __RPC_STUB IOleInPlaceObject_InPlaceDeactivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceObject_UIDeactivate_Proxy(
-    IOleInPlaceObject* This);
-void __RPC_STUB IOleInPlaceObject_UIDeactivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceObject_SetObjectRects_Proxy(
-    IOleInPlaceObject* This,
-    LPCRECT lprcPosRect,
-    LPCRECT lprcClipRect);
-void __RPC_STUB IOleInPlaceObject_SetObjectRects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceObject_ReactivateAndUndo_Proxy(
-    IOleInPlaceObject* This);
-void __RPC_STUB IOleInPlaceObject_ReactivateAndUndo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleInPlaceObject_INTERFACE_DEFINED__ */
 
@@ -3263,37 +2707,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOleInPlaceSite* This,
+        IOleInPlaceSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IOleInPlaceSite* This,
+        IOleInPlaceSite *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IOleInPlaceSite* This,
+        IOleInPlaceSite *This,
         WINBOOL fEnterMode);
 
     /*** IOleInPlaceSite methods ***/
     HRESULT (STDMETHODCALLTYPE *CanInPlaceActivate)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceActivate)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     HRESULT (STDMETHODCALLTYPE *OnUIActivate)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     HRESULT (STDMETHODCALLTYPE *GetWindowContext)(
-        IOleInPlaceSite* This,
+        IOleInPlaceSite *This,
         IOleInPlaceFrame **ppFrame,
         IOleInPlaceUIWindow **ppDoc,
         LPRECT lprcPosRect,
@@ -3301,28 +2745,29 @@
         LPOLEINPLACEFRAMEINFO lpFrameInfo);
 
     HRESULT (STDMETHODCALLTYPE *Scroll)(
-        IOleInPlaceSite* This,
+        IOleInPlaceSite *This,
         SIZE scrollExtant);
 
     HRESULT (STDMETHODCALLTYPE *OnUIDeactivate)(
-        IOleInPlaceSite* This,
+        IOleInPlaceSite *This,
         WINBOOL fUndoable);
 
     HRESULT (STDMETHODCALLTYPE *OnInPlaceDeactivate)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     HRESULT (STDMETHODCALLTYPE *DiscardUndoState)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     HRESULT (STDMETHODCALLTYPE *DeactivateAndUndo)(
-        IOleInPlaceSite* This);
+        IOleInPlaceSite *This);
 
     HRESULT (STDMETHODCALLTYPE *OnPosRectChange)(
-        IOleInPlaceSite* This,
+        IOleInPlaceSite *This,
         LPCRECT lprcPosRect);
 
     END_INTERFACE
 } IOleInPlaceSiteVtbl;
+
 interface IOleInPlaceSite {
     CONST_VTBL IOleInPlaceSiteVtbl* lpVtbl;
 };
@@ -3401,84 +2846,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_CanInPlaceActivate_Proxy(
-    IOleInPlaceSite* This);
-void __RPC_STUB IOleInPlaceSite_CanInPlaceActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnInPlaceActivate_Proxy(
-    IOleInPlaceSite* This);
-void __RPC_STUB IOleInPlaceSite_OnInPlaceActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnUIActivate_Proxy(
-    IOleInPlaceSite* This);
-void __RPC_STUB IOleInPlaceSite_OnUIActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_GetWindowContext_Proxy(
-    IOleInPlaceSite* This,
-    IOleInPlaceFrame **ppFrame,
-    IOleInPlaceUIWindow **ppDoc,
-    LPRECT lprcPosRect,
-    LPRECT lprcClipRect,
-    LPOLEINPLACEFRAMEINFO lpFrameInfo);
-void __RPC_STUB IOleInPlaceSite_GetWindowContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_Scroll_Proxy(
-    IOleInPlaceSite* This,
-    SIZE scrollExtant);
-void __RPC_STUB IOleInPlaceSite_Scroll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnUIDeactivate_Proxy(
-    IOleInPlaceSite* This,
-    WINBOOL fUndoable);
-void __RPC_STUB IOleInPlaceSite_OnUIDeactivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnInPlaceDeactivate_Proxy(
-    IOleInPlaceSite* This);
-void __RPC_STUB IOleInPlaceSite_OnInPlaceDeactivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_DiscardUndoState_Proxy(
-    IOleInPlaceSite* This);
-void __RPC_STUB IOleInPlaceSite_DiscardUndoState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_DeactivateAndUndo_Proxy(
-    IOleInPlaceSite* This);
-void __RPC_STUB IOleInPlaceSite_DeactivateAndUndo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOleInPlaceSite_OnPosRectChange_Proxy(
-    IOleInPlaceSite* This,
-    LPCRECT lprcPosRect);
-void __RPC_STUB IOleInPlaceSite_OnPosRectChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOleInPlaceSite_INTERFACE_DEFINED__ */
 
@@ -3507,22 +2874,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContinue* This,
+        IContinue *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContinue* This);
+        IContinue *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IContinue* This);
+        IContinue *This);
 
     /*** IContinue methods ***/
     HRESULT (STDMETHODCALLTYPE *FContinue)(
-        IContinue* This);
+        IContinue *This);
 
     END_INTERFACE
 } IContinueVtbl;
+
 interface IContinue {
     CONST_VTBL IContinueVtbl* lpVtbl;
 };
@@ -3555,13 +2923,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IContinue_FContinue_Proxy(
-    IContinue* This);
-void __RPC_STUB IContinue_FContinue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IContinue_INTERFACE_DEFINED__ */
 
@@ -3628,19 +2989,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IViewObject* This,
+        IViewObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IViewObject* This);
+        IViewObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IViewObject* This);
+        IViewObject *This);
 
     /*** IViewObject methods ***/
     HRESULT (STDMETHODCALLTYPE *Draw)(
-        IViewObject* This,
+        IViewObject *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
@@ -3653,7 +3014,7 @@
         ULONG_PTR dwContinue);
 
     HRESULT (STDMETHODCALLTYPE *GetColorSet)(
-        IViewObject* This,
+        IViewObject *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
@@ -3662,30 +3023,31 @@
         LOGPALETTE **ppColorSet);
 
     HRESULT (STDMETHODCALLTYPE *Freeze)(
-        IViewObject* This,
+        IViewObject *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
         DWORD *pdwFreeze);
 
     HRESULT (STDMETHODCALLTYPE *Unfreeze)(
-        IViewObject* This,
+        IViewObject *This,
         DWORD dwFreeze);
 
     HRESULT (STDMETHODCALLTYPE *SetAdvise)(
-        IViewObject* This,
+        IViewObject *This,
         DWORD aspects,
         DWORD advf,
         IAdviseSink *pAdvSink);
 
     HRESULT (STDMETHODCALLTYPE *GetAdvise)(
-        IViewObject* This,
+        IViewObject *This,
         DWORD *pAspects,
         DWORD *pAdvf,
         IAdviseSink **ppAdvSink);
 
     END_INTERFACE
 } IViewObjectVtbl;
+
 interface IViewObject {
     CONST_VTBL IViewObjectVtbl* lpVtbl;
 };
@@ -3778,24 +3140,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IViewObject_Unfreeze_Proxy(
-    IViewObject* This,
-    DWORD dwFreeze);
-void __RPC_STUB IViewObject_Unfreeze_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IViewObject_SetAdvise_Proxy(
-    IViewObject* This,
-    DWORD aspects,
-    DWORD advf,
-    IAdviseSink *pAdvSink);
-void __RPC_STUB IViewObject_SetAdvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IViewObject_RemoteGetAdvise_Proxy(
     IViewObject* This,
     DWORD *pAspects,
@@ -3900,19 +3244,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IViewObject2* This,
+        IViewObject2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IViewObject2* This);
+        IViewObject2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IViewObject2* This);
+        IViewObject2 *This);
 
     /*** IViewObject methods ***/
     HRESULT (STDMETHODCALLTYPE *Draw)(
-        IViewObject2* This,
+        IViewObject2 *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
@@ -3925,7 +3269,7 @@
         ULONG_PTR dwContinue);
 
     HRESULT (STDMETHODCALLTYPE *GetColorSet)(
-        IViewObject2* This,
+        IViewObject2 *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
@@ -3934,31 +3278,31 @@
         LOGPALETTE **ppColorSet);
 
     HRESULT (STDMETHODCALLTYPE *Freeze)(
-        IViewObject2* This,
+        IViewObject2 *This,
         DWORD dwDrawAspect,
         LONG lindex,
         void *pvAspect,
         DWORD *pdwFreeze);
 
     HRESULT (STDMETHODCALLTYPE *Unfreeze)(
-        IViewObject2* This,
+        IViewObject2 *This,
         DWORD dwFreeze);
 
     HRESULT (STDMETHODCALLTYPE *SetAdvise)(
-        IViewObject2* This,
+        IViewObject2 *This,
         DWORD aspects,
         DWORD advf,
         IAdviseSink *pAdvSink);
 
     HRESULT (STDMETHODCALLTYPE *GetAdvise)(
-        IViewObject2* This,
+        IViewObject2 *This,
         DWORD *pAspects,
         DWORD *pAdvf,
         IAdviseSink **ppAdvSink);
 
     /*** IViewObject2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetExtent)(
-        IViewObject2* This,
+        IViewObject2 *This,
         DWORD dwDrawAspect,
         LONG lindex,
         DVTARGETDEVICE *ptd,
@@ -3966,6 +3310,7 @@
 
     END_INTERFACE
 } IViewObject2Vtbl;
+
 interface IViewObject2 {
     CONST_VTBL IViewObject2Vtbl* lpVtbl;
 };
@@ -4024,17 +3369,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IViewObject2_GetExtent_Proxy(
-    IViewObject2* This,
-    DWORD dwDrawAspect,
-    LONG lindex,
-    DVTARGETDEVICE *ptd,
-    LPSIZEL lpsizel);
-void __RPC_STUB IViewObject2_GetExtent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IViewObject2_INTERFACE_DEFINED__ */
 
@@ -4069,28 +3403,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDropSource* This,
+        IDropSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDropSource* This);
+        IDropSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDropSource* This);
+        IDropSource *This);
 
     /*** IDropSource methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryContinueDrag)(
-        IDropSource* This,
+        IDropSource *This,
         WINBOOL fEscapePressed,
         DWORD grfKeyState);
 
     HRESULT (STDMETHODCALLTYPE *GiveFeedback)(
-        IDropSource* This,
+        IDropSource *This,
         DWORD dwEffect);
 
     END_INTERFACE
 } IDropSourceVtbl;
+
 interface IDropSource {
     CONST_VTBL IDropSourceVtbl* lpVtbl;
 };
@@ -4127,23 +3462,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDropSource_QueryContinueDrag_Proxy(
-    IDropSource* This,
-    WINBOOL fEscapePressed,
-    DWORD grfKeyState);
-void __RPC_STUB IDropSource_QueryContinueDrag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropSource_GiveFeedback_Proxy(
-    IDropSource* This,
-    DWORD dwEffect);
-void __RPC_STUB IDropSource_GiveFeedback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDropSource_INTERFACE_DEFINED__ */
 
@@ -4219,35 +3537,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDropTarget* This,
+        IDropTarget *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDropTarget* This);
+        IDropTarget *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDropTarget* This);
+        IDropTarget *This);
 
     /*** IDropTarget methods ***/
     HRESULT (STDMETHODCALLTYPE *DragEnter)(
-        IDropTarget* This,
+        IDropTarget *This,
         IDataObject *pDataObj,
         DWORD grfKeyState,
         POINTL pt,
         DWORD *pdwEffect);
 
     HRESULT (STDMETHODCALLTYPE *DragOver)(
-        IDropTarget* This,
+        IDropTarget *This,
         DWORD grfKeyState,
         POINTL pt,
         DWORD *pdwEffect);
 
     HRESULT (STDMETHODCALLTYPE *DragLeave)(
-        IDropTarget* This);
+        IDropTarget *This);
 
     HRESULT (STDMETHODCALLTYPE *Drop)(
-        IDropTarget* This,
+        IDropTarget *This,
         IDataObject *pDataObj,
         DWORD grfKeyState,
         POINTL pt,
@@ -4255,6 +3573,7 @@
 
     END_INTERFACE
 } IDropTargetVtbl;
+
 interface IDropTarget {
     CONST_VTBL IDropTargetVtbl* lpVtbl;
 };
@@ -4299,45 +3618,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDropTarget_DragEnter_Proxy(
-    IDropTarget* This,
-    IDataObject *pDataObj,
-    DWORD grfKeyState,
-    POINTL pt,
-    DWORD *pdwEffect);
-void __RPC_STUB IDropTarget_DragEnter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropTarget_DragOver_Proxy(
-    IDropTarget* This,
-    DWORD grfKeyState,
-    POINTL pt,
-    DWORD *pdwEffect);
-void __RPC_STUB IDropTarget_DragOver_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropTarget_DragLeave_Proxy(
-    IDropTarget* This);
-void __RPC_STUB IDropTarget_DragLeave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropTarget_Drop_Proxy(
-    IDropTarget* This,
-    IDataObject *pDataObj,
-    DWORD grfKeyState,
-    POINTL pt,
-    DWORD *pdwEffect);
-void __RPC_STUB IDropTarget_Drop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDropTarget_INTERFACE_DEFINED__ */
 
@@ -4369,26 +3649,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDropSourceNotify* This,
+        IDropSourceNotify *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDropSourceNotify* This);
+        IDropSourceNotify *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDropSourceNotify* This);
+        IDropSourceNotify *This);
 
     /*** IDropSourceNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *DragEnterTarget)(
-        IDropSourceNotify* This,
+        IDropSourceNotify *This,
         HWND hwndTarget);
 
     HRESULT (STDMETHODCALLTYPE *DragLeaveTarget)(
-        IDropSourceNotify* This);
+        IDropSourceNotify *This);
 
     END_INTERFACE
 } IDropSourceNotifyVtbl;
+
 interface IDropSourceNotify {
     CONST_VTBL IDropSourceNotifyVtbl* lpVtbl;
 };
@@ -4425,21 +3706,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDropSourceNotify_DragEnterTarget_Proxy(
-    IDropSourceNotify* This,
-    HWND hwndTarget);
-void __RPC_STUB IDropSourceNotify_DragEnterTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropSourceNotify_DragLeaveTarget_Proxy(
-    IDropSourceNotify* This);
-void __RPC_STUB IDropSourceNotify_DragLeaveTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDropSourceNotify_INTERFACE_DEFINED__ */
 
@@ -4496,36 +3762,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumOLEVERB* This,
+        IEnumOLEVERB *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumOLEVERB* This);
+        IEnumOLEVERB *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumOLEVERB* This);
+        IEnumOLEVERB *This);
 
     /*** IEnumOLEVERB methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumOLEVERB* This,
+        IEnumOLEVERB *This,
         ULONG celt,
         LPOLEVERB rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumOLEVERB* This,
+        IEnumOLEVERB *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumOLEVERB* This);
+        IEnumOLEVERB *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumOLEVERB* This,
+        IEnumOLEVERB *This,
         IEnumOLEVERB **ppenum);
 
     END_INTERFACE
 } IEnumOLEVERBVtbl;
+
 interface IEnumOLEVERB {
     CONST_VTBL IEnumOLEVERBVtbl* lpVtbl;
 };
@@ -4580,29 +3847,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOLEVERB_Skip_Proxy(
-    IEnumOLEVERB* This,
-    ULONG celt);
-void __RPC_STUB IEnumOLEVERB_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOLEVERB_Reset_Proxy(
-    IEnumOLEVERB* This);
-void __RPC_STUB IEnumOLEVERB_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumOLEVERB_Clone_Proxy(
-    IEnumOLEVERB* This,
-    IEnumOLEVERB **ppenum);
-void __RPC_STUB IEnumOLEVERB_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumOLEVERB_Next_Proxy(
     IEnumOLEVERB* This,
     ULONG celt,
diff --git a/mingw-w64-headers/include/optary.h b/mingw-w64-headers/include/optary.h
index fed5a93..239a860 100644
--- a/mingw-w64-headers/include/optary.h
+++ b/mingw-w64-headers/include/optary.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/optary.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/optary.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/portabledevicetypes.h b/mingw-w64-headers/include/portabledevicetypes.h
index e275638..ee45fa7 100644
--- a/mingw-w64-headers/include/portabledevicetypes.h
+++ b/mingw-w64-headers/include/portabledevicetypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/portabledevicetypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/portabledevicetypes.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __IPortableDeviceValues_FWD_DEFINED__
 #define __IPortableDeviceValues_FWD_DEFINED__
 typedef interface IPortableDeviceValues IPortableDeviceValues;
+#ifdef __cplusplus
+interface IPortableDeviceValues;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPortableDeviceKeyCollection_FWD_DEFINED__
 #define __IPortableDeviceKeyCollection_FWD_DEFINED__
 typedef interface IPortableDeviceKeyCollection IPortableDeviceKeyCollection;
+#ifdef __cplusplus
+interface IPortableDeviceKeyCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPortableDevicePropVariantCollection_FWD_DEFINED__
 #define __IPortableDevicePropVariantCollection_FWD_DEFINED__
 typedef interface IPortableDevicePropVariantCollection IPortableDevicePropVariantCollection;
+#ifdef __cplusplus
+interface IPortableDevicePropVariantCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPortableDeviceValuesCollection_FWD_DEFINED__
 #define __IPortableDeviceValuesCollection_FWD_DEFINED__
 typedef interface IPortableDeviceValuesCollection IPortableDeviceValuesCollection;
+#ifdef __cplusplus
+interface IPortableDeviceValuesCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __PortableDeviceValues_FWD_DEFINED__
@@ -59,16 +71,25 @@
 #ifndef __IPortableDeviceKeyCollection_FWD_DEFINED__
 #define __IPortableDeviceKeyCollection_FWD_DEFINED__
 typedef interface IPortableDeviceKeyCollection IPortableDeviceKeyCollection;
+#ifdef __cplusplus
+interface IPortableDeviceKeyCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPortableDevicePropVariantCollection_FWD_DEFINED__
 #define __IPortableDevicePropVariantCollection_FWD_DEFINED__
 typedef interface IPortableDevicePropVariantCollection IPortableDevicePropVariantCollection;
+#ifdef __cplusplus
+interface IPortableDevicePropVariantCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPortableDeviceValuesCollection_FWD_DEFINED__
 #define __IPortableDeviceValuesCollection_FWD_DEFINED__
 typedef interface IPortableDeviceValuesCollection IPortableDeviceValuesCollection;
+#ifdef __cplusplus
+interface IPortableDeviceValuesCollection;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -250,216 +271,217 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPortableDeviceValues* This);
+        IPortableDeviceValues *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPortableDeviceValues* This);
+        IPortableDeviceValues *This);
 
     /*** IPortableDeviceValues methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         DWORD *pcelt);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         const DWORD index,
         PROPERTYKEY *pKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         LPCWSTR Value);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         LPWSTR *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUnsignedIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const ULONG Value);
 
     HRESULT (STDMETHODCALLTYPE *GetUnsignedIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         ULONG *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetSignedIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const LONG Value);
 
     HRESULT (STDMETHODCALLTYPE *GetSignedIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         LONG *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUnsignedLargeIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const ULONGLONG Value);
 
     HRESULT (STDMETHODCALLTYPE *GetUnsignedLargeIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         ULONGLONG *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetSignedLargeIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const LONGLONG Value);
 
     HRESULT (STDMETHODCALLTYPE *GetSignedLargeIntegerValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         LONGLONG *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetFloatValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const FLOAT Value);
 
     HRESULT (STDMETHODCALLTYPE *GetFloatValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         FLOAT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetErrorValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const HRESULT Value);
 
     HRESULT (STDMETHODCALLTYPE *GetErrorValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         HRESULT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetKeyValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         REFPROPERTYKEY Value);
 
     HRESULT (STDMETHODCALLTYPE *GetKeyValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         PROPERTYKEY *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBoolValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         const WINBOOL Value);
 
     HRESULT (STDMETHODCALLTYPE *GetBoolValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         WINBOOL *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetIUnknownValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IUnknown *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetIUnknownValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IUnknown **ppValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGuidValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         REFGUID Value);
 
     HRESULT (STDMETHODCALLTYPE *GetGuidValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         GUID *pValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         BYTE *pValue,
         DWORD cbValue);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         BYTE **ppValue,
         DWORD *pcbValue);
 
     HRESULT (STDMETHODCALLTYPE *SetIPortableDeviceValuesValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDeviceValues *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetIPortableDeviceValuesValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDeviceValues **ppValue);
 
     HRESULT (STDMETHODCALLTYPE *SetIPortableDevicePropVariantCollectionValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDevicePropVariantCollection *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetIPortableDevicePropVariantCollectionValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDevicePropVariantCollection **ppValue);
 
     HRESULT (STDMETHODCALLTYPE *SetIPortableDeviceKeyCollectionValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDeviceKeyCollection *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetIPortableDeviceKeyCollectionValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDeviceKeyCollection **ppValue);
 
     HRESULT (STDMETHODCALLTYPE *SetIPortableDeviceValuesCollectionValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDeviceValuesCollection *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetIPortableDeviceValuesCollectionValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key,
         IPortableDeviceValuesCollection **ppValue);
 
     HRESULT (STDMETHODCALLTYPE *RemoveValue)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         REFPROPERTYKEY key);
 
     HRESULT (STDMETHODCALLTYPE *CopyValuesFromPropertyStore)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         IPropertyStore *pStore);
 
     HRESULT (STDMETHODCALLTYPE *CopyValuesToPropertyStore)(
-        IPortableDeviceValues* This,
+        IPortableDeviceValues *This,
         IPropertyStore *pStore);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        IPortableDeviceValues* This);
+        IPortableDeviceValues *This);
 
     END_INTERFACE
 } IPortableDeviceValuesVtbl;
+
 interface IPortableDeviceValues {
     CONST_VTBL IPortableDeviceValuesVtbl* lpVtbl;
 };
@@ -648,363 +670,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetCount_Proxy(
-    IPortableDeviceValues* This,
-    DWORD *pcelt);
-void __RPC_STUB IPortableDeviceValues_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetAt_Proxy(
-    IPortableDeviceValues* This,
-    const DWORD index,
-    PROPERTYKEY *pKey,
-    PROPVARIANT *pValue);
-void __RPC_STUB IPortableDeviceValues_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const PROPVARIANT *pValue);
-void __RPC_STUB IPortableDeviceValues_SetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    PROPVARIANT *pValue);
-void __RPC_STUB IPortableDeviceValues_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetStringValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    LPCWSTR Value);
-void __RPC_STUB IPortableDeviceValues_SetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetStringValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    LPWSTR *pValue);
-void __RPC_STUB IPortableDeviceValues_GetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetUnsignedIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const ULONG Value);
-void __RPC_STUB IPortableDeviceValues_SetUnsignedIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetUnsignedIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    ULONG *pValue);
-void __RPC_STUB IPortableDeviceValues_GetUnsignedIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetSignedIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const LONG Value);
-void __RPC_STUB IPortableDeviceValues_SetSignedIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetSignedIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    LONG *pValue);
-void __RPC_STUB IPortableDeviceValues_GetSignedIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetUnsignedLargeIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const ULONGLONG Value);
-void __RPC_STUB IPortableDeviceValues_SetUnsignedLargeIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetUnsignedLargeIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    ULONGLONG *pValue);
-void __RPC_STUB IPortableDeviceValues_GetUnsignedLargeIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetSignedLargeIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const LONGLONG Value);
-void __RPC_STUB IPortableDeviceValues_SetSignedLargeIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetSignedLargeIntegerValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    LONGLONG *pValue);
-void __RPC_STUB IPortableDeviceValues_GetSignedLargeIntegerValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetFloatValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const FLOAT Value);
-void __RPC_STUB IPortableDeviceValues_SetFloatValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetFloatValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    FLOAT *pValue);
-void __RPC_STUB IPortableDeviceValues_GetFloatValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetErrorValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const HRESULT Value);
-void __RPC_STUB IPortableDeviceValues_SetErrorValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetErrorValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    HRESULT *pValue);
-void __RPC_STUB IPortableDeviceValues_GetErrorValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetKeyValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    REFPROPERTYKEY Value);
-void __RPC_STUB IPortableDeviceValues_SetKeyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetKeyValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    PROPERTYKEY *pValue);
-void __RPC_STUB IPortableDeviceValues_GetKeyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetBoolValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    const WINBOOL Value);
-void __RPC_STUB IPortableDeviceValues_SetBoolValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetBoolValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    WINBOOL *pValue);
-void __RPC_STUB IPortableDeviceValues_GetBoolValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIUnknownValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IUnknown *pValue);
-void __RPC_STUB IPortableDeviceValues_SetIUnknownValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIUnknownValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IUnknown **ppValue);
-void __RPC_STUB IPortableDeviceValues_GetIUnknownValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetGuidValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    REFGUID Value);
-void __RPC_STUB IPortableDeviceValues_SetGuidValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetGuidValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    GUID *pValue);
-void __RPC_STUB IPortableDeviceValues_GetGuidValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetBufferValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    BYTE *pValue,
-    DWORD cbValue);
-void __RPC_STUB IPortableDeviceValues_SetBufferValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetBufferValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    BYTE **ppValue,
-    DWORD *pcbValue);
-void __RPC_STUB IPortableDeviceValues_GetBufferValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDeviceValuesValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDeviceValues *pValue);
-void __RPC_STUB IPortableDeviceValues_SetIPortableDeviceValuesValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDeviceValuesValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDeviceValues **ppValue);
-void __RPC_STUB IPortableDeviceValues_GetIPortableDeviceValuesValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDevicePropVariantCollectionValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDevicePropVariantCollection *pValue);
-void __RPC_STUB IPortableDeviceValues_SetIPortableDevicePropVariantCollectionValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDevicePropVariantCollectionValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDevicePropVariantCollection **ppValue);
-void __RPC_STUB IPortableDeviceValues_GetIPortableDevicePropVariantCollectionValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDeviceKeyCollectionValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDeviceKeyCollection *pValue);
-void __RPC_STUB IPortableDeviceValues_SetIPortableDeviceKeyCollectionValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDeviceKeyCollectionValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDeviceKeyCollection **ppValue);
-void __RPC_STUB IPortableDeviceValues_GetIPortableDeviceKeyCollectionValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_SetIPortableDeviceValuesCollectionValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDeviceValuesCollection *pValue);
-void __RPC_STUB IPortableDeviceValues_SetIPortableDeviceValuesCollectionValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_GetIPortableDeviceValuesCollectionValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key,
-    IPortableDeviceValuesCollection **ppValue);
-void __RPC_STUB IPortableDeviceValues_GetIPortableDeviceValuesCollectionValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_RemoveValue_Proxy(
-    IPortableDeviceValues* This,
-    REFPROPERTYKEY key);
-void __RPC_STUB IPortableDeviceValues_RemoveValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_CopyValuesFromPropertyStore_Proxy(
-    IPortableDeviceValues* This,
-    IPropertyStore *pStore);
-void __RPC_STUB IPortableDeviceValues_CopyValuesFromPropertyStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_CopyValuesToPropertyStore_Proxy(
-    IPortableDeviceValues* This,
-    IPropertyStore *pStore);
-void __RPC_STUB IPortableDeviceValues_CopyValuesToPropertyStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValues_Clear_Proxy(
-    IPortableDeviceValues* This);
-void __RPC_STUB IPortableDeviceValues_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPortableDeviceValues_INTERFACE_DEFINED__ */
 
@@ -1045,39 +710,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPortableDeviceKeyCollection* This,
+        IPortableDeviceKeyCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPortableDeviceKeyCollection* This);
+        IPortableDeviceKeyCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPortableDeviceKeyCollection* This);
+        IPortableDeviceKeyCollection *This);
 
     /*** IPortableDeviceKeyCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPortableDeviceKeyCollection* This,
+        IPortableDeviceKeyCollection *This,
         DWORD *pcElems);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPortableDeviceKeyCollection* This,
+        IPortableDeviceKeyCollection *This,
         const DWORD dwIndex,
         PROPERTYKEY *pKey);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IPortableDeviceKeyCollection* This,
+        IPortableDeviceKeyCollection *This,
         REFPROPERTYKEY Key);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        IPortableDeviceKeyCollection* This);
+        IPortableDeviceKeyCollection *This);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IPortableDeviceKeyCollection* This,
+        IPortableDeviceKeyCollection *This,
         const DWORD dwIndex);
 
     END_INTERFACE
 } IPortableDeviceKeyCollectionVtbl;
+
 interface IPortableDeviceKeyCollection {
     CONST_VTBL IPortableDeviceKeyCollectionVtbl* lpVtbl;
 };
@@ -1126,46 +792,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_GetCount_Proxy(
-    IPortableDeviceKeyCollection* This,
-    DWORD *pcElems);
-void __RPC_STUB IPortableDeviceKeyCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_GetAt_Proxy(
-    IPortableDeviceKeyCollection* This,
-    const DWORD dwIndex,
-    PROPERTYKEY *pKey);
-void __RPC_STUB IPortableDeviceKeyCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_Add_Proxy(
-    IPortableDeviceKeyCollection* This,
-    REFPROPERTYKEY Key);
-void __RPC_STUB IPortableDeviceKeyCollection_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_Clear_Proxy(
-    IPortableDeviceKeyCollection* This);
-void __RPC_STUB IPortableDeviceKeyCollection_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceKeyCollection_RemoveAt_Proxy(
-    IPortableDeviceKeyCollection* This,
-    const DWORD dwIndex);
-void __RPC_STUB IPortableDeviceKeyCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPortableDeviceKeyCollection_INTERFACE_DEFINED__ */
 
@@ -1212,47 +838,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPortableDevicePropVariantCollection* This,
+        IPortableDevicePropVariantCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPortableDevicePropVariantCollection* This);
+        IPortableDevicePropVariantCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPortableDevicePropVariantCollection* This);
+        IPortableDevicePropVariantCollection *This);
 
     /*** IPortableDevicePropVariantCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPortableDevicePropVariantCollection* This,
+        IPortableDevicePropVariantCollection *This,
         DWORD *pcElems);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPortableDevicePropVariantCollection* This,
+        IPortableDevicePropVariantCollection *This,
         const DWORD dwIndex,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IPortableDevicePropVariantCollection* This,
+        IPortableDevicePropVariantCollection *This,
         const PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IPortableDevicePropVariantCollection* This,
+        IPortableDevicePropVariantCollection *This,
         VARTYPE *pvt);
 
     HRESULT (STDMETHODCALLTYPE *ChangeType)(
-        IPortableDevicePropVariantCollection* This,
+        IPortableDevicePropVariantCollection *This,
         const VARTYPE vt);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        IPortableDevicePropVariantCollection* This);
+        IPortableDevicePropVariantCollection *This);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IPortableDevicePropVariantCollection* This,
+        IPortableDevicePropVariantCollection *This,
         const DWORD dwIndex);
 
     END_INTERFACE
 } IPortableDevicePropVariantCollectionVtbl;
+
 interface IPortableDevicePropVariantCollection {
     CONST_VTBL IPortableDevicePropVariantCollectionVtbl* lpVtbl;
 };
@@ -1309,62 +936,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_GetCount_Proxy(
-    IPortableDevicePropVariantCollection* This,
-    DWORD *pcElems);
-void __RPC_STUB IPortableDevicePropVariantCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_GetAt_Proxy(
-    IPortableDevicePropVariantCollection* This,
-    const DWORD dwIndex,
-    PROPVARIANT *pValue);
-void __RPC_STUB IPortableDevicePropVariantCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_Add_Proxy(
-    IPortableDevicePropVariantCollection* This,
-    const PROPVARIANT *pValue);
-void __RPC_STUB IPortableDevicePropVariantCollection_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_GetType_Proxy(
-    IPortableDevicePropVariantCollection* This,
-    VARTYPE *pvt);
-void __RPC_STUB IPortableDevicePropVariantCollection_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_ChangeType_Proxy(
-    IPortableDevicePropVariantCollection* This,
-    const VARTYPE vt);
-void __RPC_STUB IPortableDevicePropVariantCollection_ChangeType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_Clear_Proxy(
-    IPortableDevicePropVariantCollection* This);
-void __RPC_STUB IPortableDevicePropVariantCollection_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDevicePropVariantCollection_RemoveAt_Proxy(
-    IPortableDevicePropVariantCollection* This,
-    const DWORD dwIndex);
-void __RPC_STUB IPortableDevicePropVariantCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPortableDevicePropVariantCollection_INTERFACE_DEFINED__ */
 
@@ -1405,39 +976,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPortableDeviceValuesCollection* This,
+        IPortableDeviceValuesCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPortableDeviceValuesCollection* This);
+        IPortableDeviceValuesCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPortableDeviceValuesCollection* This);
+        IPortableDeviceValuesCollection *This);
 
     /*** IPortableDeviceValuesCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPortableDeviceValuesCollection* This,
+        IPortableDeviceValuesCollection *This,
         DWORD *pcElems);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPortableDeviceValuesCollection* This,
+        IPortableDeviceValuesCollection *This,
         DWORD dwIndex,
         IPortableDeviceValues **ppValues);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IPortableDeviceValuesCollection* This,
+        IPortableDeviceValuesCollection *This,
         IPortableDeviceValues *pValues);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        IPortableDeviceValuesCollection* This);
+        IPortableDeviceValuesCollection *This);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IPortableDeviceValuesCollection* This,
+        IPortableDeviceValuesCollection *This,
         const DWORD dwIndex);
 
     END_INTERFACE
 } IPortableDeviceValuesCollectionVtbl;
+
 interface IPortableDeviceValuesCollection {
     CONST_VTBL IPortableDeviceValuesCollectionVtbl* lpVtbl;
 };
@@ -1486,46 +1058,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_GetCount_Proxy(
-    IPortableDeviceValuesCollection* This,
-    DWORD *pcElems);
-void __RPC_STUB IPortableDeviceValuesCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_GetAt_Proxy(
-    IPortableDeviceValuesCollection* This,
-    DWORD dwIndex,
-    IPortableDeviceValues **ppValues);
-void __RPC_STUB IPortableDeviceValuesCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_Add_Proxy(
-    IPortableDeviceValuesCollection* This,
-    IPortableDeviceValues *pValues);
-void __RPC_STUB IPortableDeviceValuesCollection_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_Clear_Proxy(
-    IPortableDeviceValuesCollection* This);
-void __RPC_STUB IPortableDeviceValuesCollection_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPortableDeviceValuesCollection_RemoveAt_Proxy(
-    IPortableDeviceValuesCollection* This,
-    const DWORD dwIndex);
-void __RPC_STUB IPortableDeviceValuesCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPortableDeviceValuesCollection_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/propidl.h b/mingw-w64-headers/include/propidl.h
index a8e551c..b9128da 100644
--- a/mingw-w64-headers/include/propidl.h
+++ b/mingw-w64-headers/include/propidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/propidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/propidl.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __IPropertyStorage_FWD_DEFINED__
 #define __IPropertyStorage_FWD_DEFINED__
 typedef interface IPropertyStorage IPropertyStorage;
+#ifdef __cplusplus
+interface IPropertyStorage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertySetStorage_FWD_DEFINED__
 #define __IPropertySetStorage_FWD_DEFINED__
 typedef interface IPropertySetStorage IPropertySetStorage;
+#ifdef __cplusplus
+interface IPropertySetStorage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSTATPROPSTG_FWD_DEFINED__
 #define __IEnumSTATPROPSTG_FWD_DEFINED__
 typedef interface IEnumSTATPROPSTG IEnumSTATPROPSTG;
+#ifdef __cplusplus
+interface IEnumSTATPROPSTG;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSTATPROPSETSTG_FWD_DEFINED__
 #define __IEnumSTATPROPSETSTG_FWD_DEFINED__
 typedef interface IEnumSTATPROPSETSTG IEnumSTATPROPSETSTG;
+#ifdef __cplusplus
+interface IEnumSTATPROPSETSTG;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -59,16 +71,25 @@
 #ifndef __IPropertyStorage_FWD_DEFINED__
 #define __IPropertyStorage_FWD_DEFINED__
 typedef interface IPropertyStorage IPropertyStorage;
+#ifdef __cplusplus
+interface IPropertyStorage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSTATPROPSTG_FWD_DEFINED__
 #define __IEnumSTATPROPSTG_FWD_DEFINED__
 typedef interface IEnumSTATPROPSTG IEnumSTATPROPSTG;
+#ifdef __cplusplus
+interface IEnumSTATPROPSTG;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSTATPROPSETSTG_FWD_DEFINED__
 #define __IEnumSTATPROPSETSTG_FWD_DEFINED__
 typedef interface IEnumSTATPROPSETSTG IEnumSTATPROPSETSTG;
+#ifdef __cplusplus
+interface IEnumSTATPROPSETSTG;
+#endif /* __cplusplus */
 #endif
 
 
@@ -282,7 +303,6 @@
         PROPVARIANT *pvarVal;
     } __C89_NAMELESSUNIONNAME;
 };
-
     DECIMAL decVal;
   };
 };
@@ -390,7 +410,6 @@
     PIDMSI_STATUS_FINAL = 8,
     PIDMSI_STATUS_OTHER = 0x7fff
 };
-
 #endif
 
 #if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
@@ -403,7 +422,7 @@
 
 typedef struct tagPROPSPEC {
     ULONG ulKind;
-    __C89_NAMELESS union {
+    union {
         PROPID propid;
         LPOLESTR lpwstr;
     } DUMMYUNIONNAME;
@@ -500,79 +519,80 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyStorage* This);
+        IPropertyStorage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyStorage* This);
+        IPropertyStorage *This);
 
     /*** IPropertyStorage methods ***/
     HRESULT (STDMETHODCALLTYPE *ReadMultiple)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         ULONG cpspec,
         const PROPSPEC rgpspec[],
         PROPVARIANT rgpropvar[]);
 
     HRESULT (STDMETHODCALLTYPE *WriteMultiple)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         ULONG cpspec,
         const PROPSPEC rgpspec[],
         const PROPVARIANT rgpropvar[],
         PROPID propidNameFirst);
 
     HRESULT (STDMETHODCALLTYPE *DeleteMultiple)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         ULONG cpspec,
         const PROPSPEC rgpspec[]);
 
     HRESULT (STDMETHODCALLTYPE *ReadPropertyNames)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         ULONG cpropid,
         const PROPID rgpropid[],
         LPOLESTR rglpwstrName[]);
 
     HRESULT (STDMETHODCALLTYPE *WritePropertyNames)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         ULONG cpropid,
         const PROPID rgpropid[],
         const LPOLESTR rglpwstrName[]);
 
     HRESULT (STDMETHODCALLTYPE *DeletePropertyNames)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         ULONG cpropid,
         const PROPID rgpropid[]);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        IPropertyStorage* This);
+        IPropertyStorage *This);
 
     HRESULT (STDMETHODCALLTYPE *Enum)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         IEnumSTATPROPSTG **ppenum);
 
     HRESULT (STDMETHODCALLTYPE *SetTimes)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         const FILETIME *pctime,
         const FILETIME *patime,
         const FILETIME *pmtime);
 
     HRESULT (STDMETHODCALLTYPE *SetClass)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        IPropertyStorage* This,
+        IPropertyStorage *This,
         STATPROPSETSTG *pstatpsstg);
 
     END_INTERFACE
 } IPropertyStorageVtbl;
+
 interface IPropertyStorage {
     CONST_VTBL IPropertyStorageVtbl* lpVtbl;
 };
@@ -649,114 +669,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyStorage_ReadMultiple_Proxy(
-    IPropertyStorage* This,
-    ULONG cpspec,
-    const PROPSPEC rgpspec[],
-    PROPVARIANT rgpropvar[]);
-void __RPC_STUB IPropertyStorage_ReadMultiple_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_WriteMultiple_Proxy(
-    IPropertyStorage* This,
-    ULONG cpspec,
-    const PROPSPEC rgpspec[],
-    const PROPVARIANT rgpropvar[],
-    PROPID propidNameFirst);
-void __RPC_STUB IPropertyStorage_WriteMultiple_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_DeleteMultiple_Proxy(
-    IPropertyStorage* This,
-    ULONG cpspec,
-    const PROPSPEC rgpspec[]);
-void __RPC_STUB IPropertyStorage_DeleteMultiple_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_ReadPropertyNames_Proxy(
-    IPropertyStorage* This,
-    ULONG cpropid,
-    const PROPID rgpropid[],
-    LPOLESTR rglpwstrName[]);
-void __RPC_STUB IPropertyStorage_ReadPropertyNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_WritePropertyNames_Proxy(
-    IPropertyStorage* This,
-    ULONG cpropid,
-    const PROPID rgpropid[],
-    const LPOLESTR rglpwstrName[]);
-void __RPC_STUB IPropertyStorage_WritePropertyNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_DeletePropertyNames_Proxy(
-    IPropertyStorage* This,
-    ULONG cpropid,
-    const PROPID rgpropid[]);
-void __RPC_STUB IPropertyStorage_DeletePropertyNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_Commit_Proxy(
-    IPropertyStorage* This,
-    DWORD grfCommitFlags);
-void __RPC_STUB IPropertyStorage_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_Revert_Proxy(
-    IPropertyStorage* This);
-void __RPC_STUB IPropertyStorage_Revert_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_Enum_Proxy(
-    IPropertyStorage* This,
-    IEnumSTATPROPSTG **ppenum);
-void __RPC_STUB IPropertyStorage_Enum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_SetTimes_Proxy(
-    IPropertyStorage* This,
-    const FILETIME *pctime,
-    const FILETIME *patime,
-    const FILETIME *pmtime);
-void __RPC_STUB IPropertyStorage_SetTimes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_SetClass_Proxy(
-    IPropertyStorage* This,
-    REFCLSID clsid);
-void __RPC_STUB IPropertyStorage_SetClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStorage_Stat_Proxy(
-    IPropertyStorage* This,
-    STATPROPSETSTG *pstatpsstg);
-void __RPC_STUB IPropertyStorage_Stat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyStorage_INTERFACE_DEFINED__ */
 
@@ -802,19 +714,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertySetStorage* This,
+        IPropertySetStorage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertySetStorage* This);
+        IPropertySetStorage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertySetStorage* This);
+        IPropertySetStorage *This);
 
     /*** IPropertySetStorage methods ***/
     HRESULT (STDMETHODCALLTYPE *Create)(
-        IPropertySetStorage* This,
+        IPropertySetStorage *This,
         REFFMTID rfmtid,
         const CLSID *pclsid,
         DWORD grfFlags,
@@ -822,21 +734,22 @@
         IPropertyStorage **ppprstg);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IPropertySetStorage* This,
+        IPropertySetStorage *This,
         REFFMTID rfmtid,
         DWORD grfMode,
         IPropertyStorage **ppprstg);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IPropertySetStorage* This,
+        IPropertySetStorage *This,
         REFFMTID rfmtid);
 
     HRESULT (STDMETHODCALLTYPE *Enum)(
-        IPropertySetStorage* This,
+        IPropertySetStorage *This,
         IEnumSTATPROPSETSTG **ppenum);
 
     END_INTERFACE
 } IPropertySetStorageVtbl;
+
 interface IPropertySetStorage {
     CONST_VTBL IPropertySetStorageVtbl* lpVtbl;
 };
@@ -881,44 +794,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertySetStorage_Create_Proxy(
-    IPropertySetStorage* This,
-    REFFMTID rfmtid,
-    const CLSID *pclsid,
-    DWORD grfFlags,
-    DWORD grfMode,
-    IPropertyStorage **ppprstg);
-void __RPC_STUB IPropertySetStorage_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySetStorage_Open_Proxy(
-    IPropertySetStorage* This,
-    REFFMTID rfmtid,
-    DWORD grfMode,
-    IPropertyStorage **ppprstg);
-void __RPC_STUB IPropertySetStorage_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySetStorage_Delete_Proxy(
-    IPropertySetStorage* This,
-    REFFMTID rfmtid);
-void __RPC_STUB IPropertySetStorage_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySetStorage_Enum_Proxy(
-    IPropertySetStorage* This,
-    IEnumSTATPROPSETSTG **ppenum);
-void __RPC_STUB IPropertySetStorage_Enum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertySetStorage_INTERFACE_DEFINED__ */
 
@@ -960,36 +835,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumSTATPROPSTG* This,
+        IEnumSTATPROPSTG *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumSTATPROPSTG* This);
+        IEnumSTATPROPSTG *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumSTATPROPSTG* This);
+        IEnumSTATPROPSTG *This);
 
     /*** IEnumSTATPROPSTG methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumSTATPROPSTG* This,
+        IEnumSTATPROPSTG *This,
         ULONG celt,
         STATPROPSTG *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumSTATPROPSTG* This,
+        IEnumSTATPROPSTG *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumSTATPROPSTG* This);
+        IEnumSTATPROPSTG *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumSTATPROPSTG* This,
+        IEnumSTATPROPSTG *This,
         IEnumSTATPROPSTG **ppenum);
 
     END_INTERFACE
 } IEnumSTATPROPSTGVtbl;
+
 interface IEnumSTATPROPSTG {
     CONST_VTBL IEnumSTATPROPSTGVtbl* lpVtbl;
 };
@@ -1044,29 +920,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Skip_Proxy(
-    IEnumSTATPROPSTG* This,
-    ULONG celt);
-void __RPC_STUB IEnumSTATPROPSTG_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Reset_Proxy(
-    IEnumSTATPROPSTG* This);
-void __RPC_STUB IEnumSTATPROPSTG_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSTATPROPSTG_Clone_Proxy(
-    IEnumSTATPROPSTG* This,
-    IEnumSTATPROPSTG **ppenum);
-void __RPC_STUB IEnumSTATPROPSTG_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumSTATPROPSTG_Next_Proxy(
     IEnumSTATPROPSTG* This,
     ULONG celt,
@@ -1118,36 +971,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumSTATPROPSETSTG* This,
+        IEnumSTATPROPSETSTG *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumSTATPROPSETSTG* This);
+        IEnumSTATPROPSETSTG *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumSTATPROPSETSTG* This);
+        IEnumSTATPROPSETSTG *This);
 
     /*** IEnumSTATPROPSETSTG methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumSTATPROPSETSTG* This,
+        IEnumSTATPROPSETSTG *This,
         ULONG celt,
         STATPROPSETSTG *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumSTATPROPSETSTG* This,
+        IEnumSTATPROPSETSTG *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumSTATPROPSETSTG* This);
+        IEnumSTATPROPSETSTG *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumSTATPROPSETSTG* This,
+        IEnumSTATPROPSETSTG *This,
         IEnumSTATPROPSETSTG **ppenum);
 
     END_INTERFACE
 } IEnumSTATPROPSETSTGVtbl;
+
 interface IEnumSTATPROPSETSTG {
     CONST_VTBL IEnumSTATPROPSETSTGVtbl* lpVtbl;
 };
@@ -1202,29 +1056,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Skip_Proxy(
-    IEnumSTATPROPSETSTG* This,
-    ULONG celt);
-void __RPC_STUB IEnumSTATPROPSETSTG_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Reset_Proxy(
-    IEnumSTATPROPSETSTG* This);
-void __RPC_STUB IEnumSTATPROPSETSTG_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSTATPROPSETSTG_Clone_Proxy(
-    IEnumSTATPROPSETSTG* This,
-    IEnumSTATPROPSETSTG **ppenum);
-void __RPC_STUB IEnumSTATPROPSETSTG_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumSTATPROPSETSTG_Next_Proxy(
     IEnumSTATPROPSETSTG* This,
     ULONG celt,
diff --git a/mingw-w64-headers/include/propsys.h b/mingw-w64-headers/include/propsys.h
index 088e998..49df221 100644
--- a/mingw-w64-headers/include/propsys.h
+++ b/mingw-w64-headers/include/propsys.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/propsys.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/propsys.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,126 +20,201 @@
 #ifndef __IInitializeWithFile_FWD_DEFINED__
 #define __IInitializeWithFile_FWD_DEFINED__
 typedef interface IInitializeWithFile IInitializeWithFile;
+#ifdef __cplusplus
+interface IInitializeWithFile;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInitializeWithStream_FWD_DEFINED__
 #define __IInitializeWithStream_FWD_DEFINED__
 typedef interface IInitializeWithStream IInitializeWithStream;
+#ifdef __cplusplus
+interface IInitializeWithStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyStore_FWD_DEFINED__
 #define __IPropertyStore_FWD_DEFINED__
 typedef interface IPropertyStore IPropertyStore;
+#ifdef __cplusplus
+interface IPropertyStore;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INamedPropertyStore_FWD_DEFINED__
 #define __INamedPropertyStore_FWD_DEFINED__
 typedef interface INamedPropertyStore INamedPropertyStore;
+#ifdef __cplusplus
+interface INamedPropertyStore;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithPropertyKey_FWD_DEFINED__
 #define __IObjectWithPropertyKey_FWD_DEFINED__
 typedef interface IObjectWithPropertyKey IObjectWithPropertyKey;
+#ifdef __cplusplus
+interface IObjectWithPropertyKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyChange_FWD_DEFINED__
 #define __IPropertyChange_FWD_DEFINED__
 typedef interface IPropertyChange IPropertyChange;
+#ifdef __cplusplus
+interface IPropertyChange;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyChangeArray_FWD_DEFINED__
 #define __IPropertyChangeArray_FWD_DEFINED__
 typedef interface IPropertyChangeArray IPropertyChangeArray;
+#ifdef __cplusplus
+interface IPropertyChangeArray;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyStoreCapabilities_FWD_DEFINED__
 #define __IPropertyStoreCapabilities_FWD_DEFINED__
 typedef interface IPropertyStoreCapabilities IPropertyStoreCapabilities;
+#ifdef __cplusplus
+interface IPropertyStoreCapabilities;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyStoreCache_FWD_DEFINED__
 #define __IPropertyStoreCache_FWD_DEFINED__
 typedef interface IPropertyStoreCache IPropertyStoreCache;
+#ifdef __cplusplus
+interface IPropertyStoreCache;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyEnumType_FWD_DEFINED__
 #define __IPropertyEnumType_FWD_DEFINED__
 typedef interface IPropertyEnumType IPropertyEnumType;
+#ifdef __cplusplus
+interface IPropertyEnumType;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyEnumType2_FWD_DEFINED__
 #define __IPropertyEnumType2_FWD_DEFINED__
 typedef interface IPropertyEnumType2 IPropertyEnumType2;
+#ifdef __cplusplus
+interface IPropertyEnumType2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyEnumTypeList_FWD_DEFINED__
 #define __IPropertyEnumTypeList_FWD_DEFINED__
 typedef interface IPropertyEnumTypeList IPropertyEnumTypeList;
+#ifdef __cplusplus
+interface IPropertyEnumTypeList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyDescription_FWD_DEFINED__
 #define __IPropertyDescription_FWD_DEFINED__
 typedef interface IPropertyDescription IPropertyDescription;
+#ifdef __cplusplus
+interface IPropertyDescription;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyDescription2_FWD_DEFINED__
 #define __IPropertyDescription2_FWD_DEFINED__
 typedef interface IPropertyDescription2 IPropertyDescription2;
+#ifdef __cplusplus
+interface IPropertyDescription2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyDescriptionAliasInfo_FWD_DEFINED__
 #define __IPropertyDescriptionAliasInfo_FWD_DEFINED__
 typedef interface IPropertyDescriptionAliasInfo IPropertyDescriptionAliasInfo;
+#ifdef __cplusplus
+interface IPropertyDescriptionAliasInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyDescriptionSearchInfo_FWD_DEFINED__
 #define __IPropertyDescriptionSearchInfo_FWD_DEFINED__
 typedef interface IPropertyDescriptionSearchInfo IPropertyDescriptionSearchInfo;
+#ifdef __cplusplus
+interface IPropertyDescriptionSearchInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyDescriptionRelatedPropertyInfo_FWD_DEFINED__
 #define __IPropertyDescriptionRelatedPropertyInfo_FWD_DEFINED__
 typedef interface IPropertyDescriptionRelatedPropertyInfo IPropertyDescriptionRelatedPropertyInfo;
+#ifdef __cplusplus
+interface IPropertyDescriptionRelatedPropertyInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertySystem_FWD_DEFINED__
 #define __IPropertySystem_FWD_DEFINED__
 typedef interface IPropertySystem IPropertySystem;
+#ifdef __cplusplus
+interface IPropertySystem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyDescriptionList_FWD_DEFINED__
 #define __IPropertyDescriptionList_FWD_DEFINED__
 typedef interface IPropertyDescriptionList IPropertyDescriptionList;
+#ifdef __cplusplus
+interface IPropertyDescriptionList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyStoreFactory_FWD_DEFINED__
 #define __IPropertyStoreFactory_FWD_DEFINED__
 typedef interface IPropertyStoreFactory IPropertyStoreFactory;
+#ifdef __cplusplus
+interface IPropertyStoreFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDelayedPropertyStoreFactory_FWD_DEFINED__
 #define __IDelayedPropertyStoreFactory_FWD_DEFINED__
 typedef interface IDelayedPropertyStoreFactory IDelayedPropertyStoreFactory;
+#ifdef __cplusplus
+interface IDelayedPropertyStoreFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistSerializedPropStorage_FWD_DEFINED__
 #define __IPersistSerializedPropStorage_FWD_DEFINED__
 typedef interface IPersistSerializedPropStorage IPersistSerializedPropStorage;
+#ifdef __cplusplus
+interface IPersistSerializedPropStorage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistSerializedPropStorage2_FWD_DEFINED__
 #define __IPersistSerializedPropStorage2_FWD_DEFINED__
 typedef interface IPersistSerializedPropStorage2 IPersistSerializedPropStorage2;
+#ifdef __cplusplus
+interface IPersistSerializedPropStorage2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertySystemChangeNotify_FWD_DEFINED__
 #define __IPropertySystemChangeNotify_FWD_DEFINED__
 typedef interface IPropertySystemChangeNotify IPropertySystemChangeNotify;
+#ifdef __cplusplus
+interface IPropertySystemChangeNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICreateObject_FWD_DEFINED__
 #define __ICreateObject_FWD_DEFINED__
 typedef interface ICreateObject ICreateObject;
+#ifdef __cplusplus
+interface ICreateObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __InMemoryPropertyStore_FWD_DEFINED__
@@ -221,24 +296,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeWithFile* This,
+        IInitializeWithFile *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeWithFile* This);
+        IInitializeWithFile *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeWithFile* This);
+        IInitializeWithFile *This);
 
     /*** IInitializeWithFile methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeWithFile* This,
+        IInitializeWithFile *This,
         LPCWSTR pszFilePath,
         DWORD grfMode);
 
     END_INTERFACE
 } IInitializeWithFileVtbl;
+
 interface IInitializeWithFile {
     CONST_VTBL IInitializeWithFileVtbl* lpVtbl;
 };
@@ -271,15 +347,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInitializeWithFile_Initialize_Proxy(
-    IInitializeWithFile* This,
-    LPCWSTR pszFilePath,
-    DWORD grfMode);
-void __RPC_STUB IInitializeWithFile_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInitializeWithFile_INTERFACE_DEFINED__ */
 
@@ -309,24 +376,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeWithStream* This,
+        IInitializeWithStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeWithStream* This);
+        IInitializeWithStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeWithStream* This);
+        IInitializeWithStream *This);
 
     /*** IInitializeWithStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeWithStream* This,
+        IInitializeWithStream *This,
         IStream *pstream,
         DWORD grfMode);
 
     END_INTERFACE
 } IInitializeWithStreamVtbl;
+
 interface IInitializeWithStream {
     CONST_VTBL IInitializeWithStreamVtbl* lpVtbl;
 };
@@ -421,41 +489,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyStore* This,
+        IPropertyStore *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyStore* This);
+        IPropertyStore *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyStore* This);
+        IPropertyStore *This);
 
     /*** IPropertyStore methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPropertyStore* This,
+        IPropertyStore *This,
         DWORD *cProps);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPropertyStore* This,
+        IPropertyStore *This,
         DWORD iProp,
         PROPERTYKEY *pkey);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IPropertyStore* This,
+        IPropertyStore *This,
         REFPROPERTYKEY key,
         PROPVARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *SetValue)(
-        IPropertyStore* This,
+        IPropertyStore *This,
         REFPROPERTYKEY key,
         REFPROPVARIANT propvar);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IPropertyStore* This);
+        IPropertyStore *This);
 
     END_INTERFACE
 } IPropertyStoreVtbl;
+
 interface IPropertyStore {
     CONST_VTBL IPropertyStoreVtbl* lpVtbl;
 };
@@ -504,48 +573,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyStore_GetCount_Proxy(
-    IPropertyStore* This,
-    DWORD *cProps);
-void __RPC_STUB IPropertyStore_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStore_GetAt_Proxy(
-    IPropertyStore* This,
-    DWORD iProp,
-    PROPERTYKEY *pkey);
-void __RPC_STUB IPropertyStore_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStore_GetValue_Proxy(
-    IPropertyStore* This,
-    REFPROPERTYKEY key,
-    PROPVARIANT *pv);
-void __RPC_STUB IPropertyStore_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStore_SetValue_Proxy(
-    IPropertyStore* This,
-    REFPROPERTYKEY key,
-    REFPROPVARIANT propvar);
-void __RPC_STUB IPropertyStore_SetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStore_Commit_Proxy(
-    IPropertyStore* This);
-void __RPC_STUB IPropertyStore_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyStore_INTERFACE_DEFINED__ */
 
@@ -590,38 +617,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INamedPropertyStore* This,
+        INamedPropertyStore *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INamedPropertyStore* This);
+        INamedPropertyStore *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INamedPropertyStore* This);
+        INamedPropertyStore *This);
 
     /*** INamedPropertyStore methods ***/
     HRESULT (STDMETHODCALLTYPE *GetNamedValue)(
-        INamedPropertyStore* This,
+        INamedPropertyStore *This,
         LPCWSTR pszName,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *SetNamedValue)(
-        INamedPropertyStore* This,
+        INamedPropertyStore *This,
         LPCWSTR pszName,
         REFPROPVARIANT propvar);
 
     HRESULT (STDMETHODCALLTYPE *GetNameCount)(
-        INamedPropertyStore* This,
+        INamedPropertyStore *This,
         DWORD *pdwCount);
 
     HRESULT (STDMETHODCALLTYPE *GetNameAt)(
-        INamedPropertyStore* This,
+        INamedPropertyStore *This,
         DWORD iProp,
         BSTR *pbstrName);
 
     END_INTERFACE
 } INamedPropertyStoreVtbl;
+
 interface INamedPropertyStore {
     CONST_VTBL INamedPropertyStoreVtbl* lpVtbl;
 };
@@ -666,41 +694,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INamedPropertyStore_GetNamedValue_Proxy(
-    INamedPropertyStore* This,
-    LPCWSTR pszName,
-    PROPVARIANT *ppropvar);
-void __RPC_STUB INamedPropertyStore_GetNamedValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INamedPropertyStore_SetNamedValue_Proxy(
-    INamedPropertyStore* This,
-    LPCWSTR pszName,
-    REFPROPVARIANT propvar);
-void __RPC_STUB INamedPropertyStore_SetNamedValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INamedPropertyStore_GetNameCount_Proxy(
-    INamedPropertyStore* This,
-    DWORD *pdwCount);
-void __RPC_STUB INamedPropertyStore_GetNameCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INamedPropertyStore_GetNameAt_Proxy(
-    INamedPropertyStore* This,
-    DWORD iProp,
-    BSTR *pbstrName);
-void __RPC_STUB INamedPropertyStore_GetNameAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INamedPropertyStore_INTERFACE_DEFINED__ */
 
@@ -748,27 +741,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithPropertyKey* This,
+        IObjectWithPropertyKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithPropertyKey* This);
+        IObjectWithPropertyKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithPropertyKey* This);
+        IObjectWithPropertyKey *This);
 
     /*** IObjectWithPropertyKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyKey)(
-        IObjectWithPropertyKey* This,
+        IObjectWithPropertyKey *This,
         REFPROPERTYKEY key);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyKey)(
-        IObjectWithPropertyKey* This,
+        IObjectWithPropertyKey *This,
         PROPERTYKEY *pkey);
 
     END_INTERFACE
 } IObjectWithPropertyKeyVtbl;
+
 interface IObjectWithPropertyKey {
     CONST_VTBL IObjectWithPropertyKeyVtbl* lpVtbl;
 };
@@ -805,22 +799,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithPropertyKey_SetPropertyKey_Proxy(
-    IObjectWithPropertyKey* This,
-    REFPROPERTYKEY key);
-void __RPC_STUB IObjectWithPropertyKey_SetPropertyKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IObjectWithPropertyKey_GetPropertyKey_Proxy(
-    IObjectWithPropertyKey* This,
-    PROPERTYKEY *pkey);
-void __RPC_STUB IObjectWithPropertyKey_GetPropertyKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithPropertyKey_INTERFACE_DEFINED__ */
 
@@ -856,33 +834,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyChange* This,
+        IPropertyChange *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyChange* This);
+        IPropertyChange *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyChange* This);
+        IPropertyChange *This);
 
     /*** IObjectWithPropertyKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyKey)(
-        IPropertyChange* This,
+        IPropertyChange *This,
         REFPROPERTYKEY key);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyKey)(
-        IPropertyChange* This,
+        IPropertyChange *This,
         PROPERTYKEY *pkey);
 
     /*** IPropertyChange methods ***/
     HRESULT (STDMETHODCALLTYPE *ApplyToPropVariant)(
-        IPropertyChange* This,
+        IPropertyChange *This,
         REFPROPVARIANT propvarIn,
         PROPVARIANT *ppropvarOut);
 
     END_INTERFACE
 } IPropertyChangeVtbl;
+
 interface IPropertyChange {
     CONST_VTBL IPropertyChangeVtbl* lpVtbl;
 };
@@ -925,15 +904,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyChange_ApplyToPropVariant_Proxy(
-    IPropertyChange* This,
-    REFPROPVARIANT propvarIn,
-    PROPVARIANT *ppropvarOut);
-void __RPC_STUB IPropertyChange_ApplyToPropVariant_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyChange_INTERFACE_DEFINED__ */
 
@@ -983,50 +953,51 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyChangeArray* This);
+        IPropertyChangeArray *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyChangeArray* This);
+        IPropertyChangeArray *This);
 
     /*** IPropertyChangeArray methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         UINT *pcOperations);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         UINT iIndex,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         UINT iIndex,
         IPropertyChange *ppropChange);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         IPropertyChange *ppropChange);
 
     HRESULT (STDMETHODCALLTYPE *AppendOrReplace)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         IPropertyChange *ppropChange);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         UINT iIndex);
 
     HRESULT (STDMETHODCALLTYPE *IsKeyInArray)(
-        IPropertyChangeArray* This,
+        IPropertyChangeArray *This,
         REFPROPERTYKEY key);
 
     END_INTERFACE
 } IPropertyChangeArrayVtbl;
+
 interface IPropertyChangeArray {
     CONST_VTBL IPropertyChangeArrayVtbl* lpVtbl;
 };
@@ -1083,65 +1054,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyChangeArray_GetCount_Proxy(
-    IPropertyChangeArray* This,
-    UINT *pcOperations);
-void __RPC_STUB IPropertyChangeArray_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyChangeArray_GetAt_Proxy(
-    IPropertyChangeArray* This,
-    UINT iIndex,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyChangeArray_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyChangeArray_InsertAt_Proxy(
-    IPropertyChangeArray* This,
-    UINT iIndex,
-    IPropertyChange *ppropChange);
-void __RPC_STUB IPropertyChangeArray_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyChangeArray_Append_Proxy(
-    IPropertyChangeArray* This,
-    IPropertyChange *ppropChange);
-void __RPC_STUB IPropertyChangeArray_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyChangeArray_AppendOrReplace_Proxy(
-    IPropertyChangeArray* This,
-    IPropertyChange *ppropChange);
-void __RPC_STUB IPropertyChangeArray_AppendOrReplace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyChangeArray_RemoveAt_Proxy(
-    IPropertyChangeArray* This,
-    UINT iIndex);
-void __RPC_STUB IPropertyChangeArray_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyChangeArray_IsKeyInArray_Proxy(
-    IPropertyChangeArray* This,
-    REFPROPERTYKEY key);
-void __RPC_STUB IPropertyChangeArray_IsKeyInArray_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyChangeArray_INTERFACE_DEFINED__ */
 
@@ -1170,23 +1082,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyStoreCapabilities* This,
+        IPropertyStoreCapabilities *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyStoreCapabilities* This);
+        IPropertyStoreCapabilities *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyStoreCapabilities* This);
+        IPropertyStoreCapabilities *This);
 
     /*** IPropertyStoreCapabilities methods ***/
     HRESULT (STDMETHODCALLTYPE *IsPropertyWritable)(
-        IPropertyStoreCapabilities* This,
+        IPropertyStoreCapabilities *This,
         REFPROPERTYKEY key);
 
     END_INTERFACE
 } IPropertyStoreCapabilitiesVtbl;
+
 interface IPropertyStoreCapabilities {
     CONST_VTBL IPropertyStoreCapabilitiesVtbl* lpVtbl;
 };
@@ -1219,14 +1132,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyStoreCapabilities_IsPropertyWritable_Proxy(
-    IPropertyStoreCapabilities* This,
-    REFPROPERTYKEY key);
-void __RPC_STUB IPropertyStoreCapabilities_IsPropertyWritable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyStoreCapabilities_INTERFACE_DEFINED__ */
 
@@ -1277,64 +1182,65 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyStoreCache* This);
+        IPropertyStoreCache *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyStoreCache* This);
+        IPropertyStoreCache *This);
 
     /*** IPropertyStore methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         DWORD *cProps);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         DWORD iProp,
         PROPERTYKEY *pkey);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         REFPROPERTYKEY key,
         PROPVARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *SetValue)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         REFPROPERTYKEY key,
         REFPROPVARIANT propvar);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IPropertyStoreCache* This);
+        IPropertyStoreCache *This);
 
     /*** IPropertyStoreCache methods ***/
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         REFPROPERTYKEY key,
         PSC_STATE *pstate);
 
     HRESULT (STDMETHODCALLTYPE *GetValueAndState)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         REFPROPERTYKEY key,
         PROPVARIANT *ppropvar,
         PSC_STATE *pstate);
 
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         REFPROPERTYKEY key,
         PSC_STATE state);
 
     HRESULT (STDMETHODCALLTYPE *SetValueAndState)(
-        IPropertyStoreCache* This,
+        IPropertyStoreCache *This,
         REFPROPERTYKEY key,
         const PROPVARIANT *ppropvar,
         PSC_STATE state);
 
     END_INTERFACE
 } IPropertyStoreCacheVtbl;
+
 interface IPropertyStoreCache {
     CONST_VTBL IPropertyStoreCacheVtbl* lpVtbl;
 };
@@ -1401,44 +1307,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyStoreCache_GetState_Proxy(
-    IPropertyStoreCache* This,
-    REFPROPERTYKEY key,
-    PSC_STATE *pstate);
-void __RPC_STUB IPropertyStoreCache_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStoreCache_GetValueAndState_Proxy(
-    IPropertyStoreCache* This,
-    REFPROPERTYKEY key,
-    PROPVARIANT *ppropvar,
-    PSC_STATE *pstate);
-void __RPC_STUB IPropertyStoreCache_GetValueAndState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStoreCache_SetState_Proxy(
-    IPropertyStoreCache* This,
-    REFPROPERTYKEY key,
-    PSC_STATE state);
-void __RPC_STUB IPropertyStoreCache_SetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStoreCache_SetValueAndState_Proxy(
-    IPropertyStoreCache* This,
-    REFPROPERTYKEY key,
-    const PROPVARIANT *ppropvar,
-    PSC_STATE state);
-void __RPC_STUB IPropertyStoreCache_SetValueAndState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyStoreCache_INTERFACE_DEFINED__ */
 
@@ -1486,39 +1354,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyEnumType* This,
+        IPropertyEnumType *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyEnumType* This);
+        IPropertyEnumType *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyEnumType* This);
+        IPropertyEnumType *This);
 
     /*** IPropertyEnumType methods ***/
     HRESULT (STDMETHODCALLTYPE *GetEnumType)(
-        IPropertyEnumType* This,
+        IPropertyEnumType *This,
         PROPENUMTYPE *penumtype);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IPropertyEnumType* This,
+        IPropertyEnumType *This,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *GetRangeMinValue)(
-        IPropertyEnumType* This,
+        IPropertyEnumType *This,
         PROPVARIANT *ppropvarMin);
 
     HRESULT (STDMETHODCALLTYPE *GetRangeSetValue)(
-        IPropertyEnumType* This,
+        IPropertyEnumType *This,
         PROPVARIANT *ppropvarSet);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayText)(
-        IPropertyEnumType* This,
+        IPropertyEnumType *This,
         LPWSTR *ppszDisplay);
 
     END_INTERFACE
 } IPropertyEnumTypeVtbl;
+
 interface IPropertyEnumType {
     CONST_VTBL IPropertyEnumTypeVtbl* lpVtbl;
 };
@@ -1567,46 +1436,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetEnumType_Proxy(
-    IPropertyEnumType* This,
-    PROPENUMTYPE *penumtype);
-void __RPC_STUB IPropertyEnumType_GetEnumType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetValue_Proxy(
-    IPropertyEnumType* This,
-    PROPVARIANT *ppropvar);
-void __RPC_STUB IPropertyEnumType_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetRangeMinValue_Proxy(
-    IPropertyEnumType* This,
-    PROPVARIANT *ppropvarMin);
-void __RPC_STUB IPropertyEnumType_GetRangeMinValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetRangeSetValue_Proxy(
-    IPropertyEnumType* This,
-    PROPVARIANT *ppropvarSet);
-void __RPC_STUB IPropertyEnumType_GetRangeSetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyEnumType_GetDisplayText_Proxy(
-    IPropertyEnumType* This,
-    LPWSTR *ppszDisplay);
-void __RPC_STUB IPropertyEnumType_GetDisplayText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyEnumType_INTERFACE_DEFINED__ */
 
@@ -1635,44 +1464,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyEnumType2* This,
+        IPropertyEnumType2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyEnumType2* This);
+        IPropertyEnumType2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyEnumType2* This);
+        IPropertyEnumType2 *This);
 
     /*** IPropertyEnumType methods ***/
     HRESULT (STDMETHODCALLTYPE *GetEnumType)(
-        IPropertyEnumType2* This,
+        IPropertyEnumType2 *This,
         PROPENUMTYPE *penumtype);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IPropertyEnumType2* This,
+        IPropertyEnumType2 *This,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *GetRangeMinValue)(
-        IPropertyEnumType2* This,
+        IPropertyEnumType2 *This,
         PROPVARIANT *ppropvarMin);
 
     HRESULT (STDMETHODCALLTYPE *GetRangeSetValue)(
-        IPropertyEnumType2* This,
+        IPropertyEnumType2 *This,
         PROPVARIANT *ppropvarSet);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayText)(
-        IPropertyEnumType2* This,
+        IPropertyEnumType2 *This,
         LPWSTR *ppszDisplay);
 
     /*** IPropertyEnumType2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetImageReference)(
-        IPropertyEnumType2* This,
+        IPropertyEnumType2 *This,
         LPWSTR *ppszImageRes);
 
     END_INTERFACE
 } IPropertyEnumType2Vtbl;
+
 interface IPropertyEnumType2 {
     CONST_VTBL IPropertyEnumType2Vtbl* lpVtbl;
 };
@@ -1727,14 +1557,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyEnumType2_GetImageReference_Proxy(
-    IPropertyEnumType2* This,
-    LPWSTR *ppszImageRes);
-void __RPC_STUB IPropertyEnumType2_GetImageReference_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyEnumType2_INTERFACE_DEFINED__ */
 
@@ -1777,40 +1599,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyEnumTypeList* This,
+        IPropertyEnumTypeList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyEnumTypeList* This);
+        IPropertyEnumTypeList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyEnumTypeList* This);
+        IPropertyEnumTypeList *This);
 
     /*** IPropertyEnumTypeList methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPropertyEnumTypeList* This,
+        IPropertyEnumTypeList *This,
         UINT *pctypes);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPropertyEnumTypeList* This,
+        IPropertyEnumTypeList *This,
         UINT itype,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetConditionAt)(
-        IPropertyEnumTypeList* This,
+        IPropertyEnumTypeList *This,
         UINT nIndex,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *FindMatchingIndex)(
-        IPropertyEnumTypeList* This,
+        IPropertyEnumTypeList *This,
         REFPROPVARIANT propvarCmp,
         UINT *pnIndex);
 
     END_INTERFACE
 } IPropertyEnumTypeListVtbl;
+
 interface IPropertyEnumTypeList {
     CONST_VTBL IPropertyEnumTypeListVtbl* lpVtbl;
 };
@@ -1855,43 +1678,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_GetCount_Proxy(
-    IPropertyEnumTypeList* This,
-    UINT *pctypes);
-void __RPC_STUB IPropertyEnumTypeList_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_GetAt_Proxy(
-    IPropertyEnumTypeList* This,
-    UINT itype,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyEnumTypeList_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_GetConditionAt_Proxy(
-    IPropertyEnumTypeList* This,
-    UINT nIndex,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyEnumTypeList_GetConditionAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyEnumTypeList_FindMatchingIndex_Proxy(
-    IPropertyEnumTypeList* This,
-    REFPROPVARIANT propvarCmp,
-    UINT *pnIndex);
-void __RPC_STUB IPropertyEnumTypeList_FindMatchingIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyEnumTypeList_INTERFACE_DEFINED__ */
 
@@ -2107,112 +1893,113 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyDescription* This);
+        IPropertyDescription *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyDescription* This);
+        IPropertyDescription *This);
 
     /*** IPropertyDescription methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyKey)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPERTYKEY *pkey);
 
     HRESULT (STDMETHODCALLTYPE *GetCanonicalName)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyType)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         VARTYPE *pvartype);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetEditInvitation)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         LPWSTR *ppszInvite);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeFlags)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_TYPE_FLAGS mask,
         PROPDESC_TYPE_FLAGS *ppdtFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetViewFlags)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_VIEW_FLAGS *ppdvFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         UINT *pcxChars);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayType)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_DISPLAYTYPE *pdisplaytype);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnState)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         SHCOLSTATEF *pcsFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupingRange)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_GROUPING_RANGE *pgr);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         REFPROPVARIANT propvar1,
         REFPROPVARIANT propvar2,
         LPWSTR *ppszDesc1,
         LPWSTR *ppszDesc2);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescription)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_SORTDESCRIPTION *psd);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         WINBOOL fDescending,
         LPWSTR *ppszDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetAggregationType)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_AGGREGATION_TYPE *paggtype);
 
     HRESULT (STDMETHODCALLTYPE *GetConditionType)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPDESC_CONDITION_TYPE *pcontype,
         CONDITION_OPERATION *popDefault);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplay)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         REFPROPVARIANT propvar,
         PROPDESC_FORMAT_FLAGS pdfFlags,
         LPWSTR *ppszDisplay);
 
     HRESULT (STDMETHODCALLTYPE *IsValueCanonical)(
-        IPropertyDescription* This,
+        IPropertyDescription *This,
         REFPROPVARIANT propvar);
 
     END_INTERFACE
 } IPropertyDescriptionVtbl;
+
 interface IPropertyDescription {
     CONST_VTBL IPropertyDescriptionVtbl* lpVtbl;
 };
@@ -2325,157 +2112,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetPropertyKey_Proxy(
-    IPropertyDescription* This,
-    PROPERTYKEY *pkey);
-void __RPC_STUB IPropertyDescription_GetPropertyKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetCanonicalName_Proxy(
-    IPropertyDescription* This,
-    LPWSTR *ppszName);
-void __RPC_STUB IPropertyDescription_GetCanonicalName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetPropertyType_Proxy(
-    IPropertyDescription* This,
-    VARTYPE *pvartype);
-void __RPC_STUB IPropertyDescription_GetPropertyType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetDisplayName_Proxy(
-    IPropertyDescription* This,
-    LPWSTR *ppszName);
-void __RPC_STUB IPropertyDescription_GetDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetEditInvitation_Proxy(
-    IPropertyDescription* This,
-    LPWSTR *ppszInvite);
-void __RPC_STUB IPropertyDescription_GetEditInvitation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetTypeFlags_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_TYPE_FLAGS mask,
-    PROPDESC_TYPE_FLAGS *ppdtFlags);
-void __RPC_STUB IPropertyDescription_GetTypeFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetViewFlags_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_VIEW_FLAGS *ppdvFlags);
-void __RPC_STUB IPropertyDescription_GetViewFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetDefaultColumnWidth_Proxy(
-    IPropertyDescription* This,
-    UINT *pcxChars);
-void __RPC_STUB IPropertyDescription_GetDefaultColumnWidth_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetDisplayType_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_DISPLAYTYPE *pdisplaytype);
-void __RPC_STUB IPropertyDescription_GetDisplayType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetColumnState_Proxy(
-    IPropertyDescription* This,
-    SHCOLSTATEF *pcsFlags);
-void __RPC_STUB IPropertyDescription_GetColumnState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetGroupingRange_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_GROUPING_RANGE *pgr);
-void __RPC_STUB IPropertyDescription_GetGroupingRange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetRelativeDescriptionType_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
-void __RPC_STUB IPropertyDescription_GetRelativeDescriptionType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetRelativeDescription_Proxy(
-    IPropertyDescription* This,
-    REFPROPVARIANT propvar1,
-    REFPROPVARIANT propvar2,
-    LPWSTR *ppszDesc1,
-    LPWSTR *ppszDesc2);
-void __RPC_STUB IPropertyDescription_GetRelativeDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetSortDescription_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_SORTDESCRIPTION *psd);
-void __RPC_STUB IPropertyDescription_GetSortDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetSortDescriptionLabel_Proxy(
-    IPropertyDescription* This,
-    WINBOOL fDescending,
-    LPWSTR *ppszDescription);
-void __RPC_STUB IPropertyDescription_GetSortDescriptionLabel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetAggregationType_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_AGGREGATION_TYPE *paggtype);
-void __RPC_STUB IPropertyDescription_GetAggregationType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetConditionType_Proxy(
-    IPropertyDescription* This,
-    PROPDESC_CONDITION_TYPE *pcontype,
-    CONDITION_OPERATION *popDefault);
-void __RPC_STUB IPropertyDescription_GetConditionType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_GetEnumTypeList_Proxy(
-    IPropertyDescription* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyDescription_GetEnumTypeList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IPropertyDescription_RemoteCoerceToCanonicalValue_Proxy(
     IPropertyDescription* This,
     REFPROPVARIANT propvar,
@@ -2485,24 +2121,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_FormatForDisplay_Proxy(
-    IPropertyDescription* This,
-    REFPROPVARIANT propvar,
-    PROPDESC_FORMAT_FLAGS pdfFlags,
-    LPWSTR *ppszDisplay);
-void __RPC_STUB IPropertyDescription_FormatForDisplay_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescription_IsValueCanonical_Proxy(
-    IPropertyDescription* This,
-    REFPROPVARIANT propvar);
-void __RPC_STUB IPropertyDescription_IsValueCanonical_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IPropertyDescription_CoerceToCanonicalValue_Proxy(
     IPropertyDescription* This,
     PROPVARIANT *ppropvar);
@@ -2539,118 +2157,119 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyDescription2* This);
+        IPropertyDescription2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyDescription2* This);
+        IPropertyDescription2 *This);
 
     /*** IPropertyDescription methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyKey)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPERTYKEY *pkey);
 
     HRESULT (STDMETHODCALLTYPE *GetCanonicalName)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyType)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         VARTYPE *pvartype);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetEditInvitation)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         LPWSTR *ppszInvite);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeFlags)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_TYPE_FLAGS mask,
         PROPDESC_TYPE_FLAGS *ppdtFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetViewFlags)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_VIEW_FLAGS *ppdvFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         UINT *pcxChars);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayType)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_DISPLAYTYPE *pdisplaytype);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnState)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         SHCOLSTATEF *pcsFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupingRange)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_GROUPING_RANGE *pgr);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         REFPROPVARIANT propvar1,
         REFPROPVARIANT propvar2,
         LPWSTR *ppszDesc1,
         LPWSTR *ppszDesc2);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescription)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_SORTDESCRIPTION *psd);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         WINBOOL fDescending,
         LPWSTR *ppszDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetAggregationType)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_AGGREGATION_TYPE *paggtype);
 
     HRESULT (STDMETHODCALLTYPE *GetConditionType)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPDESC_CONDITION_TYPE *pcontype,
         CONDITION_OPERATION *popDefault);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplay)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         REFPROPVARIANT propvar,
         PROPDESC_FORMAT_FLAGS pdfFlags,
         LPWSTR *ppszDisplay);
 
     HRESULT (STDMETHODCALLTYPE *IsValueCanonical)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         REFPROPVARIANT propvar);
 
     /*** IPropertyDescription2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetImageReferenceForValue)(
-        IPropertyDescription2* This,
+        IPropertyDescription2 *This,
         REFPROPVARIANT propvar,
         LPWSTR *ppszImageRes);
 
     END_INTERFACE
 } IPropertyDescription2Vtbl;
+
 interface IPropertyDescription2 {
     CONST_VTBL IPropertyDescription2Vtbl* lpVtbl;
 };
@@ -2769,15 +2388,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyDescription2_GetImageReferenceForValue_Proxy(
-    IPropertyDescription2* This,
-    REFPROPVARIANT propvar,
-    LPWSTR *ppszImageRes);
-void __RPC_STUB IPropertyDescription2_GetImageReferenceForValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyDescription2_INTERFACE_DEFINED__ */
 
@@ -2811,123 +2421,124 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyDescriptionAliasInfo* This);
+        IPropertyDescriptionAliasInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyDescriptionAliasInfo* This);
+        IPropertyDescriptionAliasInfo *This);
 
     /*** IPropertyDescription methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyKey)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPERTYKEY *pkey);
 
     HRESULT (STDMETHODCALLTYPE *GetCanonicalName)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyType)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         VARTYPE *pvartype);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetEditInvitation)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         LPWSTR *ppszInvite);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeFlags)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_TYPE_FLAGS mask,
         PROPDESC_TYPE_FLAGS *ppdtFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetViewFlags)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_VIEW_FLAGS *ppdvFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         UINT *pcxChars);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayType)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_DISPLAYTYPE *pdisplaytype);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnState)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         SHCOLSTATEF *pcsFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupingRange)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_GROUPING_RANGE *pgr);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         REFPROPVARIANT propvar1,
         REFPROPVARIANT propvar2,
         LPWSTR *ppszDesc1,
         LPWSTR *ppszDesc2);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescription)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_SORTDESCRIPTION *psd);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         WINBOOL fDescending,
         LPWSTR *ppszDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetAggregationType)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_AGGREGATION_TYPE *paggtype);
 
     HRESULT (STDMETHODCALLTYPE *GetConditionType)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPDESC_CONDITION_TYPE *pcontype,
         CONDITION_OPERATION *popDefault);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplay)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         REFPROPVARIANT propvar,
         PROPDESC_FORMAT_FLAGS pdfFlags,
         LPWSTR *ppszDisplay);
 
     HRESULT (STDMETHODCALLTYPE *IsValueCanonical)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         REFPROPVARIANT propvar);
 
     /*** IPropertyDescriptionAliasInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSortByAlias)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetAdditionalSortByAliases)(
-        IPropertyDescriptionAliasInfo* This,
+        IPropertyDescriptionAliasInfo *This,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IPropertyDescriptionAliasInfoVtbl;
+
 interface IPropertyDescriptionAliasInfo {
     CONST_VTBL IPropertyDescriptionAliasInfoVtbl* lpVtbl;
 };
@@ -3050,24 +2661,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionAliasInfo_GetSortByAlias_Proxy(
-    IPropertyDescriptionAliasInfo* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyDescriptionAliasInfo_GetSortByAlias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionAliasInfo_GetAdditionalSortByAliases_Proxy(
-    IPropertyDescriptionAliasInfo* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyDescriptionAliasInfo_GetAdditionalSortByAliases_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyDescriptionAliasInfo_INTERFACE_DEFINED__ */
 
@@ -3125,129 +2718,130 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyDescriptionSearchInfo* This);
+        IPropertyDescriptionSearchInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyDescriptionSearchInfo* This);
+        IPropertyDescriptionSearchInfo *This);
 
     /*** IPropertyDescription methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyKey)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPERTYKEY *pkey);
 
     HRESULT (STDMETHODCALLTYPE *GetCanonicalName)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyType)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         VARTYPE *pvartype);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetEditInvitation)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         LPWSTR *ppszInvite);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeFlags)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_TYPE_FLAGS mask,
         PROPDESC_TYPE_FLAGS *ppdtFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetViewFlags)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_VIEW_FLAGS *ppdvFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         UINT *pcxChars);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayType)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_DISPLAYTYPE *pdisplaytype);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnState)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         SHCOLSTATEF *pcsFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupingRange)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_GROUPING_RANGE *pgr);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         REFPROPVARIANT propvar1,
         REFPROPVARIANT propvar2,
         LPWSTR *ppszDesc1,
         LPWSTR *ppszDesc2);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescription)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_SORTDESCRIPTION *psd);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         WINBOOL fDescending,
         LPWSTR *ppszDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetAggregationType)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_AGGREGATION_TYPE *paggtype);
 
     HRESULT (STDMETHODCALLTYPE *GetConditionType)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_CONDITION_TYPE *pcontype,
         CONDITION_OPERATION *popDefault);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplay)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         REFPROPVARIANT propvar,
         PROPDESC_FORMAT_FLAGS pdfFlags,
         LPWSTR *ppszDisplay);
 
     HRESULT (STDMETHODCALLTYPE *IsValueCanonical)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         REFPROPVARIANT propvar);
 
     /*** IPropertyDescriptionSearchInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSearchInfoFlags)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_SEARCHINFO_FLAGS *ppdsiFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnIndexType)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         PROPDESC_COLUMNINDEX_TYPE *ppdciType);
 
     HRESULT (STDMETHODCALLTYPE *GetProjectionString)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         LPWSTR *ppszProjection);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxSize)(
-        IPropertyDescriptionSearchInfo* This,
+        IPropertyDescriptionSearchInfo *This,
         UINT *pcbMaxSize);
 
     END_INTERFACE
 } IPropertyDescriptionSearchInfoVtbl;
+
 interface IPropertyDescriptionSearchInfo {
     CONST_VTBL IPropertyDescriptionSearchInfoVtbl* lpVtbl;
 };
@@ -3378,38 +2972,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetSearchInfoFlags_Proxy(
-    IPropertyDescriptionSearchInfo* This,
-    PROPDESC_SEARCHINFO_FLAGS *ppdsiFlags);
-void __RPC_STUB IPropertyDescriptionSearchInfo_GetSearchInfoFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetColumnIndexType_Proxy(
-    IPropertyDescriptionSearchInfo* This,
-    PROPDESC_COLUMNINDEX_TYPE *ppdciType);
-void __RPC_STUB IPropertyDescriptionSearchInfo_GetColumnIndexType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetProjectionString_Proxy(
-    IPropertyDescriptionSearchInfo* This,
-    LPWSTR *ppszProjection);
-void __RPC_STUB IPropertyDescriptionSearchInfo_GetProjectionString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionSearchInfo_GetMaxSize_Proxy(
-    IPropertyDescriptionSearchInfo* This,
-    UINT *pcbMaxSize);
-void __RPC_STUB IPropertyDescriptionSearchInfo_GetMaxSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyDescriptionSearchInfo_INTERFACE_DEFINED__ */
 
@@ -3440,119 +3002,120 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyDescriptionRelatedPropertyInfo* This);
+        IPropertyDescriptionRelatedPropertyInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyDescriptionRelatedPropertyInfo* This);
+        IPropertyDescriptionRelatedPropertyInfo *This);
 
     /*** IPropertyDescription methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyKey)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPERTYKEY *pkey);
 
     HRESULT (STDMETHODCALLTYPE *GetCanonicalName)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyType)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         VARTYPE *pvartype);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetEditInvitation)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         LPWSTR *ppszInvite);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeFlags)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_TYPE_FLAGS mask,
         PROPDESC_TYPE_FLAGS *ppdtFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetViewFlags)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_VIEW_FLAGS *ppdvFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColumnWidth)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         UINT *pcxChars);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayType)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_DISPLAYTYPE *pdisplaytype);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnState)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         SHCOLSTATEF *pcsFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupingRange)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_GROUPING_RANGE *pgr);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescriptionType)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_RELATIVEDESCRIPTION_TYPE *prdt);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeDescription)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         REFPROPVARIANT propvar1,
         REFPROPVARIANT propvar2,
         LPWSTR *ppszDesc1,
         LPWSTR *ppszDesc2);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescription)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_SORTDESCRIPTION *psd);
 
     HRESULT (STDMETHODCALLTYPE *GetSortDescriptionLabel)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         WINBOOL fDescending,
         LPWSTR *ppszDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetAggregationType)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_AGGREGATION_TYPE *paggtype);
 
     HRESULT (STDMETHODCALLTYPE *GetConditionType)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPDESC_CONDITION_TYPE *pcontype,
         CONDITION_OPERATION *popDefault);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumTypeList)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CoerceToCanonicalValue)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplay)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         REFPROPVARIANT propvar,
         PROPDESC_FORMAT_FLAGS pdfFlags,
         LPWSTR *ppszDisplay);
 
     HRESULT (STDMETHODCALLTYPE *IsValueCanonical)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         REFPROPVARIANT propvar);
 
     /*** IPropertyDescriptionRelatedPropertyInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRelatedProperty)(
-        IPropertyDescriptionRelatedPropertyInfo* This,
+        IPropertyDescriptionRelatedPropertyInfo *This,
         LPCWSTR pszRelationshipName,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IPropertyDescriptionRelatedPropertyInfoVtbl;
+
 interface IPropertyDescriptionRelatedPropertyInfo {
     CONST_VTBL IPropertyDescriptionRelatedPropertyInfoVtbl* lpVtbl;
 };
@@ -3671,16 +3234,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionRelatedPropertyInfo_GetRelatedProperty_Proxy(
-    IPropertyDescriptionRelatedPropertyInfo* This,
-    LPCWSTR pszRelationshipName,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyDescriptionRelatedPropertyInfo_GetRelatedProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyDescriptionRelatedPropertyInfo_INTERFACE_DEFINED__ */
 
@@ -3758,43 +3311,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertySystem* This);
+        IPropertySystem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertySystem* This);
+        IPropertySystem *This);
 
     /*** IPropertySystem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyDescription)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         REFPROPERTYKEY propkey,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionByName)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         LPCWSTR pszCanonicalName,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionListFromString)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         LPCWSTR pszPropList,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *EnumeratePropertyDescriptions)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         PROPDESC_ENUMFILTER filterOn,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplay)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         REFPROPERTYKEY key,
         REFPROPVARIANT propvar,
         PROPDESC_FORMAT_FLAGS pdff,
@@ -3802,25 +3355,26 @@
         DWORD cchText);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplayAlloc)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         REFPROPERTYKEY key,
         REFPROPVARIANT propvar,
         PROPDESC_FORMAT_FLAGS pdff,
         LPWSTR *ppszDisplay);
 
     HRESULT (STDMETHODCALLTYPE *RegisterPropertySchema)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         LPCWSTR pszPath);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterPropertySchema)(
-        IPropertySystem* This,
+        IPropertySystem *This,
         LPCWSTR pszPath);
 
     HRESULT (STDMETHODCALLTYPE *RefreshPropertySchema)(
-        IPropertySystem* This);
+        IPropertySystem *This);
 
     END_INTERFACE
 } IPropertySystemVtbl;
+
 interface IPropertySystem {
     CONST_VTBL IPropertySystemVtbl* lpVtbl;
 };
@@ -3885,92 +3439,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertySystem_GetPropertyDescription_Proxy(
-    IPropertySystem* This,
-    REFPROPERTYKEY propkey,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertySystem_GetPropertyDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_GetPropertyDescriptionByName_Proxy(
-    IPropertySystem* This,
-    LPCWSTR pszCanonicalName,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertySystem_GetPropertyDescriptionByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_GetPropertyDescriptionListFromString_Proxy(
-    IPropertySystem* This,
-    LPCWSTR pszPropList,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertySystem_GetPropertyDescriptionListFromString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_EnumeratePropertyDescriptions_Proxy(
-    IPropertySystem* This,
-    PROPDESC_ENUMFILTER filterOn,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertySystem_EnumeratePropertyDescriptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_FormatForDisplay_Proxy(
-    IPropertySystem* This,
-    REFPROPERTYKEY key,
-    REFPROPVARIANT propvar,
-    PROPDESC_FORMAT_FLAGS pdff,
-    LPWSTR pszText,
-    DWORD cchText);
-void __RPC_STUB IPropertySystem_FormatForDisplay_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_FormatForDisplayAlloc_Proxy(
-    IPropertySystem* This,
-    REFPROPERTYKEY key,
-    REFPROPVARIANT propvar,
-    PROPDESC_FORMAT_FLAGS pdff,
-    LPWSTR *ppszDisplay);
-void __RPC_STUB IPropertySystem_FormatForDisplayAlloc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_RegisterPropertySchema_Proxy(
-    IPropertySystem* This,
-    LPCWSTR pszPath);
-void __RPC_STUB IPropertySystem_RegisterPropertySchema_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_UnregisterPropertySchema_Proxy(
-    IPropertySystem* This,
-    LPCWSTR pszPath);
-void __RPC_STUB IPropertySystem_UnregisterPropertySchema_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertySystem_RefreshPropertySchema_Proxy(
-    IPropertySystem* This);
-void __RPC_STUB IPropertySystem_RefreshPropertySchema_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertySystem_INTERFACE_DEFINED__ */
 
@@ -4004,29 +3472,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyDescriptionList* This,
+        IPropertyDescriptionList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyDescriptionList* This);
+        IPropertyDescriptionList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyDescriptionList* This);
+        IPropertyDescriptionList *This);
 
     /*** IPropertyDescriptionList methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IPropertyDescriptionList* This,
+        IPropertyDescriptionList *This,
         UINT *pcElem);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IPropertyDescriptionList* This,
+        IPropertyDescriptionList *This,
         UINT iElem,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IPropertyDescriptionListVtbl;
+
 interface IPropertyDescriptionList {
     CONST_VTBL IPropertyDescriptionListVtbl* lpVtbl;
 };
@@ -4063,24 +3532,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionList_GetCount_Proxy(
-    IPropertyDescriptionList* This,
-    UINT *pcElem);
-void __RPC_STUB IPropertyDescriptionList_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyDescriptionList_GetAt_Proxy(
-    IPropertyDescriptionList* This,
-    UINT iElem,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyDescriptionList_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyDescriptionList_INTERFACE_DEFINED__ */
 
@@ -4119,26 +3570,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyStoreFactory* This,
+        IPropertyStoreFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyStoreFactory* This);
+        IPropertyStoreFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyStoreFactory* This);
+        IPropertyStoreFactory *This);
 
     /*** IPropertyStoreFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyStore)(
-        IPropertyStoreFactory* This,
+        IPropertyStoreFactory *This,
         GETPROPERTYSTOREFLAGS flags,
         IUnknown *pUnkFactory,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStoreForKeys)(
-        IPropertyStoreFactory* This,
+        IPropertyStoreFactory *This,
         const PROPERTYKEY *rgKeys,
         UINT cKeys,
         GETPROPERTYSTOREFLAGS flags,
@@ -4147,6 +3598,7 @@
 
     END_INTERFACE
 } IPropertyStoreFactoryVtbl;
+
 interface IPropertyStoreFactory {
     CONST_VTBL IPropertyStoreFactoryVtbl* lpVtbl;
 };
@@ -4183,29 +3635,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyStoreFactory_GetPropertyStore_Proxy(
-    IPropertyStoreFactory* This,
-    GETPROPERTYSTOREFLAGS flags,
-    IUnknown *pUnkFactory,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyStoreFactory_GetPropertyStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyStoreFactory_GetPropertyStoreForKeys_Proxy(
-    IPropertyStoreFactory* This,
-    const PROPERTYKEY *rgKeys,
-    UINT cKeys,
-    GETPROPERTYSTOREFLAGS flags,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IPropertyStoreFactory_GetPropertyStoreForKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyStoreFactory_INTERFACE_DEFINED__ */
 
@@ -4237,26 +3666,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDelayedPropertyStoreFactory* This,
+        IDelayedPropertyStoreFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDelayedPropertyStoreFactory* This);
+        IDelayedPropertyStoreFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDelayedPropertyStoreFactory* This);
+        IDelayedPropertyStoreFactory *This);
 
     /*** IPropertyStoreFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyStore)(
-        IDelayedPropertyStoreFactory* This,
+        IDelayedPropertyStoreFactory *This,
         GETPROPERTYSTOREFLAGS flags,
         IUnknown *pUnkFactory,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStoreForKeys)(
-        IDelayedPropertyStoreFactory* This,
+        IDelayedPropertyStoreFactory *This,
         const PROPERTYKEY *rgKeys,
         UINT cKeys,
         GETPROPERTYSTOREFLAGS flags,
@@ -4265,7 +3694,7 @@
 
     /*** IDelayedPropertyStoreFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDelayedPropertyStore)(
-        IDelayedPropertyStoreFactory* This,
+        IDelayedPropertyStoreFactory *This,
         GETPROPERTYSTOREFLAGS flags,
         DWORD dwStoreId,
         REFIID riid,
@@ -4273,6 +3702,7 @@
 
     END_INTERFACE
 } IDelayedPropertyStoreFactoryVtbl;
+
 interface IDelayedPropertyStoreFactory {
     CONST_VTBL IDelayedPropertyStoreFactoryVtbl* lpVtbl;
 };
@@ -4315,17 +3745,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDelayedPropertyStoreFactory_GetDelayedPropertyStore_Proxy(
-    IDelayedPropertyStoreFactory* This,
-    GETPROPERTYSTOREFLAGS flags,
-    DWORD dwStoreId,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IDelayedPropertyStoreFactory_GetDelayedPropertyStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDelayedPropertyStoreFactory_INTERFACE_DEFINED__ */
 
@@ -4336,7 +3755,6 @@
     FPSPS_TREAT_NEW_VALUES_AS_DIRTY = 0x2
 };
 
-
 typedef int PERSIST_SPROPSTORE_FLAGS;
 typedef struct tagSERIALIZEDPROPSTORAGE SERIALIZEDPROPSTORAGE;
 typedef SERIALIZEDPROPSTORAGE *PUSERIALIZEDPROPSTORAGE;
@@ -4374,33 +3792,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistSerializedPropStorage* This,
+        IPersistSerializedPropStorage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistSerializedPropStorage* This);
+        IPersistSerializedPropStorage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistSerializedPropStorage* This);
+        IPersistSerializedPropStorage *This);
 
     /*** IPersistSerializedPropStorage methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IPersistSerializedPropStorage* This,
+        IPersistSerializedPropStorage *This,
         PERSIST_SPROPSTORE_FLAGS flags);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyStorage)(
-        IPersistSerializedPropStorage* This,
+        IPersistSerializedPropStorage *This,
         PCUSERIALIZEDPROPSTORAGE psps,
         DWORD cb);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStorage)(
-        IPersistSerializedPropStorage* This,
+        IPersistSerializedPropStorage *This,
         SERIALIZEDPROPSTORAGE **ppsps,
         DWORD *pcb);
 
     END_INTERFACE
 } IPersistSerializedPropStorageVtbl;
+
 interface IPersistSerializedPropStorage {
     CONST_VTBL IPersistSerializedPropStorageVtbl* lpVtbl;
 };
@@ -4441,32 +3860,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage_SetFlags_Proxy(
-    IPersistSerializedPropStorage* This,
-    PERSIST_SPROPSTORE_FLAGS flags);
-void __RPC_STUB IPersistSerializedPropStorage_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage_SetPropertyStorage_Proxy(
-    IPersistSerializedPropStorage* This,
-    PCUSERIALIZEDPROPSTORAGE psps,
-    DWORD cb);
-void __RPC_STUB IPersistSerializedPropStorage_SetPropertyStorage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage_GetPropertyStorage_Proxy(
-    IPersistSerializedPropStorage* This,
-    SERIALIZEDPROPSTORAGE **ppsps,
-    DWORD *pcb);
-void __RPC_STUB IPersistSerializedPropStorage_GetPropertyStorage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistSerializedPropStorage_INTERFACE_DEFINED__ */
 
@@ -4500,44 +3893,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistSerializedPropStorage2* This,
+        IPersistSerializedPropStorage2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistSerializedPropStorage2* This);
+        IPersistSerializedPropStorage2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistSerializedPropStorage2* This);
+        IPersistSerializedPropStorage2 *This);
 
     /*** IPersistSerializedPropStorage methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IPersistSerializedPropStorage2* This,
+        IPersistSerializedPropStorage2 *This,
         PERSIST_SPROPSTORE_FLAGS flags);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyStorage)(
-        IPersistSerializedPropStorage2* This,
+        IPersistSerializedPropStorage2 *This,
         PCUSERIALIZEDPROPSTORAGE psps,
         DWORD cb);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStorage)(
-        IPersistSerializedPropStorage2* This,
+        IPersistSerializedPropStorage2 *This,
         SERIALIZEDPROPSTORAGE **ppsps,
         DWORD *pcb);
 
     /*** IPersistSerializedPropStorage2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyStorageSize)(
-        IPersistSerializedPropStorage2* This,
+        IPersistSerializedPropStorage2 *This,
         DWORD *pcb);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStorageBuffer)(
-        IPersistSerializedPropStorage2* This,
+        IPersistSerializedPropStorage2 *This,
         SERIALIZEDPROPSTORAGE *psps,
         DWORD cb,
         DWORD *pcbWritten);
 
     END_INTERFACE
 } IPersistSerializedPropStorage2Vtbl;
+
 interface IPersistSerializedPropStorage2 {
     CONST_VTBL IPersistSerializedPropStorage2Vtbl* lpVtbl;
 };
@@ -4588,24 +3982,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage2_GetPropertyStorageSize_Proxy(
-    IPersistSerializedPropStorage2* This,
-    DWORD *pcb);
-void __RPC_STUB IPersistSerializedPropStorage2_GetPropertyStorageSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistSerializedPropStorage2_GetPropertyStorageBuffer_Proxy(
-    IPersistSerializedPropStorage2* This,
-    SERIALIZEDPROPSTORAGE *psps,
-    DWORD cb,
-    DWORD *pcbWritten);
-void __RPC_STUB IPersistSerializedPropStorage2_GetPropertyStorageBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistSerializedPropStorage2_INTERFACE_DEFINED__ */
 
@@ -4634,22 +4010,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertySystemChangeNotify* This,
+        IPropertySystemChangeNotify *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertySystemChangeNotify* This);
+        IPropertySystemChangeNotify *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertySystemChangeNotify* This);
+        IPropertySystemChangeNotify *This);
 
     /*** IPropertySystemChangeNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *SchemaRefreshed)(
-        IPropertySystemChangeNotify* This);
+        IPropertySystemChangeNotify *This);
 
     END_INTERFACE
 } IPropertySystemChangeNotifyVtbl;
+
 interface IPropertySystemChangeNotify {
     CONST_VTBL IPropertySystemChangeNotifyVtbl* lpVtbl;
 };
@@ -4682,13 +4059,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertySystemChangeNotify_SchemaRefreshed_Proxy(
-    IPropertySystemChangeNotify* This);
-void __RPC_STUB IPropertySystemChangeNotify_SchemaRefreshed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertySystemChangeNotify_INTERFACE_DEFINED__ */
 
@@ -4720,19 +4090,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreateObject* This,
+        ICreateObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreateObject* This);
+        ICreateObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreateObject* This);
+        ICreateObject *This);
 
     /*** ICreateObject methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateObject)(
-        ICreateObject* This,
+        ICreateObject *This,
         REFCLSID clsid,
         IUnknown *pUnkOuter,
         REFIID riid,
@@ -4740,6 +4110,7 @@
 
     END_INTERFACE
 } ICreateObjectVtbl;
+
 interface ICreateObject {
     CONST_VTBL ICreateObjectVtbl* lpVtbl;
 };
@@ -4772,17 +4143,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreateObject_CreateObject_Proxy(
-    ICreateObject* This,
-    REFCLSID clsid,
-    IUnknown *pUnkOuter,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ICreateObject_CreateObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreateObject_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/regbag.h b/mingw-w64-headers/include/regbag.h
index de32006..5b63491 100644
--- a/mingw-w64-headers/include/regbag.h
+++ b/mingw-w64-headers/include/regbag.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/regbag.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/regbag.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __ICreatePropBagOnRegKey_FWD_DEFINED__
 #define __ICreatePropBagOnRegKey_FWD_DEFINED__
 typedef interface ICreatePropBagOnRegKey ICreatePropBagOnRegKey;
+#ifdef __cplusplus
+interface ICreatePropBagOnRegKey;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -64,19 +67,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreatePropBagOnRegKey* This,
+        ICreatePropBagOnRegKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreatePropBagOnRegKey* This);
+        ICreatePropBagOnRegKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreatePropBagOnRegKey* This);
+        ICreatePropBagOnRegKey *This);
 
     /*** ICreatePropBagOnRegKey methods ***/
     HRESULT (STDMETHODCALLTYPE *Create)(
-        ICreatePropBagOnRegKey* This,
+        ICreatePropBagOnRegKey *This,
         HKEY hkey,
         LPCOLESTR subkey,
         DWORD ulOptions,
@@ -86,6 +89,7 @@
 
     END_INTERFACE
 } ICreatePropBagOnRegKeyVtbl;
+
 interface ICreatePropBagOnRegKey {
     CONST_VTBL ICreatePropBagOnRegKeyVtbl* lpVtbl;
 };
@@ -118,19 +122,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreatePropBagOnRegKey_Create_Proxy(
-    ICreatePropBagOnRegKey* This,
-    HKEY hkey,
-    LPCOLESTR subkey,
-    DWORD ulOptions,
-    DWORD samDesired,
-    REFIID iid,
-    LPVOID *ppBag);
-void __RPC_STUB ICreatePropBagOnRegKey_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreatePropBagOnRegKey_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/sapi51.h b/mingw-w64-headers/include/sapi51.h
index e3ffbff..698ea43 100644
--- a/mingw-w64-headers/include/sapi51.h
+++ b/mingw-w64-headers/include/sapi51.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/sapi51.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/sapi51.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,396 +20,633 @@
 #ifndef __ISpNotifySource_FWD_DEFINED__
 #define __ISpNotifySource_FWD_DEFINED__
 typedef interface ISpNotifySource ISpNotifySource;
+#ifdef __cplusplus
+interface ISpNotifySource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifySink_FWD_DEFINED__
 #define __ISpNotifySink_FWD_DEFINED__
 typedef interface ISpNotifySink ISpNotifySink;
+#ifdef __cplusplus
+interface ISpNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifyTranslator_FWD_DEFINED__
 #define __ISpNotifyTranslator_FWD_DEFINED__
 typedef interface ISpNotifyTranslator ISpNotifyTranslator;
+#ifdef __cplusplus
+interface ISpNotifyTranslator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDataKey_FWD_DEFINED__
 #define __ISpDataKey_FWD_DEFINED__
 typedef interface ISpDataKey ISpDataKey;
+#ifdef __cplusplus
+interface ISpDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectWithToken_FWD_DEFINED__
 #define __ISpObjectWithToken_FWD_DEFINED__
 typedef interface ISpObjectWithToken ISpObjectWithToken;
+#ifdef __cplusplus
+interface ISpObjectWithToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSpObjectTokens_FWD_DEFINED__
 #define __IEnumSpObjectTokens_FWD_DEFINED__
 typedef interface IEnumSpObjectTokens IEnumSpObjectTokens;
+#ifdef __cplusplus
+interface IEnumSpObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRegDataKey_FWD_DEFINED__
 #define __ISpRegDataKey_FWD_DEFINED__
 typedef interface ISpRegDataKey ISpRegDataKey;
+#ifdef __cplusplus
+interface ISpRegDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenCategory_FWD_DEFINED__
 #define __ISpObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpObjectTokenCategory ISpObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectToken_FWD_DEFINED__
 #define __ISpObjectToken_FWD_DEFINED__
 typedef interface ISpObjectToken ISpObjectToken;
+#ifdef __cplusplus
+interface ISpObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenInit_FWD_DEFINED__
 #define __ISpObjectTokenInit_FWD_DEFINED__
 typedef interface ISpObjectTokenInit ISpObjectTokenInit;
+#ifdef __cplusplus
+interface ISpObjectTokenInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpResourceManager_FWD_DEFINED__
 #define __ISpResourceManager_FWD_DEFINED__
 typedef interface ISpResourceManager ISpResourceManager;
+#ifdef __cplusplus
+interface ISpResourceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource_FWD_DEFINED__
 #define __ISpEventSource_FWD_DEFINED__
 typedef interface ISpEventSource ISpEventSource;
+#ifdef __cplusplus
+interface ISpEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSink_FWD_DEFINED__
 #define __ISpEventSink_FWD_DEFINED__
 typedef interface ISpEventSink ISpEventSink;
+#ifdef __cplusplus
+interface ISpEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormat_FWD_DEFINED__
 #define __ISpStreamFormat_FWD_DEFINED__
 typedef interface ISpStreamFormat ISpStreamFormat;
+#ifdef __cplusplus
+interface ISpStreamFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStream_FWD_DEFINED__
 #define __ISpStream_FWD_DEFINED__
 typedef interface ISpStream ISpStream;
+#ifdef __cplusplus
+interface ISpStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormatConverter_FWD_DEFINED__
 #define __ISpStreamFormatConverter_FWD_DEFINED__
 typedef interface ISpStreamFormatConverter ISpStreamFormatConverter;
+#ifdef __cplusplus
+interface ISpStreamFormatConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpAudio_FWD_DEFINED__
 #define __ISpAudio_FWD_DEFINED__
 typedef interface ISpAudio ISpAudio;
+#ifdef __cplusplus
+interface ISpAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpMMSysAudio_FWD_DEFINED__
 #define __ISpMMSysAudio_FWD_DEFINED__
 typedef interface ISpMMSysAudio ISpMMSysAudio;
+#ifdef __cplusplus
+interface ISpMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpTranscript_FWD_DEFINED__
 #define __ISpTranscript_FWD_DEFINED__
 typedef interface ISpTranscript ISpTranscript;
+#ifdef __cplusplus
+interface ISpTranscript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpLexicon_FWD_DEFINED__
 #define __ISpLexicon_FWD_DEFINED__
 typedef interface ISpLexicon ISpLexicon;
+#ifdef __cplusplus
+interface ISpLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpContainerLexicon_FWD_DEFINED__
 #define __ISpContainerLexicon_FWD_DEFINED__
 typedef interface ISpContainerLexicon ISpContainerLexicon;
+#ifdef __cplusplus
+interface ISpContainerLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneConverter_FWD_DEFINED__
 #define __ISpPhoneConverter_FWD_DEFINED__
 typedef interface ISpPhoneConverter ISpPhoneConverter;
+#ifdef __cplusplus
+interface ISpPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpVoice_FWD_DEFINED__
 #define __ISpVoice_FWD_DEFINED__
 typedef interface ISpVoice ISpVoice;
+#ifdef __cplusplus
+interface ISpVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase_FWD_DEFINED__
 #define __ISpPhrase_FWD_DEFINED__
 typedef interface ISpPhrase ISpPhrase;
+#ifdef __cplusplus
+interface ISpPhrase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhraseAlt_FWD_DEFINED__
 #define __ISpPhraseAlt_FWD_DEFINED__
 typedef interface ISpPhraseAlt ISpPhraseAlt;
+#ifdef __cplusplus
+interface ISpPhraseAlt;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult_FWD_DEFINED__
 #define __ISpRecoResult_FWD_DEFINED__
 typedef interface ISpRecoResult ISpRecoResult;
+#ifdef __cplusplus
+interface ISpRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpGrammarBuilder_FWD_DEFINED__
 #define __ISpGrammarBuilder_FWD_DEFINED__
 typedef interface ISpGrammarBuilder ISpGrammarBuilder;
+#ifdef __cplusplus
+interface ISpGrammarBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar_FWD_DEFINED__
 #define __ISpRecoGrammar_FWD_DEFINED__
 typedef interface ISpRecoGrammar ISpRecoGrammar;
+#ifdef __cplusplus
+interface ISpRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext_FWD_DEFINED__
 #define __ISpRecoContext_FWD_DEFINED__
 typedef interface ISpRecoContext ISpRecoContext;
+#ifdef __cplusplus
+interface ISpRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpProperties_FWD_DEFINED__
 #define __ISpProperties_FWD_DEFINED__
 typedef interface ISpProperties ISpProperties;
+#ifdef __cplusplus
+interface ISpProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer_FWD_DEFINED__
 #define __ISpRecognizer_FWD_DEFINED__
 typedef interface ISpRecognizer ISpRecognizer;
+#ifdef __cplusplus
+interface ISpRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechDataKey_FWD_DEFINED__
 #define __ISpeechDataKey_FWD_DEFINED__
 typedef interface ISpeechDataKey ISpeechDataKey;
+#ifdef __cplusplus
+interface ISpeechDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectToken_FWD_DEFINED__
 #define __ISpeechObjectToken_FWD_DEFINED__
 typedef interface ISpeechObjectToken ISpeechObjectToken;
+#ifdef __cplusplus
+interface ISpeechObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokens_FWD_DEFINED__
 #define __ISpeechObjectTokens_FWD_DEFINED__
 typedef interface ISpeechObjectTokens ISpeechObjectTokens;
+#ifdef __cplusplus
+interface ISpeechObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__
 #define __ISpeechObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpeechObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioFormat_FWD_DEFINED__
 #define __ISpeechAudioFormat_FWD_DEFINED__
 typedef interface ISpeechAudioFormat ISpeechAudioFormat;
+#ifdef __cplusplus
+interface ISpeechAudioFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechBaseStream_FWD_DEFINED__
 #define __ISpeechBaseStream_FWD_DEFINED__
 typedef interface ISpeechBaseStream ISpeechBaseStream;
+#ifdef __cplusplus
+interface ISpeechBaseStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudio_FWD_DEFINED__
 #define __ISpeechAudio_FWD_DEFINED__
 typedef interface ISpeechAudio ISpeechAudio;
+#ifdef __cplusplus
+interface ISpeechAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMMSysAudio_FWD_DEFINED__
 #define __ISpeechMMSysAudio_FWD_DEFINED__
 typedef interface ISpeechMMSysAudio ISpeechMMSysAudio;
+#ifdef __cplusplus
+interface ISpeechMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechFileStream_FWD_DEFINED__
 #define __ISpeechFileStream_FWD_DEFINED__
 typedef interface ISpeechFileStream ISpeechFileStream;
+#ifdef __cplusplus
+interface ISpeechFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechCustomStream_FWD_DEFINED__
 #define __ISpeechCustomStream_FWD_DEFINED__
 typedef interface ISpeechCustomStream ISpeechCustomStream;
+#ifdef __cplusplus
+interface ISpeechCustomStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMemoryStream_FWD_DEFINED__
 #define __ISpeechMemoryStream_FWD_DEFINED__
 typedef interface ISpeechMemoryStream ISpeechMemoryStream;
+#ifdef __cplusplus
+interface ISpeechMemoryStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioStatus_FWD_DEFINED__
 #define __ISpeechAudioStatus_FWD_DEFINED__
 typedef interface ISpeechAudioStatus ISpeechAudioStatus;
+#ifdef __cplusplus
+interface ISpeechAudioStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__
 #define __ISpeechAudioBufferInfo_FWD_DEFINED__
 typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo;
+#ifdef __cplusplus
+interface ISpeechAudioBufferInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__
 #define __ISpeechWaveFormatEx_FWD_DEFINED__
 typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx;
+#ifdef __cplusplus
+interface ISpeechWaveFormatEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoice_FWD_DEFINED__
 #define __ISpeechVoice_FWD_DEFINED__
 typedef interface ISpeechVoice ISpeechVoice;
+#ifdef __cplusplus
+interface ISpeechVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoiceStatus_FWD_DEFINED__
 #define __ISpeechVoiceStatus_FWD_DEFINED__
 typedef interface ISpeechVoiceStatus ISpeechVoiceStatus;
+#ifdef __cplusplus
+interface ISpeechVoiceStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__
 #define ___ISpeechVoiceEvents_FWD_DEFINED__
 typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents;
+#ifdef __cplusplus
+interface _ISpeechVoiceEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizer_FWD_DEFINED__
 #define __ISpeechRecognizer_FWD_DEFINED__
 typedef interface ISpeechRecognizer ISpeechRecognizer;
+#ifdef __cplusplus
+interface ISpeechRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__
 #define __ISpeechRecognizerStatus_FWD_DEFINED__
 typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus;
+#ifdef __cplusplus
+interface ISpeechRecognizerStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoContext_FWD_DEFINED__
 #define __ISpeechRecoContext_FWD_DEFINED__
 typedef interface ISpeechRecoContext ISpeechRecoContext;
+#ifdef __cplusplus
+interface ISpeechRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoGrammar_FWD_DEFINED__
 #define __ISpeechRecoGrammar_FWD_DEFINED__
 typedef interface ISpeechRecoGrammar ISpeechRecoGrammar;
+#ifdef __cplusplus
+interface ISpeechRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__
 #define ___ISpeechRecoContextEvents_FWD_DEFINED__
 typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents;
+#ifdef __cplusplus
+interface _ISpeechRecoContextEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRule_FWD_DEFINED__
 #define __ISpeechGrammarRule_FWD_DEFINED__
 typedef interface ISpeechGrammarRule ISpeechGrammarRule;
+#ifdef __cplusplus
+interface ISpeechGrammarRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRules_FWD_DEFINED__
 #define __ISpeechGrammarRules_FWD_DEFINED__
 typedef interface ISpeechGrammarRules ISpeechGrammarRules;
+#ifdef __cplusplus
+interface ISpeechGrammarRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__
 #define __ISpeechGrammarRuleState_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransitions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__
 #define __ISpeechTextSelectionInformation_FWD_DEFINED__
 typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation;
+#ifdef __cplusplus
+interface ISpeechTextSelectionInformation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult_FWD_DEFINED__
 #define __ISpeechRecoResult_FWD_DEFINED__
 typedef interface ISpeechRecoResult ISpeechRecoResult;
+#ifdef __cplusplus
+interface ISpeechRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfoBuilder_FWD_DEFINED__
 #define __ISpeechPhraseInfoBuilder_FWD_DEFINED__
 typedef interface ISpeechPhraseInfoBuilder ISpeechPhraseInfoBuilder;
+#ifdef __cplusplus
+interface ISpeechPhraseInfoBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__
 #define __ISpeechRecoResultTimes_FWD_DEFINED__
 typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes;
+#ifdef __cplusplus
+interface ISpeechRecoResultTimes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__
 #define __ISpeechPhraseAlternate_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__
 #define __ISpeechPhraseAlternates_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfo_FWD_DEFINED__
 #define __ISpeechPhraseInfo_FWD_DEFINED__
 typedef interface ISpeechPhraseInfo ISpeechPhraseInfo;
+#ifdef __cplusplus
+interface ISpeechPhraseInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElement_FWD_DEFINED__
 #define __ISpeechPhraseElement_FWD_DEFINED__
 typedef interface ISpeechPhraseElement ISpeechPhraseElement;
+#ifdef __cplusplus
+interface ISpeechPhraseElement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElements_FWD_DEFINED__
 #define __ISpeechPhraseElements_FWD_DEFINED__
 typedef interface ISpeechPhraseElements ISpeechPhraseElements;
+#ifdef __cplusplus
+interface ISpeechPhraseElements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__
 #define __ISpeechPhraseReplacement_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__
 #define __ISpeechPhraseReplacements_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperty_FWD_DEFINED__
 #define __ISpeechPhraseProperty_FWD_DEFINED__
 typedef interface ISpeechPhraseProperty ISpeechPhraseProperty;
+#ifdef __cplusplus
+interface ISpeechPhraseProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperties_FWD_DEFINED__
 #define __ISpeechPhraseProperties_FWD_DEFINED__
 typedef interface ISpeechPhraseProperties ISpeechPhraseProperties;
+#ifdef __cplusplus
+interface ISpeechPhraseProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRule_FWD_DEFINED__
 #define __ISpeechPhraseRule_FWD_DEFINED__
 typedef interface ISpeechPhraseRule ISpeechPhraseRule;
+#ifdef __cplusplus
+interface ISpeechPhraseRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRules_FWD_DEFINED__
 #define __ISpeechPhraseRules_FWD_DEFINED__
 typedef interface ISpeechPhraseRules ISpeechPhraseRules;
+#ifdef __cplusplus
+interface ISpeechPhraseRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWords_FWD_DEFINED__
 #define __ISpeechLexiconWords_FWD_DEFINED__
 typedef interface ISpeechLexiconWords ISpeechLexiconWords;
+#ifdef __cplusplus
+interface ISpeechLexiconWords;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexicon_FWD_DEFINED__
 #define __ISpeechLexicon_FWD_DEFINED__
 typedef interface ISpeechLexicon ISpeechLexicon;
+#ifdef __cplusplus
+interface ISpeechLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWord_FWD_DEFINED__
 #define __ISpeechLexiconWord_FWD_DEFINED__
 typedef interface ISpeechLexiconWord ISpeechLexiconWord;
+#ifdef __cplusplus
+interface ISpeechLexiconWord;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__
 #define __ISpeechLexiconPronunciations_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciations;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__
 #define __ISpeechLexiconPronunciation_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhoneConverter_FWD_DEFINED__
 #define __ISpeechPhoneConverter_FWD_DEFINED__
 typedef interface ISpeechPhoneConverter ISpeechPhoneConverter;
+#ifdef __cplusplus
+interface ISpeechPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __SpNotifyTranslator_FWD_DEFINED__
@@ -672,126 +909,201 @@
 #ifndef __ISpNotifySource_FWD_DEFINED__
 #define __ISpNotifySource_FWD_DEFINED__
 typedef interface ISpNotifySource ISpNotifySource;
+#ifdef __cplusplus
+interface ISpNotifySource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifySink_FWD_DEFINED__
 #define __ISpNotifySink_FWD_DEFINED__
 typedef interface ISpNotifySink ISpNotifySink;
+#ifdef __cplusplus
+interface ISpNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifyTranslator_FWD_DEFINED__
 #define __ISpNotifyTranslator_FWD_DEFINED__
 typedef interface ISpNotifyTranslator ISpNotifyTranslator;
+#ifdef __cplusplus
+interface ISpNotifyTranslator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDataKey_FWD_DEFINED__
 #define __ISpDataKey_FWD_DEFINED__
 typedef interface ISpDataKey ISpDataKey;
+#ifdef __cplusplus
+interface ISpDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenCategory_FWD_DEFINED__
 #define __ISpObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpObjectTokenCategory ISpObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectToken_FWD_DEFINED__
 #define __ISpObjectToken_FWD_DEFINED__
 typedef interface ISpObjectToken ISpObjectToken;
+#ifdef __cplusplus
+interface ISpObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSpObjectTokens_FWD_DEFINED__
 #define __IEnumSpObjectTokens_FWD_DEFINED__
 typedef interface IEnumSpObjectTokens IEnumSpObjectTokens;
+#ifdef __cplusplus
+interface IEnumSpObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectWithToken_FWD_DEFINED__
 #define __ISpObjectWithToken_FWD_DEFINED__
 typedef interface ISpObjectWithToken ISpObjectWithToken;
+#ifdef __cplusplus
+interface ISpObjectWithToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpResourceManager_FWD_DEFINED__
 #define __ISpResourceManager_FWD_DEFINED__
 typedef interface ISpResourceManager ISpResourceManager;
+#ifdef __cplusplus
+interface ISpResourceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource_FWD_DEFINED__
 #define __ISpEventSource_FWD_DEFINED__
 typedef interface ISpEventSource ISpEventSource;
+#ifdef __cplusplus
+interface ISpEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSink_FWD_DEFINED__
 #define __ISpEventSink_FWD_DEFINED__
 typedef interface ISpEventSink ISpEventSink;
+#ifdef __cplusplus
+interface ISpEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormat_FWD_DEFINED__
 #define __ISpStreamFormat_FWD_DEFINED__
 typedef interface ISpStreamFormat ISpStreamFormat;
+#ifdef __cplusplus
+interface ISpStreamFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStream_FWD_DEFINED__
 #define __ISpStream_FWD_DEFINED__
 typedef interface ISpStream ISpStream;
+#ifdef __cplusplus
+interface ISpStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormatConverter_FWD_DEFINED__
 #define __ISpStreamFormatConverter_FWD_DEFINED__
 typedef interface ISpStreamFormatConverter ISpStreamFormatConverter;
+#ifdef __cplusplus
+interface ISpStreamFormatConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpAudio_FWD_DEFINED__
 #define __ISpAudio_FWD_DEFINED__
 typedef interface ISpAudio ISpAudio;
+#ifdef __cplusplus
+interface ISpAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpMMSysAudio_FWD_DEFINED__
 #define __ISpMMSysAudio_FWD_DEFINED__
 typedef interface ISpMMSysAudio ISpMMSysAudio;
+#ifdef __cplusplus
+interface ISpMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpTranscript_FWD_DEFINED__
 #define __ISpTranscript_FWD_DEFINED__
 typedef interface ISpTranscript ISpTranscript;
+#ifdef __cplusplus
+interface ISpTranscript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpVoice_FWD_DEFINED__
 #define __ISpVoice_FWD_DEFINED__
 typedef interface ISpVoice ISpVoice;
+#ifdef __cplusplus
+interface ISpVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult_FWD_DEFINED__
 #define __ISpRecoResult_FWD_DEFINED__
 typedef interface ISpRecoResult ISpRecoResult;
+#ifdef __cplusplus
+interface ISpRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext_FWD_DEFINED__
 #define __ISpRecoContext_FWD_DEFINED__
 typedef interface ISpRecoContext ISpRecoContext;
+#ifdef __cplusplus
+interface ISpRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer_FWD_DEFINED__
 #define __ISpRecognizer_FWD_DEFINED__
 typedef interface ISpRecognizer ISpRecognizer;
+#ifdef __cplusplus
+interface ISpRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpProperties_FWD_DEFINED__
 #define __ISpProperties_FWD_DEFINED__
 typedef interface ISpProperties ISpProperties;
+#ifdef __cplusplus
+interface ISpProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpLexicon_FWD_DEFINED__
 #define __ISpLexicon_FWD_DEFINED__
 typedef interface ISpLexicon ISpLexicon;
+#ifdef __cplusplus
+interface ISpLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneConverter_FWD_DEFINED__
 #define __ISpPhoneConverter_FWD_DEFINED__
 typedef interface ISpPhoneConverter ISpPhoneConverter;
+#ifdef __cplusplus
+interface ISpPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase_FWD_DEFINED__
 #define __ISpPhrase_FWD_DEFINED__
 typedef interface ISpPhrase ISpPhrase;
+#ifdef __cplusplus
+interface ISpPhrase;
+#endif /* __cplusplus */
 #endif
 
 typedef enum SPDATAKEYLOCATION {
@@ -1151,52 +1463,53 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     END_INTERFACE
 } ISpNotifySourceVtbl;
+
 interface ISpNotifySource {
     CONST_VTBL ISpNotifySourceVtbl* lpVtbl;
 };
@@ -1253,14 +1566,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifySource_SetNotifySink_Proxy(
-    ISpNotifySource* This,
-    ISpNotifySink *pNotifySink);
-void __RPC_STUB ISpNotifySource_SetNotifySink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifySource_INTERFACE_DEFINED__ */
 
@@ -1288,22 +1593,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifySink* This,
+        ISpNotifySink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     /*** ISpNotifySink methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     END_INTERFACE
 } ISpNotifySinkVtbl;
+
 interface ISpNotifySink {
     CONST_VTBL ISpNotifySinkVtbl* lpVtbl;
 };
@@ -1336,13 +1642,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifySink_Notify_Proxy(
-    ISpNotifySink* This);
-void __RPC_STUB ISpNotifySink_Notify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifySink_INTERFACE_DEFINED__ */
 
@@ -1393,54 +1692,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     /*** ISpNotifySink methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     /*** ISpNotifyTranslator methods ***/
     HRESULT (STDMETHODCALLTYPE *InitWindowMessage)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitCallback)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitSpNotifyCallback)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitWin32Event)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         HANDLE hEvent,
         WINBOOL fCloseHandleOnRelease);
 
     HRESULT (STDMETHODCALLTYPE *Wait)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetEventHandle)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     END_INTERFACE
 } ISpNotifyTranslatorVtbl;
+
 interface ISpNotifyTranslator {
     CONST_VTBL ISpNotifyTranslatorVtbl* lpVtbl;
 };
@@ -1499,61 +1799,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWindowMessage_Proxy(
-    ISpNotifyTranslator* This,
-    HWND hWnd,
-    UINT Msg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitWindowMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitCallback_Proxy(
-    ISpNotifyTranslator* This,
-    SPNOTIFYCALLBACK *pfnCallback,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitSpNotifyCallback_Proxy(
-    ISpNotifyTranslator* This,
-    ISpNotifyCallback *pSpCallback,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitSpNotifyCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWin32Event_Proxy(
-    ISpNotifyTranslator* This,
-    HANDLE hEvent,
-    WINBOOL fCloseHandleOnRelease);
-void __RPC_STUB ISpNotifyTranslator_InitWin32Event_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_Wait_Proxy(
-    ISpNotifyTranslator* This,
-    DWORD dwMilliseconds);
-void __RPC_STUB ISpNotifyTranslator_Wait_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HANDLE STDMETHODCALLTYPE ISpNotifyTranslator_GetEventHandle_Proxy(
-    ISpNotifyTranslator* This);
-void __RPC_STUB ISpNotifyTranslator_GetEventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifyTranslator_INTERFACE_DEFINED__ */
 
@@ -1626,79 +1871,80 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpDataKey* This);
+        ISpDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpDataKey* This);
+        ISpDataKey *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     END_INTERFACE
 } ISpDataKeyVtbl;
+
 interface ISpDataKey {
     CONST_VTBL ISpDataKeyVtbl* lpVtbl;
 };
@@ -1775,114 +2021,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetData_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    ULONG cbData,
-    const BYTE *pData);
-void __RPC_STUB ISpDataKey_SetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetData_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    ULONG *pcbData,
-    BYTE *pData);
-void __RPC_STUB ISpDataKey_GetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetStringValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    LPCWSTR pszValue);
-void __RPC_STUB ISpDataKey_SetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetStringValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    LPWSTR *ppszValue);
-void __RPC_STUB ISpDataKey_GetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetDWORD_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    DWORD dwValue);
-void __RPC_STUB ISpDataKey_SetDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetDWORD_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    DWORD *pdwValue);
-void __RPC_STUB ISpDataKey_GetDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_OpenKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKeyName,
-    ISpDataKey **ppSubKey);
-void __RPC_STUB ISpDataKey_OpenKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_CreateKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKey,
-    ISpDataKey **ppSubKey);
-void __RPC_STUB ISpDataKey_CreateKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKey);
-void __RPC_STUB ISpDataKey_DeleteKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName);
-void __RPC_STUB ISpDataKey_DeleteValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_EnumKeys_Proxy(
-    ISpDataKey* This,
-    ULONG Index,
-    LPWSTR *ppszSubKeyName);
-void __RPC_STUB ISpDataKey_EnumKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_EnumValues_Proxy(
-    ISpDataKey* This,
-    ULONG Index,
-    LPWSTR *ppszValueName);
-void __RPC_STUB ISpDataKey_EnumValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpDataKey_INTERFACE_DEFINED__ */
 
@@ -1913,27 +2051,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectWithToken* This);
+        ISpObjectWithToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectWithToken* This);
+        ISpObjectWithToken *This);
 
     /*** ISpObjectWithToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObjectToken)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectToken)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         ISpObjectToken **ppToken);
 
     END_INTERFACE
 } ISpObjectWithTokenVtbl;
+
 interface ISpObjectWithToken {
     CONST_VTBL ISpObjectWithTokenVtbl* lpVtbl;
 };
@@ -1970,22 +2109,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectWithToken_SetObjectToken_Proxy(
-    ISpObjectWithToken* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpObjectWithToken_SetObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectWithToken_GetObjectToken_Proxy(
-    ISpObjectWithToken* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpObjectWithToken_GetObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectWithToken_INTERFACE_DEFINED__ */
 
@@ -2031,45 +2154,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     /*** IEnumSpObjectTokens methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG celt,
         ISpObjectToken **pelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         IEnumSpObjectTokens **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG Index,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG *pCount);
 
     END_INTERFACE
 } IEnumSpObjectTokensVtbl;
+
 interface IEnumSpObjectTokens {
     CONST_VTBL IEnumSpObjectTokensVtbl* lpVtbl;
 };
@@ -2122,56 +2246,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Next_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG celt,
-    ISpObjectToken **pelt,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumSpObjectTokens_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Skip_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG celt);
-void __RPC_STUB IEnumSpObjectTokens_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Reset_Proxy(
-    IEnumSpObjectTokens* This);
-void __RPC_STUB IEnumSpObjectTokens_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Clone_Proxy(
-    IEnumSpObjectTokens* This,
-    IEnumSpObjectTokens **ppEnum);
-void __RPC_STUB IEnumSpObjectTokens_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Item_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG Index,
-    ISpObjectToken **ppToken);
-void __RPC_STUB IEnumSpObjectTokens_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_GetCount_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG *pCount);
-void __RPC_STUB IEnumSpObjectTokens_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumSpObjectTokens_INTERFACE_DEFINED__ */
 
@@ -2200,85 +2274,86 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRegDataKey* This);
+        ISpRegDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRegDataKey* This);
+        ISpRegDataKey *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpRegDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         HKEY hkey,
         WINBOOL fReadOnly);
 
     END_INTERFACE
 } ISpRegDataKeyVtbl;
+
 interface ISpRegDataKey {
     CONST_VTBL ISpRegDataKeyVtbl* lpVtbl;
 };
@@ -2407,108 +2482,109 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectTokenCategory* This);
+        ISpObjectTokenCategory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectTokenCategory* This);
+        ISpObjectTokenCategory *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectTokenCategory methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszCategoryId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPWSTR *ppszCoMemCategoryId);
 
     HRESULT (STDMETHODCALLTYPE *GetDataKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         SPDATAKEYLOCATION spdkl,
         ISpDataKey **ppDataKey);
 
     HRESULT (STDMETHODCALLTYPE *EnumTokens)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pzsReqAttribs,
         LPCWSTR pszOptAttribs,
         IEnumSpObjectTokens **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultTokenId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultTokenId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPWSTR *ppszCoMemTokenId);
 
     END_INTERFACE
 } ISpObjectTokenCategoryVtbl;
+
 interface ISpObjectTokenCategory {
     CONST_VTBL ISpObjectTokenCategoryVtbl* lpVtbl;
 };
@@ -2611,58 +2687,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pszCategoryId,
-    WINBOOL fCreateIfNotExist);
-void __RPC_STUB ISpObjectTokenCategory_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPWSTR *ppszCoMemCategoryId);
-void __RPC_STUB ISpObjectTokenCategory_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDataKey_Proxy(
-    ISpObjectTokenCategory* This,
-    SPDATAKEYLOCATION spdkl,
-    ISpDataKey **ppDataKey);
-void __RPC_STUB ISpObjectTokenCategory_GetDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_EnumTokens_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pzsReqAttribs,
-    LPCWSTR pszOptAttribs,
-    IEnumSpObjectTokens **ppEnum);
-void __RPC_STUB ISpObjectTokenCategory_EnumTokens_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetDefaultTokenId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pszTokenId);
-void __RPC_STUB ISpObjectTokenCategory_SetDefaultTokenId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDefaultTokenId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPWSTR *ppszCoMemTokenId);
-void __RPC_STUB ISpObjectTokenCategory_GetDefaultTokenId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectTokenCategory_INTERFACE_DEFINED__ */
 
@@ -2738,101 +2762,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectToken* This);
+        ISpObjectToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectToken* This);
+        ISpObjectToken *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPWSTR *ppszCoMemTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ISpObjectTokenCategory **ppTokenCategory);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         IUnknown *pUnkOuter,
         DWORD dwClsContext,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFCLSID clsidCaller,
         LPCWSTR pszValueName,
         LPCWSTR pszFileNameSpecifier,
@@ -2840,17 +2864,17 @@
         LPWSTR *ppszFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFCLSID clsidCaller,
         LPCWSTR pszKeyName,
         WINBOOL fDeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         const CLSID *pclsidCaller);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
@@ -2858,7 +2882,7 @@
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -2867,12 +2891,13 @@
         IUnknown *punkObject);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszAttributes,
         WINBOOL *pfMatches);
 
     END_INTERFACE
 } ISpObjectTokenVtbl;
+
 interface ISpObjectToken {
     CONST_VTBL ISpObjectTokenVtbl* lpVtbl;
 };
@@ -2991,82 +3016,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectToken_SetId_Proxy(
-    ISpObjectToken* This,
-    LPCWSTR pszCategoryId,
-    LPCWSTR pszTokenId,
-    WINBOOL fCreateIfNotExist);
-void __RPC_STUB ISpObjectToken_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetId_Proxy(
-    ISpObjectToken* This,
-    LPWSTR *ppszCoMemTokenId);
-void __RPC_STUB ISpObjectToken_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetCategory_Proxy(
-    ISpObjectToken* This,
-    ISpObjectTokenCategory **ppTokenCategory);
-void __RPC_STUB ISpObjectToken_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_CreateInstance_Proxy(
-    ISpObjectToken* This,
-    IUnknown *pUnkOuter,
-    DWORD dwClsContext,
-    REFIID riid,
-    void **ppvObject);
-void __RPC_STUB ISpObjectToken_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetStorageFileName_Proxy(
-    ISpObjectToken* This,
-    REFCLSID clsidCaller,
-    LPCWSTR pszValueName,
-    LPCWSTR pszFileNameSpecifier,
-    ULONG nFolder,
-    LPWSTR *ppszFilePath);
-void __RPC_STUB ISpObjectToken_GetStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_RemoveStorageFileName_Proxy(
-    ISpObjectToken* This,
-    REFCLSID clsidCaller,
-    LPCWSTR pszKeyName,
-    WINBOOL fDeleteFile);
-void __RPC_STUB ISpObjectToken_RemoveStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_Remove_Proxy(
-    ISpObjectToken* This,
-    const CLSID *pclsidCaller);
-void __RPC_STUB ISpObjectToken_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_MatchesAttributes_Proxy(
-    ISpObjectToken* This,
-    LPCWSTR pszAttributes,
-    WINBOOL *pfMatches);
-void __RPC_STUB ISpObjectToken_MatchesAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectToken_INTERFACE_DEFINED__ */
 
@@ -3096,101 +3045,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectTokenInit* This);
+        ISpObjectTokenInit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectTokenInit* This);
+        ISpObjectTokenInit *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPWSTR *ppszCoMemTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ISpObjectTokenCategory **ppTokenCategory);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         IUnknown *pUnkOuter,
         DWORD dwClsContext,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFCLSID clsidCaller,
         LPCWSTR pszValueName,
         LPCWSTR pszFileNameSpecifier,
@@ -3198,17 +3147,17 @@
         LPWSTR *ppszFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFCLSID clsidCaller,
         LPCWSTR pszKeyName,
         WINBOOL fDeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         const CLSID *pclsidCaller);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
@@ -3216,7 +3165,7 @@
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -3225,19 +3174,20 @@
         IUnknown *punkObject);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszAttributes,
         WINBOOL *pfMatches);
 
     /*** ISpObjectTokenInit methods ***/
     HRESULT (STDMETHODCALLTYPE *InitFromDataKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         ISpDataKey *pDataKey);
 
     END_INTERFACE
 } ISpObjectTokenInitVtbl;
+
 interface ISpObjectTokenInit {
     CONST_VTBL ISpObjectTokenInitVtbl* lpVtbl;
 };
@@ -3362,16 +3312,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectTokenInit_InitFromDataKey_Proxy(
-    ISpObjectTokenInit* This,
-    LPCWSTR pszCategoryId,
-    LPCWSTR pszTokenId,
-    ISpDataKey *pDataKey);
-void __RPC_STUB ISpObjectTokenInit_InitFromDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectTokenInit_INTERFACE_DEFINED__ */
 
@@ -3407,31 +3347,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpResourceManager* This);
+        ISpResourceManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpResourceManager* This);
+        ISpResourceManager *This);
 
     /*** IServiceProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryService)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidService,
         REFIID riid,
         void **ppvObject);
 
     /*** ISpResourceManager methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObject)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidServiceId,
         IUnknown *pUnkObject);
 
     HRESULT (STDMETHODCALLTYPE *GetObject)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidServiceId,
         REFCLSID ObjectCLSID,
         REFIID ObjectIID,
@@ -3440,6 +3380,7 @@
 
     END_INTERFACE
 } ISpResourceManagerVtbl;
+
 interface ISpResourceManager {
     CONST_VTBL ISpResourceManagerVtbl* lpVtbl;
 };
@@ -3482,27 +3423,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpResourceManager_SetObject_Proxy(
-    ISpResourceManager* This,
-    REFGUID guidServiceId,
-    IUnknown *pUnkObject);
-void __RPC_STUB ISpResourceManager_SetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpResourceManager_GetObject_Proxy(
-    ISpResourceManager* This,
-    REFGUID guidServiceId,
-    REFCLSID ObjectCLSID,
-    REFIID ObjectIID,
-    WINBOOL fReleaseWhenLastExternalRefReleased,
-    void **ppObject);
-void __RPC_STUB ISpResourceManager_GetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpResourceManager_INTERFACE_DEFINED__ */
 
@@ -3597,68 +3517,69 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         SPEVENTSOURCEINFO *pInfo);
 
     END_INTERFACE
 } ISpEventSourceVtbl;
+
 interface ISpEventSource {
     CONST_VTBL ISpEventSourceVtbl* lpVtbl;
 };
@@ -3729,33 +3650,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSource_SetInterest_Proxy(
-    ISpEventSource* This,
-    ULONGLONG ullEventInterest,
-    ULONGLONG ullQueuedInterest);
-void __RPC_STUB ISpEventSource_SetInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSource_GetEvents_Proxy(
-    ISpEventSource* This,
-    ULONG ulCount,
-    SPEVENT *pEventArray,
-    ULONG *pulFetched);
-void __RPC_STUB ISpEventSource_GetEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSource_GetInfo_Proxy(
-    ISpEventSource* This,
-    SPEVENTSOURCEINFO *pInfo);
-void __RPC_STUB ISpEventSource_GetInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSource_INTERFACE_DEFINED__ */
 
@@ -3787,28 +3681,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSink* This);
+        ISpEventSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSink* This);
+        ISpEventSink *This);
 
     /*** ISpEventSink methods ***/
     HRESULT (STDMETHODCALLTYPE *AddEvents)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         const SPEVENT *pEventArray,
         ULONG ulCount);
 
     HRESULT (STDMETHODCALLTYPE *GetEventInterest)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         ULONGLONG *pullEventInterest);
 
     END_INTERFACE
 } ISpEventSinkVtbl;
+
 interface ISpEventSink {
     CONST_VTBL ISpEventSinkVtbl* lpVtbl;
 };
@@ -3845,23 +3740,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSink_AddEvents_Proxy(
-    ISpEventSink* This,
-    const SPEVENT *pEventArray,
-    ULONG ulCount);
-void __RPC_STUB ISpEventSink_AddEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSink_GetEventInterest_Proxy(
-    ISpEventSink* This,
-    ULONGLONG *pullEventInterest);
-void __RPC_STUB ISpEventSink_GetEventInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSink_INTERFACE_DEFINED__ */
 
@@ -3890,83 +3768,84 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     END_INTERFACE
 } ISpStreamFormatVtbl;
+
 interface ISpStreamFormat {
     CONST_VTBL ISpStreamFormatVtbl* lpVtbl;
 };
@@ -4047,15 +3926,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStreamFormat_GetFormat_Proxy(
-    ISpStreamFormat* This,
-    GUID *pguidFormatId,
-    WAVEFORMATEX **ppCoMemWaveFormatEx);
-void __RPC_STUB ISpStreamFormat_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStreamFormat_INTERFACE_DEFINED__ */
 
@@ -4098,94 +3968,94 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStream* This,
+        ISpStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStream* This);
+        ISpStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStream* This);
+        ISpStream *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStream* This,
+        ISpStream *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStream* This,
+        ISpStream *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStream* This,
+        ISpStream *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStream* This,
+        ISpStream *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStream* This,
+        ISpStream *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStream* This);
+        ISpStream *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStream* This,
+        ISpStream *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStream* This,
+        ISpStream *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStream* This,
+        ISpStream *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpStream methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBaseStream)(
-        ISpStream* This,
+        ISpStream *This,
         IStream *pStream,
         REFGUID rguidFormat,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetBaseStream)(
-        ISpStream* This,
+        ISpStream *This,
         IStream **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *BindToFile)(
-        ISpStream* This,
+        ISpStream *This,
         LPCWSTR pszFileName,
         SPFILEMODE eMode,
         const GUID *pFormatId,
@@ -4193,10 +4063,11 @@
         ULONGLONG ullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        ISpStream* This);
+        ISpStream *This);
 
     END_INTERFACE
 } ISpStreamVtbl;
+
 interface ISpStream {
     CONST_VTBL ISpStreamVtbl* lpVtbl;
 };
@@ -4295,43 +4166,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStream_SetBaseStream_Proxy(
-    ISpStream* This,
-    IStream *pStream,
-    REFGUID rguidFormat,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpStream_SetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_GetBaseStream_Proxy(
-    ISpStream* This,
-    IStream **ppStream);
-void __RPC_STUB ISpStream_GetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_BindToFile_Proxy(
-    ISpStream* This,
-    LPCWSTR pszFileName,
-    SPFILEMODE eMode,
-    const GUID *pFormatId,
-    const WAVEFORMATEX *pWaveFormatEx,
-    ULONGLONG ullEventInterest);
-void __RPC_STUB ISpStream_BindToFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_Close_Proxy(
-    ISpStream* This);
-void __RPC_STUB ISpStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStream_INTERFACE_DEFINED__ */
 
@@ -4379,112 +4213,113 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpStreamFormatConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBaseStream)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ISpStreamFormat *pStream,
         WINBOOL fSetFormatToBaseStreamFormat,
         WINBOOL fWriteToBaseStream);
 
     HRESULT (STDMETHODCALLTYPE *GetBaseStream)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         REFGUID rguidFormatIdOfConvertedStream,
         const WAVEFORMATEX *pWaveFormatExOfConvertedStream);
 
     HRESULT (STDMETHODCALLTYPE *ResetSeekPosition)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     HRESULT (STDMETHODCALLTYPE *ScaleConvertedToBaseOffset)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULONGLONG ullOffsetConvertedStream,
         ULONGLONG *pullOffsetBaseStream);
 
     HRESULT (STDMETHODCALLTYPE *ScaleBaseToConvertedOffset)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULONGLONG ullOffsetBaseStream,
         ULONGLONG *pullOffsetConvertedStream);
 
     END_INTERFACE
 } ISpStreamFormatConverterVtbl;
+
 interface ISpStreamFormatConverter {
     CONST_VTBL ISpStreamFormatConverterVtbl* lpVtbl;
 };
@@ -4591,58 +4426,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetBaseStream_Proxy(
-    ISpStreamFormatConverter* This,
-    ISpStreamFormat *pStream,
-    WINBOOL fSetFormatToBaseStreamFormat,
-    WINBOOL fWriteToBaseStream);
-void __RPC_STUB ISpStreamFormatConverter_SetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_GetBaseStream_Proxy(
-    ISpStreamFormatConverter* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpStreamFormatConverter_GetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetFormat_Proxy(
-    ISpStreamFormatConverter* This,
-    REFGUID rguidFormatIdOfConvertedStream,
-    const WAVEFORMATEX *pWaveFormatExOfConvertedStream);
-void __RPC_STUB ISpStreamFormatConverter_SetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ResetSeekPosition_Proxy(
-    ISpStreamFormatConverter* This);
-void __RPC_STUB ISpStreamFormatConverter_ResetSeekPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Proxy(
-    ISpStreamFormatConverter* This,
-    ULONGLONG ullOffsetConvertedStream,
-    ULONGLONG *pullOffsetBaseStream);
-void __RPC_STUB ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Proxy(
-    ISpStreamFormatConverter* This,
-    ULONGLONG ullOffsetBaseStream,
-    ULONGLONG *pullOffsetConvertedStream);
-void __RPC_STUB ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStreamFormatConverter_INTERFACE_DEFINED__ */
 
@@ -4717,130 +4500,131 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpAudio* This,
+        ISpAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpAudio* This,
+        ISpAudio *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpAudio* This,
+        ISpAudio *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpAudio* This,
+        ISpAudio *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpAudio* This,
+        ISpAudio *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpAudio* This,
+        ISpAudio *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpAudio* This,
+        ISpAudio *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpAudio* This,
+        ISpAudio *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOSTATE NewState,
         ULONGLONG ullReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         REFGUID rguidFmtId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferInfo)(
-        ISpAudio* This,
+        ISpAudio *This,
         const SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferInfo)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     HANDLE (STDMETHODCALLTYPE *EventHandle)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG *pLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG Level);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG cbSize);
 
     END_INTERFACE
 } ISpAudioVtbl;
+
 interface ISpAudio {
     CONST_VTBL ISpAudioVtbl* lpVtbl;
 };
@@ -4967,96 +4751,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpAudio_SetState_Proxy(
-    ISpAudio* This,
-    SPAUDIOSTATE NewState,
-    ULONGLONG ullReserved);
-void __RPC_STUB ISpAudio_SetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetFormat_Proxy(
-    ISpAudio* This,
-    REFGUID rguidFmtId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpAudio_SetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetStatus_Proxy(
-    ISpAudio* This,
-    SPAUDIOSTATUS *pStatus);
-void __RPC_STUB ISpAudio_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferInfo_Proxy(
-    ISpAudio* This,
-    const SPAUDIOBUFFERINFO *pBuffInfo);
-void __RPC_STUB ISpAudio_SetBufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferInfo_Proxy(
-    ISpAudio* This,
-    SPAUDIOBUFFERINFO *pBuffInfo);
-void __RPC_STUB ISpAudio_GetBufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetDefaultFormat_Proxy(
-    ISpAudio* This,
-    GUID *pFormatId,
-    WAVEFORMATEX **ppCoMemWaveFormatEx);
-void __RPC_STUB ISpAudio_GetDefaultFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HANDLE STDMETHODCALLTYPE ISpAudio_EventHandle_Proxy(
-    ISpAudio* This);
-void __RPC_STUB ISpAudio_EventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetVolumeLevel_Proxy(
-    ISpAudio* This,
-    ULONG *pLevel);
-void __RPC_STUB ISpAudio_GetVolumeLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetVolumeLevel_Proxy(
-    ISpAudio* This,
-    ULONG Level);
-void __RPC_STUB ISpAudio_SetVolumeLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferNotifySize_Proxy(
-    ISpAudio* This,
-    ULONG *pcbSize);
-void __RPC_STUB ISpAudio_GetBufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferNotifySize_Proxy(
-    ISpAudio* This,
-    ULONG cbSize);
-void __RPC_STUB ISpAudio_SetBufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpAudio_INTERFACE_DEFINED__ */
 
@@ -5096,151 +4790,152 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOSTATE NewState,
         ULONGLONG ullReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         REFGUID rguidFmtId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferInfo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         const SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferInfo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     HANDLE (STDMETHODCALLTYPE *EventHandle)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG *pLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG Level);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG cbSize);
 
     /*** ISpMMSysAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDeviceId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT *puDeviceId);
 
     HRESULT (STDMETHODCALLTYPE *SetDeviceId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT uDeviceId);
 
     HRESULT (STDMETHODCALLTYPE *GetMMHandle)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         void **pHandle);
 
     HRESULT (STDMETHODCALLTYPE *GetLineId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT *puLineId);
 
     HRESULT (STDMETHODCALLTYPE *SetLineId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT uLineId);
 
     END_INTERFACE
 } ISpMMSysAudioVtbl;
+
 interface ISpMMSysAudio {
     CONST_VTBL ISpMMSysAudioVtbl* lpVtbl;
 };
@@ -5389,46 +5084,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetDeviceId_Proxy(
-    ISpMMSysAudio* This,
-    UINT *puDeviceId);
-void __RPC_STUB ISpMMSysAudio_GetDeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetDeviceId_Proxy(
-    ISpMMSysAudio* This,
-    UINT uDeviceId);
-void __RPC_STUB ISpMMSysAudio_SetDeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetMMHandle_Proxy(
-    ISpMMSysAudio* This,
-    void **pHandle);
-void __RPC_STUB ISpMMSysAudio_GetMMHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetLineId_Proxy(
-    ISpMMSysAudio* This,
-    UINT *puLineId);
-void __RPC_STUB ISpMMSysAudio_GetLineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetLineId_Proxy(
-    ISpMMSysAudio* This,
-    UINT uLineId);
-void __RPC_STUB ISpMMSysAudio_SetLineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpMMSysAudio_INTERFACE_DEFINED__ */
 
@@ -5459,27 +5114,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpTranscript* This);
+        ISpTranscript *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpTranscript* This);
+        ISpTranscript *This);
 
     /*** ISpTranscript methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTranscript)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         LPWSTR *ppszTranscript);
 
     HRESULT (STDMETHODCALLTYPE *AppendTranscript)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         LPCWSTR pszTranscript);
 
     END_INTERFACE
 } ISpTranscriptVtbl;
+
 interface ISpTranscript {
     CONST_VTBL ISpTranscriptVtbl* lpVtbl;
 };
@@ -5516,22 +5172,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpTranscript_GetTranscript_Proxy(
-    ISpTranscript* This,
-    LPWSTR *ppszTranscript);
-void __RPC_STUB ISpTranscript_GetTranscript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpTranscript_AppendTranscript_Proxy(
-    ISpTranscript* This,
-    LPCWSTR pszTranscript);
-void __RPC_STUB ISpTranscript_AppendTranscript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpTranscript_INTERFACE_DEFINED__ */
 
@@ -5566,7 +5206,6 @@
     float SREngineConfidence;
     signed char Confidence;
 };
-
 struct SPPHRASEPROPERTY {
     LPCWSTR pszName;
     __C89_NAMELESS union {
@@ -5586,7 +5225,6 @@
     float SREngineConfidence;
     signed char Confidence;
 };
-
 typedef struct SPPHRASEREPLACEMENT {
     BYTE bDisplayAttributes;
     LPCWSTR pszReplacementText;
@@ -5702,50 +5340,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpLexicon* This);
+        ISpLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpLexicon* This);
+        ISpLexicon *This);
 
     /*** ISpLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         DWORD dwFlags,
         SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
@@ -5753,6 +5391,7 @@
 
     END_INTERFACE
 } ISpLexiconVtbl;
+
 interface ISpLexicon {
     CONST_VTBL ISpLexiconVtbl* lpVtbl;
 };
@@ -5805,68 +5444,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetPronunciations_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    DWORD dwFlags,
-    SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
-void __RPC_STUB ISpLexicon_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_AddPronunciation_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    SPPARTOFSPEECH ePartOfSpeech,
-    PCSPPHONEID pszPronunciation);
-void __RPC_STUB ISpLexicon_AddPronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_RemovePronunciation_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    SPPARTOFSPEECH ePartOfSpeech,
-    PCSPPHONEID pszPronunciation);
-void __RPC_STUB ISpLexicon_RemovePronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetGeneration_Proxy(
-    ISpLexicon* This,
-    DWORD *pdwGeneration);
-void __RPC_STUB ISpLexicon_GetGeneration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetGenerationChange_Proxy(
-    ISpLexicon* This,
-    DWORD dwFlags,
-    DWORD *pdwGeneration,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpLexicon_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetWords_Proxy(
-    ISpLexicon* This,
-    DWORD dwFlags,
-    DWORD *pdwGeneration,
-    DWORD *pdwCookie,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpLexicon_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpLexicon_INTERFACE_DEFINED__ */
 
@@ -5895,50 +5472,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpContainerLexicon* This);
+        ISpContainerLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpContainerLexicon* This);
+        ISpContainerLexicon *This);
 
     /*** ISpLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         DWORD dwFlags,
         SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
@@ -5946,12 +5523,13 @@
 
     /*** ISpContainerLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *AddLexicon)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         ISpLexicon *pAddLexicon,
         DWORD dwFlags);
 
     END_INTERFACE
 } ISpContainerLexiconVtbl;
+
 interface ISpContainerLexicon {
     CONST_VTBL ISpContainerLexiconVtbl* lpVtbl;
 };
@@ -6010,15 +5588,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpContainerLexicon_AddLexicon_Proxy(
-    ISpContainerLexicon* This,
-    ISpLexicon *pAddLexicon,
-    DWORD dwFlags);
-void __RPC_STUB ISpContainerLexicon_AddLexicon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpContainerLexicon_INTERFACE_DEFINED__ */
 
@@ -6051,38 +5620,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhoneConverter* This);
+        ISpPhoneConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhoneConverter* This);
+        ISpPhoneConverter *This);
 
     /*** ISpObjectWithToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObjectToken)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectToken)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         ISpObjectToken **ppToken);
 
     /*** ISpPhoneConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *PhoneToId)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         LPCWSTR pszPhone,
         SPPHONEID *pId);
 
     HRESULT (STDMETHODCALLTYPE *IdToPhone)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         PCSPPHONEID pId,
         WCHAR *pszPhone);
 
     END_INTERFACE
 } ISpPhoneConverterVtbl;
+
 interface ISpPhoneConverter {
     CONST_VTBL ISpPhoneConverterVtbl* lpVtbl;
 };
@@ -6129,24 +5699,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhoneConverter_PhoneToId_Proxy(
-    ISpPhoneConverter* This,
-    LPCWSTR pszPhone,
-    SPPHONEID *pId);
-void __RPC_STUB ISpPhoneConverter_PhoneToId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneConverter_IdToPhone_Proxy(
-    ISpPhoneConverter* This,
-    PCSPPHONEID pId,
-    WCHAR *pszPhone);
-void __RPC_STUB ISpPhoneConverter_IdToPhone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhoneConverter_INTERFACE_DEFINED__ */
 
@@ -6311,173 +5863,173 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpVoice* This,
+        ISpVoice *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpVoice* This,
+        ISpVoice *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpVoice* This,
+        ISpVoice *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpVoice methods ***/
     HRESULT (STDMETHODCALLTYPE *SetOutput)(
-        ISpVoice* This,
+        ISpVoice *This,
         IUnknown *pUnkOutput,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputObjectToken)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken **ppObjectToken);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStream)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *SetVoice)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetVoice)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *Speak)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pwcs,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SpeakStream)(
-        ISpVoice* This,
+        ISpVoice *This,
         IStream *pStream,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVOICESTATUS *pStatus,
         LPWSTR *ppszLastBookmark);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pItemType,
         LONG lNumItems,
         ULONG *pulNumSkipped);
 
     HRESULT (STDMETHODCALLTYPE *SetPriority)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVPRIORITY ePriority);
 
     HRESULT (STDMETHODCALLTYPE *GetPriority)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVPRIORITY *pePriority);
 
     HRESULT (STDMETHODCALLTYPE *SetAlertBoundary)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTENUM eBoundary);
 
     HRESULT (STDMETHODCALLTYPE *GetAlertBoundary)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTENUM *peBoundary);
 
     HRESULT (STDMETHODCALLTYPE *SetRate)(
-        ISpVoice* This,
+        ISpVoice *This,
         LONG RateAdjust);
 
     HRESULT (STDMETHODCALLTYPE *GetRate)(
-        ISpVoice* This,
+        ISpVoice *This,
         LONG *pRateAdjust);
 
     HRESULT (STDMETHODCALLTYPE *SetVolume)(
-        ISpVoice* This,
+        ISpVoice *This,
         USHORT usVolume);
 
     HRESULT (STDMETHODCALLTYPE *GetVolume)(
-        ISpVoice* This,
+        ISpVoice *This,
         USHORT *pusVolume);
 
     HRESULT (STDMETHODCALLTYPE *WaitUntilDone)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncSpeakTimeout)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *GetSyncSpeakTimeout)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG *pmsTimeout);
 
     HANDLE (STDMETHODCALLTYPE *SpeakCompleteEvent)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpVoice* This,
+        ISpVoice *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -6486,6 +6038,7 @@
 
     END_INTERFACE
 } ISpVoiceVtbl;
+
 interface ISpVoice {
     CONST_VTBL ISpVoiceVtbl* lpVtbl;
 };
@@ -6658,188 +6211,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpVoice_SetOutput_Proxy(
-    ISpVoice* This,
-    IUnknown *pUnkOutput,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpVoice_SetOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputObjectToken_Proxy(
-    ISpVoice* This,
-    ISpObjectToken **ppObjectToken);
-void __RPC_STUB ISpVoice_GetOutputObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputStream_Proxy(
-    ISpVoice* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpVoice_GetOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Pause_Proxy(
-    ISpVoice* This);
-void __RPC_STUB ISpVoice_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Resume_Proxy(
-    ISpVoice* This);
-void __RPC_STUB ISpVoice_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetVoice_Proxy(
-    ISpVoice* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpVoice_SetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetVoice_Proxy(
-    ISpVoice* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpVoice_GetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Speak_Proxy(
-    ISpVoice* This,
-    LPCWSTR pwcs,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpVoice_Speak_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SpeakStream_Proxy(
-    ISpVoice* This,
-    IStream *pStream,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpVoice_SpeakStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetStatus_Proxy(
-    ISpVoice* This,
-    SPVOICESTATUS *pStatus,
-    LPWSTR *ppszLastBookmark);
-void __RPC_STUB ISpVoice_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Skip_Proxy(
-    ISpVoice* This,
-    LPCWSTR pItemType,
-    LONG lNumItems,
-    ULONG *pulNumSkipped);
-void __RPC_STUB ISpVoice_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetPriority_Proxy(
-    ISpVoice* This,
-    SPVPRIORITY ePriority);
-void __RPC_STUB ISpVoice_SetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetPriority_Proxy(
-    ISpVoice* This,
-    SPVPRIORITY *pePriority);
-void __RPC_STUB ISpVoice_GetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetAlertBoundary_Proxy(
-    ISpVoice* This,
-    SPEVENTENUM eBoundary);
-void __RPC_STUB ISpVoice_SetAlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetAlertBoundary_Proxy(
-    ISpVoice* This,
-    SPEVENTENUM *peBoundary);
-void __RPC_STUB ISpVoice_GetAlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetRate_Proxy(
-    ISpVoice* This,
-    LONG RateAdjust);
-void __RPC_STUB ISpVoice_SetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetRate_Proxy(
-    ISpVoice* This,
-    LONG *pRateAdjust);
-void __RPC_STUB ISpVoice_GetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetVolume_Proxy(
-    ISpVoice* This,
-    USHORT usVolume);
-void __RPC_STUB ISpVoice_SetVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetVolume_Proxy(
-    ISpVoice* This,
-    USHORT *pusVolume);
-void __RPC_STUB ISpVoice_GetVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_WaitUntilDone_Proxy(
-    ISpVoice* This,
-    ULONG msTimeout);
-void __RPC_STUB ISpVoice_WaitUntilDone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetSyncSpeakTimeout_Proxy(
-    ISpVoice* This,
-    ULONG msTimeout);
-void __RPC_STUB ISpVoice_SetSyncSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetSyncSpeakTimeout_Proxy(
-    ISpVoice* This,
-    ULONG *pmsTimeout);
-void __RPC_STUB ISpVoice_GetSyncSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpVoice_INTERFACE_DEFINED__ */
 
@@ -6880,27 +6251,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhrase* This);
+        ISpPhrase *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhrase* This);
+        ISpPhrase *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -6908,11 +6279,12 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         DWORD dwValueTypes);
 
     END_INTERFACE
 } ISpPhraseVtbl;
+
 interface ISpPhrase {
     CONST_VTBL ISpPhraseVtbl* lpVtbl;
 };
@@ -6957,42 +6329,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetPhrase_Proxy(
-    ISpPhrase* This,
-    SPPHRASE **ppCoMemPhrase);
-void __RPC_STUB ISpPhrase_GetPhrase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetSerializedPhrase_Proxy(
-    ISpPhrase* This,
-    SPSERIALIZEDPHRASE **ppCoMemPhrase);
-void __RPC_STUB ISpPhrase_GetSerializedPhrase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetText_Proxy(
-    ISpPhrase* This,
-    ULONG ulStart,
-    ULONG ulCount,
-    WINBOOL fUseTextReplacements,
-    LPWSTR *ppszCoMemText,
-    BYTE *pbDisplayAttributes);
-void __RPC_STUB ISpPhrase_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_Discard_Proxy(
-    ISpPhrase* This,
-    DWORD dwValueTypes);
-void __RPC_STUB ISpPhrase_Discard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhrase_INTERFACE_DEFINED__ */
 
@@ -7026,27 +6362,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -7054,22 +6390,23 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         DWORD dwValueTypes);
 
     /*** ISpPhraseAlt methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAltInfo)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         ISpPhrase **ppParent,
         ULONG *pulStartElementInParent,
         ULONG *pcElementsInParent,
         ULONG *pcElementsInAlt);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     END_INTERFACE
 } ISpPhraseAltVtbl;
+
 interface ISpPhraseAlt {
     CONST_VTBL ISpPhraseAltVtbl* lpVtbl;
 };
@@ -7124,24 +6461,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhraseAlt_GetAltInfo_Proxy(
-    ISpPhraseAlt* This,
-    ISpPhrase **ppParent,
-    ULONG *pulStartElementInParent,
-    ULONG *pcElementsInParent,
-    ULONG *pcElementsInAlt);
-void __RPC_STUB ISpPhraseAlt_GetAltInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhraseAlt_Commit_Proxy(
-    ISpPhraseAlt* This);
-void __RPC_STUB ISpPhraseAlt_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhraseAlt_INTERFACE_DEFINED__ */
 
@@ -7206,27 +6525,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoResult* This);
+        ISpRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoResult* This);
+        ISpRecoResult *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -7234,16 +6553,16 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         DWORD dwValueTypes);
 
     /*** ISpRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultTimes)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPRECORESULTTIMES *pTimes);
 
     HRESULT (STDMETHODCALLTYPE *GetAlternates)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ULONG ulRequestCount,
@@ -7251,33 +6570,34 @@
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPSERIALIZEDRESULT **ppCoMemSerializedResult);
 
     HRESULT (STDMETHODCALLTYPE *ScaleAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ISpRecoContext **ppRecoContext);
 
     END_INTERFACE
 } ISpRecoResultVtbl;
+
 interface ISpRecoResult {
     CONST_VTBL ISpRecoResultVtbl* lpVtbl;
 };
@@ -7352,72 +6672,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetResultTimes_Proxy(
-    ISpRecoResult* This,
-    SPRECORESULTTIMES *pTimes);
-void __RPC_STUB ISpRecoResult_GetResultTimes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAlternates_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ULONG ulRequestCount,
-    ISpPhraseAlt **ppPhrases,
-    ULONG *pcPhrasesReturned);
-void __RPC_STUB ISpRecoResult_GetAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAudio_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpRecoResult_GetAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_SpeakAudio_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpRecoResult_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_Serialize_Proxy(
-    ISpRecoResult* This,
-    SPSERIALIZEDRESULT **ppCoMemSerializedResult);
-void __RPC_STUB ISpRecoResult_Serialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_ScaleAudio_Proxy(
-    ISpRecoResult* This,
-    const GUID *pAudioFormatId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpRecoResult_ScaleAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetRecoContext_Proxy(
-    ISpRecoResult* This,
-    ISpRecoContext **ppRecoContext);
-void __RPC_STUB ISpRecoResult_GetRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoResult_INTERFACE_DEFINED__ */
 
@@ -7535,23 +6789,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpGrammarBuilder* This);
+        ISpGrammarBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpGrammarBuilder* This);
+        ISpGrammarBuilder *This);
 
     /*** ISpGrammarBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetGrammar)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         WORD NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *GetRule)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         LPCWSTR pszRuleName,
         DWORD dwRuleId,
         DWORD dwAttributes,
@@ -7559,16 +6813,16 @@
         SPSTATEHANDLE *phInitialState);
 
     HRESULT (STDMETHODCALLTYPE *ClearRule)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hState);
 
     HRESULT (STDMETHODCALLTYPE *CreateNewState)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hState,
         SPSTATEHANDLE *phState);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
@@ -7578,7 +6832,7 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         SPSTATEHANDLE hRule,
@@ -7586,17 +6840,18 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hRuleState,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         DWORD dwReserved);
 
     END_INTERFACE
 } ISpGrammarBuilderVtbl;
+
 interface ISpGrammarBuilder {
     CONST_VTBL ISpGrammarBuilderVtbl* lpVtbl;
 };
@@ -7657,87 +6912,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ResetGrammar_Proxy(
-    ISpGrammarBuilder* This,
-    WORD NewLanguage);
-void __RPC_STUB ISpGrammarBuilder_ResetGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_GetRule_Proxy(
-    ISpGrammarBuilder* This,
-    LPCWSTR pszRuleName,
-    DWORD dwRuleId,
-    DWORD dwAttributes,
-    WINBOOL fCreateIfNotExist,
-    SPSTATEHANDLE *phInitialState);
-void __RPC_STUB ISpGrammarBuilder_GetRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ClearRule_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hState);
-void __RPC_STUB ISpGrammarBuilder_ClearRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_CreateNewState_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hState,
-    SPSTATEHANDLE *phState);
-void __RPC_STUB ISpGrammarBuilder_CreateNewState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddWordTransition_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    LPCWSTR psz,
-    LPCWSTR pszSeparators,
-    SPGRAMMARWORDTYPE eWordType,
-    float Weight,
-    const SPPROPERTYINFO *pPropInfo);
-void __RPC_STUB ISpGrammarBuilder_AddWordTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddRuleTransition_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    SPSTATEHANDLE hRule,
-    float Weight,
-    const SPPROPERTYINFO *pPropInfo);
-void __RPC_STUB ISpGrammarBuilder_AddRuleTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddResource_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hRuleState,
-    LPCWSTR pszResourceName,
-    LPCWSTR pszResourceValue);
-void __RPC_STUB ISpGrammarBuilder_AddResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_Commit_Proxy(
-    ISpGrammarBuilder* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpGrammarBuilder_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpGrammarBuilder_INTERFACE_DEFINED__ */
 
@@ -7840,23 +7014,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     /*** ISpGrammarBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetGrammar)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         WORD NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *GetRule)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszRuleName,
         DWORD dwRuleId,
         DWORD dwAttributes,
@@ -7864,16 +7038,16 @@
         SPSTATEHANDLE *phInitialState);
 
     HRESULT (STDMETHODCALLTYPE *ClearRule)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hState);
 
     HRESULT (STDMETHODCALLTYPE *CreateNewState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hState,
         SPSTATEHANDLE *phState);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
@@ -7883,7 +7057,7 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         SPSTATEHANDLE hRule,
@@ -7891,37 +7065,37 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hRuleState,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         DWORD dwReserved);
 
     /*** ISpRecoGrammar methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGrammarId)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ULONGLONG *pullGrammarId);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ISpRecoContext **ppRecoCtxt);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszFileName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromObject)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFCLSID rcid,
         LPCWSTR pszGrammarName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromResource)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         HMODULE hModule,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceType,
@@ -7929,12 +7103,12 @@
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const SPBINARYGRAMMAR *pGrammar,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromProprietaryGrammar)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFGUID rguidParam,
         LPCWSTR pszStringParam,
         const void *pvDataPrarm,
@@ -7942,58 +7116,59 @@
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszName,
         void *pReserved,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleIdState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ULONG ulRuleId,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *LoadDictation)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszTopicName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *UnloadDictation)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     HRESULT (STDMETHODCALLTYPE *SetDictationState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const WCHAR *pText,
         ULONG cchText,
         const SPTEXTSELECTIONINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetTextSelection)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const SPTEXTSELECTIONINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *IsPronounceable)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszWord,
         SPWORDPRONOUNCEABLE *pWordPronounceable);
 
     HRESULT (STDMETHODCALLTYPE *SetGrammarState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPGRAMMARSTATE eGrammarState);
 
     HRESULT (STDMETHODCALLTYPE *SaveCmd)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         IStream *pStream,
         LPWSTR *ppszCoMemErrorText);
 
     HRESULT (STDMETHODCALLTYPE *GetGrammarState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPGRAMMARSTATE *peGrammarState);
 
     END_INTERFACE
 } ISpRecoGrammarVtbl;
+
 interface ISpRecoGrammar {
     CONST_VTBL ISpRecoGrammarVtbl* lpVtbl;
 };
@@ -8128,169 +7303,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarId_Proxy(
-    ISpRecoGrammar* This,
-    ULONGLONG *pullGrammarId);
-void __RPC_STUB ISpRecoGrammar_GetGrammarId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetRecoContext_Proxy(
-    ISpRecoGrammar* This,
-    ISpRecoContext **ppRecoCtxt);
-void __RPC_STUB ISpRecoGrammar_GetRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromFile_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszFileName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromObject_Proxy(
-    ISpRecoGrammar* This,
-    REFCLSID rcid,
-    LPCWSTR pszGrammarName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromResource_Proxy(
-    ISpRecoGrammar* This,
-    HMODULE hModule,
-    LPCWSTR pszResourceName,
-    LPCWSTR pszResourceType,
-    WORD wLanguage,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromMemory_Proxy(
-    ISpRecoGrammar* This,
-    const SPBINARYGRAMMAR *pGrammar,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Proxy(
-    ISpRecoGrammar* This,
-    REFGUID rguidParam,
-    LPCWSTR pszStringParam,
-    const void *pvDataPrarm,
-    ULONG cbDataSize,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleState_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszName,
-    void *pReserved,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetRuleState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleIdState_Proxy(
-    ISpRecoGrammar* This,
-    ULONG ulRuleId,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetRuleIdState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadDictation_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszTopicName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadDictation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_UnloadDictation_Proxy(
-    ISpRecoGrammar* This);
-void __RPC_STUB ISpRecoGrammar_UnloadDictation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetDictationState_Proxy(
-    ISpRecoGrammar* This,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetDictationState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetWordSequenceData_Proxy(
-    ISpRecoGrammar* This,
-    const WCHAR *pText,
-    ULONG cchText,
-    const SPTEXTSELECTIONINFO *pInfo);
-void __RPC_STUB ISpRecoGrammar_SetWordSequenceData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetTextSelection_Proxy(
-    ISpRecoGrammar* This,
-    const SPTEXTSELECTIONINFO *pInfo);
-void __RPC_STUB ISpRecoGrammar_SetTextSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_IsPronounceable_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszWord,
-    SPWORDPRONOUNCEABLE *pWordPronounceable);
-void __RPC_STUB ISpRecoGrammar_IsPronounceable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetGrammarState_Proxy(
-    ISpRecoGrammar* This,
-    SPGRAMMARSTATE eGrammarState);
-void __RPC_STUB ISpRecoGrammar_SetGrammarState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SaveCmd_Proxy(
-    ISpRecoGrammar* This,
-    IStream *pStream,
-    LPWSTR *ppszCoMemErrorText);
-void __RPC_STUB ISpRecoGrammar_SaveCmd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarState_Proxy(
-    ISpRecoGrammar* This,
-    SPGRAMMARSTATE *peGrammarState);
-void __RPC_STUB ISpRecoGrammar_GetGrammarState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoGrammar_INTERFACE_DEFINED__ */
 
@@ -8393,151 +7405,152 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpRecoContext methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRecognizer)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpRecognizer **ppRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *CreateGrammar)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullGrammarId,
         ISpRecoGrammar **ppGrammar);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPRECOCONTEXTSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxAlternates)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG *pcAlternates);
 
     HRESULT (STDMETHODCALLTYPE *SetMaxAlternates)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG cAlternates);
 
     HRESULT (STDMETHODCALLTYPE *SetAudioOptions)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPAUDIOOPTIONS Options,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioOptions)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPAUDIOOPTIONS *pOptions,
         GUID *pAudioFormatId,
         WAVEFORMATEX **ppCoMemWFEX);
 
     HRESULT (STDMETHODCALLTYPE *DeserializeResult)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         const SPSERIALIZEDRESULT *pSerializedResult,
         ISpRecoResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *Bookmark)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPBOOKMARKOPTIONS Options,
         ULONGLONG ullStreamPosition,
         LPARAM lparamEvent);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         LPCWSTR pAdaptationData,
         const ULONG cch);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetVoice)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpVoice *pVoice,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetVoice)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpVoice **ppVoice);
 
     HRESULT (STDMETHODCALLTYPE *SetVoicePurgeEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetVoicePurgeEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG *pullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *SetContextState)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPCONTEXTSTATE eContextState);
 
     HRESULT (STDMETHODCALLTYPE *GetContextState)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPCONTEXTSTATE *peContextState);
 
     END_INTERFACE
 } ISpRecoContextVtbl;
+
 interface ISpRecoContext {
     CONST_VTBL ISpRecoContextVtbl* lpVtbl;
 };
@@ -8682,160 +7695,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetRecognizer_Proxy(
-    ISpRecoContext* This,
-    ISpRecognizer **ppRecognizer);
-void __RPC_STUB ISpRecoContext_GetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_CreateGrammar_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG ullGrammarId,
-    ISpRecoGrammar **ppGrammar);
-void __RPC_STUB ISpRecoContext_CreateGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetStatus_Proxy(
-    ISpRecoContext* This,
-    SPRECOCONTEXTSTATUS *pStatus);
-void __RPC_STUB ISpRecoContext_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetMaxAlternates_Proxy(
-    ISpRecoContext* This,
-    ULONG *pcAlternates);
-void __RPC_STUB ISpRecoContext_GetMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetMaxAlternates_Proxy(
-    ISpRecoContext* This,
-    ULONG cAlternates);
-void __RPC_STUB ISpRecoContext_SetMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAudioOptions_Proxy(
-    ISpRecoContext* This,
-    SPAUDIOOPTIONS Options,
-    const GUID *pAudioFormatId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpRecoContext_SetAudioOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetAudioOptions_Proxy(
-    ISpRecoContext* This,
-    SPAUDIOOPTIONS *pOptions,
-    GUID *pAudioFormatId,
-    WAVEFORMATEX **ppCoMemWFEX);
-void __RPC_STUB ISpRecoContext_GetAudioOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_DeserializeResult_Proxy(
-    ISpRecoContext* This,
-    const SPSERIALIZEDRESULT *pSerializedResult,
-    ISpRecoResult **ppResult);
-void __RPC_STUB ISpRecoContext_DeserializeResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Bookmark_Proxy(
-    ISpRecoContext* This,
-    SPBOOKMARKOPTIONS Options,
-    ULONGLONG ullStreamPosition,
-    LPARAM lparamEvent);
-void __RPC_STUB ISpRecoContext_Bookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAdaptationData_Proxy(
-    ISpRecoContext* This,
-    LPCWSTR pAdaptationData,
-    const ULONG cch);
-void __RPC_STUB ISpRecoContext_SetAdaptationData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Pause_Proxy(
-    ISpRecoContext* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpRecoContext_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Resume_Proxy(
-    ISpRecoContext* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpRecoContext_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoice_Proxy(
-    ISpRecoContext* This,
-    ISpVoice *pVoice,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpRecoContext_SetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoice_Proxy(
-    ISpRecoContext* This,
-    ISpVoice **ppVoice);
-void __RPC_STUB ISpRecoContext_GetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoicePurgeEvent_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG ullEventInterest);
-void __RPC_STUB ISpRecoContext_SetVoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoicePurgeEvent_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG *pullEventInterest);
-void __RPC_STUB ISpRecoContext_GetVoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetContextState_Proxy(
-    ISpRecoContext* This,
-    SPCONTEXTSTATE eContextState);
-void __RPC_STUB ISpRecoContext_SetContextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetContextState_Proxy(
-    ISpRecoContext* This,
-    SPCONTEXTSTATE *peContextState);
-void __RPC_STUB ISpRecoContext_GetContextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoContext_INTERFACE_DEFINED__ */
 
@@ -8876,39 +7735,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpProperties* This,
+        ISpProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpProperties* This);
+        ISpProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpProperties* This);
+        ISpProperties *This);
 
     /*** ISpProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyNum)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LONG lValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNum)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LONG *plValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LPCWSTR pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LPWSTR *ppCoMemValue);
 
     END_INTERFACE
 } ISpPropertiesVtbl;
+
 interface ISpProperties {
     CONST_VTBL ISpPropertiesVtbl* lpVtbl;
 };
@@ -8953,42 +7813,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyNum_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LONG lValue);
-void __RPC_STUB ISpProperties_SetPropertyNum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyNum_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LONG *plValue);
-void __RPC_STUB ISpProperties_GetPropertyNum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyString_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LPCWSTR pValue);
-void __RPC_STUB ISpProperties_SetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyString_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LPWSTR *ppCoMemValue);
-void __RPC_STUB ISpProperties_GetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpProperties_INTERFACE_DEFINED__ */
 
@@ -9094,101 +7918,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     /*** ISpProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyNum)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LONG lValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNum)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LONG *plValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LPCWSTR pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LPWSTR *ppCoMemValue);
 
     /*** ISpRecognizer methods ***/
     HRESULT (STDMETHODCALLTYPE *SetRecognizer)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken *pRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *GetRecognizer)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *SetInput)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         IUnknown *pUnkInput,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetInputObjectToken)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStream)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *CreateRecoContext)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpRecoContext **ppNewCtxt);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoProfile)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *SetRecoProfile)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *IsSharedInstance)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoState)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOSTATE *pState);
 
     HRESULT (STDMETHODCALLTYPE *SetRecoState)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOSTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOGNIZERSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPSTREAMFORMATTYPE WaveFormatType,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWFEX);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -9196,11 +8020,12 @@
         ULONG cbExtraData);
 
     HRESULT (STDMETHODCALLTYPE *EmulateRecognition)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpPhrase *pPhrase);
 
     END_INTERFACE
 } ISpRecognizerVtbl;
+
 interface ISpRecognizer {
     CONST_VTBL ISpRecognizerVtbl* lpVtbl;
 };
@@ -9311,120 +8136,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecognizer_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken *pRecognizer);
-void __RPC_STUB ISpRecognizer_SetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecognizer_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppRecognizer);
-void __RPC_STUB ISpRecognizer_GetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetInput_Proxy(
-    ISpRecognizer* This,
-    IUnknown *pUnkInput,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpRecognizer_SetInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputObjectToken_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpRecognizer_GetInputObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputStream_Proxy(
-    ISpRecognizer* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpRecognizer_GetInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_CreateRecoContext_Proxy(
-    ISpRecognizer* This,
-    ISpRecoContext **ppNewCtxt);
-void __RPC_STUB ISpRecognizer_CreateRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoProfile_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpRecognizer_GetRecoProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoProfile_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpRecognizer_SetRecoProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_IsSharedInstance_Proxy(
-    ISpRecognizer* This);
-void __RPC_STUB ISpRecognizer_IsSharedInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoState_Proxy(
-    ISpRecognizer* This,
-    SPRECOSTATE *pState);
-void __RPC_STUB ISpRecognizer_GetRecoState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoState_Proxy(
-    ISpRecognizer* This,
-    SPRECOSTATE NewState);
-void __RPC_STUB ISpRecognizer_SetRecoState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetStatus_Proxy(
-    ISpRecognizer* This,
-    SPRECOGNIZERSTATUS *pStatus);
-void __RPC_STUB ISpRecognizer_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetFormat_Proxy(
-    ISpRecognizer* This,
-    SPSTREAMFORMATTYPE WaveFormatType,
-    GUID *pFormatId,
-    WAVEFORMATEX **ppCoMemWFEX);
-void __RPC_STUB ISpRecognizer_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_EmulateRecognition_Proxy(
-    ISpRecognizer* This,
-    ISpPhrase *pPhrase);
-void __RPC_STUB ISpRecognizer_EmulateRecognition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecognizer_INTERFACE_DEFINED__ */
 
@@ -9434,231 +8145,369 @@
 #ifndef __ISpeechDataKey_FWD_DEFINED__
 #define __ISpeechDataKey_FWD_DEFINED__
 typedef interface ISpeechDataKey ISpeechDataKey;
+#ifdef __cplusplus
+interface ISpeechDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectToken_FWD_DEFINED__
 #define __ISpeechObjectToken_FWD_DEFINED__
 typedef interface ISpeechObjectToken ISpeechObjectToken;
+#ifdef __cplusplus
+interface ISpeechObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokens_FWD_DEFINED__
 #define __ISpeechObjectTokens_FWD_DEFINED__
 typedef interface ISpeechObjectTokens ISpeechObjectTokens;
+#ifdef __cplusplus
+interface ISpeechObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__
 #define __ISpeechObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpeechObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__
 #define __ISpeechAudioBufferInfo_FWD_DEFINED__
 typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo;
+#ifdef __cplusplus
+interface ISpeechAudioBufferInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioStatus_FWD_DEFINED__
 #define __ISpeechAudioStatus_FWD_DEFINED__
 typedef interface ISpeechAudioStatus ISpeechAudioStatus;
+#ifdef __cplusplus
+interface ISpeechAudioStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioFormat_FWD_DEFINED__
 #define __ISpeechAudioFormat_FWD_DEFINED__
 typedef interface ISpeechAudioFormat ISpeechAudioFormat;
+#ifdef __cplusplus
+interface ISpeechAudioFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__
 #define __ISpeechWaveFormatEx_FWD_DEFINED__
 typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx;
+#ifdef __cplusplus
+interface ISpeechWaveFormatEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechBaseStream_FWD_DEFINED__
 #define __ISpeechBaseStream_FWD_DEFINED__
 typedef interface ISpeechBaseStream ISpeechBaseStream;
+#ifdef __cplusplus
+interface ISpeechBaseStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechFileStream_FWD_DEFINED__
 #define __ISpeechFileStream_FWD_DEFINED__
 typedef interface ISpeechFileStream ISpeechFileStream;
+#ifdef __cplusplus
+interface ISpeechFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMemoryStream_FWD_DEFINED__
 #define __ISpeechMemoryStream_FWD_DEFINED__
 typedef interface ISpeechMemoryStream ISpeechMemoryStream;
+#ifdef __cplusplus
+interface ISpeechMemoryStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechCustomStream_FWD_DEFINED__
 #define __ISpeechCustomStream_FWD_DEFINED__
 typedef interface ISpeechCustomStream ISpeechCustomStream;
+#ifdef __cplusplus
+interface ISpeechCustomStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudio_FWD_DEFINED__
 #define __ISpeechAudio_FWD_DEFINED__
 typedef interface ISpeechAudio ISpeechAudio;
+#ifdef __cplusplus
+interface ISpeechAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMMSysAudio_FWD_DEFINED__
 #define __ISpeechMMSysAudio_FWD_DEFINED__
 typedef interface ISpeechMMSysAudio ISpeechMMSysAudio;
+#ifdef __cplusplus
+interface ISpeechMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoice_FWD_DEFINED__
 #define __ISpeechVoice_FWD_DEFINED__
 typedef interface ISpeechVoice ISpeechVoice;
+#ifdef __cplusplus
+interface ISpeechVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoiceStatus_FWD_DEFINED__
 #define __ISpeechVoiceStatus_FWD_DEFINED__
 typedef interface ISpeechVoiceStatus ISpeechVoiceStatus;
+#ifdef __cplusplus
+interface ISpeechVoiceStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__
 #define ___ISpeechVoiceEvents_FWD_DEFINED__
 typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents;
+#ifdef __cplusplus
+interface _ISpeechVoiceEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizer_FWD_DEFINED__
 #define __ISpeechRecognizer_FWD_DEFINED__
 typedef interface ISpeechRecognizer ISpeechRecognizer;
+#ifdef __cplusplus
+interface ISpeechRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__
 #define __ISpeechRecognizerStatus_FWD_DEFINED__
 typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus;
+#ifdef __cplusplus
+interface ISpeechRecognizerStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoContext_FWD_DEFINED__
 #define __ISpeechRecoContext_FWD_DEFINED__
 typedef interface ISpeechRecoContext ISpeechRecoContext;
+#ifdef __cplusplus
+interface ISpeechRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoGrammar_FWD_DEFINED__
 #define __ISpeechRecoGrammar_FWD_DEFINED__
 typedef interface ISpeechRecoGrammar ISpeechRecoGrammar;
+#ifdef __cplusplus
+interface ISpeechRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__
 #define ___ISpeechRecoContextEvents_FWD_DEFINED__
 typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents;
+#ifdef __cplusplus
+interface _ISpeechRecoContextEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRule_FWD_DEFINED__
 #define __ISpeechGrammarRule_FWD_DEFINED__
 typedef interface ISpeechGrammarRule ISpeechGrammarRule;
+#ifdef __cplusplus
+interface ISpeechGrammarRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRules_FWD_DEFINED__
 #define __ISpeechGrammarRules_FWD_DEFINED__
 typedef interface ISpeechGrammarRules ISpeechGrammarRules;
+#ifdef __cplusplus
+interface ISpeechGrammarRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__
 #define __ISpeechGrammarRuleState_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransitions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__
 #define __ISpeechTextSelectionInformation_FWD_DEFINED__
 typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation;
+#ifdef __cplusplus
+interface ISpeechTextSelectionInformation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult_FWD_DEFINED__
 #define __ISpeechRecoResult_FWD_DEFINED__
 typedef interface ISpeechRecoResult ISpeechRecoResult;
+#ifdef __cplusplus
+interface ISpeechRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__
 #define __ISpeechRecoResultTimes_FWD_DEFINED__
 typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes;
+#ifdef __cplusplus
+interface ISpeechRecoResultTimes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__
 #define __ISpeechPhraseAlternate_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__
 #define __ISpeechPhraseAlternates_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfo_FWD_DEFINED__
 #define __ISpeechPhraseInfo_FWD_DEFINED__
 typedef interface ISpeechPhraseInfo ISpeechPhraseInfo;
+#ifdef __cplusplus
+interface ISpeechPhraseInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElement_FWD_DEFINED__
 #define __ISpeechPhraseElement_FWD_DEFINED__
 typedef interface ISpeechPhraseElement ISpeechPhraseElement;
+#ifdef __cplusplus
+interface ISpeechPhraseElement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElements_FWD_DEFINED__
 #define __ISpeechPhraseElements_FWD_DEFINED__
 typedef interface ISpeechPhraseElements ISpeechPhraseElements;
+#ifdef __cplusplus
+interface ISpeechPhraseElements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__
 #define __ISpeechPhraseReplacement_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__
 #define __ISpeechPhraseReplacements_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperty_FWD_DEFINED__
 #define __ISpeechPhraseProperty_FWD_DEFINED__
 typedef interface ISpeechPhraseProperty ISpeechPhraseProperty;
+#ifdef __cplusplus
+interface ISpeechPhraseProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperties_FWD_DEFINED__
 #define __ISpeechPhraseProperties_FWD_DEFINED__
 typedef interface ISpeechPhraseProperties ISpeechPhraseProperties;
+#ifdef __cplusplus
+interface ISpeechPhraseProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRule_FWD_DEFINED__
 #define __ISpeechPhraseRule_FWD_DEFINED__
 typedef interface ISpeechPhraseRule ISpeechPhraseRule;
+#ifdef __cplusplus
+interface ISpeechPhraseRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRules_FWD_DEFINED__
 #define __ISpeechPhraseRules_FWD_DEFINED__
 typedef interface ISpeechPhraseRules ISpeechPhraseRules;
+#ifdef __cplusplus
+interface ISpeechPhraseRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexicon_FWD_DEFINED__
 #define __ISpeechLexicon_FWD_DEFINED__
 typedef interface ISpeechLexicon ISpeechLexicon;
+#ifdef __cplusplus
+interface ISpeechLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWords_FWD_DEFINED__
 #define __ISpeechLexiconWords_FWD_DEFINED__
 typedef interface ISpeechLexiconWords ISpeechLexiconWords;
+#ifdef __cplusplus
+interface ISpeechLexiconWords;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWord_FWD_DEFINED__
 #define __ISpeechLexiconWord_FWD_DEFINED__
 typedef interface ISpeechLexiconWord ISpeechLexiconWord;
+#ifdef __cplusplus
+interface ISpeechLexiconWord;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__
 #define __ISpeechLexiconPronunciations_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciations;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__
 #define __ISpeechLexiconPronunciation_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciation;
+#endif /* __cplusplus */
 #endif
 
 typedef LONG SpeechLanguageId;
@@ -9790,29 +8639,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechDataKey* This);
+        ISpeechDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechDataKey* This);
+        ISpeechDataKey *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -9820,7 +8669,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -9832,65 +8681,66 @@
 
     /*** ISpeechDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBinaryValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         VARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *GetBinaryValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         const BSTR Value);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         BSTR *Value);
 
     HRESULT (STDMETHODCALLTYPE *SetLongValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         LONG Value);
 
     HRESULT (STDMETHODCALLTYPE *GetLongValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         LONG *Value);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName,
         ISpeechDataKey **SubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName,
         ISpeechDataKey **SubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         LONG Index,
         BSTR *SubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         LONG Index,
         BSTR *ValueName);
 
     END_INTERFACE
 } ISpeechDataKeyVtbl;
+
 interface ISpeechDataKey {
     CONST_VTBL ISpeechDataKeyVtbl* lpVtbl;
 };
@@ -9985,112 +8835,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetBinaryValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    VARIANT Value);
-void __RPC_STUB ISpeechDataKey_SetBinaryValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetBinaryValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    VARIANT *Value);
-void __RPC_STUB ISpeechDataKey_GetBinaryValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetStringValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    const BSTR Value);
-void __RPC_STUB ISpeechDataKey_SetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetStringValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    BSTR *Value);
-void __RPC_STUB ISpeechDataKey_GetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetLongValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    LONG Value);
-void __RPC_STUB ISpeechDataKey_SetLongValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetLongValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    LONG *Value);
-void __RPC_STUB ISpeechDataKey_GetLongValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_OpenKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName,
-    ISpeechDataKey **SubKey);
-void __RPC_STUB ISpeechDataKey_OpenKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_CreateKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName,
-    ISpeechDataKey **SubKey);
-void __RPC_STUB ISpeechDataKey_CreateKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName);
-void __RPC_STUB ISpeechDataKey_DeleteKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName);
-void __RPC_STUB ISpeechDataKey_DeleteValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumKeys_Proxy(
-    ISpeechDataKey* This,
-    LONG Index,
-    BSTR *SubKeyName);
-void __RPC_STUB ISpeechDataKey_EnumKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumValues_Proxy(
-    ISpeechDataKey* This,
-    LONG Index,
-    BSTR *ValueName);
-void __RPC_STUB ISpeechDataKey_EnumValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechDataKey_INTERFACE_DEFINED__ */
 
@@ -10174,29 +8918,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectToken* This);
+        ISpeechObjectToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectToken* This);
+        ISpeechObjectToken *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -10204,7 +8948,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -10216,45 +8960,45 @@
 
     /*** ISpeechObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR *ObjectId);
 
     HRESULT (STDMETHODCALLTYPE *get_DataKey)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         ISpeechDataKey **DataKey);
 
     HRESULT (STDMETHODCALLTYPE *get_Category)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         ISpeechObjectTokenCategory **Category);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         LONG Locale,
         BSTR *Description);
 
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR Id,
         BSTR CategoryID,
         VARIANT_BOOL CreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetAttribute)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR AttributeName,
         BSTR *AttributeValue);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         IUnknown *pUnkOuter,
         SpeechTokenContext ClsContext,
         IUnknown **Object);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID,
         BSTR KeyName,
         BSTR FileName,
@@ -10262,20 +9006,20 @@
         BSTR *FilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID,
         BSTR KeyName,
         VARIANT_BOOL DeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         IUnknown *Object,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         LONG hWnd,
         BSTR Title,
         const BSTR TypeOfUI,
@@ -10283,12 +9027,13 @@
         IUnknown *Object);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR Attributes,
         VARIANT_BOOL *Matches);
 
     END_INTERFACE
 } ISpeechObjectTokenVtbl;
+
 interface ISpeechObjectToken {
     CONST_VTBL ISpeechObjectTokenVtbl* lpVtbl;
 };
@@ -10387,130 +9132,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Id_Proxy(
-    ISpeechObjectToken* This,
-    BSTR *ObjectId);
-void __RPC_STUB ISpeechObjectToken_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_DataKey_Proxy(
-    ISpeechObjectToken* This,
-    ISpeechDataKey **DataKey);
-void __RPC_STUB ISpeechObjectToken_get_DataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Category_Proxy(
-    ISpeechObjectToken* This,
-    ISpeechObjectTokenCategory **Category);
-void __RPC_STUB ISpeechObjectToken_get_Category_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetDescription_Proxy(
-    ISpeechObjectToken* This,
-    LONG Locale,
-    BSTR *Description);
-void __RPC_STUB ISpeechObjectToken_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_SetId_Proxy(
-    ISpeechObjectToken* This,
-    BSTR Id,
-    BSTR CategoryID,
-    VARIANT_BOOL CreateIfNotExist);
-void __RPC_STUB ISpeechObjectToken_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetAttribute_Proxy(
-    ISpeechObjectToken* This,
-    BSTR AttributeName,
-    BSTR *AttributeValue);
-void __RPC_STUB ISpeechObjectToken_GetAttribute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_CreateInstance_Proxy(
-    ISpeechObjectToken* This,
-    IUnknown *pUnkOuter,
-    SpeechTokenContext ClsContext,
-    IUnknown **Object);
-void __RPC_STUB ISpeechObjectToken_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_Remove_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID);
-void __RPC_STUB ISpeechObjectToken_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetStorageFileName_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID,
-    BSTR KeyName,
-    BSTR FileName,
-    SpeechTokenShellFolder Folder,
-    BSTR *FilePath);
-void __RPC_STUB ISpeechObjectToken_GetStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_RemoveStorageFileName_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID,
-    BSTR KeyName,
-    VARIANT_BOOL DeleteFile);
-void __RPC_STUB ISpeechObjectToken_RemoveStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_IsUISupported_Proxy(
-    ISpeechObjectToken* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    IUnknown *Object,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechObjectToken_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_DisplayUI_Proxy(
-    ISpeechObjectToken* This,
-    LONG hWnd,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    IUnknown *Object);
-void __RPC_STUB ISpeechObjectToken_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_MatchesAttributes_Proxy(
-    ISpeechObjectToken* This,
-    BSTR Attributes,
-    VARIANT_BOOL *Matches);
-void __RPC_STUB ISpeechObjectToken_MatchesAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectToken_INTERFACE_DEFINED__ */
 
@@ -10545,29 +9166,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectTokens* This);
+        ISpeechObjectTokens *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectTokens* This);
+        ISpeechObjectTokens *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -10575,7 +9196,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -10587,20 +9208,21 @@
 
     /*** ISpeechObjectTokens methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         LONG Index,
         ISpeechObjectToken **Token);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         IUnknown **ppEnumVARIANT);
 
     END_INTERFACE
 } ISpeechObjectTokensVtbl;
+
 interface ISpeechObjectTokens {
     CONST_VTBL ISpeechObjectTokensVtbl* lpVtbl;
 };
@@ -10659,31 +9281,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get_Count_Proxy(
-    ISpeechObjectTokens* This,
-    LONG *Count);
-void __RPC_STUB ISpeechObjectTokens_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_Item_Proxy(
-    ISpeechObjectTokens* This,
-    LONG Index,
-    ISpeechObjectToken **Token);
-void __RPC_STUB ISpeechObjectTokens_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get__NewEnum_Proxy(
-    ISpeechObjectTokens* This,
-    IUnknown **ppEnumVARIANT);
-void __RPC_STUB ISpeechObjectTokens_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectTokens_INTERFACE_DEFINED__ */
 
@@ -10730,29 +9327,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectTokenCategory* This);
+        ISpeechObjectTokenCategory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectTokenCategory* This);
+        ISpeechObjectTokenCategory *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -10760,7 +9357,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -10772,35 +9369,36 @@
 
     /*** ISpeechObjectTokenCategory methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR *Id);
 
     HRESULT (STDMETHODCALLTYPE *put_Default)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         const BSTR TokenId);
 
     HRESULT (STDMETHODCALLTYPE *get_Default)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR *TokenId);
 
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         const BSTR Id,
         VARIANT_BOOL CreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetDataKey)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         SpeechDataKeyLocation Location,
         ISpeechDataKey **DataKey);
 
     HRESULT (STDMETHODCALLTYPE *EnumerateTokens)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **Tokens);
 
     END_INTERFACE
 } ISpeechObjectTokenCategoryVtbl;
+
 interface ISpeechObjectTokenCategory {
     CONST_VTBL ISpeechObjectTokenCategoryVtbl* lpVtbl;
 };
@@ -10871,58 +9469,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Id_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR *Id);
-void __RPC_STUB ISpeechObjectTokenCategory_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_put_Default_Proxy(
-    ISpeechObjectTokenCategory* This,
-    const BSTR TokenId);
-void __RPC_STUB ISpeechObjectTokenCategory_put_Default_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Default_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR *TokenId);
-void __RPC_STUB ISpeechObjectTokenCategory_get_Default_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_SetId_Proxy(
-    ISpeechObjectTokenCategory* This,
-    const BSTR Id,
-    VARIANT_BOOL CreateIfNotExist);
-void __RPC_STUB ISpeechObjectTokenCategory_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_GetDataKey_Proxy(
-    ISpeechObjectTokenCategory* This,
-    SpeechDataKeyLocation Location,
-    ISpeechDataKey **DataKey);
-void __RPC_STUB ISpeechObjectTokenCategory_GetDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_EnumerateTokens_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **Tokens);
-void __RPC_STUB ISpeechObjectTokenCategory_EnumerateTokens_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectTokenCategory_INTERFACE_DEFINED__ */
 
@@ -11185,29 +9731,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioFormat* This);
+        ISpeechAudioFormat *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioFormat* This);
+        ISpeechAudioFormat *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -11215,7 +9761,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -11227,31 +9773,32 @@
 
     /*** ISpeechAudioFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         SpeechAudioFormatType *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *put_Type)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         SpeechAudioFormatType AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Guid)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         BSTR *Guid);
 
     HRESULT (STDMETHODCALLTYPE *put_Guid)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         BSTR Guid);
 
     HRESULT (STDMETHODCALLTYPE *GetWaveFormatEx)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         ISpeechWaveFormatEx **SpeechWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *SetWaveFormatEx)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         ISpeechWaveFormatEx *SpeechWaveFormatEx);
 
     END_INTERFACE
 } ISpeechAudioFormatVtbl;
+
 interface ISpeechAudioFormat {
     CONST_VTBL ISpeechAudioFormatVtbl* lpVtbl;
 };
@@ -11322,54 +9869,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Type_Proxy(
-    ISpeechAudioFormat* This,
-    SpeechAudioFormatType *AudioFormat);
-void __RPC_STUB ISpeechAudioFormat_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Type_Proxy(
-    ISpeechAudioFormat* This,
-    SpeechAudioFormatType AudioFormat);
-void __RPC_STUB ISpeechAudioFormat_put_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Guid_Proxy(
-    ISpeechAudioFormat* This,
-    BSTR *Guid);
-void __RPC_STUB ISpeechAudioFormat_get_Guid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Guid_Proxy(
-    ISpeechAudioFormat* This,
-    BSTR Guid);
-void __RPC_STUB ISpeechAudioFormat_put_Guid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_GetWaveFormatEx_Proxy(
-    ISpeechAudioFormat* This,
-    ISpeechWaveFormatEx **SpeechWaveFormatEx);
-void __RPC_STUB ISpeechAudioFormat_GetWaveFormatEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_SetWaveFormatEx_Proxy(
-    ISpeechAudioFormat* This,
-    ISpeechWaveFormatEx *SpeechWaveFormatEx);
-void __RPC_STUB ISpeechAudioFormat_SetWaveFormatEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioFormat_INTERFACE_DEFINED__ */
 
@@ -11414,29 +9913,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechBaseStream* This);
+        ISpeechBaseStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechBaseStream* This);
+        ISpeechBaseStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -11444,7 +9943,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -11456,32 +9955,33 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     END_INTERFACE
 } ISpeechBaseStreamVtbl;
+
 interface ISpeechBaseStream {
     CONST_VTBL ISpeechBaseStreamVtbl* lpVtbl;
 };
@@ -11548,51 +10048,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_get_Format_Proxy(
-    ISpeechBaseStream* This,
-    ISpeechAudioFormat **AudioFormat);
-void __RPC_STUB ISpeechBaseStream_get_Format_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_putref_Format_Proxy(
-    ISpeechBaseStream* This,
-    ISpeechAudioFormat *AudioFormat);
-void __RPC_STUB ISpeechBaseStream_putref_Format_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Read_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT *Buffer,
-    LONG NumberOfBytes,
-    LONG *BytesRead);
-void __RPC_STUB ISpeechBaseStream_Read_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Write_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT Buffer,
-    LONG *BytesWritten);
-void __RPC_STUB ISpeechBaseStream_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Seek_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT Position,
-    SpeechStreamSeekPositionType Origin,
-    VARIANT *NewPosition);
-void __RPC_STUB ISpeechBaseStream_Seek_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechBaseStream_INTERFACE_DEFINED__ */
 
@@ -11644,29 +10099,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudio* This);
+        ISpeechAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudio* This);
+        ISpeechAudio *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -11674,7 +10129,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -11686,69 +10141,70 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferInfo)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioBufferInfo **BufferInfo);
 
     HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat **StreamFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventHandle)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *EventHandle);
 
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         SpeechAudioState State);
 
     END_INTERFACE
 } ISpeechAudioVtbl;
+
 interface ISpeechAudio {
     CONST_VTBL ISpeechAudioVtbl* lpVtbl;
 };
@@ -11853,78 +10309,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Status_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioStatus **Status);
-void __RPC_STUB ISpeechAudio_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferInfo_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioBufferInfo **BufferInfo);
-void __RPC_STUB ISpeechAudio_get_BufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_DefaultFormat_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioFormat **StreamFormat);
-void __RPC_STUB ISpeechAudio_get_DefaultFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Volume_Proxy(
-    ISpeechAudio* This,
-    LONG *Volume);
-void __RPC_STUB ISpeechAudio_get_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_put_Volume_Proxy(
-    ISpeechAudio* This,
-    LONG Volume);
-void __RPC_STUB ISpeechAudio_put_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferNotifySize_Proxy(
-    ISpeechAudio* This,
-    LONG *BufferNotifySize);
-void __RPC_STUB ISpeechAudio_get_BufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_put_BufferNotifySize_Proxy(
-    ISpeechAudio* This,
-    LONG BufferNotifySize);
-void __RPC_STUB ISpeechAudio_put_BufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_EventHandle_Proxy(
-    ISpeechAudio* This,
-    LONG *EventHandle);
-void __RPC_STUB ISpeechAudio_get_EventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_SetState_Proxy(
-    ISpeechAudio* This,
-    SpeechAudioState State);
-void __RPC_STUB ISpeechAudio_SetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudio_INTERFACE_DEFINED__ */
 
@@ -11964,29 +10348,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechMMSysAudio* This);
+        ISpeechMMSysAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechMMSysAudio* This);
+        ISpeechMMSysAudio *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -11994,7 +10378,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -12006,90 +10390,91 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferInfo)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioBufferInfo **BufferInfo);
 
     HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat **StreamFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventHandle)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *EventHandle);
 
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         SpeechAudioState State);
 
     /*** ISpeechMMSysAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_DeviceId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *DeviceId);
 
     HRESULT (STDMETHODCALLTYPE *put_DeviceId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG DeviceId);
 
     HRESULT (STDMETHODCALLTYPE *get_LineId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *LineId);
 
     HRESULT (STDMETHODCALLTYPE *put_LineId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG LineId);
 
     HRESULT (STDMETHODCALLTYPE *get_MMHandle)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *Handle);
 
     END_INTERFACE
 } ISpeechMMSysAudioVtbl;
+
 interface ISpeechMMSysAudio {
     CONST_VTBL ISpeechMMSysAudioVtbl* lpVtbl;
 };
@@ -12216,46 +10601,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_DeviceId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *DeviceId);
-void __RPC_STUB ISpeechMMSysAudio_get_DeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_DeviceId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG DeviceId);
-void __RPC_STUB ISpeechMMSysAudio_put_DeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_LineId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *LineId);
-void __RPC_STUB ISpeechMMSysAudio_get_LineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_LineId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG LineId);
-void __RPC_STUB ISpeechMMSysAudio_put_LineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_MMHandle_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *Handle);
-void __RPC_STUB ISpeechMMSysAudio_get_MMHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechMMSysAudio_INTERFACE_DEFINED__ */
 
@@ -12288,29 +10633,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -12318,7 +10663,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -12330,42 +10675,43 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechFileStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Open)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         BSTR FileName,
         SpeechStreamFileMode FileMode,
         VARIANT_BOOL DoEvents);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     END_INTERFACE
 } ISpeechFileStreamVtbl;
+
 interface ISpeechFileStream {
     CONST_VTBL ISpeechFileStreamVtbl* lpVtbl;
 };
@@ -12442,23 +10788,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechFileStream_Open_Proxy(
-    ISpeechFileStream* This,
-    BSTR FileName,
-    SpeechStreamFileMode FileMode,
-    VARIANT_BOOL DoEvents);
-void __RPC_STUB ISpeechFileStream_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechFileStream_Close_Proxy(
-    ISpeechFileStream* This);
-void __RPC_STUB ISpeechFileStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechFileStream_INTERFACE_DEFINED__ */
 
@@ -12489,29 +10818,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechCustomStream* This);
+        ISpeechCustomStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechCustomStream* This);
+        ISpeechCustomStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -12519,7 +10848,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -12531,41 +10860,42 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechCustomStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_BaseStream)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         IUnknown **ppUnkStream);
 
     HRESULT (STDMETHODCALLTYPE *putref_BaseStream)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         IUnknown *pUnkStream);
 
     END_INTERFACE
 } ISpeechCustomStreamVtbl;
+
 interface ISpeechCustomStream {
     CONST_VTBL ISpeechCustomStreamVtbl* lpVtbl;
 };
@@ -12642,22 +10972,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechCustomStream_get_BaseStream_Proxy(
-    ISpeechCustomStream* This,
-    IUnknown **ppUnkStream);
-void __RPC_STUB ISpeechCustomStream_get_BaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechCustomStream_putref_BaseStream_Proxy(
-    ISpeechCustomStream* This,
-    IUnknown *pUnkStream);
-void __RPC_STUB ISpeechCustomStream_putref_BaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechCustomStream_INTERFACE_DEFINED__ */
 
@@ -12688,29 +11002,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechMemoryStream* This);
+        ISpeechMemoryStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechMemoryStream* This);
+        ISpeechMemoryStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -12718,7 +11032,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -12730,41 +11044,42 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechMemoryStream methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Data);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT *pData);
 
     END_INTERFACE
 } ISpeechMemoryStreamVtbl;
+
 interface ISpeechMemoryStream {
     CONST_VTBL ISpeechMemoryStreamVtbl* lpVtbl;
 };
@@ -12841,22 +11156,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_SetData_Proxy(
-    ISpeechMemoryStream* This,
-    VARIANT Data);
-void __RPC_STUB ISpeechMemoryStream_SetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_GetData_Proxy(
-    ISpeechMemoryStream* This,
-    VARIANT *pData);
-void __RPC_STUB ISpeechMemoryStream_GetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechMemoryStream_INTERFACE_DEFINED__ */
 
@@ -12896,29 +11195,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioStatus* This);
+        ISpeechAudioStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioStatus* This);
+        ISpeechAudioStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -12926,7 +11225,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -12938,27 +11237,28 @@
 
     /*** ISpeechAudioStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_FreeBufferSpace)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         LONG *FreeBufferSpace);
 
     HRESULT (STDMETHODCALLTYPE *get_NonBlockingIO)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         LONG *NonBlockingIO);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         SpeechAudioState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentSeekPosition)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         VARIANT *CurrentSeekPosition);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentDevicePosition)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         VARIANT *CurrentDevicePosition);
 
     END_INTERFACE
 } ISpeechAudioStatusVtbl;
+
 interface ISpeechAudioStatus {
     CONST_VTBL ISpeechAudioStatusVtbl* lpVtbl;
 };
@@ -13025,46 +11325,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_FreeBufferSpace_Proxy(
-    ISpeechAudioStatus* This,
-    LONG *FreeBufferSpace);
-void __RPC_STUB ISpeechAudioStatus_get_FreeBufferSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_NonBlockingIO_Proxy(
-    ISpeechAudioStatus* This,
-    LONG *NonBlockingIO);
-void __RPC_STUB ISpeechAudioStatus_get_NonBlockingIO_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_State_Proxy(
-    ISpeechAudioStatus* This,
-    SpeechAudioState *State);
-void __RPC_STUB ISpeechAudioStatus_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentSeekPosition_Proxy(
-    ISpeechAudioStatus* This,
-    VARIANT *CurrentSeekPosition);
-void __RPC_STUB ISpeechAudioStatus_get_CurrentSeekPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentDevicePosition_Proxy(
-    ISpeechAudioStatus* This,
-    VARIANT *CurrentDevicePosition);
-void __RPC_STUB ISpeechAudioStatus_get_CurrentDevicePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioStatus_INTERFACE_DEFINED__ */
 
@@ -13107,29 +11367,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioBufferInfo* This);
+        ISpeechAudioBufferInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioBufferInfo* This);
+        ISpeechAudioBufferInfo *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13137,7 +11397,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13149,31 +11409,32 @@
 
     /*** ISpeechAudioBufferInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *get_MinNotification)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *MinNotification);
 
     HRESULT (STDMETHODCALLTYPE *put_MinNotification)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG MinNotification);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferSize)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *BufferSize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferSize)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG BufferSize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventBias)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *EventBias);
 
     HRESULT (STDMETHODCALLTYPE *put_EventBias)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG EventBias);
 
     END_INTERFACE
 } ISpeechAudioBufferInfoVtbl;
+
 interface ISpeechAudioBufferInfo {
     CONST_VTBL ISpeechAudioBufferInfoVtbl* lpVtbl;
 };
@@ -13244,54 +11505,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_MinNotification_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *MinNotification);
-void __RPC_STUB ISpeechAudioBufferInfo_get_MinNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_MinNotification_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG MinNotification);
-void __RPC_STUB ISpeechAudioBufferInfo_put_MinNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_BufferSize_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *BufferSize);
-void __RPC_STUB ISpeechAudioBufferInfo_get_BufferSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_BufferSize_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG BufferSize);
-void __RPC_STUB ISpeechAudioBufferInfo_put_BufferSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_EventBias_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *EventBias);
-void __RPC_STUB ISpeechAudioBufferInfo_get_EventBias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_EventBias_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG EventBias);
-void __RPC_STUB ISpeechAudioBufferInfo_put_EventBias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioBufferInfo_INTERFACE_DEFINED__ */
 
@@ -13358,29 +11571,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechWaveFormatEx* This);
+        ISpeechWaveFormatEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechWaveFormatEx* This);
+        ISpeechWaveFormatEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13388,7 +11601,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13400,63 +11613,64 @@
 
     /*** ISpeechWaveFormatEx methods ***/
     HRESULT (STDMETHODCALLTYPE *get_FormatTag)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *FormatTag);
 
     HRESULT (STDMETHODCALLTYPE *put_FormatTag)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short FormatTag);
 
     HRESULT (STDMETHODCALLTYPE *get_Channels)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *Channels);
 
     HRESULT (STDMETHODCALLTYPE *put_Channels)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short Channels);
 
     HRESULT (STDMETHODCALLTYPE *get_SamplesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG *SamplesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *put_SamplesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG SamplesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *get_AvgBytesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG *AvgBytesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *put_AvgBytesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG AvgBytesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *get_BlockAlign)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *BlockAlign);
 
     HRESULT (STDMETHODCALLTYPE *put_BlockAlign)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short BlockAlign);
 
     HRESULT (STDMETHODCALLTYPE *get_BitsPerSample)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *BitsPerSample);
 
     HRESULT (STDMETHODCALLTYPE *put_BitsPerSample)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short BitsPerSample);
 
     HRESULT (STDMETHODCALLTYPE *get_ExtraData)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         VARIANT *ExtraData);
 
     HRESULT (STDMETHODCALLTYPE *put_ExtraData)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         VARIANT ExtraData);
 
     END_INTERFACE
 } ISpeechWaveFormatExVtbl;
+
 interface ISpeechWaveFormatEx {
     CONST_VTBL ISpeechWaveFormatExVtbl* lpVtbl;
 };
@@ -13559,118 +11773,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_FormatTag_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *FormatTag);
-void __RPC_STUB ISpeechWaveFormatEx_get_FormatTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_FormatTag_Proxy(
-    ISpeechWaveFormatEx* This,
-    short FormatTag);
-void __RPC_STUB ISpeechWaveFormatEx_put_FormatTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_Channels_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *Channels);
-void __RPC_STUB ISpeechWaveFormatEx_get_Channels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_Channels_Proxy(
-    ISpeechWaveFormatEx* This,
-    short Channels);
-void __RPC_STUB ISpeechWaveFormatEx_put_Channels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_SamplesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG *SamplesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_get_SamplesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_SamplesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG SamplesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_put_SamplesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_AvgBytesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG *AvgBytesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_get_AvgBytesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_AvgBytesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG AvgBytesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_put_AvgBytesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BlockAlign_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *BlockAlign);
-void __RPC_STUB ISpeechWaveFormatEx_get_BlockAlign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BlockAlign_Proxy(
-    ISpeechWaveFormatEx* This,
-    short BlockAlign);
-void __RPC_STUB ISpeechWaveFormatEx_put_BlockAlign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BitsPerSample_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *BitsPerSample);
-void __RPC_STUB ISpeechWaveFormatEx_get_BitsPerSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BitsPerSample_Proxy(
-    ISpeechWaveFormatEx* This,
-    short BitsPerSample);
-void __RPC_STUB ISpeechWaveFormatEx_put_BitsPerSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_ExtraData_Proxy(
-    ISpeechWaveFormatEx* This,
-    VARIANT *ExtraData);
-void __RPC_STUB ISpeechWaveFormatEx_get_ExtraData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_ExtraData_Proxy(
-    ISpeechWaveFormatEx* This,
-    VARIANT ExtraData);
-void __RPC_STUB ISpeechWaveFormatEx_put_ExtraData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechWaveFormatEx_INTERFACE_DEFINED__ */
 
@@ -13807,29 +11909,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13837,7 +11939,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13849,142 +11951,142 @@
 
     /*** ISpeechVoice methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechVoiceStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_Voice)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken **Voice);
 
     HRESULT (STDMETHODCALLTYPE *putref_Voice)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken *Voice);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioOutput)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken **AudioOutput);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioOutput)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken *AudioOutput);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioOutputStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream **AudioOutputStream);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioOutputStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream *AudioOutputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_Rate)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Rate);
 
     HRESULT (STDMETHODCALLTYPE *put_Rate)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG Rate);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowAudioOutputFormatChangesOnNextSet)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowAudioOutputFormatChangesOnNextSet)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         VARIANT_BOOL *Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_EventInterests)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents *EventInterestFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_EventInterests)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents EventInterestFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_Priority)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoicePriority Priority);
 
     HRESULT (STDMETHODCALLTYPE *get_Priority)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoicePriority *Priority);
 
     HRESULT (STDMETHODCALLTYPE *put_AlertBoundary)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents Boundary);
 
     HRESULT (STDMETHODCALLTYPE *get_AlertBoundary)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents *Boundary);
 
     HRESULT (STDMETHODCALLTYPE *put_SynchronousSpeakTimeout)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *get_SynchronousSpeakTimeout)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *Speak)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR Text,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SpeakStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream *Stream,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         const BSTR Type,
         LONG NumItems,
         LONG *NumSkipped);
 
     HRESULT (STDMETHODCALLTYPE *GetVoices)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioOutputs)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *WaitUntilDone)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG msTimeout,
         VARIANT_BOOL *Done);
 
     HRESULT (STDMETHODCALLTYPE *SpeakCompleteEvent)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Handle);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG hWndParent,
         BSTR Title,
         const BSTR TypeOfUI,
@@ -13992,6 +12094,7 @@
 
     END_INTERFACE
 } ISpeechVoiceVtbl;
+
 interface ISpeechVoice {
     CONST_VTBL ISpeechVoiceVtbl* lpVtbl;
 };
@@ -14166,276 +12269,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Status_Proxy(
-    ISpeechVoice* This,
-    ISpeechVoiceStatus **Status);
-void __RPC_STUB ISpeechVoice_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Voice_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken **Voice);
-void __RPC_STUB ISpeechVoice_get_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_Voice_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken *Voice);
-void __RPC_STUB ISpeechVoice_putref_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutput_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken **AudioOutput);
-void __RPC_STUB ISpeechVoice_get_AudioOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutput_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken *AudioOutput);
-void __RPC_STUB ISpeechVoice_putref_AudioOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutputStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream **AudioOutputStream);
-void __RPC_STUB ISpeechVoice_get_AudioOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutputStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream *AudioOutputStream);
-void __RPC_STUB ISpeechVoice_putref_AudioOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Rate_Proxy(
-    ISpeechVoice* This,
-    LONG *Rate);
-void __RPC_STUB ISpeechVoice_get_Rate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Rate_Proxy(
-    ISpeechVoice* This,
-    LONG Rate);
-void __RPC_STUB ISpeechVoice_put_Rate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Volume_Proxy(
-    ISpeechVoice* This,
-    LONG *Volume);
-void __RPC_STUB ISpeechVoice_get_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Volume_Proxy(
-    ISpeechVoice* This,
-    LONG Volume);
-void __RPC_STUB ISpeechVoice_put_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Proxy(
-    ISpeechVoice* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Proxy(
-    ISpeechVoice* This,
-    VARIANT_BOOL *Allow);
-void __RPC_STUB ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_EventInterests_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents *EventInterestFlags);
-void __RPC_STUB ISpeechVoice_get_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_EventInterests_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents EventInterestFlags);
-void __RPC_STUB ISpeechVoice_put_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Priority_Proxy(
-    ISpeechVoice* This,
-    SpeechVoicePriority Priority);
-void __RPC_STUB ISpeechVoice_put_Priority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Priority_Proxy(
-    ISpeechVoice* This,
-    SpeechVoicePriority *Priority);
-void __RPC_STUB ISpeechVoice_get_Priority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AlertBoundary_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents Boundary);
-void __RPC_STUB ISpeechVoice_put_AlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AlertBoundary_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents *Boundary);
-void __RPC_STUB ISpeechVoice_get_AlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_SynchronousSpeakTimeout_Proxy(
-    ISpeechVoice* This,
-    LONG msTimeout);
-void __RPC_STUB ISpeechVoice_put_SynchronousSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_SynchronousSpeakTimeout_Proxy(
-    ISpeechVoice* This,
-    LONG *msTimeout);
-void __RPC_STUB ISpeechVoice_get_SynchronousSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Speak_Proxy(
-    ISpeechVoice* This,
-    BSTR Text,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoice_Speak_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream *Stream,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoice_SpeakStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Pause_Proxy(
-    ISpeechVoice* This);
-void __RPC_STUB ISpeechVoice_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Resume_Proxy(
-    ISpeechVoice* This);
-void __RPC_STUB ISpeechVoice_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Skip_Proxy(
-    ISpeechVoice* This,
-    const BSTR Type,
-    LONG NumItems,
-    LONG *NumSkipped);
-void __RPC_STUB ISpeechVoice_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_GetVoices_Proxy(
-    ISpeechVoice* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechVoice_GetVoices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_GetAudioOutputs_Proxy(
-    ISpeechVoice* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechVoice_GetAudioOutputs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_WaitUntilDone_Proxy(
-    ISpeechVoice* This,
-    LONG msTimeout,
-    VARIANT_BOOL *Done);
-void __RPC_STUB ISpeechVoice_WaitUntilDone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakCompleteEvent_Proxy(
-    ISpeechVoice* This,
-    LONG *Handle);
-void __RPC_STUB ISpeechVoice_SpeakCompleteEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_IsUISupported_Proxy(
-    ISpeechVoice* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechVoice_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_DisplayUI_Proxy(
-    ISpeechVoice* This,
-    LONG hWndParent,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData);
-void __RPC_STUB ISpeechVoice_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechVoice_INTERFACE_DEFINED__ */
 
@@ -14496,29 +12329,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechVoiceStatus* This);
+        ISpeechVoiceStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechVoiceStatus* This);
+        ISpeechVoiceStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14526,7 +12359,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14538,55 +12371,56 @@
 
     /*** ISpeechVoiceStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_LastStreamNumberQueued)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_LastHResult)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *HResult);
 
     HRESULT (STDMETHODCALLTYPE *get_RunningState)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         SpeechRunState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_InputWordPosition)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Position);
 
     HRESULT (STDMETHODCALLTYPE *get_InputWordLength)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_InputSentencePosition)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Position);
 
     HRESULT (STDMETHODCALLTYPE *get_InputSentenceLength)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_LastBookmark)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         BSTR *Bookmark);
 
     HRESULT (STDMETHODCALLTYPE *get_LastBookmarkId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *BookmarkId);
 
     HRESULT (STDMETHODCALLTYPE *get_PhonemeId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         short *PhoneId);
 
     HRESULT (STDMETHODCALLTYPE *get_VisemeId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         short *VisemeId);
 
     END_INTERFACE
 } ISpeechVoiceStatusVtbl;
+
 interface ISpeechVoiceStatus {
     CONST_VTBL ISpeechVoiceStatusVtbl* lpVtbl;
 };
@@ -14681,102 +12515,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_CurrentStreamNumber_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoiceStatus_get_CurrentStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastStreamNumberQueued_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoiceStatus_get_LastStreamNumberQueued_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastHResult_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *HResult);
-void __RPC_STUB ISpeechVoiceStatus_get_LastHResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_RunningState_Proxy(
-    ISpeechVoiceStatus* This,
-    SpeechRunState *State);
-void __RPC_STUB ISpeechVoiceStatus_get_RunningState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordPosition_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Position);
-void __RPC_STUB ISpeechVoiceStatus_get_InputWordPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordLength_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Length);
-void __RPC_STUB ISpeechVoiceStatus_get_InputWordLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentencePosition_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Position);
-void __RPC_STUB ISpeechVoiceStatus_get_InputSentencePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentenceLength_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Length);
-void __RPC_STUB ISpeechVoiceStatus_get_InputSentenceLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmark_Proxy(
-    ISpeechVoiceStatus* This,
-    BSTR *Bookmark);
-void __RPC_STUB ISpeechVoiceStatus_get_LastBookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmarkId_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *BookmarkId);
-void __RPC_STUB ISpeechVoiceStatus_get_LastBookmarkId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_PhonemeId_Proxy(
-    ISpeechVoiceStatus* This,
-    short *PhoneId);
-void __RPC_STUB ISpeechVoiceStatus_get_PhonemeId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_VisemeId_Proxy(
-    ISpeechVoiceStatus* This,
-    short *VisemeId);
-void __RPC_STUB ISpeechVoiceStatus_get_VisemeId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechVoiceStatus_INTERFACE_DEFINED__ */
 
@@ -15270,29 +13008,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _ISpeechVoiceEvents* This);
+        _ISpeechVoiceEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _ISpeechVoiceEvents* This);
+        _ISpeechVoiceEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15300,7 +13038,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15312,6 +13050,7 @@
 
     END_INTERFACE
 } _ISpeechVoiceEventsVtbl;
+
 interface _ISpeechVoiceEvents {
     CONST_VTBL _ISpeechVoiceEventsVtbl* lpVtbl;
 };
@@ -15479,29 +13218,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecognizer* This);
+        ISpeechRecognizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecognizer* This);
+        ISpeechRecognizer *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15509,7 +13248,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15521,133 +13260,134 @@
 
     /*** ISpeechRecognizer methods ***/
     HRESULT (STDMETHODCALLTYPE *putref_Recognizer)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *get_Recognizer)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowAudioInputFormatChangesOnNextSet)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowAudioInputFormatChangesOnNextSet)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL *Allow);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioInput)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *AudioInput);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInput)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **AudioInput);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioInputStream)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechBaseStream *AudioInputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInputStream)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechBaseStream **AudioInputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_IsShared)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL *Shared);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechRecognizerState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechRecognizerState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechRecognizerStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *putref_Profile)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *Profile);
 
     HRESULT (STDMETHODCALLTYPE *get_Profile)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **Profile);
 
     HRESULT (STDMETHODCALLTYPE *EmulateRecognition)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT TextElements,
         VARIANT *ElementDisplayAttributes,
         LONG LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *CreateRecoContext)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechRecoContext **NewContext);
 
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechFormatType Type,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyNumber)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         LONG Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNumber)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         LONG *Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         const BSTR Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         BSTR *Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         LONG hWndParent,
         BSTR Title,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData);
 
     HRESULT (STDMETHODCALLTYPE *GetRecognizers)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioInputs)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetProfiles)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     END_INTERFACE
 } ISpeechRecognizerVtbl;
+
 interface ISpeechRecognizer {
     CONST_VTBL ISpeechRecognizerVtbl* lpVtbl;
 };
@@ -15798,236 +13538,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Recognizer_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *Recognizer);
-void __RPC_STUB ISpeechRecognizer_putref_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Recognizer_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **Recognizer);
-void __RPC_STUB ISpeechRecognizer_get_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL *Allow);
-void __RPC_STUB ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInput_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *AudioInput);
-void __RPC_STUB ISpeechRecognizer_putref_AudioInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInput_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **AudioInput);
-void __RPC_STUB ISpeechRecognizer_get_AudioInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInputStream_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechBaseStream *AudioInputStream);
-void __RPC_STUB ISpeechRecognizer_putref_AudioInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInputStream_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechBaseStream **AudioInputStream);
-void __RPC_STUB ISpeechRecognizer_get_AudioInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_IsShared_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL *Shared);
-void __RPC_STUB ISpeechRecognizer_get_IsShared_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_State_Proxy(
-    ISpeechRecognizer* This,
-    SpeechRecognizerState State);
-void __RPC_STUB ISpeechRecognizer_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_State_Proxy(
-    ISpeechRecognizer* This,
-    SpeechRecognizerState *State);
-void __RPC_STUB ISpeechRecognizer_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Status_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechRecognizerStatus **Status);
-void __RPC_STUB ISpeechRecognizer_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Profile_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *Profile);
-void __RPC_STUB ISpeechRecognizer_putref_Profile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Profile_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **Profile);
-void __RPC_STUB ISpeechRecognizer_get_Profile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_EmulateRecognition_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT TextElements,
-    VARIANT *ElementDisplayAttributes,
-    LONG LanguageId);
-void __RPC_STUB ISpeechRecognizer_EmulateRecognition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_CreateRecoContext_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechRecoContext **NewContext);
-void __RPC_STUB ISpeechRecognizer_CreateRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetFormat_Proxy(
-    ISpeechRecognizer* This,
-    SpeechFormatType Type,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecognizer_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyNumber_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    LONG Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_SetPropertyNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyNumber_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    LONG *Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_GetPropertyNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyString_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    const BSTR Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_SetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyString_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    BSTR *Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_GetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_IsUISupported_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_DisplayUI_Proxy(
-    ISpeechRecognizer* This,
-    LONG hWndParent,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData);
-void __RPC_STUB ISpeechRecognizer_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetRecognizers_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetRecognizers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetAudioInputs_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetAudioInputs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetProfiles_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetProfiles_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecognizer_INTERFACE_DEFINED__ */
 
@@ -16070,29 +13580,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecognizerStatus* This);
+        ISpeechRecognizerStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecognizerStatus* This);
+        ISpeechRecognizerStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16100,7 +13610,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16112,31 +13622,32 @@
 
     /*** ISpeechRecognizerStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_AudioStatus)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         ISpeechAudioStatus **AudioStatus);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamPosition)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         VARIANT *pCurrentStreamPos);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfActiveRules)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         LONG *NumberOfActiveRules);
 
     HRESULT (STDMETHODCALLTYPE *get_ClsidEngine)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         BSTR *ClsidEngine);
 
     HRESULT (STDMETHODCALLTYPE *get_SupportedLanguages)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         VARIANT *SupportedLanguages);
 
     END_INTERFACE
 } ISpeechRecognizerStatusVtbl;
+
 interface ISpeechRecognizerStatus {
     CONST_VTBL ISpeechRecognizerStatusVtbl* lpVtbl;
 };
@@ -16207,54 +13718,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_AudioStatus_Proxy(
-    ISpeechRecognizerStatus* This,
-    ISpeechAudioStatus **AudioStatus);
-void __RPC_STUB ISpeechRecognizerStatus_get_AudioStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamPosition_Proxy(
-    ISpeechRecognizerStatus* This,
-    VARIANT *pCurrentStreamPos);
-void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamNumber_Proxy(
-    ISpeechRecognizerStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_NumberOfActiveRules_Proxy(
-    ISpeechRecognizerStatus* This,
-    LONG *NumberOfActiveRules);
-void __RPC_STUB ISpeechRecognizerStatus_get_NumberOfActiveRules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_ClsidEngine_Proxy(
-    ISpeechRecognizerStatus* This,
-    BSTR *ClsidEngine);
-void __RPC_STUB ISpeechRecognizerStatus_get_ClsidEngine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_SupportedLanguages_Proxy(
-    ISpeechRecognizerStatus* This,
-    VARIANT *SupportedLanguages);
-void __RPC_STUB ISpeechRecognizerStatus_get_SupportedLanguages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecognizerStatus_INTERFACE_DEFINED__ */
 
@@ -16358,29 +13821,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16388,7 +13851,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16400,109 +13863,110 @@
 
     /*** ISpeechRecoContext methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Recognizer)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechRecognizer **Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInputInterferenceStatus)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechInterference *Interference);
 
     HRESULT (STDMETHODCALLTYPE *get_RequestedUIType)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         BSTR *UIType);
 
     HRESULT (STDMETHODCALLTYPE *putref_Voice)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechVoice *Voice);
 
     HRESULT (STDMETHODCALLTYPE *get_Voice)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechVoice **Voice);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowVoiceFormatMatchingOnNextSet)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowVoiceFormatMatchingOnNextSet)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT_BOOL *pAllow);
 
     HRESULT (STDMETHODCALLTYPE *put_VoicePurgeEvent)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *get_VoicePurgeEvent)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents *EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *put_EventInterests)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *get_EventInterests)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents *EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *put_CmdMaxAlternates)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         LONG MaxAlternates);
 
     HRESULT (STDMETHODCALLTYPE *get_CmdMaxAlternates)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         LONG *MaxAlternates);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoContextState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoContextState *State);
 
     HRESULT (STDMETHODCALLTYPE *put_RetainedAudio)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRetainedAudioOptions Option);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedAudio)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRetainedAudioOptions *Option);
 
     HRESULT (STDMETHODCALLTYPE *putref_RetainedAudioFormat)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedAudioFormat)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateGrammar)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT GrammarId,
         ISpeechRecoGrammar **Grammar);
 
     HRESULT (STDMETHODCALLTYPE *CreateResultFromMemory)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT *ResultBlock,
         ISpeechRecoResult **Result);
 
     HRESULT (STDMETHODCALLTYPE *Bookmark)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechBookmarkOptions Options,
         VARIANT StreamPos,
         VARIANT BookmarkId);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         BSTR AdaptationString);
 
     END_INTERFACE
 } ISpeechRecoContextVtbl;
+
 interface ISpeechRecoContext {
     CONST_VTBL ISpeechRecoContextVtbl* lpVtbl;
 };
@@ -16649,208 +14113,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Recognizer_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechRecognizer **Recognizer);
-void __RPC_STUB ISpeechRecoContext_get_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AudioInputInterferenceStatus_Proxy(
-    ISpeechRecoContext* This,
-    SpeechInterference *Interference);
-void __RPC_STUB ISpeechRecoContext_get_AudioInputInterferenceStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RequestedUIType_Proxy(
-    ISpeechRecoContext* This,
-    BSTR *UIType);
-void __RPC_STUB ISpeechRecoContext_get_RequestedUIType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_Voice_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechVoice *Voice);
-void __RPC_STUB ISpeechRecoContext_putref_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Voice_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechVoice **Voice);
-void __RPC_STUB ISpeechRecoContext_get_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT_BOOL *pAllow);
-void __RPC_STUB ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_VoicePurgeEvent_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents EventInterest);
-void __RPC_STUB ISpeechRecoContext_put_VoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_VoicePurgeEvent_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents *EventInterest);
-void __RPC_STUB ISpeechRecoContext_get_VoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_EventInterests_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents EventInterest);
-void __RPC_STUB ISpeechRecoContext_put_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_EventInterests_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents *EventInterest);
-void __RPC_STUB ISpeechRecoContext_get_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_CmdMaxAlternates_Proxy(
-    ISpeechRecoContext* This,
-    LONG MaxAlternates);
-void __RPC_STUB ISpeechRecoContext_put_CmdMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_CmdMaxAlternates_Proxy(
-    ISpeechRecoContext* This,
-    LONG *MaxAlternates);
-void __RPC_STUB ISpeechRecoContext_get_CmdMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_State_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoContextState State);
-void __RPC_STUB ISpeechRecoContext_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_State_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoContextState *State);
-void __RPC_STUB ISpeechRecoContext_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_RetainedAudio_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRetainedAudioOptions Option);
-void __RPC_STUB ISpeechRecoContext_put_RetainedAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudio_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRetainedAudioOptions *Option);
-void __RPC_STUB ISpeechRecoContext_get_RetainedAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_RetainedAudioFormat_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoContext_putref_RetainedAudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudioFormat_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoContext_get_RetainedAudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Pause_Proxy(
-    ISpeechRecoContext* This);
-void __RPC_STUB ISpeechRecoContext_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Resume_Proxy(
-    ISpeechRecoContext* This);
-void __RPC_STUB ISpeechRecoContext_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateGrammar_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT GrammarId,
-    ISpeechRecoGrammar **Grammar);
-void __RPC_STUB ISpeechRecoContext_CreateGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateResultFromMemory_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT *ResultBlock,
-    ISpeechRecoResult **Result);
-void __RPC_STUB ISpeechRecoContext_CreateResultFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Bookmark_Proxy(
-    ISpeechRecoContext* This,
-    SpeechBookmarkOptions Options,
-    VARIANT StreamPos,
-    VARIANT BookmarkId);
-void __RPC_STUB ISpeechRecoContext_Bookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_SetAdaptationData_Proxy(
-    ISpeechRecoContext* This,
-    BSTR AdaptationString);
-void __RPC_STUB ISpeechRecoContext_SetAdaptationData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoContext_INTERFACE_DEFINED__ */
 
@@ -16949,29 +14211,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16979,7 +14241,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16991,42 +14253,42 @@
 
     /*** ISpeechRecoGrammar methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         VARIANT *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechGrammarState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechGrammarState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_Rules)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechGrammarRules **Rules);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechLanguageId NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromFile)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR FileName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromObject)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR ClassId,
         const BSTR GrammarName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromResource)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         LONG hModule,
         VARIANT ResourceName,
         VARIANT ResourceType,
@@ -17034,56 +14296,57 @@
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromMemory)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         VARIANT GrammarData,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromProprietaryGrammar)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR ProprietaryGuid,
         const BSTR ProprietaryString,
         VARIANT ProprietaryData,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdSetRuleState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Name,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *CmdSetRuleIdState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         LONG RuleId,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *DictationLoad)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR TopicName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *DictationUnload)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     HRESULT (STDMETHODCALLTYPE *DictationSetState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Text,
         LONG TextLength,
         ISpeechTextSelectionInformation *Info);
 
     HRESULT (STDMETHODCALLTYPE *SetTextSelection)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechTextSelectionInformation *Info);
 
     HRESULT (STDMETHODCALLTYPE *IsPronounceable)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Word,
         SpeechWordPronounceable *WordPronounceable);
 
     END_INTERFACE
 } ISpeechRecoGrammarVtbl;
+
 interface ISpeechRecoGrammar {
     CONST_VTBL ISpeechRecoGrammarVtbl* lpVtbl;
 };
@@ -17206,174 +14469,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Id_Proxy(
-    ISpeechRecoGrammar* This,
-    VARIANT *Id);
-void __RPC_STUB ISpeechRecoGrammar_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_RecoContext_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoGrammar_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_put_State_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechGrammarState State);
-void __RPC_STUB ISpeechRecoGrammar_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_State_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechGrammarState *State);
-void __RPC_STUB ISpeechRecoGrammar_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Rules_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechGrammarRules **Rules);
-void __RPC_STUB ISpeechRecoGrammar_get_Rules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_Reset_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechLanguageId NewLanguage);
-void __RPC_STUB ISpeechRecoGrammar_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromFile_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR FileName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromObject_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR ClassId,
-    const BSTR GrammarName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromResource_Proxy(
-    ISpeechRecoGrammar* This,
-    LONG hModule,
-    VARIANT ResourceName,
-    VARIANT ResourceType,
-    SpeechLanguageId LanguageId,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromMemory_Proxy(
-    ISpeechRecoGrammar* This,
-    VARIANT GrammarData,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR ProprietaryGuid,
-    const BSTR ProprietaryString,
-    VARIANT ProprietaryData,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleState_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Name,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleIdState_Proxy(
-    ISpeechRecoGrammar* This,
-    LONG RuleId,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleIdState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationLoad_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR TopicName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_DictationLoad_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationUnload_Proxy(
-    ISpeechRecoGrammar* This);
-void __RPC_STUB ISpeechRecoGrammar_DictationUnload_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationSetState_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_DictationSetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetWordSequenceData_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Text,
-    LONG TextLength,
-    ISpeechTextSelectionInformation *Info);
-void __RPC_STUB ISpeechRecoGrammar_SetWordSequenceData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetTextSelection_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechTextSelectionInformation *Info);
-void __RPC_STUB ISpeechRecoGrammar_SetTextSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_IsPronounceable_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Word,
-    SpeechWordPronounceable *WordPronounceable);
-void __RPC_STUB ISpeechRecoGrammar_IsPronounceable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoGrammar_INTERFACE_DEFINED__ */
 
@@ -17398,29 +14493,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _ISpeechRecoContextEvents* This);
+        _ISpeechRecoContextEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _ISpeechRecoContextEvents* This);
+        _ISpeechRecoContextEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -17428,7 +14523,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -17440,6 +14535,7 @@
 
     END_INTERFACE
 } _ISpeechRecoContextEventsVtbl;
+
 interface _ISpeechRecoContextEvents {
     CONST_VTBL _ISpeechRecoContextEventsVtbl* lpVtbl;
 };
@@ -17529,29 +14625,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -17559,7 +14655,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -17571,35 +14667,36 @@
 
     /*** ISpeechGrammarRule methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Attributes)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         SpeechRuleAttributes *Attributes);
 
     HRESULT (STDMETHODCALLTYPE *get_InitialState)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         ISpeechGrammarRuleState **State);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         const BSTR ResourceName,
         const BSTR ResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *AddState)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         ISpeechGrammarRuleState **State);
 
     END_INTERFACE
 } ISpeechGrammarRuleVtbl;
+
 interface ISpeechGrammarRule {
     CONST_VTBL ISpeechGrammarRuleVtbl* lpVtbl;
 };
@@ -17674,62 +14771,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Attributes_Proxy(
-    ISpeechGrammarRule* This,
-    SpeechRuleAttributes *Attributes);
-void __RPC_STUB ISpeechGrammarRule_get_Attributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_InitialState_Proxy(
-    ISpeechGrammarRule* This,
-    ISpeechGrammarRuleState **State);
-void __RPC_STUB ISpeechGrammarRule_get_InitialState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Name_Proxy(
-    ISpeechGrammarRule* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechGrammarRule_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Id_Proxy(
-    ISpeechGrammarRule* This,
-    LONG *Id);
-void __RPC_STUB ISpeechGrammarRule_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_Clear_Proxy(
-    ISpeechGrammarRule* This);
-void __RPC_STUB ISpeechGrammarRule_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddResource_Proxy(
-    ISpeechGrammarRule* This,
-    const BSTR ResourceName,
-    const BSTR ResourceValue);
-void __RPC_STUB ISpeechGrammarRule_AddResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddState_Proxy(
-    ISpeechGrammarRule* This,
-    ISpeechGrammarRuleState **State);
-void __RPC_STUB ISpeechGrammarRule_AddState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRule_INTERFACE_DEFINED__ */
 
@@ -17784,29 +14825,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -17814,7 +14855,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -17826,44 +14867,45 @@
 
     /*** ISpeechGrammarRules methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *FindRule)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         VARIANT RuleNameOrId,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         LONG Index,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         IUnknown **EnumVARIANT);
 
     HRESULT (STDMETHODCALLTYPE *get_Dynamic)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         VARIANT_BOOL *Dynamic);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         BSTR RuleName,
         SpeechRuleAttributes Attributes,
         LONG RuleId,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndSave)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         BSTR *ErrorText,
         VARIANT *SaveStream);
 
     END_INTERFACE
 } ISpeechGrammarRulesVtbl;
+
 interface ISpeechGrammarRules {
     CONST_VTBL ISpeechGrammarRulesVtbl* lpVtbl;
 };
@@ -17942,75 +14984,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Count_Proxy(
-    ISpeechGrammarRules* This,
-    LONG *Count);
-void __RPC_STUB ISpeechGrammarRules_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_FindRule_Proxy(
-    ISpeechGrammarRules* This,
-    VARIANT RuleNameOrId,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_FindRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Item_Proxy(
-    ISpeechGrammarRules* This,
-    LONG Index,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get__NewEnum_Proxy(
-    ISpeechGrammarRules* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechGrammarRules_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Dynamic_Proxy(
-    ISpeechGrammarRules* This,
-    VARIANT_BOOL *Dynamic);
-void __RPC_STUB ISpeechGrammarRules_get_Dynamic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Add_Proxy(
-    ISpeechGrammarRules* This,
-    BSTR RuleName,
-    SpeechRuleAttributes Attributes,
-    LONG RuleId,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Commit_Proxy(
-    ISpeechGrammarRules* This);
-void __RPC_STUB ISpeechGrammarRules_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_CommitAndSave_Proxy(
-    ISpeechGrammarRules* This,
-    BSTR *ErrorText,
-    VARIANT *SaveStream);
-void __RPC_STUB ISpeechGrammarRules_CommitAndSave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRules_INTERFACE_DEFINED__ */
 
@@ -18067,29 +15040,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleState* This);
+        ISpeechGrammarRuleState *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleState* This);
+        ISpeechGrammarRuleState *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18097,7 +15070,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18109,15 +15082,15 @@
 
     /*** ISpeechGrammarRuleState methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Transitions)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleStateTransitions **Transitions);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestState,
         const BSTR Words,
         const BSTR Separators,
@@ -18128,7 +15101,7 @@
         float Weight);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestinationState,
         ISpeechGrammarRule *Rule,
         const BSTR PropertyName,
@@ -18137,7 +15110,7 @@
         float Weight);
 
     HRESULT (STDMETHODCALLTYPE *AddSpecialTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestinationState,
         SpeechSpecialTransitionType Type,
         const BSTR PropertyName,
@@ -18147,6 +15120,7 @@
 
     END_INTERFACE
 } ISpeechGrammarRuleStateVtbl;
+
 interface ISpeechGrammarRuleState {
     CONST_VTBL ISpeechGrammarRuleStateVtbl* lpVtbl;
 };
@@ -18213,63 +15187,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Rule_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRuleState_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Transitions_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleStateTransitions **Transitions);
-void __RPC_STUB ISpeechGrammarRuleState_get_Transitions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddWordTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestState,
-    const BSTR Words,
-    const BSTR Separators,
-    SpeechGrammarWordType Type,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddWordTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddRuleTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestinationState,
-    ISpeechGrammarRule *Rule,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddRuleTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddSpecialTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestinationState,
-    SpeechSpecialTransitionType Type,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddSpecialTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleState_INTERFACE_DEFINED__ */
 
@@ -18304,29 +15221,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleStateTransitions* This);
+        ISpeechGrammarRuleStateTransitions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleStateTransitions* This);
+        ISpeechGrammarRuleStateTransitions *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18334,7 +15251,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18346,20 +15263,21 @@
 
     /*** ISpeechGrammarRuleStateTransitions methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         LONG Index,
         ISpeechGrammarRuleStateTransition **Transition);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechGrammarRuleStateTransitionsVtbl;
+
 interface ISpeechGrammarRuleStateTransitions {
     CONST_VTBL ISpeechGrammarRuleStateTransitionsVtbl* lpVtbl;
 };
@@ -18418,31 +15336,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get_Count_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    LONG *Count);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_Item_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    LONG Index,
-    ISpeechGrammarRuleStateTransition **Transition);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get__NewEnum_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleStateTransitions_INTERFACE_DEFINED__ */
 
@@ -18491,29 +15384,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleStateTransition* This);
+        ISpeechGrammarRuleStateTransition *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleStateTransition* This);
+        ISpeechGrammarRuleStateTransition *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18521,7 +15414,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18533,39 +15426,40 @@
 
     /*** ISpeechGrammarRuleStateTransition methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         SpeechGrammarRuleStateTransitionType *Type);
 
     HRESULT (STDMETHODCALLTYPE *get_Text)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Weight)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         VARIANT *Weight);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyName)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         BSTR *PropertyName);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyId)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         LONG *PropertyId);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyValue)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         VARIANT *PropertyValue);
 
     HRESULT (STDMETHODCALLTYPE *get_NextState)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         ISpeechGrammarRuleState **NextState);
 
     END_INTERFACE
 } ISpeechGrammarRuleStateTransitionVtbl;
+
 interface ISpeechGrammarRuleStateTransition {
     CONST_VTBL ISpeechGrammarRuleStateTransitionVtbl* lpVtbl;
 };
@@ -18644,70 +15538,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Type_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    SpeechGrammarRuleStateTransitionType *Type);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Text_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    BSTR *Text);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Text_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Rule_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Weight_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    VARIANT *Weight);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Weight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyName_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    BSTR *PropertyName);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyId_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    LONG *PropertyId);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyValue_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    VARIANT *PropertyValue);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_NextState_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    ISpeechGrammarRuleState **NextState);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_NextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleStateTransition_INTERFACE_DEFINED__ */
 
@@ -18756,29 +15586,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechTextSelectionInformation* This);
+        ISpeechTextSelectionInformation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechTextSelectionInformation* This);
+        ISpeechTextSelectionInformation *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18786,7 +15616,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18798,39 +15628,40 @@
 
     /*** ISpeechTextSelectionInformation methods ***/
     HRESULT (STDMETHODCALLTYPE *put_ActiveOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG ActiveOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_ActiveOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *ActiveOffset);
 
     HRESULT (STDMETHODCALLTYPE *put_ActiveLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG ActiveLength);
 
     HRESULT (STDMETHODCALLTYPE *get_ActiveLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *ActiveLength);
 
     HRESULT (STDMETHODCALLTYPE *put_SelectionOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG SelectionOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_SelectionOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *SelectionOffset);
 
     HRESULT (STDMETHODCALLTYPE *put_SelectionLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG SelectionLength);
 
     HRESULT (STDMETHODCALLTYPE *get_SelectionLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *SelectionLength);
 
     END_INTERFACE
 } ISpeechTextSelectionInformationVtbl;
+
 interface ISpeechTextSelectionInformation {
     CONST_VTBL ISpeechTextSelectionInformationVtbl* lpVtbl;
 };
@@ -18909,70 +15740,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG ActiveOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *ActiveOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG ActiveLength);
-void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *ActiveLength);
-void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG SelectionOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *SelectionOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG SelectionLength);
-void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *SelectionLength);
-void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechTextSelectionInformation_INTERFACE_DEFINED__ */
 
@@ -19035,29 +15802,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResult* This);
+        ISpeechRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResult* This);
+        ISpeechRecoResult *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19065,7 +15832,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19077,55 +15844,56 @@
 
     /*** ISpeechRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         SpeechDiscardType ValueTypes);
 
     END_INTERFACE
 } ISpeechRecoResultVtbl;
+
 interface ISpeechRecoResult {
     CONST_VTBL ISpeechRecoResultVtbl* lpVtbl;
 };
@@ -19212,94 +15980,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_RecoContext_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoResult_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_Times_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechRecoResultTimes **Times);
-void __RPC_STUB ISpeechRecoResult_get_Times_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_putref_AudioFormat_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoResult_putref_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_AudioFormat_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoResult_get_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_PhraseInfo_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechRecoResult_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Alternates_Proxy(
-    ISpeechRecoResult* This,
-    LONG RequestCount,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechPhraseAlternates **Alternates);
-void __RPC_STUB ISpeechRecoResult_Alternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Audio_Proxy(
-    ISpeechRecoResult* This,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechMemoryStream **Stream);
-void __RPC_STUB ISpeechRecoResult_Audio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SpeakAudio_Proxy(
-    ISpeechRecoResult* This,
-    LONG StartElement,
-    LONG Elements,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecoResult_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SaveToMemory_Proxy(
-    ISpeechRecoResult* This,
-    VARIANT *ResultBlock);
-void __RPC_STUB ISpeechRecoResult_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_DiscardResultInfo_Proxy(
-    ISpeechRecoResult* This,
-    SpeechDiscardType ValueTypes);
-void __RPC_STUB ISpeechRecoResult_DiscardResultInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResult_INTERFACE_DEFINED__ */
 
@@ -19328,29 +16008,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseInfoBuilder* This);
+        ISpeechPhraseInfoBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseInfoBuilder* This);
+        ISpeechPhraseInfoBuilder *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19358,7 +16038,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19370,12 +16050,13 @@
 
     /*** ISpeechPhraseInfoBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *RestorePhraseFromMemory)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         VARIANT *PhraseInMemory,
         ISpeechPhraseInfo **PhraseInfo);
 
     END_INTERFACE
 } ISpeechPhraseInfoBuilderVtbl;
+
 interface ISpeechPhraseInfoBuilder {
     CONST_VTBL ISpeechPhraseInfoBuilderVtbl* lpVtbl;
 };
@@ -19426,15 +16107,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Proxy(
-    ISpeechPhraseInfoBuilder* This,
-    VARIANT *PhraseInMemory,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseInfoBuilder_INTERFACE_DEFINED__ */
 
@@ -19471,29 +16143,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResultTimes* This);
+        ISpeechRecoResultTimes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResultTimes* This);
+        ISpeechRecoResultTimes *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19501,7 +16173,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19513,23 +16185,24 @@
 
     /*** ISpeechRecoResultTimes methods ***/
     HRESULT (STDMETHODCALLTYPE *get_StreamTime)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *Time);
 
     HRESULT (STDMETHODCALLTYPE *get_Length)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_TickCount)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         LONG *TickCount);
 
     HRESULT (STDMETHODCALLTYPE *get_OffsetFromStart)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *OffsetFromStart);
 
     END_INTERFACE
 } ISpeechRecoResultTimesVtbl;
+
 interface ISpeechRecoResultTimes {
     CONST_VTBL ISpeechRecoResultTimesVtbl* lpVtbl;
 };
@@ -19592,38 +16265,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_StreamTime_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *Time);
-void __RPC_STUB ISpeechRecoResultTimes_get_StreamTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_Length_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *Length);
-void __RPC_STUB ISpeechRecoResultTimes_get_Length_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_TickCount_Proxy(
-    ISpeechRecoResultTimes* This,
-    LONG *TickCount);
-void __RPC_STUB ISpeechRecoResultTimes_get_TickCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_OffsetFromStart_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *OffsetFromStart);
-void __RPC_STUB ISpeechRecoResultTimes_get_OffsetFromStart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResultTimes_INTERFACE_DEFINED__ */
 
@@ -19663,29 +16304,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19693,7 +16334,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19705,26 +16346,27 @@
 
     /*** ISpeechPhraseAlternate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         ISpeechRecoResult **RecoResult);
 
     HRESULT (STDMETHODCALLTYPE *get_StartElementInResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         LONG *StartElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElementsInResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     END_INTERFACE
 } ISpeechPhraseAlternateVtbl;
+
 interface ISpeechPhraseAlternate {
     CONST_VTBL ISpeechPhraseAlternateVtbl* lpVtbl;
 };
@@ -19791,45 +16433,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_RecoResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    ISpeechRecoResult **RecoResult);
-void __RPC_STUB ISpeechPhraseAlternate_get_RecoResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_StartElementInResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    LONG *StartElement);
-void __RPC_STUB ISpeechPhraseAlternate_get_StartElementInResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_NumberOfElementsInResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseAlternate_get_NumberOfElementsInResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_PhraseInfo_Proxy(
-    ISpeechPhraseAlternate* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechPhraseAlternate_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_Commit_Proxy(
-    ISpeechPhraseAlternate* This);
-void __RPC_STUB ISpeechPhraseAlternate_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseAlternate_INTERFACE_DEFINED__ */
 
@@ -19864,29 +16467,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseAlternates* This);
+        ISpeechPhraseAlternates *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseAlternates* This);
+        ISpeechPhraseAlternates *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19894,7 +16497,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19906,20 +16509,21 @@
 
     /*** ISpeechPhraseAlternates methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         LONG Index,
         ISpeechPhraseAlternate **PhraseAlternate);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseAlternatesVtbl;
+
 interface ISpeechPhraseAlternates {
     CONST_VTBL ISpeechPhraseAlternatesVtbl* lpVtbl;
 };
@@ -19978,31 +16582,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get_Count_Proxy(
-    ISpeechPhraseAlternates* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseAlternates_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_Item_Proxy(
-    ISpeechPhraseAlternates* This,
-    LONG Index,
-    ISpeechPhraseAlternate **PhraseAlternate);
-void __RPC_STUB ISpeechPhraseAlternates_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get__NewEnum_Proxy(
-    ISpeechPhraseAlternates* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseAlternates_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseAlternates_INTERFACE_DEFINED__ */
 
@@ -20081,29 +16660,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseInfo* This);
+        ISpeechPhraseInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseInfo* This);
+        ISpeechPhraseInfo *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20111,7 +16690,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20123,70 +16702,70 @@
 
     /*** ISpeechPhraseInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LanguageId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *get_GrammarId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *GrammarId);
 
     HRESULT (STDMETHODCALLTYPE *get_StartTime)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *StartTime);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioStreamPosition)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *AudioStreamPosition);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *pAudioSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *RetainedSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *AudioSizeTime);
 
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Properties)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseProperties **Properties);
 
     HRESULT (STDMETHODCALLTYPE *get_Elements)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseElements **Elements);
 
     HRESULT (STDMETHODCALLTYPE *get_Replacements)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseReplacements **Replacements);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         BSTR *EngineIdGuid);
 
     HRESULT (STDMETHODCALLTYPE *get_EnginePrivateData)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *PrivateData);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *PhraseBlock);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG StartElement,
         LONG Elements,
         VARIANT_BOOL UseReplacements,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayAttributes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG StartElement,
         LONG Elements,
         VARIANT_BOOL UseReplacements,
@@ -20194,6 +16773,7 @@
 
     END_INTERFACE
 } ISpeechPhraseInfoVtbl;
+
 interface ISpeechPhraseInfo {
     CONST_VTBL ISpeechPhraseInfoVtbl* lpVtbl;
 };
@@ -20304,140 +16884,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_LanguageId_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *LanguageId);
-void __RPC_STUB ISpeechPhraseInfo_get_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_GrammarId_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *GrammarId);
-void __RPC_STUB ISpeechPhraseInfo_get_GrammarId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_StartTime_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *StartTime);
-void __RPC_STUB ISpeechPhraseInfo_get_StartTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioStreamPosition_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *AudioStreamPosition);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioStreamPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeBytes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *pAudioSizeBytes);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_RetainedSizeBytes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *RetainedSizeBytes);
-void __RPC_STUB ISpeechPhraseInfo_get_RetainedSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeTime_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *AudioSizeTime);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Rule_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseRule **Rule);
-void __RPC_STUB ISpeechPhraseInfo_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Properties_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseProperties **Properties);
-void __RPC_STUB ISpeechPhraseInfo_get_Properties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Elements_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseElements **Elements);
-void __RPC_STUB ISpeechPhraseInfo_get_Elements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Replacements_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseReplacements **Replacements);
-void __RPC_STUB ISpeechPhraseInfo_get_Replacements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EngineId_Proxy(
-    ISpeechPhraseInfo* This,
-    BSTR *EngineIdGuid);
-void __RPC_STUB ISpeechPhraseInfo_get_EngineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EnginePrivateData_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *PrivateData);
-void __RPC_STUB ISpeechPhraseInfo_get_EnginePrivateData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_SaveToMemory_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *PhraseBlock);
-void __RPC_STUB ISpeechPhraseInfo_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetText_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG StartElement,
-    LONG Elements,
-    VARIANT_BOOL UseReplacements,
-    BSTR *Text);
-void __RPC_STUB ISpeechPhraseInfo_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetDisplayAttributes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG StartElement,
-    LONG Elements,
-    VARIANT_BOOL UseReplacements,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseInfo_GetDisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseInfo_INTERFACE_DEFINED__ */
 
@@ -20501,29 +16947,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseElement* This);
+        ISpeechPhraseElement *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseElement* This);
+        ISpeechPhraseElement *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20531,7 +16977,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20543,59 +16989,60 @@
 
     /*** ISpeechPhraseElement methods ***/
     HRESULT (STDMETHODCALLTYPE *get_AudioTimeOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioTimeOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioSizeTime);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioStreamOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioStreamOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedStreamOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *RetainedStreamOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *RetainedSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayText)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         BSTR *DisplayText);
 
     HRESULT (STDMETHODCALLTYPE *get_LexicalForm)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         BSTR *LexicalForm);
 
     HRESULT (STDMETHODCALLTYPE *get_Pronunciation)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         VARIANT *Pronunciation);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechDisplayAttributes *DisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *get_RequiredConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechEngineConfidence *RequiredConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_ActualConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechEngineConfidence *ActualConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         float *EngineConfidence);
 
     END_INTERFACE
 } ISpeechPhraseElementVtbl;
+
 interface ISpeechPhraseElement {
     CONST_VTBL ISpeechPhraseElementVtbl* lpVtbl;
 };
@@ -20694,110 +17141,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioTimeOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioTimeOffset);
-void __RPC_STUB ISpeechPhraseElement_get_AudioTimeOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeTime_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioSizeTime);
-void __RPC_STUB ISpeechPhraseElement_get_AudioSizeTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioStreamOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioStreamOffset);
-void __RPC_STUB ISpeechPhraseElement_get_AudioStreamOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeBytes_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioSizeBytes);
-void __RPC_STUB ISpeechPhraseElement_get_AudioSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedStreamOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *RetainedStreamOffset);
-void __RPC_STUB ISpeechPhraseElement_get_RetainedStreamOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedSizeBytes_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *RetainedSizeBytes);
-void __RPC_STUB ISpeechPhraseElement_get_RetainedSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayText_Proxy(
-    ISpeechPhraseElement* This,
-    BSTR *DisplayText);
-void __RPC_STUB ISpeechPhraseElement_get_DisplayText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_LexicalForm_Proxy(
-    ISpeechPhraseElement* This,
-    BSTR *LexicalForm);
-void __RPC_STUB ISpeechPhraseElement_get_LexicalForm_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_Pronunciation_Proxy(
-    ISpeechPhraseElement* This,
-    VARIANT *Pronunciation);
-void __RPC_STUB ISpeechPhraseElement_get_Pronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayAttributes_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseElement_get_DisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RequiredConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechEngineConfidence *RequiredConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_RequiredConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_ActualConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechEngineConfidence *ActualConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_ActualConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_EngineConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    float *EngineConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseElement_INTERFACE_DEFINED__ */
 
@@ -20832,29 +17175,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseElements* This);
+        ISpeechPhraseElements *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseElements* This);
+        ISpeechPhraseElements *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20862,7 +17205,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20874,20 +17217,21 @@
 
     /*** ISpeechPhraseElements methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         LONG Index,
         ISpeechPhraseElement **Element);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseElementsVtbl;
+
 interface ISpeechPhraseElements {
     CONST_VTBL ISpeechPhraseElementsVtbl* lpVtbl;
 };
@@ -20946,31 +17290,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get_Count_Proxy(
-    ISpeechPhraseElements* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseElements_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_Item_Proxy(
-    ISpeechPhraseElements* This,
-    LONG Index,
-    ISpeechPhraseElement **Element);
-void __RPC_STUB ISpeechPhraseElements_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get__NewEnum_Proxy(
-    ISpeechPhraseElements* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseElements_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseElements_INTERFACE_DEFINED__ */
 
@@ -21007,29 +17326,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseReplacement* This);
+        ISpeechPhraseReplacement *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseReplacement* This);
+        ISpeechPhraseReplacement *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21037,7 +17356,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21049,23 +17368,24 @@
 
     /*** ISpeechPhraseReplacement methods ***/
     HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         SpeechDisplayAttributes *DisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *get_Text)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         LONG *NumberOfElements);
 
     END_INTERFACE
 } ISpeechPhraseReplacementVtbl;
+
 interface ISpeechPhraseReplacement {
     CONST_VTBL ISpeechPhraseReplacementVtbl* lpVtbl;
 };
@@ -21128,38 +17448,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_DisplayAttributes_Proxy(
-    ISpeechPhraseReplacement* This,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseReplacement_get_DisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_Text_Proxy(
-    ISpeechPhraseReplacement* This,
-    BSTR *Text);
-void __RPC_STUB ISpeechPhraseReplacement_get_Text_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_FirstElement_Proxy(
-    ISpeechPhraseReplacement* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseReplacement_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_NumberOfElements_Proxy(
-    ISpeechPhraseReplacement* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseReplacement_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseReplacement_INTERFACE_DEFINED__ */
 
@@ -21194,29 +17482,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseReplacements* This);
+        ISpeechPhraseReplacements *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseReplacements* This);
+        ISpeechPhraseReplacements *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21224,7 +17512,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21236,20 +17524,21 @@
 
     /*** ISpeechPhraseReplacements methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         LONG Index,
         ISpeechPhraseReplacement **Reps);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseReplacementsVtbl;
+
 interface ISpeechPhraseReplacements {
     CONST_VTBL ISpeechPhraseReplacementsVtbl* lpVtbl;
 };
@@ -21308,31 +17597,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get_Count_Proxy(
-    ISpeechPhraseReplacements* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseReplacements_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_Item_Proxy(
-    ISpeechPhraseReplacements* This,
-    LONG Index,
-    ISpeechPhraseReplacement **Reps);
-void __RPC_STUB ISpeechPhraseReplacements_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get__NewEnum_Proxy(
-    ISpeechPhraseReplacements* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseReplacements_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseReplacements_INTERFACE_DEFINED__ */
 
@@ -21384,29 +17648,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseProperty* This);
+        ISpeechPhraseProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseProperty* This);
+        ISpeechPhraseProperty *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21414,7 +17678,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21426,43 +17690,44 @@
 
     /*** ISpeechPhraseProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         float *Confidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Confidence)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         SpeechEngineConfidence *Confidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         ISpeechPhraseProperty **ParentProperty);
 
     HRESULT (STDMETHODCALLTYPE *get_Children)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         ISpeechPhraseProperties **Children);
 
     END_INTERFACE
 } ISpeechPhrasePropertyVtbl;
+
 interface ISpeechPhraseProperty {
     CONST_VTBL ISpeechPhrasePropertyVtbl* lpVtbl;
 };
@@ -21545,78 +17810,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Name_Proxy(
-    ISpeechPhraseProperty* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechPhraseProperty_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Id_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *Id);
-void __RPC_STUB ISpeechPhraseProperty_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Value_Proxy(
-    ISpeechPhraseProperty* This,
-    VARIANT *Value);
-void __RPC_STUB ISpeechPhraseProperty_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_FirstElement_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseProperty_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_NumberOfElements_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseProperty_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_EngineConfidence_Proxy(
-    ISpeechPhraseProperty* This,
-    float *Confidence);
-void __RPC_STUB ISpeechPhraseProperty_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Confidence_Proxy(
-    ISpeechPhraseProperty* This,
-    SpeechEngineConfidence *Confidence);
-void __RPC_STUB ISpeechPhraseProperty_get_Confidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Parent_Proxy(
-    ISpeechPhraseProperty* This,
-    ISpeechPhraseProperty **ParentProperty);
-void __RPC_STUB ISpeechPhraseProperty_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Children_Proxy(
-    ISpeechPhraseProperty* This,
-    ISpeechPhraseProperties **Children);
-void __RPC_STUB ISpeechPhraseProperty_get_Children_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseProperty_INTERFACE_DEFINED__ */
 
@@ -21651,29 +17844,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseProperties* This);
+        ISpeechPhraseProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseProperties* This);
+        ISpeechPhraseProperties *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21681,7 +17874,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21693,20 +17886,21 @@
 
     /*** ISpeechPhraseProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         LONG Index,
         ISpeechPhraseProperty **Property);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhrasePropertiesVtbl;
+
 interface ISpeechPhraseProperties {
     CONST_VTBL ISpeechPhrasePropertiesVtbl* lpVtbl;
 };
@@ -21765,31 +17959,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get_Count_Proxy(
-    ISpeechPhraseProperties* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseProperties_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_Item_Proxy(
-    ISpeechPhraseProperties* This,
-    LONG Index,
-    ISpeechPhraseProperty **Property);
-void __RPC_STUB ISpeechPhraseProperties_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get__NewEnum_Proxy(
-    ISpeechPhraseProperties* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseProperties_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseProperties_INTERFACE_DEFINED__ */
 
@@ -21838,29 +18007,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseRule* This);
+        ISpeechPhraseRule *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseRule* This);
+        ISpeechPhraseRule *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21868,7 +18037,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21880,39 +18049,40 @@
 
     /*** ISpeechPhraseRule methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         ISpeechPhraseRule **Parent);
 
     HRESULT (STDMETHODCALLTYPE *get_Children)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         ISpeechPhraseRules **Children);
 
     HRESULT (STDMETHODCALLTYPE *get_Confidence)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         SpeechEngineConfidence *ActualConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         float *EngineConfidence);
 
     END_INTERFACE
 } ISpeechPhraseRuleVtbl;
+
 interface ISpeechPhraseRule {
     CONST_VTBL ISpeechPhraseRuleVtbl* lpVtbl;
 };
@@ -21991,70 +18161,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Name_Proxy(
-    ISpeechPhraseRule* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechPhraseRule_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Id_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *Id);
-void __RPC_STUB ISpeechPhraseRule_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_FirstElement_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseRule_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_NumberOfElements_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseRule_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Parent_Proxy(
-    ISpeechPhraseRule* This,
-    ISpeechPhraseRule **Parent);
-void __RPC_STUB ISpeechPhraseRule_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Children_Proxy(
-    ISpeechPhraseRule* This,
-    ISpeechPhraseRules **Children);
-void __RPC_STUB ISpeechPhraseRule_get_Children_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Confidence_Proxy(
-    ISpeechPhraseRule* This,
-    SpeechEngineConfidence *ActualConfidence);
-void __RPC_STUB ISpeechPhraseRule_get_Confidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_EngineConfidence_Proxy(
-    ISpeechPhraseRule* This,
-    float *EngineConfidence);
-void __RPC_STUB ISpeechPhraseRule_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseRule_INTERFACE_DEFINED__ */
 
@@ -22089,29 +18195,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseRules* This);
+        ISpeechPhraseRules *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseRules* This);
+        ISpeechPhraseRules *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22119,7 +18225,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22131,20 +18237,21 @@
 
     /*** ISpeechPhraseRules methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         LONG Index,
         ISpeechPhraseRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseRulesVtbl;
+
 interface ISpeechPhraseRules {
     CONST_VTBL ISpeechPhraseRulesVtbl* lpVtbl;
 };
@@ -22203,31 +18310,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get_Count_Proxy(
-    ISpeechPhraseRules* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseRules_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_Item_Proxy(
-    ISpeechPhraseRules* This,
-    LONG Index,
-    ISpeechPhraseRule **Rule);
-void __RPC_STUB ISpeechPhraseRules_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get__NewEnum_Proxy(
-    ISpeechPhraseRules* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseRules_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseRules_INTERFACE_DEFINED__ */
 
@@ -22262,29 +18344,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconWords* This);
+        ISpeechLexiconWords *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconWords* This);
+        ISpeechLexiconWords *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22292,7 +18374,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22304,20 +18386,21 @@
 
     /*** ISpeechLexiconWords methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         LONG Index,
         ISpeechLexiconWord **Word);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechLexiconWordsVtbl;
+
 interface ISpeechLexiconWords {
     CONST_VTBL ISpeechLexiconWordsVtbl* lpVtbl;
 };
@@ -22376,31 +18459,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get_Count_Proxy(
-    ISpeechLexiconWords* This,
-    LONG *Count);
-void __RPC_STUB ISpeechLexiconWords_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_Item_Proxy(
-    ISpeechLexiconWords* This,
-    LONG Index,
-    ISpeechLexiconWord **Word);
-void __RPC_STUB ISpeechLexiconWords_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get__NewEnum_Proxy(
-    ISpeechLexiconWords* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechLexiconWords_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconWords_INTERFACE_DEFINED__ */
 
@@ -22467,29 +18525,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexicon* This);
+        ISpeechLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexicon* This);
+        ISpeechLexicon *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22497,7 +18555,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22509,57 +18567,58 @@
 
     /*** ISpeechLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *get_GenerationId)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         LONG *GenerationId);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         SpeechLexiconType Flags,
         LONG *GenerationID,
         ISpeechLexiconWords **Words);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         BSTR bstrPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciationByPhoneIds)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         BSTR bstrPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciationByPhoneIds)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechLexiconType TypeFlags,
         ISpeechLexiconPronunciations **ppPronunciations);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         LONG *GenerationID,
         ISpeechLexiconWords **ppWords);
 
     END_INTERFACE
 } ISpeechLexiconVtbl;
+
 interface ISpeechLexicon {
     CONST_VTBL ISpeechLexiconVtbl* lpVtbl;
 };
@@ -22638,88 +18697,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_get_GenerationId_Proxy(
-    ISpeechLexicon* This,
-    LONG *GenerationId);
-void __RPC_STUB ISpeechLexicon_get_GenerationId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetWords_Proxy(
-    ISpeechLexicon* This,
-    SpeechLexiconType Flags,
-    LONG *GenerationID,
-    ISpeechLexiconWords **Words);
-void __RPC_STUB ISpeechLexicon_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciation_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    BSTR bstrPronunciation);
-void __RPC_STUB ISpeechLexicon_AddPronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciationByPhoneIds_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexicon_AddPronunciationByPhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciation_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    BSTR bstrPronunciation);
-void __RPC_STUB ISpeechLexicon_RemovePronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciationByPhoneIds_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexicon_RemovePronunciationByPhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetPronunciations_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechLexiconType TypeFlags,
-    ISpeechLexiconPronunciations **ppPronunciations);
-void __RPC_STUB ISpeechLexicon_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetGenerationChange_Proxy(
-    ISpeechLexicon* This,
-    LONG *GenerationID,
-    ISpeechLexiconWords **ppWords);
-void __RPC_STUB ISpeechLexicon_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexicon_INTERFACE_DEFINED__ */
 
@@ -22756,29 +18733,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconWord* This);
+        ISpeechLexiconWord *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconWord* This);
+        ISpeechLexiconWord *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22786,7 +18763,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22798,23 +18775,24 @@
 
     /*** ISpeechLexiconWord methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LangId)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         SpeechLanguageId *LangId);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         SpeechWordType *WordType);
 
     HRESULT (STDMETHODCALLTYPE *get_Word)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         BSTR *Word);
 
     HRESULT (STDMETHODCALLTYPE *get_Pronunciations)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         ISpeechLexiconPronunciations **Pronunciations);
 
     END_INTERFACE
 } ISpeechLexiconWordVtbl;
+
 interface ISpeechLexiconWord {
     CONST_VTBL ISpeechLexiconWordVtbl* lpVtbl;
 };
@@ -22877,38 +18855,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_LangId_Proxy(
-    ISpeechLexiconWord* This,
-    SpeechLanguageId *LangId);
-void __RPC_STUB ISpeechLexiconWord_get_LangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Type_Proxy(
-    ISpeechLexiconWord* This,
-    SpeechWordType *WordType);
-void __RPC_STUB ISpeechLexiconWord_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Word_Proxy(
-    ISpeechLexiconWord* This,
-    BSTR *Word);
-void __RPC_STUB ISpeechLexiconWord_get_Word_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Pronunciations_Proxy(
-    ISpeechLexiconWord* This,
-    ISpeechLexiconPronunciations **Pronunciations);
-void __RPC_STUB ISpeechLexiconWord_get_Pronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconWord_INTERFACE_DEFINED__ */
 
@@ -22943,29 +18889,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconPronunciations* This);
+        ISpeechLexiconPronunciations *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconPronunciations* This);
+        ISpeechLexiconPronunciations *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22973,7 +18919,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22985,20 +18931,21 @@
 
     /*** ISpeechLexiconPronunciations methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         LONG Index,
         ISpeechLexiconPronunciation **Pronunciation);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechLexiconPronunciationsVtbl;
+
 interface ISpeechLexiconPronunciations {
     CONST_VTBL ISpeechLexiconPronunciationsVtbl* lpVtbl;
 };
@@ -23057,31 +19004,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get_Count_Proxy(
-    ISpeechLexiconPronunciations* This,
-    LONG *Count);
-void __RPC_STUB ISpeechLexiconPronunciations_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_Item_Proxy(
-    ISpeechLexiconPronunciations* This,
-    LONG Index,
-    ISpeechLexiconPronunciation **Pronunciation);
-void __RPC_STUB ISpeechLexiconPronunciations_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get__NewEnum_Proxy(
-    ISpeechLexiconPronunciations* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechLexiconPronunciations_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconPronunciations_INTERFACE_DEFINED__ */
 
@@ -23121,29 +19043,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconPronunciation* This);
+        ISpeechLexiconPronunciation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconPronunciation* This);
+        ISpeechLexiconPronunciation *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23151,7 +19073,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23163,27 +19085,28 @@
 
     /*** ISpeechLexiconPronunciation methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechLexiconType *LexiconType);
 
     HRESULT (STDMETHODCALLTYPE *get_LangId)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechLanguageId *LangId);
 
     HRESULT (STDMETHODCALLTYPE *get_PartOfSpeech)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechPartOfSpeech *PartOfSpeech);
 
     HRESULT (STDMETHODCALLTYPE *get_PhoneIds)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *get_Symbolic)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         BSTR *Symbolic);
 
     END_INTERFACE
 } ISpeechLexiconPronunciationVtbl;
+
 interface ISpeechLexiconPronunciation {
     CONST_VTBL ISpeechLexiconPronunciationVtbl* lpVtbl;
 };
@@ -23250,46 +19173,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Type_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechLexiconType *LexiconType);
-void __RPC_STUB ISpeechLexiconPronunciation_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_LangId_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechLanguageId *LangId);
-void __RPC_STUB ISpeechLexiconPronunciation_get_LangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PartOfSpeech_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechPartOfSpeech *PartOfSpeech);
-void __RPC_STUB ISpeechLexiconPronunciation_get_PartOfSpeech_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PhoneIds_Proxy(
-    ISpeechLexiconPronunciation* This,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexiconPronunciation_get_PhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Symbolic_Proxy(
-    ISpeechLexiconPronunciation* This,
-    BSTR *Symbolic);
-void __RPC_STUB ISpeechLexiconPronunciation_get_Symbolic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconPronunciation_INTERFACE_DEFINED__ */
 
@@ -23328,29 +19211,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhoneConverter* This);
+        ISpeechPhoneConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhoneConverter* This);
+        ISpeechPhoneConverter *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23358,7 +19241,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23370,25 +19253,26 @@
 
     /*** ISpeechPhoneConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LanguageId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         SpeechLanguageId *LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *put_LanguageId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         SpeechLanguageId LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *PhoneToId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         const BSTR Phonemes,
         VARIANT *IdArray);
 
     HRESULT (STDMETHODCALLTYPE *IdToPhone)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         const VARIANT IdArray,
         BSTR *Phonemes);
 
     END_INTERFACE
 } ISpeechPhoneConverterVtbl;
+
 interface ISpeechPhoneConverter {
     CONST_VTBL ISpeechPhoneConverterVtbl* lpVtbl;
 };
@@ -23451,40 +19335,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_get_LanguageId_Proxy(
-    ISpeechPhoneConverter* This,
-    SpeechLanguageId *LanguageId);
-void __RPC_STUB ISpeechPhoneConverter_get_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_put_LanguageId_Proxy(
-    ISpeechPhoneConverter* This,
-    SpeechLanguageId LanguageId);
-void __RPC_STUB ISpeechPhoneConverter_put_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_PhoneToId_Proxy(
-    ISpeechPhoneConverter* This,
-    const BSTR Phonemes,
-    VARIANT *IdArray);
-void __RPC_STUB ISpeechPhoneConverter_PhoneToId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_IdToPhone_Proxy(
-    ISpeechPhoneConverter* This,
-    const VARIANT IdArray,
-    BSTR *Phonemes);
-void __RPC_STUB ISpeechPhoneConverter_IdToPhone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhoneConverter_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/sapi53.h b/mingw-w64-headers/include/sapi53.h
index 1abbd5a..e35b59d 100644
--- a/mingw-w64-headers/include/sapi53.h
+++ b/mingw-w64-headers/include/sapi53.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/sapi53.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/sapi53.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,486 +20,777 @@
 #ifndef __ISpNotifySource_FWD_DEFINED__
 #define __ISpNotifySource_FWD_DEFINED__
 typedef interface ISpNotifySource ISpNotifySource;
+#ifdef __cplusplus
+interface ISpNotifySource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifySink_FWD_DEFINED__
 #define __ISpNotifySink_FWD_DEFINED__
 typedef interface ISpNotifySink ISpNotifySink;
+#ifdef __cplusplus
+interface ISpNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifyTranslator_FWD_DEFINED__
 #define __ISpNotifyTranslator_FWD_DEFINED__
 typedef interface ISpNotifyTranslator ISpNotifyTranslator;
+#ifdef __cplusplus
+interface ISpNotifyTranslator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDataKey_FWD_DEFINED__
 #define __ISpDataKey_FWD_DEFINED__
 typedef interface ISpDataKey ISpDataKey;
+#ifdef __cplusplus
+interface ISpDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectWithToken_FWD_DEFINED__
 #define __ISpObjectWithToken_FWD_DEFINED__
 typedef interface ISpObjectWithToken ISpObjectWithToken;
+#ifdef __cplusplus
+interface ISpObjectWithToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSpObjectTokens_FWD_DEFINED__
 #define __IEnumSpObjectTokens_FWD_DEFINED__
 typedef interface IEnumSpObjectTokens IEnumSpObjectTokens;
+#ifdef __cplusplus
+interface IEnumSpObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRegDataKey_FWD_DEFINED__
 #define __ISpRegDataKey_FWD_DEFINED__
 typedef interface ISpRegDataKey ISpRegDataKey;
+#ifdef __cplusplus
+interface ISpRegDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenCategory_FWD_DEFINED__
 #define __ISpObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpObjectTokenCategory ISpObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectToken_FWD_DEFINED__
 #define __ISpObjectToken_FWD_DEFINED__
 typedef interface ISpObjectToken ISpObjectToken;
+#ifdef __cplusplus
+interface ISpObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenInit_FWD_DEFINED__
 #define __ISpObjectTokenInit_FWD_DEFINED__
 typedef interface ISpObjectTokenInit ISpObjectTokenInit;
+#ifdef __cplusplus
+interface ISpObjectTokenInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpResourceManager_FWD_DEFINED__
 #define __ISpResourceManager_FWD_DEFINED__
 typedef interface ISpResourceManager ISpResourceManager;
+#ifdef __cplusplus
+interface ISpResourceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource_FWD_DEFINED__
 #define __ISpEventSource_FWD_DEFINED__
 typedef interface ISpEventSource ISpEventSource;
+#ifdef __cplusplus
+interface ISpEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource2_FWD_DEFINED__
 #define __ISpEventSource2_FWD_DEFINED__
 typedef interface ISpEventSource2 ISpEventSource2;
+#ifdef __cplusplus
+interface ISpEventSource2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSink_FWD_DEFINED__
 #define __ISpEventSink_FWD_DEFINED__
 typedef interface ISpEventSink ISpEventSink;
+#ifdef __cplusplus
+interface ISpEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormat_FWD_DEFINED__
 #define __ISpStreamFormat_FWD_DEFINED__
 typedef interface ISpStreamFormat ISpStreamFormat;
+#ifdef __cplusplus
+interface ISpStreamFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStream_FWD_DEFINED__
 #define __ISpStream_FWD_DEFINED__
 typedef interface ISpStream ISpStream;
+#ifdef __cplusplus
+interface ISpStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormatConverter_FWD_DEFINED__
 #define __ISpStreamFormatConverter_FWD_DEFINED__
 typedef interface ISpStreamFormatConverter ISpStreamFormatConverter;
+#ifdef __cplusplus
+interface ISpStreamFormatConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpAudio_FWD_DEFINED__
 #define __ISpAudio_FWD_DEFINED__
 typedef interface ISpAudio ISpAudio;
+#ifdef __cplusplus
+interface ISpAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpMMSysAudio_FWD_DEFINED__
 #define __ISpMMSysAudio_FWD_DEFINED__
 typedef interface ISpMMSysAudio ISpMMSysAudio;
+#ifdef __cplusplus
+interface ISpMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpTranscript_FWD_DEFINED__
 #define __ISpTranscript_FWD_DEFINED__
 typedef interface ISpTranscript ISpTranscript;
+#ifdef __cplusplus
+interface ISpTranscript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpLexicon_FWD_DEFINED__
 #define __ISpLexicon_FWD_DEFINED__
 typedef interface ISpLexicon ISpLexicon;
+#ifdef __cplusplus
+interface ISpLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpContainerLexicon_FWD_DEFINED__
 #define __ISpContainerLexicon_FWD_DEFINED__
 typedef interface ISpContainerLexicon ISpContainerLexicon;
+#ifdef __cplusplus
+interface ISpContainerLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpShortcut_FWD_DEFINED__
 #define __ISpShortcut_FWD_DEFINED__
 typedef interface ISpShortcut ISpShortcut;
+#ifdef __cplusplus
+interface ISpShortcut;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneConverter_FWD_DEFINED__
 #define __ISpPhoneConverter_FWD_DEFINED__
 typedef interface ISpPhoneConverter ISpPhoneConverter;
+#ifdef __cplusplus
+interface ISpPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetSelection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpVoice_FWD_DEFINED__
 #define __ISpVoice_FWD_DEFINED__
 typedef interface ISpVoice ISpVoice;
+#ifdef __cplusplus
+interface ISpVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase_FWD_DEFINED__
 #define __ISpPhrase_FWD_DEFINED__
 typedef interface ISpPhrase ISpPhrase;
+#ifdef __cplusplus
+interface ISpPhrase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhraseAlt_FWD_DEFINED__
 #define __ISpPhraseAlt_FWD_DEFINED__
 typedef interface ISpPhraseAlt ISpPhraseAlt;
+#ifdef __cplusplus
+interface ISpPhraseAlt;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase2_FWD_DEFINED__
 #define __ISpPhrase2_FWD_DEFINED__
 typedef interface ISpPhrase2 ISpPhrase2;
+#ifdef __cplusplus
+interface ISpPhrase2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult_FWD_DEFINED__
 #define __ISpRecoResult_FWD_DEFINED__
 typedef interface ISpRecoResult ISpRecoResult;
+#ifdef __cplusplus
+interface ISpRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult2_FWD_DEFINED__
 #define __ISpRecoResult2_FWD_DEFINED__
 typedef interface ISpRecoResult2 ISpRecoResult2;
+#ifdef __cplusplus
+interface ISpRecoResult2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpXMLRecoResult_FWD_DEFINED__
 #define __ISpXMLRecoResult_FWD_DEFINED__
 typedef interface ISpXMLRecoResult ISpXMLRecoResult;
+#ifdef __cplusplus
+interface ISpXMLRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpGrammarBuilder_FWD_DEFINED__
 #define __ISpGrammarBuilder_FWD_DEFINED__
 typedef interface ISpGrammarBuilder ISpGrammarBuilder;
+#ifdef __cplusplus
+interface ISpGrammarBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar_FWD_DEFINED__
 #define __ISpRecoGrammar_FWD_DEFINED__
 typedef interface ISpRecoGrammar ISpRecoGrammar;
+#ifdef __cplusplus
+interface ISpRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpGrammarBuilder2_FWD_DEFINED__
 #define __ISpGrammarBuilder2_FWD_DEFINED__
 typedef interface ISpGrammarBuilder2 ISpGrammarBuilder2;
+#ifdef __cplusplus
+interface ISpGrammarBuilder2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar2_FWD_DEFINED__
 #define __ISpRecoGrammar2_FWD_DEFINED__
 typedef interface ISpRecoGrammar2 ISpRecoGrammar2;
+#ifdef __cplusplus
+interface ISpRecoGrammar2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechResourceLoader_FWD_DEFINED__
 #define __ISpeechResourceLoader_FWD_DEFINED__
 typedef interface ISpeechResourceLoader ISpeechResourceLoader;
+#ifdef __cplusplus
+interface ISpeechResourceLoader;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext_FWD_DEFINED__
 #define __ISpRecoContext_FWD_DEFINED__
 typedef interface ISpRecoContext ISpRecoContext;
+#ifdef __cplusplus
+interface ISpRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext2_FWD_DEFINED__
 #define __ISpRecoContext2_FWD_DEFINED__
 typedef interface ISpRecoContext2 ISpRecoContext2;
+#ifdef __cplusplus
+interface ISpRecoContext2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpProperties_FWD_DEFINED__
 #define __ISpProperties_FWD_DEFINED__
 typedef interface ISpProperties ISpProperties;
+#ifdef __cplusplus
+interface ISpProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer_FWD_DEFINED__
 #define __ISpRecognizer_FWD_DEFINED__
 typedef interface ISpRecognizer ISpRecognizer;
+#ifdef __cplusplus
+interface ISpRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpSerializeState_FWD_DEFINED__
 #define __ISpSerializeState_FWD_DEFINED__
 typedef interface ISpSerializeState ISpSerializeState;
+#ifdef __cplusplus
+interface ISpSerializeState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer2_FWD_DEFINED__
 #define __ISpRecognizer2_FWD_DEFINED__
 typedef interface ISpRecognizer2 ISpRecognizer2;
+#ifdef __cplusplus
+interface ISpRecognizer2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEnginePronunciation_FWD_DEFINED__
 #define __ISpEnginePronunciation_FWD_DEFINED__
 typedef interface ISpEnginePronunciation ISpEnginePronunciation;
+#ifdef __cplusplus
+interface ISpEnginePronunciation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDisplayAlternates_FWD_DEFINED__
 #define __ISpDisplayAlternates_FWD_DEFINED__
 typedef interface ISpDisplayAlternates ISpDisplayAlternates;
+#ifdef __cplusplus
+interface ISpDisplayAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechDataKey_FWD_DEFINED__
 #define __ISpeechDataKey_FWD_DEFINED__
 typedef interface ISpeechDataKey ISpeechDataKey;
+#ifdef __cplusplus
+interface ISpeechDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectToken_FWD_DEFINED__
 #define __ISpeechObjectToken_FWD_DEFINED__
 typedef interface ISpeechObjectToken ISpeechObjectToken;
+#ifdef __cplusplus
+interface ISpeechObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokens_FWD_DEFINED__
 #define __ISpeechObjectTokens_FWD_DEFINED__
 typedef interface ISpeechObjectTokens ISpeechObjectTokens;
+#ifdef __cplusplus
+interface ISpeechObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__
 #define __ISpeechObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpeechObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioFormat_FWD_DEFINED__
 #define __ISpeechAudioFormat_FWD_DEFINED__
 typedef interface ISpeechAudioFormat ISpeechAudioFormat;
+#ifdef __cplusplus
+interface ISpeechAudioFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechBaseStream_FWD_DEFINED__
 #define __ISpeechBaseStream_FWD_DEFINED__
 typedef interface ISpeechBaseStream ISpeechBaseStream;
+#ifdef __cplusplus
+interface ISpeechBaseStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudio_FWD_DEFINED__
 #define __ISpeechAudio_FWD_DEFINED__
 typedef interface ISpeechAudio ISpeechAudio;
+#ifdef __cplusplus
+interface ISpeechAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMMSysAudio_FWD_DEFINED__
 #define __ISpeechMMSysAudio_FWD_DEFINED__
 typedef interface ISpeechMMSysAudio ISpeechMMSysAudio;
+#ifdef __cplusplus
+interface ISpeechMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechFileStream_FWD_DEFINED__
 #define __ISpeechFileStream_FWD_DEFINED__
 typedef interface ISpeechFileStream ISpeechFileStream;
+#ifdef __cplusplus
+interface ISpeechFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechCustomStream_FWD_DEFINED__
 #define __ISpeechCustomStream_FWD_DEFINED__
 typedef interface ISpeechCustomStream ISpeechCustomStream;
+#ifdef __cplusplus
+interface ISpeechCustomStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMemoryStream_FWD_DEFINED__
 #define __ISpeechMemoryStream_FWD_DEFINED__
 typedef interface ISpeechMemoryStream ISpeechMemoryStream;
+#ifdef __cplusplus
+interface ISpeechMemoryStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioStatus_FWD_DEFINED__
 #define __ISpeechAudioStatus_FWD_DEFINED__
 typedef interface ISpeechAudioStatus ISpeechAudioStatus;
+#ifdef __cplusplus
+interface ISpeechAudioStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__
 #define __ISpeechAudioBufferInfo_FWD_DEFINED__
 typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo;
+#ifdef __cplusplus
+interface ISpeechAudioBufferInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__
 #define __ISpeechWaveFormatEx_FWD_DEFINED__
 typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx;
+#ifdef __cplusplus
+interface ISpeechWaveFormatEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoice_FWD_DEFINED__
 #define __ISpeechVoice_FWD_DEFINED__
 typedef interface ISpeechVoice ISpeechVoice;
+#ifdef __cplusplus
+interface ISpeechVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoiceStatus_FWD_DEFINED__
 #define __ISpeechVoiceStatus_FWD_DEFINED__
 typedef interface ISpeechVoiceStatus ISpeechVoiceStatus;
+#ifdef __cplusplus
+interface ISpeechVoiceStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__
 #define ___ISpeechVoiceEvents_FWD_DEFINED__
 typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents;
+#ifdef __cplusplus
+interface _ISpeechVoiceEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizer_FWD_DEFINED__
 #define __ISpeechRecognizer_FWD_DEFINED__
 typedef interface ISpeechRecognizer ISpeechRecognizer;
+#ifdef __cplusplus
+interface ISpeechRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__
 #define __ISpeechRecognizerStatus_FWD_DEFINED__
 typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus;
+#ifdef __cplusplus
+interface ISpeechRecognizerStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoContext_FWD_DEFINED__
 #define __ISpeechRecoContext_FWD_DEFINED__
 typedef interface ISpeechRecoContext ISpeechRecoContext;
+#ifdef __cplusplus
+interface ISpeechRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoGrammar_FWD_DEFINED__
 #define __ISpeechRecoGrammar_FWD_DEFINED__
 typedef interface ISpeechRecoGrammar ISpeechRecoGrammar;
+#ifdef __cplusplus
+interface ISpeechRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__
 #define ___ISpeechRecoContextEvents_FWD_DEFINED__
 typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents;
+#ifdef __cplusplus
+interface _ISpeechRecoContextEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRule_FWD_DEFINED__
 #define __ISpeechGrammarRule_FWD_DEFINED__
 typedef interface ISpeechGrammarRule ISpeechGrammarRule;
+#ifdef __cplusplus
+interface ISpeechGrammarRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRules_FWD_DEFINED__
 #define __ISpeechGrammarRules_FWD_DEFINED__
 typedef interface ISpeechGrammarRules ISpeechGrammarRules;
+#ifdef __cplusplus
+interface ISpeechGrammarRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__
 #define __ISpeechGrammarRuleState_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransitions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__
 #define __ISpeechTextSelectionInformation_FWD_DEFINED__
 typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation;
+#ifdef __cplusplus
+interface ISpeechTextSelectionInformation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult_FWD_DEFINED__
 #define __ISpeechRecoResult_FWD_DEFINED__
 typedef interface ISpeechRecoResult ISpeechRecoResult;
+#ifdef __cplusplus
+interface ISpeechRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechXMLRecoResult_FWD_DEFINED__
 #define __ISpeechXMLRecoResult_FWD_DEFINED__
 typedef interface ISpeechXMLRecoResult ISpeechXMLRecoResult;
+#ifdef __cplusplus
+interface ISpeechXMLRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult2_FWD_DEFINED__
 #define __ISpeechRecoResult2_FWD_DEFINED__
 typedef interface ISpeechRecoResult2 ISpeechRecoResult2;
+#ifdef __cplusplus
+interface ISpeechRecoResult2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultDispatch_FWD_DEFINED__
 #define __ISpeechRecoResultDispatch_FWD_DEFINED__
 typedef interface ISpeechRecoResultDispatch ISpeechRecoResultDispatch;
+#ifdef __cplusplus
+interface ISpeechRecoResultDispatch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfoBuilder_FWD_DEFINED__
 #define __ISpeechPhraseInfoBuilder_FWD_DEFINED__
 typedef interface ISpeechPhraseInfoBuilder ISpeechPhraseInfoBuilder;
+#ifdef __cplusplus
+interface ISpeechPhraseInfoBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__
 #define __ISpeechRecoResultTimes_FWD_DEFINED__
 typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes;
+#ifdef __cplusplus
+interface ISpeechRecoResultTimes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__
 #define __ISpeechPhraseAlternate_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__
 #define __ISpeechPhraseAlternates_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfo_FWD_DEFINED__
 #define __ISpeechPhraseInfo_FWD_DEFINED__
 typedef interface ISpeechPhraseInfo ISpeechPhraseInfo;
+#ifdef __cplusplus
+interface ISpeechPhraseInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElement_FWD_DEFINED__
 #define __ISpeechPhraseElement_FWD_DEFINED__
 typedef interface ISpeechPhraseElement ISpeechPhraseElement;
+#ifdef __cplusplus
+interface ISpeechPhraseElement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElements_FWD_DEFINED__
 #define __ISpeechPhraseElements_FWD_DEFINED__
 typedef interface ISpeechPhraseElements ISpeechPhraseElements;
+#ifdef __cplusplus
+interface ISpeechPhraseElements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__
 #define __ISpeechPhraseReplacement_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__
 #define __ISpeechPhraseReplacements_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperty_FWD_DEFINED__
 #define __ISpeechPhraseProperty_FWD_DEFINED__
 typedef interface ISpeechPhraseProperty ISpeechPhraseProperty;
+#ifdef __cplusplus
+interface ISpeechPhraseProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperties_FWD_DEFINED__
 #define __ISpeechPhraseProperties_FWD_DEFINED__
 typedef interface ISpeechPhraseProperties ISpeechPhraseProperties;
+#ifdef __cplusplus
+interface ISpeechPhraseProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRule_FWD_DEFINED__
 #define __ISpeechPhraseRule_FWD_DEFINED__
 typedef interface ISpeechPhraseRule ISpeechPhraseRule;
+#ifdef __cplusplus
+interface ISpeechPhraseRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRules_FWD_DEFINED__
 #define __ISpeechPhraseRules_FWD_DEFINED__
 typedef interface ISpeechPhraseRules ISpeechPhraseRules;
+#ifdef __cplusplus
+interface ISpeechPhraseRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWords_FWD_DEFINED__
 #define __ISpeechLexiconWords_FWD_DEFINED__
 typedef interface ISpeechLexiconWords ISpeechLexiconWords;
+#ifdef __cplusplus
+interface ISpeechLexiconWords;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexicon_FWD_DEFINED__
 #define __ISpeechLexicon_FWD_DEFINED__
 typedef interface ISpeechLexicon ISpeechLexicon;
+#ifdef __cplusplus
+interface ISpeechLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWord_FWD_DEFINED__
 #define __ISpeechLexiconWord_FWD_DEFINED__
 typedef interface ISpeechLexiconWord ISpeechLexiconWord;
+#ifdef __cplusplus
+interface ISpeechLexiconWord;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__
 #define __ISpeechLexiconPronunciations_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciations;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__
 #define __ISpeechLexiconPronunciation_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhoneConverter_FWD_DEFINED__
 #define __ISpeechPhoneConverter_FWD_DEFINED__
 typedef interface ISpeechPhoneConverter ISpeechPhoneConverter;
+#ifdef __cplusplus
+interface ISpeechPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __SpNotifyTranslator_FWD_DEFINED__
@@ -780,161 +1071,257 @@
 #ifndef __ISpNotifySource_FWD_DEFINED__
 #define __ISpNotifySource_FWD_DEFINED__
 typedef interface ISpNotifySource ISpNotifySource;
+#ifdef __cplusplus
+interface ISpNotifySource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifySink_FWD_DEFINED__
 #define __ISpNotifySink_FWD_DEFINED__
 typedef interface ISpNotifySink ISpNotifySink;
+#ifdef __cplusplus
+interface ISpNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifyTranslator_FWD_DEFINED__
 #define __ISpNotifyTranslator_FWD_DEFINED__
 typedef interface ISpNotifyTranslator ISpNotifyTranslator;
+#ifdef __cplusplus
+interface ISpNotifyTranslator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDataKey_FWD_DEFINED__
 #define __ISpDataKey_FWD_DEFINED__
 typedef interface ISpDataKey ISpDataKey;
+#ifdef __cplusplus
+interface ISpDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenCategory_FWD_DEFINED__
 #define __ISpObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpObjectTokenCategory ISpObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectToken_FWD_DEFINED__
 #define __ISpObjectToken_FWD_DEFINED__
 typedef interface ISpObjectToken ISpObjectToken;
+#ifdef __cplusplus
+interface ISpObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSpObjectTokens_FWD_DEFINED__
 #define __IEnumSpObjectTokens_FWD_DEFINED__
 typedef interface IEnumSpObjectTokens IEnumSpObjectTokens;
+#ifdef __cplusplus
+interface IEnumSpObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectWithToken_FWD_DEFINED__
 #define __ISpObjectWithToken_FWD_DEFINED__
 typedef interface ISpObjectWithToken ISpObjectWithToken;
+#ifdef __cplusplus
+interface ISpObjectWithToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpResourceManager_FWD_DEFINED__
 #define __ISpResourceManager_FWD_DEFINED__
 typedef interface ISpResourceManager ISpResourceManager;
+#ifdef __cplusplus
+interface ISpResourceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource_FWD_DEFINED__
 #define __ISpEventSource_FWD_DEFINED__
 typedef interface ISpEventSource ISpEventSource;
+#ifdef __cplusplus
+interface ISpEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSink_FWD_DEFINED__
 #define __ISpEventSink_FWD_DEFINED__
 typedef interface ISpEventSink ISpEventSink;
+#ifdef __cplusplus
+interface ISpEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormat_FWD_DEFINED__
 #define __ISpStreamFormat_FWD_DEFINED__
 typedef interface ISpStreamFormat ISpStreamFormat;
+#ifdef __cplusplus
+interface ISpStreamFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStream_FWD_DEFINED__
 #define __ISpStream_FWD_DEFINED__
 typedef interface ISpStream ISpStream;
+#ifdef __cplusplus
+interface ISpStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormatConverter_FWD_DEFINED__
 #define __ISpStreamFormatConverter_FWD_DEFINED__
 typedef interface ISpStreamFormatConverter ISpStreamFormatConverter;
+#ifdef __cplusplus
+interface ISpStreamFormatConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpAudio_FWD_DEFINED__
 #define __ISpAudio_FWD_DEFINED__
 typedef interface ISpAudio ISpAudio;
+#ifdef __cplusplus
+interface ISpAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpMMSysAudio_FWD_DEFINED__
 #define __ISpMMSysAudio_FWD_DEFINED__
 typedef interface ISpMMSysAudio ISpMMSysAudio;
+#ifdef __cplusplus
+interface ISpMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpTranscript_FWD_DEFINED__
 #define __ISpTranscript_FWD_DEFINED__
 typedef interface ISpTranscript ISpTranscript;
+#ifdef __cplusplus
+interface ISpTranscript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpVoice_FWD_DEFINED__
 #define __ISpVoice_FWD_DEFINED__
 typedef interface ISpVoice ISpVoice;
+#ifdef __cplusplus
+interface ISpVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult_FWD_DEFINED__
 #define __ISpRecoResult_FWD_DEFINED__
 typedef interface ISpRecoResult ISpRecoResult;
+#ifdef __cplusplus
+interface ISpRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext_FWD_DEFINED__
 #define __ISpRecoContext_FWD_DEFINED__
 typedef interface ISpRecoContext ISpRecoContext;
+#ifdef __cplusplus
+interface ISpRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer_FWD_DEFINED__
 #define __ISpRecognizer_FWD_DEFINED__
 typedef interface ISpRecognizer ISpRecognizer;
+#ifdef __cplusplus
+interface ISpRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpProperties_FWD_DEFINED__
 #define __ISpProperties_FWD_DEFINED__
 typedef interface ISpProperties ISpProperties;
+#ifdef __cplusplus
+interface ISpProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpLexicon_FWD_DEFINED__
 #define __ISpLexicon_FWD_DEFINED__
 typedef interface ISpLexicon ISpLexicon;
+#ifdef __cplusplus
+interface ISpLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneConverter_FWD_DEFINED__
 #define __ISpPhoneConverter_FWD_DEFINED__
 typedef interface ISpPhoneConverter ISpPhoneConverter;
+#ifdef __cplusplus
+interface ISpPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase_FWD_DEFINED__
 #define __ISpPhrase_FWD_DEFINED__
 typedef interface ISpPhrase ISpPhrase;
+#ifdef __cplusplus
+interface ISpPhrase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext2_FWD_DEFINED__
 #define __ISpRecoContext2_FWD_DEFINED__
 typedef interface ISpRecoContext2 ISpRecoContext2;
+#ifdef __cplusplus
+interface ISpRecoContext2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer2_FWD_DEFINED__
 #define __ISpRecognizer2_FWD_DEFINED__
 typedef interface ISpRecognizer2 ISpRecognizer2;
+#ifdef __cplusplus
+interface ISpRecognizer2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpShortcut_FWD_DEFINED__
 #define __ISpShortcut_FWD_DEFINED__
 typedef interface ISpShortcut ISpShortcut;
+#ifdef __cplusplus
+interface ISpShortcut;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetSelection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar2_FWD_DEFINED__
 #define __ISpRecoGrammar2_FWD_DEFINED__
 typedef interface ISpRecoGrammar2 ISpRecoGrammar2;
+#ifdef __cplusplus
+interface ISpRecoGrammar2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechResourceLoader_FWD_DEFINED__
 #define __ISpeechResourceLoader_FWD_DEFINED__
 typedef interface ISpeechResourceLoader ISpeechResourceLoader;
+#ifdef __cplusplus
+interface ISpeechResourceLoader;
+#endif /* __cplusplus */
 #endif
 
 typedef enum SPDATAKEYLOCATION {
@@ -1331,52 +1718,53 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     END_INTERFACE
 } ISpNotifySourceVtbl;
+
 interface ISpNotifySource {
     CONST_VTBL ISpNotifySourceVtbl* lpVtbl;
 };
@@ -1433,14 +1821,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifySource_SetNotifySink_Proxy(
-    ISpNotifySource* This,
-    ISpNotifySink *pNotifySink);
-void __RPC_STUB ISpNotifySource_SetNotifySink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifySource_INTERFACE_DEFINED__ */
 
@@ -1468,22 +1848,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifySink* This,
+        ISpNotifySink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     /*** ISpNotifySink methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     END_INTERFACE
 } ISpNotifySinkVtbl;
+
 interface ISpNotifySink {
     CONST_VTBL ISpNotifySinkVtbl* lpVtbl;
 };
@@ -1516,13 +1897,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifySink_Notify_Proxy(
-    ISpNotifySink* This);
-void __RPC_STUB ISpNotifySink_Notify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifySink_INTERFACE_DEFINED__ */
 
@@ -1573,54 +1947,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     /*** ISpNotifySink methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     /*** ISpNotifyTranslator methods ***/
     HRESULT (STDMETHODCALLTYPE *InitWindowMessage)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitCallback)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitSpNotifyCallback)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitWin32Event)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         HANDLE hEvent,
         WINBOOL fCloseHandleOnRelease);
 
     HRESULT (STDMETHODCALLTYPE *Wait)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetEventHandle)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     END_INTERFACE
 } ISpNotifyTranslatorVtbl;
+
 interface ISpNotifyTranslator {
     CONST_VTBL ISpNotifyTranslatorVtbl* lpVtbl;
 };
@@ -1679,61 +2054,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWindowMessage_Proxy(
-    ISpNotifyTranslator* This,
-    HWND hWnd,
-    UINT Msg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitWindowMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitCallback_Proxy(
-    ISpNotifyTranslator* This,
-    SPNOTIFYCALLBACK *pfnCallback,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitSpNotifyCallback_Proxy(
-    ISpNotifyTranslator* This,
-    ISpNotifyCallback *pSpCallback,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitSpNotifyCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWin32Event_Proxy(
-    ISpNotifyTranslator* This,
-    HANDLE hEvent,
-    WINBOOL fCloseHandleOnRelease);
-void __RPC_STUB ISpNotifyTranslator_InitWin32Event_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_Wait_Proxy(
-    ISpNotifyTranslator* This,
-    DWORD dwMilliseconds);
-void __RPC_STUB ISpNotifyTranslator_Wait_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HANDLE STDMETHODCALLTYPE ISpNotifyTranslator_GetEventHandle_Proxy(
-    ISpNotifyTranslator* This);
-void __RPC_STUB ISpNotifyTranslator_GetEventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifyTranslator_INTERFACE_DEFINED__ */
 
@@ -1806,79 +2126,80 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpDataKey* This);
+        ISpDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpDataKey* This);
+        ISpDataKey *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     END_INTERFACE
 } ISpDataKeyVtbl;
+
 interface ISpDataKey {
     CONST_VTBL ISpDataKeyVtbl* lpVtbl;
 };
@@ -1955,114 +2276,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetData_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    ULONG cbData,
-    const BYTE *pData);
-void __RPC_STUB ISpDataKey_SetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetData_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    ULONG *pcbData,
-    BYTE *pData);
-void __RPC_STUB ISpDataKey_GetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetStringValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    LPCWSTR pszValue);
-void __RPC_STUB ISpDataKey_SetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetStringValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    LPWSTR *ppszValue);
-void __RPC_STUB ISpDataKey_GetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetDWORD_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    DWORD dwValue);
-void __RPC_STUB ISpDataKey_SetDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetDWORD_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    DWORD *pdwValue);
-void __RPC_STUB ISpDataKey_GetDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_OpenKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKeyName,
-    ISpDataKey **ppSubKey);
-void __RPC_STUB ISpDataKey_OpenKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_CreateKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKey,
-    ISpDataKey **ppSubKey);
-void __RPC_STUB ISpDataKey_CreateKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKey);
-void __RPC_STUB ISpDataKey_DeleteKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName);
-void __RPC_STUB ISpDataKey_DeleteValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_EnumKeys_Proxy(
-    ISpDataKey* This,
-    ULONG Index,
-    LPWSTR *ppszSubKeyName);
-void __RPC_STUB ISpDataKey_EnumKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_EnumValues_Proxy(
-    ISpDataKey* This,
-    ULONG Index,
-    LPWSTR *ppszValueName);
-void __RPC_STUB ISpDataKey_EnumValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpDataKey_INTERFACE_DEFINED__ */
 
@@ -2093,27 +2306,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectWithToken* This);
+        ISpObjectWithToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectWithToken* This);
+        ISpObjectWithToken *This);
 
     /*** ISpObjectWithToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObjectToken)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectToken)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         ISpObjectToken **ppToken);
 
     END_INTERFACE
 } ISpObjectWithTokenVtbl;
+
 interface ISpObjectWithToken {
     CONST_VTBL ISpObjectWithTokenVtbl* lpVtbl;
 };
@@ -2150,22 +2364,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectWithToken_SetObjectToken_Proxy(
-    ISpObjectWithToken* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpObjectWithToken_SetObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectWithToken_GetObjectToken_Proxy(
-    ISpObjectWithToken* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpObjectWithToken_GetObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectWithToken_INTERFACE_DEFINED__ */
 
@@ -2211,45 +2409,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     /*** IEnumSpObjectTokens methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG celt,
         ISpObjectToken **pelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         IEnumSpObjectTokens **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG Index,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG *pCount);
 
     END_INTERFACE
 } IEnumSpObjectTokensVtbl;
+
 interface IEnumSpObjectTokens {
     CONST_VTBL IEnumSpObjectTokensVtbl* lpVtbl;
 };
@@ -2302,56 +2501,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Next_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG celt,
-    ISpObjectToken **pelt,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumSpObjectTokens_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Skip_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG celt);
-void __RPC_STUB IEnumSpObjectTokens_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Reset_Proxy(
-    IEnumSpObjectTokens* This);
-void __RPC_STUB IEnumSpObjectTokens_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Clone_Proxy(
-    IEnumSpObjectTokens* This,
-    IEnumSpObjectTokens **ppEnum);
-void __RPC_STUB IEnumSpObjectTokens_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Item_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG Index,
-    ISpObjectToken **ppToken);
-void __RPC_STUB IEnumSpObjectTokens_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_GetCount_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG *pCount);
-void __RPC_STUB IEnumSpObjectTokens_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumSpObjectTokens_INTERFACE_DEFINED__ */
 
@@ -2380,85 +2529,86 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRegDataKey* This);
+        ISpRegDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRegDataKey* This);
+        ISpRegDataKey *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpRegDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         HKEY hkey,
         WINBOOL fReadOnly);
 
     END_INTERFACE
 } ISpRegDataKeyVtbl;
+
 interface ISpRegDataKey {
     CONST_VTBL ISpRegDataKeyVtbl* lpVtbl;
 };
@@ -2587,108 +2737,109 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectTokenCategory* This);
+        ISpObjectTokenCategory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectTokenCategory* This);
+        ISpObjectTokenCategory *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectTokenCategory methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszCategoryId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPWSTR *ppszCoMemCategoryId);
 
     HRESULT (STDMETHODCALLTYPE *GetDataKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         SPDATAKEYLOCATION spdkl,
         ISpDataKey **ppDataKey);
 
     HRESULT (STDMETHODCALLTYPE *EnumTokens)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pzsReqAttribs,
         LPCWSTR pszOptAttribs,
         IEnumSpObjectTokens **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultTokenId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultTokenId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPWSTR *ppszCoMemTokenId);
 
     END_INTERFACE
 } ISpObjectTokenCategoryVtbl;
+
 interface ISpObjectTokenCategory {
     CONST_VTBL ISpObjectTokenCategoryVtbl* lpVtbl;
 };
@@ -2791,58 +2942,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pszCategoryId,
-    WINBOOL fCreateIfNotExist);
-void __RPC_STUB ISpObjectTokenCategory_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPWSTR *ppszCoMemCategoryId);
-void __RPC_STUB ISpObjectTokenCategory_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDataKey_Proxy(
-    ISpObjectTokenCategory* This,
-    SPDATAKEYLOCATION spdkl,
-    ISpDataKey **ppDataKey);
-void __RPC_STUB ISpObjectTokenCategory_GetDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_EnumTokens_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pzsReqAttribs,
-    LPCWSTR pszOptAttribs,
-    IEnumSpObjectTokens **ppEnum);
-void __RPC_STUB ISpObjectTokenCategory_EnumTokens_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetDefaultTokenId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pszTokenId);
-void __RPC_STUB ISpObjectTokenCategory_SetDefaultTokenId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDefaultTokenId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPWSTR *ppszCoMemTokenId);
-void __RPC_STUB ISpObjectTokenCategory_GetDefaultTokenId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectTokenCategory_INTERFACE_DEFINED__ */
 
@@ -2918,101 +3017,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectToken* This);
+        ISpObjectToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectToken* This);
+        ISpObjectToken *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPWSTR *ppszCoMemTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ISpObjectTokenCategory **ppTokenCategory);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         IUnknown *pUnkOuter,
         DWORD dwClsContext,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFCLSID clsidCaller,
         LPCWSTR pszValueName,
         LPCWSTR pszFileNameSpecifier,
@@ -3020,17 +3119,17 @@
         LPWSTR *ppszFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFCLSID clsidCaller,
         LPCWSTR pszKeyName,
         WINBOOL fDeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         const CLSID *pclsidCaller);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
@@ -3038,7 +3137,7 @@
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -3047,12 +3146,13 @@
         IUnknown *punkObject);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszAttributes,
         WINBOOL *pfMatches);
 
     END_INTERFACE
 } ISpObjectTokenVtbl;
+
 interface ISpObjectToken {
     CONST_VTBL ISpObjectTokenVtbl* lpVtbl;
 };
@@ -3171,82 +3271,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectToken_SetId_Proxy(
-    ISpObjectToken* This,
-    LPCWSTR pszCategoryId,
-    LPCWSTR pszTokenId,
-    WINBOOL fCreateIfNotExist);
-void __RPC_STUB ISpObjectToken_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetId_Proxy(
-    ISpObjectToken* This,
-    LPWSTR *ppszCoMemTokenId);
-void __RPC_STUB ISpObjectToken_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetCategory_Proxy(
-    ISpObjectToken* This,
-    ISpObjectTokenCategory **ppTokenCategory);
-void __RPC_STUB ISpObjectToken_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_CreateInstance_Proxy(
-    ISpObjectToken* This,
-    IUnknown *pUnkOuter,
-    DWORD dwClsContext,
-    REFIID riid,
-    void **ppvObject);
-void __RPC_STUB ISpObjectToken_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetStorageFileName_Proxy(
-    ISpObjectToken* This,
-    REFCLSID clsidCaller,
-    LPCWSTR pszValueName,
-    LPCWSTR pszFileNameSpecifier,
-    ULONG nFolder,
-    LPWSTR *ppszFilePath);
-void __RPC_STUB ISpObjectToken_GetStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_RemoveStorageFileName_Proxy(
-    ISpObjectToken* This,
-    REFCLSID clsidCaller,
-    LPCWSTR pszKeyName,
-    WINBOOL fDeleteFile);
-void __RPC_STUB ISpObjectToken_RemoveStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_Remove_Proxy(
-    ISpObjectToken* This,
-    const CLSID *pclsidCaller);
-void __RPC_STUB ISpObjectToken_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_MatchesAttributes_Proxy(
-    ISpObjectToken* This,
-    LPCWSTR pszAttributes,
-    WINBOOL *pfMatches);
-void __RPC_STUB ISpObjectToken_MatchesAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectToken_INTERFACE_DEFINED__ */
 
@@ -3276,101 +3300,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectTokenInit* This);
+        ISpObjectTokenInit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectTokenInit* This);
+        ISpObjectTokenInit *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPWSTR *ppszCoMemTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ISpObjectTokenCategory **ppTokenCategory);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         IUnknown *pUnkOuter,
         DWORD dwClsContext,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFCLSID clsidCaller,
         LPCWSTR pszValueName,
         LPCWSTR pszFileNameSpecifier,
@@ -3378,17 +3402,17 @@
         LPWSTR *ppszFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFCLSID clsidCaller,
         LPCWSTR pszKeyName,
         WINBOOL fDeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         const CLSID *pclsidCaller);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
@@ -3396,7 +3420,7 @@
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -3405,19 +3429,20 @@
         IUnknown *punkObject);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszAttributes,
         WINBOOL *pfMatches);
 
     /*** ISpObjectTokenInit methods ***/
     HRESULT (STDMETHODCALLTYPE *InitFromDataKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         ISpDataKey *pDataKey);
 
     END_INTERFACE
 } ISpObjectTokenInitVtbl;
+
 interface ISpObjectTokenInit {
     CONST_VTBL ISpObjectTokenInitVtbl* lpVtbl;
 };
@@ -3542,16 +3567,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectTokenInit_InitFromDataKey_Proxy(
-    ISpObjectTokenInit* This,
-    LPCWSTR pszCategoryId,
-    LPCWSTR pszTokenId,
-    ISpDataKey *pDataKey);
-void __RPC_STUB ISpObjectTokenInit_InitFromDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectTokenInit_INTERFACE_DEFINED__ */
 
@@ -3587,31 +3602,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpResourceManager* This);
+        ISpResourceManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpResourceManager* This);
+        ISpResourceManager *This);
 
     /*** IServiceProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryService)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidService,
         REFIID riid,
         void **ppvObject);
 
     /*** ISpResourceManager methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObject)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidServiceId,
         IUnknown *pUnkObject);
 
     HRESULT (STDMETHODCALLTYPE *GetObject)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidServiceId,
         REFCLSID ObjectCLSID,
         REFIID ObjectIID,
@@ -3620,6 +3635,7 @@
 
     END_INTERFACE
 } ISpResourceManagerVtbl;
+
 interface ISpResourceManager {
     CONST_VTBL ISpResourceManagerVtbl* lpVtbl;
 };
@@ -3662,27 +3678,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpResourceManager_SetObject_Proxy(
-    ISpResourceManager* This,
-    REFGUID guidServiceId,
-    IUnknown *pUnkObject);
-void __RPC_STUB ISpResourceManager_SetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpResourceManager_GetObject_Proxy(
-    ISpResourceManager* This,
-    REFGUID guidServiceId,
-    REFCLSID ObjectCLSID,
-    REFIID ObjectIID,
-    WINBOOL fReleaseWhenLastExternalRefReleased,
-    void **ppObject);
-void __RPC_STUB ISpResourceManager_GetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpResourceManager_INTERFACE_DEFINED__ */
 
@@ -3798,68 +3793,69 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         SPEVENTSOURCEINFO *pInfo);
 
     END_INTERFACE
 } ISpEventSourceVtbl;
+
 interface ISpEventSource {
     CONST_VTBL ISpEventSourceVtbl* lpVtbl;
 };
@@ -3930,33 +3926,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSource_SetInterest_Proxy(
-    ISpEventSource* This,
-    ULONGLONG ullEventInterest,
-    ULONGLONG ullQueuedInterest);
-void __RPC_STUB ISpEventSource_SetInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSource_GetEvents_Proxy(
-    ISpEventSource* This,
-    ULONG ulCount,
-    SPEVENT *pEventArray,
-    ULONG *pulFetched);
-void __RPC_STUB ISpEventSource_GetEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSource_GetInfo_Proxy(
-    ISpEventSource* This,
-    SPEVENTSOURCEINFO *pInfo);
-void __RPC_STUB ISpEventSource_GetInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSource_INTERFACE_DEFINED__ */
 
@@ -3986,75 +3955,76 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpEventSource2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetEventsEx)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ULONG ulCount,
         SPEVENTEX *pEventArray,
         ULONG *pulFetched);
 
     END_INTERFACE
 } ISpEventSource2Vtbl;
+
 interface ISpEventSource2 {
     CONST_VTBL ISpEventSource2Vtbl* lpVtbl;
 };
@@ -4131,16 +4101,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSource2_GetEventsEx_Proxy(
-    ISpEventSource2* This,
-    ULONG ulCount,
-    SPEVENTEX *pEventArray,
-    ULONG *pulFetched);
-void __RPC_STUB ISpEventSource2_GetEventsEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSource2_INTERFACE_DEFINED__ */
 
@@ -4172,28 +4132,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSink* This);
+        ISpEventSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSink* This);
+        ISpEventSink *This);
 
     /*** ISpEventSink methods ***/
     HRESULT (STDMETHODCALLTYPE *AddEvents)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         const SPEVENT *pEventArray,
         ULONG ulCount);
 
     HRESULT (STDMETHODCALLTYPE *GetEventInterest)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         ULONGLONG *pullEventInterest);
 
     END_INTERFACE
 } ISpEventSinkVtbl;
+
 interface ISpEventSink {
     CONST_VTBL ISpEventSinkVtbl* lpVtbl;
 };
@@ -4230,23 +4191,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSink_AddEvents_Proxy(
-    ISpEventSink* This,
-    const SPEVENT *pEventArray,
-    ULONG ulCount);
-void __RPC_STUB ISpEventSink_AddEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSink_GetEventInterest_Proxy(
-    ISpEventSink* This,
-    ULONGLONG *pullEventInterest);
-void __RPC_STUB ISpEventSink_GetEventInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSink_INTERFACE_DEFINED__ */
 
@@ -4275,83 +4219,84 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     END_INTERFACE
 } ISpStreamFormatVtbl;
+
 interface ISpStreamFormat {
     CONST_VTBL ISpStreamFormatVtbl* lpVtbl;
 };
@@ -4432,15 +4377,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStreamFormat_GetFormat_Proxy(
-    ISpStreamFormat* This,
-    GUID *pguidFormatId,
-    WAVEFORMATEX **ppCoMemWaveFormatEx);
-void __RPC_STUB ISpStreamFormat_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStreamFormat_INTERFACE_DEFINED__ */
 
@@ -4483,94 +4419,94 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStream* This,
+        ISpStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStream* This);
+        ISpStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStream* This);
+        ISpStream *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStream* This,
+        ISpStream *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStream* This,
+        ISpStream *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStream* This,
+        ISpStream *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStream* This,
+        ISpStream *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStream* This,
+        ISpStream *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStream* This);
+        ISpStream *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStream* This,
+        ISpStream *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStream* This,
+        ISpStream *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStream* This,
+        ISpStream *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpStream methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBaseStream)(
-        ISpStream* This,
+        ISpStream *This,
         IStream *pStream,
         REFGUID rguidFormat,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetBaseStream)(
-        ISpStream* This,
+        ISpStream *This,
         IStream **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *BindToFile)(
-        ISpStream* This,
+        ISpStream *This,
         LPCWSTR pszFileName,
         SPFILEMODE eMode,
         const GUID *pFormatId,
@@ -4578,10 +4514,11 @@
         ULONGLONG ullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        ISpStream* This);
+        ISpStream *This);
 
     END_INTERFACE
 } ISpStreamVtbl;
+
 interface ISpStream {
     CONST_VTBL ISpStreamVtbl* lpVtbl;
 };
@@ -4680,43 +4617,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStream_SetBaseStream_Proxy(
-    ISpStream* This,
-    IStream *pStream,
-    REFGUID rguidFormat,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpStream_SetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_GetBaseStream_Proxy(
-    ISpStream* This,
-    IStream **ppStream);
-void __RPC_STUB ISpStream_GetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_BindToFile_Proxy(
-    ISpStream* This,
-    LPCWSTR pszFileName,
-    SPFILEMODE eMode,
-    const GUID *pFormatId,
-    const WAVEFORMATEX *pWaveFormatEx,
-    ULONGLONG ullEventInterest);
-void __RPC_STUB ISpStream_BindToFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_Close_Proxy(
-    ISpStream* This);
-void __RPC_STUB ISpStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStream_INTERFACE_DEFINED__ */
 
@@ -4764,112 +4664,113 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpStreamFormatConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBaseStream)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ISpStreamFormat *pStream,
         WINBOOL fSetFormatToBaseStreamFormat,
         WINBOOL fWriteToBaseStream);
 
     HRESULT (STDMETHODCALLTYPE *GetBaseStream)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         REFGUID rguidFormatIdOfConvertedStream,
         const WAVEFORMATEX *pWaveFormatExOfConvertedStream);
 
     HRESULT (STDMETHODCALLTYPE *ResetSeekPosition)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     HRESULT (STDMETHODCALLTYPE *ScaleConvertedToBaseOffset)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULONGLONG ullOffsetConvertedStream,
         ULONGLONG *pullOffsetBaseStream);
 
     HRESULT (STDMETHODCALLTYPE *ScaleBaseToConvertedOffset)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULONGLONG ullOffsetBaseStream,
         ULONGLONG *pullOffsetConvertedStream);
 
     END_INTERFACE
 } ISpStreamFormatConverterVtbl;
+
 interface ISpStreamFormatConverter {
     CONST_VTBL ISpStreamFormatConverterVtbl* lpVtbl;
 };
@@ -4976,58 +4877,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetBaseStream_Proxy(
-    ISpStreamFormatConverter* This,
-    ISpStreamFormat *pStream,
-    WINBOOL fSetFormatToBaseStreamFormat,
-    WINBOOL fWriteToBaseStream);
-void __RPC_STUB ISpStreamFormatConverter_SetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_GetBaseStream_Proxy(
-    ISpStreamFormatConverter* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpStreamFormatConverter_GetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetFormat_Proxy(
-    ISpStreamFormatConverter* This,
-    REFGUID rguidFormatIdOfConvertedStream,
-    const WAVEFORMATEX *pWaveFormatExOfConvertedStream);
-void __RPC_STUB ISpStreamFormatConverter_SetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ResetSeekPosition_Proxy(
-    ISpStreamFormatConverter* This);
-void __RPC_STUB ISpStreamFormatConverter_ResetSeekPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Proxy(
-    ISpStreamFormatConverter* This,
-    ULONGLONG ullOffsetConvertedStream,
-    ULONGLONG *pullOffsetBaseStream);
-void __RPC_STUB ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Proxy(
-    ISpStreamFormatConverter* This,
-    ULONGLONG ullOffsetBaseStream,
-    ULONGLONG *pullOffsetConvertedStream);
-void __RPC_STUB ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStreamFormatConverter_INTERFACE_DEFINED__ */
 
@@ -5102,130 +4951,131 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpAudio* This,
+        ISpAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpAudio* This,
+        ISpAudio *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpAudio* This,
+        ISpAudio *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpAudio* This,
+        ISpAudio *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpAudio* This,
+        ISpAudio *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpAudio* This,
+        ISpAudio *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpAudio* This,
+        ISpAudio *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpAudio* This,
+        ISpAudio *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOSTATE NewState,
         ULONGLONG ullReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         REFGUID rguidFmtId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferInfo)(
-        ISpAudio* This,
+        ISpAudio *This,
         const SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferInfo)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     HANDLE (STDMETHODCALLTYPE *EventHandle)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG *pLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG Level);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG cbSize);
 
     END_INTERFACE
 } ISpAudioVtbl;
+
 interface ISpAudio {
     CONST_VTBL ISpAudioVtbl* lpVtbl;
 };
@@ -5352,96 +5202,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpAudio_SetState_Proxy(
-    ISpAudio* This,
-    SPAUDIOSTATE NewState,
-    ULONGLONG ullReserved);
-void __RPC_STUB ISpAudio_SetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetFormat_Proxy(
-    ISpAudio* This,
-    REFGUID rguidFmtId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpAudio_SetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetStatus_Proxy(
-    ISpAudio* This,
-    SPAUDIOSTATUS *pStatus);
-void __RPC_STUB ISpAudio_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferInfo_Proxy(
-    ISpAudio* This,
-    const SPAUDIOBUFFERINFO *pBuffInfo);
-void __RPC_STUB ISpAudio_SetBufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferInfo_Proxy(
-    ISpAudio* This,
-    SPAUDIOBUFFERINFO *pBuffInfo);
-void __RPC_STUB ISpAudio_GetBufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetDefaultFormat_Proxy(
-    ISpAudio* This,
-    GUID *pFormatId,
-    WAVEFORMATEX **ppCoMemWaveFormatEx);
-void __RPC_STUB ISpAudio_GetDefaultFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HANDLE STDMETHODCALLTYPE ISpAudio_EventHandle_Proxy(
-    ISpAudio* This);
-void __RPC_STUB ISpAudio_EventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetVolumeLevel_Proxy(
-    ISpAudio* This,
-    ULONG *pLevel);
-void __RPC_STUB ISpAudio_GetVolumeLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetVolumeLevel_Proxy(
-    ISpAudio* This,
-    ULONG Level);
-void __RPC_STUB ISpAudio_SetVolumeLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferNotifySize_Proxy(
-    ISpAudio* This,
-    ULONG *pcbSize);
-void __RPC_STUB ISpAudio_GetBufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferNotifySize_Proxy(
-    ISpAudio* This,
-    ULONG cbSize);
-void __RPC_STUB ISpAudio_SetBufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpAudio_INTERFACE_DEFINED__ */
 
@@ -5481,151 +5241,152 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOSTATE NewState,
         ULONGLONG ullReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         REFGUID rguidFmtId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferInfo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         const SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferInfo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     HANDLE (STDMETHODCALLTYPE *EventHandle)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG *pLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG Level);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG cbSize);
 
     /*** ISpMMSysAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDeviceId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT *puDeviceId);
 
     HRESULT (STDMETHODCALLTYPE *SetDeviceId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT uDeviceId);
 
     HRESULT (STDMETHODCALLTYPE *GetMMHandle)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         void **pHandle);
 
     HRESULT (STDMETHODCALLTYPE *GetLineId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT *puLineId);
 
     HRESULT (STDMETHODCALLTYPE *SetLineId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT uLineId);
 
     END_INTERFACE
 } ISpMMSysAudioVtbl;
+
 interface ISpMMSysAudio {
     CONST_VTBL ISpMMSysAudioVtbl* lpVtbl;
 };
@@ -5774,46 +5535,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetDeviceId_Proxy(
-    ISpMMSysAudio* This,
-    UINT *puDeviceId);
-void __RPC_STUB ISpMMSysAudio_GetDeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetDeviceId_Proxy(
-    ISpMMSysAudio* This,
-    UINT uDeviceId);
-void __RPC_STUB ISpMMSysAudio_SetDeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetMMHandle_Proxy(
-    ISpMMSysAudio* This,
-    void **pHandle);
-void __RPC_STUB ISpMMSysAudio_GetMMHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetLineId_Proxy(
-    ISpMMSysAudio* This,
-    UINT *puLineId);
-void __RPC_STUB ISpMMSysAudio_GetLineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetLineId_Proxy(
-    ISpMMSysAudio* This,
-    UINT uLineId);
-void __RPC_STUB ISpMMSysAudio_SetLineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpMMSysAudio_INTERFACE_DEFINED__ */
 
@@ -5844,27 +5565,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpTranscript* This);
+        ISpTranscript *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpTranscript* This);
+        ISpTranscript *This);
 
     /*** ISpTranscript methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTranscript)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         LPWSTR *ppszTranscript);
 
     HRESULT (STDMETHODCALLTYPE *AppendTranscript)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         LPCWSTR pszTranscript);
 
     END_INTERFACE
 } ISpTranscriptVtbl;
+
 interface ISpTranscript {
     CONST_VTBL ISpTranscriptVtbl* lpVtbl;
 };
@@ -5901,22 +5623,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpTranscript_GetTranscript_Proxy(
-    ISpTranscript* This,
-    LPWSTR *ppszTranscript);
-void __RPC_STUB ISpTranscript_GetTranscript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpTranscript_AppendTranscript_Proxy(
-    ISpTranscript* This,
-    LPCWSTR pszTranscript);
-void __RPC_STUB ISpTranscript_AppendTranscript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpTranscript_INTERFACE_DEFINED__ */
 
@@ -5951,7 +5657,6 @@
     float SREngineConfidence;
     signed char Confidence;
 };
-
 struct SPPHRASEPROPERTY {
     LPCWSTR pszName;
     __C89_NAMELESS union {
@@ -5971,7 +5676,6 @@
     float SREngineConfidence;
     signed char Confidence;
 };
-
 typedef struct SPPHRASEREPLACEMENT {
     BYTE bDisplayAttributes;
     LPCWSTR pszReplacementText;
@@ -6128,50 +5832,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpLexicon* This);
+        ISpLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpLexicon* This);
+        ISpLexicon *This);
 
     /*** ISpLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         DWORD dwFlags,
         SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
@@ -6179,6 +5883,7 @@
 
     END_INTERFACE
 } ISpLexiconVtbl;
+
 interface ISpLexicon {
     CONST_VTBL ISpLexiconVtbl* lpVtbl;
 };
@@ -6231,68 +5936,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetPronunciations_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    DWORD dwFlags,
-    SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
-void __RPC_STUB ISpLexicon_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_AddPronunciation_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    SPPARTOFSPEECH ePartOfSpeech,
-    PCSPPHONEID pszPronunciation);
-void __RPC_STUB ISpLexicon_AddPronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_RemovePronunciation_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    SPPARTOFSPEECH ePartOfSpeech,
-    PCSPPHONEID pszPronunciation);
-void __RPC_STUB ISpLexicon_RemovePronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetGeneration_Proxy(
-    ISpLexicon* This,
-    DWORD *pdwGeneration);
-void __RPC_STUB ISpLexicon_GetGeneration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetGenerationChange_Proxy(
-    ISpLexicon* This,
-    DWORD dwFlags,
-    DWORD *pdwGeneration,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpLexicon_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetWords_Proxy(
-    ISpLexicon* This,
-    DWORD dwFlags,
-    DWORD *pdwGeneration,
-    DWORD *pdwCookie,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpLexicon_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpLexicon_INTERFACE_DEFINED__ */
 
@@ -6321,50 +5964,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpContainerLexicon* This);
+        ISpContainerLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpContainerLexicon* This);
+        ISpContainerLexicon *This);
 
     /*** ISpLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         DWORD dwFlags,
         SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
@@ -6372,12 +6015,13 @@
 
     /*** ISpContainerLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *AddLexicon)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         ISpLexicon *pAddLexicon,
         DWORD dwFlags);
 
     END_INTERFACE
 } ISpContainerLexiconVtbl;
+
 interface ISpContainerLexicon {
     CONST_VTBL ISpContainerLexiconVtbl* lpVtbl;
 };
@@ -6436,15 +6080,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpContainerLexicon_AddLexicon_Proxy(
-    ISpContainerLexicon* This,
-    ISpLexicon *pAddLexicon,
-    DWORD dwFlags);
-void __RPC_STUB ISpContainerLexicon_AddLexicon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpContainerLexicon_INTERFACE_DEFINED__ */
 
@@ -6518,64 +6153,65 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpShortcut* This);
+        ISpShortcut *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpShortcut* This);
+        ISpShortcut *This);
 
     /*** ISpShortcut methods ***/
     HRESULT (STDMETHODCALLTYPE *AddShortcut)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         LPCWSTR pszDisplay,
         WORD LangID,
         LPCWSTR pszSpoken,
         SPSHORTCUTTYPE shType);
 
     HRESULT (STDMETHODCALLTYPE *RemoveShortcut)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         LPCWSTR pszDisplay,
         WORD LangID,
         LPCWSTR pszSpoken,
         SPSHORTCUTTYPE shType);
 
     HRESULT (STDMETHODCALLTYPE *GetShortcuts)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         WORD LangID,
         SPSHORTCUTPAIRLIST *pShortcutpairList);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetWordsFromGenerationChange)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetShortcutsForGeneration)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
         SPSHORTCUTPAIRLIST *pShortcutpairList);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         SPSHORTCUTPAIRLIST *pShortcutpairList);
 
     END_INTERFACE
 } ISpShortcutVtbl;
+
 interface ISpShortcut {
     CONST_VTBL ISpShortcutVtbl* lpVtbl;
 };
@@ -6636,83 +6272,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpShortcut_AddShortcut_Proxy(
-    ISpShortcut* This,
-    LPCWSTR pszDisplay,
-    WORD LangID,
-    LPCWSTR pszSpoken,
-    SPSHORTCUTTYPE shType);
-void __RPC_STUB ISpShortcut_AddShortcut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_RemoveShortcut_Proxy(
-    ISpShortcut* This,
-    LPCWSTR pszDisplay,
-    WORD LangID,
-    LPCWSTR pszSpoken,
-    SPSHORTCUTTYPE shType);
-void __RPC_STUB ISpShortcut_RemoveShortcut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcuts_Proxy(
-    ISpShortcut* This,
-    WORD LangID,
-    SPSHORTCUTPAIRLIST *pShortcutpairList);
-void __RPC_STUB ISpShortcut_GetShortcuts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetGeneration_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration);
-void __RPC_STUB ISpShortcut_GetGeneration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetWordsFromGenerationChange_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpShortcut_GetWordsFromGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetWords_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    DWORD *pdwCookie,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpShortcut_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcutsForGeneration_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    DWORD *pdwCookie,
-    SPSHORTCUTPAIRLIST *pShortcutpairList);
-void __RPC_STUB ISpShortcut_GetShortcutsForGeneration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetGenerationChange_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    SPSHORTCUTPAIRLIST *pShortcutpairList);
-void __RPC_STUB ISpShortcut_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpShortcut_INTERFACE_DEFINED__ */
 
@@ -6745,38 +6304,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhoneConverter* This);
+        ISpPhoneConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhoneConverter* This);
+        ISpPhoneConverter *This);
 
     /*** ISpObjectWithToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObjectToken)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectToken)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         ISpObjectToken **ppToken);
 
     /*** ISpPhoneConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *PhoneToId)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         LPCWSTR pszPhone,
         SPPHONEID *pId);
 
     HRESULT (STDMETHODCALLTYPE *IdToPhone)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         PCSPPHONEID pId,
         WCHAR *pszPhone);
 
     END_INTERFACE
 } ISpPhoneConverterVtbl;
+
 interface ISpPhoneConverter {
     CONST_VTBL ISpPhoneConverterVtbl* lpVtbl;
 };
@@ -6823,24 +6383,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhoneConverter_PhoneToId_Proxy(
-    ISpPhoneConverter* This,
-    LPCWSTR pszPhone,
-    SPPHONEID *pId);
-void __RPC_STUB ISpPhoneConverter_PhoneToId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneConverter_IdToPhone_Proxy(
-    ISpPhoneConverter* This,
-    PCSPPHONEID pId,
-    WCHAR *pszPhone);
-void __RPC_STUB ISpPhoneConverter_IdToPhone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhoneConverter_INTERFACE_DEFINED__ */
 
@@ -6886,45 +6428,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhoneticAlphabetConverter* This);
+        ISpPhoneticAlphabetConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhoneticAlphabetConverter* This);
+        ISpPhoneticAlphabetConverter *This);
 
     /*** ISpPhoneticAlphabetConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLangId)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         WORD *pLangID);
 
     HRESULT (STDMETHODCALLTYPE *SetLangId)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         WORD LangID);
 
     HRESULT (STDMETHODCALLTYPE *SAPI2UPS)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         const SPPHONEID *pszSAPIId,
         SPPHONEID *pszUPSId,
         DWORD cMaxLength);
 
     HRESULT (STDMETHODCALLTYPE *UPS2SAPI)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         const SPPHONEID *pszUPSId,
         SPPHONEID *pszSAPIId,
         DWORD cMaxLength);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxConvertLength)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         DWORD cSrcLength,
         WINBOOL bSAPI2UPS,
         DWORD *pcMaxDestLength);
 
     END_INTERFACE
 } ISpPhoneticAlphabetConverterVtbl;
+
 interface ISpPhoneticAlphabetConverter {
     CONST_VTBL ISpPhoneticAlphabetConverterVtbl* lpVtbl;
 };
@@ -6973,52 +6516,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetLangId_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    WORD *pLangID);
-void __RPC_STUB ISpPhoneticAlphabetConverter_GetLangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SetLangId_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    WORD LangID);
-void __RPC_STUB ISpPhoneticAlphabetConverter_SetLangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SAPI2UPS_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    const SPPHONEID *pszSAPIId,
-    SPPHONEID *pszUPSId,
-    DWORD cMaxLength);
-void __RPC_STUB ISpPhoneticAlphabetConverter_SAPI2UPS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_UPS2SAPI_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    const SPPHONEID *pszUPSId,
-    SPPHONEID *pszSAPIId,
-    DWORD cMaxLength);
-void __RPC_STUB ISpPhoneticAlphabetConverter_UPS2SAPI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetMaxConvertLength_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    DWORD cSrcLength,
-    WINBOOL bSAPI2UPS,
-    DWORD *pcMaxDestLength);
-void __RPC_STUB ISpPhoneticAlphabetConverter_GetMaxConvertLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhoneticAlphabetConverter_INTERFACE_DEFINED__ */
 
@@ -7049,27 +6546,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhoneticAlphabetSelection* This,
+        ISpPhoneticAlphabetSelection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhoneticAlphabetSelection* This);
+        ISpPhoneticAlphabetSelection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhoneticAlphabetSelection* This);
+        ISpPhoneticAlphabetSelection *This);
 
     /*** ISpPhoneticAlphabetSelection methods ***/
     HRESULT (STDMETHODCALLTYPE *IsAlphabetUPS)(
-        ISpPhoneticAlphabetSelection* This,
+        ISpPhoneticAlphabetSelection *This,
         WINBOOL *pfIsUPS);
 
     HRESULT (STDMETHODCALLTYPE *SetAlphabetToUPS)(
-        ISpPhoneticAlphabetSelection* This,
+        ISpPhoneticAlphabetSelection *This,
         WINBOOL fForceUPS);
 
     END_INTERFACE
 } ISpPhoneticAlphabetSelectionVtbl;
+
 interface ISpPhoneticAlphabetSelection {
     CONST_VTBL ISpPhoneticAlphabetSelectionVtbl* lpVtbl;
 };
@@ -7106,22 +6604,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_IsAlphabetUPS_Proxy(
-    ISpPhoneticAlphabetSelection* This,
-    WINBOOL *pfIsUPS);
-void __RPC_STUB ISpPhoneticAlphabetSelection_IsAlphabetUPS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Proxy(
-    ISpPhoneticAlphabetSelection* This,
-    WINBOOL fForceUPS);
-void __RPC_STUB ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhoneticAlphabetSelection_INTERFACE_DEFINED__ */
 
@@ -7290,173 +6772,173 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpVoice* This,
+        ISpVoice *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpVoice* This,
+        ISpVoice *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpVoice* This,
+        ISpVoice *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpVoice methods ***/
     HRESULT (STDMETHODCALLTYPE *SetOutput)(
-        ISpVoice* This,
+        ISpVoice *This,
         IUnknown *pUnkOutput,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputObjectToken)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken **ppObjectToken);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStream)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *SetVoice)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetVoice)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *Speak)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pwcs,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SpeakStream)(
-        ISpVoice* This,
+        ISpVoice *This,
         IStream *pStream,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVOICESTATUS *pStatus,
         LPWSTR *ppszLastBookmark);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pItemType,
         LONG lNumItems,
         ULONG *pulNumSkipped);
 
     HRESULT (STDMETHODCALLTYPE *SetPriority)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVPRIORITY ePriority);
 
     HRESULT (STDMETHODCALLTYPE *GetPriority)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVPRIORITY *pePriority);
 
     HRESULT (STDMETHODCALLTYPE *SetAlertBoundary)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTENUM eBoundary);
 
     HRESULT (STDMETHODCALLTYPE *GetAlertBoundary)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTENUM *peBoundary);
 
     HRESULT (STDMETHODCALLTYPE *SetRate)(
-        ISpVoice* This,
+        ISpVoice *This,
         LONG RateAdjust);
 
     HRESULT (STDMETHODCALLTYPE *GetRate)(
-        ISpVoice* This,
+        ISpVoice *This,
         LONG *pRateAdjust);
 
     HRESULT (STDMETHODCALLTYPE *SetVolume)(
-        ISpVoice* This,
+        ISpVoice *This,
         USHORT usVolume);
 
     HRESULT (STDMETHODCALLTYPE *GetVolume)(
-        ISpVoice* This,
+        ISpVoice *This,
         USHORT *pusVolume);
 
     HRESULT (STDMETHODCALLTYPE *WaitUntilDone)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncSpeakTimeout)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *GetSyncSpeakTimeout)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG *pmsTimeout);
 
     HANDLE (STDMETHODCALLTYPE *SpeakCompleteEvent)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpVoice* This,
+        ISpVoice *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -7465,6 +6947,7 @@
 
     END_INTERFACE
 } ISpVoiceVtbl;
+
 interface ISpVoice {
     CONST_VTBL ISpVoiceVtbl* lpVtbl;
 };
@@ -7637,188 +7120,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpVoice_SetOutput_Proxy(
-    ISpVoice* This,
-    IUnknown *pUnkOutput,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpVoice_SetOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputObjectToken_Proxy(
-    ISpVoice* This,
-    ISpObjectToken **ppObjectToken);
-void __RPC_STUB ISpVoice_GetOutputObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputStream_Proxy(
-    ISpVoice* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpVoice_GetOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Pause_Proxy(
-    ISpVoice* This);
-void __RPC_STUB ISpVoice_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Resume_Proxy(
-    ISpVoice* This);
-void __RPC_STUB ISpVoice_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetVoice_Proxy(
-    ISpVoice* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpVoice_SetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetVoice_Proxy(
-    ISpVoice* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpVoice_GetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Speak_Proxy(
-    ISpVoice* This,
-    LPCWSTR pwcs,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpVoice_Speak_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SpeakStream_Proxy(
-    ISpVoice* This,
-    IStream *pStream,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpVoice_SpeakStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetStatus_Proxy(
-    ISpVoice* This,
-    SPVOICESTATUS *pStatus,
-    LPWSTR *ppszLastBookmark);
-void __RPC_STUB ISpVoice_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Skip_Proxy(
-    ISpVoice* This,
-    LPCWSTR pItemType,
-    LONG lNumItems,
-    ULONG *pulNumSkipped);
-void __RPC_STUB ISpVoice_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetPriority_Proxy(
-    ISpVoice* This,
-    SPVPRIORITY ePriority);
-void __RPC_STUB ISpVoice_SetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetPriority_Proxy(
-    ISpVoice* This,
-    SPVPRIORITY *pePriority);
-void __RPC_STUB ISpVoice_GetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetAlertBoundary_Proxy(
-    ISpVoice* This,
-    SPEVENTENUM eBoundary);
-void __RPC_STUB ISpVoice_SetAlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetAlertBoundary_Proxy(
-    ISpVoice* This,
-    SPEVENTENUM *peBoundary);
-void __RPC_STUB ISpVoice_GetAlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetRate_Proxy(
-    ISpVoice* This,
-    LONG RateAdjust);
-void __RPC_STUB ISpVoice_SetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetRate_Proxy(
-    ISpVoice* This,
-    LONG *pRateAdjust);
-void __RPC_STUB ISpVoice_GetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetVolume_Proxy(
-    ISpVoice* This,
-    USHORT usVolume);
-void __RPC_STUB ISpVoice_SetVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetVolume_Proxy(
-    ISpVoice* This,
-    USHORT *pusVolume);
-void __RPC_STUB ISpVoice_GetVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_WaitUntilDone_Proxy(
-    ISpVoice* This,
-    ULONG msTimeout);
-void __RPC_STUB ISpVoice_WaitUntilDone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetSyncSpeakTimeout_Proxy(
-    ISpVoice* This,
-    ULONG msTimeout);
-void __RPC_STUB ISpVoice_SetSyncSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetSyncSpeakTimeout_Proxy(
-    ISpVoice* This,
-    ULONG *pmsTimeout);
-void __RPC_STUB ISpVoice_GetSyncSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpVoice_INTERFACE_DEFINED__ */
 
@@ -7859,27 +7160,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhrase* This);
+        ISpPhrase *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhrase* This);
+        ISpPhrase *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -7887,11 +7188,12 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         DWORD dwValueTypes);
 
     END_INTERFACE
 } ISpPhraseVtbl;
+
 interface ISpPhrase {
     CONST_VTBL ISpPhraseVtbl* lpVtbl;
 };
@@ -7936,42 +7238,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetPhrase_Proxy(
-    ISpPhrase* This,
-    SPPHRASE **ppCoMemPhrase);
-void __RPC_STUB ISpPhrase_GetPhrase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetSerializedPhrase_Proxy(
-    ISpPhrase* This,
-    SPSERIALIZEDPHRASE **ppCoMemPhrase);
-void __RPC_STUB ISpPhrase_GetSerializedPhrase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetText_Proxy(
-    ISpPhrase* This,
-    ULONG ulStart,
-    ULONG ulCount,
-    WINBOOL fUseTextReplacements,
-    LPWSTR *ppszCoMemText,
-    BYTE *pbDisplayAttributes);
-void __RPC_STUB ISpPhrase_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_Discard_Proxy(
-    ISpPhrase* This,
-    DWORD dwValueTypes);
-void __RPC_STUB ISpPhrase_Discard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhrase_INTERFACE_DEFINED__ */
 
@@ -8005,27 +7271,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8033,22 +7299,23 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         DWORD dwValueTypes);
 
     /*** ISpPhraseAlt methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAltInfo)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         ISpPhrase **ppParent,
         ULONG *pulStartElementInParent,
         ULONG *pcElementsInParent,
         ULONG *pcElementsInAlt);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     END_INTERFACE
 } ISpPhraseAltVtbl;
+
 interface ISpPhraseAlt {
     CONST_VTBL ISpPhraseAltVtbl* lpVtbl;
 };
@@ -8103,24 +7370,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhraseAlt_GetAltInfo_Proxy(
-    ISpPhraseAlt* This,
-    ISpPhrase **ppParent,
-    ULONG *pulStartElementInParent,
-    ULONG *pcElementsInParent,
-    ULONG *pcElementsInAlt);
-void __RPC_STUB ISpPhraseAlt_GetAltInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhraseAlt_Commit_Proxy(
-    ISpPhraseAlt* This);
-void __RPC_STUB ISpPhraseAlt_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhraseAlt_INTERFACE_DEFINED__ */
 
@@ -8161,27 +7410,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhrase2* This);
+        ISpPhrase2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhrase2* This);
+        ISpPhrase2 *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8189,27 +7438,28 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         DWORD dwValueTypes);
 
     /*** ISpPhrase2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         LPWSTR *ppszCoMemXMLResult,
         SPXMLRESULTOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         SPSEMANTICERRORINFO *pSemanticErrorInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     END_INTERFACE
 } ISpPhrase2Vtbl;
+
 interface ISpPhrase2 {
     CONST_VTBL ISpPhrase2Vtbl* lpVtbl;
 };
@@ -8268,33 +7518,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLResult_Proxy(
-    ISpPhrase2* This,
-    LPWSTR *ppszCoMemXMLResult,
-    SPXMLRESULTOPTIONS Options);
-void __RPC_STUB ISpPhrase2_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLErrorInfo_Proxy(
-    ISpPhrase2* This,
-    SPSEMANTICERRORINFO *pSemanticErrorInfo);
-void __RPC_STUB ISpPhrase2_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase2_GetAudio_Proxy(
-    ISpPhrase2* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpPhrase2_GetAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhrase2_INTERFACE_DEFINED__ */
 
@@ -8359,27 +7582,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoResult* This);
+        ISpRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoResult* This);
+        ISpRecoResult *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8387,16 +7610,16 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         DWORD dwValueTypes);
 
     /*** ISpRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultTimes)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPRECORESULTTIMES *pTimes);
 
     HRESULT (STDMETHODCALLTYPE *GetAlternates)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ULONG ulRequestCount,
@@ -8404,33 +7627,34 @@
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPSERIALIZEDRESULT **ppCoMemSerializedResult);
 
     HRESULT (STDMETHODCALLTYPE *ScaleAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ISpRecoContext **ppRecoContext);
 
     END_INTERFACE
 } ISpRecoResultVtbl;
+
 interface ISpRecoResult {
     CONST_VTBL ISpRecoResultVtbl* lpVtbl;
 };
@@ -8505,72 +7729,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetResultTimes_Proxy(
-    ISpRecoResult* This,
-    SPRECORESULTTIMES *pTimes);
-void __RPC_STUB ISpRecoResult_GetResultTimes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAlternates_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ULONG ulRequestCount,
-    ISpPhraseAlt **ppPhrases,
-    ULONG *pcPhrasesReturned);
-void __RPC_STUB ISpRecoResult_GetAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAudio_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpRecoResult_GetAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_SpeakAudio_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpRecoResult_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_Serialize_Proxy(
-    ISpRecoResult* This,
-    SPSERIALIZEDRESULT **ppCoMemSerializedResult);
-void __RPC_STUB ISpRecoResult_Serialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_ScaleAudio_Proxy(
-    ISpRecoResult* This,
-    const GUID *pAudioFormatId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpRecoResult_ScaleAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetRecoContext_Proxy(
-    ISpRecoResult* This,
-    ISpRecoContext **ppRecoContext);
-void __RPC_STUB ISpRecoResult_GetRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoResult_INTERFACE_DEFINED__ */
 
@@ -8614,27 +7772,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoResult2* This);
+        ISpRecoResult2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoResult2* This);
+        ISpRecoResult2 *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8642,16 +7800,16 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         DWORD dwValueTypes);
 
     /*** ISpRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultTimes)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPRECORESULTTIMES *pTimes);
 
     HRESULT (STDMETHODCALLTYPE *GetAlternates)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         ULONG ulRequestCount,
@@ -8659,51 +7817,52 @@
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPSERIALIZEDRESULT **ppCoMemSerializedResult);
 
     HRESULT (STDMETHODCALLTYPE *ScaleAudio)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ISpRecoContext **ppRecoContext);
 
     /*** ISpRecoResult2 methods ***/
     HRESULT (STDMETHODCALLTYPE *CommitAlternate)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ISpPhraseAlt *pPhraseAlt,
         ISpRecoResult **ppNewResult);
 
     HRESULT (STDMETHODCALLTYPE *CommitText)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         LPCWSTR pszCorrectedData,
         DWORD eCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetTextFeedback)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         LPCWSTR pszFeedback,
         WINBOOL fSuccessful);
 
     END_INTERFACE
 } ISpRecoResult2Vtbl;
+
 interface ISpRecoResult2 {
     CONST_VTBL ISpRecoResult2Vtbl* lpVtbl;
 };
@@ -8792,35 +7951,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitAlternate_Proxy(
-    ISpRecoResult2* This,
-    ISpPhraseAlt *pPhraseAlt,
-    ISpRecoResult **ppNewResult);
-void __RPC_STUB ISpRecoResult2_CommitAlternate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitText_Proxy(
-    ISpRecoResult2* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    LPCWSTR pszCorrectedData,
-    DWORD eCommitFlags);
-void __RPC_STUB ISpRecoResult2_CommitText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult2_SetTextFeedback_Proxy(
-    ISpRecoResult2* This,
-    LPCWSTR pszFeedback,
-    WINBOOL fSuccessful);
-void __RPC_STUB ISpRecoResult2_SetTextFeedback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoResult2_INTERFACE_DEFINED__ */
 
@@ -8852,27 +7982,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpXMLRecoResult* This);
+        ISpXMLRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpXMLRecoResult* This);
+        ISpXMLRecoResult *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8880,16 +8010,16 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         DWORD dwValueTypes);
 
     /*** ISpRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultTimes)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPRECORESULTTIMES *pTimes);
 
     HRESULT (STDMETHODCALLTYPE *GetAlternates)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ULONG ulRequestCount,
@@ -8897,43 +8027,44 @@
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPSERIALIZEDRESULT **ppCoMemSerializedResult);
 
     HRESULT (STDMETHODCALLTYPE *ScaleAudio)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ISpRecoContext **ppRecoContext);
 
     /*** ISpXMLRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         LPWSTR *ppszCoMemXMLResult,
         SPXMLRESULTOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPSEMANTICERRORINFO *pSemanticErrorInfo);
 
     END_INTERFACE
 } ISpXMLRecoResultVtbl;
+
 interface ISpXMLRecoResult {
     CONST_VTBL ISpXMLRecoResultVtbl* lpVtbl;
 };
@@ -9018,23 +8149,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLResult_Proxy(
-    ISpXMLRecoResult* This,
-    LPWSTR *ppszCoMemXMLResult,
-    SPXMLRESULTOPTIONS Options);
-void __RPC_STUB ISpXMLRecoResult_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLErrorInfo_Proxy(
-    ISpXMLRecoResult* This,
-    SPSEMANTICERRORINFO *pSemanticErrorInfo);
-void __RPC_STUB ISpXMLRecoResult_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpXMLRecoResult_INTERFACE_DEFINED__ */
 
@@ -9156,23 +8270,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpGrammarBuilder* This);
+        ISpGrammarBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpGrammarBuilder* This);
+        ISpGrammarBuilder *This);
 
     /*** ISpGrammarBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetGrammar)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         WORD NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *GetRule)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         LPCWSTR pszRuleName,
         DWORD dwRuleId,
         DWORD dwAttributes,
@@ -9180,16 +8294,16 @@
         SPSTATEHANDLE *phInitialState);
 
     HRESULT (STDMETHODCALLTYPE *ClearRule)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hState);
 
     HRESULT (STDMETHODCALLTYPE *CreateNewState)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hState,
         SPSTATEHANDLE *phState);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
@@ -9199,7 +8313,7 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         SPSTATEHANDLE hRule,
@@ -9207,17 +8321,18 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hRuleState,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         DWORD dwReserved);
 
     END_INTERFACE
 } ISpGrammarBuilderVtbl;
+
 interface ISpGrammarBuilder {
     CONST_VTBL ISpGrammarBuilderVtbl* lpVtbl;
 };
@@ -9278,87 +8393,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ResetGrammar_Proxy(
-    ISpGrammarBuilder* This,
-    WORD NewLanguage);
-void __RPC_STUB ISpGrammarBuilder_ResetGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_GetRule_Proxy(
-    ISpGrammarBuilder* This,
-    LPCWSTR pszRuleName,
-    DWORD dwRuleId,
-    DWORD dwAttributes,
-    WINBOOL fCreateIfNotExist,
-    SPSTATEHANDLE *phInitialState);
-void __RPC_STUB ISpGrammarBuilder_GetRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ClearRule_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hState);
-void __RPC_STUB ISpGrammarBuilder_ClearRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_CreateNewState_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hState,
-    SPSTATEHANDLE *phState);
-void __RPC_STUB ISpGrammarBuilder_CreateNewState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddWordTransition_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    LPCWSTR psz,
-    LPCWSTR pszSeparators,
-    SPGRAMMARWORDTYPE eWordType,
-    float Weight,
-    const SPPROPERTYINFO *pPropInfo);
-void __RPC_STUB ISpGrammarBuilder_AddWordTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddRuleTransition_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    SPSTATEHANDLE hRule,
-    float Weight,
-    const SPPROPERTYINFO *pPropInfo);
-void __RPC_STUB ISpGrammarBuilder_AddRuleTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddResource_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hRuleState,
-    LPCWSTR pszResourceName,
-    LPCWSTR pszResourceValue);
-void __RPC_STUB ISpGrammarBuilder_AddResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_Commit_Proxy(
-    ISpGrammarBuilder* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpGrammarBuilder_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpGrammarBuilder_INTERFACE_DEFINED__ */
 
@@ -9461,23 +8495,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     /*** ISpGrammarBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetGrammar)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         WORD NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *GetRule)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszRuleName,
         DWORD dwRuleId,
         DWORD dwAttributes,
@@ -9485,16 +8519,16 @@
         SPSTATEHANDLE *phInitialState);
 
     HRESULT (STDMETHODCALLTYPE *ClearRule)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hState);
 
     HRESULT (STDMETHODCALLTYPE *CreateNewState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hState,
         SPSTATEHANDLE *phState);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
@@ -9504,7 +8538,7 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         SPSTATEHANDLE hRule,
@@ -9512,37 +8546,37 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hRuleState,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         DWORD dwReserved);
 
     /*** ISpRecoGrammar methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGrammarId)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ULONGLONG *pullGrammarId);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ISpRecoContext **ppRecoCtxt);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszFileName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromObject)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFCLSID rcid,
         LPCWSTR pszGrammarName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromResource)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         HMODULE hModule,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceType,
@@ -9550,12 +8584,12 @@
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const SPBINARYGRAMMAR *pGrammar,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromProprietaryGrammar)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFGUID rguidParam,
         LPCWSTR pszStringParam,
         const void *pvDataPrarm,
@@ -9563,58 +8597,59 @@
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszName,
         void *pReserved,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleIdState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ULONG ulRuleId,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *LoadDictation)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszTopicName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *UnloadDictation)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     HRESULT (STDMETHODCALLTYPE *SetDictationState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const WCHAR *pText,
         ULONG cchText,
         const SPTEXTSELECTIONINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetTextSelection)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const SPTEXTSELECTIONINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *IsPronounceable)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszWord,
         SPWORDPRONOUNCEABLE *pWordPronounceable);
 
     HRESULT (STDMETHODCALLTYPE *SetGrammarState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPGRAMMARSTATE eGrammarState);
 
     HRESULT (STDMETHODCALLTYPE *SaveCmd)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         IStream *pStream,
         LPWSTR *ppszCoMemErrorText);
 
     HRESULT (STDMETHODCALLTYPE *GetGrammarState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPGRAMMARSTATE *peGrammarState);
 
     END_INTERFACE
 } ISpRecoGrammarVtbl;
+
 interface ISpRecoGrammar {
     CONST_VTBL ISpRecoGrammarVtbl* lpVtbl;
 };
@@ -9749,169 +8784,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarId_Proxy(
-    ISpRecoGrammar* This,
-    ULONGLONG *pullGrammarId);
-void __RPC_STUB ISpRecoGrammar_GetGrammarId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetRecoContext_Proxy(
-    ISpRecoGrammar* This,
-    ISpRecoContext **ppRecoCtxt);
-void __RPC_STUB ISpRecoGrammar_GetRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromFile_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszFileName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromObject_Proxy(
-    ISpRecoGrammar* This,
-    REFCLSID rcid,
-    LPCWSTR pszGrammarName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromResource_Proxy(
-    ISpRecoGrammar* This,
-    HMODULE hModule,
-    LPCWSTR pszResourceName,
-    LPCWSTR pszResourceType,
-    WORD wLanguage,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromMemory_Proxy(
-    ISpRecoGrammar* This,
-    const SPBINARYGRAMMAR *pGrammar,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Proxy(
-    ISpRecoGrammar* This,
-    REFGUID rguidParam,
-    LPCWSTR pszStringParam,
-    const void *pvDataPrarm,
-    ULONG cbDataSize,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleState_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszName,
-    void *pReserved,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetRuleState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleIdState_Proxy(
-    ISpRecoGrammar* This,
-    ULONG ulRuleId,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetRuleIdState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadDictation_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszTopicName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadDictation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_UnloadDictation_Proxy(
-    ISpRecoGrammar* This);
-void __RPC_STUB ISpRecoGrammar_UnloadDictation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetDictationState_Proxy(
-    ISpRecoGrammar* This,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetDictationState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetWordSequenceData_Proxy(
-    ISpRecoGrammar* This,
-    const WCHAR *pText,
-    ULONG cchText,
-    const SPTEXTSELECTIONINFO *pInfo);
-void __RPC_STUB ISpRecoGrammar_SetWordSequenceData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetTextSelection_Proxy(
-    ISpRecoGrammar* This,
-    const SPTEXTSELECTIONINFO *pInfo);
-void __RPC_STUB ISpRecoGrammar_SetTextSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_IsPronounceable_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszWord,
-    SPWORDPRONOUNCEABLE *pWordPronounceable);
-void __RPC_STUB ISpRecoGrammar_IsPronounceable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetGrammarState_Proxy(
-    ISpRecoGrammar* This,
-    SPGRAMMARSTATE eGrammarState);
-void __RPC_STUB ISpRecoGrammar_SetGrammarState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SaveCmd_Proxy(
-    ISpRecoGrammar* This,
-    IStream *pStream,
-    LPWSTR *ppszCoMemErrorText);
-void __RPC_STUB ISpRecoGrammar_SaveCmd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarState_Proxy(
-    ISpRecoGrammar* This,
-    SPGRAMMARSTATE *peGrammarState);
-void __RPC_STUB ISpRecoGrammar_GetGrammarState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoGrammar_INTERFACE_DEFINED__ */
 
@@ -9957,30 +8829,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpGrammarBuilder2* This,
+        ISpGrammarBuilder2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpGrammarBuilder2* This);
+        ISpGrammarBuilder2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpGrammarBuilder2* This);
+        ISpGrammarBuilder2 *This);
 
     /*** ISpGrammarBuilder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddTextSubset)(
-        ISpGrammarBuilder2* This,
+        ISpGrammarBuilder2 *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
         SPMATCHINGMODE eMatchMode);
 
     HRESULT (STDMETHODCALLTYPE *SetPhoneticAlphabet)(
-        ISpGrammarBuilder2* This,
+        ISpGrammarBuilder2 *This,
         PHONETICALPHABET phoneticALphabet);
 
     END_INTERFACE
 } ISpGrammarBuilder2Vtbl;
+
 interface ISpGrammarBuilder2 {
     CONST_VTBL ISpGrammarBuilder2Vtbl* lpVtbl;
 };
@@ -10017,25 +8890,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_AddTextSubset_Proxy(
-    ISpGrammarBuilder2* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    LPCWSTR psz,
-    SPMATCHINGMODE eMatchMode);
-void __RPC_STUB ISpGrammarBuilder2_AddTextSubset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_SetPhoneticAlphabet_Proxy(
-    ISpGrammarBuilder2* This,
-    PHONETICALPHABET phoneticALphabet);
-void __RPC_STUB ISpGrammarBuilder2_SetPhoneticAlphabet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpGrammarBuilder2_INTERFACE_DEFINED__ */
 
@@ -10096,62 +8950,63 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoGrammar2* This);
+        ISpRecoGrammar2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoGrammar2* This);
+        ISpRecoGrammar2 *This);
 
     /*** ISpRecoGrammar2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRules)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         SPRULE **ppCoMemRules,
         UINT *puNumRules);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile2)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         LPCWSTR pszFileName,
         SPLOADOPTIONS Options,
         LPCWSTR pszSharingUri,
         LPCWSTR pszBaseUri);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory2)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         const SPBINARYGRAMMAR *pGrammar,
         SPLOADOPTIONS Options,
         LPCWSTR pszSharingUri,
         LPCWSTR pszBaseUri);
 
     HRESULT (STDMETHODCALLTYPE *SetRulePriority)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         LPCWSTR pszRuleName,
         ULONG ulRuleId,
         int nRulePriority);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleWeight)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         LPCWSTR pszRuleName,
         ULONG ulRuleId,
         float flWeight);
 
     HRESULT (STDMETHODCALLTYPE *SetDictationWeight)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         float flWeight);
 
     HRESULT (STDMETHODCALLTYPE *SetGrammarLoader)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         ISpeechResourceLoader *pLoader);
 
     HRESULT (STDMETHODCALLTYPE *SetSMLSecurityManager)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         IInternetSecurityManager *pSMLSecurityManager);
 
     END_INTERFACE
 } ISpRecoGrammar2Vtbl;
+
 interface ISpRecoGrammar2 {
     CONST_VTBL ISpRecoGrammar2Vtbl* lpVtbl;
 };
@@ -10212,81 +9067,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_GetRules_Proxy(
-    ISpRecoGrammar2* This,
-    SPRULE **ppCoMemRules,
-    UINT *puNumRules);
-void __RPC_STUB ISpRecoGrammar2_GetRules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromFile2_Proxy(
-    ISpRecoGrammar2* This,
-    LPCWSTR pszFileName,
-    SPLOADOPTIONS Options,
-    LPCWSTR pszSharingUri,
-    LPCWSTR pszBaseUri);
-void __RPC_STUB ISpRecoGrammar2_LoadCmdFromFile2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromMemory2_Proxy(
-    ISpRecoGrammar2* This,
-    const SPBINARYGRAMMAR *pGrammar,
-    SPLOADOPTIONS Options,
-    LPCWSTR pszSharingUri,
-    LPCWSTR pszBaseUri);
-void __RPC_STUB ISpRecoGrammar2_LoadCmdFromMemory2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRulePriority_Proxy(
-    ISpRecoGrammar2* This,
-    LPCWSTR pszRuleName,
-    ULONG ulRuleId,
-    int nRulePriority);
-void __RPC_STUB ISpRecoGrammar2_SetRulePriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRuleWeight_Proxy(
-    ISpRecoGrammar2* This,
-    LPCWSTR pszRuleName,
-    ULONG ulRuleId,
-    float flWeight);
-void __RPC_STUB ISpRecoGrammar2_SetRuleWeight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetDictationWeight_Proxy(
-    ISpRecoGrammar2* This,
-    float flWeight);
-void __RPC_STUB ISpRecoGrammar2_SetDictationWeight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetGrammarLoader_Proxy(
-    ISpRecoGrammar2* This,
-    ISpeechResourceLoader *pLoader);
-void __RPC_STUB ISpRecoGrammar2_SetGrammarLoader_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetSMLSecurityManager_Proxy(
-    ISpRecoGrammar2* This,
-    IInternetSecurityManager *pSMLSecurityManager);
-void __RPC_STUB ISpRecoGrammar2_SetSMLSecurityManager_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoGrammar2_INTERFACE_DEFINED__ */
 
@@ -10328,29 +9108,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechResourceLoader* This);
+        ISpeechResourceLoader *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechResourceLoader* This);
+        ISpeechResourceLoader *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -10358,7 +9138,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -10370,7 +9150,7 @@
 
     /*** ISpeechResourceLoader methods ***/
     HRESULT (STDMETHODCALLTYPE *LoadResource)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         BSTR bstrResourceUri,
         VARIANT_BOOL fAlwaysReload,
         IUnknown **pStream,
@@ -10379,18 +9159,19 @@
         BSTR *pbstrRedirectUrl);
 
     HRESULT (STDMETHODCALLTYPE *GetLocalCopy)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         BSTR bstrResourceUri,
         BSTR *pbstrLocalPath,
         BSTR *pbstrMIMEType,
         BSTR *pbstrRedirectUrl);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseLocalCopy)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         BSTR pbstrLocalPath);
 
     END_INTERFACE
 } ISpeechResourceLoaderVtbl;
+
 interface ISpeechResourceLoader {
     CONST_VTBL ISpeechResourceLoaderVtbl* lpVtbl;
 };
@@ -10449,38 +9230,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_LoadResource_Proxy(
-    ISpeechResourceLoader* This,
-    BSTR bstrResourceUri,
-    VARIANT_BOOL fAlwaysReload,
-    IUnknown **pStream,
-    BSTR *pbstrMIMEType,
-    VARIANT_BOOL *pfModified,
-    BSTR *pbstrRedirectUrl);
-void __RPC_STUB ISpeechResourceLoader_LoadResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_GetLocalCopy_Proxy(
-    ISpeechResourceLoader* This,
-    BSTR bstrResourceUri,
-    BSTR *pbstrLocalPath,
-    BSTR *pbstrMIMEType,
-    BSTR *pbstrRedirectUrl);
-void __RPC_STUB ISpeechResourceLoader_GetLocalCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_ReleaseLocalCopy_Proxy(
-    ISpeechResourceLoader* This,
-    BSTR pbstrLocalPath);
-void __RPC_STUB ISpeechResourceLoader_ReleaseLocalCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechResourceLoader_INTERFACE_DEFINED__ */
 
@@ -10585,151 +9334,152 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpRecoContext methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRecognizer)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpRecognizer **ppRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *CreateGrammar)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullGrammarId,
         ISpRecoGrammar **ppGrammar);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPRECOCONTEXTSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxAlternates)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG *pcAlternates);
 
     HRESULT (STDMETHODCALLTYPE *SetMaxAlternates)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG cAlternates);
 
     HRESULT (STDMETHODCALLTYPE *SetAudioOptions)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPAUDIOOPTIONS Options,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioOptions)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPAUDIOOPTIONS *pOptions,
         GUID *pAudioFormatId,
         WAVEFORMATEX **ppCoMemWFEX);
 
     HRESULT (STDMETHODCALLTYPE *DeserializeResult)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         const SPSERIALIZEDRESULT *pSerializedResult,
         ISpRecoResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *Bookmark)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPBOOKMARKOPTIONS Options,
         ULONGLONG ullStreamPosition,
         LPARAM lparamEvent);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         LPCWSTR pAdaptationData,
         const ULONG cch);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetVoice)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpVoice *pVoice,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetVoice)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpVoice **ppVoice);
 
     HRESULT (STDMETHODCALLTYPE *SetVoicePurgeEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetVoicePurgeEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG *pullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *SetContextState)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPCONTEXTSTATE eContextState);
 
     HRESULT (STDMETHODCALLTYPE *GetContextState)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPCONTEXTSTATE *peContextState);
 
     END_INTERFACE
 } ISpRecoContextVtbl;
+
 interface ISpRecoContext {
     CONST_VTBL ISpRecoContextVtbl* lpVtbl;
 };
@@ -10874,160 +9624,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetRecognizer_Proxy(
-    ISpRecoContext* This,
-    ISpRecognizer **ppRecognizer);
-void __RPC_STUB ISpRecoContext_GetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_CreateGrammar_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG ullGrammarId,
-    ISpRecoGrammar **ppGrammar);
-void __RPC_STUB ISpRecoContext_CreateGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetStatus_Proxy(
-    ISpRecoContext* This,
-    SPRECOCONTEXTSTATUS *pStatus);
-void __RPC_STUB ISpRecoContext_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetMaxAlternates_Proxy(
-    ISpRecoContext* This,
-    ULONG *pcAlternates);
-void __RPC_STUB ISpRecoContext_GetMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetMaxAlternates_Proxy(
-    ISpRecoContext* This,
-    ULONG cAlternates);
-void __RPC_STUB ISpRecoContext_SetMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAudioOptions_Proxy(
-    ISpRecoContext* This,
-    SPAUDIOOPTIONS Options,
-    const GUID *pAudioFormatId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpRecoContext_SetAudioOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetAudioOptions_Proxy(
-    ISpRecoContext* This,
-    SPAUDIOOPTIONS *pOptions,
-    GUID *pAudioFormatId,
-    WAVEFORMATEX **ppCoMemWFEX);
-void __RPC_STUB ISpRecoContext_GetAudioOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_DeserializeResult_Proxy(
-    ISpRecoContext* This,
-    const SPSERIALIZEDRESULT *pSerializedResult,
-    ISpRecoResult **ppResult);
-void __RPC_STUB ISpRecoContext_DeserializeResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Bookmark_Proxy(
-    ISpRecoContext* This,
-    SPBOOKMARKOPTIONS Options,
-    ULONGLONG ullStreamPosition,
-    LPARAM lparamEvent);
-void __RPC_STUB ISpRecoContext_Bookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAdaptationData_Proxy(
-    ISpRecoContext* This,
-    LPCWSTR pAdaptationData,
-    const ULONG cch);
-void __RPC_STUB ISpRecoContext_SetAdaptationData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Pause_Proxy(
-    ISpRecoContext* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpRecoContext_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Resume_Proxy(
-    ISpRecoContext* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpRecoContext_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoice_Proxy(
-    ISpRecoContext* This,
-    ISpVoice *pVoice,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpRecoContext_SetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoice_Proxy(
-    ISpRecoContext* This,
-    ISpVoice **ppVoice);
-void __RPC_STUB ISpRecoContext_GetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoicePurgeEvent_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG ullEventInterest);
-void __RPC_STUB ISpRecoContext_SetVoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoicePurgeEvent_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG *pullEventInterest);
-void __RPC_STUB ISpRecoContext_GetVoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetContextState_Proxy(
-    ISpRecoContext* This,
-    SPCONTEXTSTATE eContextState);
-void __RPC_STUB ISpRecoContext_SetContextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetContextState_Proxy(
-    ISpRecoContext* This,
-    SPCONTEXTSTATE *peContextState);
-void __RPC_STUB ISpRecoContext_GetContextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoContext_INTERFACE_DEFINED__ */
 
@@ -11094,27 +9690,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoContext2* This);
+        ISpRecoContext2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoContext2* This);
+        ISpRecoContext2 *This);
 
     /*** ISpRecoContext2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetGrammarOptions)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         DWORD eGrammarOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetGrammarOptions)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         DWORD *peGrammarOptions);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData2)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         LPCWSTR pAdaptationData,
         const ULONG cch,
         LPCWSTR pTopicName,
@@ -11123,6 +9719,7 @@
 
     END_INTERFACE
 } ISpRecoContext2Vtbl;
+
 interface ISpRecoContext2 {
     CONST_VTBL ISpRecoContext2Vtbl* lpVtbl;
 };
@@ -11163,34 +9760,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetGrammarOptions_Proxy(
-    ISpRecoContext2* This,
-    DWORD eGrammarOptions);
-void __RPC_STUB ISpRecoContext2_SetGrammarOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext2_GetGrammarOptions_Proxy(
-    ISpRecoContext2* This,
-    DWORD *peGrammarOptions);
-void __RPC_STUB ISpRecoContext2_GetGrammarOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetAdaptationData2_Proxy(
-    ISpRecoContext2* This,
-    LPCWSTR pAdaptationData,
-    const ULONG cch,
-    LPCWSTR pTopicName,
-    DWORD eAdaptationSettings,
-    SPADAPTATIONRELEVANCE eRelevance);
-void __RPC_STUB ISpRecoContext2_SetAdaptationData2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoContext2_INTERFACE_DEFINED__ */
 
@@ -11231,39 +9800,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpProperties* This,
+        ISpProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpProperties* This);
+        ISpProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpProperties* This);
+        ISpProperties *This);
 
     /*** ISpProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyNum)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LONG lValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNum)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LONG *plValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LPCWSTR pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LPWSTR *ppCoMemValue);
 
     END_INTERFACE
 } ISpPropertiesVtbl;
+
 interface ISpProperties {
     CONST_VTBL ISpPropertiesVtbl* lpVtbl;
 };
@@ -11308,42 +9878,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyNum_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LONG lValue);
-void __RPC_STUB ISpProperties_SetPropertyNum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyNum_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LONG *plValue);
-void __RPC_STUB ISpProperties_GetPropertyNum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyString_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LPCWSTR pValue);
-void __RPC_STUB ISpProperties_SetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyString_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LPWSTR *ppCoMemValue);
-void __RPC_STUB ISpProperties_GetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpProperties_INTERFACE_DEFINED__ */
 
@@ -11449,101 +9983,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     /*** ISpProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyNum)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LONG lValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNum)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LONG *plValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LPCWSTR pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LPWSTR *ppCoMemValue);
 
     /*** ISpRecognizer methods ***/
     HRESULT (STDMETHODCALLTYPE *SetRecognizer)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken *pRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *GetRecognizer)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *SetInput)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         IUnknown *pUnkInput,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetInputObjectToken)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStream)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *CreateRecoContext)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpRecoContext **ppNewCtxt);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoProfile)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *SetRecoProfile)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *IsSharedInstance)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoState)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOSTATE *pState);
 
     HRESULT (STDMETHODCALLTYPE *SetRecoState)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOSTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOGNIZERSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPSTREAMFORMATTYPE WaveFormatType,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWFEX);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -11551,11 +10085,12 @@
         ULONG cbExtraData);
 
     HRESULT (STDMETHODCALLTYPE *EmulateRecognition)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpPhrase *pPhrase);
 
     END_INTERFACE
 } ISpRecognizerVtbl;
+
 interface ISpRecognizer {
     CONST_VTBL ISpRecognizerVtbl* lpVtbl;
 };
@@ -11666,120 +10201,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecognizer_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken *pRecognizer);
-void __RPC_STUB ISpRecognizer_SetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecognizer_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppRecognizer);
-void __RPC_STUB ISpRecognizer_GetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetInput_Proxy(
-    ISpRecognizer* This,
-    IUnknown *pUnkInput,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpRecognizer_SetInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputObjectToken_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpRecognizer_GetInputObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputStream_Proxy(
-    ISpRecognizer* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpRecognizer_GetInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_CreateRecoContext_Proxy(
-    ISpRecognizer* This,
-    ISpRecoContext **ppNewCtxt);
-void __RPC_STUB ISpRecognizer_CreateRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoProfile_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpRecognizer_GetRecoProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoProfile_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpRecognizer_SetRecoProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_IsSharedInstance_Proxy(
-    ISpRecognizer* This);
-void __RPC_STUB ISpRecognizer_IsSharedInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoState_Proxy(
-    ISpRecognizer* This,
-    SPRECOSTATE *pState);
-void __RPC_STUB ISpRecognizer_GetRecoState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoState_Proxy(
-    ISpRecognizer* This,
-    SPRECOSTATE NewState);
-void __RPC_STUB ISpRecognizer_SetRecoState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetStatus_Proxy(
-    ISpRecognizer* This,
-    SPRECOGNIZERSTATUS *pStatus);
-void __RPC_STUB ISpRecognizer_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetFormat_Proxy(
-    ISpRecognizer* This,
-    SPSTREAMFORMATTYPE WaveFormatType,
-    GUID *pFormatId,
-    WAVEFORMATEX **ppCoMemWFEX);
-void __RPC_STUB ISpRecognizer_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_EmulateRecognition_Proxy(
-    ISpRecognizer* This,
-    ISpPhrase *pPhrase);
-void __RPC_STUB ISpRecognizer_EmulateRecognition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecognizer_INTERFACE_DEFINED__ */
 
@@ -11814,31 +10235,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpSerializeState* This,
+        ISpSerializeState *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpSerializeState* This);
+        ISpSerializeState *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpSerializeState* This);
+        ISpSerializeState *This);
 
     /*** ISpSerializeState methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSerializedState)(
-        ISpSerializeState* This,
+        ISpSerializeState *This,
         BYTE **ppbData,
         ULONG *pulSize,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetSerializedState)(
-        ISpSerializeState* This,
+        ISpSerializeState *This,
         BYTE *pbData,
         ULONG ulSize,
         DWORD dwReserved);
 
     END_INTERFACE
 } ISpSerializeStateVtbl;
+
 interface ISpSerializeState {
     CONST_VTBL ISpSerializeStateVtbl* lpVtbl;
 };
@@ -11875,26 +10297,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpSerializeState_GetSerializedState_Proxy(
-    ISpSerializeState* This,
-    BYTE **ppbData,
-    ULONG *pulSize,
-    DWORD dwReserved);
-void __RPC_STUB ISpSerializeState_GetSerializedState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpSerializeState_SetSerializedState_Proxy(
-    ISpSerializeState* This,
-    BYTE *pbData,
-    ULONG ulSize,
-    DWORD dwReserved);
-void __RPC_STUB ISpSerializeState_SetSerializedState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpSerializeState_INTERFACE_DEFINED__ */
 
@@ -11930,32 +10332,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecognizer2* This,
+        ISpRecognizer2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecognizer2* This);
+        ISpRecognizer2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecognizer2* This);
+        ISpRecognizer2 *This);
 
     /*** ISpRecognizer2 methods ***/
     HRESULT (STDMETHODCALLTYPE *EmulateRecognitionEx)(
-        ISpRecognizer2* This,
+        ISpRecognizer2 *This,
         ISpPhrase *pPhrase,
         DWORD dwCompareFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetTrainingState)(
-        ISpRecognizer2* This,
+        ISpRecognizer2 *This,
         WINBOOL fDoingTraining,
         WINBOOL fAdaptFromTrainingData);
 
     HRESULT (STDMETHODCALLTYPE *ResetAcousticModelAdaptation)(
-        ISpRecognizer2* This);
+        ISpRecognizer2 *This);
 
     END_INTERFACE
 } ISpRecognizer2Vtbl;
+
 interface ISpRecognizer2 {
     CONST_VTBL ISpRecognizer2Vtbl* lpVtbl;
 };
@@ -11996,31 +10399,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecognizer2_EmulateRecognitionEx_Proxy(
-    ISpRecognizer2* This,
-    ISpPhrase *pPhrase,
-    DWORD dwCompareFlags);
-void __RPC_STUB ISpRecognizer2_EmulateRecognitionEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer2_SetTrainingState_Proxy(
-    ISpRecognizer2* This,
-    WINBOOL fDoingTraining,
-    WINBOOL fAdaptFromTrainingData);
-void __RPC_STUB ISpRecognizer2_SetTrainingState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer2_ResetAcousticModelAdaptation_Proxy(
-    ISpRecognizer2* This);
-void __RPC_STUB ISpRecognizer2_ResetAcousticModelAdaptation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecognizer2_INTERFACE_DEFINED__ */
 
@@ -12063,19 +10441,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEnginePronunciation* This,
+        ISpEnginePronunciation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEnginePronunciation* This);
+        ISpEnginePronunciation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEnginePronunciation* This);
+        ISpEnginePronunciation *This);
 
     /*** ISpEnginePronunciation methods ***/
     HRESULT (STDMETHODCALLTYPE *Normalize)(
-        ISpEnginePronunciation* This,
+        ISpEnginePronunciation *This,
         LPCWSTR pszWord,
         LPCWSTR pszLeftContext,
         LPCWSTR pszRightContext,
@@ -12083,7 +10461,7 @@
         SPNORMALIZATIONLIST *pNormalizationList);
 
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpEnginePronunciation* This,
+        ISpEnginePronunciation *This,
         LPCWSTR pszWord,
         LPCWSTR pszLeftContext,
         LPCWSTR pszRightContext,
@@ -12092,6 +10470,7 @@
 
     END_INTERFACE
 } ISpEnginePronunciationVtbl;
+
 interface ISpEnginePronunciation {
     CONST_VTBL ISpEnginePronunciationVtbl* lpVtbl;
 };
@@ -12128,30 +10507,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_Normalize_Proxy(
-    ISpEnginePronunciation* This,
-    LPCWSTR pszWord,
-    LPCWSTR pszLeftContext,
-    LPCWSTR pszRightContext,
-    WORD LangID,
-    SPNORMALIZATIONLIST *pNormalizationList);
-void __RPC_STUB ISpEnginePronunciation_Normalize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_GetPronunciations_Proxy(
-    ISpEnginePronunciation* This,
-    LPCWSTR pszWord,
-    LPCWSTR pszLeftContext,
-    LPCWSTR pszRightContext,
-    WORD LangID,
-    SPWORDPRONUNCIATIONLIST *pEnginePronunciationList);
-void __RPC_STUB ISpEnginePronunciation_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEnginePronunciation_INTERFACE_DEFINED__ */
 
@@ -12194,30 +10549,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpDisplayAlternates* This,
+        ISpDisplayAlternates *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpDisplayAlternates* This);
+        ISpDisplayAlternates *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpDisplayAlternates* This);
+        ISpDisplayAlternates *This);
 
     /*** ISpDisplayAlternates methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDisplayAlternates)(
-        ISpDisplayAlternates* This,
+        ISpDisplayAlternates *This,
         const SPDISPLAYPHRASE *pPhrase,
         ULONG cRequestCount,
         SPDISPLAYPHRASE **ppCoMemPhrases,
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *SetFullStopTrailSpace)(
-        ISpDisplayAlternates* This,
+        ISpDisplayAlternates *This,
         ULONG ulTrailSpace);
 
     END_INTERFACE
 } ISpDisplayAlternatesVtbl;
+
 interface ISpDisplayAlternates {
     CONST_VTBL ISpDisplayAlternatesVtbl* lpVtbl;
 };
@@ -12254,25 +10610,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_GetDisplayAlternates_Proxy(
-    ISpDisplayAlternates* This,
-    const SPDISPLAYPHRASE *pPhrase,
-    ULONG cRequestCount,
-    SPDISPLAYPHRASE **ppCoMemPhrases,
-    ULONG *pcPhrasesReturned);
-void __RPC_STUB ISpDisplayAlternates_GetDisplayAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_SetFullStopTrailSpace_Proxy(
-    ISpDisplayAlternates* This,
-    ULONG ulTrailSpace);
-void __RPC_STUB ISpDisplayAlternates_SetFullStopTrailSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpDisplayAlternates_INTERFACE_DEFINED__ */
 
@@ -12282,236 +10619,377 @@
 #ifndef __ISpeechDataKey_FWD_DEFINED__
 #define __ISpeechDataKey_FWD_DEFINED__
 typedef interface ISpeechDataKey ISpeechDataKey;
+#ifdef __cplusplus
+interface ISpeechDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectToken_FWD_DEFINED__
 #define __ISpeechObjectToken_FWD_DEFINED__
 typedef interface ISpeechObjectToken ISpeechObjectToken;
+#ifdef __cplusplus
+interface ISpeechObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokens_FWD_DEFINED__
 #define __ISpeechObjectTokens_FWD_DEFINED__
 typedef interface ISpeechObjectTokens ISpeechObjectTokens;
+#ifdef __cplusplus
+interface ISpeechObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__
 #define __ISpeechObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpeechObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__
 #define __ISpeechAudioBufferInfo_FWD_DEFINED__
 typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo;
+#ifdef __cplusplus
+interface ISpeechAudioBufferInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioStatus_FWD_DEFINED__
 #define __ISpeechAudioStatus_FWD_DEFINED__
 typedef interface ISpeechAudioStatus ISpeechAudioStatus;
+#ifdef __cplusplus
+interface ISpeechAudioStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioFormat_FWD_DEFINED__
 #define __ISpeechAudioFormat_FWD_DEFINED__
 typedef interface ISpeechAudioFormat ISpeechAudioFormat;
+#ifdef __cplusplus
+interface ISpeechAudioFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__
 #define __ISpeechWaveFormatEx_FWD_DEFINED__
 typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx;
+#ifdef __cplusplus
+interface ISpeechWaveFormatEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechBaseStream_FWD_DEFINED__
 #define __ISpeechBaseStream_FWD_DEFINED__
 typedef interface ISpeechBaseStream ISpeechBaseStream;
+#ifdef __cplusplus
+interface ISpeechBaseStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechFileStream_FWD_DEFINED__
 #define __ISpeechFileStream_FWD_DEFINED__
 typedef interface ISpeechFileStream ISpeechFileStream;
+#ifdef __cplusplus
+interface ISpeechFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMemoryStream_FWD_DEFINED__
 #define __ISpeechMemoryStream_FWD_DEFINED__
 typedef interface ISpeechMemoryStream ISpeechMemoryStream;
+#ifdef __cplusplus
+interface ISpeechMemoryStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechCustomStream_FWD_DEFINED__
 #define __ISpeechCustomStream_FWD_DEFINED__
 typedef interface ISpeechCustomStream ISpeechCustomStream;
+#ifdef __cplusplus
+interface ISpeechCustomStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudio_FWD_DEFINED__
 #define __ISpeechAudio_FWD_DEFINED__
 typedef interface ISpeechAudio ISpeechAudio;
+#ifdef __cplusplus
+interface ISpeechAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMMSysAudio_FWD_DEFINED__
 #define __ISpeechMMSysAudio_FWD_DEFINED__
 typedef interface ISpeechMMSysAudio ISpeechMMSysAudio;
+#ifdef __cplusplus
+interface ISpeechMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoice_FWD_DEFINED__
 #define __ISpeechVoice_FWD_DEFINED__
 typedef interface ISpeechVoice ISpeechVoice;
+#ifdef __cplusplus
+interface ISpeechVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoiceStatus_FWD_DEFINED__
 #define __ISpeechVoiceStatus_FWD_DEFINED__
 typedef interface ISpeechVoiceStatus ISpeechVoiceStatus;
+#ifdef __cplusplus
+interface ISpeechVoiceStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__
 #define ___ISpeechVoiceEvents_FWD_DEFINED__
 typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents;
+#ifdef __cplusplus
+interface _ISpeechVoiceEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizer_FWD_DEFINED__
 #define __ISpeechRecognizer_FWD_DEFINED__
 typedef interface ISpeechRecognizer ISpeechRecognizer;
+#ifdef __cplusplus
+interface ISpeechRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__
 #define __ISpeechRecognizerStatus_FWD_DEFINED__
 typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus;
+#ifdef __cplusplus
+interface ISpeechRecognizerStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoContext_FWD_DEFINED__
 #define __ISpeechRecoContext_FWD_DEFINED__
 typedef interface ISpeechRecoContext ISpeechRecoContext;
+#ifdef __cplusplus
+interface ISpeechRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoGrammar_FWD_DEFINED__
 #define __ISpeechRecoGrammar_FWD_DEFINED__
 typedef interface ISpeechRecoGrammar ISpeechRecoGrammar;
+#ifdef __cplusplus
+interface ISpeechRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__
 #define ___ISpeechRecoContextEvents_FWD_DEFINED__
 typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents;
+#ifdef __cplusplus
+interface _ISpeechRecoContextEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRule_FWD_DEFINED__
 #define __ISpeechGrammarRule_FWD_DEFINED__
 typedef interface ISpeechGrammarRule ISpeechGrammarRule;
+#ifdef __cplusplus
+interface ISpeechGrammarRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRules_FWD_DEFINED__
 #define __ISpeechGrammarRules_FWD_DEFINED__
 typedef interface ISpeechGrammarRules ISpeechGrammarRules;
+#ifdef __cplusplus
+interface ISpeechGrammarRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__
 #define __ISpeechGrammarRuleState_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransitions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__
 #define __ISpeechTextSelectionInformation_FWD_DEFINED__
 typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation;
+#ifdef __cplusplus
+interface ISpeechTextSelectionInformation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult_FWD_DEFINED__
 #define __ISpeechRecoResult_FWD_DEFINED__
 typedef interface ISpeechRecoResult ISpeechRecoResult;
+#ifdef __cplusplus
+interface ISpeechRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult2_FWD_DEFINED__
 #define __ISpeechRecoResult2_FWD_DEFINED__
 typedef interface ISpeechRecoResult2 ISpeechRecoResult2;
+#ifdef __cplusplus
+interface ISpeechRecoResult2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__
 #define __ISpeechRecoResultTimes_FWD_DEFINED__
 typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes;
+#ifdef __cplusplus
+interface ISpeechRecoResultTimes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__
 #define __ISpeechPhraseAlternate_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__
 #define __ISpeechPhraseAlternates_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfo_FWD_DEFINED__
 #define __ISpeechPhraseInfo_FWD_DEFINED__
 typedef interface ISpeechPhraseInfo ISpeechPhraseInfo;
+#ifdef __cplusplus
+interface ISpeechPhraseInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElement_FWD_DEFINED__
 #define __ISpeechPhraseElement_FWD_DEFINED__
 typedef interface ISpeechPhraseElement ISpeechPhraseElement;
+#ifdef __cplusplus
+interface ISpeechPhraseElement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElements_FWD_DEFINED__
 #define __ISpeechPhraseElements_FWD_DEFINED__
 typedef interface ISpeechPhraseElements ISpeechPhraseElements;
+#ifdef __cplusplus
+interface ISpeechPhraseElements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__
 #define __ISpeechPhraseReplacement_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__
 #define __ISpeechPhraseReplacements_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperty_FWD_DEFINED__
 #define __ISpeechPhraseProperty_FWD_DEFINED__
 typedef interface ISpeechPhraseProperty ISpeechPhraseProperty;
+#ifdef __cplusplus
+interface ISpeechPhraseProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperties_FWD_DEFINED__
 #define __ISpeechPhraseProperties_FWD_DEFINED__
 typedef interface ISpeechPhraseProperties ISpeechPhraseProperties;
+#ifdef __cplusplus
+interface ISpeechPhraseProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRule_FWD_DEFINED__
 #define __ISpeechPhraseRule_FWD_DEFINED__
 typedef interface ISpeechPhraseRule ISpeechPhraseRule;
+#ifdef __cplusplus
+interface ISpeechPhraseRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRules_FWD_DEFINED__
 #define __ISpeechPhraseRules_FWD_DEFINED__
 typedef interface ISpeechPhraseRules ISpeechPhraseRules;
+#ifdef __cplusplus
+interface ISpeechPhraseRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexicon_FWD_DEFINED__
 #define __ISpeechLexicon_FWD_DEFINED__
 typedef interface ISpeechLexicon ISpeechLexicon;
+#ifdef __cplusplus
+interface ISpeechLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWords_FWD_DEFINED__
 #define __ISpeechLexiconWords_FWD_DEFINED__
 typedef interface ISpeechLexiconWords ISpeechLexiconWords;
+#ifdef __cplusplus
+interface ISpeechLexiconWords;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWord_FWD_DEFINED__
 #define __ISpeechLexiconWord_FWD_DEFINED__
 typedef interface ISpeechLexiconWord ISpeechLexiconWord;
+#ifdef __cplusplus
+interface ISpeechLexiconWord;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__
 #define __ISpeechLexiconPronunciations_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciations;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__
 #define __ISpeechLexiconPronunciation_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciation;
+#endif /* __cplusplus */
 #endif
 
 typedef LONG SpeechLanguageId;
@@ -12643,29 +11121,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechDataKey* This);
+        ISpeechDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechDataKey* This);
+        ISpeechDataKey *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -12673,7 +11151,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -12685,65 +11163,66 @@
 
     /*** ISpeechDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBinaryValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         VARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *GetBinaryValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         const BSTR Value);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         BSTR *Value);
 
     HRESULT (STDMETHODCALLTYPE *SetLongValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         LONG Value);
 
     HRESULT (STDMETHODCALLTYPE *GetLongValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         LONG *Value);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName,
         ISpeechDataKey **SubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName,
         ISpeechDataKey **SubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         LONG Index,
         BSTR *SubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         LONG Index,
         BSTR *ValueName);
 
     END_INTERFACE
 } ISpeechDataKeyVtbl;
+
 interface ISpeechDataKey {
     CONST_VTBL ISpeechDataKeyVtbl* lpVtbl;
 };
@@ -12838,112 +11317,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetBinaryValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    VARIANT Value);
-void __RPC_STUB ISpeechDataKey_SetBinaryValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetBinaryValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    VARIANT *Value);
-void __RPC_STUB ISpeechDataKey_GetBinaryValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetStringValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    const BSTR Value);
-void __RPC_STUB ISpeechDataKey_SetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetStringValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    BSTR *Value);
-void __RPC_STUB ISpeechDataKey_GetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetLongValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    LONG Value);
-void __RPC_STUB ISpeechDataKey_SetLongValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetLongValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    LONG *Value);
-void __RPC_STUB ISpeechDataKey_GetLongValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_OpenKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName,
-    ISpeechDataKey **SubKey);
-void __RPC_STUB ISpeechDataKey_OpenKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_CreateKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName,
-    ISpeechDataKey **SubKey);
-void __RPC_STUB ISpeechDataKey_CreateKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName);
-void __RPC_STUB ISpeechDataKey_DeleteKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName);
-void __RPC_STUB ISpeechDataKey_DeleteValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumKeys_Proxy(
-    ISpeechDataKey* This,
-    LONG Index,
-    BSTR *SubKeyName);
-void __RPC_STUB ISpeechDataKey_EnumKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumValues_Proxy(
-    ISpeechDataKey* This,
-    LONG Index,
-    BSTR *ValueName);
-void __RPC_STUB ISpeechDataKey_EnumValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechDataKey_INTERFACE_DEFINED__ */
 
@@ -13027,29 +11400,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectToken* This);
+        ISpeechObjectToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectToken* This);
+        ISpeechObjectToken *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13057,7 +11430,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13069,45 +11442,45 @@
 
     /*** ISpeechObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR *ObjectId);
 
     HRESULT (STDMETHODCALLTYPE *get_DataKey)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         ISpeechDataKey **DataKey);
 
     HRESULT (STDMETHODCALLTYPE *get_Category)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         ISpeechObjectTokenCategory **Category);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         LONG Locale,
         BSTR *Description);
 
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR Id,
         BSTR CategoryID,
         VARIANT_BOOL CreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetAttribute)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR AttributeName,
         BSTR *AttributeValue);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         IUnknown *pUnkOuter,
         SpeechTokenContext ClsContext,
         IUnknown **Object);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID,
         BSTR KeyName,
         BSTR FileName,
@@ -13115,20 +11488,20 @@
         BSTR *FilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID,
         BSTR KeyName,
         VARIANT_BOOL DeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         IUnknown *Object,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         LONG hWnd,
         BSTR Title,
         const BSTR TypeOfUI,
@@ -13136,12 +11509,13 @@
         IUnknown *Object);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR Attributes,
         VARIANT_BOOL *Matches);
 
     END_INTERFACE
 } ISpeechObjectTokenVtbl;
+
 interface ISpeechObjectToken {
     CONST_VTBL ISpeechObjectTokenVtbl* lpVtbl;
 };
@@ -13240,130 +11614,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Id_Proxy(
-    ISpeechObjectToken* This,
-    BSTR *ObjectId);
-void __RPC_STUB ISpeechObjectToken_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_DataKey_Proxy(
-    ISpeechObjectToken* This,
-    ISpeechDataKey **DataKey);
-void __RPC_STUB ISpeechObjectToken_get_DataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Category_Proxy(
-    ISpeechObjectToken* This,
-    ISpeechObjectTokenCategory **Category);
-void __RPC_STUB ISpeechObjectToken_get_Category_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetDescription_Proxy(
-    ISpeechObjectToken* This,
-    LONG Locale,
-    BSTR *Description);
-void __RPC_STUB ISpeechObjectToken_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_SetId_Proxy(
-    ISpeechObjectToken* This,
-    BSTR Id,
-    BSTR CategoryID,
-    VARIANT_BOOL CreateIfNotExist);
-void __RPC_STUB ISpeechObjectToken_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetAttribute_Proxy(
-    ISpeechObjectToken* This,
-    BSTR AttributeName,
-    BSTR *AttributeValue);
-void __RPC_STUB ISpeechObjectToken_GetAttribute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_CreateInstance_Proxy(
-    ISpeechObjectToken* This,
-    IUnknown *pUnkOuter,
-    SpeechTokenContext ClsContext,
-    IUnknown **Object);
-void __RPC_STUB ISpeechObjectToken_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_Remove_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID);
-void __RPC_STUB ISpeechObjectToken_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetStorageFileName_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID,
-    BSTR KeyName,
-    BSTR FileName,
-    SpeechTokenShellFolder Folder,
-    BSTR *FilePath);
-void __RPC_STUB ISpeechObjectToken_GetStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_RemoveStorageFileName_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID,
-    BSTR KeyName,
-    VARIANT_BOOL DeleteFile);
-void __RPC_STUB ISpeechObjectToken_RemoveStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_IsUISupported_Proxy(
-    ISpeechObjectToken* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    IUnknown *Object,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechObjectToken_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_DisplayUI_Proxy(
-    ISpeechObjectToken* This,
-    LONG hWnd,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    IUnknown *Object);
-void __RPC_STUB ISpeechObjectToken_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_MatchesAttributes_Proxy(
-    ISpeechObjectToken* This,
-    BSTR Attributes,
-    VARIANT_BOOL *Matches);
-void __RPC_STUB ISpeechObjectToken_MatchesAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectToken_INTERFACE_DEFINED__ */
 
@@ -13398,29 +11648,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectTokens* This);
+        ISpeechObjectTokens *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectTokens* This);
+        ISpeechObjectTokens *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13428,7 +11678,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13440,20 +11690,21 @@
 
     /*** ISpeechObjectTokens methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         LONG Index,
         ISpeechObjectToken **Token);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         IUnknown **ppEnumVARIANT);
 
     END_INTERFACE
 } ISpeechObjectTokensVtbl;
+
 interface ISpeechObjectTokens {
     CONST_VTBL ISpeechObjectTokensVtbl* lpVtbl;
 };
@@ -13512,31 +11763,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get_Count_Proxy(
-    ISpeechObjectTokens* This,
-    LONG *Count);
-void __RPC_STUB ISpeechObjectTokens_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_Item_Proxy(
-    ISpeechObjectTokens* This,
-    LONG Index,
-    ISpeechObjectToken **Token);
-void __RPC_STUB ISpeechObjectTokens_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get__NewEnum_Proxy(
-    ISpeechObjectTokens* This,
-    IUnknown **ppEnumVARIANT);
-void __RPC_STUB ISpeechObjectTokens_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectTokens_INTERFACE_DEFINED__ */
 
@@ -13583,29 +11809,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectTokenCategory* This);
+        ISpeechObjectTokenCategory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectTokenCategory* This);
+        ISpeechObjectTokenCategory *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13613,7 +11839,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13625,35 +11851,36 @@
 
     /*** ISpeechObjectTokenCategory methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR *Id);
 
     HRESULT (STDMETHODCALLTYPE *put_Default)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         const BSTR TokenId);
 
     HRESULT (STDMETHODCALLTYPE *get_Default)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR *TokenId);
 
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         const BSTR Id,
         VARIANT_BOOL CreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetDataKey)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         SpeechDataKeyLocation Location,
         ISpeechDataKey **DataKey);
 
     HRESULT (STDMETHODCALLTYPE *EnumerateTokens)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **Tokens);
 
     END_INTERFACE
 } ISpeechObjectTokenCategoryVtbl;
+
 interface ISpeechObjectTokenCategory {
     CONST_VTBL ISpeechObjectTokenCategoryVtbl* lpVtbl;
 };
@@ -13724,58 +11951,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Id_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR *Id);
-void __RPC_STUB ISpeechObjectTokenCategory_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_put_Default_Proxy(
-    ISpeechObjectTokenCategory* This,
-    const BSTR TokenId);
-void __RPC_STUB ISpeechObjectTokenCategory_put_Default_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Default_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR *TokenId);
-void __RPC_STUB ISpeechObjectTokenCategory_get_Default_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_SetId_Proxy(
-    ISpeechObjectTokenCategory* This,
-    const BSTR Id,
-    VARIANT_BOOL CreateIfNotExist);
-void __RPC_STUB ISpeechObjectTokenCategory_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_GetDataKey_Proxy(
-    ISpeechObjectTokenCategory* This,
-    SpeechDataKeyLocation Location,
-    ISpeechDataKey **DataKey);
-void __RPC_STUB ISpeechObjectTokenCategory_GetDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_EnumerateTokens_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **Tokens);
-void __RPC_STUB ISpeechObjectTokenCategory_EnumerateTokens_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectTokenCategory_INTERFACE_DEFINED__ */
 
@@ -14042,29 +12217,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioFormat* This);
+        ISpeechAudioFormat *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioFormat* This);
+        ISpeechAudioFormat *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14072,7 +12247,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14084,31 +12259,32 @@
 
     /*** ISpeechAudioFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         SpeechAudioFormatType *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *put_Type)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         SpeechAudioFormatType AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Guid)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         BSTR *Guid);
 
     HRESULT (STDMETHODCALLTYPE *put_Guid)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         BSTR Guid);
 
     HRESULT (STDMETHODCALLTYPE *GetWaveFormatEx)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         ISpeechWaveFormatEx **SpeechWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *SetWaveFormatEx)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         ISpeechWaveFormatEx *SpeechWaveFormatEx);
 
     END_INTERFACE
 } ISpeechAudioFormatVtbl;
+
 interface ISpeechAudioFormat {
     CONST_VTBL ISpeechAudioFormatVtbl* lpVtbl;
 };
@@ -14179,54 +12355,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Type_Proxy(
-    ISpeechAudioFormat* This,
-    SpeechAudioFormatType *AudioFormat);
-void __RPC_STUB ISpeechAudioFormat_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Type_Proxy(
-    ISpeechAudioFormat* This,
-    SpeechAudioFormatType AudioFormat);
-void __RPC_STUB ISpeechAudioFormat_put_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Guid_Proxy(
-    ISpeechAudioFormat* This,
-    BSTR *Guid);
-void __RPC_STUB ISpeechAudioFormat_get_Guid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Guid_Proxy(
-    ISpeechAudioFormat* This,
-    BSTR Guid);
-void __RPC_STUB ISpeechAudioFormat_put_Guid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_GetWaveFormatEx_Proxy(
-    ISpeechAudioFormat* This,
-    ISpeechWaveFormatEx **SpeechWaveFormatEx);
-void __RPC_STUB ISpeechAudioFormat_GetWaveFormatEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_SetWaveFormatEx_Proxy(
-    ISpeechAudioFormat* This,
-    ISpeechWaveFormatEx *SpeechWaveFormatEx);
-void __RPC_STUB ISpeechAudioFormat_SetWaveFormatEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioFormat_INTERFACE_DEFINED__ */
 
@@ -14271,29 +12399,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechBaseStream* This);
+        ISpeechBaseStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechBaseStream* This);
+        ISpeechBaseStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14301,7 +12429,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14313,32 +12441,33 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     END_INTERFACE
 } ISpeechBaseStreamVtbl;
+
 interface ISpeechBaseStream {
     CONST_VTBL ISpeechBaseStreamVtbl* lpVtbl;
 };
@@ -14405,51 +12534,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_get_Format_Proxy(
-    ISpeechBaseStream* This,
-    ISpeechAudioFormat **AudioFormat);
-void __RPC_STUB ISpeechBaseStream_get_Format_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_putref_Format_Proxy(
-    ISpeechBaseStream* This,
-    ISpeechAudioFormat *AudioFormat);
-void __RPC_STUB ISpeechBaseStream_putref_Format_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Read_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT *Buffer,
-    LONG NumberOfBytes,
-    LONG *BytesRead);
-void __RPC_STUB ISpeechBaseStream_Read_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Write_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT Buffer,
-    LONG *BytesWritten);
-void __RPC_STUB ISpeechBaseStream_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Seek_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT Position,
-    SpeechStreamSeekPositionType Origin,
-    VARIANT *NewPosition);
-void __RPC_STUB ISpeechBaseStream_Seek_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechBaseStream_INTERFACE_DEFINED__ */
 
@@ -14501,29 +12585,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudio* This);
+        ISpeechAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudio* This);
+        ISpeechAudio *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14531,7 +12615,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14543,69 +12627,70 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferInfo)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioBufferInfo **BufferInfo);
 
     HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat **StreamFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventHandle)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *EventHandle);
 
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         SpeechAudioState State);
 
     END_INTERFACE
 } ISpeechAudioVtbl;
+
 interface ISpeechAudio {
     CONST_VTBL ISpeechAudioVtbl* lpVtbl;
 };
@@ -14710,78 +12795,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Status_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioStatus **Status);
-void __RPC_STUB ISpeechAudio_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferInfo_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioBufferInfo **BufferInfo);
-void __RPC_STUB ISpeechAudio_get_BufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_DefaultFormat_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioFormat **StreamFormat);
-void __RPC_STUB ISpeechAudio_get_DefaultFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Volume_Proxy(
-    ISpeechAudio* This,
-    LONG *Volume);
-void __RPC_STUB ISpeechAudio_get_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_put_Volume_Proxy(
-    ISpeechAudio* This,
-    LONG Volume);
-void __RPC_STUB ISpeechAudio_put_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferNotifySize_Proxy(
-    ISpeechAudio* This,
-    LONG *BufferNotifySize);
-void __RPC_STUB ISpeechAudio_get_BufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_put_BufferNotifySize_Proxy(
-    ISpeechAudio* This,
-    LONG BufferNotifySize);
-void __RPC_STUB ISpeechAudio_put_BufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_EventHandle_Proxy(
-    ISpeechAudio* This,
-    LONG *EventHandle);
-void __RPC_STUB ISpeechAudio_get_EventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_SetState_Proxy(
-    ISpeechAudio* This,
-    SpeechAudioState State);
-void __RPC_STUB ISpeechAudio_SetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudio_INTERFACE_DEFINED__ */
 
@@ -14821,29 +12834,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechMMSysAudio* This);
+        ISpeechMMSysAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechMMSysAudio* This);
+        ISpeechMMSysAudio *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14851,7 +12864,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14863,90 +12876,91 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferInfo)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioBufferInfo **BufferInfo);
 
     HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat **StreamFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventHandle)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *EventHandle);
 
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         SpeechAudioState State);
 
     /*** ISpeechMMSysAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_DeviceId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *DeviceId);
 
     HRESULT (STDMETHODCALLTYPE *put_DeviceId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG DeviceId);
 
     HRESULT (STDMETHODCALLTYPE *get_LineId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *LineId);
 
     HRESULT (STDMETHODCALLTYPE *put_LineId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG LineId);
 
     HRESULT (STDMETHODCALLTYPE *get_MMHandle)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *Handle);
 
     END_INTERFACE
 } ISpeechMMSysAudioVtbl;
+
 interface ISpeechMMSysAudio {
     CONST_VTBL ISpeechMMSysAudioVtbl* lpVtbl;
 };
@@ -15073,46 +13087,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_DeviceId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *DeviceId);
-void __RPC_STUB ISpeechMMSysAudio_get_DeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_DeviceId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG DeviceId);
-void __RPC_STUB ISpeechMMSysAudio_put_DeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_LineId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *LineId);
-void __RPC_STUB ISpeechMMSysAudio_get_LineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_LineId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG LineId);
-void __RPC_STUB ISpeechMMSysAudio_put_LineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_MMHandle_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *Handle);
-void __RPC_STUB ISpeechMMSysAudio_get_MMHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechMMSysAudio_INTERFACE_DEFINED__ */
 
@@ -15145,29 +13119,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15175,7 +13149,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15187,42 +13161,43 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechFileStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Open)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         BSTR FileName,
         SpeechStreamFileMode FileMode,
         VARIANT_BOOL DoEvents);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     END_INTERFACE
 } ISpeechFileStreamVtbl;
+
 interface ISpeechFileStream {
     CONST_VTBL ISpeechFileStreamVtbl* lpVtbl;
 };
@@ -15299,23 +13274,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechFileStream_Open_Proxy(
-    ISpeechFileStream* This,
-    BSTR FileName,
-    SpeechStreamFileMode FileMode,
-    VARIANT_BOOL DoEvents);
-void __RPC_STUB ISpeechFileStream_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechFileStream_Close_Proxy(
-    ISpeechFileStream* This);
-void __RPC_STUB ISpeechFileStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechFileStream_INTERFACE_DEFINED__ */
 
@@ -15346,29 +13304,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechCustomStream* This);
+        ISpeechCustomStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechCustomStream* This);
+        ISpeechCustomStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15376,7 +13334,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15388,41 +13346,42 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechCustomStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_BaseStream)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         IUnknown **ppUnkStream);
 
     HRESULT (STDMETHODCALLTYPE *putref_BaseStream)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         IUnknown *pUnkStream);
 
     END_INTERFACE
 } ISpeechCustomStreamVtbl;
+
 interface ISpeechCustomStream {
     CONST_VTBL ISpeechCustomStreamVtbl* lpVtbl;
 };
@@ -15499,22 +13458,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechCustomStream_get_BaseStream_Proxy(
-    ISpeechCustomStream* This,
-    IUnknown **ppUnkStream);
-void __RPC_STUB ISpeechCustomStream_get_BaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechCustomStream_putref_BaseStream_Proxy(
-    ISpeechCustomStream* This,
-    IUnknown *pUnkStream);
-void __RPC_STUB ISpeechCustomStream_putref_BaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechCustomStream_INTERFACE_DEFINED__ */
 
@@ -15545,29 +13488,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechMemoryStream* This);
+        ISpeechMemoryStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechMemoryStream* This);
+        ISpeechMemoryStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15575,7 +13518,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15587,41 +13530,42 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechMemoryStream methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Data);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT *pData);
 
     END_INTERFACE
 } ISpeechMemoryStreamVtbl;
+
 interface ISpeechMemoryStream {
     CONST_VTBL ISpeechMemoryStreamVtbl* lpVtbl;
 };
@@ -15698,22 +13642,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_SetData_Proxy(
-    ISpeechMemoryStream* This,
-    VARIANT Data);
-void __RPC_STUB ISpeechMemoryStream_SetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_GetData_Proxy(
-    ISpeechMemoryStream* This,
-    VARIANT *pData);
-void __RPC_STUB ISpeechMemoryStream_GetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechMemoryStream_INTERFACE_DEFINED__ */
 
@@ -15753,29 +13681,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioStatus* This);
+        ISpeechAudioStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioStatus* This);
+        ISpeechAudioStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15783,7 +13711,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15795,27 +13723,28 @@
 
     /*** ISpeechAudioStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_FreeBufferSpace)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         LONG *FreeBufferSpace);
 
     HRESULT (STDMETHODCALLTYPE *get_NonBlockingIO)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         LONG *NonBlockingIO);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         SpeechAudioState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentSeekPosition)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         VARIANT *CurrentSeekPosition);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentDevicePosition)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         VARIANT *CurrentDevicePosition);
 
     END_INTERFACE
 } ISpeechAudioStatusVtbl;
+
 interface ISpeechAudioStatus {
     CONST_VTBL ISpeechAudioStatusVtbl* lpVtbl;
 };
@@ -15882,46 +13811,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_FreeBufferSpace_Proxy(
-    ISpeechAudioStatus* This,
-    LONG *FreeBufferSpace);
-void __RPC_STUB ISpeechAudioStatus_get_FreeBufferSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_NonBlockingIO_Proxy(
-    ISpeechAudioStatus* This,
-    LONG *NonBlockingIO);
-void __RPC_STUB ISpeechAudioStatus_get_NonBlockingIO_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_State_Proxy(
-    ISpeechAudioStatus* This,
-    SpeechAudioState *State);
-void __RPC_STUB ISpeechAudioStatus_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentSeekPosition_Proxy(
-    ISpeechAudioStatus* This,
-    VARIANT *CurrentSeekPosition);
-void __RPC_STUB ISpeechAudioStatus_get_CurrentSeekPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentDevicePosition_Proxy(
-    ISpeechAudioStatus* This,
-    VARIANT *CurrentDevicePosition);
-void __RPC_STUB ISpeechAudioStatus_get_CurrentDevicePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioStatus_INTERFACE_DEFINED__ */
 
@@ -15964,29 +13853,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioBufferInfo* This);
+        ISpeechAudioBufferInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioBufferInfo* This);
+        ISpeechAudioBufferInfo *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15994,7 +13883,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16006,31 +13895,32 @@
 
     /*** ISpeechAudioBufferInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *get_MinNotification)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *MinNotification);
 
     HRESULT (STDMETHODCALLTYPE *put_MinNotification)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG MinNotification);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferSize)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *BufferSize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferSize)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG BufferSize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventBias)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *EventBias);
 
     HRESULT (STDMETHODCALLTYPE *put_EventBias)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG EventBias);
 
     END_INTERFACE
 } ISpeechAudioBufferInfoVtbl;
+
 interface ISpeechAudioBufferInfo {
     CONST_VTBL ISpeechAudioBufferInfoVtbl* lpVtbl;
 };
@@ -16101,54 +13991,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_MinNotification_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *MinNotification);
-void __RPC_STUB ISpeechAudioBufferInfo_get_MinNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_MinNotification_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG MinNotification);
-void __RPC_STUB ISpeechAudioBufferInfo_put_MinNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_BufferSize_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *BufferSize);
-void __RPC_STUB ISpeechAudioBufferInfo_get_BufferSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_BufferSize_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG BufferSize);
-void __RPC_STUB ISpeechAudioBufferInfo_put_BufferSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_EventBias_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *EventBias);
-void __RPC_STUB ISpeechAudioBufferInfo_get_EventBias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_EventBias_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG EventBias);
-void __RPC_STUB ISpeechAudioBufferInfo_put_EventBias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioBufferInfo_INTERFACE_DEFINED__ */
 
@@ -16215,29 +14057,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechWaveFormatEx* This);
+        ISpeechWaveFormatEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechWaveFormatEx* This);
+        ISpeechWaveFormatEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16245,7 +14087,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16257,63 +14099,64 @@
 
     /*** ISpeechWaveFormatEx methods ***/
     HRESULT (STDMETHODCALLTYPE *get_FormatTag)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *FormatTag);
 
     HRESULT (STDMETHODCALLTYPE *put_FormatTag)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short FormatTag);
 
     HRESULT (STDMETHODCALLTYPE *get_Channels)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *Channels);
 
     HRESULT (STDMETHODCALLTYPE *put_Channels)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short Channels);
 
     HRESULT (STDMETHODCALLTYPE *get_SamplesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG *SamplesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *put_SamplesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG SamplesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *get_AvgBytesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG *AvgBytesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *put_AvgBytesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG AvgBytesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *get_BlockAlign)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *BlockAlign);
 
     HRESULT (STDMETHODCALLTYPE *put_BlockAlign)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short BlockAlign);
 
     HRESULT (STDMETHODCALLTYPE *get_BitsPerSample)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *BitsPerSample);
 
     HRESULT (STDMETHODCALLTYPE *put_BitsPerSample)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short BitsPerSample);
 
     HRESULT (STDMETHODCALLTYPE *get_ExtraData)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         VARIANT *ExtraData);
 
     HRESULT (STDMETHODCALLTYPE *put_ExtraData)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         VARIANT ExtraData);
 
     END_INTERFACE
 } ISpeechWaveFormatExVtbl;
+
 interface ISpeechWaveFormatEx {
     CONST_VTBL ISpeechWaveFormatExVtbl* lpVtbl;
 };
@@ -16416,118 +14259,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_FormatTag_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *FormatTag);
-void __RPC_STUB ISpeechWaveFormatEx_get_FormatTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_FormatTag_Proxy(
-    ISpeechWaveFormatEx* This,
-    short FormatTag);
-void __RPC_STUB ISpeechWaveFormatEx_put_FormatTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_Channels_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *Channels);
-void __RPC_STUB ISpeechWaveFormatEx_get_Channels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_Channels_Proxy(
-    ISpeechWaveFormatEx* This,
-    short Channels);
-void __RPC_STUB ISpeechWaveFormatEx_put_Channels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_SamplesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG *SamplesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_get_SamplesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_SamplesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG SamplesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_put_SamplesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_AvgBytesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG *AvgBytesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_get_AvgBytesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_AvgBytesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG AvgBytesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_put_AvgBytesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BlockAlign_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *BlockAlign);
-void __RPC_STUB ISpeechWaveFormatEx_get_BlockAlign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BlockAlign_Proxy(
-    ISpeechWaveFormatEx* This,
-    short BlockAlign);
-void __RPC_STUB ISpeechWaveFormatEx_put_BlockAlign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BitsPerSample_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *BitsPerSample);
-void __RPC_STUB ISpeechWaveFormatEx_get_BitsPerSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BitsPerSample_Proxy(
-    ISpeechWaveFormatEx* This,
-    short BitsPerSample);
-void __RPC_STUB ISpeechWaveFormatEx_put_BitsPerSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_ExtraData_Proxy(
-    ISpeechWaveFormatEx* This,
-    VARIANT *ExtraData);
-void __RPC_STUB ISpeechWaveFormatEx_get_ExtraData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_ExtraData_Proxy(
-    ISpeechWaveFormatEx* This,
-    VARIANT ExtraData);
-void __RPC_STUB ISpeechWaveFormatEx_put_ExtraData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechWaveFormatEx_INTERFACE_DEFINED__ */
 
@@ -16664,29 +14395,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16694,7 +14425,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16706,142 +14437,142 @@
 
     /*** ISpeechVoice methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechVoiceStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_Voice)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken **Voice);
 
     HRESULT (STDMETHODCALLTYPE *putref_Voice)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken *Voice);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioOutput)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken **AudioOutput);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioOutput)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken *AudioOutput);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioOutputStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream **AudioOutputStream);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioOutputStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream *AudioOutputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_Rate)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Rate);
 
     HRESULT (STDMETHODCALLTYPE *put_Rate)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG Rate);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowAudioOutputFormatChangesOnNextSet)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowAudioOutputFormatChangesOnNextSet)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         VARIANT_BOOL *Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_EventInterests)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents *EventInterestFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_EventInterests)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents EventInterestFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_Priority)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoicePriority Priority);
 
     HRESULT (STDMETHODCALLTYPE *get_Priority)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoicePriority *Priority);
 
     HRESULT (STDMETHODCALLTYPE *put_AlertBoundary)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents Boundary);
 
     HRESULT (STDMETHODCALLTYPE *get_AlertBoundary)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents *Boundary);
 
     HRESULT (STDMETHODCALLTYPE *put_SynchronousSpeakTimeout)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *get_SynchronousSpeakTimeout)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *Speak)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR Text,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SpeakStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream *Stream,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         const BSTR Type,
         LONG NumItems,
         LONG *NumSkipped);
 
     HRESULT (STDMETHODCALLTYPE *GetVoices)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioOutputs)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *WaitUntilDone)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG msTimeout,
         VARIANT_BOOL *Done);
 
     HRESULT (STDMETHODCALLTYPE *SpeakCompleteEvent)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Handle);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG hWndParent,
         BSTR Title,
         const BSTR TypeOfUI,
@@ -16849,6 +14580,7 @@
 
     END_INTERFACE
 } ISpeechVoiceVtbl;
+
 interface ISpeechVoice {
     CONST_VTBL ISpeechVoiceVtbl* lpVtbl;
 };
@@ -17023,276 +14755,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Status_Proxy(
-    ISpeechVoice* This,
-    ISpeechVoiceStatus **Status);
-void __RPC_STUB ISpeechVoice_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Voice_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken **Voice);
-void __RPC_STUB ISpeechVoice_get_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_Voice_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken *Voice);
-void __RPC_STUB ISpeechVoice_putref_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutput_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken **AudioOutput);
-void __RPC_STUB ISpeechVoice_get_AudioOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutput_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken *AudioOutput);
-void __RPC_STUB ISpeechVoice_putref_AudioOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutputStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream **AudioOutputStream);
-void __RPC_STUB ISpeechVoice_get_AudioOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutputStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream *AudioOutputStream);
-void __RPC_STUB ISpeechVoice_putref_AudioOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Rate_Proxy(
-    ISpeechVoice* This,
-    LONG *Rate);
-void __RPC_STUB ISpeechVoice_get_Rate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Rate_Proxy(
-    ISpeechVoice* This,
-    LONG Rate);
-void __RPC_STUB ISpeechVoice_put_Rate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Volume_Proxy(
-    ISpeechVoice* This,
-    LONG *Volume);
-void __RPC_STUB ISpeechVoice_get_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Volume_Proxy(
-    ISpeechVoice* This,
-    LONG Volume);
-void __RPC_STUB ISpeechVoice_put_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Proxy(
-    ISpeechVoice* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Proxy(
-    ISpeechVoice* This,
-    VARIANT_BOOL *Allow);
-void __RPC_STUB ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_EventInterests_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents *EventInterestFlags);
-void __RPC_STUB ISpeechVoice_get_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_EventInterests_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents EventInterestFlags);
-void __RPC_STUB ISpeechVoice_put_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Priority_Proxy(
-    ISpeechVoice* This,
-    SpeechVoicePriority Priority);
-void __RPC_STUB ISpeechVoice_put_Priority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Priority_Proxy(
-    ISpeechVoice* This,
-    SpeechVoicePriority *Priority);
-void __RPC_STUB ISpeechVoice_get_Priority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AlertBoundary_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents Boundary);
-void __RPC_STUB ISpeechVoice_put_AlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AlertBoundary_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents *Boundary);
-void __RPC_STUB ISpeechVoice_get_AlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_SynchronousSpeakTimeout_Proxy(
-    ISpeechVoice* This,
-    LONG msTimeout);
-void __RPC_STUB ISpeechVoice_put_SynchronousSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_SynchronousSpeakTimeout_Proxy(
-    ISpeechVoice* This,
-    LONG *msTimeout);
-void __RPC_STUB ISpeechVoice_get_SynchronousSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Speak_Proxy(
-    ISpeechVoice* This,
-    BSTR Text,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoice_Speak_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream *Stream,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoice_SpeakStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Pause_Proxy(
-    ISpeechVoice* This);
-void __RPC_STUB ISpeechVoice_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Resume_Proxy(
-    ISpeechVoice* This);
-void __RPC_STUB ISpeechVoice_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Skip_Proxy(
-    ISpeechVoice* This,
-    const BSTR Type,
-    LONG NumItems,
-    LONG *NumSkipped);
-void __RPC_STUB ISpeechVoice_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_GetVoices_Proxy(
-    ISpeechVoice* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechVoice_GetVoices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_GetAudioOutputs_Proxy(
-    ISpeechVoice* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechVoice_GetAudioOutputs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_WaitUntilDone_Proxy(
-    ISpeechVoice* This,
-    LONG msTimeout,
-    VARIANT_BOOL *Done);
-void __RPC_STUB ISpeechVoice_WaitUntilDone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakCompleteEvent_Proxy(
-    ISpeechVoice* This,
-    LONG *Handle);
-void __RPC_STUB ISpeechVoice_SpeakCompleteEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_IsUISupported_Proxy(
-    ISpeechVoice* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechVoice_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_DisplayUI_Proxy(
-    ISpeechVoice* This,
-    LONG hWndParent,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData);
-void __RPC_STUB ISpeechVoice_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechVoice_INTERFACE_DEFINED__ */
 
@@ -17353,29 +14815,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechVoiceStatus* This);
+        ISpeechVoiceStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechVoiceStatus* This);
+        ISpeechVoiceStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -17383,7 +14845,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -17395,55 +14857,56 @@
 
     /*** ISpeechVoiceStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_LastStreamNumberQueued)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_LastHResult)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *HResult);
 
     HRESULT (STDMETHODCALLTYPE *get_RunningState)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         SpeechRunState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_InputWordPosition)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Position);
 
     HRESULT (STDMETHODCALLTYPE *get_InputWordLength)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_InputSentencePosition)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Position);
 
     HRESULT (STDMETHODCALLTYPE *get_InputSentenceLength)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_LastBookmark)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         BSTR *Bookmark);
 
     HRESULT (STDMETHODCALLTYPE *get_LastBookmarkId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *BookmarkId);
 
     HRESULT (STDMETHODCALLTYPE *get_PhonemeId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         short *PhoneId);
 
     HRESULT (STDMETHODCALLTYPE *get_VisemeId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         short *VisemeId);
 
     END_INTERFACE
 } ISpeechVoiceStatusVtbl;
+
 interface ISpeechVoiceStatus {
     CONST_VTBL ISpeechVoiceStatusVtbl* lpVtbl;
 };
@@ -17538,102 +15001,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_CurrentStreamNumber_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoiceStatus_get_CurrentStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastStreamNumberQueued_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoiceStatus_get_LastStreamNumberQueued_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastHResult_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *HResult);
-void __RPC_STUB ISpeechVoiceStatus_get_LastHResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_RunningState_Proxy(
-    ISpeechVoiceStatus* This,
-    SpeechRunState *State);
-void __RPC_STUB ISpeechVoiceStatus_get_RunningState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordPosition_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Position);
-void __RPC_STUB ISpeechVoiceStatus_get_InputWordPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordLength_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Length);
-void __RPC_STUB ISpeechVoiceStatus_get_InputWordLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentencePosition_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Position);
-void __RPC_STUB ISpeechVoiceStatus_get_InputSentencePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentenceLength_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Length);
-void __RPC_STUB ISpeechVoiceStatus_get_InputSentenceLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmark_Proxy(
-    ISpeechVoiceStatus* This,
-    BSTR *Bookmark);
-void __RPC_STUB ISpeechVoiceStatus_get_LastBookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmarkId_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *BookmarkId);
-void __RPC_STUB ISpeechVoiceStatus_get_LastBookmarkId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_PhonemeId_Proxy(
-    ISpeechVoiceStatus* This,
-    short *PhoneId);
-void __RPC_STUB ISpeechVoiceStatus_get_PhonemeId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_VisemeId_Proxy(
-    ISpeechVoiceStatus* This,
-    short *VisemeId);
-void __RPC_STUB ISpeechVoiceStatus_get_VisemeId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechVoiceStatus_INTERFACE_DEFINED__ */
 
@@ -18150,29 +15517,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _ISpeechVoiceEvents* This);
+        _ISpeechVoiceEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _ISpeechVoiceEvents* This);
+        _ISpeechVoiceEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18180,7 +15547,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18192,6 +15559,7 @@
 
     END_INTERFACE
 } _ISpeechVoiceEventsVtbl;
+
 interface _ISpeechVoiceEvents {
     CONST_VTBL _ISpeechVoiceEventsVtbl* lpVtbl;
 };
@@ -18359,29 +15727,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecognizer* This);
+        ISpeechRecognizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecognizer* This);
+        ISpeechRecognizer *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18389,7 +15757,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18401,133 +15769,134 @@
 
     /*** ISpeechRecognizer methods ***/
     HRESULT (STDMETHODCALLTYPE *putref_Recognizer)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *get_Recognizer)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowAudioInputFormatChangesOnNextSet)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowAudioInputFormatChangesOnNextSet)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL *Allow);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioInput)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *AudioInput);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInput)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **AudioInput);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioInputStream)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechBaseStream *AudioInputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInputStream)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechBaseStream **AudioInputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_IsShared)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL *Shared);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechRecognizerState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechRecognizerState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechRecognizerStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *putref_Profile)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *Profile);
 
     HRESULT (STDMETHODCALLTYPE *get_Profile)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **Profile);
 
     HRESULT (STDMETHODCALLTYPE *EmulateRecognition)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT TextElements,
         VARIANT *ElementDisplayAttributes,
         LONG LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *CreateRecoContext)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechRecoContext **NewContext);
 
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechFormatType Type,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyNumber)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         LONG Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNumber)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         LONG *Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         const BSTR Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         BSTR *Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         LONG hWndParent,
         BSTR Title,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData);
 
     HRESULT (STDMETHODCALLTYPE *GetRecognizers)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioInputs)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetProfiles)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     END_INTERFACE
 } ISpeechRecognizerVtbl;
+
 interface ISpeechRecognizer {
     CONST_VTBL ISpeechRecognizerVtbl* lpVtbl;
 };
@@ -18678,236 +16047,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Recognizer_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *Recognizer);
-void __RPC_STUB ISpeechRecognizer_putref_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Recognizer_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **Recognizer);
-void __RPC_STUB ISpeechRecognizer_get_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL *Allow);
-void __RPC_STUB ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInput_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *AudioInput);
-void __RPC_STUB ISpeechRecognizer_putref_AudioInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInput_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **AudioInput);
-void __RPC_STUB ISpeechRecognizer_get_AudioInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInputStream_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechBaseStream *AudioInputStream);
-void __RPC_STUB ISpeechRecognizer_putref_AudioInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInputStream_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechBaseStream **AudioInputStream);
-void __RPC_STUB ISpeechRecognizer_get_AudioInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_IsShared_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL *Shared);
-void __RPC_STUB ISpeechRecognizer_get_IsShared_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_State_Proxy(
-    ISpeechRecognizer* This,
-    SpeechRecognizerState State);
-void __RPC_STUB ISpeechRecognizer_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_State_Proxy(
-    ISpeechRecognizer* This,
-    SpeechRecognizerState *State);
-void __RPC_STUB ISpeechRecognizer_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Status_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechRecognizerStatus **Status);
-void __RPC_STUB ISpeechRecognizer_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Profile_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *Profile);
-void __RPC_STUB ISpeechRecognizer_putref_Profile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Profile_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **Profile);
-void __RPC_STUB ISpeechRecognizer_get_Profile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_EmulateRecognition_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT TextElements,
-    VARIANT *ElementDisplayAttributes,
-    LONG LanguageId);
-void __RPC_STUB ISpeechRecognizer_EmulateRecognition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_CreateRecoContext_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechRecoContext **NewContext);
-void __RPC_STUB ISpeechRecognizer_CreateRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetFormat_Proxy(
-    ISpeechRecognizer* This,
-    SpeechFormatType Type,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecognizer_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyNumber_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    LONG Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_SetPropertyNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyNumber_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    LONG *Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_GetPropertyNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyString_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    const BSTR Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_SetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyString_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    BSTR *Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_GetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_IsUISupported_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_DisplayUI_Proxy(
-    ISpeechRecognizer* This,
-    LONG hWndParent,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData);
-void __RPC_STUB ISpeechRecognizer_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetRecognizers_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetRecognizers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetAudioInputs_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetAudioInputs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetProfiles_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetProfiles_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecognizer_INTERFACE_DEFINED__ */
 
@@ -18950,29 +16089,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecognizerStatus* This);
+        ISpeechRecognizerStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecognizerStatus* This);
+        ISpeechRecognizerStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18980,7 +16119,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18992,31 +16131,32 @@
 
     /*** ISpeechRecognizerStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_AudioStatus)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         ISpeechAudioStatus **AudioStatus);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamPosition)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         VARIANT *pCurrentStreamPos);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfActiveRules)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         LONG *NumberOfActiveRules);
 
     HRESULT (STDMETHODCALLTYPE *get_ClsidEngine)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         BSTR *ClsidEngine);
 
     HRESULT (STDMETHODCALLTYPE *get_SupportedLanguages)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         VARIANT *SupportedLanguages);
 
     END_INTERFACE
 } ISpeechRecognizerStatusVtbl;
+
 interface ISpeechRecognizerStatus {
     CONST_VTBL ISpeechRecognizerStatusVtbl* lpVtbl;
 };
@@ -19087,54 +16227,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_AudioStatus_Proxy(
-    ISpeechRecognizerStatus* This,
-    ISpeechAudioStatus **AudioStatus);
-void __RPC_STUB ISpeechRecognizerStatus_get_AudioStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamPosition_Proxy(
-    ISpeechRecognizerStatus* This,
-    VARIANT *pCurrentStreamPos);
-void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamNumber_Proxy(
-    ISpeechRecognizerStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_NumberOfActiveRules_Proxy(
-    ISpeechRecognizerStatus* This,
-    LONG *NumberOfActiveRules);
-void __RPC_STUB ISpeechRecognizerStatus_get_NumberOfActiveRules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_ClsidEngine_Proxy(
-    ISpeechRecognizerStatus* This,
-    BSTR *ClsidEngine);
-void __RPC_STUB ISpeechRecognizerStatus_get_ClsidEngine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_SupportedLanguages_Proxy(
-    ISpeechRecognizerStatus* This,
-    VARIANT *SupportedLanguages);
-void __RPC_STUB ISpeechRecognizerStatus_get_SupportedLanguages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecognizerStatus_INTERFACE_DEFINED__ */
 
@@ -19238,29 +16330,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19268,7 +16360,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19280,109 +16372,110 @@
 
     /*** ISpeechRecoContext methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Recognizer)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechRecognizer **Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInputInterferenceStatus)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechInterference *Interference);
 
     HRESULT (STDMETHODCALLTYPE *get_RequestedUIType)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         BSTR *UIType);
 
     HRESULT (STDMETHODCALLTYPE *putref_Voice)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechVoice *Voice);
 
     HRESULT (STDMETHODCALLTYPE *get_Voice)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechVoice **Voice);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowVoiceFormatMatchingOnNextSet)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowVoiceFormatMatchingOnNextSet)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT_BOOL *pAllow);
 
     HRESULT (STDMETHODCALLTYPE *put_VoicePurgeEvent)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *get_VoicePurgeEvent)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents *EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *put_EventInterests)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *get_EventInterests)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents *EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *put_CmdMaxAlternates)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         LONG MaxAlternates);
 
     HRESULT (STDMETHODCALLTYPE *get_CmdMaxAlternates)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         LONG *MaxAlternates);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoContextState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoContextState *State);
 
     HRESULT (STDMETHODCALLTYPE *put_RetainedAudio)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRetainedAudioOptions Option);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedAudio)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRetainedAudioOptions *Option);
 
     HRESULT (STDMETHODCALLTYPE *putref_RetainedAudioFormat)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedAudioFormat)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateGrammar)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT GrammarId,
         ISpeechRecoGrammar **Grammar);
 
     HRESULT (STDMETHODCALLTYPE *CreateResultFromMemory)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT *ResultBlock,
         ISpeechRecoResult **Result);
 
     HRESULT (STDMETHODCALLTYPE *Bookmark)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechBookmarkOptions Options,
         VARIANT StreamPos,
         VARIANT BookmarkId);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         BSTR AdaptationString);
 
     END_INTERFACE
 } ISpeechRecoContextVtbl;
+
 interface ISpeechRecoContext {
     CONST_VTBL ISpeechRecoContextVtbl* lpVtbl;
 };
@@ -19529,208 +16622,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Recognizer_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechRecognizer **Recognizer);
-void __RPC_STUB ISpeechRecoContext_get_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AudioInputInterferenceStatus_Proxy(
-    ISpeechRecoContext* This,
-    SpeechInterference *Interference);
-void __RPC_STUB ISpeechRecoContext_get_AudioInputInterferenceStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RequestedUIType_Proxy(
-    ISpeechRecoContext* This,
-    BSTR *UIType);
-void __RPC_STUB ISpeechRecoContext_get_RequestedUIType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_Voice_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechVoice *Voice);
-void __RPC_STUB ISpeechRecoContext_putref_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Voice_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechVoice **Voice);
-void __RPC_STUB ISpeechRecoContext_get_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT_BOOL *pAllow);
-void __RPC_STUB ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_VoicePurgeEvent_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents EventInterest);
-void __RPC_STUB ISpeechRecoContext_put_VoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_VoicePurgeEvent_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents *EventInterest);
-void __RPC_STUB ISpeechRecoContext_get_VoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_EventInterests_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents EventInterest);
-void __RPC_STUB ISpeechRecoContext_put_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_EventInterests_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents *EventInterest);
-void __RPC_STUB ISpeechRecoContext_get_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_CmdMaxAlternates_Proxy(
-    ISpeechRecoContext* This,
-    LONG MaxAlternates);
-void __RPC_STUB ISpeechRecoContext_put_CmdMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_CmdMaxAlternates_Proxy(
-    ISpeechRecoContext* This,
-    LONG *MaxAlternates);
-void __RPC_STUB ISpeechRecoContext_get_CmdMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_State_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoContextState State);
-void __RPC_STUB ISpeechRecoContext_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_State_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoContextState *State);
-void __RPC_STUB ISpeechRecoContext_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_RetainedAudio_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRetainedAudioOptions Option);
-void __RPC_STUB ISpeechRecoContext_put_RetainedAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudio_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRetainedAudioOptions *Option);
-void __RPC_STUB ISpeechRecoContext_get_RetainedAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_RetainedAudioFormat_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoContext_putref_RetainedAudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudioFormat_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoContext_get_RetainedAudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Pause_Proxy(
-    ISpeechRecoContext* This);
-void __RPC_STUB ISpeechRecoContext_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Resume_Proxy(
-    ISpeechRecoContext* This);
-void __RPC_STUB ISpeechRecoContext_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateGrammar_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT GrammarId,
-    ISpeechRecoGrammar **Grammar);
-void __RPC_STUB ISpeechRecoContext_CreateGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateResultFromMemory_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT *ResultBlock,
-    ISpeechRecoResult **Result);
-void __RPC_STUB ISpeechRecoContext_CreateResultFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Bookmark_Proxy(
-    ISpeechRecoContext* This,
-    SpeechBookmarkOptions Options,
-    VARIANT StreamPos,
-    VARIANT BookmarkId);
-void __RPC_STUB ISpeechRecoContext_Bookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_SetAdaptationData_Proxy(
-    ISpeechRecoContext* This,
-    BSTR AdaptationString);
-void __RPC_STUB ISpeechRecoContext_SetAdaptationData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoContext_INTERFACE_DEFINED__ */
 
@@ -19829,29 +16720,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19859,7 +16750,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19871,42 +16762,42 @@
 
     /*** ISpeechRecoGrammar methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         VARIANT *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechGrammarState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechGrammarState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_Rules)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechGrammarRules **Rules);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechLanguageId NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromFile)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR FileName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromObject)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR ClassId,
         const BSTR GrammarName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromResource)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         LONG hModule,
         VARIANT ResourceName,
         VARIANT ResourceType,
@@ -19914,56 +16805,57 @@
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromMemory)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         VARIANT GrammarData,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromProprietaryGrammar)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR ProprietaryGuid,
         const BSTR ProprietaryString,
         VARIANT ProprietaryData,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdSetRuleState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Name,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *CmdSetRuleIdState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         LONG RuleId,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *DictationLoad)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR TopicName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *DictationUnload)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     HRESULT (STDMETHODCALLTYPE *DictationSetState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Text,
         LONG TextLength,
         ISpeechTextSelectionInformation *Info);
 
     HRESULT (STDMETHODCALLTYPE *SetTextSelection)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechTextSelectionInformation *Info);
 
     HRESULT (STDMETHODCALLTYPE *IsPronounceable)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Word,
         SpeechWordPronounceable *WordPronounceable);
 
     END_INTERFACE
 } ISpeechRecoGrammarVtbl;
+
 interface ISpeechRecoGrammar {
     CONST_VTBL ISpeechRecoGrammarVtbl* lpVtbl;
 };
@@ -20086,174 +16978,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Id_Proxy(
-    ISpeechRecoGrammar* This,
-    VARIANT *Id);
-void __RPC_STUB ISpeechRecoGrammar_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_RecoContext_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoGrammar_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_put_State_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechGrammarState State);
-void __RPC_STUB ISpeechRecoGrammar_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_State_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechGrammarState *State);
-void __RPC_STUB ISpeechRecoGrammar_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Rules_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechGrammarRules **Rules);
-void __RPC_STUB ISpeechRecoGrammar_get_Rules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_Reset_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechLanguageId NewLanguage);
-void __RPC_STUB ISpeechRecoGrammar_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromFile_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR FileName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromObject_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR ClassId,
-    const BSTR GrammarName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromResource_Proxy(
-    ISpeechRecoGrammar* This,
-    LONG hModule,
-    VARIANT ResourceName,
-    VARIANT ResourceType,
-    SpeechLanguageId LanguageId,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromMemory_Proxy(
-    ISpeechRecoGrammar* This,
-    VARIANT GrammarData,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR ProprietaryGuid,
-    const BSTR ProprietaryString,
-    VARIANT ProprietaryData,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleState_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Name,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleIdState_Proxy(
-    ISpeechRecoGrammar* This,
-    LONG RuleId,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleIdState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationLoad_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR TopicName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_DictationLoad_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationUnload_Proxy(
-    ISpeechRecoGrammar* This);
-void __RPC_STUB ISpeechRecoGrammar_DictationUnload_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationSetState_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_DictationSetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetWordSequenceData_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Text,
-    LONG TextLength,
-    ISpeechTextSelectionInformation *Info);
-void __RPC_STUB ISpeechRecoGrammar_SetWordSequenceData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetTextSelection_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechTextSelectionInformation *Info);
-void __RPC_STUB ISpeechRecoGrammar_SetTextSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_IsPronounceable_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Word,
-    SpeechWordPronounceable *WordPronounceable);
-void __RPC_STUB ISpeechRecoGrammar_IsPronounceable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoGrammar_INTERFACE_DEFINED__ */
 
@@ -20278,29 +17002,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _ISpeechRecoContextEvents* This);
+        _ISpeechRecoContextEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _ISpeechRecoContextEvents* This);
+        _ISpeechRecoContextEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20308,7 +17032,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20320,6 +17044,7 @@
 
     END_INTERFACE
 } _ISpeechRecoContextEventsVtbl;
+
 interface _ISpeechRecoContextEvents {
     CONST_VTBL _ISpeechRecoContextEventsVtbl* lpVtbl;
 };
@@ -20409,29 +17134,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20439,7 +17164,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20451,35 +17176,36 @@
 
     /*** ISpeechGrammarRule methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Attributes)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         SpeechRuleAttributes *Attributes);
 
     HRESULT (STDMETHODCALLTYPE *get_InitialState)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         ISpeechGrammarRuleState **State);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         const BSTR ResourceName,
         const BSTR ResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *AddState)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         ISpeechGrammarRuleState **State);
 
     END_INTERFACE
 } ISpeechGrammarRuleVtbl;
+
 interface ISpeechGrammarRule {
     CONST_VTBL ISpeechGrammarRuleVtbl* lpVtbl;
 };
@@ -20554,62 +17280,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Attributes_Proxy(
-    ISpeechGrammarRule* This,
-    SpeechRuleAttributes *Attributes);
-void __RPC_STUB ISpeechGrammarRule_get_Attributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_InitialState_Proxy(
-    ISpeechGrammarRule* This,
-    ISpeechGrammarRuleState **State);
-void __RPC_STUB ISpeechGrammarRule_get_InitialState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Name_Proxy(
-    ISpeechGrammarRule* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechGrammarRule_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Id_Proxy(
-    ISpeechGrammarRule* This,
-    LONG *Id);
-void __RPC_STUB ISpeechGrammarRule_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_Clear_Proxy(
-    ISpeechGrammarRule* This);
-void __RPC_STUB ISpeechGrammarRule_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddResource_Proxy(
-    ISpeechGrammarRule* This,
-    const BSTR ResourceName,
-    const BSTR ResourceValue);
-void __RPC_STUB ISpeechGrammarRule_AddResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddState_Proxy(
-    ISpeechGrammarRule* This,
-    ISpeechGrammarRuleState **State);
-void __RPC_STUB ISpeechGrammarRule_AddState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRule_INTERFACE_DEFINED__ */
 
@@ -20664,29 +17334,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20694,7 +17364,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20706,44 +17376,45 @@
 
     /*** ISpeechGrammarRules methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *FindRule)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         VARIANT RuleNameOrId,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         LONG Index,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         IUnknown **EnumVARIANT);
 
     HRESULT (STDMETHODCALLTYPE *get_Dynamic)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         VARIANT_BOOL *Dynamic);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         BSTR RuleName,
         SpeechRuleAttributes Attributes,
         LONG RuleId,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndSave)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         BSTR *ErrorText,
         VARIANT *SaveStream);
 
     END_INTERFACE
 } ISpeechGrammarRulesVtbl;
+
 interface ISpeechGrammarRules {
     CONST_VTBL ISpeechGrammarRulesVtbl* lpVtbl;
 };
@@ -20822,75 +17493,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Count_Proxy(
-    ISpeechGrammarRules* This,
-    LONG *Count);
-void __RPC_STUB ISpeechGrammarRules_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_FindRule_Proxy(
-    ISpeechGrammarRules* This,
-    VARIANT RuleNameOrId,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_FindRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Item_Proxy(
-    ISpeechGrammarRules* This,
-    LONG Index,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get__NewEnum_Proxy(
-    ISpeechGrammarRules* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechGrammarRules_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Dynamic_Proxy(
-    ISpeechGrammarRules* This,
-    VARIANT_BOOL *Dynamic);
-void __RPC_STUB ISpeechGrammarRules_get_Dynamic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Add_Proxy(
-    ISpeechGrammarRules* This,
-    BSTR RuleName,
-    SpeechRuleAttributes Attributes,
-    LONG RuleId,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Commit_Proxy(
-    ISpeechGrammarRules* This);
-void __RPC_STUB ISpeechGrammarRules_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_CommitAndSave_Proxy(
-    ISpeechGrammarRules* This,
-    BSTR *ErrorText,
-    VARIANT *SaveStream);
-void __RPC_STUB ISpeechGrammarRules_CommitAndSave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRules_INTERFACE_DEFINED__ */
 
@@ -20947,29 +17549,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleState* This);
+        ISpeechGrammarRuleState *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleState* This);
+        ISpeechGrammarRuleState *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20977,7 +17579,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20989,15 +17591,15 @@
 
     /*** ISpeechGrammarRuleState methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Transitions)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleStateTransitions **Transitions);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestState,
         const BSTR Words,
         const BSTR Separators,
@@ -21008,7 +17610,7 @@
         float Weight);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestinationState,
         ISpeechGrammarRule *Rule,
         const BSTR PropertyName,
@@ -21017,7 +17619,7 @@
         float Weight);
 
     HRESULT (STDMETHODCALLTYPE *AddSpecialTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestinationState,
         SpeechSpecialTransitionType Type,
         const BSTR PropertyName,
@@ -21027,6 +17629,7 @@
 
     END_INTERFACE
 } ISpeechGrammarRuleStateVtbl;
+
 interface ISpeechGrammarRuleState {
     CONST_VTBL ISpeechGrammarRuleStateVtbl* lpVtbl;
 };
@@ -21093,63 +17696,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Rule_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRuleState_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Transitions_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleStateTransitions **Transitions);
-void __RPC_STUB ISpeechGrammarRuleState_get_Transitions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddWordTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestState,
-    const BSTR Words,
-    const BSTR Separators,
-    SpeechGrammarWordType Type,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddWordTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddRuleTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestinationState,
-    ISpeechGrammarRule *Rule,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddRuleTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddSpecialTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestinationState,
-    SpeechSpecialTransitionType Type,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddSpecialTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleState_INTERFACE_DEFINED__ */
 
@@ -21184,29 +17730,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleStateTransitions* This);
+        ISpeechGrammarRuleStateTransitions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleStateTransitions* This);
+        ISpeechGrammarRuleStateTransitions *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21214,7 +17760,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21226,20 +17772,21 @@
 
     /*** ISpeechGrammarRuleStateTransitions methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         LONG Index,
         ISpeechGrammarRuleStateTransition **Transition);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechGrammarRuleStateTransitionsVtbl;
+
 interface ISpeechGrammarRuleStateTransitions {
     CONST_VTBL ISpeechGrammarRuleStateTransitionsVtbl* lpVtbl;
 };
@@ -21298,31 +17845,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get_Count_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    LONG *Count);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_Item_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    LONG Index,
-    ISpeechGrammarRuleStateTransition **Transition);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get__NewEnum_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleStateTransitions_INTERFACE_DEFINED__ */
 
@@ -21371,29 +17893,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleStateTransition* This);
+        ISpeechGrammarRuleStateTransition *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleStateTransition* This);
+        ISpeechGrammarRuleStateTransition *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21401,7 +17923,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21413,39 +17935,40 @@
 
     /*** ISpeechGrammarRuleStateTransition methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         SpeechGrammarRuleStateTransitionType *Type);
 
     HRESULT (STDMETHODCALLTYPE *get_Text)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Weight)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         VARIANT *Weight);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyName)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         BSTR *PropertyName);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyId)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         LONG *PropertyId);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyValue)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         VARIANT *PropertyValue);
 
     HRESULT (STDMETHODCALLTYPE *get_NextState)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         ISpeechGrammarRuleState **NextState);
 
     END_INTERFACE
 } ISpeechGrammarRuleStateTransitionVtbl;
+
 interface ISpeechGrammarRuleStateTransition {
     CONST_VTBL ISpeechGrammarRuleStateTransitionVtbl* lpVtbl;
 };
@@ -21524,70 +18047,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Type_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    SpeechGrammarRuleStateTransitionType *Type);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Text_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    BSTR *Text);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Text_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Rule_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Weight_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    VARIANT *Weight);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Weight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyName_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    BSTR *PropertyName);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyId_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    LONG *PropertyId);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyValue_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    VARIANT *PropertyValue);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_NextState_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    ISpeechGrammarRuleState **NextState);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_NextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleStateTransition_INTERFACE_DEFINED__ */
 
@@ -21636,29 +18095,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechTextSelectionInformation* This);
+        ISpeechTextSelectionInformation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechTextSelectionInformation* This);
+        ISpeechTextSelectionInformation *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21666,7 +18125,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21678,39 +18137,40 @@
 
     /*** ISpeechTextSelectionInformation methods ***/
     HRESULT (STDMETHODCALLTYPE *put_ActiveOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG ActiveOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_ActiveOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *ActiveOffset);
 
     HRESULT (STDMETHODCALLTYPE *put_ActiveLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG ActiveLength);
 
     HRESULT (STDMETHODCALLTYPE *get_ActiveLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *ActiveLength);
 
     HRESULT (STDMETHODCALLTYPE *put_SelectionOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG SelectionOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_SelectionOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *SelectionOffset);
 
     HRESULT (STDMETHODCALLTYPE *put_SelectionLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG SelectionLength);
 
     HRESULT (STDMETHODCALLTYPE *get_SelectionLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *SelectionLength);
 
     END_INTERFACE
 } ISpeechTextSelectionInformationVtbl;
+
 interface ISpeechTextSelectionInformation {
     CONST_VTBL ISpeechTextSelectionInformationVtbl* lpVtbl;
 };
@@ -21789,70 +18249,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG ActiveOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *ActiveOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG ActiveLength);
-void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *ActiveLength);
-void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG SelectionOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *SelectionOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG SelectionLength);
-void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *SelectionLength);
-void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechTextSelectionInformation_INTERFACE_DEFINED__ */
 
@@ -21915,29 +18311,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResult* This);
+        ISpeechRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResult* This);
+        ISpeechRecoResult *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21945,7 +18341,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21957,55 +18353,56 @@
 
     /*** ISpeechRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         SpeechDiscardType ValueTypes);
 
     END_INTERFACE
 } ISpeechRecoResultVtbl;
+
 interface ISpeechRecoResult {
     CONST_VTBL ISpeechRecoResultVtbl* lpVtbl;
 };
@@ -22092,94 +18489,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_RecoContext_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoResult_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_Times_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechRecoResultTimes **Times);
-void __RPC_STUB ISpeechRecoResult_get_Times_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_putref_AudioFormat_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoResult_putref_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_AudioFormat_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoResult_get_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_PhraseInfo_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechRecoResult_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Alternates_Proxy(
-    ISpeechRecoResult* This,
-    LONG RequestCount,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechPhraseAlternates **Alternates);
-void __RPC_STUB ISpeechRecoResult_Alternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Audio_Proxy(
-    ISpeechRecoResult* This,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechMemoryStream **Stream);
-void __RPC_STUB ISpeechRecoResult_Audio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SpeakAudio_Proxy(
-    ISpeechRecoResult* This,
-    LONG StartElement,
-    LONG Elements,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecoResult_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SaveToMemory_Proxy(
-    ISpeechRecoResult* This,
-    VARIANT *ResultBlock);
-void __RPC_STUB ISpeechRecoResult_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_DiscardResultInfo_Proxy(
-    ISpeechRecoResult* This,
-    SpeechDiscardType ValueTypes);
-void __RPC_STUB ISpeechRecoResult_DiscardResultInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResult_INTERFACE_DEFINED__ */
 
@@ -22216,29 +18525,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechXMLRecoResult* This);
+        ISpeechXMLRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechXMLRecoResult* This);
+        ISpeechXMLRecoResult *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22246,7 +18555,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22258,61 +18567,61 @@
 
     /*** ISpeechRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         SpeechDiscardType ValueTypes);
 
     /*** ISpeechXMLRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         SPXMLRESULTOPTIONS Options,
         BSTR *pResult);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG *LineNumber,
         BSTR *ScriptLine,
         BSTR *Source,
@@ -22322,6 +18631,7 @@
 
     END_INTERFACE
 } ISpeechXMLRecoResultVtbl;
+
 interface ISpeechXMLRecoResult {
     CONST_VTBL ISpeechXMLRecoResultVtbl* lpVtbl;
 };
@@ -22418,28 +18728,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLResult_Proxy(
-    ISpeechXMLRecoResult* This,
-    SPXMLRESULTOPTIONS Options,
-    BSTR *pResult);
-void __RPC_STUB ISpeechXMLRecoResult_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLErrorInfo_Proxy(
-    ISpeechXMLRecoResult* This,
-    LONG *LineNumber,
-    BSTR *ScriptLine,
-    BSTR *Source,
-    BSTR *Description,
-    LONG *ResultCode,
-    VARIANT_BOOL *IsError);
-void __RPC_STUB ISpeechXMLRecoResult_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechXMLRecoResult_INTERFACE_DEFINED__ */
 
@@ -22468,29 +18756,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResult2* This);
+        ISpeechRecoResult2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResult2* This);
+        ISpeechRecoResult2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22498,7 +18786,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22510,61 +18798,62 @@
 
     /*** ISpeechRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         SpeechDiscardType ValueTypes);
 
     /*** ISpeechRecoResult2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetTextFeedback)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         BSTR Feedback,
         VARIANT_BOOL WasSuccessful);
 
     END_INTERFACE
 } ISpeechRecoResult2Vtbl;
+
 interface ISpeechRecoResult2 {
     CONST_VTBL ISpeechRecoResult2Vtbl* lpVtbl;
 };
@@ -22657,15 +18946,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult2_SetTextFeedback_Proxy(
-    ISpeechRecoResult2* This,
-    BSTR Feedback,
-    VARIANT_BOOL WasSuccessful);
-void __RPC_STUB ISpeechRecoResult2_SetTextFeedback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResult2_INTERFACE_DEFINED__ */
 
@@ -22744,29 +19024,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResultDispatch* This);
+        ISpeechRecoResultDispatch *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResultDispatch* This);
+        ISpeechRecoResultDispatch *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22774,7 +19054,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22786,60 +19066,60 @@
 
     /*** ISpeechRecoResultDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         SpeechDiscardType ValueTypes);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         SPXMLRESULTOPTIONS Options,
         BSTR *pResult);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG *LineNumber,
         BSTR *ScriptLine,
         BSTR *Source,
@@ -22848,12 +19128,13 @@
         VARIANT_BOOL *IsError);
 
     HRESULT (STDMETHODCALLTYPE *SetTextFeedback)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         BSTR Feedback,
         VARIANT_BOOL WasSuccessful);
 
     END_INTERFACE
 } ISpeechRecoResultDispatchVtbl;
+
 interface ISpeechRecoResultDispatch {
     CONST_VTBL ISpeechRecoResultDispatchVtbl* lpVtbl;
 };
@@ -22952,125 +19233,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_RecoContext_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoResultDispatch_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_Times_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechRecoResultTimes **Times);
-void __RPC_STUB ISpeechRecoResultDispatch_get_Times_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_putref_AudioFormat_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoResultDispatch_putref_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_AudioFormat_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoResultDispatch_get_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_PhraseInfo_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechRecoResultDispatch_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Alternates_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG RequestCount,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechPhraseAlternates **Alternates);
-void __RPC_STUB ISpeechRecoResultDispatch_Alternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Audio_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechMemoryStream **Stream);
-void __RPC_STUB ISpeechRecoResultDispatch_Audio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SpeakAudio_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG StartElement,
-    LONG Elements,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecoResultDispatch_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SaveToMemory_Proxy(
-    ISpeechRecoResultDispatch* This,
-    VARIANT *ResultBlock);
-void __RPC_STUB ISpeechRecoResultDispatch_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_DiscardResultInfo_Proxy(
-    ISpeechRecoResultDispatch* This,
-    SpeechDiscardType ValueTypes);
-void __RPC_STUB ISpeechRecoResultDispatch_DiscardResultInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLResult_Proxy(
-    ISpeechRecoResultDispatch* This,
-    SPXMLRESULTOPTIONS Options,
-    BSTR *pResult);
-void __RPC_STUB ISpeechRecoResultDispatch_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLErrorInfo_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG *LineNumber,
-    BSTR *ScriptLine,
-    BSTR *Source,
-    BSTR *Description,
-    HRESULT *ResultCode,
-    VARIANT_BOOL *IsError);
-void __RPC_STUB ISpeechRecoResultDispatch_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SetTextFeedback_Proxy(
-    ISpeechRecoResultDispatch* This,
-    BSTR Feedback,
-    VARIANT_BOOL WasSuccessful);
-void __RPC_STUB ISpeechRecoResultDispatch_SetTextFeedback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResultDispatch_INTERFACE_DEFINED__ */
 
@@ -23099,29 +19261,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseInfoBuilder* This);
+        ISpeechPhraseInfoBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseInfoBuilder* This);
+        ISpeechPhraseInfoBuilder *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23129,7 +19291,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23141,12 +19303,13 @@
 
     /*** ISpeechPhraseInfoBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *RestorePhraseFromMemory)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         VARIANT *PhraseInMemory,
         ISpeechPhraseInfo **PhraseInfo);
 
     END_INTERFACE
 } ISpeechPhraseInfoBuilderVtbl;
+
 interface ISpeechPhraseInfoBuilder {
     CONST_VTBL ISpeechPhraseInfoBuilderVtbl* lpVtbl;
 };
@@ -23197,15 +19360,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Proxy(
-    ISpeechPhraseInfoBuilder* This,
-    VARIANT *PhraseInMemory,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseInfoBuilder_INTERFACE_DEFINED__ */
 
@@ -23242,29 +19396,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResultTimes* This);
+        ISpeechRecoResultTimes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResultTimes* This);
+        ISpeechRecoResultTimes *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23272,7 +19426,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23284,23 +19438,24 @@
 
     /*** ISpeechRecoResultTimes methods ***/
     HRESULT (STDMETHODCALLTYPE *get_StreamTime)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *Time);
 
     HRESULT (STDMETHODCALLTYPE *get_Length)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_TickCount)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         LONG *TickCount);
 
     HRESULT (STDMETHODCALLTYPE *get_OffsetFromStart)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *OffsetFromStart);
 
     END_INTERFACE
 } ISpeechRecoResultTimesVtbl;
+
 interface ISpeechRecoResultTimes {
     CONST_VTBL ISpeechRecoResultTimesVtbl* lpVtbl;
 };
@@ -23363,38 +19518,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_StreamTime_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *Time);
-void __RPC_STUB ISpeechRecoResultTimes_get_StreamTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_Length_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *Length);
-void __RPC_STUB ISpeechRecoResultTimes_get_Length_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_TickCount_Proxy(
-    ISpeechRecoResultTimes* This,
-    LONG *TickCount);
-void __RPC_STUB ISpeechRecoResultTimes_get_TickCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_OffsetFromStart_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *OffsetFromStart);
-void __RPC_STUB ISpeechRecoResultTimes_get_OffsetFromStart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResultTimes_INTERFACE_DEFINED__ */
 
@@ -23434,29 +19557,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23464,7 +19587,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23476,26 +19599,27 @@
 
     /*** ISpeechPhraseAlternate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         ISpeechRecoResult **RecoResult);
 
     HRESULT (STDMETHODCALLTYPE *get_StartElementInResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         LONG *StartElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElementsInResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     END_INTERFACE
 } ISpeechPhraseAlternateVtbl;
+
 interface ISpeechPhraseAlternate {
     CONST_VTBL ISpeechPhraseAlternateVtbl* lpVtbl;
 };
@@ -23562,45 +19686,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_RecoResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    ISpeechRecoResult **RecoResult);
-void __RPC_STUB ISpeechPhraseAlternate_get_RecoResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_StartElementInResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    LONG *StartElement);
-void __RPC_STUB ISpeechPhraseAlternate_get_StartElementInResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_NumberOfElementsInResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseAlternate_get_NumberOfElementsInResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_PhraseInfo_Proxy(
-    ISpeechPhraseAlternate* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechPhraseAlternate_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_Commit_Proxy(
-    ISpeechPhraseAlternate* This);
-void __RPC_STUB ISpeechPhraseAlternate_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseAlternate_INTERFACE_DEFINED__ */
 
@@ -23635,29 +19720,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseAlternates* This);
+        ISpeechPhraseAlternates *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseAlternates* This);
+        ISpeechPhraseAlternates *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23665,7 +19750,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23677,20 +19762,21 @@
 
     /*** ISpeechPhraseAlternates methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         LONG Index,
         ISpeechPhraseAlternate **PhraseAlternate);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseAlternatesVtbl;
+
 interface ISpeechPhraseAlternates {
     CONST_VTBL ISpeechPhraseAlternatesVtbl* lpVtbl;
 };
@@ -23749,31 +19835,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get_Count_Proxy(
-    ISpeechPhraseAlternates* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseAlternates_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_Item_Proxy(
-    ISpeechPhraseAlternates* This,
-    LONG Index,
-    ISpeechPhraseAlternate **PhraseAlternate);
-void __RPC_STUB ISpeechPhraseAlternates_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get__NewEnum_Proxy(
-    ISpeechPhraseAlternates* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseAlternates_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseAlternates_INTERFACE_DEFINED__ */
 
@@ -23852,29 +19913,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseInfo* This);
+        ISpeechPhraseInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseInfo* This);
+        ISpeechPhraseInfo *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23882,7 +19943,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23894,70 +19955,70 @@
 
     /*** ISpeechPhraseInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LanguageId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *get_GrammarId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *GrammarId);
 
     HRESULT (STDMETHODCALLTYPE *get_StartTime)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *StartTime);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioStreamPosition)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *AudioStreamPosition);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *pAudioSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *RetainedSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *AudioSizeTime);
 
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Properties)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseProperties **Properties);
 
     HRESULT (STDMETHODCALLTYPE *get_Elements)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseElements **Elements);
 
     HRESULT (STDMETHODCALLTYPE *get_Replacements)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseReplacements **Replacements);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         BSTR *EngineIdGuid);
 
     HRESULT (STDMETHODCALLTYPE *get_EnginePrivateData)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *PrivateData);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *PhraseBlock);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG StartElement,
         LONG Elements,
         VARIANT_BOOL UseReplacements,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayAttributes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG StartElement,
         LONG Elements,
         VARIANT_BOOL UseReplacements,
@@ -23965,6 +20026,7 @@
 
     END_INTERFACE
 } ISpeechPhraseInfoVtbl;
+
 interface ISpeechPhraseInfo {
     CONST_VTBL ISpeechPhraseInfoVtbl* lpVtbl;
 };
@@ -24075,140 +20137,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_LanguageId_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *LanguageId);
-void __RPC_STUB ISpeechPhraseInfo_get_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_GrammarId_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *GrammarId);
-void __RPC_STUB ISpeechPhraseInfo_get_GrammarId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_StartTime_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *StartTime);
-void __RPC_STUB ISpeechPhraseInfo_get_StartTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioStreamPosition_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *AudioStreamPosition);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioStreamPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeBytes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *pAudioSizeBytes);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_RetainedSizeBytes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *RetainedSizeBytes);
-void __RPC_STUB ISpeechPhraseInfo_get_RetainedSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeTime_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *AudioSizeTime);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Rule_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseRule **Rule);
-void __RPC_STUB ISpeechPhraseInfo_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Properties_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseProperties **Properties);
-void __RPC_STUB ISpeechPhraseInfo_get_Properties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Elements_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseElements **Elements);
-void __RPC_STUB ISpeechPhraseInfo_get_Elements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Replacements_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseReplacements **Replacements);
-void __RPC_STUB ISpeechPhraseInfo_get_Replacements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EngineId_Proxy(
-    ISpeechPhraseInfo* This,
-    BSTR *EngineIdGuid);
-void __RPC_STUB ISpeechPhraseInfo_get_EngineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EnginePrivateData_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *PrivateData);
-void __RPC_STUB ISpeechPhraseInfo_get_EnginePrivateData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_SaveToMemory_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *PhraseBlock);
-void __RPC_STUB ISpeechPhraseInfo_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetText_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG StartElement,
-    LONG Elements,
-    VARIANT_BOOL UseReplacements,
-    BSTR *Text);
-void __RPC_STUB ISpeechPhraseInfo_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetDisplayAttributes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG StartElement,
-    LONG Elements,
-    VARIANT_BOOL UseReplacements,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseInfo_GetDisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseInfo_INTERFACE_DEFINED__ */
 
@@ -24272,29 +20200,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseElement* This);
+        ISpeechPhraseElement *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseElement* This);
+        ISpeechPhraseElement *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -24302,7 +20230,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -24314,59 +20242,60 @@
 
     /*** ISpeechPhraseElement methods ***/
     HRESULT (STDMETHODCALLTYPE *get_AudioTimeOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioTimeOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioSizeTime);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioStreamOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioStreamOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedStreamOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *RetainedStreamOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *RetainedSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayText)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         BSTR *DisplayText);
 
     HRESULT (STDMETHODCALLTYPE *get_LexicalForm)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         BSTR *LexicalForm);
 
     HRESULT (STDMETHODCALLTYPE *get_Pronunciation)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         VARIANT *Pronunciation);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechDisplayAttributes *DisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *get_RequiredConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechEngineConfidence *RequiredConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_ActualConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechEngineConfidence *ActualConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         float *EngineConfidence);
 
     END_INTERFACE
 } ISpeechPhraseElementVtbl;
+
 interface ISpeechPhraseElement {
     CONST_VTBL ISpeechPhraseElementVtbl* lpVtbl;
 };
@@ -24465,110 +20394,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioTimeOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioTimeOffset);
-void __RPC_STUB ISpeechPhraseElement_get_AudioTimeOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeTime_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioSizeTime);
-void __RPC_STUB ISpeechPhraseElement_get_AudioSizeTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioStreamOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioStreamOffset);
-void __RPC_STUB ISpeechPhraseElement_get_AudioStreamOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeBytes_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioSizeBytes);
-void __RPC_STUB ISpeechPhraseElement_get_AudioSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedStreamOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *RetainedStreamOffset);
-void __RPC_STUB ISpeechPhraseElement_get_RetainedStreamOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedSizeBytes_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *RetainedSizeBytes);
-void __RPC_STUB ISpeechPhraseElement_get_RetainedSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayText_Proxy(
-    ISpeechPhraseElement* This,
-    BSTR *DisplayText);
-void __RPC_STUB ISpeechPhraseElement_get_DisplayText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_LexicalForm_Proxy(
-    ISpeechPhraseElement* This,
-    BSTR *LexicalForm);
-void __RPC_STUB ISpeechPhraseElement_get_LexicalForm_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_Pronunciation_Proxy(
-    ISpeechPhraseElement* This,
-    VARIANT *Pronunciation);
-void __RPC_STUB ISpeechPhraseElement_get_Pronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayAttributes_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseElement_get_DisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RequiredConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechEngineConfidence *RequiredConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_RequiredConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_ActualConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechEngineConfidence *ActualConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_ActualConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_EngineConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    float *EngineConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseElement_INTERFACE_DEFINED__ */
 
@@ -24603,29 +20428,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseElements* This);
+        ISpeechPhraseElements *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseElements* This);
+        ISpeechPhraseElements *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -24633,7 +20458,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -24645,20 +20470,21 @@
 
     /*** ISpeechPhraseElements methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         LONG Index,
         ISpeechPhraseElement **Element);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseElementsVtbl;
+
 interface ISpeechPhraseElements {
     CONST_VTBL ISpeechPhraseElementsVtbl* lpVtbl;
 };
@@ -24717,31 +20543,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get_Count_Proxy(
-    ISpeechPhraseElements* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseElements_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_Item_Proxy(
-    ISpeechPhraseElements* This,
-    LONG Index,
-    ISpeechPhraseElement **Element);
-void __RPC_STUB ISpeechPhraseElements_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get__NewEnum_Proxy(
-    ISpeechPhraseElements* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseElements_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseElements_INTERFACE_DEFINED__ */
 
@@ -24778,29 +20579,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseReplacement* This);
+        ISpeechPhraseReplacement *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseReplacement* This);
+        ISpeechPhraseReplacement *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -24808,7 +20609,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -24820,23 +20621,24 @@
 
     /*** ISpeechPhraseReplacement methods ***/
     HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         SpeechDisplayAttributes *DisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *get_Text)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         LONG *NumberOfElements);
 
     END_INTERFACE
 } ISpeechPhraseReplacementVtbl;
+
 interface ISpeechPhraseReplacement {
     CONST_VTBL ISpeechPhraseReplacementVtbl* lpVtbl;
 };
@@ -24899,38 +20701,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_DisplayAttributes_Proxy(
-    ISpeechPhraseReplacement* This,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseReplacement_get_DisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_Text_Proxy(
-    ISpeechPhraseReplacement* This,
-    BSTR *Text);
-void __RPC_STUB ISpeechPhraseReplacement_get_Text_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_FirstElement_Proxy(
-    ISpeechPhraseReplacement* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseReplacement_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_NumberOfElements_Proxy(
-    ISpeechPhraseReplacement* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseReplacement_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseReplacement_INTERFACE_DEFINED__ */
 
@@ -24965,29 +20735,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseReplacements* This);
+        ISpeechPhraseReplacements *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseReplacements* This);
+        ISpeechPhraseReplacements *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -24995,7 +20765,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25007,20 +20777,21 @@
 
     /*** ISpeechPhraseReplacements methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         LONG Index,
         ISpeechPhraseReplacement **Reps);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseReplacementsVtbl;
+
 interface ISpeechPhraseReplacements {
     CONST_VTBL ISpeechPhraseReplacementsVtbl* lpVtbl;
 };
@@ -25079,31 +20850,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get_Count_Proxy(
-    ISpeechPhraseReplacements* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseReplacements_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_Item_Proxy(
-    ISpeechPhraseReplacements* This,
-    LONG Index,
-    ISpeechPhraseReplacement **Reps);
-void __RPC_STUB ISpeechPhraseReplacements_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get__NewEnum_Proxy(
-    ISpeechPhraseReplacements* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseReplacements_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseReplacements_INTERFACE_DEFINED__ */
 
@@ -25155,29 +20901,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseProperty* This);
+        ISpeechPhraseProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseProperty* This);
+        ISpeechPhraseProperty *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25185,7 +20931,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25197,43 +20943,44 @@
 
     /*** ISpeechPhraseProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         float *Confidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Confidence)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         SpeechEngineConfidence *Confidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         ISpeechPhraseProperty **ParentProperty);
 
     HRESULT (STDMETHODCALLTYPE *get_Children)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         ISpeechPhraseProperties **Children);
 
     END_INTERFACE
 } ISpeechPhrasePropertyVtbl;
+
 interface ISpeechPhraseProperty {
     CONST_VTBL ISpeechPhrasePropertyVtbl* lpVtbl;
 };
@@ -25316,78 +21063,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Name_Proxy(
-    ISpeechPhraseProperty* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechPhraseProperty_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Id_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *Id);
-void __RPC_STUB ISpeechPhraseProperty_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Value_Proxy(
-    ISpeechPhraseProperty* This,
-    VARIANT *Value);
-void __RPC_STUB ISpeechPhraseProperty_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_FirstElement_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseProperty_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_NumberOfElements_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseProperty_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_EngineConfidence_Proxy(
-    ISpeechPhraseProperty* This,
-    float *Confidence);
-void __RPC_STUB ISpeechPhraseProperty_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Confidence_Proxy(
-    ISpeechPhraseProperty* This,
-    SpeechEngineConfidence *Confidence);
-void __RPC_STUB ISpeechPhraseProperty_get_Confidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Parent_Proxy(
-    ISpeechPhraseProperty* This,
-    ISpeechPhraseProperty **ParentProperty);
-void __RPC_STUB ISpeechPhraseProperty_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Children_Proxy(
-    ISpeechPhraseProperty* This,
-    ISpeechPhraseProperties **Children);
-void __RPC_STUB ISpeechPhraseProperty_get_Children_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseProperty_INTERFACE_DEFINED__ */
 
@@ -25422,29 +21097,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseProperties* This);
+        ISpeechPhraseProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseProperties* This);
+        ISpeechPhraseProperties *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25452,7 +21127,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25464,20 +21139,21 @@
 
     /*** ISpeechPhraseProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         LONG Index,
         ISpeechPhraseProperty **Property);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhrasePropertiesVtbl;
+
 interface ISpeechPhraseProperties {
     CONST_VTBL ISpeechPhrasePropertiesVtbl* lpVtbl;
 };
@@ -25536,31 +21212,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get_Count_Proxy(
-    ISpeechPhraseProperties* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseProperties_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_Item_Proxy(
-    ISpeechPhraseProperties* This,
-    LONG Index,
-    ISpeechPhraseProperty **Property);
-void __RPC_STUB ISpeechPhraseProperties_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get__NewEnum_Proxy(
-    ISpeechPhraseProperties* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseProperties_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseProperties_INTERFACE_DEFINED__ */
 
@@ -25609,29 +21260,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseRule* This);
+        ISpeechPhraseRule *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseRule* This);
+        ISpeechPhraseRule *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25639,7 +21290,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25651,39 +21302,40 @@
 
     /*** ISpeechPhraseRule methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         ISpeechPhraseRule **Parent);
 
     HRESULT (STDMETHODCALLTYPE *get_Children)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         ISpeechPhraseRules **Children);
 
     HRESULT (STDMETHODCALLTYPE *get_Confidence)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         SpeechEngineConfidence *ActualConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         float *EngineConfidence);
 
     END_INTERFACE
 } ISpeechPhraseRuleVtbl;
+
 interface ISpeechPhraseRule {
     CONST_VTBL ISpeechPhraseRuleVtbl* lpVtbl;
 };
@@ -25762,70 +21414,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Name_Proxy(
-    ISpeechPhraseRule* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechPhraseRule_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Id_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *Id);
-void __RPC_STUB ISpeechPhraseRule_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_FirstElement_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseRule_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_NumberOfElements_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseRule_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Parent_Proxy(
-    ISpeechPhraseRule* This,
-    ISpeechPhraseRule **Parent);
-void __RPC_STUB ISpeechPhraseRule_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Children_Proxy(
-    ISpeechPhraseRule* This,
-    ISpeechPhraseRules **Children);
-void __RPC_STUB ISpeechPhraseRule_get_Children_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Confidence_Proxy(
-    ISpeechPhraseRule* This,
-    SpeechEngineConfidence *ActualConfidence);
-void __RPC_STUB ISpeechPhraseRule_get_Confidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_EngineConfidence_Proxy(
-    ISpeechPhraseRule* This,
-    float *EngineConfidence);
-void __RPC_STUB ISpeechPhraseRule_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseRule_INTERFACE_DEFINED__ */
 
@@ -25860,29 +21448,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseRules* This);
+        ISpeechPhraseRules *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseRules* This);
+        ISpeechPhraseRules *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25890,7 +21478,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25902,20 +21490,21 @@
 
     /*** ISpeechPhraseRules methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         LONG Index,
         ISpeechPhraseRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseRulesVtbl;
+
 interface ISpeechPhraseRules {
     CONST_VTBL ISpeechPhraseRulesVtbl* lpVtbl;
 };
@@ -25974,31 +21563,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get_Count_Proxy(
-    ISpeechPhraseRules* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseRules_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_Item_Proxy(
-    ISpeechPhraseRules* This,
-    LONG Index,
-    ISpeechPhraseRule **Rule);
-void __RPC_STUB ISpeechPhraseRules_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get__NewEnum_Proxy(
-    ISpeechPhraseRules* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseRules_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseRules_INTERFACE_DEFINED__ */
 
@@ -26033,29 +21597,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconWords* This);
+        ISpeechLexiconWords *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconWords* This);
+        ISpeechLexiconWords *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26063,7 +21627,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26075,20 +21639,21 @@
 
     /*** ISpeechLexiconWords methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         LONG Index,
         ISpeechLexiconWord **Word);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechLexiconWordsVtbl;
+
 interface ISpeechLexiconWords {
     CONST_VTBL ISpeechLexiconWordsVtbl* lpVtbl;
 };
@@ -26147,31 +21712,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get_Count_Proxy(
-    ISpeechLexiconWords* This,
-    LONG *Count);
-void __RPC_STUB ISpeechLexiconWords_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_Item_Proxy(
-    ISpeechLexiconWords* This,
-    LONG Index,
-    ISpeechLexiconWord **Word);
-void __RPC_STUB ISpeechLexiconWords_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get__NewEnum_Proxy(
-    ISpeechLexiconWords* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechLexiconWords_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconWords_INTERFACE_DEFINED__ */
 
@@ -26238,29 +21778,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexicon* This);
+        ISpeechLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexicon* This);
+        ISpeechLexicon *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26268,7 +21808,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26280,57 +21820,58 @@
 
     /*** ISpeechLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *get_GenerationId)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         LONG *GenerationId);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         SpeechLexiconType Flags,
         LONG *GenerationID,
         ISpeechLexiconWords **Words);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         BSTR bstrPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciationByPhoneIds)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         BSTR bstrPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciationByPhoneIds)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechLexiconType TypeFlags,
         ISpeechLexiconPronunciations **ppPronunciations);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         LONG *GenerationID,
         ISpeechLexiconWords **ppWords);
 
     END_INTERFACE
 } ISpeechLexiconVtbl;
+
 interface ISpeechLexicon {
     CONST_VTBL ISpeechLexiconVtbl* lpVtbl;
 };
@@ -26409,88 +21950,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_get_GenerationId_Proxy(
-    ISpeechLexicon* This,
-    LONG *GenerationId);
-void __RPC_STUB ISpeechLexicon_get_GenerationId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetWords_Proxy(
-    ISpeechLexicon* This,
-    SpeechLexiconType Flags,
-    LONG *GenerationID,
-    ISpeechLexiconWords **Words);
-void __RPC_STUB ISpeechLexicon_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciation_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    BSTR bstrPronunciation);
-void __RPC_STUB ISpeechLexicon_AddPronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciationByPhoneIds_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexicon_AddPronunciationByPhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciation_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    BSTR bstrPronunciation);
-void __RPC_STUB ISpeechLexicon_RemovePronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciationByPhoneIds_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexicon_RemovePronunciationByPhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetPronunciations_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechLexiconType TypeFlags,
-    ISpeechLexiconPronunciations **ppPronunciations);
-void __RPC_STUB ISpeechLexicon_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetGenerationChange_Proxy(
-    ISpeechLexicon* This,
-    LONG *GenerationID,
-    ISpeechLexiconWords **ppWords);
-void __RPC_STUB ISpeechLexicon_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexicon_INTERFACE_DEFINED__ */
 
@@ -26527,29 +21986,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconWord* This);
+        ISpeechLexiconWord *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconWord* This);
+        ISpeechLexiconWord *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26557,7 +22016,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26569,23 +22028,24 @@
 
     /*** ISpeechLexiconWord methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LangId)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         SpeechLanguageId *LangId);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         SpeechWordType *WordType);
 
     HRESULT (STDMETHODCALLTYPE *get_Word)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         BSTR *Word);
 
     HRESULT (STDMETHODCALLTYPE *get_Pronunciations)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         ISpeechLexiconPronunciations **Pronunciations);
 
     END_INTERFACE
 } ISpeechLexiconWordVtbl;
+
 interface ISpeechLexiconWord {
     CONST_VTBL ISpeechLexiconWordVtbl* lpVtbl;
 };
@@ -26648,38 +22108,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_LangId_Proxy(
-    ISpeechLexiconWord* This,
-    SpeechLanguageId *LangId);
-void __RPC_STUB ISpeechLexiconWord_get_LangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Type_Proxy(
-    ISpeechLexiconWord* This,
-    SpeechWordType *WordType);
-void __RPC_STUB ISpeechLexiconWord_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Word_Proxy(
-    ISpeechLexiconWord* This,
-    BSTR *Word);
-void __RPC_STUB ISpeechLexiconWord_get_Word_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Pronunciations_Proxy(
-    ISpeechLexiconWord* This,
-    ISpeechLexiconPronunciations **Pronunciations);
-void __RPC_STUB ISpeechLexiconWord_get_Pronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconWord_INTERFACE_DEFINED__ */
 
@@ -26714,29 +22142,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconPronunciations* This);
+        ISpeechLexiconPronunciations *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconPronunciations* This);
+        ISpeechLexiconPronunciations *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26744,7 +22172,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26756,20 +22184,21 @@
 
     /*** ISpeechLexiconPronunciations methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         LONG Index,
         ISpeechLexiconPronunciation **Pronunciation);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechLexiconPronunciationsVtbl;
+
 interface ISpeechLexiconPronunciations {
     CONST_VTBL ISpeechLexiconPronunciationsVtbl* lpVtbl;
 };
@@ -26828,31 +22257,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get_Count_Proxy(
-    ISpeechLexiconPronunciations* This,
-    LONG *Count);
-void __RPC_STUB ISpeechLexiconPronunciations_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_Item_Proxy(
-    ISpeechLexiconPronunciations* This,
-    LONG Index,
-    ISpeechLexiconPronunciation **Pronunciation);
-void __RPC_STUB ISpeechLexiconPronunciations_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get__NewEnum_Proxy(
-    ISpeechLexiconPronunciations* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechLexiconPronunciations_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconPronunciations_INTERFACE_DEFINED__ */
 
@@ -26892,29 +22296,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconPronunciation* This);
+        ISpeechLexiconPronunciation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconPronunciation* This);
+        ISpeechLexiconPronunciation *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26922,7 +22326,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26934,27 +22338,28 @@
 
     /*** ISpeechLexiconPronunciation methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechLexiconType *LexiconType);
 
     HRESULT (STDMETHODCALLTYPE *get_LangId)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechLanguageId *LangId);
 
     HRESULT (STDMETHODCALLTYPE *get_PartOfSpeech)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechPartOfSpeech *PartOfSpeech);
 
     HRESULT (STDMETHODCALLTYPE *get_PhoneIds)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *get_Symbolic)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         BSTR *Symbolic);
 
     END_INTERFACE
 } ISpeechLexiconPronunciationVtbl;
+
 interface ISpeechLexiconPronunciation {
     CONST_VTBL ISpeechLexiconPronunciationVtbl* lpVtbl;
 };
@@ -27021,46 +22426,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Type_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechLexiconType *LexiconType);
-void __RPC_STUB ISpeechLexiconPronunciation_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_LangId_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechLanguageId *LangId);
-void __RPC_STUB ISpeechLexiconPronunciation_get_LangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PartOfSpeech_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechPartOfSpeech *PartOfSpeech);
-void __RPC_STUB ISpeechLexiconPronunciation_get_PartOfSpeech_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PhoneIds_Proxy(
-    ISpeechLexiconPronunciation* This,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexiconPronunciation_get_PhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Symbolic_Proxy(
-    ISpeechLexiconPronunciation* This,
-    BSTR *Symbolic);
-void __RPC_STUB ISpeechLexiconPronunciation_get_Symbolic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconPronunciation_INTERFACE_DEFINED__ */
 
@@ -27099,29 +22464,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhoneConverter* This);
+        ISpeechPhoneConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhoneConverter* This);
+        ISpeechPhoneConverter *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -27129,7 +22494,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -27141,25 +22506,26 @@
 
     /*** ISpeechPhoneConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LanguageId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         SpeechLanguageId *LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *put_LanguageId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         SpeechLanguageId LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *PhoneToId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         const BSTR Phonemes,
         VARIANT *IdArray);
 
     HRESULT (STDMETHODCALLTYPE *IdToPhone)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         const VARIANT IdArray,
         BSTR *Phonemes);
 
     END_INTERFACE
 } ISpeechPhoneConverterVtbl;
+
 interface ISpeechPhoneConverter {
     CONST_VTBL ISpeechPhoneConverterVtbl* lpVtbl;
 };
@@ -27222,40 +22588,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_get_LanguageId_Proxy(
-    ISpeechPhoneConverter* This,
-    SpeechLanguageId *LanguageId);
-void __RPC_STUB ISpeechPhoneConverter_get_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_put_LanguageId_Proxy(
-    ISpeechPhoneConverter* This,
-    SpeechLanguageId LanguageId);
-void __RPC_STUB ISpeechPhoneConverter_put_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_PhoneToId_Proxy(
-    ISpeechPhoneConverter* This,
-    const BSTR Phonemes,
-    VARIANT *IdArray);
-void __RPC_STUB ISpeechPhoneConverter_PhoneToId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_IdToPhone_Proxy(
-    ISpeechPhoneConverter* This,
-    const VARIANT IdArray,
-    BSTR *Phonemes);
-void __RPC_STUB ISpeechPhoneConverter_IdToPhone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhoneConverter_INTERFACE_DEFINED__ */
 
@@ -27626,16 +22958,25 @@
 #ifndef __ISpXMLRecoResult_FWD_DEFINED__
 #define __ISpXMLRecoResult_FWD_DEFINED__
 typedef interface ISpXMLRecoResult ISpXMLRecoResult;
+#ifdef __cplusplus
+interface ISpXMLRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar2_FWD_DEFINED__
 #define __ISpRecoGrammar2_FWD_DEFINED__
 typedef interface ISpRecoGrammar2 ISpRecoGrammar2;
+#ifdef __cplusplus
+interface ISpRecoGrammar2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechResourceLoader_FWD_DEFINED__
 #define __ISpeechResourceLoader_FWD_DEFINED__
 typedef interface ISpeechResourceLoader ISpeechResourceLoader;
+#ifdef __cplusplus
+interface ISpeechResourceLoader;
+#endif /* __cplusplus */
 #endif
 
 /* Begin additional prototypes for all interfaces */
diff --git a/mingw-w64-headers/include/sapi54.h b/mingw-w64-headers/include/sapi54.h
index fa79ca6..04b5b10 100644
--- a/mingw-w64-headers/include/sapi54.h
+++ b/mingw-w64-headers/include/sapi54.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/sapi54.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/sapi54.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,496 +20,793 @@
 #ifndef __ISpNotifySource_FWD_DEFINED__
 #define __ISpNotifySource_FWD_DEFINED__
 typedef interface ISpNotifySource ISpNotifySource;
+#ifdef __cplusplus
+interface ISpNotifySource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifySink_FWD_DEFINED__
 #define __ISpNotifySink_FWD_DEFINED__
 typedef interface ISpNotifySink ISpNotifySink;
+#ifdef __cplusplus
+interface ISpNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifyTranslator_FWD_DEFINED__
 #define __ISpNotifyTranslator_FWD_DEFINED__
 typedef interface ISpNotifyTranslator ISpNotifyTranslator;
+#ifdef __cplusplus
+interface ISpNotifyTranslator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDataKey_FWD_DEFINED__
 #define __ISpDataKey_FWD_DEFINED__
 typedef interface ISpDataKey ISpDataKey;
+#ifdef __cplusplus
+interface ISpDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectWithToken_FWD_DEFINED__
 #define __ISpObjectWithToken_FWD_DEFINED__
 typedef interface ISpObjectWithToken ISpObjectWithToken;
+#ifdef __cplusplus
+interface ISpObjectWithToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSpObjectTokens_FWD_DEFINED__
 #define __IEnumSpObjectTokens_FWD_DEFINED__
 typedef interface IEnumSpObjectTokens IEnumSpObjectTokens;
+#ifdef __cplusplus
+interface IEnumSpObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRegDataKey_FWD_DEFINED__
 #define __ISpRegDataKey_FWD_DEFINED__
 typedef interface ISpRegDataKey ISpRegDataKey;
+#ifdef __cplusplus
+interface ISpRegDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenCategory_FWD_DEFINED__
 #define __ISpObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpObjectTokenCategory ISpObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectToken_FWD_DEFINED__
 #define __ISpObjectToken_FWD_DEFINED__
 typedef interface ISpObjectToken ISpObjectToken;
+#ifdef __cplusplus
+interface ISpObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenInit_FWD_DEFINED__
 #define __ISpObjectTokenInit_FWD_DEFINED__
 typedef interface ISpObjectTokenInit ISpObjectTokenInit;
+#ifdef __cplusplus
+interface ISpObjectTokenInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpResourceManager_FWD_DEFINED__
 #define __ISpResourceManager_FWD_DEFINED__
 typedef interface ISpResourceManager ISpResourceManager;
+#ifdef __cplusplus
+interface ISpResourceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource_FWD_DEFINED__
 #define __ISpEventSource_FWD_DEFINED__
 typedef interface ISpEventSource ISpEventSource;
+#ifdef __cplusplus
+interface ISpEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource2_FWD_DEFINED__
 #define __ISpEventSource2_FWD_DEFINED__
 typedef interface ISpEventSource2 ISpEventSource2;
+#ifdef __cplusplus
+interface ISpEventSource2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSink_FWD_DEFINED__
 #define __ISpEventSink_FWD_DEFINED__
 typedef interface ISpEventSink ISpEventSink;
+#ifdef __cplusplus
+interface ISpEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormat_FWD_DEFINED__
 #define __ISpStreamFormat_FWD_DEFINED__
 typedef interface ISpStreamFormat ISpStreamFormat;
+#ifdef __cplusplus
+interface ISpStreamFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStream_FWD_DEFINED__
 #define __ISpStream_FWD_DEFINED__
 typedef interface ISpStream ISpStream;
+#ifdef __cplusplus
+interface ISpStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormatConverter_FWD_DEFINED__
 #define __ISpStreamFormatConverter_FWD_DEFINED__
 typedef interface ISpStreamFormatConverter ISpStreamFormatConverter;
+#ifdef __cplusplus
+interface ISpStreamFormatConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpAudio_FWD_DEFINED__
 #define __ISpAudio_FWD_DEFINED__
 typedef interface ISpAudio ISpAudio;
+#ifdef __cplusplus
+interface ISpAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpMMSysAudio_FWD_DEFINED__
 #define __ISpMMSysAudio_FWD_DEFINED__
 typedef interface ISpMMSysAudio ISpMMSysAudio;
+#ifdef __cplusplus
+interface ISpMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpTranscript_FWD_DEFINED__
 #define __ISpTranscript_FWD_DEFINED__
 typedef interface ISpTranscript ISpTranscript;
+#ifdef __cplusplus
+interface ISpTranscript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpLexicon_FWD_DEFINED__
 #define __ISpLexicon_FWD_DEFINED__
 typedef interface ISpLexicon ISpLexicon;
+#ifdef __cplusplus
+interface ISpLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpContainerLexicon_FWD_DEFINED__
 #define __ISpContainerLexicon_FWD_DEFINED__
 typedef interface ISpContainerLexicon ISpContainerLexicon;
+#ifdef __cplusplus
+interface ISpContainerLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpShortcut_FWD_DEFINED__
 #define __ISpShortcut_FWD_DEFINED__
 typedef interface ISpShortcut ISpShortcut;
+#ifdef __cplusplus
+interface ISpShortcut;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneConverter_FWD_DEFINED__
 #define __ISpPhoneConverter_FWD_DEFINED__
 typedef interface ISpPhoneConverter ISpPhoneConverter;
+#ifdef __cplusplus
+interface ISpPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetSelection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpVoice_FWD_DEFINED__
 #define __ISpVoice_FWD_DEFINED__
 typedef interface ISpVoice ISpVoice;
+#ifdef __cplusplus
+interface ISpVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase_FWD_DEFINED__
 #define __ISpPhrase_FWD_DEFINED__
 typedef interface ISpPhrase ISpPhrase;
+#ifdef __cplusplus
+interface ISpPhrase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhraseAlt_FWD_DEFINED__
 #define __ISpPhraseAlt_FWD_DEFINED__
 typedef interface ISpPhraseAlt ISpPhraseAlt;
+#ifdef __cplusplus
+interface ISpPhraseAlt;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase2_FWD_DEFINED__
 #define __ISpPhrase2_FWD_DEFINED__
 typedef interface ISpPhrase2 ISpPhrase2;
+#ifdef __cplusplus
+interface ISpPhrase2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult_FWD_DEFINED__
 #define __ISpRecoResult_FWD_DEFINED__
 typedef interface ISpRecoResult ISpRecoResult;
+#ifdef __cplusplus
+interface ISpRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult2_FWD_DEFINED__
 #define __ISpRecoResult2_FWD_DEFINED__
 typedef interface ISpRecoResult2 ISpRecoResult2;
+#ifdef __cplusplus
+interface ISpRecoResult2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpXMLRecoResult_FWD_DEFINED__
 #define __ISpXMLRecoResult_FWD_DEFINED__
 typedef interface ISpXMLRecoResult ISpXMLRecoResult;
+#ifdef __cplusplus
+interface ISpXMLRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpGrammarBuilder_FWD_DEFINED__
 #define __ISpGrammarBuilder_FWD_DEFINED__
 typedef interface ISpGrammarBuilder ISpGrammarBuilder;
+#ifdef __cplusplus
+interface ISpGrammarBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar_FWD_DEFINED__
 #define __ISpRecoGrammar_FWD_DEFINED__
 typedef interface ISpRecoGrammar ISpRecoGrammar;
+#ifdef __cplusplus
+interface ISpRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpGrammarBuilder2_FWD_DEFINED__
 #define __ISpGrammarBuilder2_FWD_DEFINED__
 typedef interface ISpGrammarBuilder2 ISpGrammarBuilder2;
+#ifdef __cplusplus
+interface ISpGrammarBuilder2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar2_FWD_DEFINED__
 #define __ISpRecoGrammar2_FWD_DEFINED__
 typedef interface ISpRecoGrammar2 ISpRecoGrammar2;
+#ifdef __cplusplus
+interface ISpRecoGrammar2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechResourceLoader_FWD_DEFINED__
 #define __ISpeechResourceLoader_FWD_DEFINED__
 typedef interface ISpeechResourceLoader ISpeechResourceLoader;
+#ifdef __cplusplus
+interface ISpeechResourceLoader;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext_FWD_DEFINED__
 #define __ISpRecoContext_FWD_DEFINED__
 typedef interface ISpRecoContext ISpRecoContext;
+#ifdef __cplusplus
+interface ISpRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext2_FWD_DEFINED__
 #define __ISpRecoContext2_FWD_DEFINED__
 typedef interface ISpRecoContext2 ISpRecoContext2;
+#ifdef __cplusplus
+interface ISpRecoContext2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpProperties_FWD_DEFINED__
 #define __ISpProperties_FWD_DEFINED__
 typedef interface ISpProperties ISpProperties;
+#ifdef __cplusplus
+interface ISpProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer_FWD_DEFINED__
 #define __ISpRecognizer_FWD_DEFINED__
 typedef interface ISpRecognizer ISpRecognizer;
+#ifdef __cplusplus
+interface ISpRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpSerializeState_FWD_DEFINED__
 #define __ISpSerializeState_FWD_DEFINED__
 typedef interface ISpSerializeState ISpSerializeState;
+#ifdef __cplusplus
+interface ISpSerializeState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer2_FWD_DEFINED__
 #define __ISpRecognizer2_FWD_DEFINED__
 typedef interface ISpRecognizer2 ISpRecognizer2;
+#ifdef __cplusplus
+interface ISpRecognizer2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoCategory_FWD_DEFINED__
 #define __ISpRecoCategory_FWD_DEFINED__
 typedef interface ISpRecoCategory ISpRecoCategory;
+#ifdef __cplusplus
+interface ISpRecoCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer3_FWD_DEFINED__
 #define __ISpRecognizer3_FWD_DEFINED__
 typedef interface ISpRecognizer3 ISpRecognizer3;
+#ifdef __cplusplus
+interface ISpRecognizer3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEnginePronunciation_FWD_DEFINED__
 #define __ISpEnginePronunciation_FWD_DEFINED__
 typedef interface ISpEnginePronunciation ISpEnginePronunciation;
+#ifdef __cplusplus
+interface ISpEnginePronunciation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDisplayAlternates_FWD_DEFINED__
 #define __ISpDisplayAlternates_FWD_DEFINED__
 typedef interface ISpDisplayAlternates ISpDisplayAlternates;
+#ifdef __cplusplus
+interface ISpDisplayAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechDataKey_FWD_DEFINED__
 #define __ISpeechDataKey_FWD_DEFINED__
 typedef interface ISpeechDataKey ISpeechDataKey;
+#ifdef __cplusplus
+interface ISpeechDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectToken_FWD_DEFINED__
 #define __ISpeechObjectToken_FWD_DEFINED__
 typedef interface ISpeechObjectToken ISpeechObjectToken;
+#ifdef __cplusplus
+interface ISpeechObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokens_FWD_DEFINED__
 #define __ISpeechObjectTokens_FWD_DEFINED__
 typedef interface ISpeechObjectTokens ISpeechObjectTokens;
+#ifdef __cplusplus
+interface ISpeechObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__
 #define __ISpeechObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpeechObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioFormat_FWD_DEFINED__
 #define __ISpeechAudioFormat_FWD_DEFINED__
 typedef interface ISpeechAudioFormat ISpeechAudioFormat;
+#ifdef __cplusplus
+interface ISpeechAudioFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechBaseStream_FWD_DEFINED__
 #define __ISpeechBaseStream_FWD_DEFINED__
 typedef interface ISpeechBaseStream ISpeechBaseStream;
+#ifdef __cplusplus
+interface ISpeechBaseStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudio_FWD_DEFINED__
 #define __ISpeechAudio_FWD_DEFINED__
 typedef interface ISpeechAudio ISpeechAudio;
+#ifdef __cplusplus
+interface ISpeechAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMMSysAudio_FWD_DEFINED__
 #define __ISpeechMMSysAudio_FWD_DEFINED__
 typedef interface ISpeechMMSysAudio ISpeechMMSysAudio;
+#ifdef __cplusplus
+interface ISpeechMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechFileStream_FWD_DEFINED__
 #define __ISpeechFileStream_FWD_DEFINED__
 typedef interface ISpeechFileStream ISpeechFileStream;
+#ifdef __cplusplus
+interface ISpeechFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechCustomStream_FWD_DEFINED__
 #define __ISpeechCustomStream_FWD_DEFINED__
 typedef interface ISpeechCustomStream ISpeechCustomStream;
+#ifdef __cplusplus
+interface ISpeechCustomStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMemoryStream_FWD_DEFINED__
 #define __ISpeechMemoryStream_FWD_DEFINED__
 typedef interface ISpeechMemoryStream ISpeechMemoryStream;
+#ifdef __cplusplus
+interface ISpeechMemoryStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioStatus_FWD_DEFINED__
 #define __ISpeechAudioStatus_FWD_DEFINED__
 typedef interface ISpeechAudioStatus ISpeechAudioStatus;
+#ifdef __cplusplus
+interface ISpeechAudioStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__
 #define __ISpeechAudioBufferInfo_FWD_DEFINED__
 typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo;
+#ifdef __cplusplus
+interface ISpeechAudioBufferInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__
 #define __ISpeechWaveFormatEx_FWD_DEFINED__
 typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx;
+#ifdef __cplusplus
+interface ISpeechWaveFormatEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoice_FWD_DEFINED__
 #define __ISpeechVoice_FWD_DEFINED__
 typedef interface ISpeechVoice ISpeechVoice;
+#ifdef __cplusplus
+interface ISpeechVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoiceStatus_FWD_DEFINED__
 #define __ISpeechVoiceStatus_FWD_DEFINED__
 typedef interface ISpeechVoiceStatus ISpeechVoiceStatus;
+#ifdef __cplusplus
+interface ISpeechVoiceStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__
 #define ___ISpeechVoiceEvents_FWD_DEFINED__
 typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents;
+#ifdef __cplusplus
+interface _ISpeechVoiceEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizer_FWD_DEFINED__
 #define __ISpeechRecognizer_FWD_DEFINED__
 typedef interface ISpeechRecognizer ISpeechRecognizer;
+#ifdef __cplusplus
+interface ISpeechRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__
 #define __ISpeechRecognizerStatus_FWD_DEFINED__
 typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus;
+#ifdef __cplusplus
+interface ISpeechRecognizerStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoContext_FWD_DEFINED__
 #define __ISpeechRecoContext_FWD_DEFINED__
 typedef interface ISpeechRecoContext ISpeechRecoContext;
+#ifdef __cplusplus
+interface ISpeechRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoGrammar_FWD_DEFINED__
 #define __ISpeechRecoGrammar_FWD_DEFINED__
 typedef interface ISpeechRecoGrammar ISpeechRecoGrammar;
+#ifdef __cplusplus
+interface ISpeechRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__
 #define ___ISpeechRecoContextEvents_FWD_DEFINED__
 typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents;
+#ifdef __cplusplus
+interface _ISpeechRecoContextEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRule_FWD_DEFINED__
 #define __ISpeechGrammarRule_FWD_DEFINED__
 typedef interface ISpeechGrammarRule ISpeechGrammarRule;
+#ifdef __cplusplus
+interface ISpeechGrammarRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRules_FWD_DEFINED__
 #define __ISpeechGrammarRules_FWD_DEFINED__
 typedef interface ISpeechGrammarRules ISpeechGrammarRules;
+#ifdef __cplusplus
+interface ISpeechGrammarRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__
 #define __ISpeechGrammarRuleState_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransitions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__
 #define __ISpeechTextSelectionInformation_FWD_DEFINED__
 typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation;
+#ifdef __cplusplus
+interface ISpeechTextSelectionInformation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult_FWD_DEFINED__
 #define __ISpeechRecoResult_FWD_DEFINED__
 typedef interface ISpeechRecoResult ISpeechRecoResult;
+#ifdef __cplusplus
+interface ISpeechRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechXMLRecoResult_FWD_DEFINED__
 #define __ISpeechXMLRecoResult_FWD_DEFINED__
 typedef interface ISpeechXMLRecoResult ISpeechXMLRecoResult;
+#ifdef __cplusplus
+interface ISpeechXMLRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult2_FWD_DEFINED__
 #define __ISpeechRecoResult2_FWD_DEFINED__
 typedef interface ISpeechRecoResult2 ISpeechRecoResult2;
+#ifdef __cplusplus
+interface ISpeechRecoResult2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultDispatch_FWD_DEFINED__
 #define __ISpeechRecoResultDispatch_FWD_DEFINED__
 typedef interface ISpeechRecoResultDispatch ISpeechRecoResultDispatch;
+#ifdef __cplusplus
+interface ISpeechRecoResultDispatch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfoBuilder_FWD_DEFINED__
 #define __ISpeechPhraseInfoBuilder_FWD_DEFINED__
 typedef interface ISpeechPhraseInfoBuilder ISpeechPhraseInfoBuilder;
+#ifdef __cplusplus
+interface ISpeechPhraseInfoBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__
 #define __ISpeechRecoResultTimes_FWD_DEFINED__
 typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes;
+#ifdef __cplusplus
+interface ISpeechRecoResultTimes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__
 #define __ISpeechPhraseAlternate_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__
 #define __ISpeechPhraseAlternates_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfo_FWD_DEFINED__
 #define __ISpeechPhraseInfo_FWD_DEFINED__
 typedef interface ISpeechPhraseInfo ISpeechPhraseInfo;
+#ifdef __cplusplus
+interface ISpeechPhraseInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElement_FWD_DEFINED__
 #define __ISpeechPhraseElement_FWD_DEFINED__
 typedef interface ISpeechPhraseElement ISpeechPhraseElement;
+#ifdef __cplusplus
+interface ISpeechPhraseElement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElements_FWD_DEFINED__
 #define __ISpeechPhraseElements_FWD_DEFINED__
 typedef interface ISpeechPhraseElements ISpeechPhraseElements;
+#ifdef __cplusplus
+interface ISpeechPhraseElements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__
 #define __ISpeechPhraseReplacement_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__
 #define __ISpeechPhraseReplacements_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperty_FWD_DEFINED__
 #define __ISpeechPhraseProperty_FWD_DEFINED__
 typedef interface ISpeechPhraseProperty ISpeechPhraseProperty;
+#ifdef __cplusplus
+interface ISpeechPhraseProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperties_FWD_DEFINED__
 #define __ISpeechPhraseProperties_FWD_DEFINED__
 typedef interface ISpeechPhraseProperties ISpeechPhraseProperties;
+#ifdef __cplusplus
+interface ISpeechPhraseProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRule_FWD_DEFINED__
 #define __ISpeechPhraseRule_FWD_DEFINED__
 typedef interface ISpeechPhraseRule ISpeechPhraseRule;
+#ifdef __cplusplus
+interface ISpeechPhraseRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRules_FWD_DEFINED__
 #define __ISpeechPhraseRules_FWD_DEFINED__
 typedef interface ISpeechPhraseRules ISpeechPhraseRules;
+#ifdef __cplusplus
+interface ISpeechPhraseRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWords_FWD_DEFINED__
 #define __ISpeechLexiconWords_FWD_DEFINED__
 typedef interface ISpeechLexiconWords ISpeechLexiconWords;
+#ifdef __cplusplus
+interface ISpeechLexiconWords;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexicon_FWD_DEFINED__
 #define __ISpeechLexicon_FWD_DEFINED__
 typedef interface ISpeechLexicon ISpeechLexicon;
+#ifdef __cplusplus
+interface ISpeechLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWord_FWD_DEFINED__
 #define __ISpeechLexiconWord_FWD_DEFINED__
 typedef interface ISpeechLexiconWord ISpeechLexiconWord;
+#ifdef __cplusplus
+interface ISpeechLexiconWord;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__
 #define __ISpeechLexiconPronunciations_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciations;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__
 #define __ISpeechLexiconPronunciation_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhoneConverter_FWD_DEFINED__
 #define __ISpeechPhoneConverter_FWD_DEFINED__
 typedef interface ISpeechPhoneConverter ISpeechPhoneConverter;
+#ifdef __cplusplus
+interface ISpeechPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __SpNotifyTranslator_FWD_DEFINED__
@@ -790,166 +1087,265 @@
 #ifndef __ISpNotifySource_FWD_DEFINED__
 #define __ISpNotifySource_FWD_DEFINED__
 typedef interface ISpNotifySource ISpNotifySource;
+#ifdef __cplusplus
+interface ISpNotifySource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifySink_FWD_DEFINED__
 #define __ISpNotifySink_FWD_DEFINED__
 typedef interface ISpNotifySink ISpNotifySink;
+#ifdef __cplusplus
+interface ISpNotifySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpNotifyTranslator_FWD_DEFINED__
 #define __ISpNotifyTranslator_FWD_DEFINED__
 typedef interface ISpNotifyTranslator ISpNotifyTranslator;
+#ifdef __cplusplus
+interface ISpNotifyTranslator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpDataKey_FWD_DEFINED__
 #define __ISpDataKey_FWD_DEFINED__
 typedef interface ISpDataKey ISpDataKey;
+#ifdef __cplusplus
+interface ISpDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectTokenCategory_FWD_DEFINED__
 #define __ISpObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpObjectTokenCategory ISpObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectToken_FWD_DEFINED__
 #define __ISpObjectToken_FWD_DEFINED__
 typedef interface ISpObjectToken ISpObjectToken;
+#ifdef __cplusplus
+interface ISpObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumSpObjectTokens_FWD_DEFINED__
 #define __IEnumSpObjectTokens_FWD_DEFINED__
 typedef interface IEnumSpObjectTokens IEnumSpObjectTokens;
+#ifdef __cplusplus
+interface IEnumSpObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpObjectWithToken_FWD_DEFINED__
 #define __ISpObjectWithToken_FWD_DEFINED__
 typedef interface ISpObjectWithToken ISpObjectWithToken;
+#ifdef __cplusplus
+interface ISpObjectWithToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpResourceManager_FWD_DEFINED__
 #define __ISpResourceManager_FWD_DEFINED__
 typedef interface ISpResourceManager ISpResourceManager;
+#ifdef __cplusplus
+interface ISpResourceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSource_FWD_DEFINED__
 #define __ISpEventSource_FWD_DEFINED__
 typedef interface ISpEventSource ISpEventSource;
+#ifdef __cplusplus
+interface ISpEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpEventSink_FWD_DEFINED__
 #define __ISpEventSink_FWD_DEFINED__
 typedef interface ISpEventSink ISpEventSink;
+#ifdef __cplusplus
+interface ISpEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormat_FWD_DEFINED__
 #define __ISpStreamFormat_FWD_DEFINED__
 typedef interface ISpStreamFormat ISpStreamFormat;
+#ifdef __cplusplus
+interface ISpStreamFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStream_FWD_DEFINED__
 #define __ISpStream_FWD_DEFINED__
 typedef interface ISpStream ISpStream;
+#ifdef __cplusplus
+interface ISpStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpStreamFormatConverter_FWD_DEFINED__
 #define __ISpStreamFormatConverter_FWD_DEFINED__
 typedef interface ISpStreamFormatConverter ISpStreamFormatConverter;
+#ifdef __cplusplus
+interface ISpStreamFormatConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpAudio_FWD_DEFINED__
 #define __ISpAudio_FWD_DEFINED__
 typedef interface ISpAudio ISpAudio;
+#ifdef __cplusplus
+interface ISpAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpMMSysAudio_FWD_DEFINED__
 #define __ISpMMSysAudio_FWD_DEFINED__
 typedef interface ISpMMSysAudio ISpMMSysAudio;
+#ifdef __cplusplus
+interface ISpMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpTranscript_FWD_DEFINED__
 #define __ISpTranscript_FWD_DEFINED__
 typedef interface ISpTranscript ISpTranscript;
+#ifdef __cplusplus
+interface ISpTranscript;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpVoice_FWD_DEFINED__
 #define __ISpVoice_FWD_DEFINED__
 typedef interface ISpVoice ISpVoice;
+#ifdef __cplusplus
+interface ISpVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoResult_FWD_DEFINED__
 #define __ISpRecoResult_FWD_DEFINED__
 typedef interface ISpRecoResult ISpRecoResult;
+#ifdef __cplusplus
+interface ISpRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext_FWD_DEFINED__
 #define __ISpRecoContext_FWD_DEFINED__
 typedef interface ISpRecoContext ISpRecoContext;
+#ifdef __cplusplus
+interface ISpRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer_FWD_DEFINED__
 #define __ISpRecognizer_FWD_DEFINED__
 typedef interface ISpRecognizer ISpRecognizer;
+#ifdef __cplusplus
+interface ISpRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpProperties_FWD_DEFINED__
 #define __ISpProperties_FWD_DEFINED__
 typedef interface ISpProperties ISpProperties;
+#ifdef __cplusplus
+interface ISpProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpLexicon_FWD_DEFINED__
 #define __ISpLexicon_FWD_DEFINED__
 typedef interface ISpLexicon ISpLexicon;
+#ifdef __cplusplus
+interface ISpLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneConverter_FWD_DEFINED__
 #define __ISpPhoneConverter_FWD_DEFINED__
 typedef interface ISpPhoneConverter ISpPhoneConverter;
+#ifdef __cplusplus
+interface ISpPhoneConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhrase_FWD_DEFINED__
 #define __ISpPhrase_FWD_DEFINED__
 typedef interface ISpPhrase ISpPhrase;
+#ifdef __cplusplus
+interface ISpPhrase;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoContext2_FWD_DEFINED__
 #define __ISpRecoContext2_FWD_DEFINED__
 typedef interface ISpRecoContext2 ISpRecoContext2;
+#ifdef __cplusplus
+interface ISpRecoContext2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer2_FWD_DEFINED__
 #define __ISpRecognizer2_FWD_DEFINED__
 typedef interface ISpRecognizer2 ISpRecognizer2;
+#ifdef __cplusplus
+interface ISpRecognizer2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpShortcut_FWD_DEFINED__
 #define __ISpShortcut_FWD_DEFINED__
 typedef interface ISpShortcut ISpShortcut;
+#ifdef __cplusplus
+interface ISpShortcut;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 #define __ISpPhoneticAlphabetConverter_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetConverter ISpPhoneticAlphabetConverter;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 #define __ISpPhoneticAlphabetSelection_FWD_DEFINED__
 typedef interface ISpPhoneticAlphabetSelection ISpPhoneticAlphabetSelection;
+#ifdef __cplusplus
+interface ISpPhoneticAlphabetSelection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar2_FWD_DEFINED__
 #define __ISpRecoGrammar2_FWD_DEFINED__
 typedef interface ISpRecoGrammar2 ISpRecoGrammar2;
+#ifdef __cplusplus
+interface ISpRecoGrammar2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechResourceLoader_FWD_DEFINED__
 #define __ISpeechResourceLoader_FWD_DEFINED__
 typedef interface ISpeechResourceLoader ISpeechResourceLoader;
+#ifdef __cplusplus
+interface ISpeechResourceLoader;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecognizer3_FWD_DEFINED__
 #define __ISpRecognizer3_FWD_DEFINED__
 typedef interface ISpRecognizer3 ISpRecognizer3;
+#ifdef __cplusplus
+interface ISpRecognizer3;
+#endif /* __cplusplus */
 #endif
 
 typedef enum SPDATAKEYLOCATION {
@@ -1346,52 +1742,53 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpNotifySource* This,
+        ISpNotifySource *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpNotifySource* This);
+        ISpNotifySource *This);
 
     END_INTERFACE
 } ISpNotifySourceVtbl;
+
 interface ISpNotifySource {
     CONST_VTBL ISpNotifySourceVtbl* lpVtbl;
 };
@@ -1448,14 +1845,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifySource_SetNotifySink_Proxy(
-    ISpNotifySource* This,
-    ISpNotifySink *pNotifySink);
-void __RPC_STUB ISpNotifySource_SetNotifySink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifySource_INTERFACE_DEFINED__ */
 
@@ -1483,22 +1872,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifySink* This,
+        ISpNotifySink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     /*** ISpNotifySink methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ISpNotifySink* This);
+        ISpNotifySink *This);
 
     END_INTERFACE
 } ISpNotifySinkVtbl;
+
 interface ISpNotifySink {
     CONST_VTBL ISpNotifySinkVtbl* lpVtbl;
 };
@@ -1531,13 +1921,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifySink_Notify_Proxy(
-    ISpNotifySink* This);
-void __RPC_STUB ISpNotifySink_Notify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifySink_INTERFACE_DEFINED__ */
 
@@ -1588,54 +1971,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     /*** ISpNotifySink methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     /*** ISpNotifyTranslator methods ***/
     HRESULT (STDMETHODCALLTYPE *InitWindowMessage)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitCallback)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitSpNotifyCallback)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *InitWin32Event)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         HANDLE hEvent,
         WINBOOL fCloseHandleOnRelease);
 
     HRESULT (STDMETHODCALLTYPE *Wait)(
-        ISpNotifyTranslator* This,
+        ISpNotifyTranslator *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetEventHandle)(
-        ISpNotifyTranslator* This);
+        ISpNotifyTranslator *This);
 
     END_INTERFACE
 } ISpNotifyTranslatorVtbl;
+
 interface ISpNotifyTranslator {
     CONST_VTBL ISpNotifyTranslatorVtbl* lpVtbl;
 };
@@ -1694,61 +2078,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWindowMessage_Proxy(
-    ISpNotifyTranslator* This,
-    HWND hWnd,
-    UINT Msg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitWindowMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitCallback_Proxy(
-    ISpNotifyTranslator* This,
-    SPNOTIFYCALLBACK *pfnCallback,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitSpNotifyCallback_Proxy(
-    ISpNotifyTranslator* This,
-    ISpNotifyCallback *pSpCallback,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB ISpNotifyTranslator_InitSpNotifyCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_InitWin32Event_Proxy(
-    ISpNotifyTranslator* This,
-    HANDLE hEvent,
-    WINBOOL fCloseHandleOnRelease);
-void __RPC_STUB ISpNotifyTranslator_InitWin32Event_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpNotifyTranslator_Wait_Proxy(
-    ISpNotifyTranslator* This,
-    DWORD dwMilliseconds);
-void __RPC_STUB ISpNotifyTranslator_Wait_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HANDLE STDMETHODCALLTYPE ISpNotifyTranslator_GetEventHandle_Proxy(
-    ISpNotifyTranslator* This);
-void __RPC_STUB ISpNotifyTranslator_GetEventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpNotifyTranslator_INTERFACE_DEFINED__ */
 
@@ -1821,79 +2150,80 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpDataKey* This);
+        ISpDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpDataKey* This);
+        ISpDataKey *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpDataKey* This,
+        ISpDataKey *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     END_INTERFACE
 } ISpDataKeyVtbl;
+
 interface ISpDataKey {
     CONST_VTBL ISpDataKeyVtbl* lpVtbl;
 };
@@ -1970,114 +2300,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetData_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    ULONG cbData,
-    const BYTE *pData);
-void __RPC_STUB ISpDataKey_SetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetData_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    ULONG *pcbData,
-    BYTE *pData);
-void __RPC_STUB ISpDataKey_GetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetStringValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    LPCWSTR pszValue);
-void __RPC_STUB ISpDataKey_SetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetStringValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    LPWSTR *ppszValue);
-void __RPC_STUB ISpDataKey_GetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_SetDWORD_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    DWORD dwValue);
-void __RPC_STUB ISpDataKey_SetDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_GetDWORD_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName,
-    DWORD *pdwValue);
-void __RPC_STUB ISpDataKey_GetDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_OpenKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKeyName,
-    ISpDataKey **ppSubKey);
-void __RPC_STUB ISpDataKey_OpenKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_CreateKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKey,
-    ISpDataKey **ppSubKey);
-void __RPC_STUB ISpDataKey_CreateKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteKey_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszSubKey);
-void __RPC_STUB ISpDataKey_DeleteKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_DeleteValue_Proxy(
-    ISpDataKey* This,
-    LPCWSTR pszValueName);
-void __RPC_STUB ISpDataKey_DeleteValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_EnumKeys_Proxy(
-    ISpDataKey* This,
-    ULONG Index,
-    LPWSTR *ppszSubKeyName);
-void __RPC_STUB ISpDataKey_EnumKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDataKey_EnumValues_Proxy(
-    ISpDataKey* This,
-    ULONG Index,
-    LPWSTR *ppszValueName);
-void __RPC_STUB ISpDataKey_EnumValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpDataKey_INTERFACE_DEFINED__ */
 
@@ -2108,27 +2330,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectWithToken* This);
+        ISpObjectWithToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectWithToken* This);
+        ISpObjectWithToken *This);
 
     /*** ISpObjectWithToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObjectToken)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectToken)(
-        ISpObjectWithToken* This,
+        ISpObjectWithToken *This,
         ISpObjectToken **ppToken);
 
     END_INTERFACE
 } ISpObjectWithTokenVtbl;
+
 interface ISpObjectWithToken {
     CONST_VTBL ISpObjectWithTokenVtbl* lpVtbl;
 };
@@ -2165,22 +2388,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectWithToken_SetObjectToken_Proxy(
-    ISpObjectWithToken* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpObjectWithToken_SetObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectWithToken_GetObjectToken_Proxy(
-    ISpObjectWithToken* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpObjectWithToken_GetObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectWithToken_INTERFACE_DEFINED__ */
 
@@ -2226,45 +2433,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     /*** IEnumSpObjectTokens methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG celt,
         ISpObjectToken **pelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumSpObjectTokens* This);
+        IEnumSpObjectTokens *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         IEnumSpObjectTokens **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG Index,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IEnumSpObjectTokens* This,
+        IEnumSpObjectTokens *This,
         ULONG *pCount);
 
     END_INTERFACE
 } IEnumSpObjectTokensVtbl;
+
 interface IEnumSpObjectTokens {
     CONST_VTBL IEnumSpObjectTokensVtbl* lpVtbl;
 };
@@ -2317,56 +2525,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Next_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG celt,
-    ISpObjectToken **pelt,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumSpObjectTokens_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Skip_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG celt);
-void __RPC_STUB IEnumSpObjectTokens_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Reset_Proxy(
-    IEnumSpObjectTokens* This);
-void __RPC_STUB IEnumSpObjectTokens_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Clone_Proxy(
-    IEnumSpObjectTokens* This,
-    IEnumSpObjectTokens **ppEnum);
-void __RPC_STUB IEnumSpObjectTokens_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_Item_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG Index,
-    ISpObjectToken **ppToken);
-void __RPC_STUB IEnumSpObjectTokens_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumSpObjectTokens_GetCount_Proxy(
-    IEnumSpObjectTokens* This,
-    ULONG *pCount);
-void __RPC_STUB IEnumSpObjectTokens_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumSpObjectTokens_INTERFACE_DEFINED__ */
 
@@ -2395,85 +2553,86 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRegDataKey* This);
+        ISpRegDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRegDataKey* This);
+        ISpRegDataKey *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpRegDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetKey)(
-        ISpRegDataKey* This,
+        ISpRegDataKey *This,
         HKEY hkey,
         WINBOOL fReadOnly);
 
     END_INTERFACE
 } ISpRegDataKeyVtbl;
+
 interface ISpRegDataKey {
     CONST_VTBL ISpRegDataKeyVtbl* lpVtbl;
 };
@@ -2602,108 +2761,109 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectTokenCategory* This);
+        ISpObjectTokenCategory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectTokenCategory* This);
+        ISpObjectTokenCategory *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectTokenCategory methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszCategoryId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPWSTR *ppszCoMemCategoryId);
 
     HRESULT (STDMETHODCALLTYPE *GetDataKey)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         SPDATAKEYLOCATION spdkl,
         ISpDataKey **ppDataKey);
 
     HRESULT (STDMETHODCALLTYPE *EnumTokens)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pzsReqAttribs,
         LPCWSTR pszOptAttribs,
         IEnumSpObjectTokens **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultTokenId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPCWSTR pszTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultTokenId)(
-        ISpObjectTokenCategory* This,
+        ISpObjectTokenCategory *This,
         LPWSTR *ppszCoMemTokenId);
 
     END_INTERFACE
 } ISpObjectTokenCategoryVtbl;
+
 interface ISpObjectTokenCategory {
     CONST_VTBL ISpObjectTokenCategoryVtbl* lpVtbl;
 };
@@ -2806,58 +2966,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pszCategoryId,
-    WINBOOL fCreateIfNotExist);
-void __RPC_STUB ISpObjectTokenCategory_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPWSTR *ppszCoMemCategoryId);
-void __RPC_STUB ISpObjectTokenCategory_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDataKey_Proxy(
-    ISpObjectTokenCategory* This,
-    SPDATAKEYLOCATION spdkl,
-    ISpDataKey **ppDataKey);
-void __RPC_STUB ISpObjectTokenCategory_GetDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_EnumTokens_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pzsReqAttribs,
-    LPCWSTR pszOptAttribs,
-    IEnumSpObjectTokens **ppEnum);
-void __RPC_STUB ISpObjectTokenCategory_EnumTokens_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_SetDefaultTokenId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPCWSTR pszTokenId);
-void __RPC_STUB ISpObjectTokenCategory_SetDefaultTokenId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectTokenCategory_GetDefaultTokenId_Proxy(
-    ISpObjectTokenCategory* This,
-    LPWSTR *ppszCoMemTokenId);
-void __RPC_STUB ISpObjectTokenCategory_GetDefaultTokenId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectTokenCategory_INTERFACE_DEFINED__ */
 
@@ -2933,101 +3041,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectToken* This);
+        ISpObjectToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectToken* This);
+        ISpObjectToken *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPWSTR *ppszCoMemTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         ISpObjectTokenCategory **ppTokenCategory);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         IUnknown *pUnkOuter,
         DWORD dwClsContext,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFCLSID clsidCaller,
         LPCWSTR pszValueName,
         LPCWSTR pszFileNameSpecifier,
@@ -3035,17 +3143,17 @@
         LPWSTR *ppszFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         REFCLSID clsidCaller,
         LPCWSTR pszKeyName,
         WINBOOL fDeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         const CLSID *pclsidCaller);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
@@ -3053,7 +3161,7 @@
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -3062,12 +3170,13 @@
         IUnknown *punkObject);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpObjectToken* This,
+        ISpObjectToken *This,
         LPCWSTR pszAttributes,
         WINBOOL *pfMatches);
 
     END_INTERFACE
 } ISpObjectTokenVtbl;
+
 interface ISpObjectToken {
     CONST_VTBL ISpObjectTokenVtbl* lpVtbl;
 };
@@ -3186,82 +3295,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectToken_SetId_Proxy(
-    ISpObjectToken* This,
-    LPCWSTR pszCategoryId,
-    LPCWSTR pszTokenId,
-    WINBOOL fCreateIfNotExist);
-void __RPC_STUB ISpObjectToken_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetId_Proxy(
-    ISpObjectToken* This,
-    LPWSTR *ppszCoMemTokenId);
-void __RPC_STUB ISpObjectToken_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetCategory_Proxy(
-    ISpObjectToken* This,
-    ISpObjectTokenCategory **ppTokenCategory);
-void __RPC_STUB ISpObjectToken_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_CreateInstance_Proxy(
-    ISpObjectToken* This,
-    IUnknown *pUnkOuter,
-    DWORD dwClsContext,
-    REFIID riid,
-    void **ppvObject);
-void __RPC_STUB ISpObjectToken_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_GetStorageFileName_Proxy(
-    ISpObjectToken* This,
-    REFCLSID clsidCaller,
-    LPCWSTR pszValueName,
-    LPCWSTR pszFileNameSpecifier,
-    ULONG nFolder,
-    LPWSTR *ppszFilePath);
-void __RPC_STUB ISpObjectToken_GetStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_RemoveStorageFileName_Proxy(
-    ISpObjectToken* This,
-    REFCLSID clsidCaller,
-    LPCWSTR pszKeyName,
-    WINBOOL fDeleteFile);
-void __RPC_STUB ISpObjectToken_RemoveStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_Remove_Proxy(
-    ISpObjectToken* This,
-    const CLSID *pclsidCaller);
-void __RPC_STUB ISpObjectToken_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpObjectToken_MatchesAttributes_Proxy(
-    ISpObjectToken* This,
-    LPCWSTR pszAttributes,
-    WINBOOL *pfMatches);
-void __RPC_STUB ISpObjectToken_MatchesAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectToken_INTERFACE_DEFINED__ */
 
@@ -3291,101 +3324,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpObjectTokenInit* This);
+        ISpObjectTokenInit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpObjectTokenInit* This);
+        ISpObjectTokenInit *This);
 
     /*** ISpDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         ULONG cbData,
         const BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         ULONG *pcbData,
         BYTE *pData);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         LPCWSTR pszValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         LPWSTR *ppszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDWORD)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         DWORD dwValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDWORD)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName,
         DWORD *pdwValue);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKeyName,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKey,
         ISpDataKey **ppSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszSubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ULONG Index,
         LPWSTR *ppszSubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ULONG Index,
         LPWSTR *ppszValueName);
 
     /*** ISpObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         WINBOOL fCreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPWSTR *ppszCoMemTokenId);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         ISpObjectTokenCategory **ppTokenCategory);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         IUnknown *pUnkOuter,
         DWORD dwClsContext,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFCLSID clsidCaller,
         LPCWSTR pszValueName,
         LPCWSTR pszFileNameSpecifier,
@@ -3393,17 +3426,17 @@
         LPWSTR *ppszFilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         REFCLSID clsidCaller,
         LPCWSTR pszKeyName,
         WINBOOL fDeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         const CLSID *pclsidCaller);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
@@ -3411,7 +3444,7 @@
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -3420,19 +3453,20 @@
         IUnknown *punkObject);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszAttributes,
         WINBOOL *pfMatches);
 
     /*** ISpObjectTokenInit methods ***/
     HRESULT (STDMETHODCALLTYPE *InitFromDataKey)(
-        ISpObjectTokenInit* This,
+        ISpObjectTokenInit *This,
         LPCWSTR pszCategoryId,
         LPCWSTR pszTokenId,
         ISpDataKey *pDataKey);
 
     END_INTERFACE
 } ISpObjectTokenInitVtbl;
+
 interface ISpObjectTokenInit {
     CONST_VTBL ISpObjectTokenInitVtbl* lpVtbl;
 };
@@ -3557,16 +3591,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpObjectTokenInit_InitFromDataKey_Proxy(
-    ISpObjectTokenInit* This,
-    LPCWSTR pszCategoryId,
-    LPCWSTR pszTokenId,
-    ISpDataKey *pDataKey);
-void __RPC_STUB ISpObjectTokenInit_InitFromDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpObjectTokenInit_INTERFACE_DEFINED__ */
 
@@ -3602,31 +3626,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpResourceManager* This);
+        ISpResourceManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpResourceManager* This);
+        ISpResourceManager *This);
 
     /*** IServiceProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryService)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidService,
         REFIID riid,
         void **ppvObject);
 
     /*** ISpResourceManager methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObject)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidServiceId,
         IUnknown *pUnkObject);
 
     HRESULT (STDMETHODCALLTYPE *GetObject)(
-        ISpResourceManager* This,
+        ISpResourceManager *This,
         REFGUID guidServiceId,
         REFCLSID ObjectCLSID,
         REFIID ObjectIID,
@@ -3635,6 +3659,7 @@
 
     END_INTERFACE
 } ISpResourceManagerVtbl;
+
 interface ISpResourceManager {
     CONST_VTBL ISpResourceManagerVtbl* lpVtbl;
 };
@@ -3677,27 +3702,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpResourceManager_SetObject_Proxy(
-    ISpResourceManager* This,
-    REFGUID guidServiceId,
-    IUnknown *pUnkObject);
-void __RPC_STUB ISpResourceManager_SetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpResourceManager_GetObject_Proxy(
-    ISpResourceManager* This,
-    REFGUID guidServiceId,
-    REFCLSID ObjectCLSID,
-    REFIID ObjectIID,
-    WINBOOL fReleaseWhenLastExternalRefReleased,
-    void **ppObject);
-void __RPC_STUB ISpResourceManager_GetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpResourceManager_INTERFACE_DEFINED__ */
 
@@ -3813,68 +3817,69 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpEventSource* This);
+        ISpEventSource *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpEventSource* This,
+        ISpEventSource *This,
         SPEVENTSOURCEINFO *pInfo);
 
     END_INTERFACE
 } ISpEventSourceVtbl;
+
 interface ISpEventSource {
     CONST_VTBL ISpEventSourceVtbl* lpVtbl;
 };
@@ -3945,33 +3950,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSource_SetInterest_Proxy(
-    ISpEventSource* This,
-    ULONGLONG ullEventInterest,
-    ULONGLONG ullQueuedInterest);
-void __RPC_STUB ISpEventSource_SetInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSource_GetEvents_Proxy(
-    ISpEventSource* This,
-    ULONG ulCount,
-    SPEVENT *pEventArray,
-    ULONG *pulFetched);
-void __RPC_STUB ISpEventSource_GetEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSource_GetInfo_Proxy(
-    ISpEventSource* This,
-    SPEVENTSOURCEINFO *pInfo);
-void __RPC_STUB ISpEventSource_GetInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSource_INTERFACE_DEFINED__ */
 
@@ -4001,75 +3979,76 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpEventSource2* This);
+        ISpEventSource2 *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpEventSource2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetEventsEx)(
-        ISpEventSource2* This,
+        ISpEventSource2 *This,
         ULONG ulCount,
         SPEVENTEX *pEventArray,
         ULONG *pulFetched);
 
     END_INTERFACE
 } ISpEventSource2Vtbl;
+
 interface ISpEventSource2 {
     CONST_VTBL ISpEventSource2Vtbl* lpVtbl;
 };
@@ -4146,16 +4125,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSource2_GetEventsEx_Proxy(
-    ISpEventSource2* This,
-    ULONG ulCount,
-    SPEVENTEX *pEventArray,
-    ULONG *pulFetched);
-void __RPC_STUB ISpEventSource2_GetEventsEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSource2_INTERFACE_DEFINED__ */
 
@@ -4187,28 +4156,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEventSink* This);
+        ISpEventSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEventSink* This);
+        ISpEventSink *This);
 
     /*** ISpEventSink methods ***/
     HRESULT (STDMETHODCALLTYPE *AddEvents)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         const SPEVENT *pEventArray,
         ULONG ulCount);
 
     HRESULT (STDMETHODCALLTYPE *GetEventInterest)(
-        ISpEventSink* This,
+        ISpEventSink *This,
         ULONGLONG *pullEventInterest);
 
     END_INTERFACE
 } ISpEventSinkVtbl;
+
 interface ISpEventSink {
     CONST_VTBL ISpEventSinkVtbl* lpVtbl;
 };
@@ -4245,23 +4215,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEventSink_AddEvents_Proxy(
-    ISpEventSink* This,
-    const SPEVENT *pEventArray,
-    ULONG ulCount);
-void __RPC_STUB ISpEventSink_AddEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEventSink_GetEventInterest_Proxy(
-    ISpEventSink* This,
-    ULONGLONG *pullEventInterest);
-void __RPC_STUB ISpEventSink_GetEventInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEventSink_INTERFACE_DEFINED__ */
 
@@ -4290,83 +4243,84 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStreamFormat* This);
+        ISpStreamFormat *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStreamFormat* This,
+        ISpStreamFormat *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     END_INTERFACE
 } ISpStreamFormatVtbl;
+
 interface ISpStreamFormat {
     CONST_VTBL ISpStreamFormatVtbl* lpVtbl;
 };
@@ -4447,15 +4401,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStreamFormat_GetFormat_Proxy(
-    ISpStreamFormat* This,
-    GUID *pguidFormatId,
-    WAVEFORMATEX **ppCoMemWaveFormatEx);
-void __RPC_STUB ISpStreamFormat_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStreamFormat_INTERFACE_DEFINED__ */
 
@@ -4498,94 +4443,94 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStream* This,
+        ISpStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStream* This);
+        ISpStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStream* This);
+        ISpStream *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStream* This,
+        ISpStream *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStream* This,
+        ISpStream *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStream* This,
+        ISpStream *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStream* This,
+        ISpStream *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStream* This,
+        ISpStream *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStream* This);
+        ISpStream *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStream* This,
+        ISpStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStream* This,
+        ISpStream *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStream* This,
+        ISpStream *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStream* This,
+        ISpStream *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpStream methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBaseStream)(
-        ISpStream* This,
+        ISpStream *This,
         IStream *pStream,
         REFGUID rguidFormat,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetBaseStream)(
-        ISpStream* This,
+        ISpStream *This,
         IStream **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *BindToFile)(
-        ISpStream* This,
+        ISpStream *This,
         LPCWSTR pszFileName,
         SPFILEMODE eMode,
         const GUID *pFormatId,
@@ -4593,10 +4538,11 @@
         ULONGLONG ullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        ISpStream* This);
+        ISpStream *This);
 
     END_INTERFACE
 } ISpStreamVtbl;
+
 interface ISpStream {
     CONST_VTBL ISpStreamVtbl* lpVtbl;
 };
@@ -4695,43 +4641,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStream_SetBaseStream_Proxy(
-    ISpStream* This,
-    IStream *pStream,
-    REFGUID rguidFormat,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpStream_SetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_GetBaseStream_Proxy(
-    ISpStream* This,
-    IStream **ppStream);
-void __RPC_STUB ISpStream_GetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_BindToFile_Proxy(
-    ISpStream* This,
-    LPCWSTR pszFileName,
-    SPFILEMODE eMode,
-    const GUID *pFormatId,
-    const WAVEFORMATEX *pWaveFormatEx,
-    ULONGLONG ullEventInterest);
-void __RPC_STUB ISpStream_BindToFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStream_Close_Proxy(
-    ISpStream* This);
-void __RPC_STUB ISpStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStream_INTERFACE_DEFINED__ */
 
@@ -4779,112 +4688,113 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpStreamFormatConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBaseStream)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ISpStreamFormat *pStream,
         WINBOOL fSetFormatToBaseStreamFormat,
         WINBOOL fWriteToBaseStream);
 
     HRESULT (STDMETHODCALLTYPE *GetBaseStream)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         REFGUID rguidFormatIdOfConvertedStream,
         const WAVEFORMATEX *pWaveFormatExOfConvertedStream);
 
     HRESULT (STDMETHODCALLTYPE *ResetSeekPosition)(
-        ISpStreamFormatConverter* This);
+        ISpStreamFormatConverter *This);
 
     HRESULT (STDMETHODCALLTYPE *ScaleConvertedToBaseOffset)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULONGLONG ullOffsetConvertedStream,
         ULONGLONG *pullOffsetBaseStream);
 
     HRESULT (STDMETHODCALLTYPE *ScaleBaseToConvertedOffset)(
-        ISpStreamFormatConverter* This,
+        ISpStreamFormatConverter *This,
         ULONGLONG ullOffsetBaseStream,
         ULONGLONG *pullOffsetConvertedStream);
 
     END_INTERFACE
 } ISpStreamFormatConverterVtbl;
+
 interface ISpStreamFormatConverter {
     CONST_VTBL ISpStreamFormatConverterVtbl* lpVtbl;
 };
@@ -4991,58 +4901,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetBaseStream_Proxy(
-    ISpStreamFormatConverter* This,
-    ISpStreamFormat *pStream,
-    WINBOOL fSetFormatToBaseStreamFormat,
-    WINBOOL fWriteToBaseStream);
-void __RPC_STUB ISpStreamFormatConverter_SetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_GetBaseStream_Proxy(
-    ISpStreamFormatConverter* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpStreamFormatConverter_GetBaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_SetFormat_Proxy(
-    ISpStreamFormatConverter* This,
-    REFGUID rguidFormatIdOfConvertedStream,
-    const WAVEFORMATEX *pWaveFormatExOfConvertedStream);
-void __RPC_STUB ISpStreamFormatConverter_SetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ResetSeekPosition_Proxy(
-    ISpStreamFormatConverter* This);
-void __RPC_STUB ISpStreamFormatConverter_ResetSeekPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Proxy(
-    ISpStreamFormatConverter* This,
-    ULONGLONG ullOffsetConvertedStream,
-    ULONGLONG *pullOffsetBaseStream);
-void __RPC_STUB ISpStreamFormatConverter_ScaleConvertedToBaseOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Proxy(
-    ISpStreamFormatConverter* This,
-    ULONGLONG ullOffsetBaseStream,
-    ULONGLONG *pullOffsetConvertedStream);
-void __RPC_STUB ISpStreamFormatConverter_ScaleBaseToConvertedOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpStreamFormatConverter_INTERFACE_DEFINED__ */
 
@@ -5117,130 +4975,131 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpAudio* This,
+        ISpAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpAudio* This,
+        ISpAudio *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpAudio* This,
+        ISpAudio *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpAudio* This,
+        ISpAudio *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpAudio* This,
+        ISpAudio *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpAudio* This,
+        ISpAudio *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpAudio* This,
+        ISpAudio *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpAudio* This,
+        ISpAudio *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOSTATE NewState,
         ULONGLONG ullReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         REFGUID rguidFmtId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferInfo)(
-        ISpAudio* This,
+        ISpAudio *This,
         const SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferInfo)(
-        ISpAudio* This,
+        ISpAudio *This,
         SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)(
-        ISpAudio* This,
+        ISpAudio *This,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     HANDLE (STDMETHODCALLTYPE *EventHandle)(
-        ISpAudio* This);
+        ISpAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG *pLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG Level);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)(
-        ISpAudio* This,
+        ISpAudio *This,
         ULONG cbSize);
 
     END_INTERFACE
 } ISpAudioVtbl;
+
 interface ISpAudio {
     CONST_VTBL ISpAudioVtbl* lpVtbl;
 };
@@ -5367,96 +5226,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpAudio_SetState_Proxy(
-    ISpAudio* This,
-    SPAUDIOSTATE NewState,
-    ULONGLONG ullReserved);
-void __RPC_STUB ISpAudio_SetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetFormat_Proxy(
-    ISpAudio* This,
-    REFGUID rguidFmtId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpAudio_SetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetStatus_Proxy(
-    ISpAudio* This,
-    SPAUDIOSTATUS *pStatus);
-void __RPC_STUB ISpAudio_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferInfo_Proxy(
-    ISpAudio* This,
-    const SPAUDIOBUFFERINFO *pBuffInfo);
-void __RPC_STUB ISpAudio_SetBufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferInfo_Proxy(
-    ISpAudio* This,
-    SPAUDIOBUFFERINFO *pBuffInfo);
-void __RPC_STUB ISpAudio_GetBufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetDefaultFormat_Proxy(
-    ISpAudio* This,
-    GUID *pFormatId,
-    WAVEFORMATEX **ppCoMemWaveFormatEx);
-void __RPC_STUB ISpAudio_GetDefaultFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HANDLE STDMETHODCALLTYPE ISpAudio_EventHandle_Proxy(
-    ISpAudio* This);
-void __RPC_STUB ISpAudio_EventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetVolumeLevel_Proxy(
-    ISpAudio* This,
-    ULONG *pLevel);
-void __RPC_STUB ISpAudio_GetVolumeLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetVolumeLevel_Proxy(
-    ISpAudio* This,
-    ULONG Level);
-void __RPC_STUB ISpAudio_SetVolumeLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_GetBufferNotifySize_Proxy(
-    ISpAudio* This,
-    ULONG *pcbSize);
-void __RPC_STUB ISpAudio_GetBufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpAudio_SetBufferNotifySize_Proxy(
-    ISpAudio* This,
-    ULONG cbSize);
-void __RPC_STUB ISpAudio_SetBufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpAudio_INTERFACE_DEFINED__ */
 
@@ -5496,151 +5265,152 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         IStream **ppstm);
 
     /*** ISpStreamFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         GUID *pguidFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     /*** ISpAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOSTATE NewState,
         ULONGLONG ullReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         REFGUID rguidFmtId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferInfo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         const SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferInfo)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         SPAUDIOBUFFERINFO *pBuffInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFormat)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWaveFormatEx);
 
     HANDLE (STDMETHODCALLTYPE *EventHandle)(
-        ISpMMSysAudio* This);
+        ISpMMSysAudio *This);
 
     HRESULT (STDMETHODCALLTYPE *GetVolumeLevel)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG *pLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetVolumeLevel)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG Level);
 
     HRESULT (STDMETHODCALLTYPE *GetBufferNotifySize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *SetBufferNotifySize)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         ULONG cbSize);
 
     /*** ISpMMSysAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDeviceId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT *puDeviceId);
 
     HRESULT (STDMETHODCALLTYPE *SetDeviceId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT uDeviceId);
 
     HRESULT (STDMETHODCALLTYPE *GetMMHandle)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         void **pHandle);
 
     HRESULT (STDMETHODCALLTYPE *GetLineId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT *puLineId);
 
     HRESULT (STDMETHODCALLTYPE *SetLineId)(
-        ISpMMSysAudio* This,
+        ISpMMSysAudio *This,
         UINT uLineId);
 
     END_INTERFACE
 } ISpMMSysAudioVtbl;
+
 interface ISpMMSysAudio {
     CONST_VTBL ISpMMSysAudioVtbl* lpVtbl;
 };
@@ -5789,46 +5559,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetDeviceId_Proxy(
-    ISpMMSysAudio* This,
-    UINT *puDeviceId);
-void __RPC_STUB ISpMMSysAudio_GetDeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetDeviceId_Proxy(
-    ISpMMSysAudio* This,
-    UINT uDeviceId);
-void __RPC_STUB ISpMMSysAudio_SetDeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetMMHandle_Proxy(
-    ISpMMSysAudio* This,
-    void **pHandle);
-void __RPC_STUB ISpMMSysAudio_GetMMHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_GetLineId_Proxy(
-    ISpMMSysAudio* This,
-    UINT *puLineId);
-void __RPC_STUB ISpMMSysAudio_GetLineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpMMSysAudio_SetLineId_Proxy(
-    ISpMMSysAudio* This,
-    UINT uLineId);
-void __RPC_STUB ISpMMSysAudio_SetLineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpMMSysAudio_INTERFACE_DEFINED__ */
 
@@ -5859,27 +5589,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpTranscript* This);
+        ISpTranscript *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpTranscript* This);
+        ISpTranscript *This);
 
     /*** ISpTranscript methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTranscript)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         LPWSTR *ppszTranscript);
 
     HRESULT (STDMETHODCALLTYPE *AppendTranscript)(
-        ISpTranscript* This,
+        ISpTranscript *This,
         LPCWSTR pszTranscript);
 
     END_INTERFACE
 } ISpTranscriptVtbl;
+
 interface ISpTranscript {
     CONST_VTBL ISpTranscriptVtbl* lpVtbl;
 };
@@ -5916,22 +5647,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpTranscript_GetTranscript_Proxy(
-    ISpTranscript* This,
-    LPWSTR *ppszTranscript);
-void __RPC_STUB ISpTranscript_GetTranscript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpTranscript_AppendTranscript_Proxy(
-    ISpTranscript* This,
-    LPCWSTR pszTranscript);
-void __RPC_STUB ISpTranscript_AppendTranscript_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpTranscript_INTERFACE_DEFINED__ */
 
@@ -5966,7 +5681,6 @@
     float SREngineConfidence;
     signed char Confidence;
 };
-
 struct SPPHRASEPROPERTY {
     LPCWSTR pszName;
     __C89_NAMELESS union {
@@ -5986,7 +5700,6 @@
     float SREngineConfidence;
     signed char Confidence;
 };
-
 typedef struct SPPHRASEREPLACEMENT {
     BYTE bDisplayAttributes;
     LPCWSTR pszReplacementText;
@@ -6172,50 +5885,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpLexicon* This);
+        ISpLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpLexicon* This);
+        ISpLexicon *This);
 
     /*** ISpLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         DWORD dwFlags,
         SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpLexicon* This,
+        ISpLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
@@ -6223,6 +5936,7 @@
 
     END_INTERFACE
 } ISpLexiconVtbl;
+
 interface ISpLexicon {
     CONST_VTBL ISpLexiconVtbl* lpVtbl;
 };
@@ -6275,68 +5989,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetPronunciations_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    DWORD dwFlags,
-    SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
-void __RPC_STUB ISpLexicon_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_AddPronunciation_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    SPPARTOFSPEECH ePartOfSpeech,
-    PCSPPHONEID pszPronunciation);
-void __RPC_STUB ISpLexicon_AddPronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_RemovePronunciation_Proxy(
-    ISpLexicon* This,
-    LPCWSTR pszWord,
-    WORD LangID,
-    SPPARTOFSPEECH ePartOfSpeech,
-    PCSPPHONEID pszPronunciation);
-void __RPC_STUB ISpLexicon_RemovePronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetGeneration_Proxy(
-    ISpLexicon* This,
-    DWORD *pdwGeneration);
-void __RPC_STUB ISpLexicon_GetGeneration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetGenerationChange_Proxy(
-    ISpLexicon* This,
-    DWORD dwFlags,
-    DWORD *pdwGeneration,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpLexicon_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpLexicon_GetWords_Proxy(
-    ISpLexicon* This,
-    DWORD dwFlags,
-    DWORD *pdwGeneration,
-    DWORD *pdwCookie,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpLexicon_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpLexicon_INTERFACE_DEFINED__ */
 
@@ -6365,50 +6017,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpContainerLexicon* This);
+        ISpContainerLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpContainerLexicon* This);
+        ISpContainerLexicon *This);
 
     /*** ISpLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         DWORD dwFlags,
         SPWORDPRONUNCIATIONLIST *pWordPronunciationList);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         LPCWSTR pszWord,
         WORD LangID,
         SPPARTOFSPEECH ePartOfSpeech,
         PCSPPHONEID pszPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         DWORD dwFlags,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
@@ -6416,12 +6068,13 @@
 
     /*** ISpContainerLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *AddLexicon)(
-        ISpContainerLexicon* This,
+        ISpContainerLexicon *This,
         ISpLexicon *pAddLexicon,
         DWORD dwFlags);
 
     END_INTERFACE
 } ISpContainerLexiconVtbl;
+
 interface ISpContainerLexicon {
     CONST_VTBL ISpContainerLexiconVtbl* lpVtbl;
 };
@@ -6480,15 +6133,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpContainerLexicon_AddLexicon_Proxy(
-    ISpContainerLexicon* This,
-    ISpLexicon *pAddLexicon,
-    DWORD dwFlags);
-void __RPC_STUB ISpContainerLexicon_AddLexicon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpContainerLexicon_INTERFACE_DEFINED__ */
 
@@ -6562,64 +6206,65 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpShortcut* This);
+        ISpShortcut *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpShortcut* This);
+        ISpShortcut *This);
 
     /*** ISpShortcut methods ***/
     HRESULT (STDMETHODCALLTYPE *AddShortcut)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         LPCWSTR pszDisplay,
         WORD LangID,
         LPCWSTR pszSpoken,
         SPSHORTCUTTYPE shType);
 
     HRESULT (STDMETHODCALLTYPE *RemoveShortcut)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         LPCWSTR pszDisplay,
         WORD LangID,
         LPCWSTR pszSpoken,
         SPSHORTCUTTYPE shType);
 
     HRESULT (STDMETHODCALLTYPE *GetShortcuts)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         WORD LangID,
         SPSHORTCUTPAIRLIST *pShortcutpairList);
 
     HRESULT (STDMETHODCALLTYPE *GetGeneration)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration);
 
     HRESULT (STDMETHODCALLTYPE *GetWordsFromGenerationChange)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
         SPWORDLIST *pWordList);
 
     HRESULT (STDMETHODCALLTYPE *GetShortcutsForGeneration)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         DWORD *pdwCookie,
         SPSHORTCUTPAIRLIST *pShortcutpairList);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpShortcut* This,
+        ISpShortcut *This,
         DWORD *pdwGeneration,
         SPSHORTCUTPAIRLIST *pShortcutpairList);
 
     END_INTERFACE
 } ISpShortcutVtbl;
+
 interface ISpShortcut {
     CONST_VTBL ISpShortcutVtbl* lpVtbl;
 };
@@ -6680,83 +6325,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpShortcut_AddShortcut_Proxy(
-    ISpShortcut* This,
-    LPCWSTR pszDisplay,
-    WORD LangID,
-    LPCWSTR pszSpoken,
-    SPSHORTCUTTYPE shType);
-void __RPC_STUB ISpShortcut_AddShortcut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_RemoveShortcut_Proxy(
-    ISpShortcut* This,
-    LPCWSTR pszDisplay,
-    WORD LangID,
-    LPCWSTR pszSpoken,
-    SPSHORTCUTTYPE shType);
-void __RPC_STUB ISpShortcut_RemoveShortcut_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcuts_Proxy(
-    ISpShortcut* This,
-    WORD LangID,
-    SPSHORTCUTPAIRLIST *pShortcutpairList);
-void __RPC_STUB ISpShortcut_GetShortcuts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetGeneration_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration);
-void __RPC_STUB ISpShortcut_GetGeneration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetWordsFromGenerationChange_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpShortcut_GetWordsFromGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetWords_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    DWORD *pdwCookie,
-    SPWORDLIST *pWordList);
-void __RPC_STUB ISpShortcut_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetShortcutsForGeneration_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    DWORD *pdwCookie,
-    SPSHORTCUTPAIRLIST *pShortcutpairList);
-void __RPC_STUB ISpShortcut_GetShortcutsForGeneration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpShortcut_GetGenerationChange_Proxy(
-    ISpShortcut* This,
-    DWORD *pdwGeneration,
-    SPSHORTCUTPAIRLIST *pShortcutpairList);
-void __RPC_STUB ISpShortcut_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpShortcut_INTERFACE_DEFINED__ */
 
@@ -6789,38 +6357,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhoneConverter* This);
+        ISpPhoneConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhoneConverter* This);
+        ISpPhoneConverter *This);
 
     /*** ISpObjectWithToken methods ***/
     HRESULT (STDMETHODCALLTYPE *SetObjectToken)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectToken)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         ISpObjectToken **ppToken);
 
     /*** ISpPhoneConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *PhoneToId)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         LPCWSTR pszPhone,
         SPPHONEID *pId);
 
     HRESULT (STDMETHODCALLTYPE *IdToPhone)(
-        ISpPhoneConverter* This,
+        ISpPhoneConverter *This,
         PCSPPHONEID pId,
         WCHAR *pszPhone);
 
     END_INTERFACE
 } ISpPhoneConverterVtbl;
+
 interface ISpPhoneConverter {
     CONST_VTBL ISpPhoneConverterVtbl* lpVtbl;
 };
@@ -6867,24 +6436,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhoneConverter_PhoneToId_Proxy(
-    ISpPhoneConverter* This,
-    LPCWSTR pszPhone,
-    SPPHONEID *pId);
-void __RPC_STUB ISpPhoneConverter_PhoneToId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneConverter_IdToPhone_Proxy(
-    ISpPhoneConverter* This,
-    PCSPPHONEID pId,
-    WCHAR *pszPhone);
-void __RPC_STUB ISpPhoneConverter_IdToPhone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhoneConverter_INTERFACE_DEFINED__ */
 
@@ -6930,45 +6481,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhoneticAlphabetConverter* This);
+        ISpPhoneticAlphabetConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhoneticAlphabetConverter* This);
+        ISpPhoneticAlphabetConverter *This);
 
     /*** ISpPhoneticAlphabetConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLangId)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         WORD *pLangID);
 
     HRESULT (STDMETHODCALLTYPE *SetLangId)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         WORD LangID);
 
     HRESULT (STDMETHODCALLTYPE *SAPI2UPS)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         const SPPHONEID *pszSAPIId,
         SPPHONEID *pszUPSId,
         DWORD cMaxLength);
 
     HRESULT (STDMETHODCALLTYPE *UPS2SAPI)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         const SPPHONEID *pszUPSId,
         SPPHONEID *pszSAPIId,
         DWORD cMaxLength);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxConvertLength)(
-        ISpPhoneticAlphabetConverter* This,
+        ISpPhoneticAlphabetConverter *This,
         DWORD cSrcLength,
         WINBOOL bSAPI2UPS,
         DWORD *pcMaxDestLength);
 
     END_INTERFACE
 } ISpPhoneticAlphabetConverterVtbl;
+
 interface ISpPhoneticAlphabetConverter {
     CONST_VTBL ISpPhoneticAlphabetConverterVtbl* lpVtbl;
 };
@@ -7017,52 +6569,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetLangId_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    WORD *pLangID);
-void __RPC_STUB ISpPhoneticAlphabetConverter_GetLangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SetLangId_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    WORD LangID);
-void __RPC_STUB ISpPhoneticAlphabetConverter_SetLangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_SAPI2UPS_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    const SPPHONEID *pszSAPIId,
-    SPPHONEID *pszUPSId,
-    DWORD cMaxLength);
-void __RPC_STUB ISpPhoneticAlphabetConverter_SAPI2UPS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_UPS2SAPI_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    const SPPHONEID *pszUPSId,
-    SPPHONEID *pszSAPIId,
-    DWORD cMaxLength);
-void __RPC_STUB ISpPhoneticAlphabetConverter_UPS2SAPI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetConverter_GetMaxConvertLength_Proxy(
-    ISpPhoneticAlphabetConverter* This,
-    DWORD cSrcLength,
-    WINBOOL bSAPI2UPS,
-    DWORD *pcMaxDestLength);
-void __RPC_STUB ISpPhoneticAlphabetConverter_GetMaxConvertLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhoneticAlphabetConverter_INTERFACE_DEFINED__ */
 
@@ -7093,27 +6599,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhoneticAlphabetSelection* This,
+        ISpPhoneticAlphabetSelection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhoneticAlphabetSelection* This);
+        ISpPhoneticAlphabetSelection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhoneticAlphabetSelection* This);
+        ISpPhoneticAlphabetSelection *This);
 
     /*** ISpPhoneticAlphabetSelection methods ***/
     HRESULT (STDMETHODCALLTYPE *IsAlphabetUPS)(
-        ISpPhoneticAlphabetSelection* This,
+        ISpPhoneticAlphabetSelection *This,
         WINBOOL *pfIsUPS);
 
     HRESULT (STDMETHODCALLTYPE *SetAlphabetToUPS)(
-        ISpPhoneticAlphabetSelection* This,
+        ISpPhoneticAlphabetSelection *This,
         WINBOOL fForceUPS);
 
     END_INTERFACE
 } ISpPhoneticAlphabetSelectionVtbl;
+
 interface ISpPhoneticAlphabetSelection {
     CONST_VTBL ISpPhoneticAlphabetSelectionVtbl* lpVtbl;
 };
@@ -7150,22 +6657,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_IsAlphabetUPS_Proxy(
-    ISpPhoneticAlphabetSelection* This,
-    WINBOOL *pfIsUPS);
-void __RPC_STUB ISpPhoneticAlphabetSelection_IsAlphabetUPS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Proxy(
-    ISpPhoneticAlphabetSelection* This,
-    WINBOOL fForceUPS);
-void __RPC_STUB ISpPhoneticAlphabetSelection_SetAlphabetToUPS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhoneticAlphabetSelection_INTERFACE_DEFINED__ */
 
@@ -7334,173 +6825,173 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpVoice* This,
+        ISpVoice *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpVoice* This,
+        ISpVoice *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpVoice* This,
+        ISpVoice *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpVoice methods ***/
     HRESULT (STDMETHODCALLTYPE *SetOutput)(
-        ISpVoice* This,
+        ISpVoice *This,
         IUnknown *pUnkOutput,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputObjectToken)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken **ppObjectToken);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStream)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *SetVoice)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *GetVoice)(
-        ISpVoice* This,
+        ISpVoice *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *Speak)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pwcs,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SpeakStream)(
-        ISpVoice* This,
+        ISpVoice *This,
         IStream *pStream,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVOICESTATUS *pStatus,
         LPWSTR *ppszLastBookmark);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pItemType,
         LONG lNumItems,
         ULONG *pulNumSkipped);
 
     HRESULT (STDMETHODCALLTYPE *SetPriority)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVPRIORITY ePriority);
 
     HRESULT (STDMETHODCALLTYPE *GetPriority)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPVPRIORITY *pePriority);
 
     HRESULT (STDMETHODCALLTYPE *SetAlertBoundary)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTENUM eBoundary);
 
     HRESULT (STDMETHODCALLTYPE *GetAlertBoundary)(
-        ISpVoice* This,
+        ISpVoice *This,
         SPEVENTENUM *peBoundary);
 
     HRESULT (STDMETHODCALLTYPE *SetRate)(
-        ISpVoice* This,
+        ISpVoice *This,
         LONG RateAdjust);
 
     HRESULT (STDMETHODCALLTYPE *GetRate)(
-        ISpVoice* This,
+        ISpVoice *This,
         LONG *pRateAdjust);
 
     HRESULT (STDMETHODCALLTYPE *SetVolume)(
-        ISpVoice* This,
+        ISpVoice *This,
         USHORT usVolume);
 
     HRESULT (STDMETHODCALLTYPE *GetVolume)(
-        ISpVoice* This,
+        ISpVoice *This,
         USHORT *pusVolume);
 
     HRESULT (STDMETHODCALLTYPE *WaitUntilDone)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncSpeakTimeout)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *GetSyncSpeakTimeout)(
-        ISpVoice* This,
+        ISpVoice *This,
         ULONG *pmsTimeout);
 
     HANDLE (STDMETHODCALLTYPE *SpeakCompleteEvent)(
-        ISpVoice* This);
+        ISpVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpVoice* This,
+        ISpVoice *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpVoice* This,
+        ISpVoice *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -7509,6 +7000,7 @@
 
     END_INTERFACE
 } ISpVoiceVtbl;
+
 interface ISpVoice {
     CONST_VTBL ISpVoiceVtbl* lpVtbl;
 };
@@ -7681,188 +7173,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpVoice_SetOutput_Proxy(
-    ISpVoice* This,
-    IUnknown *pUnkOutput,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpVoice_SetOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputObjectToken_Proxy(
-    ISpVoice* This,
-    ISpObjectToken **ppObjectToken);
-void __RPC_STUB ISpVoice_GetOutputObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetOutputStream_Proxy(
-    ISpVoice* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpVoice_GetOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Pause_Proxy(
-    ISpVoice* This);
-void __RPC_STUB ISpVoice_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Resume_Proxy(
-    ISpVoice* This);
-void __RPC_STUB ISpVoice_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetVoice_Proxy(
-    ISpVoice* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpVoice_SetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetVoice_Proxy(
-    ISpVoice* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpVoice_GetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Speak_Proxy(
-    ISpVoice* This,
-    LPCWSTR pwcs,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpVoice_Speak_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SpeakStream_Proxy(
-    ISpVoice* This,
-    IStream *pStream,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpVoice_SpeakStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetStatus_Proxy(
-    ISpVoice* This,
-    SPVOICESTATUS *pStatus,
-    LPWSTR *ppszLastBookmark);
-void __RPC_STUB ISpVoice_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_Skip_Proxy(
-    ISpVoice* This,
-    LPCWSTR pItemType,
-    LONG lNumItems,
-    ULONG *pulNumSkipped);
-void __RPC_STUB ISpVoice_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetPriority_Proxy(
-    ISpVoice* This,
-    SPVPRIORITY ePriority);
-void __RPC_STUB ISpVoice_SetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetPriority_Proxy(
-    ISpVoice* This,
-    SPVPRIORITY *pePriority);
-void __RPC_STUB ISpVoice_GetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetAlertBoundary_Proxy(
-    ISpVoice* This,
-    SPEVENTENUM eBoundary);
-void __RPC_STUB ISpVoice_SetAlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetAlertBoundary_Proxy(
-    ISpVoice* This,
-    SPEVENTENUM *peBoundary);
-void __RPC_STUB ISpVoice_GetAlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetRate_Proxy(
-    ISpVoice* This,
-    LONG RateAdjust);
-void __RPC_STUB ISpVoice_SetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetRate_Proxy(
-    ISpVoice* This,
-    LONG *pRateAdjust);
-void __RPC_STUB ISpVoice_GetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetVolume_Proxy(
-    ISpVoice* This,
-    USHORT usVolume);
-void __RPC_STUB ISpVoice_SetVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetVolume_Proxy(
-    ISpVoice* This,
-    USHORT *pusVolume);
-void __RPC_STUB ISpVoice_GetVolume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_WaitUntilDone_Proxy(
-    ISpVoice* This,
-    ULONG msTimeout);
-void __RPC_STUB ISpVoice_WaitUntilDone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_SetSyncSpeakTimeout_Proxy(
-    ISpVoice* This,
-    ULONG msTimeout);
-void __RPC_STUB ISpVoice_SetSyncSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpVoice_GetSyncSpeakTimeout_Proxy(
-    ISpVoice* This,
-    ULONG *pmsTimeout);
-void __RPC_STUB ISpVoice_GetSyncSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpVoice_INTERFACE_DEFINED__ */
 
@@ -7903,27 +7213,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhrase* This);
+        ISpPhrase *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhrase* This);
+        ISpPhrase *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -7931,11 +7241,12 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhrase* This,
+        ISpPhrase *This,
         DWORD dwValueTypes);
 
     END_INTERFACE
 } ISpPhraseVtbl;
+
 interface ISpPhrase {
     CONST_VTBL ISpPhraseVtbl* lpVtbl;
 };
@@ -7980,42 +7291,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetPhrase_Proxy(
-    ISpPhrase* This,
-    SPPHRASE **ppCoMemPhrase);
-void __RPC_STUB ISpPhrase_GetPhrase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetSerializedPhrase_Proxy(
-    ISpPhrase* This,
-    SPSERIALIZEDPHRASE **ppCoMemPhrase);
-void __RPC_STUB ISpPhrase_GetSerializedPhrase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_GetText_Proxy(
-    ISpPhrase* This,
-    ULONG ulStart,
-    ULONG ulCount,
-    WINBOOL fUseTextReplacements,
-    LPWSTR *ppszCoMemText,
-    BYTE *pbDisplayAttributes);
-void __RPC_STUB ISpPhrase_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase_Discard_Proxy(
-    ISpPhrase* This,
-    DWORD dwValueTypes);
-void __RPC_STUB ISpPhrase_Discard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhrase_INTERFACE_DEFINED__ */
 
@@ -8049,27 +7324,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8077,22 +7352,23 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         DWORD dwValueTypes);
 
     /*** ISpPhraseAlt methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAltInfo)(
-        ISpPhraseAlt* This,
+        ISpPhraseAlt *This,
         ISpPhrase **ppParent,
         ULONG *pulStartElementInParent,
         ULONG *pcElementsInParent,
         ULONG *pcElementsInAlt);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpPhraseAlt* This);
+        ISpPhraseAlt *This);
 
     END_INTERFACE
 } ISpPhraseAltVtbl;
+
 interface ISpPhraseAlt {
     CONST_VTBL ISpPhraseAltVtbl* lpVtbl;
 };
@@ -8147,24 +7423,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhraseAlt_GetAltInfo_Proxy(
-    ISpPhraseAlt* This,
-    ISpPhrase **ppParent,
-    ULONG *pulStartElementInParent,
-    ULONG *pcElementsInParent,
-    ULONG *pcElementsInAlt);
-void __RPC_STUB ISpPhraseAlt_GetAltInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhraseAlt_Commit_Proxy(
-    ISpPhraseAlt* This);
-void __RPC_STUB ISpPhraseAlt_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhraseAlt_INTERFACE_DEFINED__ */
 
@@ -8205,27 +7463,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpPhrase2* This);
+        ISpPhrase2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpPhrase2* This);
+        ISpPhrase2 *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8233,27 +7491,28 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         DWORD dwValueTypes);
 
     /*** ISpPhrase2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         LPWSTR *ppszCoMemXMLResult,
         SPXMLRESULTOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         SPSEMANTICERRORINFO *pSemanticErrorInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpPhrase2* This,
+        ISpPhrase2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     END_INTERFACE
 } ISpPhrase2Vtbl;
+
 interface ISpPhrase2 {
     CONST_VTBL ISpPhrase2Vtbl* lpVtbl;
 };
@@ -8312,33 +7571,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLResult_Proxy(
-    ISpPhrase2* This,
-    LPWSTR *ppszCoMemXMLResult,
-    SPXMLRESULTOPTIONS Options);
-void __RPC_STUB ISpPhrase2_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase2_GetXMLErrorInfo_Proxy(
-    ISpPhrase2* This,
-    SPSEMANTICERRORINFO *pSemanticErrorInfo);
-void __RPC_STUB ISpPhrase2_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpPhrase2_GetAudio_Proxy(
-    ISpPhrase2* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpPhrase2_GetAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpPhrase2_INTERFACE_DEFINED__ */
 
@@ -8403,27 +7635,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoResult* This);
+        ISpRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoResult* This);
+        ISpRecoResult *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8431,16 +7663,16 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         DWORD dwValueTypes);
 
     /*** ISpRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultTimes)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPRECORESULTTIMES *pTimes);
 
     HRESULT (STDMETHODCALLTYPE *GetAlternates)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ULONG ulRequestCount,
@@ -8448,33 +7680,34 @@
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         SPSERIALIZEDRESULT **ppCoMemSerializedResult);
 
     HRESULT (STDMETHODCALLTYPE *ScaleAudio)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoResult* This,
+        ISpRecoResult *This,
         ISpRecoContext **ppRecoContext);
 
     END_INTERFACE
 } ISpRecoResultVtbl;
+
 interface ISpRecoResult {
     CONST_VTBL ISpRecoResultVtbl* lpVtbl;
 };
@@ -8549,72 +7782,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetResultTimes_Proxy(
-    ISpRecoResult* This,
-    SPRECORESULTTIMES *pTimes);
-void __RPC_STUB ISpRecoResult_GetResultTimes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAlternates_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ULONG ulRequestCount,
-    ISpPhraseAlt **ppPhrases,
-    ULONG *pcPhrasesReturned);
-void __RPC_STUB ISpRecoResult_GetAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetAudio_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpRecoResult_GetAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_SpeakAudio_Proxy(
-    ISpRecoResult* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    DWORD dwFlags,
-    ULONG *pulStreamNumber);
-void __RPC_STUB ISpRecoResult_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_Serialize_Proxy(
-    ISpRecoResult* This,
-    SPSERIALIZEDRESULT **ppCoMemSerializedResult);
-void __RPC_STUB ISpRecoResult_Serialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_ScaleAudio_Proxy(
-    ISpRecoResult* This,
-    const GUID *pAudioFormatId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpRecoResult_ScaleAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult_GetRecoContext_Proxy(
-    ISpRecoResult* This,
-    ISpRecoContext **ppRecoContext);
-void __RPC_STUB ISpRecoResult_GetRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoResult_INTERFACE_DEFINED__ */
 
@@ -8658,27 +7825,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoResult2* This);
+        ISpRecoResult2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoResult2* This);
+        ISpRecoResult2 *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8686,16 +7853,16 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         DWORD dwValueTypes);
 
     /*** ISpRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultTimes)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPRECORESULTTIMES *pTimes);
 
     HRESULT (STDMETHODCALLTYPE *GetAlternates)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         ULONG ulRequestCount,
@@ -8703,51 +7870,52 @@
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         SPSERIALIZEDRESULT **ppCoMemSerializedResult);
 
     HRESULT (STDMETHODCALLTYPE *ScaleAudio)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ISpRecoContext **ppRecoContext);
 
     /*** ISpRecoResult2 methods ***/
     HRESULT (STDMETHODCALLTYPE *CommitAlternate)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ISpPhraseAlt *pPhraseAlt,
         ISpRecoResult **ppNewResult);
 
     HRESULT (STDMETHODCALLTYPE *CommitText)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         ULONG ulStartElement,
         ULONG cElements,
         LPCWSTR pszCorrectedData,
         DWORD eCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetTextFeedback)(
-        ISpRecoResult2* This,
+        ISpRecoResult2 *This,
         LPCWSTR pszFeedback,
         WINBOOL fSuccessful);
 
     END_INTERFACE
 } ISpRecoResult2Vtbl;
+
 interface ISpRecoResult2 {
     CONST_VTBL ISpRecoResult2Vtbl* lpVtbl;
 };
@@ -8836,35 +8004,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitAlternate_Proxy(
-    ISpRecoResult2* This,
-    ISpPhraseAlt *pPhraseAlt,
-    ISpRecoResult **ppNewResult);
-void __RPC_STUB ISpRecoResult2_CommitAlternate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult2_CommitText_Proxy(
-    ISpRecoResult2* This,
-    ULONG ulStartElement,
-    ULONG cElements,
-    LPCWSTR pszCorrectedData,
-    DWORD eCommitFlags);
-void __RPC_STUB ISpRecoResult2_CommitText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoResult2_SetTextFeedback_Proxy(
-    ISpRecoResult2* This,
-    LPCWSTR pszFeedback,
-    WINBOOL fSuccessful);
-void __RPC_STUB ISpRecoResult2_SetTextFeedback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoResult2_INTERFACE_DEFINED__ */
 
@@ -8896,27 +8035,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpXMLRecoResult* This);
+        ISpXMLRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpXMLRecoResult* This);
+        ISpXMLRecoResult *This);
 
     /*** ISpPhrase methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPhrase)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetSerializedPhrase)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPSERIALIZEDPHRASE **ppCoMemPhrase);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStart,
         ULONG ulCount,
         WINBOOL fUseTextReplacements,
@@ -8924,16 +8063,16 @@
         BYTE *pbDisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         DWORD dwValueTypes);
 
     /*** ISpRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultTimes)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPRECORESULTTIMES *pTimes);
 
     HRESULT (STDMETHODCALLTYPE *GetAlternates)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ULONG ulRequestCount,
@@ -8941,43 +8080,44 @@
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *GetAudio)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ULONG ulStartElement,
         ULONG cElements,
         DWORD dwFlags,
         ULONG *pulStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPSERIALIZEDRESULT **ppCoMemSerializedResult);
 
     HRESULT (STDMETHODCALLTYPE *ScaleAudio)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         ISpRecoContext **ppRecoContext);
 
     /*** ISpXMLRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         LPWSTR *ppszCoMemXMLResult,
         SPXMLRESULTOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpXMLRecoResult* This,
+        ISpXMLRecoResult *This,
         SPSEMANTICERRORINFO *pSemanticErrorInfo);
 
     END_INTERFACE
 } ISpXMLRecoResultVtbl;
+
 interface ISpXMLRecoResult {
     CONST_VTBL ISpXMLRecoResultVtbl* lpVtbl;
 };
@@ -9062,23 +8202,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLResult_Proxy(
-    ISpXMLRecoResult* This,
-    LPWSTR *ppszCoMemXMLResult,
-    SPXMLRESULTOPTIONS Options);
-void __RPC_STUB ISpXMLRecoResult_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpXMLRecoResult_GetXMLErrorInfo_Proxy(
-    ISpXMLRecoResult* This,
-    SPSEMANTICERRORINFO *pSemanticErrorInfo);
-void __RPC_STUB ISpXMLRecoResult_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpXMLRecoResult_INTERFACE_DEFINED__ */
 
@@ -9200,23 +8323,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpGrammarBuilder* This);
+        ISpGrammarBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpGrammarBuilder* This);
+        ISpGrammarBuilder *This);
 
     /*** ISpGrammarBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetGrammar)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         WORD NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *GetRule)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         LPCWSTR pszRuleName,
         DWORD dwRuleId,
         DWORD dwAttributes,
@@ -9224,16 +8347,16 @@
         SPSTATEHANDLE *phInitialState);
 
     HRESULT (STDMETHODCALLTYPE *ClearRule)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hState);
 
     HRESULT (STDMETHODCALLTYPE *CreateNewState)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hState,
         SPSTATEHANDLE *phState);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
@@ -9243,7 +8366,7 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         SPSTATEHANDLE hRule,
@@ -9251,17 +8374,18 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         SPSTATEHANDLE hRuleState,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpGrammarBuilder* This,
+        ISpGrammarBuilder *This,
         DWORD dwReserved);
 
     END_INTERFACE
 } ISpGrammarBuilderVtbl;
+
 interface ISpGrammarBuilder {
     CONST_VTBL ISpGrammarBuilderVtbl* lpVtbl;
 };
@@ -9322,87 +8446,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ResetGrammar_Proxy(
-    ISpGrammarBuilder* This,
-    WORD NewLanguage);
-void __RPC_STUB ISpGrammarBuilder_ResetGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_GetRule_Proxy(
-    ISpGrammarBuilder* This,
-    LPCWSTR pszRuleName,
-    DWORD dwRuleId,
-    DWORD dwAttributes,
-    WINBOOL fCreateIfNotExist,
-    SPSTATEHANDLE *phInitialState);
-void __RPC_STUB ISpGrammarBuilder_GetRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_ClearRule_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hState);
-void __RPC_STUB ISpGrammarBuilder_ClearRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_CreateNewState_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hState,
-    SPSTATEHANDLE *phState);
-void __RPC_STUB ISpGrammarBuilder_CreateNewState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddWordTransition_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    LPCWSTR psz,
-    LPCWSTR pszSeparators,
-    SPGRAMMARWORDTYPE eWordType,
-    float Weight,
-    const SPPROPERTYINFO *pPropInfo);
-void __RPC_STUB ISpGrammarBuilder_AddWordTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddRuleTransition_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    SPSTATEHANDLE hRule,
-    float Weight,
-    const SPPROPERTYINFO *pPropInfo);
-void __RPC_STUB ISpGrammarBuilder_AddRuleTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_AddResource_Proxy(
-    ISpGrammarBuilder* This,
-    SPSTATEHANDLE hRuleState,
-    LPCWSTR pszResourceName,
-    LPCWSTR pszResourceValue);
-void __RPC_STUB ISpGrammarBuilder_AddResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder_Commit_Proxy(
-    ISpGrammarBuilder* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpGrammarBuilder_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpGrammarBuilder_INTERFACE_DEFINED__ */
 
@@ -9505,23 +8548,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     /*** ISpGrammarBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *ResetGrammar)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         WORD NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *GetRule)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszRuleName,
         DWORD dwRuleId,
         DWORD dwAttributes,
@@ -9529,16 +8572,16 @@
         SPSTATEHANDLE *phInitialState);
 
     HRESULT (STDMETHODCALLTYPE *ClearRule)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hState);
 
     HRESULT (STDMETHODCALLTYPE *CreateNewState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hState,
         SPSTATEHANDLE *phState);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
@@ -9548,7 +8591,7 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         SPSTATEHANDLE hRule,
@@ -9556,37 +8599,37 @@
         const SPPROPERTYINFO *pPropInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPSTATEHANDLE hRuleState,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         DWORD dwReserved);
 
     /*** ISpRecoGrammar methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGrammarId)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ULONGLONG *pullGrammarId);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoContext)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ISpRecoContext **ppRecoCtxt);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszFileName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromObject)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFCLSID rcid,
         LPCWSTR pszGrammarName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromResource)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         HMODULE hModule,
         LPCWSTR pszResourceName,
         LPCWSTR pszResourceType,
@@ -9594,12 +8637,12 @@
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const SPBINARYGRAMMAR *pGrammar,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromProprietaryGrammar)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         REFGUID rguidParam,
         LPCWSTR pszStringParam,
         const void *pvDataPrarm,
@@ -9607,58 +8650,59 @@
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszName,
         void *pReserved,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleIdState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         ULONG ulRuleId,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *LoadDictation)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszTopicName,
         SPLOADOPTIONS Options);
 
     HRESULT (STDMETHODCALLTYPE *UnloadDictation)(
-        ISpRecoGrammar* This);
+        ISpRecoGrammar *This);
 
     HRESULT (STDMETHODCALLTYPE *SetDictationState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPRULESTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const WCHAR *pText,
         ULONG cchText,
         const SPTEXTSELECTIONINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetTextSelection)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         const SPTEXTSELECTIONINFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *IsPronounceable)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         LPCWSTR pszWord,
         SPWORDPRONOUNCEABLE *pWordPronounceable);
 
     HRESULT (STDMETHODCALLTYPE *SetGrammarState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPGRAMMARSTATE eGrammarState);
 
     HRESULT (STDMETHODCALLTYPE *SaveCmd)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         IStream *pStream,
         LPWSTR *ppszCoMemErrorText);
 
     HRESULT (STDMETHODCALLTYPE *GetGrammarState)(
-        ISpRecoGrammar* This,
+        ISpRecoGrammar *This,
         SPGRAMMARSTATE *peGrammarState);
 
     END_INTERFACE
 } ISpRecoGrammarVtbl;
+
 interface ISpRecoGrammar {
     CONST_VTBL ISpRecoGrammarVtbl* lpVtbl;
 };
@@ -9793,169 +8837,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarId_Proxy(
-    ISpRecoGrammar* This,
-    ULONGLONG *pullGrammarId);
-void __RPC_STUB ISpRecoGrammar_GetGrammarId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetRecoContext_Proxy(
-    ISpRecoGrammar* This,
-    ISpRecoContext **ppRecoCtxt);
-void __RPC_STUB ISpRecoGrammar_GetRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromFile_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszFileName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromObject_Proxy(
-    ISpRecoGrammar* This,
-    REFCLSID rcid,
-    LPCWSTR pszGrammarName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromResource_Proxy(
-    ISpRecoGrammar* This,
-    HMODULE hModule,
-    LPCWSTR pszResourceName,
-    LPCWSTR pszResourceType,
-    WORD wLanguage,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromMemory_Proxy(
-    ISpRecoGrammar* This,
-    const SPBINARYGRAMMAR *pGrammar,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Proxy(
-    ISpRecoGrammar* This,
-    REFGUID rguidParam,
-    LPCWSTR pszStringParam,
-    const void *pvDataPrarm,
-    ULONG cbDataSize,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadCmdFromProprietaryGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleState_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszName,
-    void *pReserved,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetRuleState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetRuleIdState_Proxy(
-    ISpRecoGrammar* This,
-    ULONG ulRuleId,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetRuleIdState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_LoadDictation_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszTopicName,
-    SPLOADOPTIONS Options);
-void __RPC_STUB ISpRecoGrammar_LoadDictation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_UnloadDictation_Proxy(
-    ISpRecoGrammar* This);
-void __RPC_STUB ISpRecoGrammar_UnloadDictation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetDictationState_Proxy(
-    ISpRecoGrammar* This,
-    SPRULESTATE NewState);
-void __RPC_STUB ISpRecoGrammar_SetDictationState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetWordSequenceData_Proxy(
-    ISpRecoGrammar* This,
-    const WCHAR *pText,
-    ULONG cchText,
-    const SPTEXTSELECTIONINFO *pInfo);
-void __RPC_STUB ISpRecoGrammar_SetWordSequenceData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetTextSelection_Proxy(
-    ISpRecoGrammar* This,
-    const SPTEXTSELECTIONINFO *pInfo);
-void __RPC_STUB ISpRecoGrammar_SetTextSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_IsPronounceable_Proxy(
-    ISpRecoGrammar* This,
-    LPCWSTR pszWord,
-    SPWORDPRONOUNCEABLE *pWordPronounceable);
-void __RPC_STUB ISpRecoGrammar_IsPronounceable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SetGrammarState_Proxy(
-    ISpRecoGrammar* This,
-    SPGRAMMARSTATE eGrammarState);
-void __RPC_STUB ISpRecoGrammar_SetGrammarState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_SaveCmd_Proxy(
-    ISpRecoGrammar* This,
-    IStream *pStream,
-    LPWSTR *ppszCoMemErrorText);
-void __RPC_STUB ISpRecoGrammar_SaveCmd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar_GetGrammarState_Proxy(
-    ISpRecoGrammar* This,
-    SPGRAMMARSTATE *peGrammarState);
-void __RPC_STUB ISpRecoGrammar_GetGrammarState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoGrammar_INTERFACE_DEFINED__ */
 
@@ -10001,30 +8882,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpGrammarBuilder2* This,
+        ISpGrammarBuilder2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpGrammarBuilder2* This);
+        ISpGrammarBuilder2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpGrammarBuilder2* This);
+        ISpGrammarBuilder2 *This);
 
     /*** ISpGrammarBuilder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddTextSubset)(
-        ISpGrammarBuilder2* This,
+        ISpGrammarBuilder2 *This,
         SPSTATEHANDLE hFromState,
         SPSTATEHANDLE hToState,
         LPCWSTR psz,
         SPMATCHINGMODE eMatchMode);
 
     HRESULT (STDMETHODCALLTYPE *SetPhoneticAlphabet)(
-        ISpGrammarBuilder2* This,
+        ISpGrammarBuilder2 *This,
         PHONETICALPHABET phoneticALphabet);
 
     END_INTERFACE
 } ISpGrammarBuilder2Vtbl;
+
 interface ISpGrammarBuilder2 {
     CONST_VTBL ISpGrammarBuilder2Vtbl* lpVtbl;
 };
@@ -10061,25 +8943,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_AddTextSubset_Proxy(
-    ISpGrammarBuilder2* This,
-    SPSTATEHANDLE hFromState,
-    SPSTATEHANDLE hToState,
-    LPCWSTR psz,
-    SPMATCHINGMODE eMatchMode);
-void __RPC_STUB ISpGrammarBuilder2_AddTextSubset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpGrammarBuilder2_SetPhoneticAlphabet_Proxy(
-    ISpGrammarBuilder2* This,
-    PHONETICALPHABET phoneticALphabet);
-void __RPC_STUB ISpGrammarBuilder2_SetPhoneticAlphabet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpGrammarBuilder2_INTERFACE_DEFINED__ */
 
@@ -10140,62 +9003,63 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoGrammar2* This);
+        ISpRecoGrammar2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoGrammar2* This);
+        ISpRecoGrammar2 *This);
 
     /*** ISpRecoGrammar2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRules)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         SPRULE **ppCoMemRules,
         UINT *puNumRules);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromFile2)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         LPCWSTR pszFileName,
         SPLOADOPTIONS Options,
         LPCWSTR pszSharingUri,
         LPCWSTR pszBaseUri);
 
     HRESULT (STDMETHODCALLTYPE *LoadCmdFromMemory2)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         const SPBINARYGRAMMAR *pGrammar,
         SPLOADOPTIONS Options,
         LPCWSTR pszSharingUri,
         LPCWSTR pszBaseUri);
 
     HRESULT (STDMETHODCALLTYPE *SetRulePriority)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         LPCWSTR pszRuleName,
         ULONG ulRuleId,
         int nRulePriority);
 
     HRESULT (STDMETHODCALLTYPE *SetRuleWeight)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         LPCWSTR pszRuleName,
         ULONG ulRuleId,
         float flWeight);
 
     HRESULT (STDMETHODCALLTYPE *SetDictationWeight)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         float flWeight);
 
     HRESULT (STDMETHODCALLTYPE *SetGrammarLoader)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         ISpeechResourceLoader *pLoader);
 
     HRESULT (STDMETHODCALLTYPE *SetSMLSecurityManager)(
-        ISpRecoGrammar2* This,
+        ISpRecoGrammar2 *This,
         IInternetSecurityManager *pSMLSecurityManager);
 
     END_INTERFACE
 } ISpRecoGrammar2Vtbl;
+
 interface ISpRecoGrammar2 {
     CONST_VTBL ISpRecoGrammar2Vtbl* lpVtbl;
 };
@@ -10256,81 +9120,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_GetRules_Proxy(
-    ISpRecoGrammar2* This,
-    SPRULE **ppCoMemRules,
-    UINT *puNumRules);
-void __RPC_STUB ISpRecoGrammar2_GetRules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromFile2_Proxy(
-    ISpRecoGrammar2* This,
-    LPCWSTR pszFileName,
-    SPLOADOPTIONS Options,
-    LPCWSTR pszSharingUri,
-    LPCWSTR pszBaseUri);
-void __RPC_STUB ISpRecoGrammar2_LoadCmdFromFile2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_LoadCmdFromMemory2_Proxy(
-    ISpRecoGrammar2* This,
-    const SPBINARYGRAMMAR *pGrammar,
-    SPLOADOPTIONS Options,
-    LPCWSTR pszSharingUri,
-    LPCWSTR pszBaseUri);
-void __RPC_STUB ISpRecoGrammar2_LoadCmdFromMemory2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRulePriority_Proxy(
-    ISpRecoGrammar2* This,
-    LPCWSTR pszRuleName,
-    ULONG ulRuleId,
-    int nRulePriority);
-void __RPC_STUB ISpRecoGrammar2_SetRulePriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetRuleWeight_Proxy(
-    ISpRecoGrammar2* This,
-    LPCWSTR pszRuleName,
-    ULONG ulRuleId,
-    float flWeight);
-void __RPC_STUB ISpRecoGrammar2_SetRuleWeight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetDictationWeight_Proxy(
-    ISpRecoGrammar2* This,
-    float flWeight);
-void __RPC_STUB ISpRecoGrammar2_SetDictationWeight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetGrammarLoader_Proxy(
-    ISpRecoGrammar2* This,
-    ISpeechResourceLoader *pLoader);
-void __RPC_STUB ISpRecoGrammar2_SetGrammarLoader_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoGrammar2_SetSMLSecurityManager_Proxy(
-    ISpRecoGrammar2* This,
-    IInternetSecurityManager *pSMLSecurityManager);
-void __RPC_STUB ISpRecoGrammar2_SetSMLSecurityManager_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoGrammar2_INTERFACE_DEFINED__ */
 
@@ -10372,29 +9161,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechResourceLoader* This);
+        ISpeechResourceLoader *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechResourceLoader* This);
+        ISpeechResourceLoader *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -10402,7 +9191,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -10414,7 +9203,7 @@
 
     /*** ISpeechResourceLoader methods ***/
     HRESULT (STDMETHODCALLTYPE *LoadResource)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         BSTR bstrResourceUri,
         VARIANT_BOOL fAlwaysReload,
         IUnknown **pStream,
@@ -10423,18 +9212,19 @@
         BSTR *pbstrRedirectUrl);
 
     HRESULT (STDMETHODCALLTYPE *GetLocalCopy)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         BSTR bstrResourceUri,
         BSTR *pbstrLocalPath,
         BSTR *pbstrMIMEType,
         BSTR *pbstrRedirectUrl);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseLocalCopy)(
-        ISpeechResourceLoader* This,
+        ISpeechResourceLoader *This,
         BSTR pbstrLocalPath);
 
     END_INTERFACE
 } ISpeechResourceLoaderVtbl;
+
 interface ISpeechResourceLoader {
     CONST_VTBL ISpeechResourceLoaderVtbl* lpVtbl;
 };
@@ -10493,38 +9283,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_LoadResource_Proxy(
-    ISpeechResourceLoader* This,
-    BSTR bstrResourceUri,
-    VARIANT_BOOL fAlwaysReload,
-    IUnknown **pStream,
-    BSTR *pbstrMIMEType,
-    VARIANT_BOOL *pfModified,
-    BSTR *pbstrRedirectUrl);
-void __RPC_STUB ISpeechResourceLoader_LoadResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_GetLocalCopy_Proxy(
-    ISpeechResourceLoader* This,
-    BSTR bstrResourceUri,
-    BSTR *pbstrLocalPath,
-    BSTR *pbstrMIMEType,
-    BSTR *pbstrRedirectUrl);
-void __RPC_STUB ISpeechResourceLoader_GetLocalCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechResourceLoader_ReleaseLocalCopy_Proxy(
-    ISpeechResourceLoader* This,
-    BSTR pbstrLocalPath);
-void __RPC_STUB ISpeechResourceLoader_ReleaseLocalCopy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechResourceLoader_INTERFACE_DEFINED__ */
 
@@ -10629,151 +9387,152 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     /*** ISpNotifySource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotifySink)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpNotifySink *pNotifySink);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWindowMessage)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         HWND hWnd,
         UINT Msg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackFunction)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPNOTIFYCALLBACK *pfnCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyCallbackInterface)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpNotifyCallback *pSpCallback,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *SetNotifyWin32Event)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNotifyEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwMilliseconds);
 
     HANDLE (STDMETHODCALLTYPE *GetNotifyEventHandle)(
-        ISpRecoContext* This);
+        ISpRecoContext *This);
 
     /*** ISpEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInterest)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullEventInterest,
         ULONGLONG ullQueuedInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetEvents)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG ulCount,
         SPEVENT *pEventArray,
         ULONG *pulFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPEVENTSOURCEINFO *pInfo);
 
     /*** ISpRecoContext methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRecognizer)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpRecognizer **ppRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *CreateGrammar)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullGrammarId,
         ISpRecoGrammar **ppGrammar);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPRECOCONTEXTSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxAlternates)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG *pcAlternates);
 
     HRESULT (STDMETHODCALLTYPE *SetMaxAlternates)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONG cAlternates);
 
     HRESULT (STDMETHODCALLTYPE *SetAudioOptions)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPAUDIOOPTIONS Options,
         const GUID *pAudioFormatId,
         const WAVEFORMATEX *pWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioOptions)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPAUDIOOPTIONS *pOptions,
         GUID *pAudioFormatId,
         WAVEFORMATEX **ppCoMemWFEX);
 
     HRESULT (STDMETHODCALLTYPE *DeserializeResult)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         const SPSERIALIZEDRESULT *pSerializedResult,
         ISpRecoResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *Bookmark)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPBOOKMARKOPTIONS Options,
         ULONGLONG ullStreamPosition,
         LPARAM lparamEvent);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         LPCWSTR pAdaptationData,
         const ULONG cch);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetVoice)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpVoice *pVoice,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetVoice)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ISpVoice **ppVoice);
 
     HRESULT (STDMETHODCALLTYPE *SetVoicePurgeEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG ullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *GetVoicePurgeEvent)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         ULONGLONG *pullEventInterest);
 
     HRESULT (STDMETHODCALLTYPE *SetContextState)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPCONTEXTSTATE eContextState);
 
     HRESULT (STDMETHODCALLTYPE *GetContextState)(
-        ISpRecoContext* This,
+        ISpRecoContext *This,
         SPCONTEXTSTATE *peContextState);
 
     END_INTERFACE
 } ISpRecoContextVtbl;
+
 interface ISpRecoContext {
     CONST_VTBL ISpRecoContextVtbl* lpVtbl;
 };
@@ -10918,160 +9677,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetRecognizer_Proxy(
-    ISpRecoContext* This,
-    ISpRecognizer **ppRecognizer);
-void __RPC_STUB ISpRecoContext_GetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_CreateGrammar_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG ullGrammarId,
-    ISpRecoGrammar **ppGrammar);
-void __RPC_STUB ISpRecoContext_CreateGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetStatus_Proxy(
-    ISpRecoContext* This,
-    SPRECOCONTEXTSTATUS *pStatus);
-void __RPC_STUB ISpRecoContext_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetMaxAlternates_Proxy(
-    ISpRecoContext* This,
-    ULONG *pcAlternates);
-void __RPC_STUB ISpRecoContext_GetMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetMaxAlternates_Proxy(
-    ISpRecoContext* This,
-    ULONG cAlternates);
-void __RPC_STUB ISpRecoContext_SetMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAudioOptions_Proxy(
-    ISpRecoContext* This,
-    SPAUDIOOPTIONS Options,
-    const GUID *pAudioFormatId,
-    const WAVEFORMATEX *pWaveFormatEx);
-void __RPC_STUB ISpRecoContext_SetAudioOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetAudioOptions_Proxy(
-    ISpRecoContext* This,
-    SPAUDIOOPTIONS *pOptions,
-    GUID *pAudioFormatId,
-    WAVEFORMATEX **ppCoMemWFEX);
-void __RPC_STUB ISpRecoContext_GetAudioOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_DeserializeResult_Proxy(
-    ISpRecoContext* This,
-    const SPSERIALIZEDRESULT *pSerializedResult,
-    ISpRecoResult **ppResult);
-void __RPC_STUB ISpRecoContext_DeserializeResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Bookmark_Proxy(
-    ISpRecoContext* This,
-    SPBOOKMARKOPTIONS Options,
-    ULONGLONG ullStreamPosition,
-    LPARAM lparamEvent);
-void __RPC_STUB ISpRecoContext_Bookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetAdaptationData_Proxy(
-    ISpRecoContext* This,
-    LPCWSTR pAdaptationData,
-    const ULONG cch);
-void __RPC_STUB ISpRecoContext_SetAdaptationData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Pause_Proxy(
-    ISpRecoContext* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpRecoContext_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_Resume_Proxy(
-    ISpRecoContext* This,
-    DWORD dwReserved);
-void __RPC_STUB ISpRecoContext_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoice_Proxy(
-    ISpRecoContext* This,
-    ISpVoice *pVoice,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpRecoContext_SetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoice_Proxy(
-    ISpRecoContext* This,
-    ISpVoice **ppVoice);
-void __RPC_STUB ISpRecoContext_GetVoice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetVoicePurgeEvent_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG ullEventInterest);
-void __RPC_STUB ISpRecoContext_SetVoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetVoicePurgeEvent_Proxy(
-    ISpRecoContext* This,
-    ULONGLONG *pullEventInterest);
-void __RPC_STUB ISpRecoContext_GetVoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_SetContextState_Proxy(
-    ISpRecoContext* This,
-    SPCONTEXTSTATE eContextState);
-void __RPC_STUB ISpRecoContext_SetContextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext_GetContextState_Proxy(
-    ISpRecoContext* This,
-    SPCONTEXTSTATE *peContextState);
-void __RPC_STUB ISpRecoContext_GetContextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoContext_INTERFACE_DEFINED__ */
 
@@ -11138,27 +9743,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoContext2* This);
+        ISpRecoContext2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoContext2* This);
+        ISpRecoContext2 *This);
 
     /*** ISpRecoContext2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetGrammarOptions)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         DWORD eGrammarOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetGrammarOptions)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         DWORD *peGrammarOptions);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData2)(
-        ISpRecoContext2* This,
+        ISpRecoContext2 *This,
         LPCWSTR pAdaptationData,
         const ULONG cch,
         LPCWSTR pTopicName,
@@ -11167,6 +9772,7 @@
 
     END_INTERFACE
 } ISpRecoContext2Vtbl;
+
 interface ISpRecoContext2 {
     CONST_VTBL ISpRecoContext2Vtbl* lpVtbl;
 };
@@ -11207,34 +9813,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetGrammarOptions_Proxy(
-    ISpRecoContext2* This,
-    DWORD eGrammarOptions);
-void __RPC_STUB ISpRecoContext2_SetGrammarOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext2_GetGrammarOptions_Proxy(
-    ISpRecoContext2* This,
-    DWORD *peGrammarOptions);
-void __RPC_STUB ISpRecoContext2_GetGrammarOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecoContext2_SetAdaptationData2_Proxy(
-    ISpRecoContext2* This,
-    LPCWSTR pAdaptationData,
-    const ULONG cch,
-    LPCWSTR pTopicName,
-    DWORD eAdaptationSettings,
-    SPADAPTATIONRELEVANCE eRelevance);
-void __RPC_STUB ISpRecoContext2_SetAdaptationData2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoContext2_INTERFACE_DEFINED__ */
 
@@ -11275,39 +9853,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpProperties* This,
+        ISpProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpProperties* This);
+        ISpProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpProperties* This);
+        ISpProperties *This);
 
     /*** ISpProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyNum)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LONG lValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNum)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LONG *plValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LPCWSTR pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpProperties* This,
+        ISpProperties *This,
         LPCWSTR pName,
         LPWSTR *ppCoMemValue);
 
     END_INTERFACE
 } ISpPropertiesVtbl;
+
 interface ISpProperties {
     CONST_VTBL ISpPropertiesVtbl* lpVtbl;
 };
@@ -11352,42 +9931,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyNum_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LONG lValue);
-void __RPC_STUB ISpProperties_SetPropertyNum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyNum_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LONG *plValue);
-void __RPC_STUB ISpProperties_GetPropertyNum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_SetPropertyString_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LPCWSTR pValue);
-void __RPC_STUB ISpProperties_SetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpProperties_GetPropertyString_Proxy(
-    ISpProperties* This,
-    LPCWSTR pName,
-    LPWSTR *ppCoMemValue);
-void __RPC_STUB ISpProperties_GetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpProperties_INTERFACE_DEFINED__ */
 
@@ -11500,101 +10043,101 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     /*** ISpProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPropertyNum)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LONG lValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNum)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LONG *plValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LPCWSTR pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pName,
         LPWSTR *ppCoMemValue);
 
     /*** ISpRecognizer methods ***/
     HRESULT (STDMETHODCALLTYPE *SetRecognizer)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken *pRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *GetRecognizer)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppRecognizer);
 
     HRESULT (STDMETHODCALLTYPE *SetInput)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         IUnknown *pUnkInput,
         WINBOOL fAllowFormatChanges);
 
     HRESULT (STDMETHODCALLTYPE *GetInputObjectToken)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *GetInputStream)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpStreamFormat **ppStream);
 
     HRESULT (STDMETHODCALLTYPE *CreateRecoContext)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpRecoContext **ppNewCtxt);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoProfile)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken **ppToken);
 
     HRESULT (STDMETHODCALLTYPE *SetRecoProfile)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpObjectToken *pToken);
 
     HRESULT (STDMETHODCALLTYPE *IsSharedInstance)(
-        ISpRecognizer* This);
+        ISpRecognizer *This);
 
     HRESULT (STDMETHODCALLTYPE *GetRecoState)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOSTATE *pState);
 
     HRESULT (STDMETHODCALLTYPE *SetRecoState)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOSTATE NewState);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPRECOGNIZERSTATUS *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         SPSTREAMFORMATTYPE WaveFormatType,
         GUID *pFormatId,
         WAVEFORMATEX **ppCoMemWFEX);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         LPCWSTR pszTypeOfUI,
         void *pvExtraData,
         ULONG cbExtraData,
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         HWND hwndParent,
         LPCWSTR pszTitle,
         LPCWSTR pszTypeOfUI,
@@ -11602,11 +10145,12 @@
         ULONG cbExtraData);
 
     HRESULT (STDMETHODCALLTYPE *EmulateRecognition)(
-        ISpRecognizer* This,
+        ISpRecognizer *This,
         ISpPhrase *pPhrase);
 
     END_INTERFACE
 } ISpRecognizerVtbl;
+
 interface ISpRecognizer {
     CONST_VTBL ISpRecognizerVtbl* lpVtbl;
 };
@@ -11717,120 +10261,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecognizer_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken *pRecognizer);
-void __RPC_STUB ISpRecognizer_SetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecognizer_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppRecognizer);
-void __RPC_STUB ISpRecognizer_GetRecognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetInput_Proxy(
-    ISpRecognizer* This,
-    IUnknown *pUnkInput,
-    WINBOOL fAllowFormatChanges);
-void __RPC_STUB ISpRecognizer_SetInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputObjectToken_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpRecognizer_GetInputObjectToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetInputStream_Proxy(
-    ISpRecognizer* This,
-    ISpStreamFormat **ppStream);
-void __RPC_STUB ISpRecognizer_GetInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_CreateRecoContext_Proxy(
-    ISpRecognizer* This,
-    ISpRecoContext **ppNewCtxt);
-void __RPC_STUB ISpRecognizer_CreateRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoProfile_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken **ppToken);
-void __RPC_STUB ISpRecognizer_GetRecoProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoProfile_Proxy(
-    ISpRecognizer* This,
-    ISpObjectToken *pToken);
-void __RPC_STUB ISpRecognizer_SetRecoProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_IsSharedInstance_Proxy(
-    ISpRecognizer* This);
-void __RPC_STUB ISpRecognizer_IsSharedInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetRecoState_Proxy(
-    ISpRecognizer* This,
-    SPRECOSTATE *pState);
-void __RPC_STUB ISpRecognizer_GetRecoState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_SetRecoState_Proxy(
-    ISpRecognizer* This,
-    SPRECOSTATE NewState);
-void __RPC_STUB ISpRecognizer_SetRecoState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetStatus_Proxy(
-    ISpRecognizer* This,
-    SPRECOGNIZERSTATUS *pStatus);
-void __RPC_STUB ISpRecognizer_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_GetFormat_Proxy(
-    ISpRecognizer* This,
-    SPSTREAMFORMATTYPE WaveFormatType,
-    GUID *pFormatId,
-    WAVEFORMATEX **ppCoMemWFEX);
-void __RPC_STUB ISpRecognizer_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer_EmulateRecognition_Proxy(
-    ISpRecognizer* This,
-    ISpPhrase *pPhrase);
-void __RPC_STUB ISpRecognizer_EmulateRecognition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecognizer_INTERFACE_DEFINED__ */
 
@@ -11865,31 +10295,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpSerializeState* This,
+        ISpSerializeState *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpSerializeState* This);
+        ISpSerializeState *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpSerializeState* This);
+        ISpSerializeState *This);
 
     /*** ISpSerializeState methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSerializedState)(
-        ISpSerializeState* This,
+        ISpSerializeState *This,
         BYTE **ppbData,
         ULONG *pulSize,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetSerializedState)(
-        ISpSerializeState* This,
+        ISpSerializeState *This,
         BYTE *pbData,
         ULONG ulSize,
         DWORD dwReserved);
 
     END_INTERFACE
 } ISpSerializeStateVtbl;
+
 interface ISpSerializeState {
     CONST_VTBL ISpSerializeStateVtbl* lpVtbl;
 };
@@ -11926,26 +10357,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpSerializeState_GetSerializedState_Proxy(
-    ISpSerializeState* This,
-    BYTE **ppbData,
-    ULONG *pulSize,
-    DWORD dwReserved);
-void __RPC_STUB ISpSerializeState_GetSerializedState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpSerializeState_SetSerializedState_Proxy(
-    ISpSerializeState* This,
-    BYTE *pbData,
-    ULONG ulSize,
-    DWORD dwReserved);
-void __RPC_STUB ISpSerializeState_SetSerializedState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpSerializeState_INTERFACE_DEFINED__ */
 
@@ -11981,32 +10392,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecognizer2* This,
+        ISpRecognizer2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecognizer2* This);
+        ISpRecognizer2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecognizer2* This);
+        ISpRecognizer2 *This);
 
     /*** ISpRecognizer2 methods ***/
     HRESULT (STDMETHODCALLTYPE *EmulateRecognitionEx)(
-        ISpRecognizer2* This,
+        ISpRecognizer2 *This,
         ISpPhrase *pPhrase,
         DWORD dwCompareFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetTrainingState)(
-        ISpRecognizer2* This,
+        ISpRecognizer2 *This,
         WINBOOL fDoingTraining,
         WINBOOL fAdaptFromTrainingData);
 
     HRESULT (STDMETHODCALLTYPE *ResetAcousticModelAdaptation)(
-        ISpRecognizer2* This);
+        ISpRecognizer2 *This);
 
     END_INTERFACE
 } ISpRecognizer2Vtbl;
+
 interface ISpRecognizer2 {
     CONST_VTBL ISpRecognizer2Vtbl* lpVtbl;
 };
@@ -12047,31 +10459,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecognizer2_EmulateRecognitionEx_Proxy(
-    ISpRecognizer2* This,
-    ISpPhrase *pPhrase,
-    DWORD dwCompareFlags);
-void __RPC_STUB ISpRecognizer2_EmulateRecognitionEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer2_SetTrainingState_Proxy(
-    ISpRecognizer2* This,
-    WINBOOL fDoingTraining,
-    WINBOOL fAdaptFromTrainingData);
-void __RPC_STUB ISpRecognizer2_SetTrainingState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer2_ResetAcousticModelAdaptation_Proxy(
-    ISpRecognizer2* This);
-void __RPC_STUB ISpRecognizer2_ResetAcousticModelAdaptation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecognizer2_INTERFACE_DEFINED__ */
 
@@ -12099,23 +10486,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecoCategory* This,
+        ISpRecoCategory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecoCategory* This);
+        ISpRecoCategory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecoCategory* This);
+        ISpRecoCategory *This);
 
     /*** ISpRecoCategory methods ***/
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        ISpRecoCategory* This,
+        ISpRecoCategory *This,
         SPCATEGORYTYPE *peCategoryType);
 
     END_INTERFACE
 } ISpRecoCategoryVtbl;
+
 interface ISpRecoCategory {
     CONST_VTBL ISpRecoCategoryVtbl* lpVtbl;
 };
@@ -12148,14 +10536,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecoCategory_GetType_Proxy(
-    ISpRecoCategory* This,
-    SPCATEGORYTYPE *peCategoryType);
-void __RPC_STUB ISpRecoCategory_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecoCategory_INTERFACE_DEFINED__ */
 
@@ -12190,32 +10570,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpRecognizer3* This,
+        ISpRecognizer3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpRecognizer3* This);
+        ISpRecognizer3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpRecognizer3* This);
+        ISpRecognizer3 *This);
 
     /*** ISpRecognizer3 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISpRecognizer3* This,
+        ISpRecognizer3 *This,
         SPCATEGORYTYPE categoryType,
         ISpRecoCategory **ppCategory);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveCategory)(
-        ISpRecognizer3* This,
+        ISpRecognizer3 *This,
         ISpRecoCategory *pCategory);
 
     HRESULT (STDMETHODCALLTYPE *GetActiveCategory)(
-        ISpRecognizer3* This,
+        ISpRecognizer3 *This,
         ISpRecoCategory **ppCategory);
 
     END_INTERFACE
 } ISpRecognizer3Vtbl;
+
 interface ISpRecognizer3 {
     CONST_VTBL ISpRecognizer3Vtbl* lpVtbl;
 };
@@ -12256,31 +10637,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpRecognizer3_GetCategory_Proxy(
-    ISpRecognizer3* This,
-    SPCATEGORYTYPE categoryType,
-    ISpRecoCategory **ppCategory);
-void __RPC_STUB ISpRecognizer3_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer3_SetActiveCategory_Proxy(
-    ISpRecognizer3* This,
-    ISpRecoCategory *pCategory);
-void __RPC_STUB ISpRecognizer3_SetActiveCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpRecognizer3_GetActiveCategory_Proxy(
-    ISpRecognizer3* This,
-    ISpRecoCategory **ppCategory);
-void __RPC_STUB ISpRecognizer3_GetActiveCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpRecognizer3_INTERFACE_DEFINED__ */
 
@@ -12323,19 +10679,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpEnginePronunciation* This,
+        ISpEnginePronunciation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpEnginePronunciation* This);
+        ISpEnginePronunciation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpEnginePronunciation* This);
+        ISpEnginePronunciation *This);
 
     /*** ISpEnginePronunciation methods ***/
     HRESULT (STDMETHODCALLTYPE *Normalize)(
-        ISpEnginePronunciation* This,
+        ISpEnginePronunciation *This,
         LPCWSTR pszWord,
         LPCWSTR pszLeftContext,
         LPCWSTR pszRightContext,
@@ -12343,7 +10699,7 @@
         SPNORMALIZATIONLIST *pNormalizationList);
 
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpEnginePronunciation* This,
+        ISpEnginePronunciation *This,
         LPCWSTR pszWord,
         LPCWSTR pszLeftContext,
         LPCWSTR pszRightContext,
@@ -12352,6 +10708,7 @@
 
     END_INTERFACE
 } ISpEnginePronunciationVtbl;
+
 interface ISpEnginePronunciation {
     CONST_VTBL ISpEnginePronunciationVtbl* lpVtbl;
 };
@@ -12388,30 +10745,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_Normalize_Proxy(
-    ISpEnginePronunciation* This,
-    LPCWSTR pszWord,
-    LPCWSTR pszLeftContext,
-    LPCWSTR pszRightContext,
-    WORD LangID,
-    SPNORMALIZATIONLIST *pNormalizationList);
-void __RPC_STUB ISpEnginePronunciation_Normalize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpEnginePronunciation_GetPronunciations_Proxy(
-    ISpEnginePronunciation* This,
-    LPCWSTR pszWord,
-    LPCWSTR pszLeftContext,
-    LPCWSTR pszRightContext,
-    WORD LangID,
-    SPWORDPRONUNCIATIONLIST *pEnginePronunciationList);
-void __RPC_STUB ISpEnginePronunciation_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpEnginePronunciation_INTERFACE_DEFINED__ */
 
@@ -12454,30 +10787,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpDisplayAlternates* This,
+        ISpDisplayAlternates *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpDisplayAlternates* This);
+        ISpDisplayAlternates *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpDisplayAlternates* This);
+        ISpDisplayAlternates *This);
 
     /*** ISpDisplayAlternates methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDisplayAlternates)(
-        ISpDisplayAlternates* This,
+        ISpDisplayAlternates *This,
         const SPDISPLAYPHRASE *pPhrase,
         ULONG cRequestCount,
         SPDISPLAYPHRASE **ppCoMemPhrases,
         ULONG *pcPhrasesReturned);
 
     HRESULT (STDMETHODCALLTYPE *SetFullStopTrailSpace)(
-        ISpDisplayAlternates* This,
+        ISpDisplayAlternates *This,
         ULONG ulTrailSpace);
 
     END_INTERFACE
 } ISpDisplayAlternatesVtbl;
+
 interface ISpDisplayAlternates {
     CONST_VTBL ISpDisplayAlternatesVtbl* lpVtbl;
 };
@@ -12514,25 +10848,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_GetDisplayAlternates_Proxy(
-    ISpDisplayAlternates* This,
-    const SPDISPLAYPHRASE *pPhrase,
-    ULONG cRequestCount,
-    SPDISPLAYPHRASE **ppCoMemPhrases,
-    ULONG *pcPhrasesReturned);
-void __RPC_STUB ISpDisplayAlternates_GetDisplayAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpDisplayAlternates_SetFullStopTrailSpace_Proxy(
-    ISpDisplayAlternates* This,
-    ULONG ulTrailSpace);
-void __RPC_STUB ISpDisplayAlternates_SetFullStopTrailSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpDisplayAlternates_INTERFACE_DEFINED__ */
 
@@ -12542,236 +10857,377 @@
 #ifndef __ISpeechDataKey_FWD_DEFINED__
 #define __ISpeechDataKey_FWD_DEFINED__
 typedef interface ISpeechDataKey ISpeechDataKey;
+#ifdef __cplusplus
+interface ISpeechDataKey;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectToken_FWD_DEFINED__
 #define __ISpeechObjectToken_FWD_DEFINED__
 typedef interface ISpeechObjectToken ISpeechObjectToken;
+#ifdef __cplusplus
+interface ISpeechObjectToken;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokens_FWD_DEFINED__
 #define __ISpeechObjectTokens_FWD_DEFINED__
 typedef interface ISpeechObjectTokens ISpeechObjectTokens;
+#ifdef __cplusplus
+interface ISpeechObjectTokens;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechObjectTokenCategory_FWD_DEFINED__
 #define __ISpeechObjectTokenCategory_FWD_DEFINED__
 typedef interface ISpeechObjectTokenCategory ISpeechObjectTokenCategory;
+#ifdef __cplusplus
+interface ISpeechObjectTokenCategory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioBufferInfo_FWD_DEFINED__
 #define __ISpeechAudioBufferInfo_FWD_DEFINED__
 typedef interface ISpeechAudioBufferInfo ISpeechAudioBufferInfo;
+#ifdef __cplusplus
+interface ISpeechAudioBufferInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioStatus_FWD_DEFINED__
 #define __ISpeechAudioStatus_FWD_DEFINED__
 typedef interface ISpeechAudioStatus ISpeechAudioStatus;
+#ifdef __cplusplus
+interface ISpeechAudioStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudioFormat_FWD_DEFINED__
 #define __ISpeechAudioFormat_FWD_DEFINED__
 typedef interface ISpeechAudioFormat ISpeechAudioFormat;
+#ifdef __cplusplus
+interface ISpeechAudioFormat;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechWaveFormatEx_FWD_DEFINED__
 #define __ISpeechWaveFormatEx_FWD_DEFINED__
 typedef interface ISpeechWaveFormatEx ISpeechWaveFormatEx;
+#ifdef __cplusplus
+interface ISpeechWaveFormatEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechBaseStream_FWD_DEFINED__
 #define __ISpeechBaseStream_FWD_DEFINED__
 typedef interface ISpeechBaseStream ISpeechBaseStream;
+#ifdef __cplusplus
+interface ISpeechBaseStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechFileStream_FWD_DEFINED__
 #define __ISpeechFileStream_FWD_DEFINED__
 typedef interface ISpeechFileStream ISpeechFileStream;
+#ifdef __cplusplus
+interface ISpeechFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMemoryStream_FWD_DEFINED__
 #define __ISpeechMemoryStream_FWD_DEFINED__
 typedef interface ISpeechMemoryStream ISpeechMemoryStream;
+#ifdef __cplusplus
+interface ISpeechMemoryStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechCustomStream_FWD_DEFINED__
 #define __ISpeechCustomStream_FWD_DEFINED__
 typedef interface ISpeechCustomStream ISpeechCustomStream;
+#ifdef __cplusplus
+interface ISpeechCustomStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechAudio_FWD_DEFINED__
 #define __ISpeechAudio_FWD_DEFINED__
 typedef interface ISpeechAudio ISpeechAudio;
+#ifdef __cplusplus
+interface ISpeechAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechMMSysAudio_FWD_DEFINED__
 #define __ISpeechMMSysAudio_FWD_DEFINED__
 typedef interface ISpeechMMSysAudio ISpeechMMSysAudio;
+#ifdef __cplusplus
+interface ISpeechMMSysAudio;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoice_FWD_DEFINED__
 #define __ISpeechVoice_FWD_DEFINED__
 typedef interface ISpeechVoice ISpeechVoice;
+#ifdef __cplusplus
+interface ISpeechVoice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechVoiceStatus_FWD_DEFINED__
 #define __ISpeechVoiceStatus_FWD_DEFINED__
 typedef interface ISpeechVoiceStatus ISpeechVoiceStatus;
+#ifdef __cplusplus
+interface ISpeechVoiceStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechVoiceEvents_FWD_DEFINED__
 #define ___ISpeechVoiceEvents_FWD_DEFINED__
 typedef interface _ISpeechVoiceEvents _ISpeechVoiceEvents;
+#ifdef __cplusplus
+interface _ISpeechVoiceEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizer_FWD_DEFINED__
 #define __ISpeechRecognizer_FWD_DEFINED__
 typedef interface ISpeechRecognizer ISpeechRecognizer;
+#ifdef __cplusplus
+interface ISpeechRecognizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecognizerStatus_FWD_DEFINED__
 #define __ISpeechRecognizerStatus_FWD_DEFINED__
 typedef interface ISpeechRecognizerStatus ISpeechRecognizerStatus;
+#ifdef __cplusplus
+interface ISpeechRecognizerStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoContext_FWD_DEFINED__
 #define __ISpeechRecoContext_FWD_DEFINED__
 typedef interface ISpeechRecoContext ISpeechRecoContext;
+#ifdef __cplusplus
+interface ISpeechRecoContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoGrammar_FWD_DEFINED__
 #define __ISpeechRecoGrammar_FWD_DEFINED__
 typedef interface ISpeechRecoGrammar ISpeechRecoGrammar;
+#ifdef __cplusplus
+interface ISpeechRecoGrammar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef ___ISpeechRecoContextEvents_FWD_DEFINED__
 #define ___ISpeechRecoContextEvents_FWD_DEFINED__
 typedef interface _ISpeechRecoContextEvents _ISpeechRecoContextEvents;
+#ifdef __cplusplus
+interface _ISpeechRecoContextEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRule_FWD_DEFINED__
 #define __ISpeechGrammarRule_FWD_DEFINED__
 typedef interface ISpeechGrammarRule ISpeechGrammarRule;
+#ifdef __cplusplus
+interface ISpeechGrammarRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRules_FWD_DEFINED__
 #define __ISpeechGrammarRules_FWD_DEFINED__
 typedef interface ISpeechGrammarRules ISpeechGrammarRules;
+#ifdef __cplusplus
+interface ISpeechGrammarRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleState_FWD_DEFINED__
 #define __ISpeechGrammarRuleState_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleState ISpeechGrammarRuleState;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransition_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransition ISpeechGrammarRuleStateTransition;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 #define __ISpeechGrammarRuleStateTransitions_FWD_DEFINED__
 typedef interface ISpeechGrammarRuleStateTransitions ISpeechGrammarRuleStateTransitions;
+#ifdef __cplusplus
+interface ISpeechGrammarRuleStateTransitions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechTextSelectionInformation_FWD_DEFINED__
 #define __ISpeechTextSelectionInformation_FWD_DEFINED__
 typedef interface ISpeechTextSelectionInformation ISpeechTextSelectionInformation;
+#ifdef __cplusplus
+interface ISpeechTextSelectionInformation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult_FWD_DEFINED__
 #define __ISpeechRecoResult_FWD_DEFINED__
 typedef interface ISpeechRecoResult ISpeechRecoResult;
+#ifdef __cplusplus
+interface ISpeechRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResult2_FWD_DEFINED__
 #define __ISpeechRecoResult2_FWD_DEFINED__
 typedef interface ISpeechRecoResult2 ISpeechRecoResult2;
+#ifdef __cplusplus
+interface ISpeechRecoResult2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechRecoResultTimes_FWD_DEFINED__
 #define __ISpeechRecoResultTimes_FWD_DEFINED__
 typedef interface ISpeechRecoResultTimes ISpeechRecoResultTimes;
+#ifdef __cplusplus
+interface ISpeechRecoResultTimes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternate_FWD_DEFINED__
 #define __ISpeechPhraseAlternate_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternate ISpeechPhraseAlternate;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseAlternates_FWD_DEFINED__
 #define __ISpeechPhraseAlternates_FWD_DEFINED__
 typedef interface ISpeechPhraseAlternates ISpeechPhraseAlternates;
+#ifdef __cplusplus
+interface ISpeechPhraseAlternates;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseInfo_FWD_DEFINED__
 #define __ISpeechPhraseInfo_FWD_DEFINED__
 typedef interface ISpeechPhraseInfo ISpeechPhraseInfo;
+#ifdef __cplusplus
+interface ISpeechPhraseInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElement_FWD_DEFINED__
 #define __ISpeechPhraseElement_FWD_DEFINED__
 typedef interface ISpeechPhraseElement ISpeechPhraseElement;
+#ifdef __cplusplus
+interface ISpeechPhraseElement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseElements_FWD_DEFINED__
 #define __ISpeechPhraseElements_FWD_DEFINED__
 typedef interface ISpeechPhraseElements ISpeechPhraseElements;
+#ifdef __cplusplus
+interface ISpeechPhraseElements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacement_FWD_DEFINED__
 #define __ISpeechPhraseReplacement_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacement ISpeechPhraseReplacement;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacement;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseReplacements_FWD_DEFINED__
 #define __ISpeechPhraseReplacements_FWD_DEFINED__
 typedef interface ISpeechPhraseReplacements ISpeechPhraseReplacements;
+#ifdef __cplusplus
+interface ISpeechPhraseReplacements;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperty_FWD_DEFINED__
 #define __ISpeechPhraseProperty_FWD_DEFINED__
 typedef interface ISpeechPhraseProperty ISpeechPhraseProperty;
+#ifdef __cplusplus
+interface ISpeechPhraseProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseProperties_FWD_DEFINED__
 #define __ISpeechPhraseProperties_FWD_DEFINED__
 typedef interface ISpeechPhraseProperties ISpeechPhraseProperties;
+#ifdef __cplusplus
+interface ISpeechPhraseProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRule_FWD_DEFINED__
 #define __ISpeechPhraseRule_FWD_DEFINED__
 typedef interface ISpeechPhraseRule ISpeechPhraseRule;
+#ifdef __cplusplus
+interface ISpeechPhraseRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechPhraseRules_FWD_DEFINED__
 #define __ISpeechPhraseRules_FWD_DEFINED__
 typedef interface ISpeechPhraseRules ISpeechPhraseRules;
+#ifdef __cplusplus
+interface ISpeechPhraseRules;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexicon_FWD_DEFINED__
 #define __ISpeechLexicon_FWD_DEFINED__
 typedef interface ISpeechLexicon ISpeechLexicon;
+#ifdef __cplusplus
+interface ISpeechLexicon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWords_FWD_DEFINED__
 #define __ISpeechLexiconWords_FWD_DEFINED__
 typedef interface ISpeechLexiconWords ISpeechLexiconWords;
+#ifdef __cplusplus
+interface ISpeechLexiconWords;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconWord_FWD_DEFINED__
 #define __ISpeechLexiconWord_FWD_DEFINED__
 typedef interface ISpeechLexiconWord ISpeechLexiconWord;
+#ifdef __cplusplus
+interface ISpeechLexiconWord;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciations_FWD_DEFINED__
 #define __ISpeechLexiconPronunciations_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciations ISpeechLexiconPronunciations;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciations;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechLexiconPronunciation_FWD_DEFINED__
 #define __ISpeechLexiconPronunciation_FWD_DEFINED__
 typedef interface ISpeechLexiconPronunciation ISpeechLexiconPronunciation;
+#ifdef __cplusplus
+interface ISpeechLexiconPronunciation;
+#endif /* __cplusplus */
 #endif
 
 typedef LONG SpeechLanguageId;
@@ -12903,29 +11359,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechDataKey* This);
+        ISpeechDataKey *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechDataKey* This);
+        ISpeechDataKey *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -12933,7 +11389,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -12945,65 +11401,66 @@
 
     /*** ISpeechDataKey methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBinaryValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         VARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *GetBinaryValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *SetStringValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         const BSTR Value);
 
     HRESULT (STDMETHODCALLTYPE *GetStringValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         BSTR *Value);
 
     HRESULT (STDMETHODCALLTYPE *SetLongValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         LONG Value);
 
     HRESULT (STDMETHODCALLTYPE *GetLongValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName,
         LONG *Value);
 
     HRESULT (STDMETHODCALLTYPE *OpenKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName,
         ISpeechDataKey **SubKey);
 
     HRESULT (STDMETHODCALLTYPE *CreateKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName,
         ISpeechDataKey **SubKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteKey)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR SubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         const BSTR ValueName);
 
     HRESULT (STDMETHODCALLTYPE *EnumKeys)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         LONG Index,
         BSTR *SubKeyName);
 
     HRESULT (STDMETHODCALLTYPE *EnumValues)(
-        ISpeechDataKey* This,
+        ISpeechDataKey *This,
         LONG Index,
         BSTR *ValueName);
 
     END_INTERFACE
 } ISpeechDataKeyVtbl;
+
 interface ISpeechDataKey {
     CONST_VTBL ISpeechDataKeyVtbl* lpVtbl;
 };
@@ -13098,112 +11555,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetBinaryValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    VARIANT Value);
-void __RPC_STUB ISpeechDataKey_SetBinaryValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetBinaryValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    VARIANT *Value);
-void __RPC_STUB ISpeechDataKey_GetBinaryValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetStringValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    const BSTR Value);
-void __RPC_STUB ISpeechDataKey_SetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetStringValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    BSTR *Value);
-void __RPC_STUB ISpeechDataKey_GetStringValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_SetLongValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    LONG Value);
-void __RPC_STUB ISpeechDataKey_SetLongValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_GetLongValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName,
-    LONG *Value);
-void __RPC_STUB ISpeechDataKey_GetLongValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_OpenKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName,
-    ISpeechDataKey **SubKey);
-void __RPC_STUB ISpeechDataKey_OpenKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_CreateKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName,
-    ISpeechDataKey **SubKey);
-void __RPC_STUB ISpeechDataKey_CreateKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteKey_Proxy(
-    ISpeechDataKey* This,
-    const BSTR SubKeyName);
-void __RPC_STUB ISpeechDataKey_DeleteKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_DeleteValue_Proxy(
-    ISpeechDataKey* This,
-    const BSTR ValueName);
-void __RPC_STUB ISpeechDataKey_DeleteValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumKeys_Proxy(
-    ISpeechDataKey* This,
-    LONG Index,
-    BSTR *SubKeyName);
-void __RPC_STUB ISpeechDataKey_EnumKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechDataKey_EnumValues_Proxy(
-    ISpeechDataKey* This,
-    LONG Index,
-    BSTR *ValueName);
-void __RPC_STUB ISpeechDataKey_EnumValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechDataKey_INTERFACE_DEFINED__ */
 
@@ -13287,29 +11638,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectToken* This);
+        ISpeechObjectToken *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectToken* This);
+        ISpeechObjectToken *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13317,7 +11668,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13329,45 +11680,45 @@
 
     /*** ISpeechObjectToken methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR *ObjectId);
 
     HRESULT (STDMETHODCALLTYPE *get_DataKey)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         ISpeechDataKey **DataKey);
 
     HRESULT (STDMETHODCALLTYPE *get_Category)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         ISpeechObjectTokenCategory **Category);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         LONG Locale,
         BSTR *Description);
 
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR Id,
         BSTR CategoryID,
         VARIANT_BOOL CreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetAttribute)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR AttributeName,
         BSTR *AttributeValue);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         IUnknown *pUnkOuter,
         SpeechTokenContext ClsContext,
         IUnknown **Object);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID);
 
     HRESULT (STDMETHODCALLTYPE *GetStorageFileName)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID,
         BSTR KeyName,
         BSTR FileName,
@@ -13375,20 +11726,20 @@
         BSTR *FilePath);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStorageFileName)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR ObjectStorageCLSID,
         BSTR KeyName,
         VARIANT_BOOL DeleteFile);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         IUnknown *Object,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         LONG hWnd,
         BSTR Title,
         const BSTR TypeOfUI,
@@ -13396,12 +11747,13 @@
         IUnknown *Object);
 
     HRESULT (STDMETHODCALLTYPE *MatchesAttributes)(
-        ISpeechObjectToken* This,
+        ISpeechObjectToken *This,
         BSTR Attributes,
         VARIANT_BOOL *Matches);
 
     END_INTERFACE
 } ISpeechObjectTokenVtbl;
+
 interface ISpeechObjectToken {
     CONST_VTBL ISpeechObjectTokenVtbl* lpVtbl;
 };
@@ -13500,130 +11852,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Id_Proxy(
-    ISpeechObjectToken* This,
-    BSTR *ObjectId);
-void __RPC_STUB ISpeechObjectToken_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_DataKey_Proxy(
-    ISpeechObjectToken* This,
-    ISpeechDataKey **DataKey);
-void __RPC_STUB ISpeechObjectToken_get_DataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_get_Category_Proxy(
-    ISpeechObjectToken* This,
-    ISpeechObjectTokenCategory **Category);
-void __RPC_STUB ISpeechObjectToken_get_Category_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetDescription_Proxy(
-    ISpeechObjectToken* This,
-    LONG Locale,
-    BSTR *Description);
-void __RPC_STUB ISpeechObjectToken_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_SetId_Proxy(
-    ISpeechObjectToken* This,
-    BSTR Id,
-    BSTR CategoryID,
-    VARIANT_BOOL CreateIfNotExist);
-void __RPC_STUB ISpeechObjectToken_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetAttribute_Proxy(
-    ISpeechObjectToken* This,
-    BSTR AttributeName,
-    BSTR *AttributeValue);
-void __RPC_STUB ISpeechObjectToken_GetAttribute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_CreateInstance_Proxy(
-    ISpeechObjectToken* This,
-    IUnknown *pUnkOuter,
-    SpeechTokenContext ClsContext,
-    IUnknown **Object);
-void __RPC_STUB ISpeechObjectToken_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_Remove_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID);
-void __RPC_STUB ISpeechObjectToken_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_GetStorageFileName_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID,
-    BSTR KeyName,
-    BSTR FileName,
-    SpeechTokenShellFolder Folder,
-    BSTR *FilePath);
-void __RPC_STUB ISpeechObjectToken_GetStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_RemoveStorageFileName_Proxy(
-    ISpeechObjectToken* This,
-    BSTR ObjectStorageCLSID,
-    BSTR KeyName,
-    VARIANT_BOOL DeleteFile);
-void __RPC_STUB ISpeechObjectToken_RemoveStorageFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_IsUISupported_Proxy(
-    ISpeechObjectToken* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    IUnknown *Object,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechObjectToken_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_DisplayUI_Proxy(
-    ISpeechObjectToken* This,
-    LONG hWnd,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    IUnknown *Object);
-void __RPC_STUB ISpeechObjectToken_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectToken_MatchesAttributes_Proxy(
-    ISpeechObjectToken* This,
-    BSTR Attributes,
-    VARIANT_BOOL *Matches);
-void __RPC_STUB ISpeechObjectToken_MatchesAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectToken_INTERFACE_DEFINED__ */
 
@@ -13658,29 +11886,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectTokens* This);
+        ISpeechObjectTokens *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectTokens* This);
+        ISpeechObjectTokens *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13688,7 +11916,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13700,20 +11928,21 @@
 
     /*** ISpeechObjectTokens methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         LONG Index,
         ISpeechObjectToken **Token);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechObjectTokens* This,
+        ISpeechObjectTokens *This,
         IUnknown **ppEnumVARIANT);
 
     END_INTERFACE
 } ISpeechObjectTokensVtbl;
+
 interface ISpeechObjectTokens {
     CONST_VTBL ISpeechObjectTokensVtbl* lpVtbl;
 };
@@ -13772,31 +12001,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get_Count_Proxy(
-    ISpeechObjectTokens* This,
-    LONG *Count);
-void __RPC_STUB ISpeechObjectTokens_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_Item_Proxy(
-    ISpeechObjectTokens* This,
-    LONG Index,
-    ISpeechObjectToken **Token);
-void __RPC_STUB ISpeechObjectTokens_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokens_get__NewEnum_Proxy(
-    ISpeechObjectTokens* This,
-    IUnknown **ppEnumVARIANT);
-void __RPC_STUB ISpeechObjectTokens_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectTokens_INTERFACE_DEFINED__ */
 
@@ -13843,29 +12047,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechObjectTokenCategory* This);
+        ISpeechObjectTokenCategory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechObjectTokenCategory* This);
+        ISpeechObjectTokenCategory *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -13873,7 +12077,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -13885,35 +12089,36 @@
 
     /*** ISpeechObjectTokenCategory methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR *Id);
 
     HRESULT (STDMETHODCALLTYPE *put_Default)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         const BSTR TokenId);
 
     HRESULT (STDMETHODCALLTYPE *get_Default)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR *TokenId);
 
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         const BSTR Id,
         VARIANT_BOOL CreateIfNotExist);
 
     HRESULT (STDMETHODCALLTYPE *GetDataKey)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         SpeechDataKeyLocation Location,
         ISpeechDataKey **DataKey);
 
     HRESULT (STDMETHODCALLTYPE *EnumerateTokens)(
-        ISpeechObjectTokenCategory* This,
+        ISpeechObjectTokenCategory *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **Tokens);
 
     END_INTERFACE
 } ISpeechObjectTokenCategoryVtbl;
+
 interface ISpeechObjectTokenCategory {
     CONST_VTBL ISpeechObjectTokenCategoryVtbl* lpVtbl;
 };
@@ -13984,58 +12189,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Id_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR *Id);
-void __RPC_STUB ISpeechObjectTokenCategory_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_put_Default_Proxy(
-    ISpeechObjectTokenCategory* This,
-    const BSTR TokenId);
-void __RPC_STUB ISpeechObjectTokenCategory_put_Default_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_get_Default_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR *TokenId);
-void __RPC_STUB ISpeechObjectTokenCategory_get_Default_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_SetId_Proxy(
-    ISpeechObjectTokenCategory* This,
-    const BSTR Id,
-    VARIANT_BOOL CreateIfNotExist);
-void __RPC_STUB ISpeechObjectTokenCategory_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_GetDataKey_Proxy(
-    ISpeechObjectTokenCategory* This,
-    SpeechDataKeyLocation Location,
-    ISpeechDataKey **DataKey);
-void __RPC_STUB ISpeechObjectTokenCategory_GetDataKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechObjectTokenCategory_EnumerateTokens_Proxy(
-    ISpeechObjectTokenCategory* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **Tokens);
-void __RPC_STUB ISpeechObjectTokenCategory_EnumerateTokens_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechObjectTokenCategory_INTERFACE_DEFINED__ */
 
@@ -14302,29 +12455,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioFormat* This);
+        ISpeechAudioFormat *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioFormat* This);
+        ISpeechAudioFormat *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14332,7 +12485,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14344,31 +12497,32 @@
 
     /*** ISpeechAudioFormat methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         SpeechAudioFormatType *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *put_Type)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         SpeechAudioFormatType AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Guid)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         BSTR *Guid);
 
     HRESULT (STDMETHODCALLTYPE *put_Guid)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         BSTR Guid);
 
     HRESULT (STDMETHODCALLTYPE *GetWaveFormatEx)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         ISpeechWaveFormatEx **SpeechWaveFormatEx);
 
     HRESULT (STDMETHODCALLTYPE *SetWaveFormatEx)(
-        ISpeechAudioFormat* This,
+        ISpeechAudioFormat *This,
         ISpeechWaveFormatEx *SpeechWaveFormatEx);
 
     END_INTERFACE
 } ISpeechAudioFormatVtbl;
+
 interface ISpeechAudioFormat {
     CONST_VTBL ISpeechAudioFormatVtbl* lpVtbl;
 };
@@ -14439,54 +12593,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Type_Proxy(
-    ISpeechAudioFormat* This,
-    SpeechAudioFormatType *AudioFormat);
-void __RPC_STUB ISpeechAudioFormat_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Type_Proxy(
-    ISpeechAudioFormat* This,
-    SpeechAudioFormatType AudioFormat);
-void __RPC_STUB ISpeechAudioFormat_put_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_get_Guid_Proxy(
-    ISpeechAudioFormat* This,
-    BSTR *Guid);
-void __RPC_STUB ISpeechAudioFormat_get_Guid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_put_Guid_Proxy(
-    ISpeechAudioFormat* This,
-    BSTR Guid);
-void __RPC_STUB ISpeechAudioFormat_put_Guid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_GetWaveFormatEx_Proxy(
-    ISpeechAudioFormat* This,
-    ISpeechWaveFormatEx **SpeechWaveFormatEx);
-void __RPC_STUB ISpeechAudioFormat_GetWaveFormatEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioFormat_SetWaveFormatEx_Proxy(
-    ISpeechAudioFormat* This,
-    ISpeechWaveFormatEx *SpeechWaveFormatEx);
-void __RPC_STUB ISpeechAudioFormat_SetWaveFormatEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioFormat_INTERFACE_DEFINED__ */
 
@@ -14531,29 +12637,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechBaseStream* This);
+        ISpeechBaseStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechBaseStream* This);
+        ISpeechBaseStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14561,7 +12667,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14573,32 +12679,33 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechBaseStream* This,
+        ISpeechBaseStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     END_INTERFACE
 } ISpeechBaseStreamVtbl;
+
 interface ISpeechBaseStream {
     CONST_VTBL ISpeechBaseStreamVtbl* lpVtbl;
 };
@@ -14665,51 +12772,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_get_Format_Proxy(
-    ISpeechBaseStream* This,
-    ISpeechAudioFormat **AudioFormat);
-void __RPC_STUB ISpeechBaseStream_get_Format_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_putref_Format_Proxy(
-    ISpeechBaseStream* This,
-    ISpeechAudioFormat *AudioFormat);
-void __RPC_STUB ISpeechBaseStream_putref_Format_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Read_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT *Buffer,
-    LONG NumberOfBytes,
-    LONG *BytesRead);
-void __RPC_STUB ISpeechBaseStream_Read_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Write_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT Buffer,
-    LONG *BytesWritten);
-void __RPC_STUB ISpeechBaseStream_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechBaseStream_Seek_Proxy(
-    ISpeechBaseStream* This,
-    VARIANT Position,
-    SpeechStreamSeekPositionType Origin,
-    VARIANT *NewPosition);
-void __RPC_STUB ISpeechBaseStream_Seek_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechBaseStream_INTERFACE_DEFINED__ */
 
@@ -14761,29 +12823,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudio* This);
+        ISpeechAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudio* This);
+        ISpeechAudio *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -14791,7 +12853,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -14803,69 +12865,70 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferInfo)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioBufferInfo **BufferInfo);
 
     HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         ISpeechAudioFormat **StreamFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventHandle)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         LONG *EventHandle);
 
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpeechAudio* This,
+        ISpeechAudio *This,
         SpeechAudioState State);
 
     END_INTERFACE
 } ISpeechAudioVtbl;
+
 interface ISpeechAudio {
     CONST_VTBL ISpeechAudioVtbl* lpVtbl;
 };
@@ -14970,78 +13033,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Status_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioStatus **Status);
-void __RPC_STUB ISpeechAudio_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferInfo_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioBufferInfo **BufferInfo);
-void __RPC_STUB ISpeechAudio_get_BufferInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_DefaultFormat_Proxy(
-    ISpeechAudio* This,
-    ISpeechAudioFormat **StreamFormat);
-void __RPC_STUB ISpeechAudio_get_DefaultFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_Volume_Proxy(
-    ISpeechAudio* This,
-    LONG *Volume);
-void __RPC_STUB ISpeechAudio_get_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_put_Volume_Proxy(
-    ISpeechAudio* This,
-    LONG Volume);
-void __RPC_STUB ISpeechAudio_put_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_BufferNotifySize_Proxy(
-    ISpeechAudio* This,
-    LONG *BufferNotifySize);
-void __RPC_STUB ISpeechAudio_get_BufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_put_BufferNotifySize_Proxy(
-    ISpeechAudio* This,
-    LONG BufferNotifySize);
-void __RPC_STUB ISpeechAudio_put_BufferNotifySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_get_EventHandle_Proxy(
-    ISpeechAudio* This,
-    LONG *EventHandle);
-void __RPC_STUB ISpeechAudio_get_EventHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudio_SetState_Proxy(
-    ISpeechAudio* This,
-    SpeechAudioState State);
-void __RPC_STUB ISpeechAudio_SetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudio_INTERFACE_DEFINED__ */
 
@@ -15081,29 +13072,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechMMSysAudio* This);
+        ISpeechMMSysAudio *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechMMSysAudio* This);
+        ISpeechMMSysAudio *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15111,7 +13102,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15123,90 +13114,91 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferInfo)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioBufferInfo **BufferInfo);
 
     HRESULT (STDMETHODCALLTYPE *get_DefaultFormat)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         ISpeechAudioFormat **StreamFormat);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferNotifySize)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferNotifySize)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG BufferNotifySize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventHandle)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *EventHandle);
 
     HRESULT (STDMETHODCALLTYPE *SetState)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         SpeechAudioState State);
 
     /*** ISpeechMMSysAudio methods ***/
     HRESULT (STDMETHODCALLTYPE *get_DeviceId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *DeviceId);
 
     HRESULT (STDMETHODCALLTYPE *put_DeviceId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG DeviceId);
 
     HRESULT (STDMETHODCALLTYPE *get_LineId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *LineId);
 
     HRESULT (STDMETHODCALLTYPE *put_LineId)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG LineId);
 
     HRESULT (STDMETHODCALLTYPE *get_MMHandle)(
-        ISpeechMMSysAudio* This,
+        ISpeechMMSysAudio *This,
         LONG *Handle);
 
     END_INTERFACE
 } ISpeechMMSysAudioVtbl;
+
 interface ISpeechMMSysAudio {
     CONST_VTBL ISpeechMMSysAudioVtbl* lpVtbl;
 };
@@ -15333,46 +13325,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_DeviceId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *DeviceId);
-void __RPC_STUB ISpeechMMSysAudio_get_DeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_DeviceId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG DeviceId);
-void __RPC_STUB ISpeechMMSysAudio_put_DeviceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_LineId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *LineId);
-void __RPC_STUB ISpeechMMSysAudio_get_LineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_put_LineId_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG LineId);
-void __RPC_STUB ISpeechMMSysAudio_put_LineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMMSysAudio_get_MMHandle_Proxy(
-    ISpeechMMSysAudio* This,
-    LONG *Handle);
-void __RPC_STUB ISpeechMMSysAudio_get_MMHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechMMSysAudio_INTERFACE_DEFINED__ */
 
@@ -15405,29 +13357,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15435,7 +13387,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15447,42 +13399,43 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechFileStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Open)(
-        ISpeechFileStream* This,
+        ISpeechFileStream *This,
         BSTR FileName,
         SpeechStreamFileMode FileMode,
         VARIANT_BOOL DoEvents);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        ISpeechFileStream* This);
+        ISpeechFileStream *This);
 
     END_INTERFACE
 } ISpeechFileStreamVtbl;
+
 interface ISpeechFileStream {
     CONST_VTBL ISpeechFileStreamVtbl* lpVtbl;
 };
@@ -15559,23 +13512,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechFileStream_Open_Proxy(
-    ISpeechFileStream* This,
-    BSTR FileName,
-    SpeechStreamFileMode FileMode,
-    VARIANT_BOOL DoEvents);
-void __RPC_STUB ISpeechFileStream_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechFileStream_Close_Proxy(
-    ISpeechFileStream* This);
-void __RPC_STUB ISpeechFileStream_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechFileStream_INTERFACE_DEFINED__ */
 
@@ -15606,29 +13542,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechCustomStream* This);
+        ISpeechCustomStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechCustomStream* This);
+        ISpeechCustomStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15636,7 +13572,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15648,41 +13584,42 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechCustomStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_BaseStream)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         IUnknown **ppUnkStream);
 
     HRESULT (STDMETHODCALLTYPE *putref_BaseStream)(
-        ISpeechCustomStream* This,
+        ISpeechCustomStream *This,
         IUnknown *pUnkStream);
 
     END_INTERFACE
 } ISpeechCustomStreamVtbl;
+
 interface ISpeechCustomStream {
     CONST_VTBL ISpeechCustomStreamVtbl* lpVtbl;
 };
@@ -15759,22 +13696,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechCustomStream_get_BaseStream_Proxy(
-    ISpeechCustomStream* This,
-    IUnknown **ppUnkStream);
-void __RPC_STUB ISpeechCustomStream_get_BaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechCustomStream_putref_BaseStream_Proxy(
-    ISpeechCustomStream* This,
-    IUnknown *pUnkStream);
-void __RPC_STUB ISpeechCustomStream_putref_BaseStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechCustomStream_INTERFACE_DEFINED__ */
 
@@ -15805,29 +13726,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechMemoryStream* This);
+        ISpeechMemoryStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechMemoryStream* This);
+        ISpeechMemoryStream *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -15835,7 +13756,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -15847,41 +13768,42 @@
 
     /*** ISpeechBaseStream methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Format)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         ISpeechAudioFormat **AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *putref_Format)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         ISpeechAudioFormat *AudioFormat);
 
     HRESULT (STDMETHODCALLTYPE *Read)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT *Buffer,
         LONG NumberOfBytes,
         LONG *BytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Buffer,
         LONG *BytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Position,
         SpeechStreamSeekPositionType Origin,
         VARIANT *NewPosition);
 
     /*** ISpeechMemoryStream methods ***/
     HRESULT (STDMETHODCALLTYPE *SetData)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT Data);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISpeechMemoryStream* This,
+        ISpeechMemoryStream *This,
         VARIANT *pData);
 
     END_INTERFACE
 } ISpeechMemoryStreamVtbl;
+
 interface ISpeechMemoryStream {
     CONST_VTBL ISpeechMemoryStreamVtbl* lpVtbl;
 };
@@ -15958,22 +13880,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_SetData_Proxy(
-    ISpeechMemoryStream* This,
-    VARIANT Data);
-void __RPC_STUB ISpeechMemoryStream_SetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechMemoryStream_GetData_Proxy(
-    ISpeechMemoryStream* This,
-    VARIANT *pData);
-void __RPC_STUB ISpeechMemoryStream_GetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechMemoryStream_INTERFACE_DEFINED__ */
 
@@ -16013,29 +13919,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioStatus* This);
+        ISpeechAudioStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioStatus* This);
+        ISpeechAudioStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16043,7 +13949,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16055,27 +13961,28 @@
 
     /*** ISpeechAudioStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_FreeBufferSpace)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         LONG *FreeBufferSpace);
 
     HRESULT (STDMETHODCALLTYPE *get_NonBlockingIO)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         LONG *NonBlockingIO);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         SpeechAudioState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentSeekPosition)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         VARIANT *CurrentSeekPosition);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentDevicePosition)(
-        ISpeechAudioStatus* This,
+        ISpeechAudioStatus *This,
         VARIANT *CurrentDevicePosition);
 
     END_INTERFACE
 } ISpeechAudioStatusVtbl;
+
 interface ISpeechAudioStatus {
     CONST_VTBL ISpeechAudioStatusVtbl* lpVtbl;
 };
@@ -16142,46 +14049,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_FreeBufferSpace_Proxy(
-    ISpeechAudioStatus* This,
-    LONG *FreeBufferSpace);
-void __RPC_STUB ISpeechAudioStatus_get_FreeBufferSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_NonBlockingIO_Proxy(
-    ISpeechAudioStatus* This,
-    LONG *NonBlockingIO);
-void __RPC_STUB ISpeechAudioStatus_get_NonBlockingIO_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_State_Proxy(
-    ISpeechAudioStatus* This,
-    SpeechAudioState *State);
-void __RPC_STUB ISpeechAudioStatus_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentSeekPosition_Proxy(
-    ISpeechAudioStatus* This,
-    VARIANT *CurrentSeekPosition);
-void __RPC_STUB ISpeechAudioStatus_get_CurrentSeekPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioStatus_get_CurrentDevicePosition_Proxy(
-    ISpeechAudioStatus* This,
-    VARIANT *CurrentDevicePosition);
-void __RPC_STUB ISpeechAudioStatus_get_CurrentDevicePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioStatus_INTERFACE_DEFINED__ */
 
@@ -16224,29 +14091,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechAudioBufferInfo* This);
+        ISpeechAudioBufferInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechAudioBufferInfo* This);
+        ISpeechAudioBufferInfo *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16254,7 +14121,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16266,31 +14133,32 @@
 
     /*** ISpeechAudioBufferInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *get_MinNotification)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *MinNotification);
 
     HRESULT (STDMETHODCALLTYPE *put_MinNotification)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG MinNotification);
 
     HRESULT (STDMETHODCALLTYPE *get_BufferSize)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *BufferSize);
 
     HRESULT (STDMETHODCALLTYPE *put_BufferSize)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG BufferSize);
 
     HRESULT (STDMETHODCALLTYPE *get_EventBias)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG *EventBias);
 
     HRESULT (STDMETHODCALLTYPE *put_EventBias)(
-        ISpeechAudioBufferInfo* This,
+        ISpeechAudioBufferInfo *This,
         LONG EventBias);
 
     END_INTERFACE
 } ISpeechAudioBufferInfoVtbl;
+
 interface ISpeechAudioBufferInfo {
     CONST_VTBL ISpeechAudioBufferInfoVtbl* lpVtbl;
 };
@@ -16361,54 +14229,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_MinNotification_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *MinNotification);
-void __RPC_STUB ISpeechAudioBufferInfo_get_MinNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_MinNotification_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG MinNotification);
-void __RPC_STUB ISpeechAudioBufferInfo_put_MinNotification_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_BufferSize_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *BufferSize);
-void __RPC_STUB ISpeechAudioBufferInfo_get_BufferSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_BufferSize_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG BufferSize);
-void __RPC_STUB ISpeechAudioBufferInfo_put_BufferSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_get_EventBias_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG *EventBias);
-void __RPC_STUB ISpeechAudioBufferInfo_get_EventBias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechAudioBufferInfo_put_EventBias_Proxy(
-    ISpeechAudioBufferInfo* This,
-    LONG EventBias);
-void __RPC_STUB ISpeechAudioBufferInfo_put_EventBias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechAudioBufferInfo_INTERFACE_DEFINED__ */
 
@@ -16475,29 +14295,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechWaveFormatEx* This);
+        ISpeechWaveFormatEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechWaveFormatEx* This);
+        ISpeechWaveFormatEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16505,7 +14325,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16517,63 +14337,64 @@
 
     /*** ISpeechWaveFormatEx methods ***/
     HRESULT (STDMETHODCALLTYPE *get_FormatTag)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *FormatTag);
 
     HRESULT (STDMETHODCALLTYPE *put_FormatTag)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short FormatTag);
 
     HRESULT (STDMETHODCALLTYPE *get_Channels)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *Channels);
 
     HRESULT (STDMETHODCALLTYPE *put_Channels)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short Channels);
 
     HRESULT (STDMETHODCALLTYPE *get_SamplesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG *SamplesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *put_SamplesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG SamplesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *get_AvgBytesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG *AvgBytesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *put_AvgBytesPerSec)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         LONG AvgBytesPerSec);
 
     HRESULT (STDMETHODCALLTYPE *get_BlockAlign)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *BlockAlign);
 
     HRESULT (STDMETHODCALLTYPE *put_BlockAlign)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short BlockAlign);
 
     HRESULT (STDMETHODCALLTYPE *get_BitsPerSample)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short *BitsPerSample);
 
     HRESULT (STDMETHODCALLTYPE *put_BitsPerSample)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         short BitsPerSample);
 
     HRESULT (STDMETHODCALLTYPE *get_ExtraData)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         VARIANT *ExtraData);
 
     HRESULT (STDMETHODCALLTYPE *put_ExtraData)(
-        ISpeechWaveFormatEx* This,
+        ISpeechWaveFormatEx *This,
         VARIANT ExtraData);
 
     END_INTERFACE
 } ISpeechWaveFormatExVtbl;
+
 interface ISpeechWaveFormatEx {
     CONST_VTBL ISpeechWaveFormatExVtbl* lpVtbl;
 };
@@ -16676,118 +14497,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_FormatTag_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *FormatTag);
-void __RPC_STUB ISpeechWaveFormatEx_get_FormatTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_FormatTag_Proxy(
-    ISpeechWaveFormatEx* This,
-    short FormatTag);
-void __RPC_STUB ISpeechWaveFormatEx_put_FormatTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_Channels_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *Channels);
-void __RPC_STUB ISpeechWaveFormatEx_get_Channels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_Channels_Proxy(
-    ISpeechWaveFormatEx* This,
-    short Channels);
-void __RPC_STUB ISpeechWaveFormatEx_put_Channels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_SamplesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG *SamplesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_get_SamplesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_SamplesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG SamplesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_put_SamplesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_AvgBytesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG *AvgBytesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_get_AvgBytesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_AvgBytesPerSec_Proxy(
-    ISpeechWaveFormatEx* This,
-    LONG AvgBytesPerSec);
-void __RPC_STUB ISpeechWaveFormatEx_put_AvgBytesPerSec_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BlockAlign_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *BlockAlign);
-void __RPC_STUB ISpeechWaveFormatEx_get_BlockAlign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BlockAlign_Proxy(
-    ISpeechWaveFormatEx* This,
-    short BlockAlign);
-void __RPC_STUB ISpeechWaveFormatEx_put_BlockAlign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_BitsPerSample_Proxy(
-    ISpeechWaveFormatEx* This,
-    short *BitsPerSample);
-void __RPC_STUB ISpeechWaveFormatEx_get_BitsPerSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_BitsPerSample_Proxy(
-    ISpeechWaveFormatEx* This,
-    short BitsPerSample);
-void __RPC_STUB ISpeechWaveFormatEx_put_BitsPerSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_get_ExtraData_Proxy(
-    ISpeechWaveFormatEx* This,
-    VARIANT *ExtraData);
-void __RPC_STUB ISpeechWaveFormatEx_get_ExtraData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechWaveFormatEx_put_ExtraData_Proxy(
-    ISpeechWaveFormatEx* This,
-    VARIANT ExtraData);
-void __RPC_STUB ISpeechWaveFormatEx_put_ExtraData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechWaveFormatEx_INTERFACE_DEFINED__ */
 
@@ -16924,29 +14633,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -16954,7 +14663,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -16966,142 +14675,142 @@
 
     /*** ISpeechVoice methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechVoiceStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *get_Voice)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken **Voice);
 
     HRESULT (STDMETHODCALLTYPE *putref_Voice)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken *Voice);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioOutput)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken **AudioOutput);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioOutput)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechObjectToken *AudioOutput);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioOutputStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream **AudioOutputStream);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioOutputStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream *AudioOutputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_Rate)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Rate);
 
     HRESULT (STDMETHODCALLTYPE *put_Rate)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG Rate);
 
     HRESULT (STDMETHODCALLTYPE *get_Volume)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_Volume)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG Volume);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowAudioOutputFormatChangesOnNextSet)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowAudioOutputFormatChangesOnNextSet)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         VARIANT_BOOL *Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_EventInterests)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents *EventInterestFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_EventInterests)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents EventInterestFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_Priority)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoicePriority Priority);
 
     HRESULT (STDMETHODCALLTYPE *get_Priority)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoicePriority *Priority);
 
     HRESULT (STDMETHODCALLTYPE *put_AlertBoundary)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents Boundary);
 
     HRESULT (STDMETHODCALLTYPE *get_AlertBoundary)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         SpeechVoiceEvents *Boundary);
 
     HRESULT (STDMETHODCALLTYPE *put_SynchronousSpeakTimeout)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *get_SynchronousSpeakTimeout)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *msTimeout);
 
     HRESULT (STDMETHODCALLTYPE *Speak)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR Text,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SpeakStream)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         ISpeechBaseStream *Stream,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpeechVoice* This);
+        ISpeechVoice *This);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         const BSTR Type,
         LONG NumItems,
         LONG *NumSkipped);
 
     HRESULT (STDMETHODCALLTYPE *GetVoices)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioOutputs)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *WaitUntilDone)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG msTimeout,
         VARIANT_BOOL *Done);
 
     HRESULT (STDMETHODCALLTYPE *SpeakCompleteEvent)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG *Handle);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechVoice* This,
+        ISpeechVoice *This,
         LONG hWndParent,
         BSTR Title,
         const BSTR TypeOfUI,
@@ -17109,6 +14818,7 @@
 
     END_INTERFACE
 } ISpeechVoiceVtbl;
+
 interface ISpeechVoice {
     CONST_VTBL ISpeechVoiceVtbl* lpVtbl;
 };
@@ -17283,276 +14993,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Status_Proxy(
-    ISpeechVoice* This,
-    ISpeechVoiceStatus **Status);
-void __RPC_STUB ISpeechVoice_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Voice_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken **Voice);
-void __RPC_STUB ISpeechVoice_get_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_Voice_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken *Voice);
-void __RPC_STUB ISpeechVoice_putref_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutput_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken **AudioOutput);
-void __RPC_STUB ISpeechVoice_get_AudioOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutput_Proxy(
-    ISpeechVoice* This,
-    ISpeechObjectToken *AudioOutput);
-void __RPC_STUB ISpeechVoice_putref_AudioOutput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AudioOutputStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream **AudioOutputStream);
-void __RPC_STUB ISpeechVoice_get_AudioOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_putref_AudioOutputStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream *AudioOutputStream);
-void __RPC_STUB ISpeechVoice_putref_AudioOutputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Rate_Proxy(
-    ISpeechVoice* This,
-    LONG *Rate);
-void __RPC_STUB ISpeechVoice_get_Rate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Rate_Proxy(
-    ISpeechVoice* This,
-    LONG Rate);
-void __RPC_STUB ISpeechVoice_put_Rate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Volume_Proxy(
-    ISpeechVoice* This,
-    LONG *Volume);
-void __RPC_STUB ISpeechVoice_get_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Volume_Proxy(
-    ISpeechVoice* This,
-    LONG Volume);
-void __RPC_STUB ISpeechVoice_put_Volume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Proxy(
-    ISpeechVoice* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechVoice_put_AllowAudioOutputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Proxy(
-    ISpeechVoice* This,
-    VARIANT_BOOL *Allow);
-void __RPC_STUB ISpeechVoice_get_AllowAudioOutputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_EventInterests_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents *EventInterestFlags);
-void __RPC_STUB ISpeechVoice_get_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_EventInterests_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents EventInterestFlags);
-void __RPC_STUB ISpeechVoice_put_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_Priority_Proxy(
-    ISpeechVoice* This,
-    SpeechVoicePriority Priority);
-void __RPC_STUB ISpeechVoice_put_Priority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_Priority_Proxy(
-    ISpeechVoice* This,
-    SpeechVoicePriority *Priority);
-void __RPC_STUB ISpeechVoice_get_Priority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_AlertBoundary_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents Boundary);
-void __RPC_STUB ISpeechVoice_put_AlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_AlertBoundary_Proxy(
-    ISpeechVoice* This,
-    SpeechVoiceEvents *Boundary);
-void __RPC_STUB ISpeechVoice_get_AlertBoundary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_put_SynchronousSpeakTimeout_Proxy(
-    ISpeechVoice* This,
-    LONG msTimeout);
-void __RPC_STUB ISpeechVoice_put_SynchronousSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_get_SynchronousSpeakTimeout_Proxy(
-    ISpeechVoice* This,
-    LONG *msTimeout);
-void __RPC_STUB ISpeechVoice_get_SynchronousSpeakTimeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Speak_Proxy(
-    ISpeechVoice* This,
-    BSTR Text,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoice_Speak_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakStream_Proxy(
-    ISpeechVoice* This,
-    ISpeechBaseStream *Stream,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoice_SpeakStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Pause_Proxy(
-    ISpeechVoice* This);
-void __RPC_STUB ISpeechVoice_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Resume_Proxy(
-    ISpeechVoice* This);
-void __RPC_STUB ISpeechVoice_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_Skip_Proxy(
-    ISpeechVoice* This,
-    const BSTR Type,
-    LONG NumItems,
-    LONG *NumSkipped);
-void __RPC_STUB ISpeechVoice_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_GetVoices_Proxy(
-    ISpeechVoice* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechVoice_GetVoices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_GetAudioOutputs_Proxy(
-    ISpeechVoice* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechVoice_GetAudioOutputs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_WaitUntilDone_Proxy(
-    ISpeechVoice* This,
-    LONG msTimeout,
-    VARIANT_BOOL *Done);
-void __RPC_STUB ISpeechVoice_WaitUntilDone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_SpeakCompleteEvent_Proxy(
-    ISpeechVoice* This,
-    LONG *Handle);
-void __RPC_STUB ISpeechVoice_SpeakCompleteEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_IsUISupported_Proxy(
-    ISpeechVoice* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechVoice_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoice_DisplayUI_Proxy(
-    ISpeechVoice* This,
-    LONG hWndParent,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData);
-void __RPC_STUB ISpeechVoice_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechVoice_INTERFACE_DEFINED__ */
 
@@ -17613,29 +15053,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechVoiceStatus* This);
+        ISpeechVoiceStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechVoiceStatus* This);
+        ISpeechVoiceStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -17643,7 +15083,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -17655,55 +15095,56 @@
 
     /*** ISpeechVoiceStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_LastStreamNumberQueued)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_LastHResult)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *HResult);
 
     HRESULT (STDMETHODCALLTYPE *get_RunningState)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         SpeechRunState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_InputWordPosition)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Position);
 
     HRESULT (STDMETHODCALLTYPE *get_InputWordLength)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_InputSentencePosition)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Position);
 
     HRESULT (STDMETHODCALLTYPE *get_InputSentenceLength)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_LastBookmark)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         BSTR *Bookmark);
 
     HRESULT (STDMETHODCALLTYPE *get_LastBookmarkId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         LONG *BookmarkId);
 
     HRESULT (STDMETHODCALLTYPE *get_PhonemeId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         short *PhoneId);
 
     HRESULT (STDMETHODCALLTYPE *get_VisemeId)(
-        ISpeechVoiceStatus* This,
+        ISpeechVoiceStatus *This,
         short *VisemeId);
 
     END_INTERFACE
 } ISpeechVoiceStatusVtbl;
+
 interface ISpeechVoiceStatus {
     CONST_VTBL ISpeechVoiceStatusVtbl* lpVtbl;
 };
@@ -17798,102 +15239,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_CurrentStreamNumber_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoiceStatus_get_CurrentStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastStreamNumberQueued_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechVoiceStatus_get_LastStreamNumberQueued_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastHResult_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *HResult);
-void __RPC_STUB ISpeechVoiceStatus_get_LastHResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_RunningState_Proxy(
-    ISpeechVoiceStatus* This,
-    SpeechRunState *State);
-void __RPC_STUB ISpeechVoiceStatus_get_RunningState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordPosition_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Position);
-void __RPC_STUB ISpeechVoiceStatus_get_InputWordPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputWordLength_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Length);
-void __RPC_STUB ISpeechVoiceStatus_get_InputWordLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentencePosition_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Position);
-void __RPC_STUB ISpeechVoiceStatus_get_InputSentencePosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_InputSentenceLength_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *Length);
-void __RPC_STUB ISpeechVoiceStatus_get_InputSentenceLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmark_Proxy(
-    ISpeechVoiceStatus* This,
-    BSTR *Bookmark);
-void __RPC_STUB ISpeechVoiceStatus_get_LastBookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_LastBookmarkId_Proxy(
-    ISpeechVoiceStatus* This,
-    LONG *BookmarkId);
-void __RPC_STUB ISpeechVoiceStatus_get_LastBookmarkId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_PhonemeId_Proxy(
-    ISpeechVoiceStatus* This,
-    short *PhoneId);
-void __RPC_STUB ISpeechVoiceStatus_get_PhonemeId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechVoiceStatus_get_VisemeId_Proxy(
-    ISpeechVoiceStatus* This,
-    short *VisemeId);
-void __RPC_STUB ISpeechVoiceStatus_get_VisemeId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechVoiceStatus_INTERFACE_DEFINED__ */
 
@@ -18410,29 +15755,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _ISpeechVoiceEvents* This);
+        _ISpeechVoiceEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _ISpeechVoiceEvents* This);
+        _ISpeechVoiceEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18440,7 +15785,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _ISpeechVoiceEvents* This,
+        _ISpeechVoiceEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18452,6 +15797,7 @@
 
     END_INTERFACE
 } _ISpeechVoiceEventsVtbl;
+
 interface _ISpeechVoiceEvents {
     CONST_VTBL _ISpeechVoiceEventsVtbl* lpVtbl;
 };
@@ -18619,29 +15965,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecognizer* This);
+        ISpeechRecognizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecognizer* This);
+        ISpeechRecognizer *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -18649,7 +15995,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -18661,133 +16007,134 @@
 
     /*** ISpeechRecognizer methods ***/
     HRESULT (STDMETHODCALLTYPE *putref_Recognizer)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *get_Recognizer)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowAudioInputFormatChangesOnNextSet)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowAudioInputFormatChangesOnNextSet)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL *Allow);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioInput)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *AudioInput);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInput)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **AudioInput);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioInputStream)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechBaseStream *AudioInputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInputStream)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechBaseStream **AudioInputStream);
 
     HRESULT (STDMETHODCALLTYPE *get_IsShared)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT_BOOL *Shared);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechRecognizerState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechRecognizerState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_Status)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechRecognizerStatus **Status);
 
     HRESULT (STDMETHODCALLTYPE *putref_Profile)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken *Profile);
 
     HRESULT (STDMETHODCALLTYPE *get_Profile)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechObjectToken **Profile);
 
     HRESULT (STDMETHODCALLTYPE *EmulateRecognition)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         VARIANT TextElements,
         VARIANT *ElementDisplayAttributes,
         LONG LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *CreateRecoContext)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         ISpeechRecoContext **NewContext);
 
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         SpeechFormatType Type,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyNumber)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         LONG Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyNumber)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         LONG *Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyString)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         const BSTR Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyString)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR Name,
         BSTR *Value,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *IsUISupported)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData,
         VARIANT_BOOL *Supported);
 
     HRESULT (STDMETHODCALLTYPE *DisplayUI)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         LONG hWndParent,
         BSTR Title,
         const BSTR TypeOfUI,
         const VARIANT *ExtraData);
 
     HRESULT (STDMETHODCALLTYPE *GetRecognizers)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetAudioInputs)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     HRESULT (STDMETHODCALLTYPE *GetProfiles)(
-        ISpeechRecognizer* This,
+        ISpeechRecognizer *This,
         BSTR RequiredAttributes,
         BSTR OptionalAttributes,
         ISpeechObjectTokens **ObjectTokens);
 
     END_INTERFACE
 } ISpeechRecognizerVtbl;
+
 interface ISpeechRecognizer {
     CONST_VTBL ISpeechRecognizerVtbl* lpVtbl;
 };
@@ -18938,236 +16285,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Recognizer_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *Recognizer);
-void __RPC_STUB ISpeechRecognizer_putref_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Recognizer_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **Recognizer);
-void __RPC_STUB ISpeechRecognizer_get_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechRecognizer_put_AllowAudioInputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL *Allow);
-void __RPC_STUB ISpeechRecognizer_get_AllowAudioInputFormatChangesOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInput_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *AudioInput);
-void __RPC_STUB ISpeechRecognizer_putref_AudioInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInput_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **AudioInput);
-void __RPC_STUB ISpeechRecognizer_get_AudioInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_AudioInputStream_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechBaseStream *AudioInputStream);
-void __RPC_STUB ISpeechRecognizer_putref_AudioInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_AudioInputStream_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechBaseStream **AudioInputStream);
-void __RPC_STUB ISpeechRecognizer_get_AudioInputStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_IsShared_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT_BOOL *Shared);
-void __RPC_STUB ISpeechRecognizer_get_IsShared_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_put_State_Proxy(
-    ISpeechRecognizer* This,
-    SpeechRecognizerState State);
-void __RPC_STUB ISpeechRecognizer_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_State_Proxy(
-    ISpeechRecognizer* This,
-    SpeechRecognizerState *State);
-void __RPC_STUB ISpeechRecognizer_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Status_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechRecognizerStatus **Status);
-void __RPC_STUB ISpeechRecognizer_get_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_putref_Profile_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken *Profile);
-void __RPC_STUB ISpeechRecognizer_putref_Profile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_get_Profile_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechObjectToken **Profile);
-void __RPC_STUB ISpeechRecognizer_get_Profile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_EmulateRecognition_Proxy(
-    ISpeechRecognizer* This,
-    VARIANT TextElements,
-    VARIANT *ElementDisplayAttributes,
-    LONG LanguageId);
-void __RPC_STUB ISpeechRecognizer_EmulateRecognition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_CreateRecoContext_Proxy(
-    ISpeechRecognizer* This,
-    ISpeechRecoContext **NewContext);
-void __RPC_STUB ISpeechRecognizer_CreateRecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetFormat_Proxy(
-    ISpeechRecognizer* This,
-    SpeechFormatType Type,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecognizer_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyNumber_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    LONG Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_SetPropertyNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyNumber_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    LONG *Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_GetPropertyNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_SetPropertyString_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    const BSTR Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_SetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetPropertyString_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR Name,
-    BSTR *Value,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_GetPropertyString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_IsUISupported_Proxy(
-    ISpeechRecognizer* This,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData,
-    VARIANT_BOOL *Supported);
-void __RPC_STUB ISpeechRecognizer_IsUISupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_DisplayUI_Proxy(
-    ISpeechRecognizer* This,
-    LONG hWndParent,
-    BSTR Title,
-    const BSTR TypeOfUI,
-    const VARIANT *ExtraData);
-void __RPC_STUB ISpeechRecognizer_DisplayUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetRecognizers_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetRecognizers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetAudioInputs_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetAudioInputs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizer_GetProfiles_Proxy(
-    ISpeechRecognizer* This,
-    BSTR RequiredAttributes,
-    BSTR OptionalAttributes,
-    ISpeechObjectTokens **ObjectTokens);
-void __RPC_STUB ISpeechRecognizer_GetProfiles_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecognizer_INTERFACE_DEFINED__ */
 
@@ -19210,29 +16327,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecognizerStatus* This);
+        ISpeechRecognizerStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecognizerStatus* This);
+        ISpeechRecognizerStatus *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19240,7 +16357,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19252,31 +16369,32 @@
 
     /*** ISpeechRecognizerStatus methods ***/
     HRESULT (STDMETHODCALLTYPE *get_AudioStatus)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         ISpeechAudioStatus **AudioStatus);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamPosition)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         VARIANT *pCurrentStreamPos);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentStreamNumber)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfActiveRules)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         LONG *NumberOfActiveRules);
 
     HRESULT (STDMETHODCALLTYPE *get_ClsidEngine)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         BSTR *ClsidEngine);
 
     HRESULT (STDMETHODCALLTYPE *get_SupportedLanguages)(
-        ISpeechRecognizerStatus* This,
+        ISpeechRecognizerStatus *This,
         VARIANT *SupportedLanguages);
 
     END_INTERFACE
 } ISpeechRecognizerStatusVtbl;
+
 interface ISpeechRecognizerStatus {
     CONST_VTBL ISpeechRecognizerStatusVtbl* lpVtbl;
 };
@@ -19347,54 +16465,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_AudioStatus_Proxy(
-    ISpeechRecognizerStatus* This,
-    ISpeechAudioStatus **AudioStatus);
-void __RPC_STUB ISpeechRecognizerStatus_get_AudioStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamPosition_Proxy(
-    ISpeechRecognizerStatus* This,
-    VARIANT *pCurrentStreamPos);
-void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_CurrentStreamNumber_Proxy(
-    ISpeechRecognizerStatus* This,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecognizerStatus_get_CurrentStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_NumberOfActiveRules_Proxy(
-    ISpeechRecognizerStatus* This,
-    LONG *NumberOfActiveRules);
-void __RPC_STUB ISpeechRecognizerStatus_get_NumberOfActiveRules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_ClsidEngine_Proxy(
-    ISpeechRecognizerStatus* This,
-    BSTR *ClsidEngine);
-void __RPC_STUB ISpeechRecognizerStatus_get_ClsidEngine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecognizerStatus_get_SupportedLanguages_Proxy(
-    ISpeechRecognizerStatus* This,
-    VARIANT *SupportedLanguages);
-void __RPC_STUB ISpeechRecognizerStatus_get_SupportedLanguages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecognizerStatus_INTERFACE_DEFINED__ */
 
@@ -19498,29 +16568,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -19528,7 +16598,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -19540,109 +16610,110 @@
 
     /*** ISpeechRecoContext methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Recognizer)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechRecognizer **Recognizer);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioInputInterferenceStatus)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechInterference *Interference);
 
     HRESULT (STDMETHODCALLTYPE *get_RequestedUIType)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         BSTR *UIType);
 
     HRESULT (STDMETHODCALLTYPE *putref_Voice)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechVoice *Voice);
 
     HRESULT (STDMETHODCALLTYPE *get_Voice)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechVoice **Voice);
 
     HRESULT (STDMETHODCALLTYPE *put_AllowVoiceFormatMatchingOnNextSet)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT_BOOL Allow);
 
     HRESULT (STDMETHODCALLTYPE *get_AllowVoiceFormatMatchingOnNextSet)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT_BOOL *pAllow);
 
     HRESULT (STDMETHODCALLTYPE *put_VoicePurgeEvent)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *get_VoicePurgeEvent)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents *EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *put_EventInterests)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *get_EventInterests)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoEvents *EventInterest);
 
     HRESULT (STDMETHODCALLTYPE *put_CmdMaxAlternates)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         LONG MaxAlternates);
 
     HRESULT (STDMETHODCALLTYPE *get_CmdMaxAlternates)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         LONG *MaxAlternates);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoContextState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRecoContextState *State);
 
     HRESULT (STDMETHODCALLTYPE *put_RetainedAudio)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRetainedAudioOptions Option);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedAudio)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechRetainedAudioOptions *Option);
 
     HRESULT (STDMETHODCALLTYPE *putref_RetainedAudioFormat)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedAudioFormat)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        ISpeechRecoContext* This);
+        ISpeechRecoContext *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateGrammar)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT GrammarId,
         ISpeechRecoGrammar **Grammar);
 
     HRESULT (STDMETHODCALLTYPE *CreateResultFromMemory)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         VARIANT *ResultBlock,
         ISpeechRecoResult **Result);
 
     HRESULT (STDMETHODCALLTYPE *Bookmark)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         SpeechBookmarkOptions Options,
         VARIANT StreamPos,
         VARIANT BookmarkId);
 
     HRESULT (STDMETHODCALLTYPE *SetAdaptationData)(
-        ISpeechRecoContext* This,
+        ISpeechRecoContext *This,
         BSTR AdaptationString);
 
     END_INTERFACE
 } ISpeechRecoContextVtbl;
+
 interface ISpeechRecoContext {
     CONST_VTBL ISpeechRecoContextVtbl* lpVtbl;
 };
@@ -19789,208 +16860,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Recognizer_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechRecognizer **Recognizer);
-void __RPC_STUB ISpeechRecoContext_get_Recognizer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AudioInputInterferenceStatus_Proxy(
-    ISpeechRecoContext* This,
-    SpeechInterference *Interference);
-void __RPC_STUB ISpeechRecoContext_get_AudioInputInterferenceStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RequestedUIType_Proxy(
-    ISpeechRecoContext* This,
-    BSTR *UIType);
-void __RPC_STUB ISpeechRecoContext_get_RequestedUIType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_Voice_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechVoice *Voice);
-void __RPC_STUB ISpeechRecoContext_putref_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_Voice_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechVoice **Voice);
-void __RPC_STUB ISpeechRecoContext_get_Voice_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT_BOOL Allow);
-void __RPC_STUB ISpeechRecoContext_put_AllowVoiceFormatMatchingOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT_BOOL *pAllow);
-void __RPC_STUB ISpeechRecoContext_get_AllowVoiceFormatMatchingOnNextSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_VoicePurgeEvent_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents EventInterest);
-void __RPC_STUB ISpeechRecoContext_put_VoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_VoicePurgeEvent_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents *EventInterest);
-void __RPC_STUB ISpeechRecoContext_get_VoicePurgeEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_EventInterests_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents EventInterest);
-void __RPC_STUB ISpeechRecoContext_put_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_EventInterests_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoEvents *EventInterest);
-void __RPC_STUB ISpeechRecoContext_get_EventInterests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_CmdMaxAlternates_Proxy(
-    ISpeechRecoContext* This,
-    LONG MaxAlternates);
-void __RPC_STUB ISpeechRecoContext_put_CmdMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_CmdMaxAlternates_Proxy(
-    ISpeechRecoContext* This,
-    LONG *MaxAlternates);
-void __RPC_STUB ISpeechRecoContext_get_CmdMaxAlternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_State_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoContextState State);
-void __RPC_STUB ISpeechRecoContext_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_State_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRecoContextState *State);
-void __RPC_STUB ISpeechRecoContext_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_put_RetainedAudio_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRetainedAudioOptions Option);
-void __RPC_STUB ISpeechRecoContext_put_RetainedAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudio_Proxy(
-    ISpeechRecoContext* This,
-    SpeechRetainedAudioOptions *Option);
-void __RPC_STUB ISpeechRecoContext_get_RetainedAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_putref_RetainedAudioFormat_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoContext_putref_RetainedAudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_get_RetainedAudioFormat_Proxy(
-    ISpeechRecoContext* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoContext_get_RetainedAudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Pause_Proxy(
-    ISpeechRecoContext* This);
-void __RPC_STUB ISpeechRecoContext_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Resume_Proxy(
-    ISpeechRecoContext* This);
-void __RPC_STUB ISpeechRecoContext_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateGrammar_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT GrammarId,
-    ISpeechRecoGrammar **Grammar);
-void __RPC_STUB ISpeechRecoContext_CreateGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_CreateResultFromMemory_Proxy(
-    ISpeechRecoContext* This,
-    VARIANT *ResultBlock,
-    ISpeechRecoResult **Result);
-void __RPC_STUB ISpeechRecoContext_CreateResultFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_Bookmark_Proxy(
-    ISpeechRecoContext* This,
-    SpeechBookmarkOptions Options,
-    VARIANT StreamPos,
-    VARIANT BookmarkId);
-void __RPC_STUB ISpeechRecoContext_Bookmark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoContext_SetAdaptationData_Proxy(
-    ISpeechRecoContext* This,
-    BSTR AdaptationString);
-void __RPC_STUB ISpeechRecoContext_SetAdaptationData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoContext_INTERFACE_DEFINED__ */
 
@@ -20089,29 +16958,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20119,7 +16988,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20131,42 +17000,42 @@
 
     /*** ISpeechRecoGrammar methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         VARIANT *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *put_State)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechGrammarState State);
 
     HRESULT (STDMETHODCALLTYPE *get_State)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechGrammarState *State);
 
     HRESULT (STDMETHODCALLTYPE *get_Rules)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechGrammarRules **Rules);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechLanguageId NewLanguage);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromFile)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR FileName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromObject)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR ClassId,
         const BSTR GrammarName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromResource)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         LONG hModule,
         VARIANT ResourceName,
         VARIANT ResourceType,
@@ -20174,56 +17043,57 @@
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromMemory)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         VARIANT GrammarData,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdLoadFromProprietaryGrammar)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR ProprietaryGuid,
         const BSTR ProprietaryString,
         VARIANT ProprietaryData,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *CmdSetRuleState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Name,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *CmdSetRuleIdState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         LONG RuleId,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *DictationLoad)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR TopicName,
         SpeechLoadOption LoadOption);
 
     HRESULT (STDMETHODCALLTYPE *DictationUnload)(
-        ISpeechRecoGrammar* This);
+        ISpeechRecoGrammar *This);
 
     HRESULT (STDMETHODCALLTYPE *DictationSetState)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         SpeechRuleState State);
 
     HRESULT (STDMETHODCALLTYPE *SetWordSequenceData)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Text,
         LONG TextLength,
         ISpeechTextSelectionInformation *Info);
 
     HRESULT (STDMETHODCALLTYPE *SetTextSelection)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         ISpeechTextSelectionInformation *Info);
 
     HRESULT (STDMETHODCALLTYPE *IsPronounceable)(
-        ISpeechRecoGrammar* This,
+        ISpeechRecoGrammar *This,
         const BSTR Word,
         SpeechWordPronounceable *WordPronounceable);
 
     END_INTERFACE
 } ISpeechRecoGrammarVtbl;
+
 interface ISpeechRecoGrammar {
     CONST_VTBL ISpeechRecoGrammarVtbl* lpVtbl;
 };
@@ -20346,174 +17216,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Id_Proxy(
-    ISpeechRecoGrammar* This,
-    VARIANT *Id);
-void __RPC_STUB ISpeechRecoGrammar_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_RecoContext_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoGrammar_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_put_State_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechGrammarState State);
-void __RPC_STUB ISpeechRecoGrammar_put_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_State_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechGrammarState *State);
-void __RPC_STUB ISpeechRecoGrammar_get_State_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_get_Rules_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechGrammarRules **Rules);
-void __RPC_STUB ISpeechRecoGrammar_get_Rules_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_Reset_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechLanguageId NewLanguage);
-void __RPC_STUB ISpeechRecoGrammar_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromFile_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR FileName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromObject_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR ClassId,
-    const BSTR GrammarName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromResource_Proxy(
-    ISpeechRecoGrammar* This,
-    LONG hModule,
-    VARIANT ResourceName,
-    VARIANT ResourceType,
-    SpeechLanguageId LanguageId,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromMemory_Proxy(
-    ISpeechRecoGrammar* This,
-    VARIANT GrammarData,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR ProprietaryGuid,
-    const BSTR ProprietaryString,
-    VARIANT ProprietaryData,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_CmdLoadFromProprietaryGrammar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleState_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Name,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_CmdSetRuleIdState_Proxy(
-    ISpeechRecoGrammar* This,
-    LONG RuleId,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_CmdSetRuleIdState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationLoad_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR TopicName,
-    SpeechLoadOption LoadOption);
-void __RPC_STUB ISpeechRecoGrammar_DictationLoad_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationUnload_Proxy(
-    ISpeechRecoGrammar* This);
-void __RPC_STUB ISpeechRecoGrammar_DictationUnload_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_DictationSetState_Proxy(
-    ISpeechRecoGrammar* This,
-    SpeechRuleState State);
-void __RPC_STUB ISpeechRecoGrammar_DictationSetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetWordSequenceData_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Text,
-    LONG TextLength,
-    ISpeechTextSelectionInformation *Info);
-void __RPC_STUB ISpeechRecoGrammar_SetWordSequenceData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_SetTextSelection_Proxy(
-    ISpeechRecoGrammar* This,
-    ISpeechTextSelectionInformation *Info);
-void __RPC_STUB ISpeechRecoGrammar_SetTextSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoGrammar_IsPronounceable_Proxy(
-    ISpeechRecoGrammar* This,
-    const BSTR Word,
-    SpeechWordPronounceable *WordPronounceable);
-void __RPC_STUB ISpeechRecoGrammar_IsPronounceable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoGrammar_INTERFACE_DEFINED__ */
 
@@ -20538,29 +17240,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        _ISpeechRecoContextEvents* This);
+        _ISpeechRecoContextEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        _ISpeechRecoContextEvents* This);
+        _ISpeechRecoContextEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20568,7 +17270,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        _ISpeechRecoContextEvents* This,
+        _ISpeechRecoContextEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20580,6 +17282,7 @@
 
     END_INTERFACE
 } _ISpeechRecoContextEventsVtbl;
+
 interface _ISpeechRecoContextEvents {
     CONST_VTBL _ISpeechRecoContextEventsVtbl* lpVtbl;
 };
@@ -20669,29 +17372,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20699,7 +17402,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20711,35 +17414,36 @@
 
     /*** ISpeechGrammarRule methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Attributes)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         SpeechRuleAttributes *Attributes);
 
     HRESULT (STDMETHODCALLTYPE *get_InitialState)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         ISpeechGrammarRuleState **State);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        ISpeechGrammarRule* This);
+        ISpeechGrammarRule *This);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         const BSTR ResourceName,
         const BSTR ResourceValue);
 
     HRESULT (STDMETHODCALLTYPE *AddState)(
-        ISpeechGrammarRule* This,
+        ISpeechGrammarRule *This,
         ISpeechGrammarRuleState **State);
 
     END_INTERFACE
 } ISpeechGrammarRuleVtbl;
+
 interface ISpeechGrammarRule {
     CONST_VTBL ISpeechGrammarRuleVtbl* lpVtbl;
 };
@@ -20814,62 +17518,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Attributes_Proxy(
-    ISpeechGrammarRule* This,
-    SpeechRuleAttributes *Attributes);
-void __RPC_STUB ISpeechGrammarRule_get_Attributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_InitialState_Proxy(
-    ISpeechGrammarRule* This,
-    ISpeechGrammarRuleState **State);
-void __RPC_STUB ISpeechGrammarRule_get_InitialState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Name_Proxy(
-    ISpeechGrammarRule* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechGrammarRule_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_get_Id_Proxy(
-    ISpeechGrammarRule* This,
-    LONG *Id);
-void __RPC_STUB ISpeechGrammarRule_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_Clear_Proxy(
-    ISpeechGrammarRule* This);
-void __RPC_STUB ISpeechGrammarRule_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddResource_Proxy(
-    ISpeechGrammarRule* This,
-    const BSTR ResourceName,
-    const BSTR ResourceValue);
-void __RPC_STUB ISpeechGrammarRule_AddResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRule_AddState_Proxy(
-    ISpeechGrammarRule* This,
-    ISpeechGrammarRuleState **State);
-void __RPC_STUB ISpeechGrammarRule_AddState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRule_INTERFACE_DEFINED__ */
 
@@ -20924,29 +17572,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -20954,7 +17602,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -20966,44 +17614,45 @@
 
     /*** ISpeechGrammarRules methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *FindRule)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         VARIANT RuleNameOrId,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         LONG Index,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         IUnknown **EnumVARIANT);
 
     HRESULT (STDMETHODCALLTYPE *get_Dynamic)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         VARIANT_BOOL *Dynamic);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         BSTR RuleName,
         SpeechRuleAttributes Attributes,
         LONG RuleId,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpeechGrammarRules* This);
+        ISpeechGrammarRules *This);
 
     HRESULT (STDMETHODCALLTYPE *CommitAndSave)(
-        ISpeechGrammarRules* This,
+        ISpeechGrammarRules *This,
         BSTR *ErrorText,
         VARIANT *SaveStream);
 
     END_INTERFACE
 } ISpeechGrammarRulesVtbl;
+
 interface ISpeechGrammarRules {
     CONST_VTBL ISpeechGrammarRulesVtbl* lpVtbl;
 };
@@ -21082,75 +17731,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Count_Proxy(
-    ISpeechGrammarRules* This,
-    LONG *Count);
-void __RPC_STUB ISpeechGrammarRules_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_FindRule_Proxy(
-    ISpeechGrammarRules* This,
-    VARIANT RuleNameOrId,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_FindRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Item_Proxy(
-    ISpeechGrammarRules* This,
-    LONG Index,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get__NewEnum_Proxy(
-    ISpeechGrammarRules* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechGrammarRules_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_get_Dynamic_Proxy(
-    ISpeechGrammarRules* This,
-    VARIANT_BOOL *Dynamic);
-void __RPC_STUB ISpeechGrammarRules_get_Dynamic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Add_Proxy(
-    ISpeechGrammarRules* This,
-    BSTR RuleName,
-    SpeechRuleAttributes Attributes,
-    LONG RuleId,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRules_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_Commit_Proxy(
-    ISpeechGrammarRules* This);
-void __RPC_STUB ISpeechGrammarRules_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRules_CommitAndSave_Proxy(
-    ISpeechGrammarRules* This,
-    BSTR *ErrorText,
-    VARIANT *SaveStream);
-void __RPC_STUB ISpeechGrammarRules_CommitAndSave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRules_INTERFACE_DEFINED__ */
 
@@ -21207,29 +17787,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleState* This);
+        ISpeechGrammarRuleState *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleState* This);
+        ISpeechGrammarRuleState *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21237,7 +17817,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21249,15 +17829,15 @@
 
     /*** ISpeechGrammarRuleState methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Transitions)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleStateTransitions **Transitions);
 
     HRESULT (STDMETHODCALLTYPE *AddWordTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestState,
         const BSTR Words,
         const BSTR Separators,
@@ -21268,7 +17848,7 @@
         float Weight);
 
     HRESULT (STDMETHODCALLTYPE *AddRuleTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestinationState,
         ISpeechGrammarRule *Rule,
         const BSTR PropertyName,
@@ -21277,7 +17857,7 @@
         float Weight);
 
     HRESULT (STDMETHODCALLTYPE *AddSpecialTransition)(
-        ISpeechGrammarRuleState* This,
+        ISpeechGrammarRuleState *This,
         ISpeechGrammarRuleState *DestinationState,
         SpeechSpecialTransitionType Type,
         const BSTR PropertyName,
@@ -21287,6 +17867,7 @@
 
     END_INTERFACE
 } ISpeechGrammarRuleStateVtbl;
+
 interface ISpeechGrammarRuleState {
     CONST_VTBL ISpeechGrammarRuleStateVtbl* lpVtbl;
 };
@@ -21353,63 +17934,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Rule_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRuleState_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_get_Transitions_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleStateTransitions **Transitions);
-void __RPC_STUB ISpeechGrammarRuleState_get_Transitions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddWordTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestState,
-    const BSTR Words,
-    const BSTR Separators,
-    SpeechGrammarWordType Type,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddWordTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddRuleTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestinationState,
-    ISpeechGrammarRule *Rule,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddRuleTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleState_AddSpecialTransition_Proxy(
-    ISpeechGrammarRuleState* This,
-    ISpeechGrammarRuleState *DestinationState,
-    SpeechSpecialTransitionType Type,
-    const BSTR PropertyName,
-    LONG PropertyId,
-    VARIANT *PropertyValue,
-    float Weight);
-void __RPC_STUB ISpeechGrammarRuleState_AddSpecialTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleState_INTERFACE_DEFINED__ */
 
@@ -21444,29 +17968,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleStateTransitions* This);
+        ISpeechGrammarRuleStateTransitions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleStateTransitions* This);
+        ISpeechGrammarRuleStateTransitions *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21474,7 +17998,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21486,20 +18010,21 @@
 
     /*** ISpeechGrammarRuleStateTransitions methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         LONG Index,
         ISpeechGrammarRuleStateTransition **Transition);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechGrammarRuleStateTransitions* This,
+        ISpeechGrammarRuleStateTransitions *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechGrammarRuleStateTransitionsVtbl;
+
 interface ISpeechGrammarRuleStateTransitions {
     CONST_VTBL ISpeechGrammarRuleStateTransitionsVtbl* lpVtbl;
 };
@@ -21558,31 +18083,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get_Count_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    LONG *Count);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_Item_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    LONG Index,
-    ISpeechGrammarRuleStateTransition **Transition);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransitions_get__NewEnum_Proxy(
-    ISpeechGrammarRuleStateTransitions* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechGrammarRuleStateTransitions_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleStateTransitions_INTERFACE_DEFINED__ */
 
@@ -21631,29 +18131,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechGrammarRuleStateTransition* This);
+        ISpeechGrammarRuleStateTransition *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechGrammarRuleStateTransition* This);
+        ISpeechGrammarRuleStateTransition *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21661,7 +18161,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21673,39 +18173,40 @@
 
     /*** ISpeechGrammarRuleStateTransition methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         SpeechGrammarRuleStateTransitionType *Type);
 
     HRESULT (STDMETHODCALLTYPE *get_Text)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         ISpeechGrammarRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Weight)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         VARIANT *Weight);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyName)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         BSTR *PropertyName);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyId)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         LONG *PropertyId);
 
     HRESULT (STDMETHODCALLTYPE *get_PropertyValue)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         VARIANT *PropertyValue);
 
     HRESULT (STDMETHODCALLTYPE *get_NextState)(
-        ISpeechGrammarRuleStateTransition* This,
+        ISpeechGrammarRuleStateTransition *This,
         ISpeechGrammarRuleState **NextState);
 
     END_INTERFACE
 } ISpeechGrammarRuleStateTransitionVtbl;
+
 interface ISpeechGrammarRuleStateTransition {
     CONST_VTBL ISpeechGrammarRuleStateTransitionVtbl* lpVtbl;
 };
@@ -21784,70 +18285,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Type_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    SpeechGrammarRuleStateTransitionType *Type);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Text_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    BSTR *Text);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Text_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Rule_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    ISpeechGrammarRule **Rule);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_Weight_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    VARIANT *Weight);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_Weight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyName_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    BSTR *PropertyName);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyId_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    LONG *PropertyId);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_PropertyValue_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    VARIANT *PropertyValue);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_PropertyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechGrammarRuleStateTransition_get_NextState_Proxy(
-    ISpeechGrammarRuleStateTransition* This,
-    ISpeechGrammarRuleState **NextState);
-void __RPC_STUB ISpeechGrammarRuleStateTransition_get_NextState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechGrammarRuleStateTransition_INTERFACE_DEFINED__ */
 
@@ -21896,29 +18333,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechTextSelectionInformation* This);
+        ISpeechTextSelectionInformation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechTextSelectionInformation* This);
+        ISpeechTextSelectionInformation *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -21926,7 +18363,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -21938,39 +18375,40 @@
 
     /*** ISpeechTextSelectionInformation methods ***/
     HRESULT (STDMETHODCALLTYPE *put_ActiveOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG ActiveOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_ActiveOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *ActiveOffset);
 
     HRESULT (STDMETHODCALLTYPE *put_ActiveLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG ActiveLength);
 
     HRESULT (STDMETHODCALLTYPE *get_ActiveLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *ActiveLength);
 
     HRESULT (STDMETHODCALLTYPE *put_SelectionOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG SelectionOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_SelectionOffset)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *SelectionOffset);
 
     HRESULT (STDMETHODCALLTYPE *put_SelectionLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG SelectionLength);
 
     HRESULT (STDMETHODCALLTYPE *get_SelectionLength)(
-        ISpeechTextSelectionInformation* This,
+        ISpeechTextSelectionInformation *This,
         LONG *SelectionLength);
 
     END_INTERFACE
 } ISpeechTextSelectionInformationVtbl;
+
 interface ISpeechTextSelectionInformation {
     CONST_VTBL ISpeechTextSelectionInformationVtbl* lpVtbl;
 };
@@ -22049,70 +18487,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG ActiveOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *ActiveOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_ActiveLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG ActiveLength);
-void __RPC_STUB ISpeechTextSelectionInformation_put_ActiveLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_ActiveLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *ActiveLength);
-void __RPC_STUB ISpeechTextSelectionInformation_get_ActiveLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG SelectionOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionOffset_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *SelectionOffset);
-void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_put_SelectionLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG SelectionLength);
-void __RPC_STUB ISpeechTextSelectionInformation_put_SelectionLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechTextSelectionInformation_get_SelectionLength_Proxy(
-    ISpeechTextSelectionInformation* This,
-    LONG *SelectionLength);
-void __RPC_STUB ISpeechTextSelectionInformation_get_SelectionLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechTextSelectionInformation_INTERFACE_DEFINED__ */
 
@@ -22175,29 +18549,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResult* This);
+        ISpeechRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResult* This);
+        ISpeechRecoResult *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22205,7 +18579,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22217,55 +18591,56 @@
 
     /*** ISpeechRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechRecoResult* This,
+        ISpeechRecoResult *This,
         SpeechDiscardType ValueTypes);
 
     END_INTERFACE
 } ISpeechRecoResultVtbl;
+
 interface ISpeechRecoResult {
     CONST_VTBL ISpeechRecoResultVtbl* lpVtbl;
 };
@@ -22352,94 +18727,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_RecoContext_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoResult_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_Times_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechRecoResultTimes **Times);
-void __RPC_STUB ISpeechRecoResult_get_Times_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_putref_AudioFormat_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoResult_putref_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_AudioFormat_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoResult_get_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_get_PhraseInfo_Proxy(
-    ISpeechRecoResult* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechRecoResult_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Alternates_Proxy(
-    ISpeechRecoResult* This,
-    LONG RequestCount,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechPhraseAlternates **Alternates);
-void __RPC_STUB ISpeechRecoResult_Alternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_Audio_Proxy(
-    ISpeechRecoResult* This,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechMemoryStream **Stream);
-void __RPC_STUB ISpeechRecoResult_Audio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SpeakAudio_Proxy(
-    ISpeechRecoResult* This,
-    LONG StartElement,
-    LONG Elements,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecoResult_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_SaveToMemory_Proxy(
-    ISpeechRecoResult* This,
-    VARIANT *ResultBlock);
-void __RPC_STUB ISpeechRecoResult_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult_DiscardResultInfo_Proxy(
-    ISpeechRecoResult* This,
-    SpeechDiscardType ValueTypes);
-void __RPC_STUB ISpeechRecoResult_DiscardResultInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResult_INTERFACE_DEFINED__ */
 
@@ -22476,29 +18763,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechXMLRecoResult* This);
+        ISpeechXMLRecoResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechXMLRecoResult* This);
+        ISpeechXMLRecoResult *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22506,7 +18793,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22518,61 +18805,61 @@
 
     /*** ISpeechRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         SpeechDiscardType ValueTypes);
 
     /*** ISpeechXMLRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         SPXMLRESULTOPTIONS Options,
         BSTR *pResult);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpeechXMLRecoResult* This,
+        ISpeechXMLRecoResult *This,
         LONG *LineNumber,
         BSTR *ScriptLine,
         BSTR *Source,
@@ -22582,6 +18869,7 @@
 
     END_INTERFACE
 } ISpeechXMLRecoResultVtbl;
+
 interface ISpeechXMLRecoResult {
     CONST_VTBL ISpeechXMLRecoResultVtbl* lpVtbl;
 };
@@ -22678,28 +18966,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLResult_Proxy(
-    ISpeechXMLRecoResult* This,
-    SPXMLRESULTOPTIONS Options,
-    BSTR *pResult);
-void __RPC_STUB ISpeechXMLRecoResult_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechXMLRecoResult_GetXMLErrorInfo_Proxy(
-    ISpeechXMLRecoResult* This,
-    LONG *LineNumber,
-    BSTR *ScriptLine,
-    BSTR *Source,
-    BSTR *Description,
-    LONG *ResultCode,
-    VARIANT_BOOL *IsError);
-void __RPC_STUB ISpeechXMLRecoResult_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechXMLRecoResult_INTERFACE_DEFINED__ */
 
@@ -22728,29 +18994,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResult2* This);
+        ISpeechRecoResult2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResult2* This);
+        ISpeechRecoResult2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -22758,7 +19024,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -22770,61 +19036,62 @@
 
     /*** ISpeechRecoResult methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         SpeechDiscardType ValueTypes);
 
     /*** ISpeechRecoResult2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetTextFeedback)(
-        ISpeechRecoResult2* This,
+        ISpeechRecoResult2 *This,
         BSTR Feedback,
         VARIANT_BOOL WasSuccessful);
 
     END_INTERFACE
 } ISpeechRecoResult2Vtbl;
+
 interface ISpeechRecoResult2 {
     CONST_VTBL ISpeechRecoResult2Vtbl* lpVtbl;
 };
@@ -22917,15 +19184,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResult2_SetTextFeedback_Proxy(
-    ISpeechRecoResult2* This,
-    BSTR Feedback,
-    VARIANT_BOOL WasSuccessful);
-void __RPC_STUB ISpeechRecoResult2_SetTextFeedback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResult2_INTERFACE_DEFINED__ */
 
@@ -23004,29 +19262,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResultDispatch* This);
+        ISpeechRecoResultDispatch *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResultDispatch* This);
+        ISpeechRecoResultDispatch *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23034,7 +19292,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23046,60 +19304,60 @@
 
     /*** ISpeechRecoResultDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoContext)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechRecoContext **RecoContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Times)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechRecoResultTimes **Times);
 
     HRESULT (STDMETHODCALLTYPE *putref_AudioFormat)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechAudioFormat *Format);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioFormat)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechAudioFormat **Format);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Alternates)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG RequestCount,
         LONG StartElement,
         LONG Elements,
         ISpeechPhraseAlternates **Alternates);
 
     HRESULT (STDMETHODCALLTYPE *Audio)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG StartElement,
         LONG Elements,
         ISpeechMemoryStream **Stream);
 
     HRESULT (STDMETHODCALLTYPE *SpeakAudio)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG StartElement,
         LONG Elements,
         SpeechVoiceSpeakFlags Flags,
         LONG *StreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         VARIANT *ResultBlock);
 
     HRESULT (STDMETHODCALLTYPE *DiscardResultInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         SpeechDiscardType ValueTypes);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLResult)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         SPXMLRESULTOPTIONS Options,
         BSTR *pResult);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLErrorInfo)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         LONG *LineNumber,
         BSTR *ScriptLine,
         BSTR *Source,
@@ -23108,12 +19366,13 @@
         VARIANT_BOOL *IsError);
 
     HRESULT (STDMETHODCALLTYPE *SetTextFeedback)(
-        ISpeechRecoResultDispatch* This,
+        ISpeechRecoResultDispatch *This,
         BSTR Feedback,
         VARIANT_BOOL WasSuccessful);
 
     END_INTERFACE
 } ISpeechRecoResultDispatchVtbl;
+
 interface ISpeechRecoResultDispatch {
     CONST_VTBL ISpeechRecoResultDispatchVtbl* lpVtbl;
 };
@@ -23212,125 +19471,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_RecoContext_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechRecoContext **RecoContext);
-void __RPC_STUB ISpeechRecoResultDispatch_get_RecoContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_Times_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechRecoResultTimes **Times);
-void __RPC_STUB ISpeechRecoResultDispatch_get_Times_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_putref_AudioFormat_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechAudioFormat *Format);
-void __RPC_STUB ISpeechRecoResultDispatch_putref_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_AudioFormat_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechAudioFormat **Format);
-void __RPC_STUB ISpeechRecoResultDispatch_get_AudioFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_get_PhraseInfo_Proxy(
-    ISpeechRecoResultDispatch* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechRecoResultDispatch_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Alternates_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG RequestCount,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechPhraseAlternates **Alternates);
-void __RPC_STUB ISpeechRecoResultDispatch_Alternates_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_Audio_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG StartElement,
-    LONG Elements,
-    ISpeechMemoryStream **Stream);
-void __RPC_STUB ISpeechRecoResultDispatch_Audio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SpeakAudio_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG StartElement,
-    LONG Elements,
-    SpeechVoiceSpeakFlags Flags,
-    LONG *StreamNumber);
-void __RPC_STUB ISpeechRecoResultDispatch_SpeakAudio_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SaveToMemory_Proxy(
-    ISpeechRecoResultDispatch* This,
-    VARIANT *ResultBlock);
-void __RPC_STUB ISpeechRecoResultDispatch_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_DiscardResultInfo_Proxy(
-    ISpeechRecoResultDispatch* This,
-    SpeechDiscardType ValueTypes);
-void __RPC_STUB ISpeechRecoResultDispatch_DiscardResultInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLResult_Proxy(
-    ISpeechRecoResultDispatch* This,
-    SPXMLRESULTOPTIONS Options,
-    BSTR *pResult);
-void __RPC_STUB ISpeechRecoResultDispatch_GetXMLResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_GetXMLErrorInfo_Proxy(
-    ISpeechRecoResultDispatch* This,
-    LONG *LineNumber,
-    BSTR *ScriptLine,
-    BSTR *Source,
-    BSTR *Description,
-    HRESULT *ResultCode,
-    VARIANT_BOOL *IsError);
-void __RPC_STUB ISpeechRecoResultDispatch_GetXMLErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultDispatch_SetTextFeedback_Proxy(
-    ISpeechRecoResultDispatch* This,
-    BSTR Feedback,
-    VARIANT_BOOL WasSuccessful);
-void __RPC_STUB ISpeechRecoResultDispatch_SetTextFeedback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResultDispatch_INTERFACE_DEFINED__ */
 
@@ -23359,29 +19499,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseInfoBuilder* This);
+        ISpeechPhraseInfoBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseInfoBuilder* This);
+        ISpeechPhraseInfoBuilder *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23389,7 +19529,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23401,12 +19541,13 @@
 
     /*** ISpeechPhraseInfoBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *RestorePhraseFromMemory)(
-        ISpeechPhraseInfoBuilder* This,
+        ISpeechPhraseInfoBuilder *This,
         VARIANT *PhraseInMemory,
         ISpeechPhraseInfo **PhraseInfo);
 
     END_INTERFACE
 } ISpeechPhraseInfoBuilderVtbl;
+
 interface ISpeechPhraseInfoBuilder {
     CONST_VTBL ISpeechPhraseInfoBuilderVtbl* lpVtbl;
 };
@@ -23457,15 +19598,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Proxy(
-    ISpeechPhraseInfoBuilder* This,
-    VARIANT *PhraseInMemory,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechPhraseInfoBuilder_RestorePhraseFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseInfoBuilder_INTERFACE_DEFINED__ */
 
@@ -23502,29 +19634,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechRecoResultTimes* This);
+        ISpeechRecoResultTimes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechRecoResultTimes* This);
+        ISpeechRecoResultTimes *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23532,7 +19664,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23544,23 +19676,24 @@
 
     /*** ISpeechRecoResultTimes methods ***/
     HRESULT (STDMETHODCALLTYPE *get_StreamTime)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *Time);
 
     HRESULT (STDMETHODCALLTYPE *get_Length)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *Length);
 
     HRESULT (STDMETHODCALLTYPE *get_TickCount)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         LONG *TickCount);
 
     HRESULT (STDMETHODCALLTYPE *get_OffsetFromStart)(
-        ISpeechRecoResultTimes* This,
+        ISpeechRecoResultTimes *This,
         VARIANT *OffsetFromStart);
 
     END_INTERFACE
 } ISpeechRecoResultTimesVtbl;
+
 interface ISpeechRecoResultTimes {
     CONST_VTBL ISpeechRecoResultTimesVtbl* lpVtbl;
 };
@@ -23623,38 +19756,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_StreamTime_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *Time);
-void __RPC_STUB ISpeechRecoResultTimes_get_StreamTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_Length_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *Length);
-void __RPC_STUB ISpeechRecoResultTimes_get_Length_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_TickCount_Proxy(
-    ISpeechRecoResultTimes* This,
-    LONG *TickCount);
-void __RPC_STUB ISpeechRecoResultTimes_get_TickCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechRecoResultTimes_get_OffsetFromStart_Proxy(
-    ISpeechRecoResultTimes* This,
-    VARIANT *OffsetFromStart);
-void __RPC_STUB ISpeechRecoResultTimes_get_OffsetFromStart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechRecoResultTimes_INTERFACE_DEFINED__ */
 
@@ -23694,29 +19795,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23724,7 +19825,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23736,26 +19837,27 @@
 
     /*** ISpeechPhraseAlternate methods ***/
     HRESULT (STDMETHODCALLTYPE *get_RecoResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         ISpeechRecoResult **RecoResult);
 
     HRESULT (STDMETHODCALLTYPE *get_StartElementInResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         LONG *StartElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElementsInResult)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_PhraseInfo)(
-        ISpeechPhraseAlternate* This,
+        ISpeechPhraseAlternate *This,
         ISpeechPhraseInfo **PhraseInfo);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        ISpeechPhraseAlternate* This);
+        ISpeechPhraseAlternate *This);
 
     END_INTERFACE
 } ISpeechPhraseAlternateVtbl;
+
 interface ISpeechPhraseAlternate {
     CONST_VTBL ISpeechPhraseAlternateVtbl* lpVtbl;
 };
@@ -23822,45 +19924,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_RecoResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    ISpeechRecoResult **RecoResult);
-void __RPC_STUB ISpeechPhraseAlternate_get_RecoResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_StartElementInResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    LONG *StartElement);
-void __RPC_STUB ISpeechPhraseAlternate_get_StartElementInResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_NumberOfElementsInResult_Proxy(
-    ISpeechPhraseAlternate* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseAlternate_get_NumberOfElementsInResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_get_PhraseInfo_Proxy(
-    ISpeechPhraseAlternate* This,
-    ISpeechPhraseInfo **PhraseInfo);
-void __RPC_STUB ISpeechPhraseAlternate_get_PhraseInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternate_Commit_Proxy(
-    ISpeechPhraseAlternate* This);
-void __RPC_STUB ISpeechPhraseAlternate_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseAlternate_INTERFACE_DEFINED__ */
 
@@ -23895,29 +19958,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseAlternates* This);
+        ISpeechPhraseAlternates *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseAlternates* This);
+        ISpeechPhraseAlternates *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -23925,7 +19988,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -23937,20 +20000,21 @@
 
     /*** ISpeechPhraseAlternates methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         LONG Index,
         ISpeechPhraseAlternate **PhraseAlternate);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseAlternates* This,
+        ISpeechPhraseAlternates *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseAlternatesVtbl;
+
 interface ISpeechPhraseAlternates {
     CONST_VTBL ISpeechPhraseAlternatesVtbl* lpVtbl;
 };
@@ -24009,31 +20073,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get_Count_Proxy(
-    ISpeechPhraseAlternates* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseAlternates_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_Item_Proxy(
-    ISpeechPhraseAlternates* This,
-    LONG Index,
-    ISpeechPhraseAlternate **PhraseAlternate);
-void __RPC_STUB ISpeechPhraseAlternates_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseAlternates_get__NewEnum_Proxy(
-    ISpeechPhraseAlternates* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseAlternates_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseAlternates_INTERFACE_DEFINED__ */
 
@@ -24112,29 +20151,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseInfo* This);
+        ISpeechPhraseInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseInfo* This);
+        ISpeechPhraseInfo *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -24142,7 +20181,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -24154,70 +20193,70 @@
 
     /*** ISpeechPhraseInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LanguageId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *get_GrammarId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *GrammarId);
 
     HRESULT (STDMETHODCALLTYPE *get_StartTime)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *StartTime);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioStreamPosition)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *AudioStreamPosition);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *pAudioSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *RetainedSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG *AudioSizeTime);
 
     HRESULT (STDMETHODCALLTYPE *get_Rule)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get_Properties)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseProperties **Properties);
 
     HRESULT (STDMETHODCALLTYPE *get_Elements)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseElements **Elements);
 
     HRESULT (STDMETHODCALLTYPE *get_Replacements)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         ISpeechPhraseReplacements **Replacements);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineId)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         BSTR *EngineIdGuid);
 
     HRESULT (STDMETHODCALLTYPE *get_EnginePrivateData)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *PrivateData);
 
     HRESULT (STDMETHODCALLTYPE *SaveToMemory)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         VARIANT *PhraseBlock);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG StartElement,
         LONG Elements,
         VARIANT_BOOL UseReplacements,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayAttributes)(
-        ISpeechPhraseInfo* This,
+        ISpeechPhraseInfo *This,
         LONG StartElement,
         LONG Elements,
         VARIANT_BOOL UseReplacements,
@@ -24225,6 +20264,7 @@
 
     END_INTERFACE
 } ISpeechPhraseInfoVtbl;
+
 interface ISpeechPhraseInfo {
     CONST_VTBL ISpeechPhraseInfoVtbl* lpVtbl;
 };
@@ -24335,140 +20375,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_LanguageId_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *LanguageId);
-void __RPC_STUB ISpeechPhraseInfo_get_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_GrammarId_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *GrammarId);
-void __RPC_STUB ISpeechPhraseInfo_get_GrammarId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_StartTime_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *StartTime);
-void __RPC_STUB ISpeechPhraseInfo_get_StartTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioStreamPosition_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *AudioStreamPosition);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioStreamPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeBytes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *pAudioSizeBytes);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_RetainedSizeBytes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *RetainedSizeBytes);
-void __RPC_STUB ISpeechPhraseInfo_get_RetainedSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_AudioSizeTime_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG *AudioSizeTime);
-void __RPC_STUB ISpeechPhraseInfo_get_AudioSizeTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Rule_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseRule **Rule);
-void __RPC_STUB ISpeechPhraseInfo_get_Rule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Properties_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseProperties **Properties);
-void __RPC_STUB ISpeechPhraseInfo_get_Properties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Elements_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseElements **Elements);
-void __RPC_STUB ISpeechPhraseInfo_get_Elements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_Replacements_Proxy(
-    ISpeechPhraseInfo* This,
-    ISpeechPhraseReplacements **Replacements);
-void __RPC_STUB ISpeechPhraseInfo_get_Replacements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EngineId_Proxy(
-    ISpeechPhraseInfo* This,
-    BSTR *EngineIdGuid);
-void __RPC_STUB ISpeechPhraseInfo_get_EngineId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_get_EnginePrivateData_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *PrivateData);
-void __RPC_STUB ISpeechPhraseInfo_get_EnginePrivateData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_SaveToMemory_Proxy(
-    ISpeechPhraseInfo* This,
-    VARIANT *PhraseBlock);
-void __RPC_STUB ISpeechPhraseInfo_SaveToMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetText_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG StartElement,
-    LONG Elements,
-    VARIANT_BOOL UseReplacements,
-    BSTR *Text);
-void __RPC_STUB ISpeechPhraseInfo_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseInfo_GetDisplayAttributes_Proxy(
-    ISpeechPhraseInfo* This,
-    LONG StartElement,
-    LONG Elements,
-    VARIANT_BOOL UseReplacements,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseInfo_GetDisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseInfo_INTERFACE_DEFINED__ */
 
@@ -24532,29 +20438,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseElement* This);
+        ISpeechPhraseElement *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseElement* This);
+        ISpeechPhraseElement *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -24562,7 +20468,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -24574,59 +20480,60 @@
 
     /*** ISpeechPhraseElement methods ***/
     HRESULT (STDMETHODCALLTYPE *get_AudioTimeOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioTimeOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeTime)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioSizeTime);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioStreamOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioStreamOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_AudioSizeBytes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *AudioSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedStreamOffset)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *RetainedStreamOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_RetainedSizeBytes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         LONG *RetainedSizeBytes);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayText)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         BSTR *DisplayText);
 
     HRESULT (STDMETHODCALLTYPE *get_LexicalForm)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         BSTR *LexicalForm);
 
     HRESULT (STDMETHODCALLTYPE *get_Pronunciation)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         VARIANT *Pronunciation);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechDisplayAttributes *DisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *get_RequiredConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechEngineConfidence *RequiredConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_ActualConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         SpeechEngineConfidence *ActualConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseElement* This,
+        ISpeechPhraseElement *This,
         float *EngineConfidence);
 
     END_INTERFACE
 } ISpeechPhraseElementVtbl;
+
 interface ISpeechPhraseElement {
     CONST_VTBL ISpeechPhraseElementVtbl* lpVtbl;
 };
@@ -24725,110 +20632,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioTimeOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioTimeOffset);
-void __RPC_STUB ISpeechPhraseElement_get_AudioTimeOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeTime_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioSizeTime);
-void __RPC_STUB ISpeechPhraseElement_get_AudioSizeTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioStreamOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioStreamOffset);
-void __RPC_STUB ISpeechPhraseElement_get_AudioStreamOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_AudioSizeBytes_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *AudioSizeBytes);
-void __RPC_STUB ISpeechPhraseElement_get_AudioSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedStreamOffset_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *RetainedStreamOffset);
-void __RPC_STUB ISpeechPhraseElement_get_RetainedStreamOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RetainedSizeBytes_Proxy(
-    ISpeechPhraseElement* This,
-    LONG *RetainedSizeBytes);
-void __RPC_STUB ISpeechPhraseElement_get_RetainedSizeBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayText_Proxy(
-    ISpeechPhraseElement* This,
-    BSTR *DisplayText);
-void __RPC_STUB ISpeechPhraseElement_get_DisplayText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_LexicalForm_Proxy(
-    ISpeechPhraseElement* This,
-    BSTR *LexicalForm);
-void __RPC_STUB ISpeechPhraseElement_get_LexicalForm_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_Pronunciation_Proxy(
-    ISpeechPhraseElement* This,
-    VARIANT *Pronunciation);
-void __RPC_STUB ISpeechPhraseElement_get_Pronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_DisplayAttributes_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseElement_get_DisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_RequiredConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechEngineConfidence *RequiredConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_RequiredConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_ActualConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    SpeechEngineConfidence *ActualConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_ActualConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElement_get_EngineConfidence_Proxy(
-    ISpeechPhraseElement* This,
-    float *EngineConfidence);
-void __RPC_STUB ISpeechPhraseElement_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseElement_INTERFACE_DEFINED__ */
 
@@ -24863,29 +20666,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseElements* This);
+        ISpeechPhraseElements *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseElements* This);
+        ISpeechPhraseElements *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -24893,7 +20696,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -24905,20 +20708,21 @@
 
     /*** ISpeechPhraseElements methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         LONG Index,
         ISpeechPhraseElement **Element);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseElements* This,
+        ISpeechPhraseElements *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseElementsVtbl;
+
 interface ISpeechPhraseElements {
     CONST_VTBL ISpeechPhraseElementsVtbl* lpVtbl;
 };
@@ -24977,31 +20781,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get_Count_Proxy(
-    ISpeechPhraseElements* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseElements_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_Item_Proxy(
-    ISpeechPhraseElements* This,
-    LONG Index,
-    ISpeechPhraseElement **Element);
-void __RPC_STUB ISpeechPhraseElements_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseElements_get__NewEnum_Proxy(
-    ISpeechPhraseElements* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseElements_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseElements_INTERFACE_DEFINED__ */
 
@@ -25038,29 +20817,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseReplacement* This);
+        ISpeechPhraseReplacement *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseReplacement* This);
+        ISpeechPhraseReplacement *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25068,7 +20847,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25080,23 +20859,24 @@
 
     /*** ISpeechPhraseReplacement methods ***/
     HRESULT (STDMETHODCALLTYPE *get_DisplayAttributes)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         SpeechDisplayAttributes *DisplayAttributes);
 
     HRESULT (STDMETHODCALLTYPE *get_Text)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         BSTR *Text);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseReplacement* This,
+        ISpeechPhraseReplacement *This,
         LONG *NumberOfElements);
 
     END_INTERFACE
 } ISpeechPhraseReplacementVtbl;
+
 interface ISpeechPhraseReplacement {
     CONST_VTBL ISpeechPhraseReplacementVtbl* lpVtbl;
 };
@@ -25159,38 +20939,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_DisplayAttributes_Proxy(
-    ISpeechPhraseReplacement* This,
-    SpeechDisplayAttributes *DisplayAttributes);
-void __RPC_STUB ISpeechPhraseReplacement_get_DisplayAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_Text_Proxy(
-    ISpeechPhraseReplacement* This,
-    BSTR *Text);
-void __RPC_STUB ISpeechPhraseReplacement_get_Text_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_FirstElement_Proxy(
-    ISpeechPhraseReplacement* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseReplacement_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacement_get_NumberOfElements_Proxy(
-    ISpeechPhraseReplacement* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseReplacement_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseReplacement_INTERFACE_DEFINED__ */
 
@@ -25225,29 +20973,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseReplacements* This);
+        ISpeechPhraseReplacements *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseReplacements* This);
+        ISpeechPhraseReplacements *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25255,7 +21003,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25267,20 +21015,21 @@
 
     /*** ISpeechPhraseReplacements methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         LONG Index,
         ISpeechPhraseReplacement **Reps);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseReplacements* This,
+        ISpeechPhraseReplacements *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseReplacementsVtbl;
+
 interface ISpeechPhraseReplacements {
     CONST_VTBL ISpeechPhraseReplacementsVtbl* lpVtbl;
 };
@@ -25339,31 +21088,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get_Count_Proxy(
-    ISpeechPhraseReplacements* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseReplacements_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_Item_Proxy(
-    ISpeechPhraseReplacements* This,
-    LONG Index,
-    ISpeechPhraseReplacement **Reps);
-void __RPC_STUB ISpeechPhraseReplacements_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseReplacements_get__NewEnum_Proxy(
-    ISpeechPhraseReplacements* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseReplacements_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseReplacements_INTERFACE_DEFINED__ */
 
@@ -25415,29 +21139,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseProperty* This);
+        ISpeechPhraseProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseProperty* This);
+        ISpeechPhraseProperty *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25445,7 +21169,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25457,43 +21181,44 @@
 
     /*** ISpeechPhraseProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         VARIANT *Value);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         float *Confidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Confidence)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         SpeechEngineConfidence *Confidence);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         ISpeechPhraseProperty **ParentProperty);
 
     HRESULT (STDMETHODCALLTYPE *get_Children)(
-        ISpeechPhraseProperty* This,
+        ISpeechPhraseProperty *This,
         ISpeechPhraseProperties **Children);
 
     END_INTERFACE
 } ISpeechPhrasePropertyVtbl;
+
 interface ISpeechPhraseProperty {
     CONST_VTBL ISpeechPhrasePropertyVtbl* lpVtbl;
 };
@@ -25576,78 +21301,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Name_Proxy(
-    ISpeechPhraseProperty* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechPhraseProperty_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Id_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *Id);
-void __RPC_STUB ISpeechPhraseProperty_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Value_Proxy(
-    ISpeechPhraseProperty* This,
-    VARIANT *Value);
-void __RPC_STUB ISpeechPhraseProperty_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_FirstElement_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseProperty_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_NumberOfElements_Proxy(
-    ISpeechPhraseProperty* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseProperty_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_EngineConfidence_Proxy(
-    ISpeechPhraseProperty* This,
-    float *Confidence);
-void __RPC_STUB ISpeechPhraseProperty_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Confidence_Proxy(
-    ISpeechPhraseProperty* This,
-    SpeechEngineConfidence *Confidence);
-void __RPC_STUB ISpeechPhraseProperty_get_Confidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Parent_Proxy(
-    ISpeechPhraseProperty* This,
-    ISpeechPhraseProperty **ParentProperty);
-void __RPC_STUB ISpeechPhraseProperty_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperty_get_Children_Proxy(
-    ISpeechPhraseProperty* This,
-    ISpeechPhraseProperties **Children);
-void __RPC_STUB ISpeechPhraseProperty_get_Children_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseProperty_INTERFACE_DEFINED__ */
 
@@ -25682,29 +21335,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseProperties* This);
+        ISpeechPhraseProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseProperties* This);
+        ISpeechPhraseProperties *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25712,7 +21365,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25724,20 +21377,21 @@
 
     /*** ISpeechPhraseProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         LONG Index,
         ISpeechPhraseProperty **Property);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseProperties* This,
+        ISpeechPhraseProperties *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhrasePropertiesVtbl;
+
 interface ISpeechPhraseProperties {
     CONST_VTBL ISpeechPhrasePropertiesVtbl* lpVtbl;
 };
@@ -25796,31 +21450,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get_Count_Proxy(
-    ISpeechPhraseProperties* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseProperties_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_Item_Proxy(
-    ISpeechPhraseProperties* This,
-    LONG Index,
-    ISpeechPhraseProperty **Property);
-void __RPC_STUB ISpeechPhraseProperties_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseProperties_get__NewEnum_Proxy(
-    ISpeechPhraseProperties* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseProperties_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseProperties_INTERFACE_DEFINED__ */
 
@@ -25869,29 +21498,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseRule* This);
+        ISpeechPhraseRule *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseRule* This);
+        ISpeechPhraseRule *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -25899,7 +21528,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -25911,39 +21540,40 @@
 
     /*** ISpeechPhraseRule methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         BSTR *Name);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *Id);
 
     HRESULT (STDMETHODCALLTYPE *get_FirstElement)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *FirstElement);
 
     HRESULT (STDMETHODCALLTYPE *get_NumberOfElements)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         LONG *NumberOfElements);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         ISpeechPhraseRule **Parent);
 
     HRESULT (STDMETHODCALLTYPE *get_Children)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         ISpeechPhraseRules **Children);
 
     HRESULT (STDMETHODCALLTYPE *get_Confidence)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         SpeechEngineConfidence *ActualConfidence);
 
     HRESULT (STDMETHODCALLTYPE *get_EngineConfidence)(
-        ISpeechPhraseRule* This,
+        ISpeechPhraseRule *This,
         float *EngineConfidence);
 
     END_INTERFACE
 } ISpeechPhraseRuleVtbl;
+
 interface ISpeechPhraseRule {
     CONST_VTBL ISpeechPhraseRuleVtbl* lpVtbl;
 };
@@ -26022,70 +21652,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Name_Proxy(
-    ISpeechPhraseRule* This,
-    BSTR *Name);
-void __RPC_STUB ISpeechPhraseRule_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Id_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *Id);
-void __RPC_STUB ISpeechPhraseRule_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_FirstElement_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *FirstElement);
-void __RPC_STUB ISpeechPhraseRule_get_FirstElement_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_NumberOfElements_Proxy(
-    ISpeechPhraseRule* This,
-    LONG *NumberOfElements);
-void __RPC_STUB ISpeechPhraseRule_get_NumberOfElements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Parent_Proxy(
-    ISpeechPhraseRule* This,
-    ISpeechPhraseRule **Parent);
-void __RPC_STUB ISpeechPhraseRule_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Children_Proxy(
-    ISpeechPhraseRule* This,
-    ISpeechPhraseRules **Children);
-void __RPC_STUB ISpeechPhraseRule_get_Children_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_Confidence_Proxy(
-    ISpeechPhraseRule* This,
-    SpeechEngineConfidence *ActualConfidence);
-void __RPC_STUB ISpeechPhraseRule_get_Confidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRule_get_EngineConfidence_Proxy(
-    ISpeechPhraseRule* This,
-    float *EngineConfidence);
-void __RPC_STUB ISpeechPhraseRule_get_EngineConfidence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseRule_INTERFACE_DEFINED__ */
 
@@ -26120,29 +21686,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhraseRules* This);
+        ISpeechPhraseRules *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhraseRules* This);
+        ISpeechPhraseRules *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26150,7 +21716,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26162,20 +21728,21 @@
 
     /*** ISpeechPhraseRules methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         LONG Index,
         ISpeechPhraseRule **Rule);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechPhraseRules* This,
+        ISpeechPhraseRules *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechPhraseRulesVtbl;
+
 interface ISpeechPhraseRules {
     CONST_VTBL ISpeechPhraseRulesVtbl* lpVtbl;
 };
@@ -26234,31 +21801,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get_Count_Proxy(
-    ISpeechPhraseRules* This,
-    LONG *Count);
-void __RPC_STUB ISpeechPhraseRules_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_Item_Proxy(
-    ISpeechPhraseRules* This,
-    LONG Index,
-    ISpeechPhraseRule **Rule);
-void __RPC_STUB ISpeechPhraseRules_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhraseRules_get__NewEnum_Proxy(
-    ISpeechPhraseRules* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechPhraseRules_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhraseRules_INTERFACE_DEFINED__ */
 
@@ -26293,29 +21835,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconWords* This);
+        ISpeechLexiconWords *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconWords* This);
+        ISpeechLexiconWords *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26323,7 +21865,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26335,20 +21877,21 @@
 
     /*** ISpeechLexiconWords methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         LONG Index,
         ISpeechLexiconWord **Word);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechLexiconWords* This,
+        ISpeechLexiconWords *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechLexiconWordsVtbl;
+
 interface ISpeechLexiconWords {
     CONST_VTBL ISpeechLexiconWordsVtbl* lpVtbl;
 };
@@ -26407,31 +21950,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get_Count_Proxy(
-    ISpeechLexiconWords* This,
-    LONG *Count);
-void __RPC_STUB ISpeechLexiconWords_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_Item_Proxy(
-    ISpeechLexiconWords* This,
-    LONG Index,
-    ISpeechLexiconWord **Word);
-void __RPC_STUB ISpeechLexiconWords_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWords_get__NewEnum_Proxy(
-    ISpeechLexiconWords* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechLexiconWords_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconWords_INTERFACE_DEFINED__ */
 
@@ -26498,29 +22016,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexicon* This);
+        ISpeechLexicon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexicon* This);
+        ISpeechLexicon *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26528,7 +22046,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26540,57 +22058,58 @@
 
     /*** ISpeechLexicon methods ***/
     HRESULT (STDMETHODCALLTYPE *get_GenerationId)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         LONG *GenerationId);
 
     HRESULT (STDMETHODCALLTYPE *GetWords)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         SpeechLexiconType Flags,
         LONG *GenerationID,
         ISpeechLexiconWords **Words);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciation)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         BSTR bstrPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *AddPronunciationByPhoneIds)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciation)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         BSTR bstrPronunciation);
 
     HRESULT (STDMETHODCALLTYPE *RemovePronunciationByPhoneIds)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechPartOfSpeech PartOfSpeech,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *GetPronunciations)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         BSTR bstrWord,
         SpeechLanguageId LangId,
         SpeechLexiconType TypeFlags,
         ISpeechLexiconPronunciations **ppPronunciations);
 
     HRESULT (STDMETHODCALLTYPE *GetGenerationChange)(
-        ISpeechLexicon* This,
+        ISpeechLexicon *This,
         LONG *GenerationID,
         ISpeechLexiconWords **ppWords);
 
     END_INTERFACE
 } ISpeechLexiconVtbl;
+
 interface ISpeechLexicon {
     CONST_VTBL ISpeechLexiconVtbl* lpVtbl;
 };
@@ -26669,88 +22188,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_get_GenerationId_Proxy(
-    ISpeechLexicon* This,
-    LONG *GenerationId);
-void __RPC_STUB ISpeechLexicon_get_GenerationId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetWords_Proxy(
-    ISpeechLexicon* This,
-    SpeechLexiconType Flags,
-    LONG *GenerationID,
-    ISpeechLexiconWords **Words);
-void __RPC_STUB ISpeechLexicon_GetWords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciation_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    BSTR bstrPronunciation);
-void __RPC_STUB ISpeechLexicon_AddPronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_AddPronunciationByPhoneIds_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexicon_AddPronunciationByPhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciation_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    BSTR bstrPronunciation);
-void __RPC_STUB ISpeechLexicon_RemovePronunciation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_RemovePronunciationByPhoneIds_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechPartOfSpeech PartOfSpeech,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexicon_RemovePronunciationByPhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetPronunciations_Proxy(
-    ISpeechLexicon* This,
-    BSTR bstrWord,
-    SpeechLanguageId LangId,
-    SpeechLexiconType TypeFlags,
-    ISpeechLexiconPronunciations **ppPronunciations);
-void __RPC_STUB ISpeechLexicon_GetPronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexicon_GetGenerationChange_Proxy(
-    ISpeechLexicon* This,
-    LONG *GenerationID,
-    ISpeechLexiconWords **ppWords);
-void __RPC_STUB ISpeechLexicon_GetGenerationChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexicon_INTERFACE_DEFINED__ */
 
@@ -26787,29 +22224,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconWord* This);
+        ISpeechLexiconWord *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconWord* This);
+        ISpeechLexiconWord *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -26817,7 +22254,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -26829,23 +22266,24 @@
 
     /*** ISpeechLexiconWord methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LangId)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         SpeechLanguageId *LangId);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         SpeechWordType *WordType);
 
     HRESULT (STDMETHODCALLTYPE *get_Word)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         BSTR *Word);
 
     HRESULT (STDMETHODCALLTYPE *get_Pronunciations)(
-        ISpeechLexiconWord* This,
+        ISpeechLexiconWord *This,
         ISpeechLexiconPronunciations **Pronunciations);
 
     END_INTERFACE
 } ISpeechLexiconWordVtbl;
+
 interface ISpeechLexiconWord {
     CONST_VTBL ISpeechLexiconWordVtbl* lpVtbl;
 };
@@ -26908,38 +22346,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_LangId_Proxy(
-    ISpeechLexiconWord* This,
-    SpeechLanguageId *LangId);
-void __RPC_STUB ISpeechLexiconWord_get_LangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Type_Proxy(
-    ISpeechLexiconWord* This,
-    SpeechWordType *WordType);
-void __RPC_STUB ISpeechLexiconWord_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Word_Proxy(
-    ISpeechLexiconWord* This,
-    BSTR *Word);
-void __RPC_STUB ISpeechLexiconWord_get_Word_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconWord_get_Pronunciations_Proxy(
-    ISpeechLexiconWord* This,
-    ISpeechLexiconPronunciations **Pronunciations);
-void __RPC_STUB ISpeechLexiconWord_get_Pronunciations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconWord_INTERFACE_DEFINED__ */
 
@@ -26974,29 +22380,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconPronunciations* This);
+        ISpeechLexiconPronunciations *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconPronunciations* This);
+        ISpeechLexiconPronunciations *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -27004,7 +22410,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -27016,20 +22422,21 @@
 
     /*** ISpeechLexiconPronunciations methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         LONG *Count);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         LONG Index,
         ISpeechLexiconPronunciation **Pronunciation);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISpeechLexiconPronunciations* This,
+        ISpeechLexiconPronunciations *This,
         IUnknown **EnumVARIANT);
 
     END_INTERFACE
 } ISpeechLexiconPronunciationsVtbl;
+
 interface ISpeechLexiconPronunciations {
     CONST_VTBL ISpeechLexiconPronunciationsVtbl* lpVtbl;
 };
@@ -27088,31 +22495,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get_Count_Proxy(
-    ISpeechLexiconPronunciations* This,
-    LONG *Count);
-void __RPC_STUB ISpeechLexiconPronunciations_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_Item_Proxy(
-    ISpeechLexiconPronunciations* This,
-    LONG Index,
-    ISpeechLexiconPronunciation **Pronunciation);
-void __RPC_STUB ISpeechLexiconPronunciations_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciations_get__NewEnum_Proxy(
-    ISpeechLexiconPronunciations* This,
-    IUnknown **EnumVARIANT);
-void __RPC_STUB ISpeechLexiconPronunciations_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconPronunciations_INTERFACE_DEFINED__ */
 
@@ -27152,29 +22534,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechLexiconPronunciation* This);
+        ISpeechLexiconPronunciation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechLexiconPronunciation* This);
+        ISpeechLexiconPronunciation *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -27182,7 +22564,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -27194,27 +22576,28 @@
 
     /*** ISpeechLexiconPronunciation methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechLexiconType *LexiconType);
 
     HRESULT (STDMETHODCALLTYPE *get_LangId)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechLanguageId *LangId);
 
     HRESULT (STDMETHODCALLTYPE *get_PartOfSpeech)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         SpeechPartOfSpeech *PartOfSpeech);
 
     HRESULT (STDMETHODCALLTYPE *get_PhoneIds)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         VARIANT *PhoneIds);
 
     HRESULT (STDMETHODCALLTYPE *get_Symbolic)(
-        ISpeechLexiconPronunciation* This,
+        ISpeechLexiconPronunciation *This,
         BSTR *Symbolic);
 
     END_INTERFACE
 } ISpeechLexiconPronunciationVtbl;
+
 interface ISpeechLexiconPronunciation {
     CONST_VTBL ISpeechLexiconPronunciationVtbl* lpVtbl;
 };
@@ -27281,46 +22664,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Type_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechLexiconType *LexiconType);
-void __RPC_STUB ISpeechLexiconPronunciation_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_LangId_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechLanguageId *LangId);
-void __RPC_STUB ISpeechLexiconPronunciation_get_LangId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PartOfSpeech_Proxy(
-    ISpeechLexiconPronunciation* This,
-    SpeechPartOfSpeech *PartOfSpeech);
-void __RPC_STUB ISpeechLexiconPronunciation_get_PartOfSpeech_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_PhoneIds_Proxy(
-    ISpeechLexiconPronunciation* This,
-    VARIANT *PhoneIds);
-void __RPC_STUB ISpeechLexiconPronunciation_get_PhoneIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechLexiconPronunciation_get_Symbolic_Proxy(
-    ISpeechLexiconPronunciation* This,
-    BSTR *Symbolic);
-void __RPC_STUB ISpeechLexiconPronunciation_get_Symbolic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechLexiconPronunciation_INTERFACE_DEFINED__ */
 
@@ -27359,29 +22702,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISpeechPhoneConverter* This);
+        ISpeechPhoneConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISpeechPhoneConverter* This);
+        ISpeechPhoneConverter *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -27389,7 +22732,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -27401,25 +22744,26 @@
 
     /*** ISpeechPhoneConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *get_LanguageId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         SpeechLanguageId *LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *put_LanguageId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         SpeechLanguageId LanguageId);
 
     HRESULT (STDMETHODCALLTYPE *PhoneToId)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         const BSTR Phonemes,
         VARIANT *IdArray);
 
     HRESULT (STDMETHODCALLTYPE *IdToPhone)(
-        ISpeechPhoneConverter* This,
+        ISpeechPhoneConverter *This,
         const VARIANT IdArray,
         BSTR *Phonemes);
 
     END_INTERFACE
 } ISpeechPhoneConverterVtbl;
+
 interface ISpeechPhoneConverter {
     CONST_VTBL ISpeechPhoneConverterVtbl* lpVtbl;
 };
@@ -27482,40 +22826,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_get_LanguageId_Proxy(
-    ISpeechPhoneConverter* This,
-    SpeechLanguageId *LanguageId);
-void __RPC_STUB ISpeechPhoneConverter_get_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_put_LanguageId_Proxy(
-    ISpeechPhoneConverter* This,
-    SpeechLanguageId LanguageId);
-void __RPC_STUB ISpeechPhoneConverter_put_LanguageId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_PhoneToId_Proxy(
-    ISpeechPhoneConverter* This,
-    const BSTR Phonemes,
-    VARIANT *IdArray);
-void __RPC_STUB ISpeechPhoneConverter_PhoneToId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISpeechPhoneConverter_IdToPhone_Proxy(
-    ISpeechPhoneConverter* This,
-    const VARIANT IdArray,
-    BSTR *Phonemes);
-void __RPC_STUB ISpeechPhoneConverter_IdToPhone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISpeechPhoneConverter_INTERFACE_DEFINED__ */
 
@@ -27886,16 +23196,25 @@
 #ifndef __ISpXMLRecoResult_FWD_DEFINED__
 #define __ISpXMLRecoResult_FWD_DEFINED__
 typedef interface ISpXMLRecoResult ISpXMLRecoResult;
+#ifdef __cplusplus
+interface ISpXMLRecoResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpRecoGrammar2_FWD_DEFINED__
 #define __ISpRecoGrammar2_FWD_DEFINED__
 typedef interface ISpRecoGrammar2 ISpRecoGrammar2;
+#ifdef __cplusplus
+interface ISpRecoGrammar2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISpeechResourceLoader_FWD_DEFINED__
 #define __ISpeechResourceLoader_FWD_DEFINED__
 typedef interface ISpeechResourceLoader ISpeechResourceLoader;
+#ifdef __cplusplus
+interface ISpeechResourceLoader;
+#endif /* __cplusplus */
 #endif
 
 /* Begin additional prototypes for all interfaces */
diff --git a/mingw-w64-headers/include/sensorsapi.h b/mingw-w64-headers/include/sensorsapi.h
index 65d36eb..2282cb6 100644
--- a/mingw-w64-headers/include/sensorsapi.h
+++ b/mingw-w64-headers/include/sensorsapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/sensorsapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/sensorsapi.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,31 +20,49 @@
 #ifndef __ISensorManager_FWD_DEFINED__
 #define __ISensorManager_FWD_DEFINED__
 typedef interface ISensorManager ISensorManager;
+#ifdef __cplusplus
+interface ISensorManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensorCollection_FWD_DEFINED__
 #define __ISensorCollection_FWD_DEFINED__
 typedef interface ISensorCollection ISensorCollection;
+#ifdef __cplusplus
+interface ISensorCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensor_FWD_DEFINED__
 #define __ISensor_FWD_DEFINED__
 typedef interface ISensor ISensor;
+#ifdef __cplusplus
+interface ISensor;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensorDataReport_FWD_DEFINED__
 #define __ISensorDataReport_FWD_DEFINED__
 typedef interface ISensorDataReport ISensorDataReport;
+#ifdef __cplusplus
+interface ISensorDataReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensorManagerEvents_FWD_DEFINED__
 #define __ISensorManagerEvents_FWD_DEFINED__
 typedef interface ISensorManagerEvents ISensorManagerEvents;
+#ifdef __cplusplus
+interface ISensorManagerEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensorEvents_FWD_DEFINED__
 #define __ISensorEvents_FWD_DEFINED__
 typedef interface ISensorEvents ISensorEvents;
+#ifdef __cplusplus
+interface ISensorEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __SensorManager_FWD_DEFINED__
@@ -95,26 +113,41 @@
 #ifndef __ISensorCollection_FWD_DEFINED__
 #define __ISensorCollection_FWD_DEFINED__
 typedef interface ISensorCollection ISensorCollection;
+#ifdef __cplusplus
+interface ISensorCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensor_FWD_DEFINED__
 #define __ISensor_FWD_DEFINED__
 typedef interface ISensor ISensor;
+#ifdef __cplusplus
+interface ISensor;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensorDataReport_FWD_DEFINED__
 #define __ISensorDataReport_FWD_DEFINED__
 typedef interface ISensorDataReport ISensorDataReport;
+#ifdef __cplusplus
+interface ISensorDataReport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensorManagerEvents_FWD_DEFINED__
 #define __ISensorManagerEvents_FWD_DEFINED__
 typedef interface ISensorManagerEvents ISensorManagerEvents;
+#ifdef __cplusplus
+interface ISensorManagerEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISensorEvents_FWD_DEFINED__
 #define __ISensorEvents_FWD_DEFINED__
 typedef interface ISensorEvents ISensorEvents;
+#ifdef __cplusplus
+interface ISensorEvents;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -158,44 +191,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISensorManager* This,
+        ISensorManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISensorManager* This);
+        ISensorManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISensorManager* This);
+        ISensorManager *This);
 
     /*** ISensorManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSensorsByCategory)(
-        ISensorManager* This,
+        ISensorManager *This,
         REFSENSOR_CATEGORY_ID sensorCategory,
         ISensorCollection **ppSensorsFound);
 
     HRESULT (STDMETHODCALLTYPE *GetSensorsByType)(
-        ISensorManager* This,
+        ISensorManager *This,
         REFSENSOR_TYPE_ID sensorType,
         ISensorCollection **ppSensorsFound);
 
     HRESULT (STDMETHODCALLTYPE *GetSensorByID)(
-        ISensorManager* This,
+        ISensorManager *This,
         REFSENSOR_ID sensorID,
         ISensor **ppSensor);
 
     HRESULT (STDMETHODCALLTYPE *SetEventSink)(
-        ISensorManager* This,
+        ISensorManager *This,
         ISensorManagerEvents *pEvents);
 
     HRESULT (STDMETHODCALLTYPE *RequestPermissions)(
-        ISensorManager* This,
+        ISensorManager *This,
         HWND hParent,
         ISensorCollection *pSensors,
         WINBOOL fModal);
 
     END_INTERFACE
 } ISensorManagerVtbl;
+
 interface ISensorManager {
     CONST_VTBL ISensorManagerVtbl* lpVtbl;
 };
@@ -244,51 +278,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISensorManager_GetSensorsByCategory_Proxy(
-    ISensorManager* This,
-    REFSENSOR_CATEGORY_ID sensorCategory,
-    ISensorCollection **ppSensorsFound);
-void __RPC_STUB ISensorManager_GetSensorsByCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorManager_GetSensorsByType_Proxy(
-    ISensorManager* This,
-    REFSENSOR_TYPE_ID sensorType,
-    ISensorCollection **ppSensorsFound);
-void __RPC_STUB ISensorManager_GetSensorsByType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorManager_GetSensorByID_Proxy(
-    ISensorManager* This,
-    REFSENSOR_ID sensorID,
-    ISensor **ppSensor);
-void __RPC_STUB ISensorManager_GetSensorByID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorManager_SetEventSink_Proxy(
-    ISensorManager* This,
-    ISensorManagerEvents *pEvents);
-void __RPC_STUB ISensorManager_SetEventSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorManager_RequestPermissions_Proxy(
-    ISensorManager* This,
-    HWND hParent,
-    ISensorCollection *pSensors,
-    WINBOOL fModal);
-void __RPC_STUB ISensorManager_RequestPermissions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISensorManager_INTERFACE_DEFINED__ */
 
@@ -332,43 +321,44 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISensorCollection* This,
+        ISensorCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISensorCollection* This);
+        ISensorCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISensorCollection* This);
+        ISensorCollection *This);
 
     /*** ISensorCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        ISensorCollection* This,
+        ISensorCollection *This,
         ULONG ulIndex,
         ISensor **ppSensor);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        ISensorCollection* This,
+        ISensorCollection *This,
         ULONG *pCount);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISensorCollection* This,
+        ISensorCollection *This,
         ISensor *pSensor);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISensorCollection* This,
+        ISensorCollection *This,
         ISensor *pSensor);
 
     HRESULT (STDMETHODCALLTYPE *RemoveByID)(
-        ISensorCollection* This,
+        ISensorCollection *This,
         REFSENSOR_ID sensorID);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        ISensorCollection* This);
+        ISensorCollection *This);
 
     END_INTERFACE
 } ISensorCollectionVtbl;
+
 interface ISensorCollection {
     CONST_VTBL ISensorCollectionVtbl* lpVtbl;
 };
@@ -421,54 +411,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISensorCollection_GetAt_Proxy(
-    ISensorCollection* This,
-    ULONG ulIndex,
-    ISensor **ppSensor);
-void __RPC_STUB ISensorCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorCollection_GetCount_Proxy(
-    ISensorCollection* This,
-    ULONG *pCount);
-void __RPC_STUB ISensorCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorCollection_Add_Proxy(
-    ISensorCollection* This,
-    ISensor *pSensor);
-void __RPC_STUB ISensorCollection_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorCollection_Remove_Proxy(
-    ISensorCollection* This,
-    ISensor *pSensor);
-void __RPC_STUB ISensorCollection_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorCollection_RemoveByID_Proxy(
-    ISensorCollection* This,
-    REFSENSOR_ID sensorID);
-void __RPC_STUB ISensorCollection_RemoveByID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorCollection_Clear_Proxy(
-    ISensorCollection* This);
-void __RPC_STUB ISensorCollection_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISensorCollection_INTERFACE_DEFINED__ */
 
@@ -545,86 +487,87 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISensor* This,
+        ISensor *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISensor* This);
+        ISensor *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISensor* This);
+        ISensor *This);
 
     /*** ISensor methods ***/
     HRESULT (STDMETHODCALLTYPE *GetID)(
-        ISensor* This,
+        ISensor *This,
         SENSOR_ID *pID);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ISensor* This,
+        ISensor *This,
         SENSOR_CATEGORY_ID *pSensorCategory);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        ISensor* This,
+        ISensor *This,
         SENSOR_TYPE_ID *pSensorType);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        ISensor* This,
+        ISensor *This,
         BSTR *pFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        ISensor* This,
+        ISensor *This,
         REFPROPERTYKEY key,
         PROPVARIANT *pProperty);
 
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        ISensor* This,
+        ISensor *This,
         IPortableDeviceKeyCollection *pKeys,
         IPortableDeviceValues **ppProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetSupportedDataFields)(
-        ISensor* This,
+        ISensor *This,
         IPortableDeviceKeyCollection **ppDataFields);
 
     HRESULT (STDMETHODCALLTYPE *SetProperties)(
-        ISensor* This,
+        ISensor *This,
         IPortableDeviceValues *pProperties,
         IPortableDeviceValues **ppResults);
 
     HRESULT (STDMETHODCALLTYPE *SupportsDataField)(
-        ISensor* This,
+        ISensor *This,
         REFPROPERTYKEY key,
         VARIANT_BOOL *pIsSupported);
 
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        ISensor* This,
+        ISensor *This,
         SensorState *pState);
 
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        ISensor* This,
+        ISensor *This,
         ISensorDataReport **ppDataReport);
 
     HRESULT (STDMETHODCALLTYPE *SupportsEvent)(
-        ISensor* This,
+        ISensor *This,
         REFGUID eventGuid,
         VARIANT_BOOL *pIsSupported);
 
     HRESULT (STDMETHODCALLTYPE *GetEventInterest)(
-        ISensor* This,
+        ISensor *This,
         GUID **ppValues,
         ULONG *pCount);
 
     HRESULT (STDMETHODCALLTYPE *SetEventInterest)(
-        ISensor* This,
+        ISensor *This,
         GUID *pValues,
         ULONG count);
 
     HRESULT (STDMETHODCALLTYPE *SetEventSink)(
-        ISensor* This,
+        ISensor *This,
         ISensorEvents *pEvents);
 
     END_INTERFACE
 } ISensorVtbl;
+
 interface ISensor {
     CONST_VTBL ISensorVtbl* lpVtbl;
 };
@@ -713,133 +656,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISensor_GetID_Proxy(
-    ISensor* This,
-    SENSOR_ID *pID);
-void __RPC_STUB ISensor_GetID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetCategory_Proxy(
-    ISensor* This,
-    SENSOR_CATEGORY_ID *pSensorCategory);
-void __RPC_STUB ISensor_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetType_Proxy(
-    ISensor* This,
-    SENSOR_TYPE_ID *pSensorType);
-void __RPC_STUB ISensor_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetFriendlyName_Proxy(
-    ISensor* This,
-    BSTR *pFriendlyName);
-void __RPC_STUB ISensor_GetFriendlyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetProperty_Proxy(
-    ISensor* This,
-    REFPROPERTYKEY key,
-    PROPVARIANT *pProperty);
-void __RPC_STUB ISensor_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetProperties_Proxy(
-    ISensor* This,
-    IPortableDeviceKeyCollection *pKeys,
-    IPortableDeviceValues **ppProperties);
-void __RPC_STUB ISensor_GetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetSupportedDataFields_Proxy(
-    ISensor* This,
-    IPortableDeviceKeyCollection **ppDataFields);
-void __RPC_STUB ISensor_GetSupportedDataFields_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_SetProperties_Proxy(
-    ISensor* This,
-    IPortableDeviceValues *pProperties,
-    IPortableDeviceValues **ppResults);
-void __RPC_STUB ISensor_SetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_SupportsDataField_Proxy(
-    ISensor* This,
-    REFPROPERTYKEY key,
-    VARIANT_BOOL *pIsSupported);
-void __RPC_STUB ISensor_SupportsDataField_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetState_Proxy(
-    ISensor* This,
-    SensorState *pState);
-void __RPC_STUB ISensor_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetData_Proxy(
-    ISensor* This,
-    ISensorDataReport **ppDataReport);
-void __RPC_STUB ISensor_GetData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_SupportsEvent_Proxy(
-    ISensor* This,
-    REFGUID eventGuid,
-    VARIANT_BOOL *pIsSupported);
-void __RPC_STUB ISensor_SupportsEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_GetEventInterest_Proxy(
-    ISensor* This,
-    GUID **ppValues,
-    ULONG *pCount);
-void __RPC_STUB ISensor_GetEventInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_SetEventInterest_Proxy(
-    ISensor* This,
-    GUID *pValues,
-    ULONG count);
-void __RPC_STUB ISensor_SetEventInterest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensor_SetEventSink_Proxy(
-    ISensor* This,
-    ISensorEvents *pEvents);
-void __RPC_STUB ISensor_SetEventSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISensor_INTERFACE_DEFINED__ */
 
@@ -875,33 +691,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISensorDataReport* This,
+        ISensorDataReport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISensorDataReport* This);
+        ISensorDataReport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISensorDataReport* This);
+        ISensorDataReport *This);
 
     /*** ISensorDataReport methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTimestamp)(
-        ISensorDataReport* This,
+        ISensorDataReport *This,
         SYSTEMTIME *pTimeStamp);
 
     HRESULT (STDMETHODCALLTYPE *GetSensorValue)(
-        ISensorDataReport* This,
+        ISensorDataReport *This,
         REFPROPERTYKEY pKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetSensorValues)(
-        ISensorDataReport* This,
+        ISensorDataReport *This,
         IPortableDeviceKeyCollection *pKeys,
         IPortableDeviceValues **ppValues);
 
     END_INTERFACE
 } ISensorDataReportVtbl;
+
 interface ISensorDataReport {
     CONST_VTBL ISensorDataReportVtbl* lpVtbl;
 };
@@ -942,32 +759,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISensorDataReport_GetTimestamp_Proxy(
-    ISensorDataReport* This,
-    SYSTEMTIME *pTimeStamp);
-void __RPC_STUB ISensorDataReport_GetTimestamp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorDataReport_GetSensorValue_Proxy(
-    ISensorDataReport* This,
-    REFPROPERTYKEY pKey,
-    PROPVARIANT *pValue);
-void __RPC_STUB ISensorDataReport_GetSensorValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorDataReport_GetSensorValues_Proxy(
-    ISensorDataReport* This,
-    IPortableDeviceKeyCollection *pKeys,
-    IPortableDeviceValues **ppValues);
-void __RPC_STUB ISensorDataReport_GetSensorValues_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISensorDataReport_INTERFACE_DEFINED__ */
 
@@ -996,24 +787,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISensorManagerEvents* This,
+        ISensorManagerEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISensorManagerEvents* This);
+        ISensorManagerEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISensorManagerEvents* This);
+        ISensorManagerEvents *This);
 
     /*** ISensorManagerEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnSensorEnter)(
-        ISensorManagerEvents* This,
+        ISensorManagerEvents *This,
         ISensor *pSensor,
         SensorState state);
 
     END_INTERFACE
 } ISensorManagerEventsVtbl;
+
 interface ISensorManagerEvents {
     CONST_VTBL ISensorManagerEventsVtbl* lpVtbl;
 };
@@ -1046,15 +838,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISensorManagerEvents_OnSensorEnter_Proxy(
-    ISensorManagerEvents* This,
-    ISensor *pSensor,
-    SensorState state);
-void __RPC_STUB ISensorManagerEvents_OnSensorEnter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISensorManagerEvents_INTERFACE_DEFINED__ */
 
@@ -1095,39 +878,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISensorEvents* This,
+        ISensorEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISensorEvents* This);
+        ISensorEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISensorEvents* This);
+        ISensorEvents *This);
 
     /*** ISensorEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnStateChanged)(
-        ISensorEvents* This,
+        ISensorEvents *This,
         ISensor *pSensor,
         SensorState state);
 
     HRESULT (STDMETHODCALLTYPE *OnDataUpdated)(
-        ISensorEvents* This,
+        ISensorEvents *This,
         ISensor *pSensor,
         ISensorDataReport *pNewData);
 
     HRESULT (STDMETHODCALLTYPE *OnEvent)(
-        ISensorEvents* This,
+        ISensorEvents *This,
         ISensor *pSensor,
         REFGUID eventID,
         IPortableDeviceValues *pEventData);
 
     HRESULT (STDMETHODCALLTYPE *OnLeave)(
-        ISensorEvents* This,
+        ISensorEvents *This,
         REFSENSOR_ID ID);
 
     END_INTERFACE
 } ISensorEventsVtbl;
+
 interface ISensorEvents {
     CONST_VTBL ISensorEventsVtbl* lpVtbl;
 };
@@ -1172,42 +956,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISensorEvents_OnStateChanged_Proxy(
-    ISensorEvents* This,
-    ISensor *pSensor,
-    SensorState state);
-void __RPC_STUB ISensorEvents_OnStateChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorEvents_OnDataUpdated_Proxy(
-    ISensorEvents* This,
-    ISensor *pSensor,
-    ISensorDataReport *pNewData);
-void __RPC_STUB ISensorEvents_OnDataUpdated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorEvents_OnEvent_Proxy(
-    ISensorEvents* This,
-    ISensor *pSensor,
-    REFGUID eventID,
-    IPortableDeviceValues *pEventData);
-void __RPC_STUB ISensorEvents_OnEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISensorEvents_OnLeave_Proxy(
-    ISensorEvents* This,
-    REFSENSOR_ID ID);
-void __RPC_STUB ISensorEvents_OnLeave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISensorEvents_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/servprov.h b/mingw-w64-headers/include/servprov.h
index b4f93b6..5df01c0 100644
--- a/mingw-w64-headers/include/servprov.h
+++ b/mingw-w64-headers/include/servprov.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/servprov.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/servprov.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IServiceProvider_FWD_DEFINED__
 #define __IServiceProvider_FWD_DEFINED__
 typedef interface IServiceProvider IServiceProvider;
+#ifdef __cplusplus
+interface IServiceProvider;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -43,6 +46,9 @@
 #ifndef __IServiceProvider_FWD_DEFINED__
 #define __IServiceProvider_FWD_DEFINED__
 typedef interface IServiceProvider IServiceProvider;
+#ifdef __cplusplus
+interface IServiceProvider;
+#endif /* __cplusplus */
 #endif
 
 
@@ -94,25 +100,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IServiceProvider* This,
+        IServiceProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IServiceProvider* This);
+        IServiceProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IServiceProvider* This);
+        IServiceProvider *This);
 
     /*** IServiceProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryService)(
-        IServiceProvider* This,
+        IServiceProvider *This,
         REFGUID guidService,
         REFIID riid,
         void **ppvObject);
 
     END_INTERFACE
 } IServiceProviderVtbl;
+
 interface IServiceProvider {
     CONST_VTBL IServiceProviderVtbl* lpVtbl;
 };
diff --git a/mingw-w64-headers/include/shldisp.h b/mingw-w64-headers/include/shldisp.h
index cb99924..2c8461a 100644
--- a/mingw-w64-headers/include/shldisp.h
+++ b/mingw-w64-headers/include/shldisp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/shldisp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/shldisp.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,11 +20,17 @@
 #ifndef __IFolderViewOC_FWD_DEFINED__
 #define __IFolderViewOC_FWD_DEFINED__
 typedef interface IFolderViewOC IFolderViewOC;
+#ifdef __cplusplus
+interface IFolderViewOC;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __DShellFolderViewEvents_FWD_DEFINED__
 #define __DShellFolderViewEvents_FWD_DEFINED__
 typedef interface DShellFolderViewEvents DShellFolderViewEvents;
+#ifdef __cplusplus
+interface DShellFolderViewEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellFolderViewOC_FWD_DEFINED__
@@ -39,31 +45,49 @@
 #ifndef __DFConstraint_FWD_DEFINED__
 #define __DFConstraint_FWD_DEFINED__
 typedef interface DFConstraint DFConstraint;
+#ifdef __cplusplus
+interface DFConstraint;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __Folder_FWD_DEFINED__
 #define __Folder_FWD_DEFINED__
 typedef interface Folder Folder;
+#ifdef __cplusplus
+interface Folder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __Folder2_FWD_DEFINED__
 #define __Folder2_FWD_DEFINED__
 typedef interface Folder2 Folder2;
+#ifdef __cplusplus
+interface Folder2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __Folder3_FWD_DEFINED__
 #define __Folder3_FWD_DEFINED__
 typedef interface Folder3 Folder3;
+#ifdef __cplusplus
+interface Folder3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItem_FWD_DEFINED__
 #define __FolderItem_FWD_DEFINED__
 typedef interface FolderItem FolderItem;
+#ifdef __cplusplus
+interface FolderItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItem2_FWD_DEFINED__
 #define __FolderItem2_FWD_DEFINED__
 typedef interface FolderItem2 FolderItem2;
+#ifdef __cplusplus
+interface FolderItem2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellFolderItem_FWD_DEFINED__
@@ -78,36 +102,57 @@
 #ifndef __FolderItems_FWD_DEFINED__
 #define __FolderItems_FWD_DEFINED__
 typedef interface FolderItems FolderItems;
+#ifdef __cplusplus
+interface FolderItems;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItems2_FWD_DEFINED__
 #define __FolderItems2_FWD_DEFINED__
 typedef interface FolderItems2 FolderItems2;
+#ifdef __cplusplus
+interface FolderItems2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItems3_FWD_DEFINED__
 #define __FolderItems3_FWD_DEFINED__
 typedef interface FolderItems3 FolderItems3;
+#ifdef __cplusplus
+interface FolderItems3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItemVerb_FWD_DEFINED__
 #define __FolderItemVerb_FWD_DEFINED__
 typedef interface FolderItemVerb FolderItemVerb;
+#ifdef __cplusplus
+interface FolderItemVerb;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItemVerbs_FWD_DEFINED__
 #define __FolderItemVerbs_FWD_DEFINED__
 typedef interface FolderItemVerbs FolderItemVerbs;
+#ifdef __cplusplus
+interface FolderItemVerbs;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellLinkDual_FWD_DEFINED__
 #define __IShellLinkDual_FWD_DEFINED__
 typedef interface IShellLinkDual IShellLinkDual;
+#ifdef __cplusplus
+interface IShellLinkDual;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellLinkDual2_FWD_DEFINED__
 #define __IShellLinkDual2_FWD_DEFINED__
 typedef interface IShellLinkDual2 IShellLinkDual2;
+#ifdef __cplusplus
+interface IShellLinkDual2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellLinkObject_FWD_DEFINED__
@@ -122,16 +167,25 @@
 #ifndef __IShellFolderViewDual_FWD_DEFINED__
 #define __IShellFolderViewDual_FWD_DEFINED__
 typedef interface IShellFolderViewDual IShellFolderViewDual;
+#ifdef __cplusplus
+interface IShellFolderViewDual;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellFolderViewDual2_FWD_DEFINED__
 #define __IShellFolderViewDual2_FWD_DEFINED__
 typedef interface IShellFolderViewDual2 IShellFolderViewDual2;
+#ifdef __cplusplus
+interface IShellFolderViewDual2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellFolderViewDual3_FWD_DEFINED__
 #define __IShellFolderViewDual3_FWD_DEFINED__
 typedef interface IShellFolderViewDual3 IShellFolderViewDual3;
+#ifdef __cplusplus
+interface IShellFolderViewDual3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ShellFolderView_FWD_DEFINED__
@@ -146,31 +200,49 @@
 #ifndef __IShellDispatch_FWD_DEFINED__
 #define __IShellDispatch_FWD_DEFINED__
 typedef interface IShellDispatch IShellDispatch;
+#ifdef __cplusplus
+interface IShellDispatch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellDispatch2_FWD_DEFINED__
 #define __IShellDispatch2_FWD_DEFINED__
 typedef interface IShellDispatch2 IShellDispatch2;
+#ifdef __cplusplus
+interface IShellDispatch2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellDispatch3_FWD_DEFINED__
 #define __IShellDispatch3_FWD_DEFINED__
 typedef interface IShellDispatch3 IShellDispatch3;
+#ifdef __cplusplus
+interface IShellDispatch3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellDispatch4_FWD_DEFINED__
 #define __IShellDispatch4_FWD_DEFINED__
 typedef interface IShellDispatch4 IShellDispatch4;
+#ifdef __cplusplus
+interface IShellDispatch4;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellDispatch5_FWD_DEFINED__
 #define __IShellDispatch5_FWD_DEFINED__
 typedef interface IShellDispatch5 IShellDispatch5;
+#ifdef __cplusplus
+interface IShellDispatch5;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellDispatch6_FWD_DEFINED__
 #define __IShellDispatch6_FWD_DEFINED__
 typedef interface IShellDispatch6 IShellDispatch6;
+#ifdef __cplusplus
+interface IShellDispatch6;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __Shell_FWD_DEFINED__
@@ -194,6 +266,9 @@
 #ifndef __IFileSearchBand_FWD_DEFINED__
 #define __IFileSearchBand_FWD_DEFINED__
 typedef interface IFileSearchBand IFileSearchBand;
+#ifdef __cplusplus
+interface IFileSearchBand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FileSearchBand_FWD_DEFINED__
@@ -208,31 +283,49 @@
 #ifndef __IWebWizardHost_FWD_DEFINED__
 #define __IWebWizardHost_FWD_DEFINED__
 typedef interface IWebWizardHost IWebWizardHost;
+#ifdef __cplusplus
+interface IWebWizardHost;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INewWDEvents_FWD_DEFINED__
 #define __INewWDEvents_FWD_DEFINED__
 typedef interface INewWDEvents INewWDEvents;
+#ifdef __cplusplus
+interface INewWDEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAutoComplete_FWD_DEFINED__
 #define __IAutoComplete_FWD_DEFINED__
 typedef interface IAutoComplete IAutoComplete;
+#ifdef __cplusplus
+interface IAutoComplete;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAutoComplete2_FWD_DEFINED__
 #define __IAutoComplete2_FWD_DEFINED__
 typedef interface IAutoComplete2 IAutoComplete2;
+#ifdef __cplusplus
+interface IAutoComplete2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumACString_FWD_DEFINED__
 #define __IEnumACString_FWD_DEFINED__
 typedef interface IEnumACString IEnumACString;
+#ifdef __cplusplus
+interface IEnumACString;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDataObjectAsyncCapability_FWD_DEFINED__
 #define __IDataObjectAsyncCapability_FWD_DEFINED__
 typedef interface IDataObjectAsyncCapability IDataObjectAsyncCapability;
+#ifdef __cplusplus
+interface IDataObjectAsyncCapability;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -249,31 +342,49 @@
 #ifndef __DShellFolderViewEvents_FWD_DEFINED__
 #define __DShellFolderViewEvents_FWD_DEFINED__
 typedef interface DShellFolderViewEvents DShellFolderViewEvents;
+#ifdef __cplusplus
+interface DShellFolderViewEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAutoComplete_FWD_DEFINED__
 #define __IAutoComplete_FWD_DEFINED__
 typedef interface IAutoComplete IAutoComplete;
+#ifdef __cplusplus
+interface IAutoComplete;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItem_FWD_DEFINED__
 #define __FolderItem_FWD_DEFINED__
 typedef interface FolderItem FolderItem;
+#ifdef __cplusplus
+interface FolderItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItems_FWD_DEFINED__
 #define __FolderItems_FWD_DEFINED__
 typedef interface FolderItems FolderItems;
+#ifdef __cplusplus
+interface FolderItems;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItemVerb_FWD_DEFINED__
 #define __FolderItemVerb_FWD_DEFINED__
 typedef interface FolderItemVerb FolderItemVerb;
+#ifdef __cplusplus
+interface FolderItemVerb;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __FolderItemVerbs_FWD_DEFINED__
 #define __FolderItemVerbs_FWD_DEFINED__
 typedef interface FolderItemVerbs FolderItemVerbs;
+#ifdef __cplusplus
+interface FolderItemVerbs;
+#endif /* __cplusplus */
 #endif
 
 
@@ -303,29 +414,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderViewOC* This,
+        IFolderViewOC *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderViewOC* This);
+        IFolderViewOC *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderViewOC* This);
+        IFolderViewOC *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFolderViewOC* This,
+        IFolderViewOC *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFolderViewOC* This,
+        IFolderViewOC *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFolderViewOC* This,
+        IFolderViewOC *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -333,7 +444,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFolderViewOC* This,
+        IFolderViewOC *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -345,11 +456,12 @@
 
     /*** IFolderViewOC methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFolderView)(
-        IFolderViewOC* This,
+        IFolderViewOC *This,
         IDispatch *pdisp);
 
     END_INTERFACE
 } IFolderViewOCVtbl;
+
 interface IFolderViewOC {
     CONST_VTBL IFolderViewOCVtbl* lpVtbl;
 };
@@ -400,14 +512,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderViewOC_SetFolderView_Proxy(
-    IFolderViewOC* This,
-    IDispatch *pdisp);
-void __RPC_STUB IFolderViewOC_SetFolderView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderViewOC_INTERFACE_DEFINED__ */
 
@@ -432,29 +536,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        DShellFolderViewEvents* This,
+        DShellFolderViewEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        DShellFolderViewEvents* This);
+        DShellFolderViewEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        DShellFolderViewEvents* This);
+        DShellFolderViewEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        DShellFolderViewEvents* This,
+        DShellFolderViewEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        DShellFolderViewEvents* This,
+        DShellFolderViewEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        DShellFolderViewEvents* This,
+        DShellFolderViewEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -462,7 +566,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        DShellFolderViewEvents* This,
+        DShellFolderViewEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -474,6 +578,7 @@
 
     END_INTERFACE
 } DShellFolderViewEventsVtbl;
+
 interface DShellFolderViewEvents {
     CONST_VTBL DShellFolderViewEventsVtbl* lpVtbl;
 };
@@ -560,29 +665,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        DFConstraint* This,
+        DFConstraint *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        DFConstraint* This);
+        DFConstraint *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        DFConstraint* This);
+        DFConstraint *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        DFConstraint* This,
+        DFConstraint *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        DFConstraint* This,
+        DFConstraint *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        DFConstraint* This,
+        DFConstraint *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -590,7 +695,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        DFConstraint* This,
+        DFConstraint *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -602,15 +707,16 @@
 
     /*** DFConstraint methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        DFConstraint* This,
+        DFConstraint *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        DFConstraint* This,
+        DFConstraint *This,
         VARIANT *pv);
 
     END_INTERFACE
 } DFConstraintVtbl;
+
 interface DFConstraint {
     CONST_VTBL DFConstraintVtbl* lpVtbl;
 };
@@ -665,22 +771,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE DFConstraint_get_Name_Proxy(
-    DFConstraint* This,
-    BSTR *pbs);
-void __RPC_STUB DFConstraint_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE DFConstraint_get_Value_Proxy(
-    DFConstraint* This,
-    VARIANT *pv);
-void __RPC_STUB DFConstraint_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __DFConstraint_INTERFACE_DEFINED__ */
 
@@ -741,29 +831,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        Folder* This,
+        Folder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        Folder* This);
+        Folder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        Folder* This);
+        Folder *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        Folder* This,
+        Folder *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        Folder* This,
+        Folder *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        Folder* This,
+        Folder *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -771,7 +861,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        Folder* This,
+        Folder *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -783,53 +873,54 @@
 
     /*** Folder methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Title)(
-        Folder* This,
+        Folder *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        Folder* This,
+        Folder *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        Folder* This,
+        Folder *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_ParentFolder)(
-        Folder* This,
+        Folder *This,
         Folder **ppsf);
 
     HRESULT (STDMETHODCALLTYPE *Items)(
-        Folder* This,
+        Folder *This,
         FolderItems **ppid);
 
     HRESULT (STDMETHODCALLTYPE *ParseName)(
-        Folder* This,
+        Folder *This,
         BSTR bName,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NewFolder)(
-        Folder* This,
+        Folder *This,
         BSTR bName,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *MoveHere)(
-        Folder* This,
+        Folder *This,
         VARIANT vItem,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *CopyHere)(
-        Folder* This,
+        Folder *This,
         VARIANT vItem,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetDetailsOf)(
-        Folder* This,
+        Folder *This,
         VARIANT vItem,
         int iColumn,
         BSTR *pbs);
 
     END_INTERFACE
 } FolderVtbl;
+
 interface Folder {
     CONST_VTBL FolderVtbl* lpVtbl;
 };
@@ -916,92 +1007,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE Folder_get_Title_Proxy(
-    Folder* This,
-    BSTR *pbs);
-void __RPC_STUB Folder_get_Title_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_get_Application_Proxy(
-    Folder* This,
-    IDispatch **ppid);
-void __RPC_STUB Folder_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_get_Parent_Proxy(
-    Folder* This,
-    IDispatch **ppid);
-void __RPC_STUB Folder_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_get_ParentFolder_Proxy(
-    Folder* This,
-    Folder **ppsf);
-void __RPC_STUB Folder_get_ParentFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_Items_Proxy(
-    Folder* This,
-    FolderItems **ppid);
-void __RPC_STUB Folder_Items_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_ParseName_Proxy(
-    Folder* This,
-    BSTR bName,
-    FolderItem **ppid);
-void __RPC_STUB Folder_ParseName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_NewFolder_Proxy(
-    Folder* This,
-    BSTR bName,
-    VARIANT vOptions);
-void __RPC_STUB Folder_NewFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_MoveHere_Proxy(
-    Folder* This,
-    VARIANT vItem,
-    VARIANT vOptions);
-void __RPC_STUB Folder_MoveHere_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_CopyHere_Proxy(
-    Folder* This,
-    VARIANT vItem,
-    VARIANT vOptions);
-void __RPC_STUB Folder_CopyHere_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder_GetDetailsOf_Proxy(
-    Folder* This,
-    VARIANT vItem,
-    int iColumn,
-    BSTR *pbs);
-void __RPC_STUB Folder_GetDetailsOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __Folder_INTERFACE_DEFINED__ */
 
@@ -1041,29 +1046,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        Folder2* This,
+        Folder2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        Folder2* This);
+        Folder2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        Folder2* This);
+        Folder2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        Folder2* This,
+        Folder2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        Folder2* This,
+        Folder2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        Folder2* This,
+        Folder2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1071,7 +1076,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        Folder2* This,
+        Folder2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1083,72 +1088,73 @@
 
     /*** Folder methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Title)(
-        Folder2* This,
+        Folder2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        Folder2* This,
+        Folder2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        Folder2* This,
+        Folder2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_ParentFolder)(
-        Folder2* This,
+        Folder2 *This,
         Folder **ppsf);
 
     HRESULT (STDMETHODCALLTYPE *Items)(
-        Folder2* This,
+        Folder2 *This,
         FolderItems **ppid);
 
     HRESULT (STDMETHODCALLTYPE *ParseName)(
-        Folder2* This,
+        Folder2 *This,
         BSTR bName,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NewFolder)(
-        Folder2* This,
+        Folder2 *This,
         BSTR bName,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *MoveHere)(
-        Folder2* This,
+        Folder2 *This,
         VARIANT vItem,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *CopyHere)(
-        Folder2* This,
+        Folder2 *This,
         VARIANT vItem,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetDetailsOf)(
-        Folder2* This,
+        Folder2 *This,
         VARIANT vItem,
         int iColumn,
         BSTR *pbs);
 
     /*** Folder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Self)(
-        Folder2* This,
+        Folder2 *This,
         FolderItem **ppfi);
 
     HRESULT (STDMETHODCALLTYPE *get_OfflineStatus)(
-        Folder2* This,
+        Folder2 *This,
         LONG *pul);
 
     HRESULT (STDMETHODCALLTYPE *Synchronize)(
-        Folder2* This);
+        Folder2 *This);
 
     HRESULT (STDMETHODCALLTYPE *get_HaveToShowWebViewBarricade)(
-        Folder2* This,
+        Folder2 *This,
         VARIANT_BOOL *pbHaveToShowWebViewBarricade);
 
     HRESULT (STDMETHODCALLTYPE *DismissedWebViewBarricade)(
-        Folder2* This);
+        Folder2 *This);
 
     END_INTERFACE
 } Folder2Vtbl;
+
 interface Folder2 {
     CONST_VTBL Folder2Vtbl* lpVtbl;
 };
@@ -1257,44 +1263,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE Folder2_get_Self_Proxy(
-    Folder2* This,
-    FolderItem **ppfi);
-void __RPC_STUB Folder2_get_Self_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder2_get_OfflineStatus_Proxy(
-    Folder2* This,
-    LONG *pul);
-void __RPC_STUB Folder2_get_OfflineStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder2_Synchronize_Proxy(
-    Folder2* This);
-void __RPC_STUB Folder2_Synchronize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder2_get_HaveToShowWebViewBarricade_Proxy(
-    Folder2* This,
-    VARIANT_BOOL *pbHaveToShowWebViewBarricade);
-void __RPC_STUB Folder2_get_HaveToShowWebViewBarricade_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder2_DismissedWebViewBarricade_Proxy(
-    Folder2* This);
-void __RPC_STUB Folder2_DismissedWebViewBarricade_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __Folder2_INTERFACE_DEFINED__ */
 
@@ -1332,29 +1300,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        Folder3* This,
+        Folder3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        Folder3* This);
+        Folder3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        Folder3* This);
+        Folder3 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        Folder3* This,
+        Folder3 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        Folder3* This,
+        Folder3 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        Folder3* This,
+        Folder3 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1362,7 +1330,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        Folder3* This,
+        Folder3 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1374,81 +1342,82 @@
 
     /*** Folder methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Title)(
-        Folder3* This,
+        Folder3 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        Folder3* This,
+        Folder3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        Folder3* This,
+        Folder3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_ParentFolder)(
-        Folder3* This,
+        Folder3 *This,
         Folder **ppsf);
 
     HRESULT (STDMETHODCALLTYPE *Items)(
-        Folder3* This,
+        Folder3 *This,
         FolderItems **ppid);
 
     HRESULT (STDMETHODCALLTYPE *ParseName)(
-        Folder3* This,
+        Folder3 *This,
         BSTR bName,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NewFolder)(
-        Folder3* This,
+        Folder3 *This,
         BSTR bName,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *MoveHere)(
-        Folder3* This,
+        Folder3 *This,
         VARIANT vItem,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *CopyHere)(
-        Folder3* This,
+        Folder3 *This,
         VARIANT vItem,
         VARIANT vOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetDetailsOf)(
-        Folder3* This,
+        Folder3 *This,
         VARIANT vItem,
         int iColumn,
         BSTR *pbs);
 
     /*** Folder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Self)(
-        Folder3* This,
+        Folder3 *This,
         FolderItem **ppfi);
 
     HRESULT (STDMETHODCALLTYPE *get_OfflineStatus)(
-        Folder3* This,
+        Folder3 *This,
         LONG *pul);
 
     HRESULT (STDMETHODCALLTYPE *Synchronize)(
-        Folder3* This);
+        Folder3 *This);
 
     HRESULT (STDMETHODCALLTYPE *get_HaveToShowWebViewBarricade)(
-        Folder3* This,
+        Folder3 *This,
         VARIANT_BOOL *pbHaveToShowWebViewBarricade);
 
     HRESULT (STDMETHODCALLTYPE *DismissedWebViewBarricade)(
-        Folder3* This);
+        Folder3 *This);
 
     /*** Folder3 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ShowWebViewBarricade)(
-        Folder3* This,
+        Folder3 *This,
         VARIANT_BOOL *pbShowWebViewBarricade);
 
     HRESULT (STDMETHODCALLTYPE *put_ShowWebViewBarricade)(
-        Folder3* This,
+        Folder3 *This,
         VARIANT_BOOL bShowWebViewBarricade);
 
     END_INTERFACE
 } Folder3Vtbl;
+
 interface Folder3 {
     CONST_VTBL Folder3Vtbl* lpVtbl;
 };
@@ -1567,22 +1536,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE Folder3_get_ShowWebViewBarricade_Proxy(
-    Folder3* This,
-    VARIANT_BOOL *pbShowWebViewBarricade);
-void __RPC_STUB Folder3_get_ShowWebViewBarricade_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE Folder3_put_ShowWebViewBarricade_Proxy(
-    Folder3* This,
-    VARIANT_BOOL bShowWebViewBarricade);
-void __RPC_STUB Folder3_put_ShowWebViewBarricade_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __Folder3_INTERFACE_DEFINED__ */
 
@@ -1659,29 +1612,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        FolderItem* This,
+        FolderItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        FolderItem* This);
+        FolderItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        FolderItem* This);
+        FolderItem *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        FolderItem* This,
+        FolderItem *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        FolderItem* This,
+        FolderItem *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        FolderItem* This,
+        FolderItem *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1689,7 +1642,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        FolderItem* This,
+        FolderItem *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1701,75 +1654,76 @@
 
     /*** FolderItem methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        FolderItem* This,
+        FolderItem *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        FolderItem* This,
+        FolderItem *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        FolderItem* This,
+        FolderItem *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        FolderItem* This,
+        FolderItem *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        FolderItem* This,
+        FolderItem *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_GetLink)(
-        FolderItem* This,
+        FolderItem *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_GetFolder)(
-        FolderItem* This,
+        FolderItem *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_IsLink)(
-        FolderItem* This,
+        FolderItem *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_IsFolder)(
-        FolderItem* This,
+        FolderItem *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_IsFileSystem)(
-        FolderItem* This,
+        FolderItem *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_IsBrowsable)(
-        FolderItem* This,
+        FolderItem *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_ModifyDate)(
-        FolderItem* This,
+        FolderItem *This,
         DATE *pdt);
 
     HRESULT (STDMETHODCALLTYPE *put_ModifyDate)(
-        FolderItem* This,
+        FolderItem *This,
         DATE dt);
 
     HRESULT (STDMETHODCALLTYPE *get_Size)(
-        FolderItem* This,
+        FolderItem *This,
         LONG *pul);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        FolderItem* This,
+        FolderItem *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *Verbs)(
-        FolderItem* This,
+        FolderItem *This,
         FolderItemVerbs **ppfic);
 
     HRESULT (STDMETHODCALLTYPE *InvokeVerb)(
-        FolderItem* This,
+        FolderItem *This,
         VARIANT vVerb);
 
     END_INTERFACE
 } FolderItemVtbl;
+
 interface FolderItem {
     CONST_VTBL FolderItemVtbl* lpVtbl;
 };
@@ -1884,142 +1838,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE FolderItem_get_Application_Proxy(
-    FolderItem* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItem_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_Parent_Proxy(
-    FolderItem* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItem_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_Name_Proxy(
-    FolderItem* This,
-    BSTR *pbs);
-void __RPC_STUB FolderItem_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_put_Name_Proxy(
-    FolderItem* This,
-    BSTR bs);
-void __RPC_STUB FolderItem_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_Path_Proxy(
-    FolderItem* This,
-    BSTR *pbs);
-void __RPC_STUB FolderItem_get_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_GetLink_Proxy(
-    FolderItem* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItem_get_GetLink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_GetFolder_Proxy(
-    FolderItem* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItem_get_GetFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_IsLink_Proxy(
-    FolderItem* This,
-    VARIANT_BOOL *pb);
-void __RPC_STUB FolderItem_get_IsLink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_IsFolder_Proxy(
-    FolderItem* This,
-    VARIANT_BOOL *pb);
-void __RPC_STUB FolderItem_get_IsFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_IsFileSystem_Proxy(
-    FolderItem* This,
-    VARIANT_BOOL *pb);
-void __RPC_STUB FolderItem_get_IsFileSystem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_IsBrowsable_Proxy(
-    FolderItem* This,
-    VARIANT_BOOL *pb);
-void __RPC_STUB FolderItem_get_IsBrowsable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_ModifyDate_Proxy(
-    FolderItem* This,
-    DATE *pdt);
-void __RPC_STUB FolderItem_get_ModifyDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_put_ModifyDate_Proxy(
-    FolderItem* This,
-    DATE dt);
-void __RPC_STUB FolderItem_put_ModifyDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_Size_Proxy(
-    FolderItem* This,
-    LONG *pul);
-void __RPC_STUB FolderItem_get_Size_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_get_Type_Proxy(
-    FolderItem* This,
-    BSTR *pbs);
-void __RPC_STUB FolderItem_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_Verbs_Proxy(
-    FolderItem* This,
-    FolderItemVerbs **ppfic);
-void __RPC_STUB FolderItem_Verbs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem_InvokeVerb_Proxy(
-    FolderItem* This,
-    VARIANT vVerb);
-void __RPC_STUB FolderItem_InvokeVerb_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __FolderItem_INTERFACE_DEFINED__ */
 
@@ -2052,29 +1870,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        FolderItem2* This,
+        FolderItem2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        FolderItem2* This);
+        FolderItem2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        FolderItem2* This);
+        FolderItem2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        FolderItem2* This,
+        FolderItem2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        FolderItem2* This,
+        FolderItem2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        FolderItem2* This,
+        FolderItem2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2082,7 +1900,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        FolderItem2* This,
+        FolderItem2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2094,86 +1912,87 @@
 
     /*** FolderItem methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        FolderItem2* This,
+        FolderItem2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        FolderItem2* This,
+        FolderItem2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        FolderItem2* This,
+        FolderItem2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        FolderItem2* This,
+        FolderItem2 *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        FolderItem2* This,
+        FolderItem2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_GetLink)(
-        FolderItem2* This,
+        FolderItem2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_GetFolder)(
-        FolderItem2* This,
+        FolderItem2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_IsLink)(
-        FolderItem2* This,
+        FolderItem2 *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_IsFolder)(
-        FolderItem2* This,
+        FolderItem2 *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_IsFileSystem)(
-        FolderItem2* This,
+        FolderItem2 *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_IsBrowsable)(
-        FolderItem2* This,
+        FolderItem2 *This,
         VARIANT_BOOL *pb);
 
     HRESULT (STDMETHODCALLTYPE *get_ModifyDate)(
-        FolderItem2* This,
+        FolderItem2 *This,
         DATE *pdt);
 
     HRESULT (STDMETHODCALLTYPE *put_ModifyDate)(
-        FolderItem2* This,
+        FolderItem2 *This,
         DATE dt);
 
     HRESULT (STDMETHODCALLTYPE *get_Size)(
-        FolderItem2* This,
+        FolderItem2 *This,
         LONG *pul);
 
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        FolderItem2* This,
+        FolderItem2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *Verbs)(
-        FolderItem2* This,
+        FolderItem2 *This,
         FolderItemVerbs **ppfic);
 
     HRESULT (STDMETHODCALLTYPE *InvokeVerb)(
-        FolderItem2* This,
+        FolderItem2 *This,
         VARIANT vVerb);
 
     /*** FolderItem2 methods ***/
     HRESULT (STDMETHODCALLTYPE *InvokeVerbEx)(
-        FolderItem2* This,
+        FolderItem2 *This,
         VARIANT vVerb,
         VARIANT vArgs);
 
     HRESULT (STDMETHODCALLTYPE *ExtendedProperty)(
-        FolderItem2* This,
+        FolderItem2 *This,
         BSTR bstrPropName,
         VARIANT *pvRet);
 
     END_INTERFACE
 } FolderItem2Vtbl;
+
 interface FolderItem2 {
     CONST_VTBL FolderItem2Vtbl* lpVtbl;
 };
@@ -2298,24 +2117,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE FolderItem2_InvokeVerbEx_Proxy(
-    FolderItem2* This,
-    VARIANT vVerb,
-    VARIANT vArgs);
-void __RPC_STUB FolderItem2_InvokeVerbEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItem2_ExtendedProperty_Proxy(
-    FolderItem2* This,
-    BSTR bstrPropName,
-    VARIANT *pvRet);
-void __RPC_STUB FolderItem2_ExtendedProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __FolderItem2_INTERFACE_DEFINED__ */
 
@@ -2369,29 +2170,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        FolderItems* This,
+        FolderItems *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        FolderItems* This);
+        FolderItems *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        FolderItems* This);
+        FolderItems *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        FolderItems* This,
+        FolderItems *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        FolderItems* This,
+        FolderItems *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        FolderItems* This,
+        FolderItems *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2399,7 +2200,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        FolderItems* This,
+        FolderItems *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2411,28 +2212,29 @@
 
     /*** FolderItems methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        FolderItems* This,
+        FolderItems *This,
         LONG *plCount);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        FolderItems* This,
+        FolderItems *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        FolderItems* This,
+        FolderItems *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        FolderItems* This,
+        FolderItems *This,
         VARIANT index,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *_NewEnum)(
-        FolderItems* This,
+        FolderItems *This,
         IUnknown **ppunk);
 
     END_INTERFACE
 } FolderItemsVtbl;
+
 interface FolderItems {
     CONST_VTBL FolderItemsVtbl* lpVtbl;
 };
@@ -2499,47 +2301,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE FolderItems_get_Count_Proxy(
-    FolderItems* This,
-    LONG *plCount);
-void __RPC_STUB FolderItems_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItems_get_Application_Proxy(
-    FolderItems* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItems_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItems_get_Parent_Proxy(
-    FolderItems* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItems_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItems_Item_Proxy(
-    FolderItems* This,
-    VARIANT index,
-    FolderItem **ppid);
-void __RPC_STUB FolderItems_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItems__NewEnum_Proxy(
-    FolderItems* This,
-    IUnknown **ppunk);
-void __RPC_STUB FolderItems__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __FolderItems_INTERFACE_DEFINED__ */
 
@@ -2568,29 +2329,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        FolderItems2* This,
+        FolderItems2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        FolderItems2* This);
+        FolderItems2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        FolderItems2* This);
+        FolderItems2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        FolderItems2* This,
+        FolderItems2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        FolderItems2* This,
+        FolderItems2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        FolderItems2* This,
+        FolderItems2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2598,7 +2359,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        FolderItems2* This,
+        FolderItems2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2610,34 +2371,35 @@
 
     /*** FolderItems methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        FolderItems2* This,
+        FolderItems2 *This,
         LONG *plCount);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        FolderItems2* This,
+        FolderItems2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        FolderItems2* This,
+        FolderItems2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        FolderItems2* This,
+        FolderItems2 *This,
         VARIANT index,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *_NewEnum)(
-        FolderItems2* This,
+        FolderItems2 *This,
         IUnknown **ppunk);
 
     /*** FolderItems2 methods ***/
     HRESULT (STDMETHODCALLTYPE *InvokeVerbEx)(
-        FolderItems2* This,
+        FolderItems2 *This,
         VARIANT vVerb,
         VARIANT vArgs);
 
     END_INTERFACE
 } FolderItems2Vtbl;
+
 interface FolderItems2 {
     CONST_VTBL FolderItems2Vtbl* lpVtbl;
 };
@@ -2710,15 +2472,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE FolderItems2_InvokeVerbEx_Proxy(
-    FolderItems2* This,
-    VARIANT vVerb,
-    VARIANT vArgs);
-void __RPC_STUB FolderItems2_InvokeVerbEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __FolderItems2_INTERFACE_DEFINED__ */
 
@@ -2750,29 +2503,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        FolderItems3* This,
+        FolderItems3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        FolderItems3* This);
+        FolderItems3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        FolderItems3* This);
+        FolderItems3 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        FolderItems3* This,
+        FolderItems3 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        FolderItems3* This,
+        FolderItems3 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        FolderItems3* This,
+        FolderItems3 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2780,7 +2533,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        FolderItems3* This,
+        FolderItems3 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2792,44 +2545,45 @@
 
     /*** FolderItems methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        FolderItems3* This,
+        FolderItems3 *This,
         LONG *plCount);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        FolderItems3* This,
+        FolderItems3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        FolderItems3* This,
+        FolderItems3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        FolderItems3* This,
+        FolderItems3 *This,
         VARIANT index,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *_NewEnum)(
-        FolderItems3* This,
+        FolderItems3 *This,
         IUnknown **ppunk);
 
     /*** FolderItems2 methods ***/
     HRESULT (STDMETHODCALLTYPE *InvokeVerbEx)(
-        FolderItems3* This,
+        FolderItems3 *This,
         VARIANT vVerb,
         VARIANT vArgs);
 
     /*** FolderItems3 methods ***/
     HRESULT (STDMETHODCALLTYPE *Filter)(
-        FolderItems3* This,
+        FolderItems3 *This,
         LONG grfFlags,
         BSTR bstrFileSpec);
 
     HRESULT (STDMETHODCALLTYPE *get_Verbs)(
-        FolderItems3* This,
+        FolderItems3 *This,
         FolderItemVerbs **ppfic);
 
     END_INTERFACE
 } FolderItems3Vtbl;
+
 interface FolderItems3 {
     CONST_VTBL FolderItems3Vtbl* lpVtbl;
 };
@@ -2912,23 +2666,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE FolderItems3_Filter_Proxy(
-    FolderItems3* This,
-    LONG grfFlags,
-    BSTR bstrFileSpec);
-void __RPC_STUB FolderItems3_Filter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItems3_get_Verbs_Proxy(
-    FolderItems3* This,
-    FolderItemVerbs **ppfic);
-void __RPC_STUB FolderItems3_get_Verbs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __FolderItems3_INTERFACE_DEFINED__ */
 
@@ -2965,29 +2702,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        FolderItemVerb* This);
+        FolderItemVerb *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        FolderItemVerb* This);
+        FolderItemVerb *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2995,7 +2732,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3007,22 +2744,23 @@
 
     /*** FolderItemVerb methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        FolderItemVerb* This,
+        FolderItemVerb *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *DoIt)(
-        FolderItemVerb* This);
+        FolderItemVerb *This);
 
     END_INTERFACE
 } FolderItemVerbVtbl;
+
 interface FolderItemVerb {
     CONST_VTBL FolderItemVerbVtbl* lpVtbl;
 };
@@ -3085,37 +2823,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE FolderItemVerb_get_Application_Proxy(
-    FolderItemVerb* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItemVerb_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItemVerb_get_Parent_Proxy(
-    FolderItemVerb* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItemVerb_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItemVerb_get_Name_Proxy(
-    FolderItemVerb* This,
-    BSTR *pbs);
-void __RPC_STUB FolderItemVerb_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItemVerb_DoIt_Proxy(
-    FolderItemVerb* This);
-void __RPC_STUB FolderItemVerb_DoIt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __FolderItemVerb_INTERFACE_DEFINED__ */
 
@@ -3156,29 +2863,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        FolderItemVerbs* This);
+        FolderItemVerbs *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        FolderItemVerbs* This);
+        FolderItemVerbs *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3186,7 +2893,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3198,28 +2905,29 @@
 
     /*** FolderItemVerbs methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         LONG *plCount);
 
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         VARIANT index,
         FolderItemVerb **ppid);
 
     HRESULT (STDMETHODCALLTYPE *_NewEnum)(
-        FolderItemVerbs* This,
+        FolderItemVerbs *This,
         IUnknown **ppunk);
 
     END_INTERFACE
 } FolderItemVerbsVtbl;
+
 interface FolderItemVerbs {
     CONST_VTBL FolderItemVerbsVtbl* lpVtbl;
 };
@@ -3286,47 +2994,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE FolderItemVerbs_get_Count_Proxy(
-    FolderItemVerbs* This,
-    LONG *plCount);
-void __RPC_STUB FolderItemVerbs_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItemVerbs_get_Application_Proxy(
-    FolderItemVerbs* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItemVerbs_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItemVerbs_get_Parent_Proxy(
-    FolderItemVerbs* This,
-    IDispatch **ppid);
-void __RPC_STUB FolderItemVerbs_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItemVerbs_Item_Proxy(
-    FolderItemVerbs* This,
-    VARIANT index,
-    FolderItemVerb **ppid);
-void __RPC_STUB FolderItemVerbs_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE FolderItemVerbs__NewEnum_Proxy(
-    FolderItemVerbs* This,
-    IUnknown **ppunk);
-void __RPC_STUB FolderItemVerbs__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __FolderItemVerbs_INTERFACE_DEFINED__ */
 
@@ -3401,29 +3068,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLinkDual* This);
+        IShellLinkDual *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLinkDual* This);
+        IShellLinkDual *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3431,7 +3098,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3443,73 +3110,74 @@
 
     /*** IShellLinkDual methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Path)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_WorkingDirectory)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_WorkingDirectory)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Arguments)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Arguments)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Hotkey)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         int *piHK);
 
     HRESULT (STDMETHODCALLTYPE *put_Hotkey)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         int iHK);
 
     HRESULT (STDMETHODCALLTYPE *get_ShowCommand)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         int *piShowCommand);
 
     HRESULT (STDMETHODCALLTYPE *put_ShowCommand)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         int iShowCommand);
 
     HRESULT (STDMETHODCALLTYPE *Resolve)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         int fFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR *pbs,
         int *piIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetIconLocation)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         BSTR bs,
         int iIcon);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IShellLinkDual* This,
+        IShellLinkDual *This,
         VARIANT vWhere);
 
     END_INTERFACE
 } IShellLinkDualVtbl;
+
 interface IShellLinkDual {
     CONST_VTBL IShellLinkDualVtbl* lpVtbl;
 };
@@ -3620,136 +3288,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Path_Proxy(
-    IShellLinkDual* This,
-    BSTR *pbs);
-void __RPC_STUB IShellLinkDual_get_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Path_Proxy(
-    IShellLinkDual* This,
-    BSTR bs);
-void __RPC_STUB IShellLinkDual_put_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Description_Proxy(
-    IShellLinkDual* This,
-    BSTR *pbs);
-void __RPC_STUB IShellLinkDual_get_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Description_Proxy(
-    IShellLinkDual* This,
-    BSTR bs);
-void __RPC_STUB IShellLinkDual_put_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_get_WorkingDirectory_Proxy(
-    IShellLinkDual* This,
-    BSTR *pbs);
-void __RPC_STUB IShellLinkDual_get_WorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_put_WorkingDirectory_Proxy(
-    IShellLinkDual* This,
-    BSTR bs);
-void __RPC_STUB IShellLinkDual_put_WorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Arguments_Proxy(
-    IShellLinkDual* This,
-    BSTR *pbs);
-void __RPC_STUB IShellLinkDual_get_Arguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Arguments_Proxy(
-    IShellLinkDual* This,
-    BSTR bs);
-void __RPC_STUB IShellLinkDual_put_Arguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_get_Hotkey_Proxy(
-    IShellLinkDual* This,
-    int *piHK);
-void __RPC_STUB IShellLinkDual_get_Hotkey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_put_Hotkey_Proxy(
-    IShellLinkDual* This,
-    int iHK);
-void __RPC_STUB IShellLinkDual_put_Hotkey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_get_ShowCommand_Proxy(
-    IShellLinkDual* This,
-    int *piShowCommand);
-void __RPC_STUB IShellLinkDual_get_ShowCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_put_ShowCommand_Proxy(
-    IShellLinkDual* This,
-    int iShowCommand);
-void __RPC_STUB IShellLinkDual_put_ShowCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_Resolve_Proxy(
-    IShellLinkDual* This,
-    int fFlags);
-void __RPC_STUB IShellLinkDual_Resolve_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_GetIconLocation_Proxy(
-    IShellLinkDual* This,
-    BSTR *pbs,
-    int *piIcon);
-void __RPC_STUB IShellLinkDual_GetIconLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_SetIconLocation_Proxy(
-    IShellLinkDual* This,
-    BSTR bs,
-    int iIcon);
-void __RPC_STUB IShellLinkDual_SetIconLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDual_Save_Proxy(
-    IShellLinkDual* This,
-    VARIANT vWhere);
-void __RPC_STUB IShellLinkDual_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellLinkDual_INTERFACE_DEFINED__ */
 
@@ -3777,29 +3315,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLinkDual2* This);
+        IShellLinkDual2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLinkDual2* This);
+        IShellLinkDual2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3807,7 +3345,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3819,78 +3357,79 @@
 
     /*** IShellLinkDual methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Path)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_WorkingDirectory)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_WorkingDirectory)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Arguments)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *put_Arguments)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR bs);
 
     HRESULT (STDMETHODCALLTYPE *get_Hotkey)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         int *piHK);
 
     HRESULT (STDMETHODCALLTYPE *put_Hotkey)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         int iHK);
 
     HRESULT (STDMETHODCALLTYPE *get_ShowCommand)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         int *piShowCommand);
 
     HRESULT (STDMETHODCALLTYPE *put_ShowCommand)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         int iShowCommand);
 
     HRESULT (STDMETHODCALLTYPE *Resolve)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         int fFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR *pbs,
         int *piIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetIconLocation)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         BSTR bs,
         int iIcon);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         VARIANT vWhere);
 
     /*** IShellLinkDual2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Target)(
-        IShellLinkDual2* This,
+        IShellLinkDual2 *This,
         FolderItem **ppfi);
 
     END_INTERFACE
 } IShellLinkDual2Vtbl;
+
 interface IShellLinkDual2 {
     CONST_VTBL IShellLinkDual2Vtbl* lpVtbl;
 };
@@ -4007,14 +3546,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellLinkDual2_get_Target_Proxy(
-    IShellLinkDual2* This,
-    FolderItem **ppfi);
-void __RPC_STUB IShellLinkDual2_get_Target_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellLinkDual2_INTERFACE_DEFINED__ */
 
@@ -4083,29 +3614,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFolderViewDual* This);
+        IShellFolderViewDual *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFolderViewDual* This);
+        IShellFolderViewDual *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4113,7 +3644,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4125,47 +3656,48 @@
 
     /*** IShellFolderViewDual methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Folder)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         Folder **ppid);
 
     HRESULT (STDMETHODCALLTYPE *SelectedItems)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         FolderItems **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_FocusedItem)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         VARIANT *pvfi,
         int dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *PopupItemMenu)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         FolderItem *pfi,
         VARIANT vx,
         VARIANT vy,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_Script)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_ViewOptions)(
-        IShellFolderViewDual* This,
+        IShellFolderViewDual *This,
         LONG *plViewOptions);
 
     END_INTERFACE
 } IShellFolderViewDualVtbl;
+
 interface IShellFolderViewDual {
     CONST_VTBL IShellFolderViewDualVtbl* lpVtbl;
 };
@@ -4248,82 +3780,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Application_Proxy(
-    IShellFolderViewDual* This,
-    IDispatch **ppid);
-void __RPC_STUB IShellFolderViewDual_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Parent_Proxy(
-    IShellFolderViewDual* This,
-    IDispatch **ppid);
-void __RPC_STUB IShellFolderViewDual_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Folder_Proxy(
-    IShellFolderViewDual* This,
-    Folder **ppid);
-void __RPC_STUB IShellFolderViewDual_get_Folder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_SelectedItems_Proxy(
-    IShellFolderViewDual* This,
-    FolderItems **ppid);
-void __RPC_STUB IShellFolderViewDual_SelectedItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_FocusedItem_Proxy(
-    IShellFolderViewDual* This,
-    FolderItem **ppid);
-void __RPC_STUB IShellFolderViewDual_get_FocusedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_SelectItem_Proxy(
-    IShellFolderViewDual* This,
-    VARIANT *pvfi,
-    int dwFlags);
-void __RPC_STUB IShellFolderViewDual_SelectItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_PopupItemMenu_Proxy(
-    IShellFolderViewDual* This,
-    FolderItem *pfi,
-    VARIANT vx,
-    VARIANT vy,
-    BSTR *pbs);
-void __RPC_STUB IShellFolderViewDual_PopupItemMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_Script_Proxy(
-    IShellFolderViewDual* This,
-    IDispatch **ppDisp);
-void __RPC_STUB IShellFolderViewDual_get_Script_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual_get_ViewOptions_Proxy(
-    IShellFolderViewDual* This,
-    LONG *plViewOptions);
-void __RPC_STUB IShellFolderViewDual_get_ViewOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellFolderViewDual_INTERFACE_DEFINED__ */
 
@@ -4357,29 +3813,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFolderViewDual2* This);
+        IShellFolderViewDual2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFolderViewDual2* This);
+        IShellFolderViewDual2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4387,7 +3843,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4399,60 +3855,61 @@
 
     /*** IShellFolderViewDual methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Folder)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         Folder **ppid);
 
     HRESULT (STDMETHODCALLTYPE *SelectedItems)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         FolderItems **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_FocusedItem)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         VARIANT *pvfi,
         int dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *PopupItemMenu)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         FolderItem *pfi,
         VARIANT vx,
         VARIANT vy,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_Script)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_ViewOptions)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         LONG *plViewOptions);
 
     /*** IShellFolderViewDual2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_CurrentViewMode)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         UINT *pViewMode);
 
     HRESULT (STDMETHODCALLTYPE *put_CurrentViewMode)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         UINT ViewMode);
 
     HRESULT (STDMETHODCALLTYPE *SelectItemRelative)(
-        IShellFolderViewDual2* This,
+        IShellFolderViewDual2 *This,
         int iRelative);
 
     END_INTERFACE
 } IShellFolderViewDual2Vtbl;
+
 interface IShellFolderViewDual2 {
     CONST_VTBL IShellFolderViewDual2Vtbl* lpVtbl;
 };
@@ -4549,30 +4006,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual2_get_CurrentViewMode_Proxy(
-    IShellFolderViewDual2* This,
-    UINT *pViewMode);
-void __RPC_STUB IShellFolderViewDual2_get_CurrentViewMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual2_put_CurrentViewMode_Proxy(
-    IShellFolderViewDual2* This,
-    UINT ViewMode);
-void __RPC_STUB IShellFolderViewDual2_put_CurrentViewMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual2_SelectItemRelative_Proxy(
-    IShellFolderViewDual2* This,
-    int iRelative);
-void __RPC_STUB IShellFolderViewDual2_SelectItemRelative_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellFolderViewDual2_INTERFACE_DEFINED__ */
 
@@ -4624,29 +4057,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFolderViewDual3* This);
+        IShellFolderViewDual3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFolderViewDual3* This);
+        IShellFolderViewDual3 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4654,7 +4087,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4666,97 +4099,98 @@
 
     /*** IShellFolderViewDual methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Folder)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         Folder **ppid);
 
     HRESULT (STDMETHODCALLTYPE *SelectedItems)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         FolderItems **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_FocusedItem)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         FolderItem **ppid);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         VARIANT *pvfi,
         int dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *PopupItemMenu)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         FolderItem *pfi,
         VARIANT vx,
         VARIANT vy,
         BSTR *pbs);
 
     HRESULT (STDMETHODCALLTYPE *get_Script)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         IDispatch **ppDisp);
 
     HRESULT (STDMETHODCALLTYPE *get_ViewOptions)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         LONG *plViewOptions);
 
     /*** IShellFolderViewDual2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_CurrentViewMode)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         UINT *pViewMode);
 
     HRESULT (STDMETHODCALLTYPE *put_CurrentViewMode)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         UINT ViewMode);
 
     HRESULT (STDMETHODCALLTYPE *SelectItemRelative)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         int iRelative);
 
     /*** IShellFolderViewDual3 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_GroupBy)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         BSTR *pbstrGroupBy);
 
     HRESULT (STDMETHODCALLTYPE *put_GroupBy)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         BSTR bstrGroupBy);
 
     HRESULT (STDMETHODCALLTYPE *get_FolderFlags)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *put_FolderFlags)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_SortColumns)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         BSTR *pbstrSortColumns);
 
     HRESULT (STDMETHODCALLTYPE *put_SortColumns)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         BSTR bstrSortColumns);
 
     HRESULT (STDMETHODCALLTYPE *put_IconSize)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         int iIconSize);
 
     HRESULT (STDMETHODCALLTYPE *get_IconSize)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         int *piIconSize);
 
     HRESULT (STDMETHODCALLTYPE *FilterView)(
-        IShellFolderViewDual3* This,
+        IShellFolderViewDual3 *This,
         BSTR bstrFilterText);
 
     END_INTERFACE
 } IShellFolderViewDual3Vtbl;
+
 interface IShellFolderViewDual3 {
     CONST_VTBL IShellFolderViewDual3Vtbl* lpVtbl;
 };
@@ -4891,78 +4325,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_GroupBy_Proxy(
-    IShellFolderViewDual3* This,
-    BSTR *pbstrGroupBy);
-void __RPC_STUB IShellFolderViewDual3_get_GroupBy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_GroupBy_Proxy(
-    IShellFolderViewDual3* This,
-    BSTR bstrGroupBy);
-void __RPC_STUB IShellFolderViewDual3_put_GroupBy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_FolderFlags_Proxy(
-    IShellFolderViewDual3* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IShellFolderViewDual3_get_FolderFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_FolderFlags_Proxy(
-    IShellFolderViewDual3* This,
-    DWORD dwFlags);
-void __RPC_STUB IShellFolderViewDual3_put_FolderFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_SortColumns_Proxy(
-    IShellFolderViewDual3* This,
-    BSTR *pbstrSortColumns);
-void __RPC_STUB IShellFolderViewDual3_get_SortColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_SortColumns_Proxy(
-    IShellFolderViewDual3* This,
-    BSTR bstrSortColumns);
-void __RPC_STUB IShellFolderViewDual3_put_SortColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_put_IconSize_Proxy(
-    IShellFolderViewDual3* This,
-    int iIconSize);
-void __RPC_STUB IShellFolderViewDual3_put_IconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_get_IconSize_Proxy(
-    IShellFolderViewDual3* This,
-    int *piIconSize);
-void __RPC_STUB IShellFolderViewDual3_get_IconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolderViewDual3_FilterView_Proxy(
-    IShellFolderViewDual3* This,
-    BSTR bstrFilterText);
-void __RPC_STUB IShellFolderViewDual3_FilterView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellFolderViewDual3_INTERFACE_DEFINED__ */
 
@@ -5083,29 +4445,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5113,7 +4475,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5125,20 +4487,20 @@
 
     /*** IShellDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NameSpace)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         VARIANT vDir,
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *BrowseForFolder)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         LONG Hwnd,
         BSTR Title,
         LONG Options,
@@ -5146,68 +4508,69 @@
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *Windows)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *Explore)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *MinimizeAll)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *FileRun)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *CascadeWindows)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *TileVertically)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *TileHorizontally)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownWindows)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *EjectPC)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *TrayProperties)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFiles)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshMenu)(
-        IShellDispatch* This);
+        IShellDispatch *This);
 
     HRESULT (STDMETHODCALLTYPE *ControlPanelItem)(
-        IShellDispatch* This,
+        IShellDispatch *This,
         BSTR bstrDir);
 
     END_INTERFACE
 } IShellDispatchVtbl;
+
 interface IShellDispatch {
     CONST_VTBL IShellDispatchVtbl* lpVtbl;
 };
@@ -5346,180 +4709,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellDispatch_get_Application_Proxy(
-    IShellDispatch* This,
-    IDispatch **ppid);
-void __RPC_STUB IShellDispatch_get_Application_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_get_Parent_Proxy(
-    IShellDispatch* This,
-    IDispatch **ppid);
-void __RPC_STUB IShellDispatch_get_Parent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_NameSpace_Proxy(
-    IShellDispatch* This,
-    VARIANT vDir,
-    Folder **ppsdf);
-void __RPC_STUB IShellDispatch_NameSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_BrowseForFolder_Proxy(
-    IShellDispatch* This,
-    LONG Hwnd,
-    BSTR Title,
-    LONG Options,
-    VARIANT RootFolder,
-    Folder **ppsdf);
-void __RPC_STUB IShellDispatch_BrowseForFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_Windows_Proxy(
-    IShellDispatch* This,
-    IDispatch **ppid);
-void __RPC_STUB IShellDispatch_Windows_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_Open_Proxy(
-    IShellDispatch* This,
-    VARIANT vDir);
-void __RPC_STUB IShellDispatch_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_Explore_Proxy(
-    IShellDispatch* This,
-    VARIANT vDir);
-void __RPC_STUB IShellDispatch_Explore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_MinimizeAll_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_MinimizeAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_UndoMinimizeALL_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_UndoMinimizeALL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_FileRun_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_FileRun_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_CascadeWindows_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_CascadeWindows_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_TileVertically_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_TileVertically_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_TileHorizontally_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_TileHorizontally_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_ShutdownWindows_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_ShutdownWindows_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_Suspend_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_Suspend_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_EjectPC_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_EjectPC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_SetTime_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_SetTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_TrayProperties_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_TrayProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_Help_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_Help_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_FindFiles_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_FindFiles_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_FindComputer_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_FindComputer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_RefreshMenu_Proxy(
-    IShellDispatch* This);
-void __RPC_STUB IShellDispatch_RefreshMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch_ControlPanelItem_Proxy(
-    IShellDispatch* This,
-    BSTR bstrDir);
-void __RPC_STUB IShellDispatch_ControlPanelItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellDispatch_INTERFACE_DEFINED__ */
 
@@ -5588,29 +4777,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5618,7 +4807,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5630,20 +4819,20 @@
 
     /*** IShellDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NameSpace)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         VARIANT vDir,
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *BrowseForFolder)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         LONG Hwnd,
         BSTR Title,
         LONG Options,
@@ -5651,75 +4840,75 @@
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *Windows)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *Explore)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *MinimizeAll)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FileRun)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *CascadeWindows)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileVertically)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileHorizontally)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownWindows)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *EjectPC)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *TrayProperties)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFiles)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshMenu)(
-        IShellDispatch2* This);
+        IShellDispatch2 *This);
 
     HRESULT (STDMETHODCALLTYPE *ControlPanelItem)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR bstrDir);
 
     /*** IShellDispatch2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR Group,
         BSTR Restriction,
         LONG *plRestrictValue);
 
     HRESULT (STDMETHODCALLTYPE *ShellExecute)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR File,
         VARIANT vArgs,
         VARIANT vDir,
@@ -5727,46 +4916,47 @@
         VARIANT vShow);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR name,
         BSTR location,
         BSTR model);
 
     HRESULT (STDMETHODCALLTYPE *GetSystemInformation)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR name,
         VARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStart)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStop)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *IsServiceRunning)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR ServiceName,
         VARIANT *pRunning);
 
     HRESULT (STDMETHODCALLTYPE *CanStartStopService)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR ServiceName,
         VARIANT *pCanStartStop);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)(
-        IShellDispatch2* This,
+        IShellDispatch2 *This,
         BSTR bstrClsid,
         VARIANT bShow,
         VARIANT *pSuccess);
 
     END_INTERFACE
 } IShellDispatch2Vtbl;
+
 interface IShellDispatch2 {
     CONST_VTBL IShellDispatch2Vtbl* lpVtbl;
 };
@@ -5943,95 +5133,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellDispatch2_IsRestricted_Proxy(
-    IShellDispatch2* This,
-    BSTR Group,
-    BSTR Restriction,
-    LONG *plRestrictValue);
-void __RPC_STUB IShellDispatch2_IsRestricted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_ShellExecute_Proxy(
-    IShellDispatch2* This,
-    BSTR File,
-    VARIANT vArgs,
-    VARIANT vDir,
-    VARIANT vOperation,
-    VARIANT vShow);
-void __RPC_STUB IShellDispatch2_ShellExecute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_FindPrinter_Proxy(
-    IShellDispatch2* This,
-    BSTR name,
-    BSTR location,
-    BSTR model);
-void __RPC_STUB IShellDispatch2_FindPrinter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_GetSystemInformation_Proxy(
-    IShellDispatch2* This,
-    BSTR name,
-    VARIANT *pv);
-void __RPC_STUB IShellDispatch2_GetSystemInformation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_ServiceStart_Proxy(
-    IShellDispatch2* This,
-    BSTR ServiceName,
-    VARIANT Persistent,
-    VARIANT *pSuccess);
-void __RPC_STUB IShellDispatch2_ServiceStart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_ServiceStop_Proxy(
-    IShellDispatch2* This,
-    BSTR ServiceName,
-    VARIANT Persistent,
-    VARIANT *pSuccess);
-void __RPC_STUB IShellDispatch2_ServiceStop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_IsServiceRunning_Proxy(
-    IShellDispatch2* This,
-    BSTR ServiceName,
-    VARIANT *pRunning);
-void __RPC_STUB IShellDispatch2_IsServiceRunning_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_CanStartStopService_Proxy(
-    IShellDispatch2* This,
-    BSTR ServiceName,
-    VARIANT *pCanStartStop);
-void __RPC_STUB IShellDispatch2_CanStartStopService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch2_ShowBrowserBar_Proxy(
-    IShellDispatch2* This,
-    BSTR bstrClsid,
-    VARIANT bShow,
-    VARIANT *pSuccess);
-void __RPC_STUB IShellDispatch2_ShowBrowserBar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellDispatch2_INTERFACE_DEFINED__ */
 
@@ -6060,29 +5161,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6090,7 +5191,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6102,20 +5203,20 @@
 
     /*** IShellDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NameSpace)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         VARIANT vDir,
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *BrowseForFolder)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         LONG Hwnd,
         BSTR Title,
         LONG Options,
@@ -6123,75 +5224,75 @@
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *Windows)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *Explore)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *MinimizeAll)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FileRun)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *CascadeWindows)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileVertically)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileHorizontally)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownWindows)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *EjectPC)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *TrayProperties)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFiles)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshMenu)(
-        IShellDispatch3* This);
+        IShellDispatch3 *This);
 
     HRESULT (STDMETHODCALLTYPE *ControlPanelItem)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR bstrDir);
 
     /*** IShellDispatch2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR Group,
         BSTR Restriction,
         LONG *plRestrictValue);
 
     HRESULT (STDMETHODCALLTYPE *ShellExecute)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR File,
         VARIANT vArgs,
         VARIANT vDir,
@@ -6199,52 +5300,53 @@
         VARIANT vShow);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR name,
         BSTR location,
         BSTR model);
 
     HRESULT (STDMETHODCALLTYPE *GetSystemInformation)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR name,
         VARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStart)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStop)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *IsServiceRunning)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR ServiceName,
         VARIANT *pRunning);
 
     HRESULT (STDMETHODCALLTYPE *CanStartStopService)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR ServiceName,
         VARIANT *pCanStartStop);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         BSTR bstrClsid,
         VARIANT bShow,
         VARIANT *pSuccess);
 
     /*** IShellDispatch3 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddToRecent)(
-        IShellDispatch3* This,
+        IShellDispatch3 *This,
         VARIANT varFile,
         BSTR bstrCategory);
 
     END_INTERFACE
 } IShellDispatch3Vtbl;
+
 interface IShellDispatch3 {
     CONST_VTBL IShellDispatch3Vtbl* lpVtbl;
 };
@@ -6427,15 +5529,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellDispatch3_AddToRecent_Proxy(
-    IShellDispatch3* This,
-    VARIANT varFile,
-    BSTR bstrCategory);
-void __RPC_STUB IShellDispatch3_AddToRecent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellDispatch3_INTERFACE_DEFINED__ */
 
@@ -6474,29 +5567,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6504,7 +5597,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6516,20 +5609,20 @@
 
     /*** IShellDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NameSpace)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         VARIANT vDir,
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *BrowseForFolder)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         LONG Hwnd,
         BSTR Title,
         LONG Options,
@@ -6537,75 +5630,75 @@
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *Windows)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *Explore)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *MinimizeAll)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *FileRun)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *CascadeWindows)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileVertically)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileHorizontally)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownWindows)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *EjectPC)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *TrayProperties)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFiles)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshMenu)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *ControlPanelItem)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR bstrDir);
 
     /*** IShellDispatch2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR Group,
         BSTR Restriction,
         LONG *plRestrictValue);
 
     HRESULT (STDMETHODCALLTYPE *ShellExecute)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR File,
         VARIANT vArgs,
         VARIANT vDir,
@@ -6613,69 +5706,70 @@
         VARIANT vShow);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR name,
         BSTR location,
         BSTR model);
 
     HRESULT (STDMETHODCALLTYPE *GetSystemInformation)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR name,
         VARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStart)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStop)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *IsServiceRunning)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR ServiceName,
         VARIANT *pRunning);
 
     HRESULT (STDMETHODCALLTYPE *CanStartStopService)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR ServiceName,
         VARIANT *pCanStartStop);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR bstrClsid,
         VARIANT bShow,
         VARIANT *pSuccess);
 
     /*** IShellDispatch3 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddToRecent)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         VARIANT varFile,
         BSTR bstrCategory);
 
     /*** IShellDispatch4 methods ***/
     HRESULT (STDMETHODCALLTYPE *WindowsSecurity)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *ToggleDesktop)(
-        IShellDispatch4* This);
+        IShellDispatch4 *This);
 
     HRESULT (STDMETHODCALLTYPE *ExplorerPolicy)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         BSTR bstrPolicyName,
         VARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetSetting)(
-        IShellDispatch4* This,
+        IShellDispatch4 *This,
         LONG lSetting,
         VARIANT_BOOL *pResult);
 
     END_INTERFACE
 } IShellDispatch4Vtbl;
+
 interface IShellDispatch4 {
     CONST_VTBL IShellDispatch4Vtbl* lpVtbl;
 };
@@ -6876,38 +5970,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellDispatch4_WindowsSecurity_Proxy(
-    IShellDispatch4* This);
-void __RPC_STUB IShellDispatch4_WindowsSecurity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch4_ToggleDesktop_Proxy(
-    IShellDispatch4* This);
-void __RPC_STUB IShellDispatch4_ToggleDesktop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch4_ExplorerPolicy_Proxy(
-    IShellDispatch4* This,
-    BSTR bstrPolicyName,
-    VARIANT *pValue);
-void __RPC_STUB IShellDispatch4_ExplorerPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellDispatch4_GetSetting_Proxy(
-    IShellDispatch4* This,
-    LONG lSetting,
-    VARIANT_BOOL *pResult);
-void __RPC_STUB IShellDispatch4_GetSetting_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellDispatch4_INTERFACE_DEFINED__ */
 
@@ -6935,29 +5997,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6965,7 +6027,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6977,20 +6039,20 @@
 
     /*** IShellDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NameSpace)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         VARIANT vDir,
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *BrowseForFolder)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         LONG Hwnd,
         BSTR Title,
         LONG Options,
@@ -6998,75 +6060,75 @@
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *Windows)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *Explore)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *MinimizeAll)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *FileRun)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *CascadeWindows)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileVertically)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileHorizontally)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownWindows)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *EjectPC)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *TrayProperties)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFiles)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshMenu)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *ControlPanelItem)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR bstrDir);
 
     /*** IShellDispatch2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR Group,
         BSTR Restriction,
         LONG *plRestrictValue);
 
     HRESULT (STDMETHODCALLTYPE *ShellExecute)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR File,
         VARIANT vArgs,
         VARIANT vDir,
@@ -7074,73 +6136,74 @@
         VARIANT vShow);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR name,
         BSTR location,
         BSTR model);
 
     HRESULT (STDMETHODCALLTYPE *GetSystemInformation)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR name,
         VARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStart)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStop)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *IsServiceRunning)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR ServiceName,
         VARIANT *pRunning);
 
     HRESULT (STDMETHODCALLTYPE *CanStartStopService)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR ServiceName,
         VARIANT *pCanStartStop);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR bstrClsid,
         VARIANT bShow,
         VARIANT *pSuccess);
 
     /*** IShellDispatch3 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddToRecent)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         VARIANT varFile,
         BSTR bstrCategory);
 
     /*** IShellDispatch4 methods ***/
     HRESULT (STDMETHODCALLTYPE *WindowsSecurity)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *ToggleDesktop)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     HRESULT (STDMETHODCALLTYPE *ExplorerPolicy)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         BSTR bstrPolicyName,
         VARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetSetting)(
-        IShellDispatch5* This,
+        IShellDispatch5 *This,
         LONG lSetting,
         VARIANT_BOOL *pResult);
 
     /*** IShellDispatch5 methods ***/
     HRESULT (STDMETHODCALLTYPE *WindowSwitcher)(
-        IShellDispatch5* This);
+        IShellDispatch5 *This);
 
     END_INTERFACE
 } IShellDispatch5Vtbl;
+
 interface IShellDispatch5 {
     CONST_VTBL IShellDispatch5Vtbl* lpVtbl;
 };
@@ -7347,13 +6410,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellDispatch5_WindowSwitcher_Proxy(
-    IShellDispatch5* This);
-void __RPC_STUB IShellDispatch5_WindowSwitcher_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellDispatch5_INTERFACE_DEFINED__ */
 
@@ -7382,29 +6438,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7412,7 +6468,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7424,20 +6480,20 @@
 
     /*** IShellDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Application)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *get_Parent)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *NameSpace)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         VARIANT vDir,
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *BrowseForFolder)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         LONG Hwnd,
         BSTR Title,
         LONG Options,
@@ -7445,75 +6501,75 @@
         Folder **ppsdf);
 
     HRESULT (STDMETHODCALLTYPE *Windows)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         IDispatch **ppid);
 
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *Explore)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         VARIANT vDir);
 
     HRESULT (STDMETHODCALLTYPE *MinimizeAll)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *UndoMinimizeALL)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *FileRun)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *CascadeWindows)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileVertically)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *TileHorizontally)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *ShutdownWindows)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *EjectPC)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *TrayProperties)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *Help)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindFiles)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *FindComputer)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *RefreshMenu)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *ControlPanelItem)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR bstrDir);
 
     /*** IShellDispatch2 methods ***/
     HRESULT (STDMETHODCALLTYPE *IsRestricted)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR Group,
         BSTR Restriction,
         LONG *plRestrictValue);
 
     HRESULT (STDMETHODCALLTYPE *ShellExecute)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR File,
         VARIANT vArgs,
         VARIANT vDir,
@@ -7521,77 +6577,78 @@
         VARIANT vShow);
 
     HRESULT (STDMETHODCALLTYPE *FindPrinter)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR name,
         BSTR location,
         BSTR model);
 
     HRESULT (STDMETHODCALLTYPE *GetSystemInformation)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR name,
         VARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStart)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *ServiceStop)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR ServiceName,
         VARIANT Persistent,
         VARIANT *pSuccess);
 
     HRESULT (STDMETHODCALLTYPE *IsServiceRunning)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR ServiceName,
         VARIANT *pRunning);
 
     HRESULT (STDMETHODCALLTYPE *CanStartStopService)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR ServiceName,
         VARIANT *pCanStartStop);
 
     HRESULT (STDMETHODCALLTYPE *ShowBrowserBar)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR bstrClsid,
         VARIANT bShow,
         VARIANT *pSuccess);
 
     /*** IShellDispatch3 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddToRecent)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         VARIANT varFile,
         BSTR bstrCategory);
 
     /*** IShellDispatch4 methods ***/
     HRESULT (STDMETHODCALLTYPE *WindowsSecurity)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *ToggleDesktop)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     HRESULT (STDMETHODCALLTYPE *ExplorerPolicy)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         BSTR bstrPolicyName,
         VARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetSetting)(
-        IShellDispatch6* This,
+        IShellDispatch6 *This,
         LONG lSetting,
         VARIANT_BOOL *pResult);
 
     /*** IShellDispatch5 methods ***/
     HRESULT (STDMETHODCALLTYPE *WindowSwitcher)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     /*** IShellDispatch6 methods ***/
     HRESULT (STDMETHODCALLTYPE *SearchCommand)(
-        IShellDispatch6* This);
+        IShellDispatch6 *This);
 
     END_INTERFACE
 } IShellDispatch6Vtbl;
+
 interface IShellDispatch6 {
     CONST_VTBL IShellDispatch6Vtbl* lpVtbl;
 };
@@ -7804,13 +6861,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellDispatch6_SearchCommand_Proxy(
-    IShellDispatch6* This);
-void __RPC_STUB IShellDispatch6_SearchCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellDispatch6_INTERFACE_DEFINED__ */
 
@@ -7920,29 +6970,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSearchBand* This);
+        IFileSearchBand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSearchBand* This);
+        IFileSearchBand *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7950,7 +7000,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7962,29 +7012,30 @@
 
     /*** IFileSearchBand methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFocus)(
-        IFileSearchBand* This);
+        IFileSearchBand *This);
 
     HRESULT (STDMETHODCALLTYPE *SetSearchParameters)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         BSTR *pbstrSearchID,
         VARIANT_BOOL bNavToResults,
         VARIANT *pvarScope,
         VARIANT *pvarQueryFile);
 
     HRESULT (STDMETHODCALLTYPE *get_SearchID)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         BSTR *pbstrSearchID);
 
     HRESULT (STDMETHODCALLTYPE *get_Scope)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         VARIANT *pvarScope);
 
     HRESULT (STDMETHODCALLTYPE *get_QueryFile)(
-        IFileSearchBand* This,
+        IFileSearchBand *This,
         VARIANT *pvarFile);
 
     END_INTERFACE
 } IFileSearchBandVtbl;
+
 interface IFileSearchBand {
     CONST_VTBL IFileSearchBandVtbl* lpVtbl;
 };
@@ -8051,48 +7102,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileSearchBand_SetFocus_Proxy(
-    IFileSearchBand* This);
-void __RPC_STUB IFileSearchBand_SetFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSearchBand_SetSearchParameters_Proxy(
-    IFileSearchBand* This,
-    BSTR *pbstrSearchID,
-    VARIANT_BOOL bNavToResults,
-    VARIANT *pvarScope,
-    VARIANT *pvarQueryFile);
-void __RPC_STUB IFileSearchBand_SetSearchParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSearchBand_get_SearchID_Proxy(
-    IFileSearchBand* This,
-    BSTR *pbstrSearchID);
-void __RPC_STUB IFileSearchBand_get_SearchID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSearchBand_get_Scope_Proxy(
-    IFileSearchBand* This,
-    VARIANT *pvarScope);
-void __RPC_STUB IFileSearchBand_get_Scope_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSearchBand_get_QueryFile_Proxy(
-    IFileSearchBand* This,
-    VARIANT *pvarFile);
-void __RPC_STUB IFileSearchBand_get_QueryFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileSearchBand_INTERFACE_DEFINED__ */
 
@@ -8162,29 +7171,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWebWizardHost* This);
+        IWebWizardHost *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWebWizardHost* This);
+        IWebWizardHost *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -8192,7 +7201,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -8204,45 +7213,46 @@
 
     /*** IWebWizardHost methods ***/
     HRESULT (STDMETHODCALLTYPE *FinalBack)(
-        IWebWizardHost* This);
+        IWebWizardHost *This);
 
     HRESULT (STDMETHODCALLTYPE *FinalNext)(
-        IWebWizardHost* This);
+        IWebWizardHost *This);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IWebWizardHost* This);
+        IWebWizardHost *This);
 
     HRESULT (STDMETHODCALLTYPE *put_Caption)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         BSTR bstrCaption);
 
     HRESULT (STDMETHODCALLTYPE *get_Caption)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         BSTR *pbstrCaption);
 
     HRESULT (STDMETHODCALLTYPE *put_Property)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         BSTR bstrPropertyName,
         VARIANT *pvProperty);
 
     HRESULT (STDMETHODCALLTYPE *get_Property)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         BSTR bstrPropertyName,
         VARIANT *pvProperty);
 
     HRESULT (STDMETHODCALLTYPE *SetWizardButtons)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         VARIANT_BOOL vfEnableBack,
         VARIANT_BOOL vfEnableNext,
         VARIANT_BOOL vfLastPage);
 
     HRESULT (STDMETHODCALLTYPE *SetHeaderText)(
-        IWebWizardHost* This,
+        IWebWizardHost *This,
         BSTR bstrHeaderTitle,
         BSTR bstrHeaderSubtitle);
 
     END_INTERFACE
 } IWebWizardHostVtbl;
+
 interface IWebWizardHost {
     CONST_VTBL IWebWizardHostVtbl* lpVtbl;
 };
@@ -8325,80 +7335,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWebWizardHost_FinalBack_Proxy(
-    IWebWizardHost* This);
-void __RPC_STUB IWebWizardHost_FinalBack_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_FinalNext_Proxy(
-    IWebWizardHost* This);
-void __RPC_STUB IWebWizardHost_FinalNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_Cancel_Proxy(
-    IWebWizardHost* This);
-void __RPC_STUB IWebWizardHost_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_put_Caption_Proxy(
-    IWebWizardHost* This,
-    BSTR bstrCaption);
-void __RPC_STUB IWebWizardHost_put_Caption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_get_Caption_Proxy(
-    IWebWizardHost* This,
-    BSTR *pbstrCaption);
-void __RPC_STUB IWebWizardHost_get_Caption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_put_Property_Proxy(
-    IWebWizardHost* This,
-    BSTR bstrPropertyName,
-    VARIANT *pvProperty);
-void __RPC_STUB IWebWizardHost_put_Property_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_get_Property_Proxy(
-    IWebWizardHost* This,
-    BSTR bstrPropertyName,
-    VARIANT *pvProperty);
-void __RPC_STUB IWebWizardHost_get_Property_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_SetWizardButtons_Proxy(
-    IWebWizardHost* This,
-    VARIANT_BOOL vfEnableBack,
-    VARIANT_BOOL vfEnableNext,
-    VARIANT_BOOL vfLastPage);
-void __RPC_STUB IWebWizardHost_SetWizardButtons_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardHost_SetHeaderText_Proxy(
-    IWebWizardHost* This,
-    BSTR bstrHeaderTitle,
-    BSTR bstrHeaderSubtitle);
-void __RPC_STUB IWebWizardHost_SetHeaderText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWebWizardHost_INTERFACE_DEFINED__ */
 
@@ -8427,29 +7363,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INewWDEvents* This);
+        INewWDEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INewWDEvents* This);
+        INewWDEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -8457,7 +7393,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -8469,51 +7405,52 @@
 
     /*** IWebWizardHost methods ***/
     HRESULT (STDMETHODCALLTYPE *FinalBack)(
-        INewWDEvents* This);
+        INewWDEvents *This);
 
     HRESULT (STDMETHODCALLTYPE *FinalNext)(
-        INewWDEvents* This);
+        INewWDEvents *This);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        INewWDEvents* This);
+        INewWDEvents *This);
 
     HRESULT (STDMETHODCALLTYPE *put_Caption)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         BSTR bstrCaption);
 
     HRESULT (STDMETHODCALLTYPE *get_Caption)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         BSTR *pbstrCaption);
 
     HRESULT (STDMETHODCALLTYPE *put_Property)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         BSTR bstrPropertyName,
         VARIANT *pvProperty);
 
     HRESULT (STDMETHODCALLTYPE *get_Property)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         BSTR bstrPropertyName,
         VARIANT *pvProperty);
 
     HRESULT (STDMETHODCALLTYPE *SetWizardButtons)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         VARIANT_BOOL vfEnableBack,
         VARIANT_BOOL vfEnableNext,
         VARIANT_BOOL vfLastPage);
 
     HRESULT (STDMETHODCALLTYPE *SetHeaderText)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         BSTR bstrHeaderTitle,
         BSTR bstrHeaderSubtitle);
 
     /*** INewWDEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *PassportAuthenticate)(
-        INewWDEvents* This,
+        INewWDEvents *This,
         BSTR bstrSignInUrl,
         VARIANT_BOOL *pvfAuthenitcated);
 
     END_INTERFACE
 } INewWDEventsVtbl;
+
 interface INewWDEvents {
     CONST_VTBL INewWDEventsVtbl* lpVtbl;
 };
@@ -8602,15 +7539,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INewWDEvents_PassportAuthenticate_Proxy(
-    INewWDEvents* This,
-    BSTR bstrSignInUrl,
-    VARIANT_BOOL *pvfAuthenitcated);
-void __RPC_STUB INewWDEvents_PassportAuthenticate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INewWDEvents_INTERFACE_DEFINED__ */
 
@@ -8645,30 +7573,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAutoComplete* This,
+        IAutoComplete *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAutoComplete* This);
+        IAutoComplete *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAutoComplete* This);
+        IAutoComplete *This);
 
     /*** IAutoComplete methods ***/
     HRESULT (STDMETHODCALLTYPE *Init)(
-        IAutoComplete* This,
+        IAutoComplete *This,
         HWND hwndEdit,
         IUnknown *punkACL,
         LPCWSTR pwszRegKeyPath,
         LPCWSTR pwszQuickComplete);
 
     HRESULT (STDMETHODCALLTYPE *Enable)(
-        IAutoComplete* This,
+        IAutoComplete *This,
         WINBOOL fEnable);
 
     END_INTERFACE
 } IAutoCompleteVtbl;
+
 interface IAutoComplete {
     CONST_VTBL IAutoCompleteVtbl* lpVtbl;
 };
@@ -8705,25 +7634,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAutoComplete_Init_Proxy(
-    IAutoComplete* This,
-    HWND hwndEdit,
-    IUnknown *punkACL,
-    LPCWSTR pwszRegKeyPath,
-    LPCWSTR pwszQuickComplete);
-void __RPC_STUB IAutoComplete_Init_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAutoComplete_Enable_Proxy(
-    IAutoComplete* This,
-    WINBOOL fEnable);
-void __RPC_STUB IAutoComplete_Enable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAutoComplete_INTERFACE_DEFINED__ */
 
@@ -8767,39 +7677,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAutoComplete2* This,
+        IAutoComplete2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAutoComplete2* This);
+        IAutoComplete2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAutoComplete2* This);
+        IAutoComplete2 *This);
 
     /*** IAutoComplete methods ***/
     HRESULT (STDMETHODCALLTYPE *Init)(
-        IAutoComplete2* This,
+        IAutoComplete2 *This,
         HWND hwndEdit,
         IUnknown *punkACL,
         LPCWSTR pwszRegKeyPath,
         LPCWSTR pwszQuickComplete);
 
     HRESULT (STDMETHODCALLTYPE *Enable)(
-        IAutoComplete2* This,
+        IAutoComplete2 *This,
         WINBOOL fEnable);
 
     /*** IAutoComplete2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetOptions)(
-        IAutoComplete2* This,
+        IAutoComplete2 *This,
         DWORD dwFlag);
 
     HRESULT (STDMETHODCALLTYPE *GetOptions)(
-        IAutoComplete2* This,
+        IAutoComplete2 *This,
         DWORD *pdwFlag);
 
     END_INTERFACE
 } IAutoComplete2Vtbl;
+
 interface IAutoComplete2 {
     CONST_VTBL IAutoComplete2Vtbl* lpVtbl;
 };
@@ -8846,22 +7757,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAutoComplete2_SetOptions_Proxy(
-    IAutoComplete2* This,
-    DWORD dwFlag);
-void __RPC_STUB IAutoComplete2_SetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAutoComplete2_GetOptions_Proxy(
-    IAutoComplete2* This,
-    DWORD *pdwFlag);
-void __RPC_STUB IAutoComplete2_GetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAutoComplete2_INTERFACE_DEFINED__ */
 
@@ -8905,51 +7800,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumACString* This,
+        IEnumACString *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumACString* This);
+        IEnumACString *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumACString* This);
+        IEnumACString *This);
 
     /*** IEnumString methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumACString* This,
+        IEnumACString *This,
         ULONG celt,
         LPOLESTR *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumACString* This,
+        IEnumACString *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumACString* This);
+        IEnumACString *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumACString* This,
+        IEnumACString *This,
         IEnumString **ppenum);
 
     /*** IEnumACString methods ***/
     HRESULT (STDMETHODCALLTYPE *NextItem)(
-        IEnumACString* This,
+        IEnumACString *This,
         LPWSTR pszUrl,
         ULONG cchMax,
         ULONG *pulSortIndex);
 
     HRESULT (STDMETHODCALLTYPE *SetEnumOptions)(
-        IEnumACString* This,
+        IEnumACString *This,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumOptions)(
-        IEnumACString* This,
+        IEnumACString *This,
         DWORD *pdwOptions);
 
     END_INTERFACE
 } IEnumACStringVtbl;
+
 interface IEnumACString {
     CONST_VTBL IEnumACStringVtbl* lpVtbl;
 };
@@ -9008,32 +7904,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumACString_NextItem_Proxy(
-    IEnumACString* This,
-    LPWSTR pszUrl,
-    ULONG cchMax,
-    ULONG *pulSortIndex);
-void __RPC_STUB IEnumACString_NextItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumACString_SetEnumOptions_Proxy(
-    IEnumACString* This,
-    DWORD dwOptions);
-void __RPC_STUB IEnumACString_SetEnumOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumACString_GetEnumOptions_Proxy(
-    IEnumACString* This,
-    DWORD *pdwOptions);
-void __RPC_STUB IEnumACString_GetEnumOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumACString_INTERFACE_DEFINED__ */
 
@@ -9075,41 +7945,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDataObjectAsyncCapability* This,
+        IDataObjectAsyncCapability *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDataObjectAsyncCapability* This);
+        IDataObjectAsyncCapability *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDataObjectAsyncCapability* This);
+        IDataObjectAsyncCapability *This);
 
     /*** IDataObjectAsyncCapability methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAsyncMode)(
-        IDataObjectAsyncCapability* This,
+        IDataObjectAsyncCapability *This,
         WINBOOL fDoOpAsync);
 
     HRESULT (STDMETHODCALLTYPE *GetAsyncMode)(
-        IDataObjectAsyncCapability* This,
+        IDataObjectAsyncCapability *This,
         WINBOOL *pfIsOpAsync);
 
     HRESULT (STDMETHODCALLTYPE *StartOperation)(
-        IDataObjectAsyncCapability* This,
+        IDataObjectAsyncCapability *This,
         IBindCtx *pbcReserved);
 
     HRESULT (STDMETHODCALLTYPE *InOperation)(
-        IDataObjectAsyncCapability* This,
+        IDataObjectAsyncCapability *This,
         WINBOOL *pfInAsyncOp);
 
     HRESULT (STDMETHODCALLTYPE *EndOperation)(
-        IDataObjectAsyncCapability* This,
+        IDataObjectAsyncCapability *This,
         HRESULT hResult,
         IBindCtx *pbcReserved,
         DWORD dwEffects);
 
     END_INTERFACE
 } IDataObjectAsyncCapabilityVtbl;
+
 interface IDataObjectAsyncCapability {
     CONST_VTBL IDataObjectAsyncCapabilityVtbl* lpVtbl;
 };
@@ -9158,48 +8029,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_SetAsyncMode_Proxy(
-    IDataObjectAsyncCapability* This,
-    WINBOOL fDoOpAsync);
-void __RPC_STUB IDataObjectAsyncCapability_SetAsyncMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_GetAsyncMode_Proxy(
-    IDataObjectAsyncCapability* This,
-    WINBOOL *pfIsOpAsync);
-void __RPC_STUB IDataObjectAsyncCapability_GetAsyncMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_StartOperation_Proxy(
-    IDataObjectAsyncCapability* This,
-    IBindCtx *pbcReserved);
-void __RPC_STUB IDataObjectAsyncCapability_StartOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_InOperation_Proxy(
-    IDataObjectAsyncCapability* This,
-    WINBOOL *pfInAsyncOp);
-void __RPC_STUB IDataObjectAsyncCapability_InOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataObjectAsyncCapability_EndOperation_Proxy(
-    IDataObjectAsyncCapability* This,
-    HRESULT hResult,
-    IBindCtx *pbcReserved,
-    DWORD dwEffects);
-void __RPC_STUB IDataObjectAsyncCapability_EndOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDataObjectAsyncCapability_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/shobjidl.h b/mingw-w64-headers/include/shobjidl.h
index b0ea2e9..1bd1c0d 100644
--- a/mingw-w64-headers/include/shobjidl.h
+++ b/mingw-w64-headers/include/shobjidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/shobjidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/shobjidl.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,1011 +20,1617 @@
 #ifndef __IContextMenu_FWD_DEFINED__
 #define __IContextMenu_FWD_DEFINED__
 typedef interface IContextMenu IContextMenu;
+#ifdef __cplusplus
+interface IContextMenu;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IContextMenu2_FWD_DEFINED__
 #define __IContextMenu2_FWD_DEFINED__
 typedef interface IContextMenu2 IContextMenu2;
+#ifdef __cplusplus
+interface IContextMenu2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IContextMenu3_FWD_DEFINED__
 #define __IContextMenu3_FWD_DEFINED__
 typedef interface IContextMenu3 IContextMenu3;
+#ifdef __cplusplus
+interface IContextMenu3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExecuteCommand_FWD_DEFINED__
 #define __IExecuteCommand_FWD_DEFINED__
 typedef interface IExecuteCommand IExecuteCommand;
+#ifdef __cplusplus
+interface IExecuteCommand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistFolder_FWD_DEFINED__
 #define __IPersistFolder_FWD_DEFINED__
 typedef interface IPersistFolder IPersistFolder;
+#ifdef __cplusplus
+interface IPersistFolder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRunnableTask_FWD_DEFINED__
 #define __IRunnableTask_FWD_DEFINED__
 typedef interface IRunnableTask IRunnableTask;
+#ifdef __cplusplus
+interface IRunnableTask;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellTaskScheduler_FWD_DEFINED__
 #define __IShellTaskScheduler_FWD_DEFINED__
 typedef interface IShellTaskScheduler IShellTaskScheduler;
+#ifdef __cplusplus
+interface IShellTaskScheduler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IQueryCodePage_FWD_DEFINED__
 #define __IQueryCodePage_FWD_DEFINED__
 typedef interface IQueryCodePage IQueryCodePage;
+#ifdef __cplusplus
+interface IQueryCodePage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistFolder2_FWD_DEFINED__
 #define __IPersistFolder2_FWD_DEFINED__
 typedef interface IPersistFolder2 IPersistFolder2;
+#ifdef __cplusplus
+interface IPersistFolder2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistFolder3_FWD_DEFINED__
 #define __IPersistFolder3_FWD_DEFINED__
 typedef interface IPersistFolder3 IPersistFolder3;
+#ifdef __cplusplus
+interface IPersistFolder3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistIDList_FWD_DEFINED__
 #define __IPersistIDList_FWD_DEFINED__
 typedef interface IPersistIDList IPersistIDList;
+#ifdef __cplusplus
+interface IPersistIDList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumIDList_FWD_DEFINED__
 #define __IEnumIDList_FWD_DEFINED__
 typedef interface IEnumIDList IEnumIDList;
+#ifdef __cplusplus
+interface IEnumIDList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumFullIDList_FWD_DEFINED__
 #define __IEnumFullIDList_FWD_DEFINED__
 typedef interface IEnumFullIDList IEnumFullIDList;
+#ifdef __cplusplus
+interface IEnumFullIDList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithFolderEnumMode_FWD_DEFINED__
 #define __IObjectWithFolderEnumMode_FWD_DEFINED__
 typedef interface IObjectWithFolderEnumMode IObjectWithFolderEnumMode;
+#ifdef __cplusplus
+interface IObjectWithFolderEnumMode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IParseAndCreateItem_FWD_DEFINED__
 #define __IParseAndCreateItem_FWD_DEFINED__
 typedef interface IParseAndCreateItem IParseAndCreateItem;
+#ifdef __cplusplus
+interface IParseAndCreateItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellFolder_FWD_DEFINED__
 #define __IShellFolder_FWD_DEFINED__
 typedef interface IShellFolder IShellFolder;
+#ifdef __cplusplus
+interface IShellFolder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumExtraSearch_FWD_DEFINED__
 #define __IEnumExtraSearch_FWD_DEFINED__
 typedef interface IEnumExtraSearch IEnumExtraSearch;
+#ifdef __cplusplus
+interface IEnumExtraSearch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellFolder2_FWD_DEFINED__
 #define __IShellFolder2_FWD_DEFINED__
 typedef interface IShellFolder2 IShellFolder2;
+#ifdef __cplusplus
+interface IShellFolder2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderViewOptions_FWD_DEFINED__
 #define __IFolderViewOptions_FWD_DEFINED__
 typedef interface IFolderViewOptions IFolderViewOptions;
+#ifdef __cplusplus
+interface IFolderViewOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellView_FWD_DEFINED__
 #define __IShellView_FWD_DEFINED__
 typedef interface IShellView IShellView;
+#ifdef __cplusplus
+interface IShellView;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellView2_FWD_DEFINED__
 #define __IShellView2_FWD_DEFINED__
 typedef interface IShellView2 IShellView2;
+#ifdef __cplusplus
+interface IShellView2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellView3_FWD_DEFINED__
 #define __IShellView3_FWD_DEFINED__
 typedef interface IShellView3 IShellView3;
+#ifdef __cplusplus
+interface IShellView3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderView_FWD_DEFINED__
 #define __IFolderView_FWD_DEFINED__
 typedef interface IFolderView IFolderView;
+#ifdef __cplusplus
+interface IFolderView;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISearchBoxInfo_FWD_DEFINED__
 #define __ISearchBoxInfo_FWD_DEFINED__
 typedef interface ISearchBoxInfo ISearchBoxInfo;
+#ifdef __cplusplus
+interface ISearchBoxInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderView2_FWD_DEFINED__
 #define __IFolderView2_FWD_DEFINED__
 typedef interface IFolderView2 IFolderView2;
+#ifdef __cplusplus
+interface IFolderView2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderViewSettings_FWD_DEFINED__
 #define __IFolderViewSettings_FWD_DEFINED__
 typedef interface IFolderViewSettings IFolderViewSettings;
+#ifdef __cplusplus
+interface IFolderViewSettings;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPreviewHandlerVisuals_FWD_DEFINED__
 #define __IPreviewHandlerVisuals_FWD_DEFINED__
 typedef interface IPreviewHandlerVisuals IPreviewHandlerVisuals;
+#ifdef __cplusplus
+interface IPreviewHandlerVisuals;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IVisualProperties_FWD_DEFINED__
 #define __IVisualProperties_FWD_DEFINED__
 typedef interface IVisualProperties IVisualProperties;
+#ifdef __cplusplus
+interface IVisualProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICommDlgBrowser_FWD_DEFINED__
 #define __ICommDlgBrowser_FWD_DEFINED__
 typedef interface ICommDlgBrowser ICommDlgBrowser;
+#ifdef __cplusplus
+interface ICommDlgBrowser;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICommDlgBrowser2_FWD_DEFINED__
 #define __ICommDlgBrowser2_FWD_DEFINED__
 typedef interface ICommDlgBrowser2 ICommDlgBrowser2;
+#ifdef __cplusplus
+interface ICommDlgBrowser2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICommDlgBrowser3_FWD_DEFINED__
 #define __ICommDlgBrowser3_FWD_DEFINED__
 typedef interface ICommDlgBrowser3 ICommDlgBrowser3;
+#ifdef __cplusplus
+interface ICommDlgBrowser3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IColumnManager_FWD_DEFINED__
 #define __IColumnManager_FWD_DEFINED__
 typedef interface IColumnManager IColumnManager;
+#ifdef __cplusplus
+interface IColumnManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderFilterSite_FWD_DEFINED__
 #define __IFolderFilterSite_FWD_DEFINED__
 typedef interface IFolderFilterSite IFolderFilterSite;
+#ifdef __cplusplus
+interface IFolderFilterSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderFilter_FWD_DEFINED__
 #define __IFolderFilter_FWD_DEFINED__
 typedef interface IFolderFilter IFolderFilter;
+#ifdef __cplusplus
+interface IFolderFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInputObjectSite_FWD_DEFINED__
 #define __IInputObjectSite_FWD_DEFINED__
 typedef interface IInputObjectSite IInputObjectSite;
+#ifdef __cplusplus
+interface IInputObjectSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInputObject_FWD_DEFINED__
 #define __IInputObject_FWD_DEFINED__
 typedef interface IInputObject IInputObject;
+#ifdef __cplusplus
+interface IInputObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInputObject2_FWD_DEFINED__
 #define __IInputObject2_FWD_DEFINED__
 typedef interface IInputObject2 IInputObject2;
+#ifdef __cplusplus
+interface IInputObject2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellIcon_FWD_DEFINED__
 #define __IShellIcon_FWD_DEFINED__
 typedef interface IShellIcon IShellIcon;
+#ifdef __cplusplus
+interface IShellIcon;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellBrowser_FWD_DEFINED__
 #define __IShellBrowser_FWD_DEFINED__
 typedef interface IShellBrowser IShellBrowser;
+#ifdef __cplusplus
+interface IShellBrowser;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IProfferService_FWD_DEFINED__
 #define __IProfferService_FWD_DEFINED__
 typedef interface IProfferService IProfferService;
+#ifdef __cplusplus
+interface IProfferService;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellItem_FWD_DEFINED__
 #define __IShellItem_FWD_DEFINED__
 typedef interface IShellItem IShellItem;
+#ifdef __cplusplus
+interface IShellItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellItem2_FWD_DEFINED__
 #define __IShellItem2_FWD_DEFINED__
 typedef interface IShellItem2 IShellItem2;
+#ifdef __cplusplus
+interface IShellItem2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellItemImageFactory_FWD_DEFINED__
 #define __IShellItemImageFactory_FWD_DEFINED__
 typedef interface IShellItemImageFactory IShellItemImageFactory;
+#ifdef __cplusplus
+interface IShellItemImageFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUserAccountChangeCallback_FWD_DEFINED__
 #define __IUserAccountChangeCallback_FWD_DEFINED__
 typedef interface IUserAccountChangeCallback IUserAccountChangeCallback;
+#ifdef __cplusplus
+interface IUserAccountChangeCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumShellItems_FWD_DEFINED__
 #define __IEnumShellItems_FWD_DEFINED__
 typedef interface IEnumShellItems IEnumShellItems;
+#ifdef __cplusplus
+interface IEnumShellItems;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITransferAdviseSink_FWD_DEFINED__
 #define __ITransferAdviseSink_FWD_DEFINED__
 typedef interface ITransferAdviseSink ITransferAdviseSink;
+#ifdef __cplusplus
+interface ITransferAdviseSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITransferSource_FWD_DEFINED__
 #define __ITransferSource_FWD_DEFINED__
 typedef interface ITransferSource ITransferSource;
+#ifdef __cplusplus
+interface ITransferSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumResources_FWD_DEFINED__
 #define __IEnumResources_FWD_DEFINED__
 typedef interface IEnumResources IEnumResources;
+#ifdef __cplusplus
+interface IEnumResources;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellItemResources_FWD_DEFINED__
 #define __IShellItemResources_FWD_DEFINED__
 typedef interface IShellItemResources IShellItemResources;
+#ifdef __cplusplus
+interface IShellItemResources;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITransferDestination_FWD_DEFINED__
 #define __ITransferDestination_FWD_DEFINED__
 typedef interface ITransferDestination ITransferDestination;
+#ifdef __cplusplus
+interface ITransferDestination;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IStreamAsync_FWD_DEFINED__
 #define __IStreamAsync_FWD_DEFINED__
 typedef interface IStreamAsync IStreamAsync;
+#ifdef __cplusplus
+interface IStreamAsync;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IStreamUnbufferedInfo_FWD_DEFINED__
 #define __IStreamUnbufferedInfo_FWD_DEFINED__
 typedef interface IStreamUnbufferedInfo IStreamUnbufferedInfo;
+#ifdef __cplusplus
+interface IStreamUnbufferedInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileOperationProgressSink_FWD_DEFINED__
 #define __IFileOperationProgressSink_FWD_DEFINED__
 typedef interface IFileOperationProgressSink IFileOperationProgressSink;
+#ifdef __cplusplus
+interface IFileOperationProgressSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellItemArray_FWD_DEFINED__
 #define __IShellItemArray_FWD_DEFINED__
 typedef interface IShellItemArray IShellItemArray;
+#ifdef __cplusplus
+interface IShellItemArray;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInitializeWithItem_FWD_DEFINED__
 #define __IInitializeWithItem_FWD_DEFINED__
 typedef interface IInitializeWithItem IInitializeWithItem;
+#ifdef __cplusplus
+interface IInitializeWithItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithSelection_FWD_DEFINED__
 #define __IObjectWithSelection_FWD_DEFINED__
 typedef interface IObjectWithSelection IObjectWithSelection;
+#ifdef __cplusplus
+interface IObjectWithSelection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithBackReferences_FWD_DEFINED__
 #define __IObjectWithBackReferences_FWD_DEFINED__
 typedef interface IObjectWithBackReferences IObjectWithBackReferences;
+#ifdef __cplusplus
+interface IObjectWithBackReferences;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPropertyUI_FWD_DEFINED__
 #define __IPropertyUI_FWD_DEFINED__
 typedef interface IPropertyUI IPropertyUI;
+#ifdef __cplusplus
+interface IPropertyUI;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICategoryProvider_FWD_DEFINED__
 #define __ICategoryProvider_FWD_DEFINED__
 typedef interface ICategoryProvider ICategoryProvider;
+#ifdef __cplusplus
+interface ICategoryProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICategorizer_FWD_DEFINED__
 #define __ICategorizer_FWD_DEFINED__
 typedef interface ICategorizer ICategorizer;
+#ifdef __cplusplus
+interface ICategorizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDropTargetHelper_FWD_DEFINED__
 #define __IDropTargetHelper_FWD_DEFINED__
 typedef interface IDropTargetHelper IDropTargetHelper;
+#ifdef __cplusplus
+interface IDropTargetHelper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDragSourceHelper_FWD_DEFINED__
 #define __IDragSourceHelper_FWD_DEFINED__
 typedef interface IDragSourceHelper IDragSourceHelper;
+#ifdef __cplusplus
+interface IDragSourceHelper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDragSourceHelper2_FWD_DEFINED__
 #define __IDragSourceHelper2_FWD_DEFINED__
 typedef interface IDragSourceHelper2 IDragSourceHelper2;
+#ifdef __cplusplus
+interface IDragSourceHelper2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellLinkA_FWD_DEFINED__
 #define __IShellLinkA_FWD_DEFINED__
 typedef interface IShellLinkA IShellLinkA;
+#ifdef __cplusplus
+interface IShellLinkA;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellLinkW_FWD_DEFINED__
 #define __IShellLinkW_FWD_DEFINED__
 typedef interface IShellLinkW IShellLinkW;
+#ifdef __cplusplus
+interface IShellLinkW;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellLinkDataList_FWD_DEFINED__
 #define __IShellLinkDataList_FWD_DEFINED__
 typedef interface IShellLinkDataList IShellLinkDataList;
+#ifdef __cplusplus
+interface IShellLinkDataList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IResolveShellLink_FWD_DEFINED__
 #define __IResolveShellLink_FWD_DEFINED__
 typedef interface IResolveShellLink IResolveShellLink;
+#ifdef __cplusplus
+interface IResolveShellLink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActionProgressDialog_FWD_DEFINED__
 #define __IActionProgressDialog_FWD_DEFINED__
 typedef interface IActionProgressDialog IActionProgressDialog;
+#ifdef __cplusplus
+interface IActionProgressDialog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHWEventHandler_FWD_DEFINED__
 #define __IHWEventHandler_FWD_DEFINED__
 typedef interface IHWEventHandler IHWEventHandler;
+#ifdef __cplusplus
+interface IHWEventHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHWEventHandler2_FWD_DEFINED__
 #define __IHWEventHandler2_FWD_DEFINED__
 typedef interface IHWEventHandler2 IHWEventHandler2;
+#ifdef __cplusplus
+interface IHWEventHandler2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IQueryCancelAutoPlay_FWD_DEFINED__
 #define __IQueryCancelAutoPlay_FWD_DEFINED__
 typedef interface IQueryCancelAutoPlay IQueryCancelAutoPlay;
+#ifdef __cplusplus
+interface IQueryCancelAutoPlay;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDynamicHWHandler_FWD_DEFINED__
 #define __IDynamicHWHandler_FWD_DEFINED__
 typedef interface IDynamicHWHandler IDynamicHWHandler;
+#ifdef __cplusplus
+interface IDynamicHWHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IActionProgress_FWD_DEFINED__
 #define __IActionProgress_FWD_DEFINED__
 typedef interface IActionProgress IActionProgress;
+#ifdef __cplusplus
+interface IActionProgress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellExtInit_FWD_DEFINED__
 #define __IShellExtInit_FWD_DEFINED__
 typedef interface IShellExtInit IShellExtInit;
+#ifdef __cplusplus
+interface IShellExtInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellPropSheetExt_FWD_DEFINED__
 #define __IShellPropSheetExt_FWD_DEFINED__
 typedef interface IShellPropSheetExt IShellPropSheetExt;
+#ifdef __cplusplus
+interface IShellPropSheetExt;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRemoteComputer_FWD_DEFINED__
 #define __IRemoteComputer_FWD_DEFINED__
 typedef interface IRemoteComputer IRemoteComputer;
+#ifdef __cplusplus
+interface IRemoteComputer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IQueryContinue_FWD_DEFINED__
 #define __IQueryContinue_FWD_DEFINED__
 typedef interface IQueryContinue IQueryContinue;
+#ifdef __cplusplus
+interface IQueryContinue;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithCancelEvent_FWD_DEFINED__
 #define __IObjectWithCancelEvent_FWD_DEFINED__
 typedef interface IObjectWithCancelEvent IObjectWithCancelEvent;
+#ifdef __cplusplus
+interface IObjectWithCancelEvent;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUserNotification_FWD_DEFINED__
 #define __IUserNotification_FWD_DEFINED__
 typedef interface IUserNotification IUserNotification;
+#ifdef __cplusplus
+interface IUserNotification;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUserNotificationCallback_FWD_DEFINED__
 #define __IUserNotificationCallback_FWD_DEFINED__
 typedef interface IUserNotificationCallback IUserNotificationCallback;
+#ifdef __cplusplus
+interface IUserNotificationCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUserNotification2_FWD_DEFINED__
 #define __IUserNotification2_FWD_DEFINED__
 typedef interface IUserNotification2 IUserNotification2;
+#ifdef __cplusplus
+interface IUserNotification2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IItemNameLimits_FWD_DEFINED__
 #define __IItemNameLimits_FWD_DEFINED__
 typedef interface IItemNameLimits IItemNameLimits;
+#ifdef __cplusplus
+interface IItemNameLimits;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISearchFolderItemFactory_FWD_DEFINED__
 #define __ISearchFolderItemFactory_FWD_DEFINED__
 typedef interface ISearchFolderItemFactory ISearchFolderItemFactory;
+#ifdef __cplusplus
+interface ISearchFolderItemFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExtractImage_FWD_DEFINED__
 #define __IExtractImage_FWD_DEFINED__
 typedef interface IExtractImage IExtractImage;
+#ifdef __cplusplus
+interface IExtractImage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExtractImage2_FWD_DEFINED__
 #define __IExtractImage2_FWD_DEFINED__
 typedef interface IExtractImage2 IExtractImage2;
+#ifdef __cplusplus
+interface IExtractImage2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IThumbnailHandlerFactory_FWD_DEFINED__
 #define __IThumbnailHandlerFactory_FWD_DEFINED__
 typedef interface IThumbnailHandlerFactory IThumbnailHandlerFactory;
+#ifdef __cplusplus
+interface IThumbnailHandlerFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IParentAndItem_FWD_DEFINED__
 #define __IParentAndItem_FWD_DEFINED__
 typedef interface IParentAndItem IParentAndItem;
+#ifdef __cplusplus
+interface IParentAndItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDockingWindow_FWD_DEFINED__
 #define __IDockingWindow_FWD_DEFINED__
 typedef interface IDockingWindow IDockingWindow;
+#ifdef __cplusplus
+interface IDockingWindow;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDeskBand_FWD_DEFINED__
 #define __IDeskBand_FWD_DEFINED__
 typedef interface IDeskBand IDeskBand;
+#ifdef __cplusplus
+interface IDeskBand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDeskBandInfo_FWD_DEFINED__
 #define __IDeskBandInfo_FWD_DEFINED__
 typedef interface IDeskBandInfo IDeskBandInfo;
+#ifdef __cplusplus
+interface IDeskBandInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDeskBand2_FWD_DEFINED__
 #define __IDeskBand2_FWD_DEFINED__
 typedef interface IDeskBand2 IDeskBand2;
+#ifdef __cplusplus
+interface IDeskBand2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITaskbarList_FWD_DEFINED__
 #define __ITaskbarList_FWD_DEFINED__
 typedef interface ITaskbarList ITaskbarList;
+#ifdef __cplusplus
+interface ITaskbarList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITaskbarList2_FWD_DEFINED__
 #define __ITaskbarList2_FWD_DEFINED__
 typedef interface ITaskbarList2 ITaskbarList2;
+#ifdef __cplusplus
+interface ITaskbarList2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITaskbarList3_FWD_DEFINED__
 #define __ITaskbarList3_FWD_DEFINED__
 typedef interface ITaskbarList3 ITaskbarList3;
+#ifdef __cplusplus
+interface ITaskbarList3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITaskbarList4_FWD_DEFINED__
 #define __ITaskbarList4_FWD_DEFINED__
 typedef interface ITaskbarList4 ITaskbarList4;
+#ifdef __cplusplus
+interface ITaskbarList4;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IStartMenuPinnedList_FWD_DEFINED__
 #define __IStartMenuPinnedList_FWD_DEFINED__
 typedef interface IStartMenuPinnedList IStartMenuPinnedList;
+#ifdef __cplusplus
+interface IStartMenuPinnedList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICDBurn_FWD_DEFINED__
 #define __ICDBurn_FWD_DEFINED__
 typedef interface ICDBurn ICDBurn;
+#ifdef __cplusplus
+interface ICDBurn;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWizardSite_FWD_DEFINED__
 #define __IWizardSite_FWD_DEFINED__
 typedef interface IWizardSite IWizardSite;
+#ifdef __cplusplus
+interface IWizardSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWizardExtension_FWD_DEFINED__
 #define __IWizardExtension_FWD_DEFINED__
 typedef interface IWizardExtension IWizardExtension;
+#ifdef __cplusplus
+interface IWizardExtension;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWebWizardExtension_FWD_DEFINED__
 #define __IWebWizardExtension_FWD_DEFINED__
 typedef interface IWebWizardExtension IWebWizardExtension;
+#ifdef __cplusplus
+interface IWebWizardExtension;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPublishingWizard_FWD_DEFINED__
 #define __IPublishingWizard_FWD_DEFINED__
 typedef interface IPublishingWizard IPublishingWizard;
+#ifdef __cplusplus
+interface IPublishingWizard;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderViewHost_FWD_DEFINED__
 #define __IFolderViewHost_FWD_DEFINED__
 typedef interface IFolderViewHost IFolderViewHost;
+#ifdef __cplusplus
+interface IFolderViewHost;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExplorerBrowserEvents_FWD_DEFINED__
 #define __IExplorerBrowserEvents_FWD_DEFINED__
 typedef interface IExplorerBrowserEvents IExplorerBrowserEvents;
+#ifdef __cplusplus
+interface IExplorerBrowserEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExplorerBrowser_FWD_DEFINED__
 #define __IExplorerBrowser_FWD_DEFINED__
 typedef interface IExplorerBrowser IExplorerBrowser;
+#ifdef __cplusplus
+interface IExplorerBrowser;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAccessibleObject_FWD_DEFINED__
 #define __IAccessibleObject_FWD_DEFINED__
 typedef interface IAccessibleObject IAccessibleObject;
+#ifdef __cplusplus
+interface IAccessibleObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IResultsFolder_FWD_DEFINED__
 #define __IResultsFolder_FWD_DEFINED__
 typedef interface IResultsFolder IResultsFolder;
+#ifdef __cplusplus
+interface IResultsFolder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumObjects_FWD_DEFINED__
 #define __IEnumObjects_FWD_DEFINED__
 typedef interface IEnumObjects IEnumObjects;
+#ifdef __cplusplus
+interface IEnumObjects;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOperationsProgressDialog_FWD_DEFINED__
 #define __IOperationsProgressDialog_FWD_DEFINED__
 typedef interface IOperationsProgressDialog IOperationsProgressDialog;
+#ifdef __cplusplus
+interface IOperationsProgressDialog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IIOCancelInformation_FWD_DEFINED__
 #define __IIOCancelInformation_FWD_DEFINED__
 typedef interface IIOCancelInformation IIOCancelInformation;
+#ifdef __cplusplus
+interface IIOCancelInformation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileOperation_FWD_DEFINED__
 #define __IFileOperation_FWD_DEFINED__
 typedef interface IFileOperation IFileOperation;
+#ifdef __cplusplus
+interface IFileOperation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectProvider_FWD_DEFINED__
 #define __IObjectProvider_FWD_DEFINED__
 typedef interface IObjectProvider IObjectProvider;
+#ifdef __cplusplus
+interface IObjectProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INamespaceWalkCB_FWD_DEFINED__
 #define __INamespaceWalkCB_FWD_DEFINED__
 typedef interface INamespaceWalkCB INamespaceWalkCB;
+#ifdef __cplusplus
+interface INamespaceWalkCB;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INamespaceWalkCB2_FWD_DEFINED__
 #define __INamespaceWalkCB2_FWD_DEFINED__
 typedef interface INamespaceWalkCB2 INamespaceWalkCB2;
+#ifdef __cplusplus
+interface INamespaceWalkCB2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INamespaceWalk_FWD_DEFINED__
 #define __INamespaceWalk_FWD_DEFINED__
 typedef interface INamespaceWalk INamespaceWalk;
+#ifdef __cplusplus
+interface INamespaceWalk;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAutoCompleteDropDown_FWD_DEFINED__
 #define __IAutoCompleteDropDown_FWD_DEFINED__
 typedef interface IAutoCompleteDropDown IAutoCompleteDropDown;
+#ifdef __cplusplus
+interface IAutoCompleteDropDown;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBandSite_FWD_DEFINED__
 #define __IBandSite_FWD_DEFINED__
 typedef interface IBandSite IBandSite;
+#ifdef __cplusplus
+interface IBandSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IModalWindow_FWD_DEFINED__
 #define __IModalWindow_FWD_DEFINED__
 typedef interface IModalWindow IModalWindow;
+#ifdef __cplusplus
+interface IModalWindow;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICDBurnExt_FWD_DEFINED__
 #define __ICDBurnExt_FWD_DEFINED__
 typedef interface ICDBurnExt ICDBurnExt;
+#ifdef __cplusplus
+interface ICDBurnExt;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IContextMenuSite_FWD_DEFINED__
 #define __IContextMenuSite_FWD_DEFINED__
 typedef interface IContextMenuSite IContextMenuSite;
+#ifdef __cplusplus
+interface IContextMenuSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumReadyCallback_FWD_DEFINED__
 #define __IEnumReadyCallback_FWD_DEFINED__
 typedef interface IEnumReadyCallback IEnumReadyCallback;
+#ifdef __cplusplus
+interface IEnumReadyCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumerableView_FWD_DEFINED__
 #define __IEnumerableView_FWD_DEFINED__
 typedef interface IEnumerableView IEnumerableView;
+#ifdef __cplusplus
+interface IEnumerableView;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInsertItem_FWD_DEFINED__
 #define __IInsertItem_FWD_DEFINED__
 typedef interface IInsertItem IInsertItem;
+#ifdef __cplusplus
+interface IInsertItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMenuBand_FWD_DEFINED__
 #define __IMenuBand_FWD_DEFINED__
 typedef interface IMenuBand IMenuBand;
+#ifdef __cplusplus
+interface IMenuBand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFolderBandPriv_FWD_DEFINED__
 #define __IFolderBandPriv_FWD_DEFINED__
 typedef interface IFolderBandPriv IFolderBandPriv;
+#ifdef __cplusplus
+interface IFolderBandPriv;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRegTreeItem_FWD_DEFINED__
 #define __IRegTreeItem_FWD_DEFINED__
 typedef interface IRegTreeItem IRegTreeItem;
+#ifdef __cplusplus
+interface IRegTreeItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IImageRecompress_FWD_DEFINED__
 #define __IImageRecompress_FWD_DEFINED__
 typedef interface IImageRecompress IImageRecompress;
+#ifdef __cplusplus
+interface IImageRecompress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDeskBar_FWD_DEFINED__
 #define __IDeskBar_FWD_DEFINED__
 typedef interface IDeskBar IDeskBar;
+#ifdef __cplusplus
+interface IDeskBar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMenuPopup_FWD_DEFINED__
 #define __IMenuPopup_FWD_DEFINED__
 typedef interface IMenuPopup IMenuPopup;
+#ifdef __cplusplus
+interface IMenuPopup;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileIsInUse_FWD_DEFINED__
 #define __IFileIsInUse_FWD_DEFINED__
 typedef interface IFileIsInUse IFileIsInUse;
+#ifdef __cplusplus
+interface IFileIsInUse;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileDialogEvents_FWD_DEFINED__
 #define __IFileDialogEvents_FWD_DEFINED__
 typedef interface IFileDialogEvents IFileDialogEvents;
+#ifdef __cplusplus
+interface IFileDialogEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileDialog_FWD_DEFINED__
 #define __IFileDialog_FWD_DEFINED__
 typedef interface IFileDialog IFileDialog;
+#ifdef __cplusplus
+interface IFileDialog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSaveDialog_FWD_DEFINED__
 #define __IFileSaveDialog_FWD_DEFINED__
 typedef interface IFileSaveDialog IFileSaveDialog;
+#ifdef __cplusplus
+interface IFileSaveDialog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileOpenDialog_FWD_DEFINED__
 #define __IFileOpenDialog_FWD_DEFINED__
 typedef interface IFileOpenDialog IFileOpenDialog;
+#ifdef __cplusplus
+interface IFileOpenDialog;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileDialogCustomize_FWD_DEFINED__
 #define __IFileDialogCustomize_FWD_DEFINED__
 typedef interface IFileDialogCustomize IFileDialogCustomize;
+#ifdef __cplusplus
+interface IFileDialogCustomize;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileDialogControlEvents_FWD_DEFINED__
 #define __IFileDialogControlEvents_FWD_DEFINED__
 typedef interface IFileDialogControlEvents IFileDialogControlEvents;
+#ifdef __cplusplus
+interface IFileDialogControlEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileDialog2_FWD_DEFINED__
 #define __IFileDialog2_FWD_DEFINED__
 typedef interface IFileDialog2 IFileDialog2;
+#ifdef __cplusplus
+interface IFileDialog2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationAssociationRegistration_FWD_DEFINED__
 #define __IApplicationAssociationRegistration_FWD_DEFINED__
 typedef interface IApplicationAssociationRegistration IApplicationAssociationRegistration;
+#ifdef __cplusplus
+interface IApplicationAssociationRegistration;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationAssociationRegistrationUI_FWD_DEFINED__
 #define __IApplicationAssociationRegistrationUI_FWD_DEFINED__
 typedef interface IApplicationAssociationRegistrationUI IApplicationAssociationRegistrationUI;
+#ifdef __cplusplus
+interface IApplicationAssociationRegistrationUI;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDelegateFolder_FWD_DEFINED__
 #define __IDelegateFolder_FWD_DEFINED__
 typedef interface IDelegateFolder IDelegateFolder;
+#ifdef __cplusplus
+interface IDelegateFolder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBrowserFrameOptions_FWD_DEFINED__
 #define __IBrowserFrameOptions_FWD_DEFINED__
 typedef interface IBrowserFrameOptions IBrowserFrameOptions;
+#ifdef __cplusplus
+interface IBrowserFrameOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INewWindowManager_FWD_DEFINED__
 #define __INewWindowManager_FWD_DEFINED__
 typedef interface INewWindowManager INewWindowManager;
+#ifdef __cplusplus
+interface INewWindowManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAttachmentExecute_FWD_DEFINED__
 #define __IAttachmentExecute_FWD_DEFINED__
 typedef interface IAttachmentExecute IAttachmentExecute;
+#ifdef __cplusplus
+interface IAttachmentExecute;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellMenuCallback_FWD_DEFINED__
 #define __IShellMenuCallback_FWD_DEFINED__
 typedef interface IShellMenuCallback IShellMenuCallback;
+#ifdef __cplusplus
+interface IShellMenuCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellMenu_FWD_DEFINED__
 #define __IShellMenu_FWD_DEFINED__
 typedef interface IShellMenu IShellMenu;
+#ifdef __cplusplus
+interface IShellMenu;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellRunDll_FWD_DEFINED__
 #define __IShellRunDll_FWD_DEFINED__
 typedef interface IShellRunDll IShellRunDll;
+#ifdef __cplusplus
+interface IShellRunDll;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IKnownFolder_FWD_DEFINED__
 #define __IKnownFolder_FWD_DEFINED__
 typedef interface IKnownFolder IKnownFolder;
+#ifdef __cplusplus
+interface IKnownFolder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IKnownFolderManager_FWD_DEFINED__
 #define __IKnownFolderManager_FWD_DEFINED__
 typedef interface IKnownFolderManager IKnownFolderManager;
+#ifdef __cplusplus
+interface IKnownFolderManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISharingConfigurationManager_FWD_DEFINED__
 #define __ISharingConfigurationManager_FWD_DEFINED__
 typedef interface ISharingConfigurationManager ISharingConfigurationManager;
+#ifdef __cplusplus
+interface ISharingConfigurationManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPreviousVersionsInfo_FWD_DEFINED__
 #define __IPreviousVersionsInfo_FWD_DEFINED__
 typedef interface IPreviousVersionsInfo IPreviousVersionsInfo;
+#ifdef __cplusplus
+interface IPreviousVersionsInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IRelatedItem_FWD_DEFINED__
 #define __IRelatedItem_FWD_DEFINED__
 typedef interface IRelatedItem IRelatedItem;
+#ifdef __cplusplus
+interface IRelatedItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IIdentityName_FWD_DEFINED__
 #define __IIdentityName_FWD_DEFINED__
 typedef interface IIdentityName IIdentityName;
+#ifdef __cplusplus
+interface IIdentityName;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDelegateItem_FWD_DEFINED__
 #define __IDelegateItem_FWD_DEFINED__
 typedef interface IDelegateItem IDelegateItem;
+#ifdef __cplusplus
+interface IDelegateItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICurrentItem_FWD_DEFINED__
 #define __ICurrentItem_FWD_DEFINED__
 typedef interface ICurrentItem ICurrentItem;
+#ifdef __cplusplus
+interface ICurrentItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITransferMediumItem_FWD_DEFINED__
 #define __ITransferMediumItem_FWD_DEFINED__
 typedef interface ITransferMediumItem ITransferMediumItem;
+#ifdef __cplusplus
+interface ITransferMediumItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUseToBrowseItem_FWD_DEFINED__
 #define __IUseToBrowseItem_FWD_DEFINED__
 typedef interface IUseToBrowseItem IUseToBrowseItem;
+#ifdef __cplusplus
+interface IUseToBrowseItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDisplayItem_FWD_DEFINED__
 #define __IDisplayItem_FWD_DEFINED__
 typedef interface IDisplayItem IDisplayItem;
+#ifdef __cplusplus
+interface IDisplayItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IViewStateIdentityItem_FWD_DEFINED__
 #define __IViewStateIdentityItem_FWD_DEFINED__
 typedef interface IViewStateIdentityItem IViewStateIdentityItem;
+#ifdef __cplusplus
+interface IViewStateIdentityItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPreviewItem_FWD_DEFINED__
 #define __IPreviewItem_FWD_DEFINED__
 typedef interface IPreviewItem IPreviewItem;
+#ifdef __cplusplus
+interface IPreviewItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDestinationStreamFactory_FWD_DEFINED__
 #define __IDestinationStreamFactory_FWD_DEFINED__
 typedef interface IDestinationStreamFactory IDestinationStreamFactory;
+#ifdef __cplusplus
+interface IDestinationStreamFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INewMenuClient_FWD_DEFINED__
 #define __INewMenuClient_FWD_DEFINED__
 typedef interface INewMenuClient INewMenuClient;
+#ifdef __cplusplus
+interface INewMenuClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInitializeWithBindCtx_FWD_DEFINED__
 #define __IInitializeWithBindCtx_FWD_DEFINED__
 typedef interface IInitializeWithBindCtx IInitializeWithBindCtx;
+#ifdef __cplusplus
+interface IInitializeWithBindCtx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellItemFilter_FWD_DEFINED__
 #define __IShellItemFilter_FWD_DEFINED__
 typedef interface IShellItemFilter IShellItemFilter;
+#ifdef __cplusplus
+interface IShellItemFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INameSpaceTreeControl_FWD_DEFINED__
 #define __INameSpaceTreeControl_FWD_DEFINED__
 typedef interface INameSpaceTreeControl INameSpaceTreeControl;
+#ifdef __cplusplus
+interface INameSpaceTreeControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INameSpaceTreeControl2_FWD_DEFINED__
 #define __INameSpaceTreeControl2_FWD_DEFINED__
 typedef interface INameSpaceTreeControl2 INameSpaceTreeControl2;
+#ifdef __cplusplus
+interface INameSpaceTreeControl2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INameSpaceTreeControlEvents_FWD_DEFINED__
 #define __INameSpaceTreeControlEvents_FWD_DEFINED__
 typedef interface INameSpaceTreeControlEvents INameSpaceTreeControlEvents;
+#ifdef __cplusplus
+interface INameSpaceTreeControlEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INameSpaceTreeControlDropHandler_FWD_DEFINED__
 #define __INameSpaceTreeControlDropHandler_FWD_DEFINED__
 typedef interface INameSpaceTreeControlDropHandler INameSpaceTreeControlDropHandler;
+#ifdef __cplusplus
+interface INameSpaceTreeControlDropHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INameSpaceTreeAccessible_FWD_DEFINED__
 #define __INameSpaceTreeAccessible_FWD_DEFINED__
 typedef interface INameSpaceTreeAccessible INameSpaceTreeAccessible;
+#ifdef __cplusplus
+interface INameSpaceTreeAccessible;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INameSpaceTreeControlCustomDraw_FWD_DEFINED__
 #define __INameSpaceTreeControlCustomDraw_FWD_DEFINED__
 typedef interface INameSpaceTreeControlCustomDraw INameSpaceTreeControlCustomDraw;
+#ifdef __cplusplus
+interface INameSpaceTreeControlCustomDraw;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __INameSpaceTreeControlFolderCapabilities_FWD_DEFINED__
 #define __INameSpaceTreeControlFolderCapabilities_FWD_DEFINED__
 typedef interface INameSpaceTreeControlFolderCapabilities INameSpaceTreeControlFolderCapabilities;
+#ifdef __cplusplus
+interface INameSpaceTreeControlFolderCapabilities;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPreviewHandler_FWD_DEFINED__
 #define __IPreviewHandler_FWD_DEFINED__
 typedef interface IPreviewHandler IPreviewHandler;
+#ifdef __cplusplus
+interface IPreviewHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPreviewHandlerFrame_FWD_DEFINED__
 #define __IPreviewHandlerFrame_FWD_DEFINED__
 typedef interface IPreviewHandlerFrame IPreviewHandlerFrame;
+#ifdef __cplusplus
+interface IPreviewHandlerFrame;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITrayDeskBand_FWD_DEFINED__
 #define __ITrayDeskBand_FWD_DEFINED__
 typedef interface ITrayDeskBand ITrayDeskBand;
+#ifdef __cplusplus
+interface ITrayDeskBand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBandHost_FWD_DEFINED__
 #define __IBandHost_FWD_DEFINED__
 typedef interface IBandHost IBandHost;
+#ifdef __cplusplus
+interface IBandHost;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExplorerPaneVisibility_FWD_DEFINED__
 #define __IExplorerPaneVisibility_FWD_DEFINED__
 typedef interface IExplorerPaneVisibility IExplorerPaneVisibility;
+#ifdef __cplusplus
+interface IExplorerPaneVisibility;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IContextMenuCB_FWD_DEFINED__
 #define __IContextMenuCB_FWD_DEFINED__
 typedef interface IContextMenuCB IContextMenuCB;
+#ifdef __cplusplus
+interface IContextMenuCB;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDefaultExtractIconInit_FWD_DEFINED__
 #define __IDefaultExtractIconInit_FWD_DEFINED__
 typedef interface IDefaultExtractIconInit IDefaultExtractIconInit;
+#ifdef __cplusplus
+interface IDefaultExtractIconInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExplorerCommand_FWD_DEFINED__
 #define __IExplorerCommand_FWD_DEFINED__
 typedef interface IExplorerCommand IExplorerCommand;
+#ifdef __cplusplus
+interface IExplorerCommand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExplorerCommandState_FWD_DEFINED__
 #define __IExplorerCommandState_FWD_DEFINED__
 typedef interface IExplorerCommandState IExplorerCommandState;
+#ifdef __cplusplus
+interface IExplorerCommandState;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInitializeCommand_FWD_DEFINED__
 #define __IInitializeCommand_FWD_DEFINED__
 typedef interface IInitializeCommand IInitializeCommand;
+#ifdef __cplusplus
+interface IInitializeCommand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumExplorerCommand_FWD_DEFINED__
 #define __IEnumExplorerCommand_FWD_DEFINED__
 typedef interface IEnumExplorerCommand IEnumExplorerCommand;
+#ifdef __cplusplus
+interface IEnumExplorerCommand;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExplorerCommandProvider_FWD_DEFINED__
 #define __IExplorerCommandProvider_FWD_DEFINED__
 typedef interface IExplorerCommandProvider IExplorerCommandProvider;
+#ifdef __cplusplus
+interface IExplorerCommandProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInitializeNetworkFolder_FWD_DEFINED__
 #define __IInitializeNetworkFolder_FWD_DEFINED__
 typedef interface IInitializeNetworkFolder IInitializeNetworkFolder;
+#ifdef __cplusplus
+interface IInitializeNetworkFolder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpenControlPanel_FWD_DEFINED__
 #define __IOpenControlPanel_FWD_DEFINED__
 typedef interface IOpenControlPanel IOpenControlPanel;
+#ifdef __cplusplus
+interface IOpenControlPanel;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IComputerInfoChangeNotify_FWD_DEFINED__
 #define __IComputerInfoChangeNotify_FWD_DEFINED__
 typedef interface IComputerInfoChangeNotify IComputerInfoChangeNotify;
+#ifdef __cplusplus
+interface IComputerInfoChangeNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSystemBindData_FWD_DEFINED__
 #define __IFileSystemBindData_FWD_DEFINED__
 typedef interface IFileSystemBindData IFileSystemBindData;
+#ifdef __cplusplus
+interface IFileSystemBindData;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSystemBindData2_FWD_DEFINED__
 #define __IFileSystemBindData2_FWD_DEFINED__
 typedef interface IFileSystemBindData2 IFileSystemBindData2;
+#ifdef __cplusplus
+interface IFileSystemBindData2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICustomDestinationList_FWD_DEFINED__
 #define __ICustomDestinationList_FWD_DEFINED__
 typedef interface ICustomDestinationList ICustomDestinationList;
+#ifdef __cplusplus
+interface ICustomDestinationList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationDestinations_FWD_DEFINED__
 #define __IApplicationDestinations_FWD_DEFINED__
 typedef interface IApplicationDestinations IApplicationDestinations;
+#ifdef __cplusplus
+interface IApplicationDestinations;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationDocumentLists_FWD_DEFINED__
 #define __IApplicationDocumentLists_FWD_DEFINED__
 typedef interface IApplicationDocumentLists IApplicationDocumentLists;
+#ifdef __cplusplus
+interface IApplicationDocumentLists;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithAppUserModelID_FWD_DEFINED__
 #define __IObjectWithAppUserModelID_FWD_DEFINED__
 typedef interface IObjectWithAppUserModelID IObjectWithAppUserModelID;
+#ifdef __cplusplus
+interface IObjectWithAppUserModelID;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IObjectWithProgID_FWD_DEFINED__
 #define __IObjectWithProgID_FWD_DEFINED__
 typedef interface IObjectWithProgID IObjectWithProgID;
+#ifdef __cplusplus
+interface IObjectWithProgID;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUpdateIDList_FWD_DEFINED__
 #define __IUpdateIDList_FWD_DEFINED__
 typedef interface IUpdateIDList IUpdateIDList;
+#ifdef __cplusplus
+interface IUpdateIDList;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDesktopGadget_FWD_DEFINED__
 #define __IDesktopGadget_FWD_DEFINED__
 typedef interface IDesktopGadget IDesktopGadget;
+#ifdef __cplusplus
+interface IDesktopGadget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDesktopWallpaper_FWD_DEFINED__
 #define __IDesktopWallpaper_FWD_DEFINED__
 typedef interface IDesktopWallpaper IDesktopWallpaper;
+#ifdef __cplusplus
+interface IDesktopWallpaper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHomeGroup_FWD_DEFINED__
 #define __IHomeGroup_FWD_DEFINED__
 typedef interface IHomeGroup IHomeGroup;
+#ifdef __cplusplus
+interface IHomeGroup;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInitializeWithPropertyStore_FWD_DEFINED__
 #define __IInitializeWithPropertyStore_FWD_DEFINED__
 typedef interface IInitializeWithPropertyStore IInitializeWithPropertyStore;
+#ifdef __cplusplus
+interface IInitializeWithPropertyStore;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOpenSearchSource_FWD_DEFINED__
 #define __IOpenSearchSource_FWD_DEFINED__
 typedef interface IOpenSearchSource IOpenSearchSource;
+#ifdef __cplusplus
+interface IOpenSearchSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IShellLibrary_FWD_DEFINED__
 #define __IShellLibrary_FWD_DEFINED__
 typedef interface IShellLibrary IShellLibrary;
+#ifdef __cplusplus
+interface IShellLibrary;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPlaybackManagerEvents_FWD_DEFINED__
 #define __IPlaybackManagerEvents_FWD_DEFINED__
 typedef interface IPlaybackManagerEvents IPlaybackManagerEvents;
+#ifdef __cplusplus
+interface IPlaybackManagerEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPlaybackManager_FWD_DEFINED__
 #define __IPlaybackManager_FWD_DEFINED__
 typedef interface IPlaybackManager IPlaybackManager;
+#ifdef __cplusplus
+interface IPlaybackManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDefaultFolderMenuInitialize_FWD_DEFINED__
 #define __IDefaultFolderMenuInitialize_FWD_DEFINED__
 typedef interface IDefaultFolderMenuInitialize IDefaultFolderMenuInitialize;
+#ifdef __cplusplus
+interface IDefaultFolderMenuInitialize;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationActivationManager_FWD_DEFINED__
 #define __IApplicationActivationManager_FWD_DEFINED__
 typedef interface IApplicationActivationManager IApplicationActivationManager;
+#ifdef __cplusplus
+interface IApplicationActivationManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __DesktopWallpaper_FWD_DEFINED__
@@ -1642,101 +2248,161 @@
 #ifndef __IAssocHandlerInvoker_FWD_DEFINED__
 #define __IAssocHandlerInvoker_FWD_DEFINED__
 typedef interface IAssocHandlerInvoker IAssocHandlerInvoker;
+#ifdef __cplusplus
+interface IAssocHandlerInvoker;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAssocHandler_FWD_DEFINED__
 #define __IAssocHandler_FWD_DEFINED__
 typedef interface IAssocHandler IAssocHandler;
+#ifdef __cplusplus
+interface IAssocHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumAssocHandlers_FWD_DEFINED__
 #define __IEnumAssocHandlers_FWD_DEFINED__
 typedef interface IEnumAssocHandlers IEnumAssocHandlers;
+#ifdef __cplusplus
+interface IEnumAssocHandlers;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDataObjectProvider_FWD_DEFINED__
 #define __IDataObjectProvider_FWD_DEFINED__
 typedef interface IDataObjectProvider IDataObjectProvider;
+#ifdef __cplusplus
+interface IDataObjectProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDataTransferManagerInterop_FWD_DEFINED__
 #define __IDataTransferManagerInterop_FWD_DEFINED__
 typedef interface IDataTransferManagerInterop IDataTransferManagerInterop;
+#ifdef __cplusplus
+interface IDataTransferManagerInterop;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFrameworkInputPaneHandler_FWD_DEFINED__
 #define __IFrameworkInputPaneHandler_FWD_DEFINED__
 typedef interface IFrameworkInputPaneHandler IFrameworkInputPaneHandler;
+#ifdef __cplusplus
+interface IFrameworkInputPaneHandler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFrameworkInputPane_FWD_DEFINED__
 #define __IFrameworkInputPane_FWD_DEFINED__
 typedef interface IFrameworkInputPane IFrameworkInputPane;
+#ifdef __cplusplus
+interface IFrameworkInputPane;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISearchableApplication_FWD_DEFINED__
 #define __ISearchableApplication_FWD_DEFINED__
 typedef interface ISearchableApplication ISearchableApplication;
+#ifdef __cplusplus
+interface ISearchableApplication;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAccessibilityDockingServiceCallback_FWD_DEFINED__
 #define __IAccessibilityDockingServiceCallback_FWD_DEFINED__
 typedef interface IAccessibilityDockingServiceCallback IAccessibilityDockingServiceCallback;
+#ifdef __cplusplus
+interface IAccessibilityDockingServiceCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAccessibilityDockingService_FWD_DEFINED__
 #define __IAccessibilityDockingService_FWD_DEFINED__
 typedef interface IAccessibilityDockingService IAccessibilityDockingService;
+#ifdef __cplusplus
+interface IAccessibilityDockingService;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAppVisibilityEvents_FWD_DEFINED__
 #define __IAppVisibilityEvents_FWD_DEFINED__
 typedef interface IAppVisibilityEvents IAppVisibilityEvents;
+#ifdef __cplusplus
+interface IAppVisibilityEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAppVisibility_FWD_DEFINED__
 #define __IAppVisibility_FWD_DEFINED__
 typedef interface IAppVisibility IAppVisibility;
+#ifdef __cplusplus
+interface IAppVisibility;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPackageExecutionStateChangeNotification_FWD_DEFINED__
 #define __IPackageExecutionStateChangeNotification_FWD_DEFINED__
 typedef interface IPackageExecutionStateChangeNotification IPackageExecutionStateChangeNotification;
+#ifdef __cplusplus
+interface IPackageExecutionStateChangeNotification;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPackageDebugSettings_FWD_DEFINED__
 #define __IPackageDebugSettings_FWD_DEFINED__
 typedef interface IPackageDebugSettings IPackageDebugSettings;
+#ifdef __cplusplus
+interface IPackageDebugSettings;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExecuteCommandApplicationHostEnvironment_FWD_DEFINED__
 #define __IExecuteCommandApplicationHostEnvironment_FWD_DEFINED__
 typedef interface IExecuteCommandApplicationHostEnvironment IExecuteCommandApplicationHostEnvironment;
+#ifdef __cplusplus
+interface IExecuteCommandApplicationHostEnvironment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IExecuteCommandHost_FWD_DEFINED__
 #define __IExecuteCommandHost_FWD_DEFINED__
 typedef interface IExecuteCommandHost IExecuteCommandHost;
+#ifdef __cplusplus
+interface IExecuteCommandHost;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IApplicationDesignModeSettings_FWD_DEFINED__
 #define __IApplicationDesignModeSettings_FWD_DEFINED__
 typedef interface IApplicationDesignModeSettings IApplicationDesignModeSettings;
+#ifdef __cplusplus
+interface IApplicationDesignModeSettings;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInitializeWithWindow_FWD_DEFINED__
 #define __IInitializeWithWindow_FWD_DEFINED__
 typedef interface IInitializeWithWindow IInitializeWithWindow;
+#ifdef __cplusplus
+interface IInitializeWithWindow;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHandlerInfo_FWD_DEFINED__
 #define __IHandlerInfo_FWD_DEFINED__
 typedef interface IHandlerInfo IHandlerInfo;
+#ifdef __cplusplus
+interface IHandlerInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHandlerActivationHost_FWD_DEFINED__
 #define __IHandlerActivationHost_FWD_DEFINED__
 typedef interface IHandlerActivationHost IHandlerActivationHost;
+#ifdef __cplusplus
+interface IHandlerActivationHost;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -1927,19 +2593,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenu* This,
+        IContextMenu *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenu* This);
+        IContextMenu *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenu* This);
+        IContextMenu *This);
 
     /*** IContextMenu methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryContextMenu)(
-        IContextMenu* This,
+        IContextMenu *This,
         HMENU hmenu,
         UINT indexMenu,
         UINT idCmdFirst,
@@ -1947,11 +2613,11 @@
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *InvokeCommand)(
-        IContextMenu* This,
+        IContextMenu *This,
         CMINVOKECOMMANDINFO *pici);
 
     HRESULT (STDMETHODCALLTYPE *GetCommandString)(
-        IContextMenu* This,
+        IContextMenu *This,
         UINT_PTR idCmd,
         UINT uType,
         UINT *pReserved,
@@ -1960,6 +2626,7 @@
 
     END_INTERFACE
 } IContextMenuVtbl;
+
 interface IContextMenu {
     CONST_VTBL IContextMenuVtbl* lpVtbl;
 };
@@ -2000,38 +2667,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IContextMenu_QueryContextMenu_Proxy(
-    IContextMenu* This,
-    HMENU hmenu,
-    UINT indexMenu,
-    UINT idCmdFirst,
-    UINT idCmdLast,
-    UINT uFlags);
-void __RPC_STUB IContextMenu_QueryContextMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IContextMenu_InvokeCommand_Proxy(
-    IContextMenu* This,
-    CMINVOKECOMMANDINFO *pici);
-void __RPC_STUB IContextMenu_InvokeCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IContextMenu_GetCommandString_Proxy(
-    IContextMenu* This,
-    UINT_PTR idCmd,
-    UINT uType,
-    UINT *pReserved,
-    CHAR *pszName,
-    UINT cchMax);
-void __RPC_STUB IContextMenu_GetCommandString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IContextMenu_INTERFACE_DEFINED__ */
 
@@ -2063,19 +2698,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenu2* This,
+        IContextMenu2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenu2* This);
+        IContextMenu2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenu2* This);
+        IContextMenu2 *This);
 
     /*** IContextMenu methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryContextMenu)(
-        IContextMenu2* This,
+        IContextMenu2 *This,
         HMENU hmenu,
         UINT indexMenu,
         UINT idCmdFirst,
@@ -2083,11 +2718,11 @@
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *InvokeCommand)(
-        IContextMenu2* This,
+        IContextMenu2 *This,
         CMINVOKECOMMANDINFO *pici);
 
     HRESULT (STDMETHODCALLTYPE *GetCommandString)(
-        IContextMenu2* This,
+        IContextMenu2 *This,
         UINT_PTR idCmd,
         UINT uType,
         UINT *pReserved,
@@ -2096,13 +2731,14 @@
 
     /*** IContextMenu2 methods ***/
     HRESULT (STDMETHODCALLTYPE *HandleMenuMsg)(
-        IContextMenu2* This,
+        IContextMenu2 *This,
         UINT uMsg,
         WPARAM wParam,
         LPARAM lParam);
 
     END_INTERFACE
 } IContextMenu2Vtbl;
+
 interface IContextMenu2 {
     CONST_VTBL IContextMenu2Vtbl* lpVtbl;
 };
@@ -2149,16 +2785,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IContextMenu2_HandleMenuMsg_Proxy(
-    IContextMenu2* This,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IContextMenu2_HandleMenuMsg_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IContextMenu2_INTERFACE_DEFINED__ */
 
@@ -2191,19 +2817,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenu3* This,
+        IContextMenu3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenu3* This);
+        IContextMenu3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenu3* This);
+        IContextMenu3 *This);
 
     /*** IContextMenu methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryContextMenu)(
-        IContextMenu3* This,
+        IContextMenu3 *This,
         HMENU hmenu,
         UINT indexMenu,
         UINT idCmdFirst,
@@ -2211,11 +2837,11 @@
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *InvokeCommand)(
-        IContextMenu3* This,
+        IContextMenu3 *This,
         CMINVOKECOMMANDINFO *pici);
 
     HRESULT (STDMETHODCALLTYPE *GetCommandString)(
-        IContextMenu3* This,
+        IContextMenu3 *This,
         UINT_PTR idCmd,
         UINT uType,
         UINT *pReserved,
@@ -2224,14 +2850,14 @@
 
     /*** IContextMenu2 methods ***/
     HRESULT (STDMETHODCALLTYPE *HandleMenuMsg)(
-        IContextMenu3* This,
+        IContextMenu3 *This,
         UINT uMsg,
         WPARAM wParam,
         LPARAM lParam);
 
     /*** IContextMenu3 methods ***/
     HRESULT (STDMETHODCALLTYPE *HandleMenuMsg2)(
-        IContextMenu3* This,
+        IContextMenu3 *This,
         UINT uMsg,
         WPARAM wParam,
         LPARAM lParam,
@@ -2239,6 +2865,7 @@
 
     END_INTERFACE
 } IContextMenu3Vtbl;
+
 interface IContextMenu3 {
     CONST_VTBL IContextMenu3Vtbl* lpVtbl;
 };
@@ -2291,17 +2918,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IContextMenu3_HandleMenuMsg2_Proxy(
-    IContextMenu3* This,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam,
-    LRESULT *plResult);
-void __RPC_STUB IContextMenu3_HandleMenuMsg2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IContextMenu3_INTERFACE_DEFINED__ */
 
@@ -2349,46 +2965,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExecuteCommand* This,
+        IExecuteCommand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExecuteCommand* This);
+        IExecuteCommand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExecuteCommand* This);
+        IExecuteCommand *This);
 
     /*** IExecuteCommand methods ***/
     HRESULT (STDMETHODCALLTYPE *SetKeyState)(
-        IExecuteCommand* This,
+        IExecuteCommand *This,
         DWORD grfKeyState);
 
     HRESULT (STDMETHODCALLTYPE *SetParameters)(
-        IExecuteCommand* This,
+        IExecuteCommand *This,
         LPCWSTR pszParameters);
 
     HRESULT (STDMETHODCALLTYPE *SetPosition)(
-        IExecuteCommand* This,
+        IExecuteCommand *This,
         POINT pt);
 
     HRESULT (STDMETHODCALLTYPE *SetShowWindow)(
-        IExecuteCommand* This,
+        IExecuteCommand *This,
         int nShow);
 
     HRESULT (STDMETHODCALLTYPE *SetNoShowUI)(
-        IExecuteCommand* This,
+        IExecuteCommand *This,
         WINBOOL fNoShowUI);
 
     HRESULT (STDMETHODCALLTYPE *SetDirectory)(
-        IExecuteCommand* This,
+        IExecuteCommand *This,
         LPCWSTR pszDirectory);
 
     HRESULT (STDMETHODCALLTYPE *Execute)(
-        IExecuteCommand* This);
+        IExecuteCommand *This);
 
     END_INTERFACE
 } IExecuteCommandVtbl;
+
 interface IExecuteCommand {
     CONST_VTBL IExecuteCommandVtbl* lpVtbl;
 };
@@ -2445,61 +3062,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExecuteCommand_SetKeyState_Proxy(
-    IExecuteCommand* This,
-    DWORD grfKeyState);
-void __RPC_STUB IExecuteCommand_SetKeyState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExecuteCommand_SetParameters_Proxy(
-    IExecuteCommand* This,
-    LPCWSTR pszParameters);
-void __RPC_STUB IExecuteCommand_SetParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExecuteCommand_SetPosition_Proxy(
-    IExecuteCommand* This,
-    POINT pt);
-void __RPC_STUB IExecuteCommand_SetPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExecuteCommand_SetShowWindow_Proxy(
-    IExecuteCommand* This,
-    int nShow);
-void __RPC_STUB IExecuteCommand_SetShowWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExecuteCommand_SetNoShowUI_Proxy(
-    IExecuteCommand* This,
-    WINBOOL fNoShowUI);
-void __RPC_STUB IExecuteCommand_SetNoShowUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExecuteCommand_SetDirectory_Proxy(
-    IExecuteCommand* This,
-    LPCWSTR pszDirectory);
-void __RPC_STUB IExecuteCommand_SetDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExecuteCommand_Execute_Proxy(
-    IExecuteCommand* This);
-void __RPC_STUB IExecuteCommand_Execute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExecuteCommand_INTERFACE_DEFINED__ */
 
@@ -2528,28 +3090,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistFolder* This,
+        IPersistFolder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistFolder* This);
+        IPersistFolder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistFolder* This);
+        IPersistFolder *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistFolder* This,
+        IPersistFolder *This,
         CLSID *pClassID);
 
     /*** IPersistFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IPersistFolder* This,
+        IPersistFolder *This,
         PCIDLIST_ABSOLUTE pidl);
 
     END_INTERFACE
 } IPersistFolderVtbl;
+
 interface IPersistFolder {
     CONST_VTBL IPersistFolderVtbl* lpVtbl;
 };
@@ -2588,14 +3151,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistFolder_Initialize_Proxy(
-    IPersistFolder* This,
-    PCIDLIST_ABSOLUTE pidl);
-void __RPC_STUB IPersistFolder_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistFolder_INTERFACE_DEFINED__ */
 
@@ -2643,35 +3198,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRunnableTask* This,
+        IRunnableTask *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRunnableTask* This);
+        IRunnableTask *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRunnableTask* This);
+        IRunnableTask *This);
 
     /*** IRunnableTask methods ***/
     HRESULT (STDMETHODCALLTYPE *Run)(
-        IRunnableTask* This);
+        IRunnableTask *This);
 
     HRESULT (STDMETHODCALLTYPE *Kill)(
-        IRunnableTask* This,
+        IRunnableTask *This,
         WINBOOL bWait);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IRunnableTask* This);
+        IRunnableTask *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IRunnableTask* This);
+        IRunnableTask *This);
 
     ULONG (STDMETHODCALLTYPE *IsRunning)(
-        IRunnableTask* This);
+        IRunnableTask *This);
 
     END_INTERFACE
 } IRunnableTaskVtbl;
+
 interface IRunnableTask {
     CONST_VTBL IRunnableTaskVtbl* lpVtbl;
 };
@@ -2720,42 +3276,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IRunnableTask_Run_Proxy(
-    IRunnableTask* This);
-void __RPC_STUB IRunnableTask_Run_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRunnableTask_Kill_Proxy(
-    IRunnableTask* This,
-    WINBOOL bWait);
-void __RPC_STUB IRunnableTask_Kill_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRunnableTask_Suspend_Proxy(
-    IRunnableTask* This);
-void __RPC_STUB IRunnableTask_Suspend_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRunnableTask_Resume_Proxy(
-    IRunnableTask* This);
-void __RPC_STUB IRunnableTask_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-ULONG STDMETHODCALLTYPE IRunnableTask_IsRunning_Proxy(
-    IRunnableTask* This);
-void __RPC_STUB IRunnableTask_IsRunning_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IRunnableTask_INTERFACE_DEFINED__ */
 
@@ -2815,41 +3335,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellTaskScheduler* This,
+        IShellTaskScheduler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellTaskScheduler* This);
+        IShellTaskScheduler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellTaskScheduler* This);
+        IShellTaskScheduler *This);
 
     /*** IShellTaskScheduler methods ***/
     HRESULT (STDMETHODCALLTYPE *AddTask)(
-        IShellTaskScheduler* This,
+        IShellTaskScheduler *This,
         IRunnableTask *prt,
         REFTASKOWNERID rtoid,
         DWORD_PTR lParam,
         DWORD dwPriority);
 
     HRESULT (STDMETHODCALLTYPE *RemoveTasks)(
-        IShellTaskScheduler* This,
+        IShellTaskScheduler *This,
         REFTASKOWNERID rtoid,
         DWORD_PTR lParam,
         WINBOOL bWaitIfRunning);
 
     UINT (STDMETHODCALLTYPE *CountTasks)(
-        IShellTaskScheduler* This,
+        IShellTaskScheduler *This,
         REFTASKOWNERID rtoid);
 
     HRESULT (STDMETHODCALLTYPE *Status)(
-        IShellTaskScheduler* This,
+        IShellTaskScheduler *This,
         DWORD dwReleaseStatus,
         DWORD dwThreadTimeout);
 
     END_INTERFACE
 } IShellTaskSchedulerVtbl;
+
 interface IShellTaskScheduler {
     CONST_VTBL IShellTaskSchedulerVtbl* lpVtbl;
 };
@@ -2894,44 +3415,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellTaskScheduler_AddTask_Proxy(
-    IShellTaskScheduler* This,
-    IRunnableTask *prt,
-    REFTASKOWNERID rtoid,
-    DWORD_PTR lParam,
-    DWORD dwPriority);
-void __RPC_STUB IShellTaskScheduler_AddTask_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellTaskScheduler_RemoveTasks_Proxy(
-    IShellTaskScheduler* This,
-    REFTASKOWNERID rtoid,
-    DWORD_PTR lParam,
-    WINBOOL bWaitIfRunning);
-void __RPC_STUB IShellTaskScheduler_RemoveTasks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-UINT STDMETHODCALLTYPE IShellTaskScheduler_CountTasks_Proxy(
-    IShellTaskScheduler* This,
-    REFTASKOWNERID rtoid);
-void __RPC_STUB IShellTaskScheduler_CountTasks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellTaskScheduler_Status_Proxy(
-    IShellTaskScheduler* This,
-    DWORD dwReleaseStatus,
-    DWORD dwThreadTimeout);
-void __RPC_STUB IShellTaskScheduler_Status_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellTaskScheduler_INTERFACE_DEFINED__ */
 
@@ -2965,27 +3448,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IQueryCodePage* This,
+        IQueryCodePage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IQueryCodePage* This);
+        IQueryCodePage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IQueryCodePage* This);
+        IQueryCodePage *This);
 
     /*** IQueryCodePage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCodePage)(
-        IQueryCodePage* This,
+        IQueryCodePage *This,
         UINT *puiCodePage);
 
     HRESULT (STDMETHODCALLTYPE *SetCodePage)(
-        IQueryCodePage* This,
+        IQueryCodePage *This,
         UINT uiCodePage);
 
     END_INTERFACE
 } IQueryCodePageVtbl;
+
 interface IQueryCodePage {
     CONST_VTBL IQueryCodePageVtbl* lpVtbl;
 };
@@ -3022,22 +3506,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IQueryCodePage_GetCodePage_Proxy(
-    IQueryCodePage* This,
-    UINT *puiCodePage);
-void __RPC_STUB IQueryCodePage_GetCodePage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IQueryCodePage_SetCodePage_Proxy(
-    IQueryCodePage* This,
-    UINT uiCodePage);
-void __RPC_STUB IQueryCodePage_SetCodePage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IQueryCodePage_INTERFACE_DEFINED__ */
 
@@ -3066,33 +3534,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistFolder2* This,
+        IPersistFolder2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistFolder2* This);
+        IPersistFolder2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistFolder2* This);
+        IPersistFolder2 *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistFolder2* This,
+        IPersistFolder2 *This,
         CLSID *pClassID);
 
     /*** IPersistFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IPersistFolder2* This,
+        IPersistFolder2 *This,
         PCIDLIST_ABSOLUTE pidl);
 
     /*** IPersistFolder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCurFolder)(
-        IPersistFolder2* This,
+        IPersistFolder2 *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     END_INTERFACE
 } IPersistFolder2Vtbl;
+
 interface IPersistFolder2 {
     CONST_VTBL IPersistFolder2Vtbl* lpVtbl;
 };
@@ -3137,14 +3606,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistFolder2_GetCurFolder_Proxy(
-    IPersistFolder2* This,
-    PIDLIST_ABSOLUTE *ppidl);
-void __RPC_STUB IPersistFolder2_GetCurFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistFolder2_INTERFACE_DEFINED__ */
 
@@ -3190,44 +3651,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistFolder3* This,
+        IPersistFolder3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistFolder3* This);
+        IPersistFolder3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistFolder3* This);
+        IPersistFolder3 *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistFolder3* This,
+        IPersistFolder3 *This,
         CLSID *pClassID);
 
     /*** IPersistFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IPersistFolder3* This,
+        IPersistFolder3 *This,
         PCIDLIST_ABSOLUTE pidl);
 
     /*** IPersistFolder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCurFolder)(
-        IPersistFolder3* This,
+        IPersistFolder3 *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     /*** IPersistFolder3 methods ***/
     HRESULT (STDMETHODCALLTYPE *InitializeEx)(
-        IPersistFolder3* This,
+        IPersistFolder3 *This,
         IBindCtx *pbc,
         PCIDLIST_ABSOLUTE pidlRoot,
         const PERSIST_FOLDER_TARGET_INFO *ppfti);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderTargetInfo)(
-        IPersistFolder3* This,
+        IPersistFolder3 *This,
         PERSIST_FOLDER_TARGET_INFO *ppfti);
 
     END_INTERFACE
 } IPersistFolder3Vtbl;
+
 interface IPersistFolder3 {
     CONST_VTBL IPersistFolder3Vtbl* lpVtbl;
 };
@@ -3282,24 +3744,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistFolder3_InitializeEx_Proxy(
-    IPersistFolder3* This,
-    IBindCtx *pbc,
-    PCIDLIST_ABSOLUTE pidlRoot,
-    const PERSIST_FOLDER_TARGET_INFO *ppfti);
-void __RPC_STUB IPersistFolder3_InitializeEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistFolder3_GetFolderTargetInfo_Proxy(
-    IPersistFolder3* This,
-    PERSIST_FOLDER_TARGET_INFO *ppfti);
-void __RPC_STUB IPersistFolder3_GetFolderTargetInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistFolder3_INTERFACE_DEFINED__ */
 
@@ -3331,32 +3775,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistIDList* This,
+        IPersistIDList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistIDList* This);
+        IPersistIDList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistIDList* This);
+        IPersistIDList *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistIDList* This,
+        IPersistIDList *This,
         CLSID *pClassID);
 
     /*** IPersistIDList methods ***/
     HRESULT (STDMETHODCALLTYPE *SetIDList)(
-        IPersistIDList* This,
+        IPersistIDList *This,
         PCIDLIST_ABSOLUTE pidl);
 
     HRESULT (STDMETHODCALLTYPE *GetIDList)(
-        IPersistIDList* This,
+        IPersistIDList *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     END_INTERFACE
 } IPersistIDListVtbl;
+
 interface IPersistIDList {
     CONST_VTBL IPersistIDListVtbl* lpVtbl;
 };
@@ -3399,22 +3844,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistIDList_SetIDList_Proxy(
-    IPersistIDList* This,
-    PCIDLIST_ABSOLUTE pidl);
-void __RPC_STUB IPersistIDList_SetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistIDList_GetIDList_Proxy(
-    IPersistIDList* This,
-    PIDLIST_ABSOLUTE *ppidl);
-void __RPC_STUB IPersistIDList_GetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistIDList_INTERFACE_DEFINED__ */
 
@@ -3454,36 +3883,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumIDList* This,
+        IEnumIDList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumIDList* This);
+        IEnumIDList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumIDList* This);
+        IEnumIDList *This);
 
     /*** IEnumIDList methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumIDList* This,
+        IEnumIDList *This,
         ULONG celt,
         PITEMID_CHILD *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumIDList* This,
+        IEnumIDList *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumIDList* This);
+        IEnumIDList *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumIDList* This,
+        IEnumIDList *This,
         IEnumIDList **ppenum);
 
     END_INTERFACE
 } IEnumIDListVtbl;
+
 interface IEnumIDList {
     CONST_VTBL IEnumIDListVtbl* lpVtbl;
 };
@@ -3538,29 +3968,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumIDList_Skip_Proxy(
-    IEnumIDList* This,
-    ULONG celt);
-void __RPC_STUB IEnumIDList_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumIDList_Reset_Proxy(
-    IEnumIDList* This);
-void __RPC_STUB IEnumIDList_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumIDList_Clone_Proxy(
-    IEnumIDList* This,
-    IEnumIDList **ppenum);
-void __RPC_STUB IEnumIDList_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumIDList_Next_Proxy(
     IEnumIDList* This,
     ULONG celt,
@@ -3611,36 +4018,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumFullIDList* This,
+        IEnumFullIDList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumFullIDList* This);
+        IEnumFullIDList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumFullIDList* This);
+        IEnumFullIDList *This);
 
     /*** IEnumFullIDList methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumFullIDList* This,
+        IEnumFullIDList *This,
         ULONG celt,
         PIDLIST_ABSOLUTE *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumFullIDList* This,
+        IEnumFullIDList *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumFullIDList* This);
+        IEnumFullIDList *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumFullIDList* This,
+        IEnumFullIDList *This,
         IEnumFullIDList **ppenum);
 
     END_INTERFACE
 } IEnumFullIDListVtbl;
+
 interface IEnumFullIDList {
     CONST_VTBL IEnumFullIDListVtbl* lpVtbl;
 };
@@ -3695,29 +4103,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumFullIDList_Skip_Proxy(
-    IEnumFullIDList* This,
-    ULONG celt);
-void __RPC_STUB IEnumFullIDList_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumFullIDList_Reset_Proxy(
-    IEnumFullIDList* This);
-void __RPC_STUB IEnumFullIDList_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumFullIDList_Clone_Proxy(
-    IEnumFullIDList* This,
-    IEnumFullIDList **ppenum);
-void __RPC_STUB IEnumFullIDList_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumFullIDList_Next_Proxy(
     IEnumFullIDList* This,
     ULONG celt,
@@ -3740,7 +4125,6 @@
     SHGDN_FORPARSING = 0x8000
 };
 
-
 typedef DWORD SHGDNF;
 
 enum _SHCONTF {
@@ -3759,7 +4143,6 @@
     SHCONTF_INCLUDESUPERHIDDEN = 0x10000
 };
 
-
 typedef DWORD SHCONTF;
 
 #define SHCIDS_ALLFIELDS __MSABI_LONG(0x80000000)
@@ -3874,27 +4257,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithFolderEnumMode* This,
+        IObjectWithFolderEnumMode *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithFolderEnumMode* This);
+        IObjectWithFolderEnumMode *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithFolderEnumMode* This);
+        IObjectWithFolderEnumMode *This);
 
     /*** IObjectWithFolderEnumMode methods ***/
     HRESULT (STDMETHODCALLTYPE *SetMode)(
-        IObjectWithFolderEnumMode* This,
+        IObjectWithFolderEnumMode *This,
         FOLDER_ENUM_MODE feMode);
 
     HRESULT (STDMETHODCALLTYPE *GetMode)(
-        IObjectWithFolderEnumMode* This,
+        IObjectWithFolderEnumMode *This,
         FOLDER_ENUM_MODE *pfeMode);
 
     END_INTERFACE
 } IObjectWithFolderEnumModeVtbl;
+
 interface IObjectWithFolderEnumMode {
     CONST_VTBL IObjectWithFolderEnumModeVtbl* lpVtbl;
 };
@@ -3931,22 +4315,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithFolderEnumMode_SetMode_Proxy(
-    IObjectWithFolderEnumMode* This,
-    FOLDER_ENUM_MODE feMode);
-void __RPC_STUB IObjectWithFolderEnumMode_SetMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IObjectWithFolderEnumMode_GetMode_Proxy(
-    IObjectWithFolderEnumMode* This,
-    FOLDER_ENUM_MODE *pfeMode);
-void __RPC_STUB IObjectWithFolderEnumMode_GetMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithFolderEnumMode_INTERFACE_DEFINED__ */
 
@@ -3961,6 +4329,9 @@
 #ifndef __IShellItem_FWD_DEFINED__
 #define __IShellItem_FWD_DEFINED__
 typedef interface IShellItem IShellItem;
+#ifdef __cplusplus
+interface IShellItem;
+#endif /* __cplusplus */
 #endif
 
 
@@ -3992,28 +4363,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IParseAndCreateItem* This,
+        IParseAndCreateItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IParseAndCreateItem* This);
+        IParseAndCreateItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IParseAndCreateItem* This);
+        IParseAndCreateItem *This);
 
     /*** IParseAndCreateItem methods ***/
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IParseAndCreateItem* This,
+        IParseAndCreateItem *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IParseAndCreateItem* This,
+        IParseAndCreateItem *This,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IParseAndCreateItemVtbl;
+
 interface IParseAndCreateItem {
     CONST_VTBL IParseAndCreateItemVtbl* lpVtbl;
 };
@@ -4050,23 +4422,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IParseAndCreateItem_SetItem_Proxy(
-    IParseAndCreateItem* This,
-    IShellItem *psi);
-void __RPC_STUB IParseAndCreateItem_SetItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IParseAndCreateItem_GetItem_Proxy(
-    IParseAndCreateItem* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IParseAndCreateItem_GetItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IParseAndCreateItem_INTERFACE_DEFINED__ */
 
@@ -4077,6 +4432,9 @@
 #ifndef __IShellFolder_FWD_DEFINED__
 #define __IShellFolder_FWD_DEFINED__
 typedef interface IShellFolder IShellFolder;
+#ifdef __cplusplus
+interface IShellFolder;
+#endif /* __cplusplus */
 #endif
 
 
@@ -4161,19 +4519,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFolder* This,
+        IShellFolder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFolder* This);
+        IShellFolder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFolder* This);
+        IShellFolder *This);
 
     /*** IShellFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseDisplayName)(
-        IShellFolder* This,
+        IShellFolder *This,
         HWND hwnd,
         IBindCtx *pbc,
         LPWSTR pszDisplayName,
@@ -4182,45 +4540,45 @@
         ULONG *pdwAttributes);
 
     HRESULT (STDMETHODCALLTYPE *EnumObjects)(
-        IShellFolder* This,
+        IShellFolder *This,
         HWND hwnd,
         SHCONTF grfFlags,
         IEnumIDList **ppenumIDList);
 
     HRESULT (STDMETHODCALLTYPE *BindToObject)(
-        IShellFolder* This,
+        IShellFolder *This,
         PCUIDLIST_RELATIVE pidl,
         IBindCtx *pbc,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *BindToStorage)(
-        IShellFolder* This,
+        IShellFolder *This,
         PCUIDLIST_RELATIVE pidl,
         IBindCtx *pbc,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CompareIDs)(
-        IShellFolder* This,
+        IShellFolder *This,
         LPARAM lParam,
         PCUIDLIST_RELATIVE pidl1,
         PCUIDLIST_RELATIVE pidl2);
 
     HRESULT (STDMETHODCALLTYPE *CreateViewObject)(
-        IShellFolder* This,
+        IShellFolder *This,
         HWND hwndOwner,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetAttributesOf)(
-        IShellFolder* This,
+        IShellFolder *This,
         UINT cidl,
         PCUITEMID_CHILD_ARRAY apidl,
         SFGAOF *rgfInOut);
 
     HRESULT (STDMETHODCALLTYPE *GetUIObjectOf)(
-        IShellFolder* This,
+        IShellFolder *This,
         HWND hwndOwner,
         UINT cidl,
         PCUITEMID_CHILD_ARRAY apidl,
@@ -4229,13 +4587,13 @@
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayNameOf)(
-        IShellFolder* This,
+        IShellFolder *This,
         PCUITEMID_CHILD pidl,
         SHGDNF uFlags,
         STRRET *pName);
 
     HRESULT (STDMETHODCALLTYPE *SetNameOf)(
-        IShellFolder* This,
+        IShellFolder *This,
         HWND hwnd,
         PCUITEMID_CHILD pidl,
         LPCWSTR pszName,
@@ -4244,6 +4602,7 @@
 
     END_INTERFACE
 } IShellFolderVtbl;
+
 interface IShellFolder {
     CONST_VTBL IShellFolderVtbl* lpVtbl;
 };
@@ -4312,104 +4671,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellFolder_ParseDisplayName_Proxy(
-    IShellFolder* This,
-    HWND hwnd,
-    IBindCtx *pbc,
-    LPWSTR pszDisplayName,
-    ULONG *pchEaten,
-    PIDLIST_RELATIVE *ppidl,
-    ULONG *pdwAttributes);
-void __RPC_STUB IShellFolder_ParseDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_EnumObjects_Proxy(
-    IShellFolder* This,
-    HWND hwnd,
-    SHCONTF grfFlags,
-    IEnumIDList **ppenumIDList);
-void __RPC_STUB IShellFolder_EnumObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_BindToObject_Proxy(
-    IShellFolder* This,
-    PCUIDLIST_RELATIVE pidl,
-    IBindCtx *pbc,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellFolder_BindToObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_BindToStorage_Proxy(
-    IShellFolder* This,
-    PCUIDLIST_RELATIVE pidl,
-    IBindCtx *pbc,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellFolder_BindToStorage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_CompareIDs_Proxy(
-    IShellFolder* This,
-    LPARAM lParam,
-    PCUIDLIST_RELATIVE pidl1,
-    PCUIDLIST_RELATIVE pidl2);
-void __RPC_STUB IShellFolder_CompareIDs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_CreateViewObject_Proxy(
-    IShellFolder* This,
-    HWND hwndOwner,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellFolder_CreateViewObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_GetAttributesOf_Proxy(
-    IShellFolder* This,
-    UINT cidl,
-    PCUITEMID_CHILD_ARRAY apidl,
-    SFGAOF *rgfInOut);
-void __RPC_STUB IShellFolder_GetAttributesOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_GetUIObjectOf_Proxy(
-    IShellFolder* This,
-    HWND hwndOwner,
-    UINT cidl,
-    PCUITEMID_CHILD_ARRAY apidl,
-    REFIID riid,
-    UINT *rgfReserved,
-    void **ppv);
-void __RPC_STUB IShellFolder_GetUIObjectOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder_GetDisplayNameOf_Proxy(
-    IShellFolder* This,
-    PCUITEMID_CHILD pidl,
-    SHGDNF uFlags,
-    STRRET *pName);
-void __RPC_STUB IShellFolder_GetDisplayNameOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IShellFolder_RemoteSetNameOf_Proxy(
     IShellFolder* This,
     HWND hwnd,
@@ -4483,36 +4744,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumExtraSearch* This,
+        IEnumExtraSearch *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumExtraSearch* This);
+        IEnumExtraSearch *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumExtraSearch* This);
+        IEnumExtraSearch *This);
 
     /*** IEnumExtraSearch methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumExtraSearch* This,
+        IEnumExtraSearch *This,
         ULONG celt,
         EXTRASEARCH *rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumExtraSearch* This,
+        IEnumExtraSearch *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumExtraSearch* This);
+        IEnumExtraSearch *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumExtraSearch* This,
+        IEnumExtraSearch *This,
         IEnumExtraSearch **ppenum);
 
     END_INTERFACE
 } IEnumExtraSearchVtbl;
+
 interface IEnumExtraSearch {
     CONST_VTBL IEnumExtraSearchVtbl* lpVtbl;
 };
@@ -4557,39 +4819,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Next_Proxy(
-    IEnumExtraSearch* This,
-    ULONG celt,
-    EXTRASEARCH *rgelt,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumExtraSearch_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Skip_Proxy(
-    IEnumExtraSearch* This,
-    ULONG celt);
-void __RPC_STUB IEnumExtraSearch_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Reset_Proxy(
-    IEnumExtraSearch* This);
-void __RPC_STUB IEnumExtraSearch_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumExtraSearch_Clone_Proxy(
-    IEnumExtraSearch* This,
-    IEnumExtraSearch **ppenum);
-void __RPC_STUB IEnumExtraSearch_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumExtraSearch_INTERFACE_DEFINED__ */
 
@@ -4645,19 +4874,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellFolder2* This);
+        IShellFolder2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellFolder2* This);
+        IShellFolder2 *This);
 
     /*** IShellFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseDisplayName)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         HWND hwnd,
         IBindCtx *pbc,
         LPWSTR pszDisplayName,
@@ -4666,45 +4895,45 @@
         ULONG *pdwAttributes);
 
     HRESULT (STDMETHODCALLTYPE *EnumObjects)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         HWND hwnd,
         SHCONTF grfFlags,
         IEnumIDList **ppenumIDList);
 
     HRESULT (STDMETHODCALLTYPE *BindToObject)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         PCUIDLIST_RELATIVE pidl,
         IBindCtx *pbc,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *BindToStorage)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         PCUIDLIST_RELATIVE pidl,
         IBindCtx *pbc,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CompareIDs)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         LPARAM lParam,
         PCUIDLIST_RELATIVE pidl1,
         PCUIDLIST_RELATIVE pidl2);
 
     HRESULT (STDMETHODCALLTYPE *CreateViewObject)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         HWND hwndOwner,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetAttributesOf)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         UINT cidl,
         PCUITEMID_CHILD_ARRAY apidl,
         SFGAOF *rgfInOut);
 
     HRESULT (STDMETHODCALLTYPE *GetUIObjectOf)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         HWND hwndOwner,
         UINT cidl,
         PCUITEMID_CHILD_ARRAY apidl,
@@ -4713,13 +4942,13 @@
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayNameOf)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         PCUITEMID_CHILD pidl,
         SHGDNF uFlags,
         STRRET *pName);
 
     HRESULT (STDMETHODCALLTYPE *SetNameOf)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         HWND hwnd,
         PCUITEMID_CHILD pidl,
         LPCWSTR pszName,
@@ -4728,43 +4957,44 @@
 
     /*** IShellFolder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDefaultSearchGUID)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         GUID *pguid);
 
     HRESULT (STDMETHODCALLTYPE *EnumSearches)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         IEnumExtraSearch **ppenum);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColumn)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         DWORD dwRes,
         ULONG *pSort,
         ULONG *pDisplay);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColumnState)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         UINT iColumn,
         SHCOLSTATEF *pcsFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetDetailsEx)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         PCUITEMID_CHILD pidl,
         const SHCOLUMNID *pscid,
         VARIANT *pv);
 
     HRESULT (STDMETHODCALLTYPE *GetDetailsOf)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         PCUITEMID_CHILD pidl,
         UINT iColumn,
         SHELLDETAILS *psd);
 
     HRESULT (STDMETHODCALLTYPE *MapColumnToSCID)(
-        IShellFolder2* This,
+        IShellFolder2 *This,
         UINT iColumn,
         SHCOLUMNID *pscid);
 
     END_INTERFACE
 } IShellFolder2Vtbl;
+
 interface IShellFolder2 {
     CONST_VTBL IShellFolder2Vtbl* lpVtbl;
 };
@@ -4863,70 +5093,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellFolder2_GetDefaultSearchGUID_Proxy(
-    IShellFolder2* This,
-    GUID *pguid);
-void __RPC_STUB IShellFolder2_GetDefaultSearchGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder2_EnumSearches_Proxy(
-    IShellFolder2* This,
-    IEnumExtraSearch **ppenum);
-void __RPC_STUB IShellFolder2_EnumSearches_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder2_GetDefaultColumn_Proxy(
-    IShellFolder2* This,
-    DWORD dwRes,
-    ULONG *pSort,
-    ULONG *pDisplay);
-void __RPC_STUB IShellFolder2_GetDefaultColumn_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder2_GetDefaultColumnState_Proxy(
-    IShellFolder2* This,
-    UINT iColumn,
-    SHCOLSTATEF *pcsFlags);
-void __RPC_STUB IShellFolder2_GetDefaultColumnState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder2_GetDetailsEx_Proxy(
-    IShellFolder2* This,
-    PCUITEMID_CHILD pidl,
-    const SHCOLUMNID *pscid,
-    VARIANT *pv);
-void __RPC_STUB IShellFolder2_GetDetailsEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder2_GetDetailsOf_Proxy(
-    IShellFolder2* This,
-    PCUITEMID_CHILD pidl,
-    UINT iColumn,
-    SHELLDETAILS *psd);
-void __RPC_STUB IShellFolder2_GetDetailsOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellFolder2_MapColumnToSCID_Proxy(
-    IShellFolder2* This,
-    UINT iColumn,
-    SHCOLUMNID *pscid);
-void __RPC_STUB IShellFolder2_MapColumnToSCID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellFolder2_INTERFACE_DEFINED__ */
 
@@ -5045,28 +5211,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderViewOptions* This,
+        IFolderViewOptions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderViewOptions* This);
+        IFolderViewOptions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderViewOptions* This);
+        IFolderViewOptions *This);
 
     /*** IFolderViewOptions methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFolderViewOptions)(
-        IFolderViewOptions* This,
+        IFolderViewOptions *This,
         FOLDERVIEWOPTIONS fvoMask,
         FOLDERVIEWOPTIONS fvoFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderViewOptions)(
-        IFolderViewOptions* This,
+        IFolderViewOptions *This,
         FOLDERVIEWOPTIONS *pfvoFlags);
 
     END_INTERFACE
 } IFolderViewOptionsVtbl;
+
 interface IFolderViewOptions {
     CONST_VTBL IFolderViewOptionsVtbl* lpVtbl;
 };
@@ -5103,23 +5270,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderViewOptions_SetFolderViewOptions_Proxy(
-    IFolderViewOptions* This,
-    FOLDERVIEWOPTIONS fvoMask,
-    FOLDERVIEWOPTIONS fvoFlags);
-void __RPC_STUB IFolderViewOptions_SetFolderViewOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderViewOptions_GetFolderViewOptions_Proxy(
-    IFolderViewOptions* This,
-    FOLDERVIEWOPTIONS *pfvoFlags);
-void __RPC_STUB IFolderViewOptions_GetFolderViewOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderViewOptions_INTERFACE_DEFINED__ */
 
@@ -5177,6 +5327,9 @@
 #ifndef __IShellBrowser_FWD_DEFINED__
 #define __IShellBrowser_FWD_DEFINED__
 typedef interface IShellBrowser IShellBrowser;
+#ifdef __cplusplus
+interface IShellBrowser;
+#endif /* __cplusplus */
 #endif
 
 
@@ -5243,43 +5396,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellView* This,
+        IShellView *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellView* This);
+        IShellView *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellView* This);
+        IShellView *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IShellView* This,
+        IShellView *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IShellView* This,
+        IShellView *This,
         WINBOOL fEnterMode);
 
     /*** IShellView methods ***/
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IShellView* This,
+        IShellView *This,
         MSG *pmsg);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IShellView* This,
+        IShellView *This,
         WINBOOL fEnable);
 
     HRESULT (STDMETHODCALLTYPE *UIActivate)(
-        IShellView* This,
+        IShellView *This,
         UINT uState);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IShellView* This);
+        IShellView *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateViewWindow)(
-        IShellView* This,
+        IShellView *This,
         IShellView *psvPrevious,
         LPCFOLDERSETTINGS pfs,
         IShellBrowser *psb,
@@ -5287,34 +5440,35 @@
         HWND *phWnd);
 
     HRESULT (STDMETHODCALLTYPE *DestroyViewWindow)(
-        IShellView* This);
+        IShellView *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentInfo)(
-        IShellView* This,
+        IShellView *This,
         LPFOLDERSETTINGS pfs);
 
     HRESULT (STDMETHODCALLTYPE *AddPropertySheetPages)(
-        IShellView* This,
+        IShellView *This,
         DWORD dwReserved,
         LPFNSVADDPROPSHEETPAGE pfn,
         LPARAM lparam);
 
     HRESULT (STDMETHODCALLTYPE *SaveViewState)(
-        IShellView* This);
+        IShellView *This);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IShellView* This,
+        IShellView *This,
         PCUITEMID_CHILD pidlItem,
         SVSIF uFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetItemObject)(
-        IShellView* This,
+        IShellView *This,
         UINT uItem,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IShellViewVtbl;
+
 interface IShellView {
     CONST_VTBL IShellViewVtbl* lpVtbl;
 };
@@ -5397,90 +5551,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellView_TranslateAccelerator_Proxy(
-    IShellView* This,
-    MSG *pmsg);
-void __RPC_STUB IShellView_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_EnableModeless_Proxy(
-    IShellView* This,
-    WINBOOL fEnable);
-void __RPC_STUB IShellView_EnableModeless_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_UIActivate_Proxy(
-    IShellView* This,
-    UINT uState);
-void __RPC_STUB IShellView_UIActivate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_Refresh_Proxy(
-    IShellView* This);
-void __RPC_STUB IShellView_Refresh_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_CreateViewWindow_Proxy(
-    IShellView* This,
-    IShellView *psvPrevious,
-    LPCFOLDERSETTINGS pfs,
-    IShellBrowser *psb,
-    RECT *prcView,
-    HWND *phWnd);
-void __RPC_STUB IShellView_CreateViewWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_DestroyViewWindow_Proxy(
-    IShellView* This);
-void __RPC_STUB IShellView_DestroyViewWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_GetCurrentInfo_Proxy(
-    IShellView* This,
-    LPFOLDERSETTINGS pfs);
-void __RPC_STUB IShellView_GetCurrentInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_SaveViewState_Proxy(
-    IShellView* This);
-void __RPC_STUB IShellView_SaveViewState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_SelectItem_Proxy(
-    IShellView* This,
-    PCUITEMID_CHILD pidlItem,
-    SVSIF uFlags);
-void __RPC_STUB IShellView_SelectItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView_GetItemObject_Proxy(
-    IShellView* This,
-    UINT uItem,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellView_GetItemObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellView_INTERFACE_DEFINED__ */
 
@@ -5540,43 +5610,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellView2* This,
+        IShellView2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellView2* This);
+        IShellView2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellView2* This);
+        IShellView2 *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IShellView2* This,
+        IShellView2 *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IShellView2* This,
+        IShellView2 *This,
         WINBOOL fEnterMode);
 
     /*** IShellView methods ***/
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IShellView2* This,
+        IShellView2 *This,
         MSG *pmsg);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IShellView2* This,
+        IShellView2 *This,
         WINBOOL fEnable);
 
     HRESULT (STDMETHODCALLTYPE *UIActivate)(
-        IShellView2* This,
+        IShellView2 *This,
         UINT uState);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IShellView2* This);
+        IShellView2 *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateViewWindow)(
-        IShellView2* This,
+        IShellView2 *This,
         IShellView *psvPrevious,
         LPCFOLDERSETTINGS pfs,
         IShellBrowser *psb,
@@ -5584,54 +5654,55 @@
         HWND *phWnd);
 
     HRESULT (STDMETHODCALLTYPE *DestroyViewWindow)(
-        IShellView2* This);
+        IShellView2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentInfo)(
-        IShellView2* This,
+        IShellView2 *This,
         LPFOLDERSETTINGS pfs);
 
     HRESULT (STDMETHODCALLTYPE *AddPropertySheetPages)(
-        IShellView2* This,
+        IShellView2 *This,
         DWORD dwReserved,
         LPFNSVADDPROPSHEETPAGE pfn,
         LPARAM lparam);
 
     HRESULT (STDMETHODCALLTYPE *SaveViewState)(
-        IShellView2* This);
+        IShellView2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IShellView2* This,
+        IShellView2 *This,
         PCUITEMID_CHILD pidlItem,
         SVSIF uFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetItemObject)(
-        IShellView2* This,
+        IShellView2 *This,
         UINT uItem,
         REFIID riid,
         void **ppv);
 
     /*** IShellView2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetView)(
-        IShellView2* This,
+        IShellView2 *This,
         SHELLVIEWID *pvid,
         ULONG uView);
 
     HRESULT (STDMETHODCALLTYPE *CreateViewWindow2)(
-        IShellView2* This,
+        IShellView2 *This,
         LPSV2CVW2_PARAMS lpParams);
 
     HRESULT (STDMETHODCALLTYPE *HandleRename)(
-        IShellView2* This,
+        IShellView2 *This,
         PCUITEMID_CHILD pidlNew);
 
     HRESULT (STDMETHODCALLTYPE *SelectAndPositionItem)(
-        IShellView2* This,
+        IShellView2 *This,
         PCUITEMID_CHILD pidlItem,
         UINT uFlags,
         POINT *ppt);
 
     END_INTERFACE
 } IShellView2Vtbl;
+
 interface IShellView2 {
     CONST_VTBL IShellView2Vtbl* lpVtbl;
 };
@@ -5732,41 +5803,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellView2_GetView_Proxy(
-    IShellView2* This,
-    SHELLVIEWID *pvid,
-    ULONG uView);
-void __RPC_STUB IShellView2_GetView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView2_CreateViewWindow2_Proxy(
-    IShellView2* This,
-    LPSV2CVW2_PARAMS lpParams);
-void __RPC_STUB IShellView2_CreateViewWindow2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView2_HandleRename_Proxy(
-    IShellView2* This,
-    PCUITEMID_CHILD pidlNew);
-void __RPC_STUB IShellView2_HandleRename_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellView2_SelectAndPositionItem_Proxy(
-    IShellView2* This,
-    PCUITEMID_CHILD pidlItem,
-    UINT uFlags,
-    POINT *ppt);
-void __RPC_STUB IShellView2_SelectAndPositionItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellView2_INTERFACE_DEFINED__ */
 
@@ -5785,7 +5821,6 @@
     SV3CVW3_FORCEFOLDERFLAGS = 0x4
 };
 
-
 typedef DWORD SV3CVW3_FLAGS;
 
 DEFINE_GUID(IID_IShellView3, 0xec39fa88, 0xf8af, 0x41c5, 0x84,0x21, 0x38,0xbe,0xd2,0x8f,0x46,0x73);
@@ -5814,43 +5849,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellView3* This,
+        IShellView3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellView3* This);
+        IShellView3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellView3* This);
+        IShellView3 *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IShellView3* This,
+        IShellView3 *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IShellView3* This,
+        IShellView3 *This,
         WINBOOL fEnterMode);
 
     /*** IShellView methods ***/
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IShellView3* This,
+        IShellView3 *This,
         MSG *pmsg);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IShellView3* This,
+        IShellView3 *This,
         WINBOOL fEnable);
 
     HRESULT (STDMETHODCALLTYPE *UIActivate)(
-        IShellView3* This,
+        IShellView3 *This,
         UINT uState);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IShellView3* This);
+        IShellView3 *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateViewWindow)(
-        IShellView3* This,
+        IShellView3 *This,
         IShellView *psvPrevious,
         LPCFOLDERSETTINGS pfs,
         IShellBrowser *psb,
@@ -5858,55 +5893,55 @@
         HWND *phWnd);
 
     HRESULT (STDMETHODCALLTYPE *DestroyViewWindow)(
-        IShellView3* This);
+        IShellView3 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentInfo)(
-        IShellView3* This,
+        IShellView3 *This,
         LPFOLDERSETTINGS pfs);
 
     HRESULT (STDMETHODCALLTYPE *AddPropertySheetPages)(
-        IShellView3* This,
+        IShellView3 *This,
         DWORD dwReserved,
         LPFNSVADDPROPSHEETPAGE pfn,
         LPARAM lparam);
 
     HRESULT (STDMETHODCALLTYPE *SaveViewState)(
-        IShellView3* This);
+        IShellView3 *This);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IShellView3* This,
+        IShellView3 *This,
         PCUITEMID_CHILD pidlItem,
         SVSIF uFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetItemObject)(
-        IShellView3* This,
+        IShellView3 *This,
         UINT uItem,
         REFIID riid,
         void **ppv);
 
     /*** IShellView2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetView)(
-        IShellView3* This,
+        IShellView3 *This,
         SHELLVIEWID *pvid,
         ULONG uView);
 
     HRESULT (STDMETHODCALLTYPE *CreateViewWindow2)(
-        IShellView3* This,
+        IShellView3 *This,
         LPSV2CVW2_PARAMS lpParams);
 
     HRESULT (STDMETHODCALLTYPE *HandleRename)(
-        IShellView3* This,
+        IShellView3 *This,
         PCUITEMID_CHILD pidlNew);
 
     HRESULT (STDMETHODCALLTYPE *SelectAndPositionItem)(
-        IShellView3* This,
+        IShellView3 *This,
         PCUITEMID_CHILD pidlItem,
         UINT uFlags,
         POINT *ppt);
 
     /*** IShellView3 methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateViewWindow3)(
-        IShellView3* This,
+        IShellView3 *This,
         IShellBrowser *psbOwner,
         IShellView *psvPrev,
         SV3CVW3_FLAGS dwViewFlags,
@@ -5919,6 +5954,7 @@
 
     END_INTERFACE
 } IShellView3Vtbl;
+
 interface IShellView3 {
     CONST_VTBL IShellView3Vtbl* lpVtbl;
 };
@@ -6025,22 +6061,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellView3_CreateViewWindow3_Proxy(
-    IShellView3* This,
-    IShellBrowser *psbOwner,
-    IShellView *psvPrev,
-    SV3CVW3_FLAGS dwViewFlags,
-    FOLDERFLAGS dwMask,
-    FOLDERFLAGS dwFlags,
-    FOLDERVIEWMODE fvMode,
-    const SHELLVIEWID *pvid,
-    const RECT *prcView,
-    HWND *phwndView);
-void __RPC_STUB IShellView3_CreateViewWindow3_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellView3_INTERFACE_DEFINED__ */
 
@@ -6122,77 +6142,77 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderView* This,
+        IFolderView *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderView* This);
+        IFolderView *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderView* This);
+        IFolderView *This);
 
     /*** IFolderView methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCurrentViewMode)(
-        IFolderView* This,
+        IFolderView *This,
         UINT *pViewMode);
 
     HRESULT (STDMETHODCALLTYPE *SetCurrentViewMode)(
-        IFolderView* This,
+        IFolderView *This,
         UINT ViewMode);
 
     HRESULT (STDMETHODCALLTYPE *GetFolder)(
-        IFolderView* This,
+        IFolderView *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IFolderView* This,
+        IFolderView *This,
         int iItemIndex,
         PITEMID_CHILD *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *ItemCount)(
-        IFolderView* This,
+        IFolderView *This,
         UINT uFlags,
         int *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *Items)(
-        IFolderView* This,
+        IFolderView *This,
         UINT uFlags,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectionMarkedItem)(
-        IFolderView* This,
+        IFolderView *This,
         int *piItem);
 
     HRESULT (STDMETHODCALLTYPE *GetFocusedItem)(
-        IFolderView* This,
+        IFolderView *This,
         int *piItem);
 
     HRESULT (STDMETHODCALLTYPE *GetItemPosition)(
-        IFolderView* This,
+        IFolderView *This,
         PCUITEMID_CHILD pidl,
         POINT *ppt);
 
     HRESULT (STDMETHODCALLTYPE *GetSpacing)(
-        IFolderView* This,
+        IFolderView *This,
         POINT *ppt);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultSpacing)(
-        IFolderView* This,
+        IFolderView *This,
         POINT *ppt);
 
     HRESULT (STDMETHODCALLTYPE *GetAutoArrange)(
-        IFolderView* This);
+        IFolderView *This);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IFolderView* This,
+        IFolderView *This,
         int iItem,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SelectAndPositionItems)(
-        IFolderView* This,
+        IFolderView *This,
         UINT cidl,
         PCUITEMID_CHILD_ARRAY apidl,
         POINT *apt,
@@ -6200,6 +6220,7 @@
 
     END_INTERFACE
 } IFolderViewVtbl;
+
 interface IFolderView {
     CONST_VTBL IFolderViewVtbl* lpVtbl;
 };
@@ -6284,127 +6305,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderView_GetCurrentViewMode_Proxy(
-    IFolderView* This,
-    UINT *pViewMode);
-void __RPC_STUB IFolderView_GetCurrentViewMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_SetCurrentViewMode_Proxy(
-    IFolderView* This,
-    UINT ViewMode);
-void __RPC_STUB IFolderView_SetCurrentViewMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_GetFolder_Proxy(
-    IFolderView* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IFolderView_GetFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_Item_Proxy(
-    IFolderView* This,
-    int iItemIndex,
-    PITEMID_CHILD *ppidl);
-void __RPC_STUB IFolderView_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_ItemCount_Proxy(
-    IFolderView* This,
-    UINT uFlags,
-    int *pcItems);
-void __RPC_STUB IFolderView_ItemCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_Items_Proxy(
-    IFolderView* This,
-    UINT uFlags,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IFolderView_Items_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_GetSelectionMarkedItem_Proxy(
-    IFolderView* This,
-    int *piItem);
-void __RPC_STUB IFolderView_GetSelectionMarkedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_GetFocusedItem_Proxy(
-    IFolderView* This,
-    int *piItem);
-void __RPC_STUB IFolderView_GetFocusedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_GetItemPosition_Proxy(
-    IFolderView* This,
-    PCUITEMID_CHILD pidl,
-    POINT *ppt);
-void __RPC_STUB IFolderView_GetItemPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_GetSpacing_Proxy(
-    IFolderView* This,
-    POINT *ppt);
-void __RPC_STUB IFolderView_GetSpacing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_GetDefaultSpacing_Proxy(
-    IFolderView* This,
-    POINT *ppt);
-void __RPC_STUB IFolderView_GetDefaultSpacing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_GetAutoArrange_Proxy(
-    IFolderView* This);
-void __RPC_STUB IFolderView_GetAutoArrange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_SelectItem_Proxy(
-    IFolderView* This,
-    int iItem,
-    DWORD dwFlags);
-void __RPC_STUB IFolderView_SelectItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView_SelectAndPositionItems_Proxy(
-    IFolderView* This,
-    UINT cidl,
-    PCUITEMID_CHILD_ARRAY apidl,
-    POINT *apt,
-    DWORD dwFlags);
-void __RPC_STUB IFolderView_SelectAndPositionItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderView_INTERFACE_DEFINED__ */
 
@@ -6440,28 +6340,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearchBoxInfo* This,
+        ISearchBoxInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearchBoxInfo* This);
+        ISearchBoxInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearchBoxInfo* This);
+        ISearchBoxInfo *This);
 
     /*** ISearchBoxInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCondition)(
-        ISearchBoxInfo* This,
+        ISearchBoxInfo *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ISearchBoxInfo* This,
+        ISearchBoxInfo *This,
         LPWSTR *ppsz);
 
     END_INTERFACE
 } ISearchBoxInfoVtbl;
+
 interface ISearchBoxInfo {
     CONST_VTBL ISearchBoxInfoVtbl* lpVtbl;
 };
@@ -6498,23 +6399,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearchBoxInfo_GetCondition_Proxy(
-    ISearchBoxInfo* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ISearchBoxInfo_GetCondition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchBoxInfo_GetText_Proxy(
-    ISearchBoxInfo* This,
-    LPWSTR *ppsz);
-void __RPC_STUB ISearchBoxInfo_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearchBoxInfo_INTERFACE_DEFINED__ */
 
@@ -6526,7 +6410,6 @@
     SORT_DESCENDING = -1,
     SORT_ASCENDING = 1
 };
-
 #endif
 
 typedef int SORTDIRECTION;
@@ -6543,6 +6426,9 @@
 #ifndef __IShellItemArray_FWD_DEFINED__
 #define __IShellItemArray_FWD_DEFINED__
 typedef interface IShellItemArray IShellItemArray;
+#ifdef __cplusplus
+interface IShellItemArray;
+#endif /* __cplusplus */
 #endif
 
 
@@ -6669,77 +6555,77 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderView2* This,
+        IFolderView2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderView2* This);
+        IFolderView2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderView2* This);
+        IFolderView2 *This);
 
     /*** IFolderView methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCurrentViewMode)(
-        IFolderView2* This,
+        IFolderView2 *This,
         UINT *pViewMode);
 
     HRESULT (STDMETHODCALLTYPE *SetCurrentViewMode)(
-        IFolderView2* This,
+        IFolderView2 *This,
         UINT ViewMode);
 
     HRESULT (STDMETHODCALLTYPE *GetFolder)(
-        IFolderView2* This,
+        IFolderView2 *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int iItemIndex,
         PITEMID_CHILD *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *ItemCount)(
-        IFolderView2* This,
+        IFolderView2 *This,
         UINT uFlags,
         int *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *Items)(
-        IFolderView2* This,
+        IFolderView2 *This,
         UINT uFlags,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectionMarkedItem)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int *piItem);
 
     HRESULT (STDMETHODCALLTYPE *GetFocusedItem)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int *piItem);
 
     HRESULT (STDMETHODCALLTYPE *GetItemPosition)(
-        IFolderView2* This,
+        IFolderView2 *This,
         PCUITEMID_CHILD pidl,
         POINT *ppt);
 
     HRESULT (STDMETHODCALLTYPE *GetSpacing)(
-        IFolderView2* This,
+        IFolderView2 *This,
         POINT *ppt);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultSpacing)(
-        IFolderView2* This,
+        IFolderView2 *This,
         POINT *ppt);
 
     HRESULT (STDMETHODCALLTYPE *GetAutoArrange)(
-        IFolderView2* This);
+        IFolderView2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SelectItem)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int iItem,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SelectAndPositionItems)(
-        IFolderView2* This,
+        IFolderView2 *This,
         UINT cidl,
         PCUITEMID_CHILD_ARRAY apidl,
         POINT *apt,
@@ -6747,126 +6633,127 @@
 
     /*** IFolderView2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetGroupBy)(
-        IFolderView2* This,
+        IFolderView2 *This,
         REFPROPERTYKEY key,
         WINBOOL fAscending);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupBy)(
-        IFolderView2* This,
+        IFolderView2 *This,
         PROPERTYKEY *pkey,
         WINBOOL *pfAscending);
 
     HRESULT (STDMETHODCALLTYPE *SetViewProperty)(
-        IFolderView2* This,
+        IFolderView2 *This,
         PCUITEMID_CHILD pidl,
         REFPROPERTYKEY propkey,
         REFPROPVARIANT propvar);
 
     HRESULT (STDMETHODCALLTYPE *GetViewProperty)(
-        IFolderView2* This,
+        IFolderView2 *This,
         PCUITEMID_CHILD pidl,
         REFPROPERTYKEY propkey,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *SetTileViewProperties)(
-        IFolderView2* This,
+        IFolderView2 *This,
         PCUITEMID_CHILD pidl,
         LPCWSTR pszPropList);
 
     HRESULT (STDMETHODCALLTYPE *SetExtendedTileViewProperties)(
-        IFolderView2* This,
+        IFolderView2 *This,
         PCUITEMID_CHILD pidl,
         LPCWSTR pszPropList);
 
     HRESULT (STDMETHODCALLTYPE *SetText)(
-        IFolderView2* This,
+        IFolderView2 *This,
         FVTEXTTYPE iType,
         LPCWSTR pwszText);
 
     HRESULT (STDMETHODCALLTYPE *SetCurrentFolderFlags)(
-        IFolderView2* This,
+        IFolderView2 *This,
         DWORD dwMask,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentFolderFlags)(
-        IFolderView2* This,
+        IFolderView2 *This,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSortColumnCount)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int *pcColumns);
 
     HRESULT (STDMETHODCALLTYPE *SetSortColumns)(
-        IFolderView2* This,
+        IFolderView2 *This,
         const SORTCOLUMN *rgSortColumns,
         int cColumns);
 
     HRESULT (STDMETHODCALLTYPE *GetSortColumns)(
-        IFolderView2* This,
+        IFolderView2 *This,
         SORTCOLUMN *rgSortColumns,
         int cColumns);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int iItem,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetVisibleItem)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int iStart,
         WINBOOL fPrevious,
         int *piItem);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectedItem)(
-        IFolderView2* This,
+        IFolderView2 *This,
         int iStart,
         int *piItem);
 
     HRESULT (STDMETHODCALLTYPE *GetSelection)(
-        IFolderView2* This,
+        IFolderView2 *This,
         WINBOOL fNoneImpliesFolder,
         IShellItemArray **ppsia);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectionState)(
-        IFolderView2* This,
+        IFolderView2 *This,
         PCUITEMID_CHILD pidl,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *InvokeVerbOnSelection)(
-        IFolderView2* This,
+        IFolderView2 *This,
         LPCSTR pszVerb);
 
     HRESULT (STDMETHODCALLTYPE *SetViewModeAndIconSize)(
-        IFolderView2* This,
+        IFolderView2 *This,
         FOLDERVIEWMODE uViewMode,
         int iImageSize);
 
     HRESULT (STDMETHODCALLTYPE *GetViewModeAndIconSize)(
-        IFolderView2* This,
+        IFolderView2 *This,
         FOLDERVIEWMODE *puViewMode,
         int *piImageSize);
 
     HRESULT (STDMETHODCALLTYPE *SetGroupSubsetCount)(
-        IFolderView2* This,
+        IFolderView2 *This,
         UINT cVisibleRows);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupSubsetCount)(
-        IFolderView2* This,
+        IFolderView2 *This,
         UINT *pcVisibleRows);
 
     HRESULT (STDMETHODCALLTYPE *SetRedraw)(
-        IFolderView2* This,
+        IFolderView2 *This,
         WINBOOL fRedrawOn);
 
     HRESULT (STDMETHODCALLTYPE *IsMoveInSameFolder)(
-        IFolderView2* This);
+        IFolderView2 *This);
 
     HRESULT (STDMETHODCALLTYPE *DoRename)(
-        IFolderView2* This);
+        IFolderView2 *This);
 
     END_INTERFACE
 } IFolderView2Vtbl;
+
 interface IFolderView2 {
     CONST_VTBL IFolderView2Vtbl* lpVtbl;
 };
@@ -7053,15 +6940,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderView2_SetGroupBy_Proxy(
-    IFolderView2* This,
-    REFPROPERTYKEY key,
-    WINBOOL fAscending);
-void __RPC_STUB IFolderView2_SetGroupBy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IFolderView2_RemoteGetGroupBy_Proxy(
     IFolderView2* This,
     PROPERTYKEY *pkey,
@@ -7071,207 +6949,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetViewProperty_Proxy(
-    IFolderView2* This,
-    PCUITEMID_CHILD pidl,
-    REFPROPERTYKEY propkey,
-    REFPROPVARIANT propvar);
-void __RPC_STUB IFolderView2_SetViewProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetViewProperty_Proxy(
-    IFolderView2* This,
-    PCUITEMID_CHILD pidl,
-    REFPROPERTYKEY propkey,
-    PROPVARIANT *ppropvar);
-void __RPC_STUB IFolderView2_GetViewProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetTileViewProperties_Proxy(
-    IFolderView2* This,
-    PCUITEMID_CHILD pidl,
-    LPCWSTR pszPropList);
-void __RPC_STUB IFolderView2_SetTileViewProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetExtendedTileViewProperties_Proxy(
-    IFolderView2* This,
-    PCUITEMID_CHILD pidl,
-    LPCWSTR pszPropList);
-void __RPC_STUB IFolderView2_SetExtendedTileViewProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetText_Proxy(
-    IFolderView2* This,
-    FVTEXTTYPE iType,
-    LPCWSTR pwszText);
-void __RPC_STUB IFolderView2_SetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetCurrentFolderFlags_Proxy(
-    IFolderView2* This,
-    DWORD dwMask,
-    DWORD dwFlags);
-void __RPC_STUB IFolderView2_SetCurrentFolderFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetCurrentFolderFlags_Proxy(
-    IFolderView2* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IFolderView2_GetCurrentFolderFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetSortColumnCount_Proxy(
-    IFolderView2* This,
-    int *pcColumns);
-void __RPC_STUB IFolderView2_GetSortColumnCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetSortColumns_Proxy(
-    IFolderView2* This,
-    const SORTCOLUMN *rgSortColumns,
-    int cColumns);
-void __RPC_STUB IFolderView2_SetSortColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetSortColumns_Proxy(
-    IFolderView2* This,
-    SORTCOLUMN *rgSortColumns,
-    int cColumns);
-void __RPC_STUB IFolderView2_GetSortColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetItem_Proxy(
-    IFolderView2* This,
-    int iItem,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IFolderView2_GetItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetVisibleItem_Proxy(
-    IFolderView2* This,
-    int iStart,
-    WINBOOL fPrevious,
-    int *piItem);
-void __RPC_STUB IFolderView2_GetVisibleItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetSelectedItem_Proxy(
-    IFolderView2* This,
-    int iStart,
-    int *piItem);
-void __RPC_STUB IFolderView2_GetSelectedItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetSelection_Proxy(
-    IFolderView2* This,
-    WINBOOL fNoneImpliesFolder,
-    IShellItemArray **ppsia);
-void __RPC_STUB IFolderView2_GetSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetSelectionState_Proxy(
-    IFolderView2* This,
-    PCUITEMID_CHILD pidl,
-    DWORD *pdwFlags);
-void __RPC_STUB IFolderView2_GetSelectionState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_InvokeVerbOnSelection_Proxy(
-    IFolderView2* This,
-    LPCSTR pszVerb);
-void __RPC_STUB IFolderView2_InvokeVerbOnSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetViewModeAndIconSize_Proxy(
-    IFolderView2* This,
-    FOLDERVIEWMODE uViewMode,
-    int iImageSize);
-void __RPC_STUB IFolderView2_SetViewModeAndIconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetViewModeAndIconSize_Proxy(
-    IFolderView2* This,
-    FOLDERVIEWMODE *puViewMode,
-    int *piImageSize);
-void __RPC_STUB IFolderView2_GetViewModeAndIconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetGroupSubsetCount_Proxy(
-    IFolderView2* This,
-    UINT cVisibleRows);
-void __RPC_STUB IFolderView2_SetGroupSubsetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_GetGroupSubsetCount_Proxy(
-    IFolderView2* This,
-    UINT *pcVisibleRows);
-void __RPC_STUB IFolderView2_GetGroupSubsetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_SetRedraw_Proxy(
-    IFolderView2* This,
-    WINBOOL fRedrawOn);
-void __RPC_STUB IFolderView2_SetRedraw_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_IsMoveInSameFolder_Proxy(
-    IFolderView2* This);
-void __RPC_STUB IFolderView2_IsMoveInSameFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderView2_DoRename_Proxy(
-    IFolderView2* This);
-void __RPC_STUB IFolderView2_DoRename_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IFolderView2_GetGroupBy_Proxy(
     IFolderView2* This,
     PROPERTYKEY *pkey,
@@ -7332,52 +7009,53 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderViewSettings* This);
+        IFolderViewSettings *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderViewSettings* This);
+        IFolderViewSettings *This);
 
     /*** IFolderViewSettings methods ***/
     HRESULT (STDMETHODCALLTYPE *GetColumnPropertyList)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupByProperty)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         PROPERTYKEY *pkey,
         WINBOOL *pfGroupAscending);
 
     HRESULT (STDMETHODCALLTYPE *GetViewMode)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         FOLDERLOGICALVIEWMODE *plvm);
 
     HRESULT (STDMETHODCALLTYPE *GetIconSize)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         UINT *puIconSize);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderFlags)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         FOLDERFLAGS *pfolderMask,
         FOLDERFLAGS *pfolderFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSortColumns)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         SORTCOLUMN *rgSortColumns,
         UINT cColumnsIn,
         UINT *pcColumnsOut);
 
     HRESULT (STDMETHODCALLTYPE *GetGroupSubsetCount)(
-        IFolderViewSettings* This,
+        IFolderViewSettings *This,
         UINT *pcVisibleRows);
 
     END_INTERFACE
 } IFolderViewSettingsVtbl;
+
 interface IFolderViewSettings {
     CONST_VTBL IFolderViewSettingsVtbl* lpVtbl;
 };
@@ -7434,67 +7112,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetColumnPropertyList_Proxy(
-    IFolderViewSettings* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IFolderViewSettings_GetColumnPropertyList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetGroupByProperty_Proxy(
-    IFolderViewSettings* This,
-    PROPERTYKEY *pkey,
-    WINBOOL *pfGroupAscending);
-void __RPC_STUB IFolderViewSettings_GetGroupByProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetViewMode_Proxy(
-    IFolderViewSettings* This,
-    FOLDERLOGICALVIEWMODE *plvm);
-void __RPC_STUB IFolderViewSettings_GetViewMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetIconSize_Proxy(
-    IFolderViewSettings* This,
-    UINT *puIconSize);
-void __RPC_STUB IFolderViewSettings_GetIconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetFolderFlags_Proxy(
-    IFolderViewSettings* This,
-    FOLDERFLAGS *pfolderMask,
-    FOLDERFLAGS *pfolderFlags);
-void __RPC_STUB IFolderViewSettings_GetFolderFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetSortColumns_Proxy(
-    IFolderViewSettings* This,
-    SORTCOLUMN *rgSortColumns,
-    UINT cColumnsIn,
-    UINT *pcColumnsOut);
-void __RPC_STUB IFolderViewSettings_GetSortColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderViewSettings_GetGroupSubsetCount_Proxy(
-    IFolderViewSettings* This,
-    UINT *pcVisibleRows);
-void __RPC_STUB IFolderViewSettings_GetGroupSubsetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderViewSettings_INTERFACE_DEFINED__ */
 
@@ -7532,31 +7149,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPreviewHandlerVisuals* This,
+        IPreviewHandlerVisuals *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPreviewHandlerVisuals* This);
+        IPreviewHandlerVisuals *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPreviewHandlerVisuals* This);
+        IPreviewHandlerVisuals *This);
 
     /*** IPreviewHandlerVisuals methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBackgroundColor)(
-        IPreviewHandlerVisuals* This,
+        IPreviewHandlerVisuals *This,
         COLORREF color);
 
     HRESULT (STDMETHODCALLTYPE *SetFont)(
-        IPreviewHandlerVisuals* This,
+        IPreviewHandlerVisuals *This,
         const LOGFONTW *plf);
 
     HRESULT (STDMETHODCALLTYPE *SetTextColor)(
-        IPreviewHandlerVisuals* This,
+        IPreviewHandlerVisuals *This,
         COLORREF color);
 
     END_INTERFACE
 } IPreviewHandlerVisualsVtbl;
+
 interface IPreviewHandlerVisuals {
     CONST_VTBL IPreviewHandlerVisualsVtbl* lpVtbl;
 };
@@ -7597,30 +7215,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPreviewHandlerVisuals_SetBackgroundColor_Proxy(
-    IPreviewHandlerVisuals* This,
-    COLORREF color);
-void __RPC_STUB IPreviewHandlerVisuals_SetBackgroundColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandlerVisuals_SetFont_Proxy(
-    IPreviewHandlerVisuals* This,
-    const LOGFONTW *plf);
-void __RPC_STUB IPreviewHandlerVisuals_SetFont_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandlerVisuals_SetTextColor_Proxy(
-    IPreviewHandlerVisuals* This,
-    COLORREF color);
-void __RPC_STUB IPreviewHandlerVisuals_SetTextColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPreviewHandlerVisuals_INTERFACE_DEFINED__ */
 
@@ -7690,56 +7284,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IVisualProperties* This);
+        IVisualProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IVisualProperties* This);
+        IVisualProperties *This);
 
     /*** IVisualProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *SetWatermark)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         HBITMAP hbmp,
         VPWATERMARKFLAGS vpwf);
 
     HRESULT (STDMETHODCALLTYPE *SetColor)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         VPCOLORFLAGS vpcf,
         COLORREF cr);
 
     HRESULT (STDMETHODCALLTYPE *GetColor)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         VPCOLORFLAGS vpcf,
         COLORREF *pcr);
 
     HRESULT (STDMETHODCALLTYPE *SetItemHeight)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         int cyItemInPixels);
 
     HRESULT (STDMETHODCALLTYPE *GetItemHeight)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         int *cyItemInPixels);
 
     HRESULT (STDMETHODCALLTYPE *SetFont)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         const LOGFONTW *plf,
         WINBOOL bRedraw);
 
     HRESULT (STDMETHODCALLTYPE *GetFont)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         LOGFONTW *plf);
 
     HRESULT (STDMETHODCALLTYPE *SetTheme)(
-        IVisualProperties* This,
+        IVisualProperties *This,
         LPCWSTR pszSubAppName,
         LPCWSTR pszSubIdList);
 
     END_INTERFACE
 } IVisualPropertiesVtbl;
+
 interface IVisualProperties {
     CONST_VTBL IVisualPropertiesVtbl* lpVtbl;
 };
@@ -7800,75 +7395,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IVisualProperties_SetWatermark_Proxy(
-    IVisualProperties* This,
-    HBITMAP hbmp,
-    VPWATERMARKFLAGS vpwf);
-void __RPC_STUB IVisualProperties_SetWatermark_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IVisualProperties_SetColor_Proxy(
-    IVisualProperties* This,
-    VPCOLORFLAGS vpcf,
-    COLORREF cr);
-void __RPC_STUB IVisualProperties_SetColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IVisualProperties_GetColor_Proxy(
-    IVisualProperties* This,
-    VPCOLORFLAGS vpcf,
-    COLORREF *pcr);
-void __RPC_STUB IVisualProperties_GetColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IVisualProperties_SetItemHeight_Proxy(
-    IVisualProperties* This,
-    int cyItemInPixels);
-void __RPC_STUB IVisualProperties_SetItemHeight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IVisualProperties_GetItemHeight_Proxy(
-    IVisualProperties* This,
-    int *cyItemInPixels);
-void __RPC_STUB IVisualProperties_GetItemHeight_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IVisualProperties_SetFont_Proxy(
-    IVisualProperties* This,
-    const LOGFONTW *plf,
-    WINBOOL bRedraw);
-void __RPC_STUB IVisualProperties_SetFont_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IVisualProperties_GetFont_Proxy(
-    IVisualProperties* This,
-    LOGFONTW *plf);
-void __RPC_STUB IVisualProperties_GetFont_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IVisualProperties_SetTheme_Proxy(
-    IVisualProperties* This,
-    LPCWSTR pszSubAppName,
-    LPCWSTR pszSubIdList);
-void __RPC_STUB IVisualProperties_SetTheme_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IVisualProperties_INTERFACE_DEFINED__ */
 
@@ -7912,33 +7438,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICommDlgBrowser* This,
+        ICommDlgBrowser *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICommDlgBrowser* This);
+        ICommDlgBrowser *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICommDlgBrowser* This);
+        ICommDlgBrowser *This);
 
     /*** ICommDlgBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *OnDefaultCommand)(
-        ICommDlgBrowser* This,
+        ICommDlgBrowser *This,
         IShellView *ppshv);
 
     HRESULT (STDMETHODCALLTYPE *OnStateChange)(
-        ICommDlgBrowser* This,
+        ICommDlgBrowser *This,
         IShellView *ppshv,
         ULONG uChange);
 
     HRESULT (STDMETHODCALLTYPE *IncludeObject)(
-        ICommDlgBrowser* This,
+        ICommDlgBrowser *This,
         IShellView *ppshv,
         PCUITEMID_CHILD pidl);
 
     END_INTERFACE
 } ICommDlgBrowserVtbl;
+
 interface ICommDlgBrowser {
     CONST_VTBL ICommDlgBrowserVtbl* lpVtbl;
 };
@@ -7979,32 +7506,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser_OnDefaultCommand_Proxy(
-    ICommDlgBrowser* This,
-    IShellView *ppshv);
-void __RPC_STUB ICommDlgBrowser_OnDefaultCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser_OnStateChange_Proxy(
-    ICommDlgBrowser* This,
-    IShellView *ppshv,
-    ULONG uChange);
-void __RPC_STUB ICommDlgBrowser_OnStateChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser_IncludeObject_Proxy(
-    ICommDlgBrowser* This,
-    IShellView *ppshv,
-    PCUITEMID_CHILD pidl);
-void __RPC_STUB ICommDlgBrowser_IncludeObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICommDlgBrowser_INTERFACE_DEFINED__ */
 
@@ -8058,49 +7559,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICommDlgBrowser2* This,
+        ICommDlgBrowser2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICommDlgBrowser2* This);
+        ICommDlgBrowser2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICommDlgBrowser2* This);
+        ICommDlgBrowser2 *This);
 
     /*** ICommDlgBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *OnDefaultCommand)(
-        ICommDlgBrowser2* This,
+        ICommDlgBrowser2 *This,
         IShellView *ppshv);
 
     HRESULT (STDMETHODCALLTYPE *OnStateChange)(
-        ICommDlgBrowser2* This,
+        ICommDlgBrowser2 *This,
         IShellView *ppshv,
         ULONG uChange);
 
     HRESULT (STDMETHODCALLTYPE *IncludeObject)(
-        ICommDlgBrowser2* This,
+        ICommDlgBrowser2 *This,
         IShellView *ppshv,
         PCUITEMID_CHILD pidl);
 
     /*** ICommDlgBrowser2 methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ICommDlgBrowser2* This,
+        ICommDlgBrowser2 *This,
         IShellView *ppshv,
         DWORD dwNotifyType);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultMenuText)(
-        ICommDlgBrowser2* This,
+        ICommDlgBrowser2 *This,
         IShellView *ppshv,
         LPWSTR pszText,
         int cchMax);
 
     HRESULT (STDMETHODCALLTYPE *GetViewFlags)(
-        ICommDlgBrowser2* This,
+        ICommDlgBrowser2 *This,
         DWORD *pdwFlags);
 
     END_INTERFACE
 } ICommDlgBrowser2Vtbl;
+
 interface ICommDlgBrowser2 {
     CONST_VTBL ICommDlgBrowser2Vtbl* lpVtbl;
 };
@@ -8155,33 +7657,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser2_Notify_Proxy(
-    ICommDlgBrowser2* This,
-    IShellView *ppshv,
-    DWORD dwNotifyType);
-void __RPC_STUB ICommDlgBrowser2_Notify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser2_GetDefaultMenuText_Proxy(
-    ICommDlgBrowser2* This,
-    IShellView *ppshv,
-    LPWSTR pszText,
-    int cchMax);
-void __RPC_STUB ICommDlgBrowser2_GetDefaultMenuText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser2_GetViewFlags_Proxy(
-    ICommDlgBrowser2* This,
-    DWORD *pdwFlags);
-void __RPC_STUB ICommDlgBrowser2_GetViewFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICommDlgBrowser2_INTERFACE_DEFINED__ */
 
@@ -8220,64 +7695,65 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICommDlgBrowser3* This);
+        ICommDlgBrowser3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICommDlgBrowser3* This);
+        ICommDlgBrowser3 *This);
 
     /*** ICommDlgBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *OnDefaultCommand)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         IShellView *ppshv);
 
     HRESULT (STDMETHODCALLTYPE *OnStateChange)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         IShellView *ppshv,
         ULONG uChange);
 
     HRESULT (STDMETHODCALLTYPE *IncludeObject)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         IShellView *ppshv,
         PCUITEMID_CHILD pidl);
 
     /*** ICommDlgBrowser2 methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         IShellView *ppshv,
         DWORD dwNotifyType);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultMenuText)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         IShellView *ppshv,
         LPWSTR pszText,
         int cchMax);
 
     HRESULT (STDMETHODCALLTYPE *GetViewFlags)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         DWORD *pdwFlags);
 
     /*** ICommDlgBrowser3 methods ***/
     HRESULT (STDMETHODCALLTYPE *OnColumnClicked)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         IShellView *ppshv,
         int iColumn);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentFilter)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         LPWSTR pszFileSpec,
         int cchFileSpec);
 
     HRESULT (STDMETHODCALLTYPE *OnPreViewCreated)(
-        ICommDlgBrowser3* This,
+        ICommDlgBrowser3 *This,
         IShellView *ppshv);
 
     END_INTERFACE
 } ICommDlgBrowser3Vtbl;
+
 interface ICommDlgBrowser3 {
     CONST_VTBL ICommDlgBrowser3Vtbl* lpVtbl;
 };
@@ -8346,32 +7822,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser3_OnColumnClicked_Proxy(
-    ICommDlgBrowser3* This,
-    IShellView *ppshv,
-    int iColumn);
-void __RPC_STUB ICommDlgBrowser3_OnColumnClicked_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser3_GetCurrentFilter_Proxy(
-    ICommDlgBrowser3* This,
-    LPWSTR pszFileSpec,
-    int cchFileSpec);
-void __RPC_STUB ICommDlgBrowser3_GetCurrentFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICommDlgBrowser3_OnPreViewCreated_Proxy(
-    ICommDlgBrowser3* This,
-    IShellView *ppshv);
-void __RPC_STUB ICommDlgBrowser3_OnPreViewCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICommDlgBrowser3_INTERFACE_DEFINED__ */
 
@@ -8460,45 +7910,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IColumnManager* This,
+        IColumnManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IColumnManager* This);
+        IColumnManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IColumnManager* This);
+        IColumnManager *This);
 
     /*** IColumnManager methods ***/
     HRESULT (STDMETHODCALLTYPE *SetColumnInfo)(
-        IColumnManager* This,
+        IColumnManager *This,
         REFPROPERTYKEY propkey,
         const CM_COLUMNINFO *pcmci);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnInfo)(
-        IColumnManager* This,
+        IColumnManager *This,
         REFPROPERTYKEY propkey,
         CM_COLUMNINFO *pcmci);
 
     HRESULT (STDMETHODCALLTYPE *GetColumnCount)(
-        IColumnManager* This,
+        IColumnManager *This,
         CM_ENUM_FLAGS dwFlags,
         UINT *puCount);
 
     HRESULT (STDMETHODCALLTYPE *GetColumns)(
-        IColumnManager* This,
+        IColumnManager *This,
         CM_ENUM_FLAGS dwFlags,
         PROPERTYKEY *rgkeyOrder,
         UINT cColumns);
 
     HRESULT (STDMETHODCALLTYPE *SetColumns)(
-        IColumnManager* This,
+        IColumnManager *This,
         const PROPERTYKEY *rgkeyOrder,
         UINT cVisible);
 
     END_INTERFACE
 } IColumnManagerVtbl;
+
 interface IColumnManager {
     CONST_VTBL IColumnManagerVtbl* lpVtbl;
 };
@@ -8547,52 +7998,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IColumnManager_SetColumnInfo_Proxy(
-    IColumnManager* This,
-    REFPROPERTYKEY propkey,
-    const CM_COLUMNINFO *pcmci);
-void __RPC_STUB IColumnManager_SetColumnInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IColumnManager_GetColumnInfo_Proxy(
-    IColumnManager* This,
-    REFPROPERTYKEY propkey,
-    CM_COLUMNINFO *pcmci);
-void __RPC_STUB IColumnManager_GetColumnInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IColumnManager_GetColumnCount_Proxy(
-    IColumnManager* This,
-    CM_ENUM_FLAGS dwFlags,
-    UINT *puCount);
-void __RPC_STUB IColumnManager_GetColumnCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IColumnManager_GetColumns_Proxy(
-    IColumnManager* This,
-    CM_ENUM_FLAGS dwFlags,
-    PROPERTYKEY *rgkeyOrder,
-    UINT cColumns);
-void __RPC_STUB IColumnManager_GetColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IColumnManager_SetColumns_Proxy(
-    IColumnManager* This,
-    const PROPERTYKEY *rgkeyOrder,
-    UINT cVisible);
-void __RPC_STUB IColumnManager_SetColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IColumnManager_INTERFACE_DEFINED__ */
 
@@ -8622,23 +8027,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderFilterSite* This,
+        IFolderFilterSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderFilterSite* This);
+        IFolderFilterSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderFilterSite* This);
+        IFolderFilterSite *This);
 
     /*** IFolderFilterSite methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFilter)(
-        IFolderFilterSite* This,
+        IFolderFilterSite *This,
         IUnknown *punk);
 
     END_INTERFACE
 } IFolderFilterSiteVtbl;
+
 interface IFolderFilterSite {
     CONST_VTBL IFolderFilterSiteVtbl* lpVtbl;
 };
@@ -8671,14 +8077,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderFilterSite_SetFilter_Proxy(
-    IFolderFilterSite* This,
-    IUnknown *punk);
-void __RPC_STUB IFolderFilterSite_SetFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderFilterSite_INTERFACE_DEFINED__ */
 
@@ -8715,25 +8113,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderFilter* This,
+        IFolderFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderFilter* This);
+        IFolderFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderFilter* This);
+        IFolderFilter *This);
 
     /*** IFolderFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *ShouldShow)(
-        IFolderFilter* This,
+        IFolderFilter *This,
         IShellFolder *psf,
         PCIDLIST_ABSOLUTE pidlFolder,
         PCUITEMID_CHILD pidlItem);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumFlags)(
-        IFolderFilter* This,
+        IFolderFilter *This,
         IShellFolder *psf,
         PCIDLIST_ABSOLUTE pidlFolder,
         HWND *phwnd,
@@ -8741,6 +8139,7 @@
 
     END_INTERFACE
 } IFolderFilterVtbl;
+
 interface IFolderFilter {
     CONST_VTBL IFolderFilterVtbl* lpVtbl;
 };
@@ -8777,27 +8176,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderFilter_ShouldShow_Proxy(
-    IFolderFilter* This,
-    IShellFolder *psf,
-    PCIDLIST_ABSOLUTE pidlFolder,
-    PCUITEMID_CHILD pidlItem);
-void __RPC_STUB IFolderFilter_ShouldShow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderFilter_GetEnumFlags_Proxy(
-    IFolderFilter* This,
-    IShellFolder *psf,
-    PCIDLIST_ABSOLUTE pidlFolder,
-    HWND *phwnd,
-    DWORD *pgrfFlags);
-void __RPC_STUB IFolderFilter_GetEnumFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderFilter_INTERFACE_DEFINED__ */
 
@@ -8827,24 +8205,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInputObjectSite* This,
+        IInputObjectSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInputObjectSite* This);
+        IInputObjectSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInputObjectSite* This);
+        IInputObjectSite *This);
 
     /*** IInputObjectSite methods ***/
     HRESULT (STDMETHODCALLTYPE *OnFocusChangeIS)(
-        IInputObjectSite* This,
+        IInputObjectSite *This,
         IUnknown *punkObj,
         WINBOOL fSetFocus);
 
     END_INTERFACE
 } IInputObjectSiteVtbl;
+
 interface IInputObjectSite {
     CONST_VTBL IInputObjectSiteVtbl* lpVtbl;
 };
@@ -8877,15 +8256,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInputObjectSite_OnFocusChangeIS_Proxy(
-    IInputObjectSite* This,
-    IUnknown *punkObj,
-    WINBOOL fSetFocus);
-void __RPC_STUB IInputObjectSite_OnFocusChangeIS_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInputObjectSite_INTERFACE_DEFINED__ */
 
@@ -8921,31 +8291,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInputObject* This,
+        IInputObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInputObject* This);
+        IInputObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInputObject* This);
+        IInputObject *This);
 
     /*** IInputObject methods ***/
     HRESULT (STDMETHODCALLTYPE *UIActivateIO)(
-        IInputObject* This,
+        IInputObject *This,
         WINBOOL fActivate,
         MSG *pMsg);
 
     HRESULT (STDMETHODCALLTYPE *HasFocusIO)(
-        IInputObject* This);
+        IInputObject *This);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorIO)(
-        IInputObject* This,
+        IInputObject *This,
         MSG *pMsg);
 
     END_INTERFACE
 } IInputObjectVtbl;
+
 interface IInputObject {
     CONST_VTBL IInputObjectVtbl* lpVtbl;
 };
@@ -8986,30 +8357,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInputObject_UIActivateIO_Proxy(
-    IInputObject* This,
-    WINBOOL fActivate,
-    MSG *pMsg);
-void __RPC_STUB IInputObject_UIActivateIO_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInputObject_HasFocusIO_Proxy(
-    IInputObject* This);
-void __RPC_STUB IInputObject_HasFocusIO_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInputObject_TranslateAcceleratorIO_Proxy(
-    IInputObject* This,
-    MSG *pMsg);
-void __RPC_STUB IInputObject_TranslateAcceleratorIO_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInputObject_INTERFACE_DEFINED__ */
 
@@ -9038,36 +8385,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInputObject2* This,
+        IInputObject2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInputObject2* This);
+        IInputObject2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInputObject2* This);
+        IInputObject2 *This);
 
     /*** IInputObject methods ***/
     HRESULT (STDMETHODCALLTYPE *UIActivateIO)(
-        IInputObject2* This,
+        IInputObject2 *This,
         WINBOOL fActivate,
         MSG *pMsg);
 
     HRESULT (STDMETHODCALLTYPE *HasFocusIO)(
-        IInputObject2* This);
+        IInputObject2 *This);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorIO)(
-        IInputObject2* This,
+        IInputObject2 *This,
         MSG *pMsg);
 
     /*** IInputObject2 methods ***/
     HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorGlobal)(
-        IInputObject2* This,
+        IInputObject2 *This,
         MSG *pMsg);
 
     END_INTERFACE
 } IInputObject2Vtbl;
+
 interface IInputObject2 {
     CONST_VTBL IInputObject2Vtbl* lpVtbl;
 };
@@ -9114,14 +8462,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInputObject2_TranslateAcceleratorGlobal_Proxy(
-    IInputObject2* This,
-    MSG *pMsg);
-void __RPC_STUB IInputObject2_TranslateAcceleratorGlobal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInputObject2_INTERFACE_DEFINED__ */
 
@@ -9152,25 +8492,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellIcon* This,
+        IShellIcon *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellIcon* This);
+        IShellIcon *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellIcon* This);
+        IShellIcon *This);
 
     /*** IShellIcon methods ***/
     HRESULT (STDMETHODCALLTYPE *GetIconOf)(
-        IShellIcon* This,
+        IShellIcon *This,
         PCUITEMID_CHILD pidl,
         UINT flags,
         int *pIconIndex);
 
     END_INTERFACE
 } IShellIconVtbl;
+
 interface IShellIcon {
     CONST_VTBL IShellIconVtbl* lpVtbl;
 };
@@ -9203,16 +8544,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellIcon_GetIconOf_Proxy(
-    IShellIcon* This,
-    PCUITEMID_CHILD pidl,
-    UINT flags,
-    int *pIconIndex);
-void __RPC_STUB IShellIcon_GetIconOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellIcon_INTERFACE_DEFINED__ */
 
@@ -9347,71 +8678,71 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellBrowser* This);
+        IShellBrowser *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellBrowser* This);
+        IShellBrowser *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         WINBOOL fEnterMode);
 
     /*** IShellBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *InsertMenusSB)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         HMENU hmenuShared,
         LPOLEMENUGROUPWIDTHS lpMenuWidths);
 
     HRESULT (STDMETHODCALLTYPE *SetMenuSB)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         HMENU hmenuShared,
         HOLEMENU holemenuRes,
         HWND hwndActiveObject);
 
     HRESULT (STDMETHODCALLTYPE *RemoveMenusSB)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         HMENU hmenuShared);
 
     HRESULT (STDMETHODCALLTYPE *SetStatusTextSB)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         LPCWSTR pszStatusText);
 
     HRESULT (STDMETHODCALLTYPE *EnableModelessSB)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         WINBOOL fEnable);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAcceleratorSB)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         MSG *pmsg,
         WORD wID);
 
     HRESULT (STDMETHODCALLTYPE *BrowseObject)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         PCUIDLIST_RELATIVE pidl,
         UINT wFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetViewStateStream)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         DWORD grfMode,
         IStream **ppStrm);
 
     HRESULT (STDMETHODCALLTYPE *GetControlWindow)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         UINT id,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *SendControlMsg)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         UINT id,
         UINT uMsg,
         WPARAM wParam,
@@ -9419,21 +8750,22 @@
         LRESULT *pret);
 
     HRESULT (STDMETHODCALLTYPE *QueryActiveShellView)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         IShellView **ppshv);
 
     HRESULT (STDMETHODCALLTYPE *OnViewWindowActive)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         IShellView *pshv);
 
     HRESULT (STDMETHODCALLTYPE *SetToolbarItems)(
-        IShellBrowser* This,
+        IShellBrowser *This,
         LPTBBUTTONSB lpButtons,
         UINT nButtons,
         UINT uFlags);
 
     END_INTERFACE
 } IShellBrowserVtbl;
+
 interface IShellBrowser {
     CONST_VTBL IShellBrowserVtbl* lpVtbl;
 };
@@ -9524,101 +8856,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellBrowser_InsertMenusSB_Proxy(
-    IShellBrowser* This,
-    HMENU hmenuShared,
-    LPOLEMENUGROUPWIDTHS lpMenuWidths);
-void __RPC_STUB IShellBrowser_InsertMenusSB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_SetMenuSB_Proxy(
-    IShellBrowser* This,
-    HMENU hmenuShared,
-    HOLEMENU holemenuRes,
-    HWND hwndActiveObject);
-void __RPC_STUB IShellBrowser_SetMenuSB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_RemoveMenusSB_Proxy(
-    IShellBrowser* This,
-    HMENU hmenuShared);
-void __RPC_STUB IShellBrowser_RemoveMenusSB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_SetStatusTextSB_Proxy(
-    IShellBrowser* This,
-    LPCWSTR pszStatusText);
-void __RPC_STUB IShellBrowser_SetStatusTextSB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_EnableModelessSB_Proxy(
-    IShellBrowser* This,
-    WINBOOL fEnable);
-void __RPC_STUB IShellBrowser_EnableModelessSB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_TranslateAcceleratorSB_Proxy(
-    IShellBrowser* This,
-    MSG *pmsg,
-    WORD wID);
-void __RPC_STUB IShellBrowser_TranslateAcceleratorSB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_BrowseObject_Proxy(
-    IShellBrowser* This,
-    PCUIDLIST_RELATIVE pidl,
-    UINT wFlags);
-void __RPC_STUB IShellBrowser_BrowseObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_GetViewStateStream_Proxy(
-    IShellBrowser* This,
-    DWORD grfMode,
-    IStream **ppStrm);
-void __RPC_STUB IShellBrowser_GetViewStateStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_GetControlWindow_Proxy(
-    IShellBrowser* This,
-    UINT id,
-    HWND *phwnd);
-void __RPC_STUB IShellBrowser_GetControlWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_QueryActiveShellView_Proxy(
-    IShellBrowser* This,
-    IShellView **ppshv);
-void __RPC_STUB IShellBrowser_QueryActiveShellView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellBrowser_OnViewWindowActive_Proxy(
-    IShellBrowser* This,
-    IShellView *pshv);
-void __RPC_STUB IShellBrowser_OnViewWindowActive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellBrowser_INTERFACE_DEFINED__ */
 
@@ -9654,29 +8891,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IProfferService* This,
+        IProfferService *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IProfferService* This);
+        IProfferService *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IProfferService* This);
+        IProfferService *This);
 
     /*** IProfferService methods ***/
     HRESULT (STDMETHODCALLTYPE *ProfferService)(
-        IProfferService* This,
+        IProfferService *This,
         REFGUID guidService,
         IServiceProvider *psp,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *RevokeService)(
-        IProfferService* This,
+        IProfferService *This,
         DWORD dwCookie);
 
     END_INTERFACE
 } IProfferServiceVtbl;
+
 interface IProfferService {
     CONST_VTBL IProfferServiceVtbl* lpVtbl;
 };
@@ -9713,24 +8951,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IProfferService_ProfferService_Proxy(
-    IProfferService* This,
-    REFGUID guidService,
-    IServiceProvider *psp,
-    DWORD *pdwCookie);
-void __RPC_STUB IProfferService_ProfferService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IProfferService_RevokeService_Proxy(
-    IProfferService* This,
-    DWORD dwCookie);
-void __RPC_STUB IProfferService_RevokeService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IProfferService_INTERFACE_DEFINED__ */
 
@@ -9765,7 +8985,6 @@
     SICHINT_TEST_FILESYSPATH_IF_NOT_EQUAL = 0x20000000
 };
 
-
 typedef DWORD SICHINTF;
 
 DEFINE_GUID(IID_IShellItem, 0x43826d1e, 0xe718, 0x42ee, 0xbc,0x55, 0xa1,0xe2,0x61,0xc3,0x7b,0xfe);
@@ -9805,46 +9024,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellItem* This,
+        IShellItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellItem* This);
+        IShellItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellItem* This);
+        IShellItem *This);
 
     /*** IShellItem methods ***/
     HRESULT (STDMETHODCALLTYPE *BindToHandler)(
-        IShellItem* This,
+        IShellItem *This,
         IBindCtx *pbc,
         REFGUID bhid,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetParent)(
-        IShellItem* This,
+        IShellItem *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IShellItem* This,
+        IShellItem *This,
         SIGDN sigdnName,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetAttributes)(
-        IShellItem* This,
+        IShellItem *This,
         SFGAOF sfgaoMask,
         SFGAOF *psfgaoAttribs);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IShellItem* This,
+        IShellItem *This,
         IShellItem *psi,
         SICHINTF hint,
         int *piOrder);
 
     END_INTERFACE
 } IShellItemVtbl;
+
 interface IShellItem {
     CONST_VTBL IShellItemVtbl* lpVtbl;
 };
@@ -9893,53 +9113,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellItem_BindToHandler_Proxy(
-    IShellItem* This,
-    IBindCtx *pbc,
-    REFGUID bhid,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItem_BindToHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem_GetParent_Proxy(
-    IShellItem* This,
-    IShellItem **ppsi);
-void __RPC_STUB IShellItem_GetParent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem_GetDisplayName_Proxy(
-    IShellItem* This,
-    SIGDN sigdnName,
-    LPWSTR *ppszName);
-void __RPC_STUB IShellItem_GetDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem_GetAttributes_Proxy(
-    IShellItem* This,
-    SFGAOF sfgaoMask,
-    SFGAOF *psfgaoAttribs);
-void __RPC_STUB IShellItem_GetAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem_Compare_Proxy(
-    IShellItem* This,
-    IShellItem *psi,
-    SICHINTF hint,
-    int *piOrder);
-void __RPC_STUB IShellItem_Compare_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellItem_INTERFACE_DEFINED__ */
 
@@ -10060,60 +9233,60 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellItem2* This);
+        IShellItem2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellItem2* This);
+        IShellItem2 *This);
 
     /*** IShellItem methods ***/
     HRESULT (STDMETHODCALLTYPE *BindToHandler)(
-        IShellItem2* This,
+        IShellItem2 *This,
         IBindCtx *pbc,
         REFGUID bhid,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetParent)(
-        IShellItem2* This,
+        IShellItem2 *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IShellItem2* This,
+        IShellItem2 *This,
         SIGDN sigdnName,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetAttributes)(
-        IShellItem2* This,
+        IShellItem2 *This,
         SFGAOF sfgaoMask,
         SFGAOF *psfgaoAttribs);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IShellItem2* This,
+        IShellItem2 *This,
         IShellItem *psi,
         SICHINTF hint,
         int *piOrder);
 
     /*** IShellItem2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyStore)(
-        IShellItem2* This,
+        IShellItem2 *This,
         GETPROPERTYSTOREFLAGS flags,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStoreWithCreateObject)(
-        IShellItem2* This,
+        IShellItem2 *This,
         GETPROPERTYSTOREFLAGS flags,
         IUnknown *punkCreateObject,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStoreForKeys)(
-        IShellItem2* This,
+        IShellItem2 *This,
         const PROPERTYKEY *rgKeys,
         UINT cKeys,
         GETPROPERTYSTOREFLAGS flags,
@@ -10121,57 +9294,58 @@
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionList)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY keyType,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *Update)(
-        IShellItem2* This,
+        IShellItem2 *This,
         IBindCtx *pbc);
 
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetFileTime)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         FILETIME *pft);
 
     HRESULT (STDMETHODCALLTYPE *GetInt32)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         int *pi);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         LPWSTR *ppsz);
 
     HRESULT (STDMETHODCALLTYPE *GetUInt32)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         ULONG *pui);
 
     HRESULT (STDMETHODCALLTYPE *GetUInt64)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         ULONGLONG *pull);
 
     HRESULT (STDMETHODCALLTYPE *GetBool)(
-        IShellItem2* This,
+        IShellItem2 *This,
         REFPROPERTYKEY key,
         WINBOOL *pf);
 
     END_INTERFACE
 } IShellItem2Vtbl;
+
 interface IShellItem2 {
     CONST_VTBL IShellItem2Vtbl* lpVtbl;
 };
@@ -10274,129 +9448,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyStore_Proxy(
-    IShellItem2* This,
-    GETPROPERTYSTOREFLAGS flags,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItem2_GetPropertyStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyStoreWithCreateObject_Proxy(
-    IShellItem2* This,
-    GETPROPERTYSTOREFLAGS flags,
-    IUnknown *punkCreateObject,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItem2_GetPropertyStoreWithCreateObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyStoreForKeys_Proxy(
-    IShellItem2* This,
-    const PROPERTYKEY *rgKeys,
-    UINT cKeys,
-    GETPROPERTYSTOREFLAGS flags,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItem2_GetPropertyStoreForKeys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetPropertyDescriptionList_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY keyType,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItem2_GetPropertyDescriptionList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_Update_Proxy(
-    IShellItem2* This,
-    IBindCtx *pbc);
-void __RPC_STUB IShellItem2_Update_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetProperty_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    PROPVARIANT *ppropvar);
-void __RPC_STUB IShellItem2_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetCLSID_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    CLSID *pclsid);
-void __RPC_STUB IShellItem2_GetCLSID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetFileTime_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    FILETIME *pft);
-void __RPC_STUB IShellItem2_GetFileTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetInt32_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    int *pi);
-void __RPC_STUB IShellItem2_GetInt32_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetString_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    LPWSTR *ppsz);
-void __RPC_STUB IShellItem2_GetString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetUInt32_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    ULONG *pui);
-void __RPC_STUB IShellItem2_GetUInt32_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetUInt64_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    ULONGLONG *pull);
-void __RPC_STUB IShellItem2_GetUInt64_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItem2_GetBool_Proxy(
-    IShellItem2* This,
-    REFPROPERTYKEY key,
-    WINBOOL *pf);
-void __RPC_STUB IShellItem2_GetBool_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellItem2_INTERFACE_DEFINED__ */
 
@@ -10414,7 +9465,6 @@
     SIIGBF_SCALEUP = 0x100
 };
 
-
 typedef int SIIGBF;
 
 /*****************************************************************************
@@ -10443,25 +9493,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellItemImageFactory* This,
+        IShellItemImageFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellItemImageFactory* This);
+        IShellItemImageFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellItemImageFactory* This);
+        IShellItemImageFactory *This);
 
     /*** IShellItemImageFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *GetImage)(
-        IShellItemImageFactory* This,
+        IShellItemImageFactory *This,
         SIZE size,
         SIIGBF flags,
         HBITMAP *phbm);
 
     END_INTERFACE
 } IShellItemImageFactoryVtbl;
+
 interface IShellItemImageFactory {
     CONST_VTBL IShellItemImageFactoryVtbl* lpVtbl;
 };
@@ -10494,16 +9545,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellItemImageFactory_GetImage_Proxy(
-    IShellItemImageFactory* This,
-    SIZE size,
-    SIIGBF flags,
-    HBITMAP *phbm);
-void __RPC_STUB IShellItemImageFactory_GetImage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellItemImageFactory_INTERFACE_DEFINED__ */
 
@@ -10532,23 +9573,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUserAccountChangeCallback* This,
+        IUserAccountChangeCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUserAccountChangeCallback* This);
+        IUserAccountChangeCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUserAccountChangeCallback* This);
+        IUserAccountChangeCallback *This);
 
     /*** IUserAccountChangeCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *OnPictureChange)(
-        IUserAccountChangeCallback* This,
+        IUserAccountChangeCallback *This,
         LPCWSTR pszUserName);
 
     END_INTERFACE
 } IUserAccountChangeCallbackVtbl;
+
 interface IUserAccountChangeCallback {
     CONST_VTBL IUserAccountChangeCallbackVtbl* lpVtbl;
 };
@@ -10581,14 +9623,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUserAccountChangeCallback_OnPictureChange_Proxy(
-    IUserAccountChangeCallback* This,
-    LPCWSTR pszUserName);
-void __RPC_STUB IUserAccountChangeCallback_OnPictureChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUserAccountChangeCallback_INTERFACE_DEFINED__ */
 
@@ -10628,36 +9662,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumShellItems* This,
+        IEnumShellItems *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumShellItems* This);
+        IEnumShellItems *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumShellItems* This);
+        IEnumShellItems *This);
 
     /*** IEnumShellItems methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumShellItems* This,
+        IEnumShellItems *This,
         ULONG celt,
         IShellItem **rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumShellItems* This,
+        IEnumShellItems *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumShellItems* This);
+        IEnumShellItems *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumShellItems* This,
+        IEnumShellItems *This,
         IEnumShellItems **ppenum);
 
     END_INTERFACE
 } IEnumShellItemsVtbl;
+
 interface IEnumShellItems {
     CONST_VTBL IEnumShellItemsVtbl* lpVtbl;
 };
@@ -10712,29 +9747,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumShellItems_Skip_Proxy(
-    IEnumShellItems* This,
-    ULONG celt);
-void __RPC_STUB IEnumShellItems_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumShellItems_Reset_Proxy(
-    IEnumShellItems* This);
-void __RPC_STUB IEnumShellItems_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumShellItems_Clone_Proxy(
-    IEnumShellItems* This,
-    IEnumShellItems **ppenum);
-void __RPC_STUB IEnumShellItems_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumShellItems_Next_Proxy(
     IEnumShellItems* This,
     ULONG celt,
@@ -10779,7 +9791,6 @@
     TSF_SUSPEND_SHELLEVENTS = 0x800
 };
 
-
 typedef DWORD TRANSFER_SOURCE_FLAGS;
 
 #if _WIN32_IE >= _WIN32_IE_IE70
@@ -10796,7 +9807,6 @@
     TS_INDETERMINATE = 0x4
 };
 
-
 typedef DWORD TRANSFER_ADVISE_STATE;
 
 DEFINE_GUID(IID_ITransferAdviseSink, 0xd594d0d8, 0x8da7, 0x457b, 0xb3,0xb4, 0xce,0x5d,0xba,0xac,0x0b,0x88);
@@ -10850,19 +9860,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITransferAdviseSink* This);
+        ITransferAdviseSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITransferAdviseSink* This);
+        ITransferAdviseSink *This);
 
     /*** ITransferAdviseSink methods ***/
     HRESULT (STDMETHODCALLTYPE *UpdateProgress)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         ULONGLONG ullSizeCurrent,
         ULONGLONG ullSizeTotal,
         int nFilesCurrent,
@@ -10871,21 +9881,21 @@
         int nFoldersTotal);
 
     HRESULT (STDMETHODCALLTYPE *UpdateTransferState)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         TRANSFER_ADVISE_STATE ts);
 
     HRESULT (STDMETHODCALLTYPE *ConfirmOverwrite)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         IShellItem *psiSource,
         IShellItem *psiDestParent,
         LPCWSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *ConfirmEncryptionLoss)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         IShellItem *psiSource);
 
     HRESULT (STDMETHODCALLTYPE *FileFailure)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         IShellItem *psi,
         LPCWSTR pszItem,
         HRESULT hrError,
@@ -10893,19 +9903,20 @@
         ULONG cchRename);
 
     HRESULT (STDMETHODCALLTYPE *SubStreamFailure)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         IShellItem *psi,
         LPCWSTR pszStreamName,
         HRESULT hrError);
 
     HRESULT (STDMETHODCALLTYPE *PropertyFailure)(
-        ITransferAdviseSink* This,
+        ITransferAdviseSink *This,
         IShellItem *psi,
         const PROPERTYKEY *pkey,
         HRESULT hrError);
 
     END_INTERFACE
 } ITransferAdviseSinkVtbl;
+
 interface ITransferAdviseSink {
     CONST_VTBL ITransferAdviseSinkVtbl* lpVtbl;
 };
@@ -10962,77 +9973,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITransferAdviseSink_UpdateProgress_Proxy(
-    ITransferAdviseSink* This,
-    ULONGLONG ullSizeCurrent,
-    ULONGLONG ullSizeTotal,
-    int nFilesCurrent,
-    int nFilesTotal,
-    int nFoldersCurrent,
-    int nFoldersTotal);
-void __RPC_STUB ITransferAdviseSink_UpdateProgress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferAdviseSink_UpdateTransferState_Proxy(
-    ITransferAdviseSink* This,
-    TRANSFER_ADVISE_STATE ts);
-void __RPC_STUB ITransferAdviseSink_UpdateTransferState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferAdviseSink_ConfirmOverwrite_Proxy(
-    ITransferAdviseSink* This,
-    IShellItem *psiSource,
-    IShellItem *psiDestParent,
-    LPCWSTR pszName);
-void __RPC_STUB ITransferAdviseSink_ConfirmOverwrite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferAdviseSink_ConfirmEncryptionLoss_Proxy(
-    ITransferAdviseSink* This,
-    IShellItem *psiSource);
-void __RPC_STUB ITransferAdviseSink_ConfirmEncryptionLoss_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferAdviseSink_FileFailure_Proxy(
-    ITransferAdviseSink* This,
-    IShellItem *psi,
-    LPCWSTR pszItem,
-    HRESULT hrError,
-    LPWSTR pszRename,
-    ULONG cchRename);
-void __RPC_STUB ITransferAdviseSink_FileFailure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferAdviseSink_SubStreamFailure_Proxy(
-    ITransferAdviseSink* This,
-    IShellItem *psi,
-    LPCWSTR pszStreamName,
-    HRESULT hrError);
-void __RPC_STUB ITransferAdviseSink_SubStreamFailure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferAdviseSink_PropertyFailure_Proxy(
-    ITransferAdviseSink* This,
-    IShellItem *psi,
-    const PROPERTYKEY *pkey,
-    HRESULT hrError);
-void __RPC_STUB ITransferAdviseSink_PropertyFailure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITransferAdviseSink_INTERFACE_DEFINED__ */
 
@@ -11121,39 +10061,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITransferSource* This,
+        ITransferSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITransferSource* This);
+        ITransferSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITransferSource* This);
+        ITransferSource *This);
 
     /*** ITransferSource methods ***/
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        ITransferSource* This,
+        ITransferSource *This,
         ITransferAdviseSink *psink,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        ITransferSource* This,
+        ITransferSource *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *SetProperties)(
-        ITransferSource* This,
+        ITransferSource *This,
         IPropertyChangeArray *pproparray);
 
     HRESULT (STDMETHODCALLTYPE *OpenItem)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psi,
         TRANSFER_SOURCE_FLAGS flags,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *MoveItem)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psi,
         IShellItem *psiParentDst,
         LPCWSTR pszNameDst,
@@ -11161,26 +10101,26 @@
         IShellItem **ppsiNew);
 
     HRESULT (STDMETHODCALLTYPE *RecycleItem)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiSource,
         IShellItem *psiParentDest,
         TRANSFER_SOURCE_FLAGS flags,
         IShellItem **ppsiNewDest);
 
     HRESULT (STDMETHODCALLTYPE *RemoveItem)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiSource,
         TRANSFER_SOURCE_FLAGS flags);
 
     HRESULT (STDMETHODCALLTYPE *RenameItem)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiSource,
         LPCWSTR pszNewName,
         TRANSFER_SOURCE_FLAGS flags,
         IShellItem **ppsiNewDest);
 
     HRESULT (STDMETHODCALLTYPE *LinkItem)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiSource,
         IShellItem *psiParentDest,
         LPCWSTR pszNewName,
@@ -11188,26 +10128,27 @@
         IShellItem **ppsiNewDest);
 
     HRESULT (STDMETHODCALLTYPE *ApplyPropertiesToItem)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiSource,
         IShellItem **ppsiNew);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultDestinationName)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiSource,
         IShellItem *psiParentDest,
         LPWSTR *ppszDestinationName);
 
     HRESULT (STDMETHODCALLTYPE *EnterFolder)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiChildFolderDest);
 
     HRESULT (STDMETHODCALLTYPE *LeaveFolder)(
-        ITransferSource* This,
+        ITransferSource *This,
         IShellItem *psiChildFolderDest);
 
     END_INTERFACE
 } ITransferSourceVtbl;
+
 interface ITransferSource {
     CONST_VTBL ITransferSourceVtbl* lpVtbl;
 };
@@ -11288,132 +10229,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITransferSource_Advise_Proxy(
-    ITransferSource* This,
-    ITransferAdviseSink *psink,
-    DWORD *pdwCookie);
-void __RPC_STUB ITransferSource_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_Unadvise_Proxy(
-    ITransferSource* This,
-    DWORD dwCookie);
-void __RPC_STUB ITransferSource_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_SetProperties_Proxy(
-    ITransferSource* This,
-    IPropertyChangeArray *pproparray);
-void __RPC_STUB ITransferSource_SetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_OpenItem_Proxy(
-    ITransferSource* This,
-    IShellItem *psi,
-    TRANSFER_SOURCE_FLAGS flags,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ITransferSource_OpenItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_MoveItem_Proxy(
-    ITransferSource* This,
-    IShellItem *psi,
-    IShellItem *psiParentDst,
-    LPCWSTR pszNameDst,
-    TRANSFER_SOURCE_FLAGS flags,
-    IShellItem **ppsiNew);
-void __RPC_STUB ITransferSource_MoveItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_RecycleItem_Proxy(
-    ITransferSource* This,
-    IShellItem *psiSource,
-    IShellItem *psiParentDest,
-    TRANSFER_SOURCE_FLAGS flags,
-    IShellItem **ppsiNewDest);
-void __RPC_STUB ITransferSource_RecycleItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_RemoveItem_Proxy(
-    ITransferSource* This,
-    IShellItem *psiSource,
-    TRANSFER_SOURCE_FLAGS flags);
-void __RPC_STUB ITransferSource_RemoveItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_RenameItem_Proxy(
-    ITransferSource* This,
-    IShellItem *psiSource,
-    LPCWSTR pszNewName,
-    TRANSFER_SOURCE_FLAGS flags,
-    IShellItem **ppsiNewDest);
-void __RPC_STUB ITransferSource_RenameItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_LinkItem_Proxy(
-    ITransferSource* This,
-    IShellItem *psiSource,
-    IShellItem *psiParentDest,
-    LPCWSTR pszNewName,
-    TRANSFER_SOURCE_FLAGS flags,
-    IShellItem **ppsiNewDest);
-void __RPC_STUB ITransferSource_LinkItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_ApplyPropertiesToItem_Proxy(
-    ITransferSource* This,
-    IShellItem *psiSource,
-    IShellItem **ppsiNew);
-void __RPC_STUB ITransferSource_ApplyPropertiesToItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_GetDefaultDestinationName_Proxy(
-    ITransferSource* This,
-    IShellItem *psiSource,
-    IShellItem *psiParentDest,
-    LPWSTR *ppszDestinationName);
-void __RPC_STUB ITransferSource_GetDefaultDestinationName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_EnterFolder_Proxy(
-    ITransferSource* This,
-    IShellItem *psiChildFolderDest);
-void __RPC_STUB ITransferSource_EnterFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferSource_LeaveFolder_Proxy(
-    ITransferSource* This,
-    IShellItem *psiChildFolderDest);
-void __RPC_STUB ITransferSource_LeaveFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITransferSource_INTERFACE_DEFINED__ */
 
@@ -11459,36 +10274,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumResources* This,
+        IEnumResources *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumResources* This);
+        IEnumResources *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumResources* This);
+        IEnumResources *This);
 
     /*** IEnumResources methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumResources* This,
+        IEnumResources *This,
         ULONG celt,
         SHELL_ITEM_RESOURCE *psir,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumResources* This,
+        IEnumResources *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumResources* This);
+        IEnumResources *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumResources* This,
+        IEnumResources *This,
         IEnumResources **ppenumr);
 
     END_INTERFACE
 } IEnumResourcesVtbl;
+
 interface IEnumResources {
     CONST_VTBL IEnumResourcesVtbl* lpVtbl;
 };
@@ -11533,39 +10349,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumResources_Next_Proxy(
-    IEnumResources* This,
-    ULONG celt,
-    SHELL_ITEM_RESOURCE *psir,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumResources_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumResources_Skip_Proxy(
-    IEnumResources* This,
-    ULONG celt);
-void __RPC_STUB IEnumResources_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumResources_Reset_Proxy(
-    IEnumResources* This);
-void __RPC_STUB IEnumResources_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumResources_Clone_Proxy(
-    IEnumResources* This,
-    IEnumResources **ppenumr);
-void __RPC_STUB IEnumResources_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumResources_INTERFACE_DEFINED__ */
 
@@ -11630,67 +10413,68 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellItemResources* This);
+        IShellItemResources *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellItemResources* This);
+        IShellItemResources *This);
 
     /*** IShellItemResources methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAttributes)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         DWORD *pdwAttributes);
 
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         ULONGLONG *pullSize);
 
     HRESULT (STDMETHODCALLTYPE *GetTimes)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         FILETIME *pftCreation,
         FILETIME *pftWrite,
         FILETIME *pftAccess);
 
     HRESULT (STDMETHODCALLTYPE *SetTimes)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         const FILETIME *pftCreation,
         const FILETIME *pftWrite,
         const FILETIME *pftAccess);
 
     HRESULT (STDMETHODCALLTYPE *GetResourceDescription)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         const SHELL_ITEM_RESOURCE *pcsir,
         LPWSTR *ppszDescription);
 
     HRESULT (STDMETHODCALLTYPE *EnumResources)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         IEnumResources **ppenumr);
 
     HRESULT (STDMETHODCALLTYPE *SupportsResource)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         const SHELL_ITEM_RESOURCE *pcsir);
 
     HRESULT (STDMETHODCALLTYPE *OpenResource)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         const SHELL_ITEM_RESOURCE *pcsir,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *CreateResource)(
-        IShellItemResources* This,
+        IShellItemResources *This,
         const SHELL_ITEM_RESOURCE *pcsir,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *MarkForDelete)(
-        IShellItemResources* This);
+        IShellItemResources *This);
 
     END_INTERFACE
 } IShellItemResourcesVtbl;
+
 interface IShellItemResources {
     CONST_VTBL IShellItemResourcesVtbl* lpVtbl;
 };
@@ -11759,94 +10543,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellItemResources_GetAttributes_Proxy(
-    IShellItemResources* This,
-    DWORD *pdwAttributes);
-void __RPC_STUB IShellItemResources_GetAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_GetSize_Proxy(
-    IShellItemResources* This,
-    ULONGLONG *pullSize);
-void __RPC_STUB IShellItemResources_GetSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_GetTimes_Proxy(
-    IShellItemResources* This,
-    FILETIME *pftCreation,
-    FILETIME *pftWrite,
-    FILETIME *pftAccess);
-void __RPC_STUB IShellItemResources_GetTimes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_SetTimes_Proxy(
-    IShellItemResources* This,
-    const FILETIME *pftCreation,
-    const FILETIME *pftWrite,
-    const FILETIME *pftAccess);
-void __RPC_STUB IShellItemResources_SetTimes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_GetResourceDescription_Proxy(
-    IShellItemResources* This,
-    const SHELL_ITEM_RESOURCE *pcsir,
-    LPWSTR *ppszDescription);
-void __RPC_STUB IShellItemResources_GetResourceDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_EnumResources_Proxy(
-    IShellItemResources* This,
-    IEnumResources **ppenumr);
-void __RPC_STUB IShellItemResources_EnumResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_SupportsResource_Proxy(
-    IShellItemResources* This,
-    const SHELL_ITEM_RESOURCE *pcsir);
-void __RPC_STUB IShellItemResources_SupportsResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_OpenResource_Proxy(
-    IShellItemResources* This,
-    const SHELL_ITEM_RESOURCE *pcsir,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItemResources_OpenResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_CreateResource_Proxy(
-    IShellItemResources* This,
-    const SHELL_ITEM_RESOURCE *pcsir,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItemResources_CreateResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemResources_MarkForDelete_Proxy(
-    IShellItemResources* This);
-void __RPC_STUB IShellItemResources_MarkForDelete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellItemResources_INTERFACE_DEFINED__ */
 
@@ -11889,28 +10585,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITransferDestination* This,
+        ITransferDestination *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITransferDestination* This);
+        ITransferDestination *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITransferDestination* This);
+        ITransferDestination *This);
 
     /*** ITransferDestination methods ***/
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        ITransferDestination* This,
+        ITransferDestination *This,
         ITransferAdviseSink *psink,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        ITransferDestination* This,
+        ITransferDestination *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *CreateItem)(
-        ITransferDestination* This,
+        ITransferDestination *This,
         LPCWSTR pszName,
         DWORD dwAttributes,
         ULONGLONG ullSize,
@@ -11922,6 +10618,7 @@
 
     END_INTERFACE
 } ITransferDestinationVtbl;
+
 interface ITransferDestination {
     CONST_VTBL ITransferDestinationVtbl* lpVtbl;
 };
@@ -11962,38 +10659,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITransferDestination_Advise_Proxy(
-    ITransferDestination* This,
-    ITransferAdviseSink *psink,
-    DWORD *pdwCookie);
-void __RPC_STUB ITransferDestination_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferDestination_Unadvise_Proxy(
-    ITransferDestination* This,
-    DWORD dwCookie);
-void __RPC_STUB ITransferDestination_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITransferDestination_CreateItem_Proxy(
-    ITransferDestination* This,
-    LPCWSTR pszName,
-    DWORD dwAttributes,
-    ULONGLONG ullSize,
-    TRANSFER_SOURCE_FLAGS flags,
-    REFIID riidItem,
-    void **ppvItem,
-    REFIID riidResources,
-    void **ppvResources);
-void __RPC_STUB ITransferDestination_CreateItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITransferDestination_INTERFACE_DEFINED__ */
 
@@ -12054,101 +10719,102 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IStreamAsync* This);
+        IStreamAsync *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IStreamAsync* This);
+        IStreamAsync *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        IStreamAsync* This);
+        IStreamAsync *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         IStream **ppstm);
 
     /*** IStreamAsync methods ***/
     HRESULT (STDMETHODCALLTYPE *ReadAsync)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         void *pv,
         DWORD cb,
         LPDWORD pcbRead,
         LPOVERLAPPED lpOverlapped);
 
     HRESULT (STDMETHODCALLTYPE *WriteAsync)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         const void *lpBuffer,
         DWORD cb,
         LPDWORD pcbWritten,
         LPOVERLAPPED lpOverlapped);
 
     HRESULT (STDMETHODCALLTYPE *OverlappedResult)(
-        IStreamAsync* This,
+        IStreamAsync *This,
         LPOVERLAPPED lpOverlapped,
         LPDWORD lpNumberOfBytesTransferred,
         WINBOOL bWait);
 
     HRESULT (STDMETHODCALLTYPE *CancelIo)(
-        IStreamAsync* This);
+        IStreamAsync *This);
 
     END_INTERFACE
 } IStreamAsyncVtbl;
+
 interface IStreamAsync {
     CONST_VTBL IStreamAsyncVtbl* lpVtbl;
 };
@@ -12241,45 +10907,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IStreamAsync_ReadAsync_Proxy(
-    IStreamAsync* This,
-    void *pv,
-    DWORD cb,
-    LPDWORD pcbRead,
-    LPOVERLAPPED lpOverlapped);
-void __RPC_STUB IStreamAsync_ReadAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IStreamAsync_WriteAsync_Proxy(
-    IStreamAsync* This,
-    const void *lpBuffer,
-    DWORD cb,
-    LPDWORD pcbWritten,
-    LPOVERLAPPED lpOverlapped);
-void __RPC_STUB IStreamAsync_WriteAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IStreamAsync_OverlappedResult_Proxy(
-    IStreamAsync* This,
-    LPOVERLAPPED lpOverlapped,
-    LPDWORD lpNumberOfBytesTransferred,
-    WINBOOL bWait);
-void __RPC_STUB IStreamAsync_OverlappedResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IStreamAsync_CancelIo_Proxy(
-    IStreamAsync* This);
-void __RPC_STUB IStreamAsync_CancelIo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IStreamAsync_INTERFACE_DEFINED__ */
 
@@ -12308,23 +10935,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IStreamUnbufferedInfo* This,
+        IStreamUnbufferedInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IStreamUnbufferedInfo* This);
+        IStreamUnbufferedInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IStreamUnbufferedInfo* This);
+        IStreamUnbufferedInfo *This);
 
     /*** IStreamUnbufferedInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSectorSize)(
-        IStreamUnbufferedInfo* This,
+        IStreamUnbufferedInfo *This,
         ULONG *pcbSectorSize);
 
     END_INTERFACE
 } IStreamUnbufferedInfoVtbl;
+
 interface IStreamUnbufferedInfo {
     CONST_VTBL IStreamUnbufferedInfoVtbl* lpVtbl;
 };
@@ -12357,14 +10985,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IStreamUnbufferedInfo_GetSectorSize_Proxy(
-    IStreamUnbufferedInfo* This,
-    ULONG *pcbSectorSize);
-void __RPC_STUB IStreamUnbufferedInfo_GetSectorSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IStreamUnbufferedInfo_INTERFACE_DEFINED__ */
 
@@ -12474,32 +11094,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileOperationProgressSink* This);
+        IFileOperationProgressSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileOperationProgressSink* This);
+        IFileOperationProgressSink *This);
 
     /*** IFileOperationProgressSink methods ***/
     HRESULT (STDMETHODCALLTYPE *StartOperations)(
-        IFileOperationProgressSink* This);
+        IFileOperationProgressSink *This);
 
     HRESULT (STDMETHODCALLTYPE *FinishOperations)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         HRESULT hrResult);
 
     HRESULT (STDMETHODCALLTYPE *PreRenameItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem,
         LPCWSTR pszNewName);
 
     HRESULT (STDMETHODCALLTYPE *PostRenameItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem,
         LPCWSTR pszNewName,
@@ -12507,14 +11127,14 @@
         IShellItem *psiNewlyCreated);
 
     HRESULT (STDMETHODCALLTYPE *PreMoveItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem,
         IShellItem *psiDestinationFolder,
         LPCWSTR pszNewName);
 
     HRESULT (STDMETHODCALLTYPE *PostMoveItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem,
         IShellItem *psiDestinationFolder,
@@ -12523,14 +11143,14 @@
         IShellItem *psiNewlyCreated);
 
     HRESULT (STDMETHODCALLTYPE *PreCopyItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem,
         IShellItem *psiDestinationFolder,
         LPCWSTR pszNewName);
 
     HRESULT (STDMETHODCALLTYPE *PostCopyItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem,
         IShellItem *psiDestinationFolder,
@@ -12539,25 +11159,25 @@
         IShellItem *psiNewlyCreated);
 
     HRESULT (STDMETHODCALLTYPE *PreDeleteItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem);
 
     HRESULT (STDMETHODCALLTYPE *PostDeleteItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiItem,
         HRESULT hrDelete,
         IShellItem *psiNewlyCreated);
 
     HRESULT (STDMETHODCALLTYPE *PreNewItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiDestinationFolder,
         LPCWSTR pszNewName);
 
     HRESULT (STDMETHODCALLTYPE *PostNewItem)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         DWORD dwFlags,
         IShellItem *psiDestinationFolder,
         LPCWSTR pszNewName,
@@ -12567,21 +11187,22 @@
         IShellItem *psiNewItem);
 
     HRESULT (STDMETHODCALLTYPE *UpdateProgress)(
-        IFileOperationProgressSink* This,
+        IFileOperationProgressSink *This,
         UINT iWorkTotal,
         UINT iWorkSoFar);
 
     HRESULT (STDMETHODCALLTYPE *ResetTimer)(
-        IFileOperationProgressSink* This);
+        IFileOperationProgressSink *This);
 
     HRESULT (STDMETHODCALLTYPE *PauseTimer)(
-        IFileOperationProgressSink* This);
+        IFileOperationProgressSink *This);
 
     HRESULT (STDMETHODCALLTYPE *ResumeTimer)(
-        IFileOperationProgressSink* This);
+        IFileOperationProgressSink *This);
 
     END_INTERFACE
 } IFileOperationProgressSinkVtbl;
+
 interface IFileOperationProgressSink {
     CONST_VTBL IFileOperationProgressSinkVtbl* lpVtbl;
 };
@@ -12674,165 +11295,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_StartOperations_Proxy(
-    IFileOperationProgressSink* This);
-void __RPC_STUB IFileOperationProgressSink_StartOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_FinishOperations_Proxy(
-    IFileOperationProgressSink* This,
-    HRESULT hrResult);
-void __RPC_STUB IFileOperationProgressSink_FinishOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreRenameItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem,
-    LPCWSTR pszNewName);
-void __RPC_STUB IFileOperationProgressSink_PreRenameItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostRenameItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem,
-    LPCWSTR pszNewName,
-    HRESULT hrRename,
-    IShellItem *psiNewlyCreated);
-void __RPC_STUB IFileOperationProgressSink_PostRenameItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreMoveItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszNewName);
-void __RPC_STUB IFileOperationProgressSink_PreMoveItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostMoveItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszNewName,
-    HRESULT hrMove,
-    IShellItem *psiNewlyCreated);
-void __RPC_STUB IFileOperationProgressSink_PostMoveItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreCopyItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszNewName);
-void __RPC_STUB IFileOperationProgressSink_PreCopyItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostCopyItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszNewName,
-    HRESULT hrCopy,
-    IShellItem *psiNewlyCreated);
-void __RPC_STUB IFileOperationProgressSink_PostCopyItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreDeleteItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem);
-void __RPC_STUB IFileOperationProgressSink_PreDeleteItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostDeleteItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiItem,
-    HRESULT hrDelete,
-    IShellItem *psiNewlyCreated);
-void __RPC_STUB IFileOperationProgressSink_PostDeleteItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PreNewItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszNewName);
-void __RPC_STUB IFileOperationProgressSink_PreNewItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PostNewItem_Proxy(
-    IFileOperationProgressSink* This,
-    DWORD dwFlags,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszNewName,
-    LPCWSTR pszTemplateName,
-    DWORD dwFileAttributes,
-    HRESULT hrNew,
-    IShellItem *psiNewItem);
-void __RPC_STUB IFileOperationProgressSink_PostNewItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_UpdateProgress_Proxy(
-    IFileOperationProgressSink* This,
-    UINT iWorkTotal,
-    UINT iWorkSoFar);
-void __RPC_STUB IFileOperationProgressSink_UpdateProgress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_ResetTimer_Proxy(
-    IFileOperationProgressSink* This);
-void __RPC_STUB IFileOperationProgressSink_ResetTimer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_PauseTimer_Proxy(
-    IFileOperationProgressSink* This);
-void __RPC_STUB IFileOperationProgressSink_PauseTimer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperationProgressSink_ResumeTimer_Proxy(
-    IFileOperationProgressSink* This);
-void __RPC_STUB IFileOperationProgressSink_ResumeTimer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileOperationProgressSink_INTERFACE_DEFINED__ */
 
@@ -12900,57 +11362,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellItemArray* This);
+        IShellItemArray *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellItemArray* This);
+        IShellItemArray *This);
 
     /*** IShellItemArray methods ***/
     HRESULT (STDMETHODCALLTYPE *BindToHandler)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         IBindCtx *pbc,
         REFGUID bhid,
         REFIID riid,
         void **ppvOut);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyStore)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         GETPROPERTYSTOREFLAGS flags,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDescriptionList)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         REFPROPERTYKEY keyType,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetAttributes)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         SIATTRIBFLAGS AttribFlags,
         SFGAOF sfgaoMask,
         SFGAOF *psfgaoAttribs);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         DWORD *pdwNumItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemAt)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         DWORD dwIndex,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *EnumItems)(
-        IShellItemArray* This,
+        IShellItemArray *This,
         IEnumShellItems **ppenumShellItems);
 
     END_INTERFACE
 } IShellItemArrayVtbl;
+
 interface IShellItemArray {
     CONST_VTBL IShellItemArrayVtbl* lpVtbl;
 };
@@ -13007,72 +11470,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellItemArray_BindToHandler_Proxy(
-    IShellItemArray* This,
-    IBindCtx *pbc,
-    REFGUID bhid,
-    REFIID riid,
-    void **ppvOut);
-void __RPC_STUB IShellItemArray_BindToHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemArray_GetPropertyStore_Proxy(
-    IShellItemArray* This,
-    GETPROPERTYSTOREFLAGS flags,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItemArray_GetPropertyStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemArray_GetPropertyDescriptionList_Proxy(
-    IShellItemArray* This,
-    REFPROPERTYKEY keyType,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellItemArray_GetPropertyDescriptionList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemArray_GetAttributes_Proxy(
-    IShellItemArray* This,
-    SIATTRIBFLAGS AttribFlags,
-    SFGAOF sfgaoMask,
-    SFGAOF *psfgaoAttribs);
-void __RPC_STUB IShellItemArray_GetAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemArray_GetCount_Proxy(
-    IShellItemArray* This,
-    DWORD *pdwNumItems);
-void __RPC_STUB IShellItemArray_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemArray_GetItemAt_Proxy(
-    IShellItemArray* This,
-    DWORD dwIndex,
-    IShellItem **ppsi);
-void __RPC_STUB IShellItemArray_GetItemAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemArray_EnumItems_Proxy(
-    IShellItemArray* This,
-    IEnumShellItems **ppenumShellItems);
-void __RPC_STUB IShellItemArray_EnumItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellItemArray_INTERFACE_DEFINED__ */
 
@@ -13109,24 +11506,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeWithItem* This,
+        IInitializeWithItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeWithItem* This);
+        IInitializeWithItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeWithItem* This);
+        IInitializeWithItem *This);
 
     /*** IInitializeWithItem methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeWithItem* This,
+        IInitializeWithItem *This,
         IShellItem *psi,
         DWORD grfMode);
 
     END_INTERFACE
 } IInitializeWithItemVtbl;
+
 interface IInitializeWithItem {
     CONST_VTBL IInitializeWithItemVtbl* lpVtbl;
 };
@@ -13159,15 +11557,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInitializeWithItem_Initialize_Proxy(
-    IInitializeWithItem* This,
-    IShellItem *psi,
-    DWORD grfMode);
-void __RPC_STUB IInitializeWithItem_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInitializeWithItem_INTERFACE_DEFINED__ */
 
@@ -13200,28 +11589,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithSelection* This,
+        IObjectWithSelection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithSelection* This);
+        IObjectWithSelection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithSelection* This);
+        IObjectWithSelection *This);
 
     /*** IObjectWithSelection methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSelection)(
-        IObjectWithSelection* This,
+        IObjectWithSelection *This,
         IShellItemArray *psia);
 
     HRESULT (STDMETHODCALLTYPE *GetSelection)(
-        IObjectWithSelection* This,
+        IObjectWithSelection *This,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IObjectWithSelectionVtbl;
+
 interface IObjectWithSelection {
     CONST_VTBL IObjectWithSelectionVtbl* lpVtbl;
 };
@@ -13258,23 +11648,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithSelection_SetSelection_Proxy(
-    IObjectWithSelection* This,
-    IShellItemArray *psia);
-void __RPC_STUB IObjectWithSelection_SetSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IObjectWithSelection_GetSelection_Proxy(
-    IObjectWithSelection* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IObjectWithSelection_GetSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithSelection_INTERFACE_DEFINED__ */
 
@@ -13303,22 +11676,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithBackReferences* This,
+        IObjectWithBackReferences *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithBackReferences* This);
+        IObjectWithBackReferences *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithBackReferences* This);
+        IObjectWithBackReferences *This);
 
     /*** IObjectWithBackReferences methods ***/
     HRESULT (STDMETHODCALLTYPE *RemoveBackReferences)(
-        IObjectWithBackReferences* This);
+        IObjectWithBackReferences *This);
 
     END_INTERFACE
 } IObjectWithBackReferencesVtbl;
+
 interface IObjectWithBackReferences {
     CONST_VTBL IObjectWithBackReferencesVtbl* lpVtbl;
 };
@@ -13351,13 +11725,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithBackReferences_RemoveBackReferences_Proxy(
-    IObjectWithBackReferences* This);
-void __RPC_STUB IObjectWithBackReferences_RemoveBackReferences_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithBackReferences_INTERFACE_DEFINED__ */
 
@@ -13367,7 +11734,6 @@
     PUIFNF_MNEMONIC = 0x1
 };
 
-
 typedef DWORD PROPERTYUI_NAME_FLAGS;
 
 enum _PROPERTYUI_FLAGS {
@@ -13376,7 +11742,6 @@
     PUIF_NOLABELININFOTIP = 0x2
 };
 
-
 typedef DWORD PROPERTYUI_FLAGS;
 
 enum _PROPERTYUI_FORMAT_FLAGS {
@@ -13387,7 +11752,6 @@
     PUIFFDF_FRIENDLYDATE = 0x8
 };
 
-
 typedef DWORD PROPERTYUI_FORMAT_FLAGS;
 
 /*****************************************************************************
@@ -13461,33 +11825,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPropertyUI* This);
+        IPropertyUI *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPropertyUI* This);
+        IPropertyUI *This);
 
     /*** IPropertyUI methods ***/
     HRESULT (STDMETHODCALLTYPE *ParsePropertyName)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         LPCWSTR pszName,
         FMTID *pfmtid,
         PROPID *ppid,
         ULONG *pchEaten);
 
     HRESULT (STDMETHODCALLTYPE *GetCannonicalName)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFFMTID fmtid,
         PROPID pid,
         LPWSTR pwszText,
         DWORD cchText);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayName)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFFMTID fmtid,
         PROPID pid,
         PROPERTYUI_NAME_FLAGS flags,
@@ -13495,26 +11859,26 @@
         DWORD cchText);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDescription)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFFMTID fmtid,
         PROPID pid,
         LPWSTR pwszText,
         DWORD cchText);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultWidth)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFFMTID fmtid,
         PROPID pid,
         ULONG *pcxChars);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFFMTID fmtid,
         PROPID pid,
         PROPERTYUI_FLAGS *pflags);
 
     HRESULT (STDMETHODCALLTYPE *FormatForDisplay)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFFMTID fmtid,
         PROPID pid,
         const PROPVARIANT *ppropvar,
@@ -13523,7 +11887,7 @@
         DWORD cchText);
 
     HRESULT (STDMETHODCALLTYPE *GetHelpInfo)(
-        IPropertyUI* This,
+        IPropertyUI *This,
         REFFMTID fmtid,
         PROPID pid,
         LPWSTR pwszHelpFile,
@@ -13532,6 +11896,7 @@
 
     END_INTERFACE
 } IPropertyUIVtbl;
+
 interface IPropertyUI {
     CONST_VTBL IPropertyUIVtbl* lpVtbl;
 };
@@ -13592,96 +11957,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPropertyUI_ParsePropertyName_Proxy(
-    IPropertyUI* This,
-    LPCWSTR pszName,
-    FMTID *pfmtid,
-    PROPID *ppid,
-    ULONG *pchEaten);
-void __RPC_STUB IPropertyUI_ParsePropertyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyUI_GetCannonicalName_Proxy(
-    IPropertyUI* This,
-    REFFMTID fmtid,
-    PROPID pid,
-    LPWSTR pwszText,
-    DWORD cchText);
-void __RPC_STUB IPropertyUI_GetCannonicalName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyUI_GetDisplayName_Proxy(
-    IPropertyUI* This,
-    REFFMTID fmtid,
-    PROPID pid,
-    PROPERTYUI_NAME_FLAGS flags,
-    LPWSTR pwszText,
-    DWORD cchText);
-void __RPC_STUB IPropertyUI_GetDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyUI_GetPropertyDescription_Proxy(
-    IPropertyUI* This,
-    REFFMTID fmtid,
-    PROPID pid,
-    LPWSTR pwszText,
-    DWORD cchText);
-void __RPC_STUB IPropertyUI_GetPropertyDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyUI_GetDefaultWidth_Proxy(
-    IPropertyUI* This,
-    REFFMTID fmtid,
-    PROPID pid,
-    ULONG *pcxChars);
-void __RPC_STUB IPropertyUI_GetDefaultWidth_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyUI_GetFlags_Proxy(
-    IPropertyUI* This,
-    REFFMTID fmtid,
-    PROPID pid,
-    PROPERTYUI_FLAGS *pflags);
-void __RPC_STUB IPropertyUI_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyUI_FormatForDisplay_Proxy(
-    IPropertyUI* This,
-    REFFMTID fmtid,
-    PROPID pid,
-    const PROPVARIANT *ppropvar,
-    PROPERTYUI_FORMAT_FLAGS puiff,
-    LPWSTR pwszText,
-    DWORD cchText);
-void __RPC_STUB IPropertyUI_FormatForDisplay_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPropertyUI_GetHelpInfo_Proxy(
-    IPropertyUI* This,
-    REFFMTID fmtid,
-    PROPID pid,
-    LPWSTR pwszHelpFile,
-    DWORD cch,
-    UINT *puHelpID);
-void __RPC_STUB IPropertyUI_GetHelpInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPropertyUI_INTERFACE_DEFINED__ */
 
@@ -13738,49 +12013,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICategoryProvider* This,
+        ICategoryProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICategoryProvider* This);
+        ICategoryProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICategoryProvider* This);
+        ICategoryProvider *This);
 
     /*** ICategoryProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *CanCategorizeOnSCID)(
-        ICategoryProvider* This,
+        ICategoryProvider *This,
         const SHCOLUMNID *pscid);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultCategory)(
-        ICategoryProvider* This,
+        ICategoryProvider *This,
         GUID *pguid,
         SHCOLUMNID *pscid);
 
     HRESULT (STDMETHODCALLTYPE *GetCategoryForSCID)(
-        ICategoryProvider* This,
+        ICategoryProvider *This,
         const SHCOLUMNID *pscid,
         GUID *pguid);
 
     HRESULT (STDMETHODCALLTYPE *EnumCategories)(
-        ICategoryProvider* This,
+        ICategoryProvider *This,
         IEnumGUID **penum);
 
     HRESULT (STDMETHODCALLTYPE *GetCategoryName)(
-        ICategoryProvider* This,
+        ICategoryProvider *This,
         const GUID *pguid,
         LPWSTR pszName,
         UINT cch);
 
     HRESULT (STDMETHODCALLTYPE *CreateCategory)(
-        ICategoryProvider* This,
+        ICategoryProvider *This,
         const GUID *pguid,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } ICategoryProviderVtbl;
+
 interface ICategoryProvider {
     CONST_VTBL ICategoryProviderVtbl* lpVtbl;
 };
@@ -13833,60 +12109,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICategoryProvider_CanCategorizeOnSCID_Proxy(
-    ICategoryProvider* This,
-    const SHCOLUMNID *pscid);
-void __RPC_STUB ICategoryProvider_CanCategorizeOnSCID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategoryProvider_GetDefaultCategory_Proxy(
-    ICategoryProvider* This,
-    GUID *pguid,
-    SHCOLUMNID *pscid);
-void __RPC_STUB ICategoryProvider_GetDefaultCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategoryProvider_GetCategoryForSCID_Proxy(
-    ICategoryProvider* This,
-    const SHCOLUMNID *pscid,
-    GUID *pguid);
-void __RPC_STUB ICategoryProvider_GetCategoryForSCID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategoryProvider_EnumCategories_Proxy(
-    ICategoryProvider* This,
-    IEnumGUID **penum);
-void __RPC_STUB ICategoryProvider_EnumCategories_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategoryProvider_GetCategoryName_Proxy(
-    ICategoryProvider* This,
-    const GUID *pguid,
-    LPWSTR pszName,
-    UINT cch);
-void __RPC_STUB ICategoryProvider_GetCategoryName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategoryProvider_CreateCategory_Proxy(
-    ICategoryProvider* This,
-    const GUID *pguid,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ICategoryProvider_CreateCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICategoryProvider_INTERFACE_DEFINED__ */
 
@@ -13955,41 +12177,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICategorizer* This,
+        ICategorizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICategorizer* This);
+        ICategorizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICategorizer* This);
+        ICategorizer *This);
 
     /*** ICategorizer methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        ICategorizer* This,
+        ICategorizer *This,
         LPWSTR pszDesc,
         UINT cch);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        ICategorizer* This,
+        ICategorizer *This,
         UINT cidl,
         PCUITEMID_CHILD_ARRAY apidl,
         DWORD *rgCategoryIds);
 
     HRESULT (STDMETHODCALLTYPE *GetCategoryInfo)(
-        ICategorizer* This,
+        ICategorizer *This,
         DWORD dwCategoryId,
         CATEGORY_INFO *pci);
 
     HRESULT (STDMETHODCALLTYPE *CompareCategory)(
-        ICategorizer* This,
+        ICategorizer *This,
         CATSORT_FLAGS csfFlags,
         DWORD dwCategoryId1,
         DWORD dwCategoryId2);
 
     END_INTERFACE
 } ICategorizerVtbl;
+
 interface ICategorizer {
     CONST_VTBL ICategorizerVtbl* lpVtbl;
 };
@@ -14034,44 +12257,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICategorizer_GetDescription_Proxy(
-    ICategorizer* This,
-    LPWSTR pszDesc,
-    UINT cch);
-void __RPC_STUB ICategorizer_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategorizer_GetCategory_Proxy(
-    ICategorizer* This,
-    UINT cidl,
-    PCUITEMID_CHILD_ARRAY apidl,
-    DWORD *rgCategoryIds);
-void __RPC_STUB ICategorizer_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategorizer_GetCategoryInfo_Proxy(
-    ICategorizer* This,
-    DWORD dwCategoryId,
-    CATEGORY_INFO *pci);
-void __RPC_STUB ICategorizer_GetCategoryInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICategorizer_CompareCategory_Proxy(
-    ICategorizer* This,
-    CATSORT_FLAGS csfFlags,
-    DWORD dwCategoryId1,
-    DWORD dwCategoryId2);
-void __RPC_STUB ICategorizer_CompareCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICategorizer_INTERFACE_DEFINED__ */
 
@@ -14130,44 +12315,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDropTargetHelper* This,
+        IDropTargetHelper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDropTargetHelper* This);
+        IDropTargetHelper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDropTargetHelper* This);
+        IDropTargetHelper *This);
 
     /*** IDropTargetHelper methods ***/
     HRESULT (STDMETHODCALLTYPE *DragEnter)(
-        IDropTargetHelper* This,
+        IDropTargetHelper *This,
         HWND hwndTarget,
         IDataObject *pDataObject,
         POINT *ppt,
         DWORD dwEffect);
 
     HRESULT (STDMETHODCALLTYPE *DragLeave)(
-        IDropTargetHelper* This);
+        IDropTargetHelper *This);
 
     HRESULT (STDMETHODCALLTYPE *DragOver)(
-        IDropTargetHelper* This,
+        IDropTargetHelper *This,
         POINT *ppt,
         DWORD dwEffect);
 
     HRESULT (STDMETHODCALLTYPE *Drop)(
-        IDropTargetHelper* This,
+        IDropTargetHelper *This,
         IDataObject *pDataObject,
         POINT *ppt,
         DWORD dwEffect);
 
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IDropTargetHelper* This,
+        IDropTargetHelper *This,
         WINBOOL fShow);
 
     END_INTERFACE
 } IDropTargetHelperVtbl;
+
 interface IDropTargetHelper {
     CONST_VTBL IDropTargetHelperVtbl* lpVtbl;
 };
@@ -14216,51 +12402,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDropTargetHelper_DragEnter_Proxy(
-    IDropTargetHelper* This,
-    HWND hwndTarget,
-    IDataObject *pDataObject,
-    POINT *ppt,
-    DWORD dwEffect);
-void __RPC_STUB IDropTargetHelper_DragEnter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropTargetHelper_DragLeave_Proxy(
-    IDropTargetHelper* This);
-void __RPC_STUB IDropTargetHelper_DragLeave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropTargetHelper_DragOver_Proxy(
-    IDropTargetHelper* This,
-    POINT *ppt,
-    DWORD dwEffect);
-void __RPC_STUB IDropTargetHelper_DragOver_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropTargetHelper_Drop_Proxy(
-    IDropTargetHelper* This,
-    IDataObject *pDataObject,
-    POINT *ppt,
-    DWORD dwEffect);
-void __RPC_STUB IDropTargetHelper_Drop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDropTargetHelper_Show_Proxy(
-    IDropTargetHelper* This,
-    WINBOOL fShow);
-void __RPC_STUB IDropTargetHelper_Show_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDropTargetHelper_INTERFACE_DEFINED__ */
 
@@ -14295,30 +12436,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDragSourceHelper* This,
+        IDragSourceHelper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDragSourceHelper* This);
+        IDragSourceHelper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDragSourceHelper* This);
+        IDragSourceHelper *This);
 
     /*** IDragSourceHelper methods ***/
     HRESULT (STDMETHODCALLTYPE *InitializeFromBitmap)(
-        IDragSourceHelper* This,
+        IDragSourceHelper *This,
         LPSHDRAGIMAGE pshdi,
         IDataObject *pDataObject);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromWindow)(
-        IDragSourceHelper* This,
+        IDragSourceHelper *This,
         HWND hwnd,
         POINT *ppt,
         IDataObject *pDataObject);
 
     END_INTERFACE
 } IDragSourceHelperVtbl;
+
 interface IDragSourceHelper {
     CONST_VTBL IDragSourceHelperVtbl* lpVtbl;
 };
@@ -14355,25 +12497,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDragSourceHelper_InitializeFromBitmap_Proxy(
-    IDragSourceHelper* This,
-    LPSHDRAGIMAGE pshdi,
-    IDataObject *pDataObject);
-void __RPC_STUB IDragSourceHelper_InitializeFromBitmap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDragSourceHelper_InitializeFromWindow_Proxy(
-    IDragSourceHelper* This,
-    HWND hwnd,
-    POINT *ppt,
-    IDataObject *pDataObject);
-void __RPC_STUB IDragSourceHelper_InitializeFromWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDragSourceHelper_INTERFACE_DEFINED__ */
 
@@ -14409,35 +12532,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDragSourceHelper2* This,
+        IDragSourceHelper2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDragSourceHelper2* This);
+        IDragSourceHelper2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDragSourceHelper2* This);
+        IDragSourceHelper2 *This);
 
     /*** IDragSourceHelper methods ***/
     HRESULT (STDMETHODCALLTYPE *InitializeFromBitmap)(
-        IDragSourceHelper2* This,
+        IDragSourceHelper2 *This,
         LPSHDRAGIMAGE pshdi,
         IDataObject *pDataObject);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromWindow)(
-        IDragSourceHelper2* This,
+        IDragSourceHelper2 *This,
         HWND hwnd,
         POINT *ppt,
         IDataObject *pDataObject);
 
     /*** IDragSourceHelper2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IDragSourceHelper2* This,
+        IDragSourceHelper2 *This,
         DWORD dwFlags);
 
     END_INTERFACE
 } IDragSourceHelper2Vtbl;
+
 interface IDragSourceHelper2 {
     CONST_VTBL IDragSourceHelper2Vtbl* lpVtbl;
 };
@@ -14480,14 +12604,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDragSourceHelper2_SetFlags_Proxy(
-    IDragSourceHelper2* This,
-    DWORD dwFlags);
-void __RPC_STUB IDragSourceHelper2_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDragSourceHelper2_INTERFACE_DEFINED__ */
 
@@ -14608,102 +12724,103 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLinkA* This);
+        IShellLinkA *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLinkA* This);
+        IShellLinkA *This);
 
     /*** IShellLinkA methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPSTR pszFile,
         int cch,
         WIN32_FIND_DATAA *pfd,
         DWORD fFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetIDList)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *SetIDList)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         PCIDLIST_ABSOLUTE pidl);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPSTR pszName,
         int cch);
 
     HRESULT (STDMETHODCALLTYPE *SetDescription)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPCSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *GetWorkingDirectory)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPSTR pszDir,
         int cch);
 
     HRESULT (STDMETHODCALLTYPE *SetWorkingDirectory)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPCSTR pszDir);
 
     HRESULT (STDMETHODCALLTYPE *GetArguments)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPSTR pszArgs,
         int cch);
 
     HRESULT (STDMETHODCALLTYPE *SetArguments)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPCSTR pszArgs);
 
     HRESULT (STDMETHODCALLTYPE *GetHotkey)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         WORD *pwHotkey);
 
     HRESULT (STDMETHODCALLTYPE *SetHotkey)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         WORD wHotkey);
 
     HRESULT (STDMETHODCALLTYPE *GetShowCmd)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         int *piShowCmd);
 
     HRESULT (STDMETHODCALLTYPE *SetShowCmd)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         int iShowCmd);
 
     HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPSTR pszIconPath,
         int cch,
         int *piIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetIconLocation)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPCSTR pszIconPath,
         int iIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetRelativePath)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPCSTR pszPathRel,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Resolve)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         HWND hwnd,
         DWORD fFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetPath)(
-        IShellLinkA* This,
+        IShellLinkA *This,
         LPCSTR pszFile);
 
     END_INTERFACE
 } IShellLinkAVtbl;
+
 interface IShellLinkA {
     CONST_VTBL IShellLinkAVtbl* lpVtbl;
 };
@@ -14804,161 +12921,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetPath_Proxy(
-    IShellLinkA* This,
-    LPSTR pszFile,
-    int cch,
-    WIN32_FIND_DATAA *pfd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkA_GetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetIDList_Proxy(
-    IShellLinkA* This,
-    PIDLIST_ABSOLUTE *ppidl);
-void __RPC_STUB IShellLinkA_GetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetIDList_Proxy(
-    IShellLinkA* This,
-    PCIDLIST_ABSOLUTE pidl);
-void __RPC_STUB IShellLinkA_SetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetDescription_Proxy(
-    IShellLinkA* This,
-    LPSTR pszName,
-    int cch);
-void __RPC_STUB IShellLinkA_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetDescription_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszName);
-void __RPC_STUB IShellLinkA_SetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetWorkingDirectory_Proxy(
-    IShellLinkA* This,
-    LPSTR pszDir,
-    int cch);
-void __RPC_STUB IShellLinkA_GetWorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetWorkingDirectory_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszDir);
-void __RPC_STUB IShellLinkA_SetWorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetArguments_Proxy(
-    IShellLinkA* This,
-    LPSTR pszArgs,
-    int cch);
-void __RPC_STUB IShellLinkA_GetArguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetArguments_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszArgs);
-void __RPC_STUB IShellLinkA_SetArguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetHotkey_Proxy(
-    IShellLinkA* This,
-    WORD *pwHotkey);
-void __RPC_STUB IShellLinkA_GetHotkey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetHotkey_Proxy(
-    IShellLinkA* This,
-    WORD wHotkey);
-void __RPC_STUB IShellLinkA_SetHotkey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetShowCmd_Proxy(
-    IShellLinkA* This,
-    int *piShowCmd);
-void __RPC_STUB IShellLinkA_GetShowCmd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetShowCmd_Proxy(
-    IShellLinkA* This,
-    int iShowCmd);
-void __RPC_STUB IShellLinkA_SetShowCmd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_GetIconLocation_Proxy(
-    IShellLinkA* This,
-    LPSTR pszIconPath,
-    int cch,
-    int *piIcon);
-void __RPC_STUB IShellLinkA_GetIconLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetIconLocation_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszIconPath,
-    int iIcon);
-void __RPC_STUB IShellLinkA_SetIconLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetRelativePath_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszPathRel,
-    DWORD dwReserved);
-void __RPC_STUB IShellLinkA_SetRelativePath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_Resolve_Proxy(
-    IShellLinkA* This,
-    HWND hwnd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkA_Resolve_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkA_SetPath_Proxy(
-    IShellLinkA* This,
-    LPCSTR pszFile);
-void __RPC_STUB IShellLinkA_SetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellLinkA_INTERFACE_DEFINED__ */
 
@@ -15049,102 +13011,103 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLinkW* This);
+        IShellLinkW *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLinkW* This);
+        IShellLinkW *This);
 
     /*** IShellLinkW methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPWSTR pszFile,
         int cch,
         WIN32_FIND_DATAW *pfd,
         DWORD fFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetIDList)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *SetIDList)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         PCIDLIST_ABSOLUTE pidl);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPWSTR pszName,
         int cch);
 
     HRESULT (STDMETHODCALLTYPE *SetDescription)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPCWSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *GetWorkingDirectory)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPWSTR pszDir,
         int cch);
 
     HRESULT (STDMETHODCALLTYPE *SetWorkingDirectory)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPCWSTR pszDir);
 
     HRESULT (STDMETHODCALLTYPE *GetArguments)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPWSTR pszArgs,
         int cch);
 
     HRESULT (STDMETHODCALLTYPE *SetArguments)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPCWSTR pszArgs);
 
     HRESULT (STDMETHODCALLTYPE *GetHotkey)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         WORD *pwHotkey);
 
     HRESULT (STDMETHODCALLTYPE *SetHotkey)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         WORD wHotkey);
 
     HRESULT (STDMETHODCALLTYPE *GetShowCmd)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         int *piShowCmd);
 
     HRESULT (STDMETHODCALLTYPE *SetShowCmd)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         int iShowCmd);
 
     HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPWSTR pszIconPath,
         int cch,
         int *piIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetIconLocation)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPCWSTR pszIconPath,
         int iIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetRelativePath)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPCWSTR pszPathRel,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Resolve)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         HWND hwnd,
         DWORD fFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetPath)(
-        IShellLinkW* This,
+        IShellLinkW *This,
         LPCWSTR pszFile);
 
     END_INTERFACE
 } IShellLinkWVtbl;
+
 interface IShellLinkW {
     CONST_VTBL IShellLinkWVtbl* lpVtbl;
 };
@@ -15245,161 +13208,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetPath_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszFile,
-    int cch,
-    WIN32_FIND_DATAW *pfd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkW_GetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetIDList_Proxy(
-    IShellLinkW* This,
-    PIDLIST_ABSOLUTE *ppidl);
-void __RPC_STUB IShellLinkW_GetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetIDList_Proxy(
-    IShellLinkW* This,
-    PCIDLIST_ABSOLUTE pidl);
-void __RPC_STUB IShellLinkW_SetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetDescription_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszName,
-    int cch);
-void __RPC_STUB IShellLinkW_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetDescription_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszName);
-void __RPC_STUB IShellLinkW_SetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetWorkingDirectory_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszDir,
-    int cch);
-void __RPC_STUB IShellLinkW_GetWorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetWorkingDirectory_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszDir);
-void __RPC_STUB IShellLinkW_SetWorkingDirectory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetArguments_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszArgs,
-    int cch);
-void __RPC_STUB IShellLinkW_GetArguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetArguments_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszArgs);
-void __RPC_STUB IShellLinkW_SetArguments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetHotkey_Proxy(
-    IShellLinkW* This,
-    WORD *pwHotkey);
-void __RPC_STUB IShellLinkW_GetHotkey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetHotkey_Proxy(
-    IShellLinkW* This,
-    WORD wHotkey);
-void __RPC_STUB IShellLinkW_SetHotkey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetShowCmd_Proxy(
-    IShellLinkW* This,
-    int *piShowCmd);
-void __RPC_STUB IShellLinkW_GetShowCmd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetShowCmd_Proxy(
-    IShellLinkW* This,
-    int iShowCmd);
-void __RPC_STUB IShellLinkW_SetShowCmd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_GetIconLocation_Proxy(
-    IShellLinkW* This,
-    LPWSTR pszIconPath,
-    int cch,
-    int *piIcon);
-void __RPC_STUB IShellLinkW_GetIconLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetIconLocation_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszIconPath,
-    int iIcon);
-void __RPC_STUB IShellLinkW_SetIconLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetRelativePath_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszPathRel,
-    DWORD dwReserved);
-void __RPC_STUB IShellLinkW_SetRelativePath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_Resolve_Proxy(
-    IShellLinkW* This,
-    HWND hwnd,
-    DWORD fFlags);
-void __RPC_STUB IShellLinkW_Resolve_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkW_SetPath_Proxy(
-    IShellLinkW* This,
-    LPCWSTR pszFile);
-void __RPC_STUB IShellLinkW_SetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellLinkW_INTERFACE_DEFINED__ */
 
@@ -15441,40 +13249,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLinkDataList* This,
+        IShellLinkDataList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLinkDataList* This);
+        IShellLinkDataList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLinkDataList* This);
+        IShellLinkDataList *This);
 
     /*** IShellLinkDataList methods ***/
     HRESULT (STDMETHODCALLTYPE *AddDataBlock)(
-        IShellLinkDataList* This,
+        IShellLinkDataList *This,
         void *pDataBlock);
 
     HRESULT (STDMETHODCALLTYPE *CopyDataBlock)(
-        IShellLinkDataList* This,
+        IShellLinkDataList *This,
         DWORD dwSig,
         void **ppDataBlock);
 
     HRESULT (STDMETHODCALLTYPE *RemoveDataBlock)(
-        IShellLinkDataList* This,
+        IShellLinkDataList *This,
         DWORD dwSig);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        IShellLinkDataList* This,
+        IShellLinkDataList *This,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IShellLinkDataList* This,
+        IShellLinkDataList *This,
         DWORD dwFlags);
 
     END_INTERFACE
 } IShellLinkDataListVtbl;
+
 interface IShellLinkDataList {
     CONST_VTBL IShellLinkDataListVtbl* lpVtbl;
 };
@@ -15523,30 +13332,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellLinkDataList_RemoveDataBlock_Proxy(
-    IShellLinkDataList* This,
-    DWORD dwSig);
-void __RPC_STUB IShellLinkDataList_RemoveDataBlock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDataList_GetFlags_Proxy(
-    IShellLinkDataList* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IShellLinkDataList_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLinkDataList_SetFlags_Proxy(
-    IShellLinkDataList* This,
-    DWORD dwFlags);
-void __RPC_STUB IShellLinkDataList_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellLinkDataList_INTERFACE_DEFINED__ */
 
@@ -15577,25 +13362,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IResolveShellLink* This,
+        IResolveShellLink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IResolveShellLink* This);
+        IResolveShellLink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IResolveShellLink* This);
+        IResolveShellLink *This);
 
     /*** IResolveShellLink methods ***/
     HRESULT (STDMETHODCALLTYPE *ResolveShellLink)(
-        IResolveShellLink* This,
+        IResolveShellLink *This,
         IUnknown *punkLink,
         HWND hwnd,
         DWORD fFlags);
 
     END_INTERFACE
 } IResolveShellLinkVtbl;
+
 interface IResolveShellLink {
     CONST_VTBL IResolveShellLinkVtbl* lpVtbl;
 };
@@ -15628,16 +13414,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IResolveShellLink_ResolveShellLink_Proxy(
-    IResolveShellLink* This,
-    IUnknown *punkLink,
-    HWND hwnd,
-    DWORD fFlags);
-void __RPC_STUB IResolveShellLink_ResolveShellLink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IResolveShellLink_INTERFACE_DEFINED__ */
 
@@ -15654,7 +13430,6 @@
     SPINITF_NOMINIMIZE = 0x8
 };
 
-
 typedef DWORD SPINITF;
 
 DEFINE_GUID(IID_IActionProgressDialog, 0x49ff1172, 0xeadc, 0x446d, 0x92,0x85, 0x15,0x64,0x53,0xa6,0x43,0x1c);
@@ -15680,28 +13455,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActionProgressDialog* This,
+        IActionProgressDialog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActionProgressDialog* This);
+        IActionProgressDialog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActionProgressDialog* This);
+        IActionProgressDialog *This);
 
     /*** IActionProgressDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IActionProgressDialog* This,
+        IActionProgressDialog *This,
         SPINITF flags,
         LPCWSTR pszTitle,
         LPCWSTR pszCancel);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IActionProgressDialog* This);
+        IActionProgressDialog *This);
 
     END_INTERFACE
 } IActionProgressDialogVtbl;
+
 interface IActionProgressDialog {
     CONST_VTBL IActionProgressDialogVtbl* lpVtbl;
 };
@@ -15738,23 +13514,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActionProgressDialog_Initialize_Proxy(
-    IActionProgressDialog* This,
-    SPINITF flags,
-    LPCWSTR pszTitle,
-    LPCWSTR pszCancel);
-void __RPC_STUB IActionProgressDialog_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActionProgressDialog_Stop_Proxy(
-    IActionProgressDialog* This);
-void __RPC_STUB IActionProgressDialog_Stop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActionProgressDialog_INTERFACE_DEFINED__ */
 
@@ -15795,29 +13554,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHWEventHandler* This,
+        IHWEventHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHWEventHandler* This);
+        IHWEventHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHWEventHandler* This);
+        IHWEventHandler *This);
 
     /*** IHWEventHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IHWEventHandler* This,
+        IHWEventHandler *This,
         LPCWSTR pszParams);
 
     HRESULT (STDMETHODCALLTYPE *HandleEvent)(
-        IHWEventHandler* This,
+        IHWEventHandler *This,
         LPCWSTR pszDeviceID,
         LPCWSTR pszAltDeviceID,
         LPCWSTR pszEventType);
 
     HRESULT (STDMETHODCALLTYPE *HandleEventWithContent)(
-        IHWEventHandler* This,
+        IHWEventHandler *This,
         LPCWSTR pszDeviceID,
         LPCWSTR pszAltDeviceID,
         LPCWSTR pszEventType,
@@ -15826,6 +13585,7 @@
 
     END_INTERFACE
 } IHWEventHandlerVtbl;
+
 interface IHWEventHandler {
     CONST_VTBL IHWEventHandlerVtbl* lpVtbl;
 };
@@ -15866,36 +13626,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHWEventHandler_Initialize_Proxy(
-    IHWEventHandler* This,
-    LPCWSTR pszParams);
-void __RPC_STUB IHWEventHandler_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHWEventHandler_HandleEvent_Proxy(
-    IHWEventHandler* This,
-    LPCWSTR pszDeviceID,
-    LPCWSTR pszAltDeviceID,
-    LPCWSTR pszEventType);
-void __RPC_STUB IHWEventHandler_HandleEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHWEventHandler_HandleEventWithContent_Proxy(
-    IHWEventHandler* This,
-    LPCWSTR pszDeviceID,
-    LPCWSTR pszAltDeviceID,
-    LPCWSTR pszEventType,
-    LPCWSTR pszContentTypeHandler,
-    IDataObject *pdataobject);
-void __RPC_STUB IHWEventHandler_HandleEventWithContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHWEventHandler_INTERFACE_DEFINED__ */
 
@@ -15927,29 +13657,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHWEventHandler2* This,
+        IHWEventHandler2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHWEventHandler2* This);
+        IHWEventHandler2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHWEventHandler2* This);
+        IHWEventHandler2 *This);
 
     /*** IHWEventHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IHWEventHandler2* This,
+        IHWEventHandler2 *This,
         LPCWSTR pszParams);
 
     HRESULT (STDMETHODCALLTYPE *HandleEvent)(
-        IHWEventHandler2* This,
+        IHWEventHandler2 *This,
         LPCWSTR pszDeviceID,
         LPCWSTR pszAltDeviceID,
         LPCWSTR pszEventType);
 
     HRESULT (STDMETHODCALLTYPE *HandleEventWithContent)(
-        IHWEventHandler2* This,
+        IHWEventHandler2 *This,
         LPCWSTR pszDeviceID,
         LPCWSTR pszAltDeviceID,
         LPCWSTR pszEventType,
@@ -15958,7 +13688,7 @@
 
     /*** IHWEventHandler2 methods ***/
     HRESULT (STDMETHODCALLTYPE *HandleEventWithHWND)(
-        IHWEventHandler2* This,
+        IHWEventHandler2 *This,
         LPCWSTR pszDeviceID,
         LPCWSTR pszAltDeviceID,
         LPCWSTR pszEventType,
@@ -15966,6 +13696,7 @@
 
     END_INTERFACE
 } IHWEventHandler2Vtbl;
+
 interface IHWEventHandler2 {
     CONST_VTBL IHWEventHandler2Vtbl* lpVtbl;
 };
@@ -16012,17 +13743,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHWEventHandler2_HandleEventWithHWND_Proxy(
-    IHWEventHandler2* This,
-    LPCWSTR pszDeviceID,
-    LPCWSTR pszAltDeviceID,
-    LPCWSTR pszEventType,
-    HWND hwndOwner);
-void __RPC_STUB IHWEventHandler2_HandleEventWithHWND_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHWEventHandler2_INTERFACE_DEFINED__ */
 
@@ -16082,19 +13802,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IQueryCancelAutoPlay* This,
+        IQueryCancelAutoPlay *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IQueryCancelAutoPlay* This);
+        IQueryCancelAutoPlay *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IQueryCancelAutoPlay* This);
+        IQueryCancelAutoPlay *This);
 
     /*** IQueryCancelAutoPlay methods ***/
     HRESULT (STDMETHODCALLTYPE *AllowAutoPlay)(
-        IQueryCancelAutoPlay* This,
+        IQueryCancelAutoPlay *This,
         LPCWSTR pszPath,
         DWORD dwContentType,
         LPCWSTR pszLabel,
@@ -16102,6 +13822,7 @@
 
     END_INTERFACE
 } IQueryCancelAutoPlayVtbl;
+
 interface IQueryCancelAutoPlay {
     CONST_VTBL IQueryCancelAutoPlayVtbl* lpVtbl;
 };
@@ -16134,17 +13855,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IQueryCancelAutoPlay_AllowAutoPlay_Proxy(
-    IQueryCancelAutoPlay* This,
-    LPCWSTR pszPath,
-    DWORD dwContentType,
-    LPCWSTR pszLabel,
-    DWORD dwSerialNumber);
-void __RPC_STUB IQueryCancelAutoPlay_AllowAutoPlay_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IQueryCancelAutoPlay_INTERFACE_DEFINED__ */
 
@@ -16176,25 +13886,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDynamicHWHandler* This,
+        IDynamicHWHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDynamicHWHandler* This);
+        IDynamicHWHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDynamicHWHandler* This);
+        IDynamicHWHandler *This);
 
     /*** IDynamicHWHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDynamicInfo)(
-        IDynamicHWHandler* This,
+        IDynamicHWHandler *This,
         LPCWSTR pszDeviceID,
         DWORD dwContentType,
         LPWSTR *ppszAction);
 
     END_INTERFACE
 } IDynamicHWHandlerVtbl;
+
 interface IDynamicHWHandler {
     CONST_VTBL IDynamicHWHandlerVtbl* lpVtbl;
 };
@@ -16227,16 +13938,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDynamicHWHandler_GetDynamicInfo_Proxy(
-    IDynamicHWHandler* This,
-    LPCWSTR pszDeviceID,
-    DWORD dwContentType,
-    LPWSTR *ppszAction);
-void __RPC_STUB IDynamicHWHandler_GetDynamicInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDynamicHWHandler_INTERFACE_DEFINED__ */
 
@@ -16256,7 +13957,6 @@
     SPBEGINF_NOCANCELBUTTON = 0x40
 };
 
-
 typedef DWORD SPBEGINF;
 
 typedef enum _SPACTION {
@@ -16318,45 +14018,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IActionProgress* This,
+        IActionProgress *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IActionProgress* This);
+        IActionProgress *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IActionProgress* This);
+        IActionProgress *This);
 
     /*** IActionProgress methods ***/
     HRESULT (STDMETHODCALLTYPE *Begin)(
-        IActionProgress* This,
+        IActionProgress *This,
         SPACTION action,
         SPBEGINF flags);
 
     HRESULT (STDMETHODCALLTYPE *UpdateProgress)(
-        IActionProgress* This,
+        IActionProgress *This,
         ULONGLONG ulCompleted,
         ULONGLONG ulTotal);
 
     HRESULT (STDMETHODCALLTYPE *UpdateText)(
-        IActionProgress* This,
+        IActionProgress *This,
         SPTEXT sptext,
         LPCWSTR pszText,
         WINBOOL fMayCompact);
 
     HRESULT (STDMETHODCALLTYPE *QueryCancel)(
-        IActionProgress* This,
+        IActionProgress *This,
         WINBOOL *pfCancelled);
 
     HRESULT (STDMETHODCALLTYPE *ResetCancel)(
-        IActionProgress* This);
+        IActionProgress *This);
 
     HRESULT (STDMETHODCALLTYPE *End)(
-        IActionProgress* This);
+        IActionProgress *This);
 
     END_INTERFACE
 } IActionProgressVtbl;
+
 interface IActionProgress {
     CONST_VTBL IActionProgressVtbl* lpVtbl;
 };
@@ -16409,56 +14110,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IActionProgress_Begin_Proxy(
-    IActionProgress* This,
-    SPACTION action,
-    SPBEGINF flags);
-void __RPC_STUB IActionProgress_Begin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActionProgress_UpdateProgress_Proxy(
-    IActionProgress* This,
-    ULONGLONG ulCompleted,
-    ULONGLONG ulTotal);
-void __RPC_STUB IActionProgress_UpdateProgress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActionProgress_UpdateText_Proxy(
-    IActionProgress* This,
-    SPTEXT sptext,
-    LPCWSTR pszText,
-    WINBOOL fMayCompact);
-void __RPC_STUB IActionProgress_UpdateText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActionProgress_QueryCancel_Proxy(
-    IActionProgress* This,
-    WINBOOL *pfCancelled);
-void __RPC_STUB IActionProgress_QueryCancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActionProgress_ResetCancel_Proxy(
-    IActionProgress* This);
-void __RPC_STUB IActionProgress_ResetCancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IActionProgress_End_Proxy(
-    IActionProgress* This);
-void __RPC_STUB IActionProgress_End_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IActionProgress_INTERFACE_DEFINED__ */
 
@@ -16489,25 +14140,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellExtInit* This,
+        IShellExtInit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellExtInit* This);
+        IShellExtInit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellExtInit* This);
+        IShellExtInit *This);
 
     /*** IShellExtInit methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IShellExtInit* This,
+        IShellExtInit *This,
         PCIDLIST_ABSOLUTE pidlFolder,
         IDataObject *pdtobj,
         HKEY hkeyProgID);
 
     END_INTERFACE
 } IShellExtInitVtbl;
+
 interface IShellExtInit {
     CONST_VTBL IShellExtInitVtbl* lpVtbl;
 };
@@ -16540,16 +14192,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellExtInit_Initialize_Proxy(
-    IShellExtInit* This,
-    PCIDLIST_ABSOLUTE pidlFolder,
-    IDataObject *pdtobj,
-    HKEY hkeyProgID);
-void __RPC_STUB IShellExtInit_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellExtInit_INTERFACE_DEFINED__ */
 
@@ -16565,7 +14207,6 @@
     EXPPS_FILETYPES = 0x1
 };
 
-
 typedef UINT EXPPS;
 
 DEFINE_GUID(IID_IShellPropSheetExt, 0x000214e9, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46);
@@ -16592,30 +14233,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellPropSheetExt* This,
+        IShellPropSheetExt *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellPropSheetExt* This);
+        IShellPropSheetExt *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellPropSheetExt* This);
+        IShellPropSheetExt *This);
 
     /*** IShellPropSheetExt methods ***/
     HRESULT (STDMETHODCALLTYPE *AddPages)(
-        IShellPropSheetExt* This,
+        IShellPropSheetExt *This,
         LPFNSVADDPROPSHEETPAGE pfnAddPage,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *ReplacePage)(
-        IShellPropSheetExt* This,
+        IShellPropSheetExt *This,
         EXPPS uPageID,
         LPFNSVADDPROPSHEETPAGE pfnReplaceWith,
         LPARAM lParam);
 
     END_INTERFACE
 } IShellPropSheetExtVtbl;
+
 interface IShellPropSheetExt {
     CONST_VTBL IShellPropSheetExtVtbl* lpVtbl;
 };
@@ -16652,25 +14294,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellPropSheetExt_AddPages_Proxy(
-    IShellPropSheetExt* This,
-    LPFNSVADDPROPSHEETPAGE pfnAddPage,
-    LPARAM lParam);
-void __RPC_STUB IShellPropSheetExt_AddPages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellPropSheetExt_ReplacePage_Proxy(
-    IShellPropSheetExt* This,
-    EXPPS uPageID,
-    LPFNSVADDPROPSHEETPAGE pfnReplaceWith,
-    LPARAM lParam);
-void __RPC_STUB IShellPropSheetExt_ReplacePage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellPropSheetExt_INTERFACE_DEFINED__ */
 
@@ -16701,24 +14324,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRemoteComputer* This,
+        IRemoteComputer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRemoteComputer* This);
+        IRemoteComputer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRemoteComputer* This);
+        IRemoteComputer *This);
 
     /*** IRemoteComputer methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IRemoteComputer* This,
+        IRemoteComputer *This,
         LPCWSTR pszMachine,
         WINBOOL bEnumerating);
 
     END_INTERFACE
 } IRemoteComputerVtbl;
+
 interface IRemoteComputer {
     CONST_VTBL IRemoteComputerVtbl* lpVtbl;
 };
@@ -16751,15 +14375,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IRemoteComputer_Initialize_Proxy(
-    IRemoteComputer* This,
-    LPCWSTR pszMachine,
-    WINBOOL bEnumerating);
-void __RPC_STUB IRemoteComputer_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IRemoteComputer_INTERFACE_DEFINED__ */
 
@@ -16788,22 +14403,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IQueryContinue* This,
+        IQueryContinue *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IQueryContinue* This);
+        IQueryContinue *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IQueryContinue* This);
+        IQueryContinue *This);
 
     /*** IQueryContinue methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryContinue)(
-        IQueryContinue* This);
+        IQueryContinue *This);
 
     END_INTERFACE
 } IQueryContinueVtbl;
+
 interface IQueryContinue {
     CONST_VTBL IQueryContinueVtbl* lpVtbl;
 };
@@ -16836,13 +14452,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IQueryContinue_QueryContinue_Proxy(
-    IQueryContinue* This);
-void __RPC_STUB IQueryContinue_QueryContinue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IQueryContinue_INTERFACE_DEFINED__ */
 
@@ -16871,23 +14480,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithCancelEvent* This,
+        IObjectWithCancelEvent *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithCancelEvent* This);
+        IObjectWithCancelEvent *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithCancelEvent* This);
+        IObjectWithCancelEvent *This);
 
     /*** IObjectWithCancelEvent methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCancelEvent)(
-        IObjectWithCancelEvent* This,
+        IObjectWithCancelEvent *This,
         HANDLE *phEvent);
 
     END_INTERFACE
 } IObjectWithCancelEventVtbl;
+
 interface IObjectWithCancelEvent {
     CONST_VTBL IObjectWithCancelEventVtbl* lpVtbl;
 };
@@ -16920,14 +14530,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithCancelEvent_GetCancelEvent_Proxy(
-    IObjectWithCancelEvent* This,
-    HANDLE *phEvent);
-void __RPC_STUB IObjectWithCancelEvent_GetCancelEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithCancelEvent_INTERFACE_DEFINED__ */
 
@@ -16974,45 +14576,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUserNotification* This,
+        IUserNotification *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUserNotification* This);
+        IUserNotification *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUserNotification* This);
+        IUserNotification *This);
 
     /*** IUserNotification methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBalloonInfo)(
-        IUserNotification* This,
+        IUserNotification *This,
         LPCWSTR pszTitle,
         LPCWSTR pszText,
         DWORD dwInfoFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetBalloonRetry)(
-        IUserNotification* This,
+        IUserNotification *This,
         DWORD dwShowTime,
         DWORD dwInterval,
         UINT cRetryCount);
 
     HRESULT (STDMETHODCALLTYPE *SetIconInfo)(
-        IUserNotification* This,
+        IUserNotification *This,
         HICON hIcon,
         LPCWSTR pszToolTip);
 
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IUserNotification* This,
+        IUserNotification *This,
         IQueryContinue *pqc,
         DWORD dwContinuePollInterval);
 
     HRESULT (STDMETHODCALLTYPE *PlaySound)(
-        IUserNotification* This,
+        IUserNotification *This,
         LPCWSTR pszSoundName);
 
     END_INTERFACE
 } IUserNotificationVtbl;
+
 interface IUserNotification {
     CONST_VTBL IUserNotificationVtbl* lpVtbl;
 };
@@ -17061,52 +14664,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUserNotification_SetBalloonInfo_Proxy(
-    IUserNotification* This,
-    LPCWSTR pszTitle,
-    LPCWSTR pszText,
-    DWORD dwInfoFlags);
-void __RPC_STUB IUserNotification_SetBalloonInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification_SetBalloonRetry_Proxy(
-    IUserNotification* This,
-    DWORD dwShowTime,
-    DWORD dwInterval,
-    UINT cRetryCount);
-void __RPC_STUB IUserNotification_SetBalloonRetry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification_SetIconInfo_Proxy(
-    IUserNotification* This,
-    HICON hIcon,
-    LPCWSTR pszToolTip);
-void __RPC_STUB IUserNotification_SetIconInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification_Show_Proxy(
-    IUserNotification* This,
-    IQueryContinue *pqc,
-    DWORD dwContinuePollInterval);
-void __RPC_STUB IUserNotification_Show_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification_PlaySound_Proxy(
-    IUserNotification* This,
-    LPCWSTR pszSoundName);
-void __RPC_STUB IUserNotification_PlaySound_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUserNotification_INTERFACE_DEFINED__ */
 
@@ -17141,31 +14698,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUserNotificationCallback* This,
+        IUserNotificationCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUserNotificationCallback* This);
+        IUserNotificationCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUserNotificationCallback* This);
+        IUserNotificationCallback *This);
 
     /*** IUserNotificationCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *OnBalloonUserClick)(
-        IUserNotificationCallback* This,
+        IUserNotificationCallback *This,
         POINT *pt);
 
     HRESULT (STDMETHODCALLTYPE *OnLeftClick)(
-        IUserNotificationCallback* This,
+        IUserNotificationCallback *This,
         POINT *pt);
 
     HRESULT (STDMETHODCALLTYPE *OnContextMenu)(
-        IUserNotificationCallback* This,
+        IUserNotificationCallback *This,
         POINT *pt);
 
     END_INTERFACE
 } IUserNotificationCallbackVtbl;
+
 interface IUserNotificationCallback {
     CONST_VTBL IUserNotificationCallbackVtbl* lpVtbl;
 };
@@ -17206,30 +14764,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUserNotificationCallback_OnBalloonUserClick_Proxy(
-    IUserNotificationCallback* This,
-    POINT *pt);
-void __RPC_STUB IUserNotificationCallback_OnBalloonUserClick_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotificationCallback_OnLeftClick_Proxy(
-    IUserNotificationCallback* This,
-    POINT *pt);
-void __RPC_STUB IUserNotificationCallback_OnLeftClick_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotificationCallback_OnContextMenu_Proxy(
-    IUserNotificationCallback* This,
-    POINT *pt);
-void __RPC_STUB IUserNotificationCallback_OnContextMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUserNotificationCallback_INTERFACE_DEFINED__ */
 
@@ -17277,46 +14811,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUserNotification2* This,
+        IUserNotification2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUserNotification2* This);
+        IUserNotification2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUserNotification2* This);
+        IUserNotification2 *This);
 
     /*** IUserNotification2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetBalloonInfo)(
-        IUserNotification2* This,
+        IUserNotification2 *This,
         LPCWSTR pszTitle,
         LPCWSTR pszText,
         DWORD dwInfoFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetBalloonRetry)(
-        IUserNotification2* This,
+        IUserNotification2 *This,
         DWORD dwShowTime,
         DWORD dwInterval,
         UINT cRetryCount);
 
     HRESULT (STDMETHODCALLTYPE *SetIconInfo)(
-        IUserNotification2* This,
+        IUserNotification2 *This,
         HICON hIcon,
         LPCWSTR pszToolTip);
 
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IUserNotification2* This,
+        IUserNotification2 *This,
         IQueryContinue *pqc,
         DWORD dwContinuePollInterval,
         IUserNotificationCallback *pSink);
 
     HRESULT (STDMETHODCALLTYPE *PlaySound)(
-        IUserNotification2* This,
+        IUserNotification2 *This,
         LPCWSTR pszSoundName);
 
     END_INTERFACE
 } IUserNotification2Vtbl;
+
 interface IUserNotification2 {
     CONST_VTBL IUserNotification2Vtbl* lpVtbl;
 };
@@ -17365,53 +14900,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUserNotification2_SetBalloonInfo_Proxy(
-    IUserNotification2* This,
-    LPCWSTR pszTitle,
-    LPCWSTR pszText,
-    DWORD dwInfoFlags);
-void __RPC_STUB IUserNotification2_SetBalloonInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification2_SetBalloonRetry_Proxy(
-    IUserNotification2* This,
-    DWORD dwShowTime,
-    DWORD dwInterval,
-    UINT cRetryCount);
-void __RPC_STUB IUserNotification2_SetBalloonRetry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification2_SetIconInfo_Proxy(
-    IUserNotification2* This,
-    HICON hIcon,
-    LPCWSTR pszToolTip);
-void __RPC_STUB IUserNotification2_SetIconInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification2_Show_Proxy(
-    IUserNotification2* This,
-    IQueryContinue *pqc,
-    DWORD dwContinuePollInterval,
-    IUserNotificationCallback *pSink);
-void __RPC_STUB IUserNotification2_Show_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUserNotification2_PlaySound_Proxy(
-    IUserNotification2* This,
-    LPCWSTR pszSoundName);
-void __RPC_STUB IUserNotification2_PlaySound_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUserNotification2_INTERFACE_DEFINED__ */
 
@@ -17445,29 +14933,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IItemNameLimits* This,
+        IItemNameLimits *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IItemNameLimits* This);
+        IItemNameLimits *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IItemNameLimits* This);
+        IItemNameLimits *This);
 
     /*** IItemNameLimits methods ***/
     HRESULT (STDMETHODCALLTYPE *GetValidCharacters)(
-        IItemNameLimits* This,
+        IItemNameLimits *This,
         LPWSTR *ppwszValidChars,
         LPWSTR *ppwszInvalidChars);
 
     HRESULT (STDMETHODCALLTYPE *GetMaxLength)(
-        IItemNameLimits* This,
+        IItemNameLimits *This,
         LPCWSTR pszName,
         int *piMaxNameLen);
 
     END_INTERFACE
 } IItemNameLimitsVtbl;
+
 interface IItemNameLimits {
     CONST_VTBL IItemNameLimitsVtbl* lpVtbl;
 };
@@ -17504,24 +14993,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IItemNameLimits_GetValidCharacters_Proxy(
-    IItemNameLimits* This,
-    LPWSTR *ppwszValidChars,
-    LPWSTR *ppwszInvalidChars);
-void __RPC_STUB IItemNameLimits_GetValidCharacters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IItemNameLimits_GetMaxLength_Proxy(
-    IItemNameLimits* This,
-    LPCWSTR pszName,
-    int *piMaxNameLen);
-void __RPC_STUB IItemNameLimits_GetMaxLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IItemNameLimits_INTERFACE_DEFINED__ */
 
@@ -17530,6 +15001,9 @@
 #ifndef __ICondition_FWD_DEFINED__
 #define __ICondition_FWD_DEFINED__
 typedef interface ICondition ICondition;
+#ifdef __cplusplus
+interface ICondition;
+#endif /* __cplusplus */
 #endif
 
 
@@ -17594,71 +15068,72 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearchFolderItemFactory* This);
+        ISearchFolderItemFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearchFolderItemFactory* This);
+        ISearchFolderItemFactory *This);
 
     /*** ISearchFolderItemFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *SetDisplayName)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         LPCWSTR pszDisplayName);
 
     HRESULT (STDMETHODCALLTYPE *SetFolderTypeID)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         FOLDERTYPEID ftid);
 
     HRESULT (STDMETHODCALLTYPE *SetFolderLogicalViewMode)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         FOLDERLOGICALVIEWMODE flvm);
 
     HRESULT (STDMETHODCALLTYPE *SetIconSize)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         int iIconSize);
 
     HRESULT (STDMETHODCALLTYPE *SetVisibleColumns)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         UINT cVisibleColumns,
         PROPERTYKEY *rgKey);
 
     HRESULT (STDMETHODCALLTYPE *SetSortColumns)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         UINT cSortColumns,
         SORTCOLUMN *rgSortColumns);
 
     HRESULT (STDMETHODCALLTYPE *SetGroupColumn)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         REFPROPERTYKEY keyGroup);
 
     HRESULT (STDMETHODCALLTYPE *SetStacks)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         UINT cStackKeys,
         PROPERTYKEY *rgStackKeys);
 
     HRESULT (STDMETHODCALLTYPE *SetScope)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         IShellItemArray *psiaScope);
 
     HRESULT (STDMETHODCALLTYPE *SetCondition)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         ICondition *pCondition);
 
     HRESULT (STDMETHODCALLTYPE *GetShellItem)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetIDList)(
-        ISearchFolderItemFactory* This,
+        ISearchFolderItemFactory *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     END_INTERFACE
 } ISearchFolderItemFactoryVtbl;
+
 interface ISearchFolderItemFactory {
     CONST_VTBL ISearchFolderItemFactoryVtbl* lpVtbl;
 };
@@ -17735,106 +15210,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetDisplayName_Proxy(
-    ISearchFolderItemFactory* This,
-    LPCWSTR pszDisplayName);
-void __RPC_STUB ISearchFolderItemFactory_SetDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetFolderTypeID_Proxy(
-    ISearchFolderItemFactory* This,
-    FOLDERTYPEID ftid);
-void __RPC_STUB ISearchFolderItemFactory_SetFolderTypeID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetFolderLogicalViewMode_Proxy(
-    ISearchFolderItemFactory* This,
-    FOLDERLOGICALVIEWMODE flvm);
-void __RPC_STUB ISearchFolderItemFactory_SetFolderLogicalViewMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetIconSize_Proxy(
-    ISearchFolderItemFactory* This,
-    int iIconSize);
-void __RPC_STUB ISearchFolderItemFactory_SetIconSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetVisibleColumns_Proxy(
-    ISearchFolderItemFactory* This,
-    UINT cVisibleColumns,
-    PROPERTYKEY *rgKey);
-void __RPC_STUB ISearchFolderItemFactory_SetVisibleColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetSortColumns_Proxy(
-    ISearchFolderItemFactory* This,
-    UINT cSortColumns,
-    SORTCOLUMN *rgSortColumns);
-void __RPC_STUB ISearchFolderItemFactory_SetSortColumns_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetGroupColumn_Proxy(
-    ISearchFolderItemFactory* This,
-    REFPROPERTYKEY keyGroup);
-void __RPC_STUB ISearchFolderItemFactory_SetGroupColumn_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetStacks_Proxy(
-    ISearchFolderItemFactory* This,
-    UINT cStackKeys,
-    PROPERTYKEY *rgStackKeys);
-void __RPC_STUB ISearchFolderItemFactory_SetStacks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetScope_Proxy(
-    ISearchFolderItemFactory* This,
-    IShellItemArray *psiaScope);
-void __RPC_STUB ISearchFolderItemFactory_SetScope_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_SetCondition_Proxy(
-    ISearchFolderItemFactory* This,
-    ICondition *pCondition);
-void __RPC_STUB ISearchFolderItemFactory_SetCondition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_GetShellItem_Proxy(
-    ISearchFolderItemFactory* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ISearchFolderItemFactory_GetShellItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISearchFolderItemFactory_GetIDList_Proxy(
-    ISearchFolderItemFactory* This,
-    PIDLIST_ABSOLUTE *ppidl);
-void __RPC_STUB ISearchFolderItemFactory_GetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearchFolderItemFactory_INTERFACE_DEFINED__ */
 
@@ -17888,19 +15263,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExtractImage* This,
+        IExtractImage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExtractImage* This);
+        IExtractImage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExtractImage* This);
+        IExtractImage *This);
 
     /*** IExtractImage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLocation)(
-        IExtractImage* This,
+        IExtractImage *This,
         LPWSTR pszPathBuffer,
         DWORD cch,
         DWORD *pdwPriority,
@@ -17909,11 +15284,12 @@
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *Extract)(
-        IExtractImage* This,
+        IExtractImage *This,
         HBITMAP *phBmpThumbnail);
 
     END_INTERFACE
 } IExtractImageVtbl;
+
 interface IExtractImage {
     CONST_VTBL IExtractImageVtbl* lpVtbl;
 };
@@ -17950,27 +15326,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExtractImage_GetLocation_Proxy(
-    IExtractImage* This,
-    LPWSTR pszPathBuffer,
-    DWORD cch,
-    DWORD *pdwPriority,
-    const SIZE *prgSize,
-    DWORD dwRecClrDepth,
-    DWORD *pdwFlags);
-void __RPC_STUB IExtractImage_GetLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExtractImage_Extract_Proxy(
-    IExtractImage* This,
-    HBITMAP *phBmpThumbnail);
-void __RPC_STUB IExtractImage_Extract_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExtractImage_INTERFACE_DEFINED__ */
 
@@ -18000,19 +15355,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExtractImage2* This,
+        IExtractImage2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExtractImage2* This);
+        IExtractImage2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExtractImage2* This);
+        IExtractImage2 *This);
 
     /*** IExtractImage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLocation)(
-        IExtractImage2* This,
+        IExtractImage2 *This,
         LPWSTR pszPathBuffer,
         DWORD cch,
         DWORD *pdwPriority,
@@ -18021,16 +15376,17 @@
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *Extract)(
-        IExtractImage2* This,
+        IExtractImage2 *This,
         HBITMAP *phBmpThumbnail);
 
     /*** IExtractImage2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDateStamp)(
-        IExtractImage2* This,
+        IExtractImage2 *This,
         FILETIME *pDateStamp);
 
     END_INTERFACE
 } IExtractImage2Vtbl;
+
 interface IExtractImage2 {
     CONST_VTBL IExtractImage2Vtbl* lpVtbl;
 };
@@ -18073,14 +15429,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExtractImage2_GetDateStamp_Proxy(
-    IExtractImage2* This,
-    FILETIME *pDateStamp);
-void __RPC_STUB IExtractImage2_GetDateStamp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExtractImage2_INTERFACE_DEFINED__ */
 
@@ -18113,19 +15461,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IThumbnailHandlerFactory* This,
+        IThumbnailHandlerFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IThumbnailHandlerFactory* This);
+        IThumbnailHandlerFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IThumbnailHandlerFactory* This);
+        IThumbnailHandlerFactory *This);
 
     /*** IThumbnailHandlerFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *GetThumbnailHandler)(
-        IThumbnailHandlerFactory* This,
+        IThumbnailHandlerFactory *This,
         PCUITEMID_CHILD pidlChild,
         IBindCtx *pbc,
         REFIID riid,
@@ -18133,6 +15481,7 @@
 
     END_INTERFACE
 } IThumbnailHandlerFactoryVtbl;
+
 interface IThumbnailHandlerFactory {
     CONST_VTBL IThumbnailHandlerFactoryVtbl* lpVtbl;
 };
@@ -18165,17 +15514,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IThumbnailHandlerFactory_GetThumbnailHandler_Proxy(
-    IThumbnailHandlerFactory* This,
-    PCUITEMID_CHILD pidlChild,
-    IBindCtx *pbc,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IThumbnailHandlerFactory_GetThumbnailHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IThumbnailHandlerFactory_INTERFACE_DEFINED__ */
 
@@ -18211,31 +15549,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IParentAndItem* This,
+        IParentAndItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IParentAndItem* This);
+        IParentAndItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IParentAndItem* This);
+        IParentAndItem *This);
 
     /*** IParentAndItem methods ***/
     HRESULT (STDMETHODCALLTYPE *SetParentAndItem)(
-        IParentAndItem* This,
+        IParentAndItem *This,
         PCIDLIST_ABSOLUTE pidlParent,
         IShellFolder *psf,
         PCUITEMID_CHILD pidlChild);
 
     HRESULT (STDMETHODCALLTYPE *GetParentAndItem)(
-        IParentAndItem* This,
+        IParentAndItem *This,
         PIDLIST_ABSOLUTE *ppidlParent,
         IShellFolder **ppsf,
         PITEMID_CHILD *ppidlChild);
 
     END_INTERFACE
 } IParentAndItemVtbl;
+
 interface IParentAndItem {
     CONST_VTBL IParentAndItemVtbl* lpVtbl;
 };
@@ -18272,16 +15611,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IParentAndItem_SetParentAndItem_Proxy(
-    IParentAndItem* This,
-    PCIDLIST_ABSOLUTE pidlParent,
-    IShellFolder *psf,
-    PCUITEMID_CHILD pidlChild);
-void __RPC_STUB IParentAndItem_SetParentAndItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IParentAndItem_RemoteGetParentAndItem_Proxy(
     IParentAndItem* This,
     PIDLIST_ABSOLUTE *ppidlParent,
@@ -18338,42 +15667,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDockingWindow* This,
+        IDockingWindow *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDockingWindow* This);
+        IDockingWindow *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDockingWindow* This);
+        IDockingWindow *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IDockingWindow* This,
+        IDockingWindow *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IDockingWindow* This,
+        IDockingWindow *This,
         WINBOOL fEnterMode);
 
     /*** IDockingWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowDW)(
-        IDockingWindow* This,
+        IDockingWindow *This,
         WINBOOL fShow);
 
     HRESULT (STDMETHODCALLTYPE *CloseDW)(
-        IDockingWindow* This,
+        IDockingWindow *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ResizeBorderDW)(
-        IDockingWindow* This,
+        IDockingWindow *This,
         LPCRECT prcBorder,
         IUnknown *punkToolbarSite,
         WINBOOL fReserved);
 
     END_INTERFACE
 } IDockingWindowVtbl;
+
 interface IDockingWindow {
     CONST_VTBL IDockingWindowVtbl* lpVtbl;
 };
@@ -18424,32 +15754,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDockingWindow_ShowDW_Proxy(
-    IDockingWindow* This,
-    WINBOOL fShow);
-void __RPC_STUB IDockingWindow_ShowDW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDockingWindow_CloseDW_Proxy(
-    IDockingWindow* This,
-    DWORD dwReserved);
-void __RPC_STUB IDockingWindow_CloseDW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDockingWindow_ResizeBorderDW_Proxy(
-    IDockingWindow* This,
-    LPCRECT prcBorder,
-    IUnknown *punkToolbarSite,
-    WINBOOL fReserved);
-void __RPC_STUB IDockingWindow_ResizeBorderDW_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDockingWindow_INTERFACE_DEFINED__ */
 
@@ -18508,7 +15812,6 @@
     DBID_PERMITAUTOHIDE = 7
 };
 
-
 #define DBPC_SELECTFIRST    (DWORD)-1
 #define DBPC_SELECTLAST     (DWORD)-2
 
@@ -18540,49 +15843,50 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDeskBand* This,
+        IDeskBand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDeskBand* This);
+        IDeskBand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDeskBand* This);
+        IDeskBand *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IDeskBand* This,
+        IDeskBand *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IDeskBand* This,
+        IDeskBand *This,
         WINBOOL fEnterMode);
 
     /*** IDockingWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowDW)(
-        IDeskBand* This,
+        IDeskBand *This,
         WINBOOL fShow);
 
     HRESULT (STDMETHODCALLTYPE *CloseDW)(
-        IDeskBand* This,
+        IDeskBand *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ResizeBorderDW)(
-        IDeskBand* This,
+        IDeskBand *This,
         LPCRECT prcBorder,
         IUnknown *punkToolbarSite,
         WINBOOL fReserved);
 
     /*** IDeskBand methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBandInfo)(
-        IDeskBand* This,
+        IDeskBand *This,
         DWORD dwBandID,
         DWORD dwViewMode,
         DESKBANDINFO *pdbi);
 
     END_INTERFACE
 } IDeskBandVtbl;
+
 interface IDeskBand {
     CONST_VTBL IDeskBandVtbl* lpVtbl;
 };
@@ -18639,16 +15943,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDeskBand_GetBandInfo_Proxy(
-    IDeskBand* This,
-    DWORD dwBandID,
-    DWORD dwViewMode,
-    DESKBANDINFO *pdbi);
-void __RPC_STUB IDeskBand_GetBandInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDeskBand_INTERFACE_DEFINED__ */
 
@@ -18680,25 +15974,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDeskBandInfo* This,
+        IDeskBandInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDeskBandInfo* This);
+        IDeskBandInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDeskBandInfo* This);
+        IDeskBandInfo *This);
 
     /*** IDeskBandInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDefaultBandWidth)(
-        IDeskBandInfo* This,
+        IDeskBandInfo *This,
         DWORD dwBandID,
         DWORD dwViewMode,
         int *pnWidth);
 
     END_INTERFACE
 } IDeskBandInfoVtbl;
+
 interface IDeskBandInfo {
     CONST_VTBL IDeskBandInfoVtbl* lpVtbl;
 };
@@ -18731,16 +16026,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDeskBandInfo_GetDefaultBandWidth_Proxy(
-    IDeskBandInfo* This,
-    DWORD dwBandID,
-    DWORD dwViewMode,
-    int *pnWidth);
-void __RPC_STUB IDeskBandInfo_GetDefaultBandWidth_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDeskBandInfo_INTERFACE_DEFINED__ */
 
@@ -18775,62 +16060,63 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDeskBand2* This);
+        IDeskBand2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDeskBand2* This);
+        IDeskBand2 *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         WINBOOL fEnterMode);
 
     /*** IDockingWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowDW)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         WINBOOL fShow);
 
     HRESULT (STDMETHODCALLTYPE *CloseDW)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ResizeBorderDW)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         LPCRECT prcBorder,
         IUnknown *punkToolbarSite,
         WINBOOL fReserved);
 
     /*** IDeskBand methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBandInfo)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         DWORD dwBandID,
         DWORD dwViewMode,
         DESKBANDINFO *pdbi);
 
     /*** IDeskBand2 methods ***/
     HRESULT (STDMETHODCALLTYPE *CanRenderComposited)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         WINBOOL *pfCanRenderComposited);
 
     HRESULT (STDMETHODCALLTYPE *SetCompositionState)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         WINBOOL fCompositionEnabled);
 
     HRESULT (STDMETHODCALLTYPE *GetCompositionState)(
-        IDeskBand2* This,
+        IDeskBand2 *This,
         WINBOOL *pfCompositionEnabled);
 
     END_INTERFACE
 } IDeskBand2Vtbl;
+
 interface IDeskBand2 {
     CONST_VTBL IDeskBand2Vtbl* lpVtbl;
 };
@@ -18901,30 +16187,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDeskBand2_CanRenderComposited_Proxy(
-    IDeskBand2* This,
-    WINBOOL *pfCanRenderComposited);
-void __RPC_STUB IDeskBand2_CanRenderComposited_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDeskBand2_SetCompositionState_Proxy(
-    IDeskBand2* This,
-    WINBOOL fCompositionEnabled);
-void __RPC_STUB IDeskBand2_SetCompositionState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDeskBand2_GetCompositionState_Proxy(
-    IDeskBand2* This,
-    WINBOOL *pfCompositionEnabled);
-void __RPC_STUB IDeskBand2_GetCompositionState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDeskBand2_INTERFACE_DEFINED__ */
 
@@ -18966,38 +16228,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITaskbarList* This,
+        ITaskbarList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITaskbarList* This);
+        ITaskbarList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITaskbarList* This);
+        ITaskbarList *This);
 
     /*** ITaskbarList methods ***/
     HRESULT (STDMETHODCALLTYPE *HrInit)(
-        ITaskbarList* This);
+        ITaskbarList *This);
 
     HRESULT (STDMETHODCALLTYPE *AddTab)(
-        ITaskbarList* This,
+        ITaskbarList *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *DeleteTab)(
-        ITaskbarList* This,
+        ITaskbarList *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *ActivateTab)(
-        ITaskbarList* This,
+        ITaskbarList *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveAlt)(
-        ITaskbarList* This,
+        ITaskbarList *This,
         HWND hwnd);
 
     END_INTERFACE
 } ITaskbarListVtbl;
+
 interface ITaskbarList {
     CONST_VTBL ITaskbarListVtbl* lpVtbl;
 };
@@ -19046,45 +16309,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITaskbarList_HrInit_Proxy(
-    ITaskbarList* This);
-void __RPC_STUB ITaskbarList_HrInit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList_AddTab_Proxy(
-    ITaskbarList* This,
-    HWND hwnd);
-void __RPC_STUB ITaskbarList_AddTab_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList_DeleteTab_Proxy(
-    ITaskbarList* This,
-    HWND hwnd);
-void __RPC_STUB ITaskbarList_DeleteTab_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList_ActivateTab_Proxy(
-    ITaskbarList* This,
-    HWND hwnd);
-void __RPC_STUB ITaskbarList_ActivateTab_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList_SetActiveAlt_Proxy(
-    ITaskbarList* This,
-    HWND hwnd);
-void __RPC_STUB ITaskbarList_SetActiveAlt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITaskbarList_INTERFACE_DEFINED__ */
 
@@ -19114,44 +16338,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITaskbarList2* This,
+        ITaskbarList2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITaskbarList2* This);
+        ITaskbarList2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITaskbarList2* This);
+        ITaskbarList2 *This);
 
     /*** ITaskbarList methods ***/
     HRESULT (STDMETHODCALLTYPE *HrInit)(
-        ITaskbarList2* This);
+        ITaskbarList2 *This);
 
     HRESULT (STDMETHODCALLTYPE *AddTab)(
-        ITaskbarList2* This,
+        ITaskbarList2 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *DeleteTab)(
-        ITaskbarList2* This,
+        ITaskbarList2 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *ActivateTab)(
-        ITaskbarList2* This,
+        ITaskbarList2 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveAlt)(
-        ITaskbarList2* This,
+        ITaskbarList2 *This,
         HWND hwnd);
 
     /*** ITaskbarList2 methods ***/
     HRESULT (STDMETHODCALLTYPE *MarkFullscreenWindow)(
-        ITaskbarList2* This,
+        ITaskbarList2 *This,
         HWND hwnd,
         WINBOOL fFullscreen);
 
     END_INTERFACE
 } ITaskbarList2Vtbl;
+
 interface ITaskbarList2 {
     CONST_VTBL ITaskbarList2Vtbl* lpVtbl;
 };
@@ -19206,15 +16431,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITaskbarList2_MarkFullscreenWindow_Proxy(
-    ITaskbarList2* This,
-    HWND hwnd,
-    WINBOOL fFullscreen);
-void __RPC_STUB ITaskbarList2_MarkFullscreenWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITaskbarList2_INTERFACE_DEFINED__ */
 
@@ -19341,109 +16557,110 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITaskbarList3* This);
+        ITaskbarList3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITaskbarList3* This);
+        ITaskbarList3 *This);
 
     /*** ITaskbarList methods ***/
     HRESULT (STDMETHODCALLTYPE *HrInit)(
-        ITaskbarList3* This);
+        ITaskbarList3 *This);
 
     HRESULT (STDMETHODCALLTYPE *AddTab)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *DeleteTab)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *ActivateTab)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveAlt)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd);
 
     /*** ITaskbarList2 methods ***/
     HRESULT (STDMETHODCALLTYPE *MarkFullscreenWindow)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         WINBOOL fFullscreen);
 
     /*** ITaskbarList3 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetProgressValue)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         ULONGLONG ullCompleted,
         ULONGLONG ullTotal);
 
     HRESULT (STDMETHODCALLTYPE *SetProgressState)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         TBPFLAG tbpFlags);
 
     HRESULT (STDMETHODCALLTYPE *RegisterTab)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwndTab,
         HWND hwndMDI);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterTab)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwndTab);
 
     HRESULT (STDMETHODCALLTYPE *SetTabOrder)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwndTab,
         HWND hwndInsertBefore);
 
     HRESULT (STDMETHODCALLTYPE *SetTabActive)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwndTab,
         HWND hwndMDI,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ThumbBarAddButtons)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         UINT cButtons,
         LPTHUMBBUTTON pButton);
 
     HRESULT (STDMETHODCALLTYPE *ThumbBarUpdateButtons)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         UINT cButtons,
         LPTHUMBBUTTON pButton);
 
     HRESULT (STDMETHODCALLTYPE *ThumbBarSetImageList)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         HIMAGELIST himl);
 
     HRESULT (STDMETHODCALLTYPE *SetOverlayIcon)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         HICON hIcon,
         LPCWSTR pszDescription);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnailTooltip)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         LPCWSTR pszTip);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnailClip)(
-        ITaskbarList3* This,
+        ITaskbarList3 *This,
         HWND hwnd,
         RECT *prcClip);
 
     END_INTERFACE
 } ITaskbarList3Vtbl;
+
 interface ITaskbarList3 {
     CONST_VTBL ITaskbarList3Vtbl* lpVtbl;
 };
@@ -19548,118 +16765,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITaskbarList3_SetProgressValue_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    ULONGLONG ullCompleted,
-    ULONGLONG ullTotal);
-void __RPC_STUB ITaskbarList3_SetProgressValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_SetProgressState_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    TBPFLAG tbpFlags);
-void __RPC_STUB ITaskbarList3_SetProgressState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_RegisterTab_Proxy(
-    ITaskbarList3* This,
-    HWND hwndTab,
-    HWND hwndMDI);
-void __RPC_STUB ITaskbarList3_RegisterTab_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_UnregisterTab_Proxy(
-    ITaskbarList3* This,
-    HWND hwndTab);
-void __RPC_STUB ITaskbarList3_UnregisterTab_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_SetTabOrder_Proxy(
-    ITaskbarList3* This,
-    HWND hwndTab,
-    HWND hwndInsertBefore);
-void __RPC_STUB ITaskbarList3_SetTabOrder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_SetTabActive_Proxy(
-    ITaskbarList3* This,
-    HWND hwndTab,
-    HWND hwndMDI,
-    DWORD dwReserved);
-void __RPC_STUB ITaskbarList3_SetTabActive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_ThumbBarAddButtons_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    UINT cButtons,
-    LPTHUMBBUTTON pButton);
-void __RPC_STUB ITaskbarList3_ThumbBarAddButtons_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_ThumbBarUpdateButtons_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    UINT cButtons,
-    LPTHUMBBUTTON pButton);
-void __RPC_STUB ITaskbarList3_ThumbBarUpdateButtons_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_ThumbBarSetImageList_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    HIMAGELIST himl);
-void __RPC_STUB ITaskbarList3_ThumbBarSetImageList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_SetOverlayIcon_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    HICON hIcon,
-    LPCWSTR pszDescription);
-void __RPC_STUB ITaskbarList3_SetOverlayIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_SetThumbnailTooltip_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    LPCWSTR pszTip);
-void __RPC_STUB ITaskbarList3_SetThumbnailTooltip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITaskbarList3_SetThumbnailClip_Proxy(
-    ITaskbarList3* This,
-    HWND hwnd,
-    RECT *prcClip);
-void __RPC_STUB ITaskbarList3_SetThumbnailClip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITaskbarList3_INTERFACE_DEFINED__ */
 
@@ -19699,115 +16804,116 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITaskbarList4* This);
+        ITaskbarList4 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITaskbarList4* This);
+        ITaskbarList4 *This);
 
     /*** ITaskbarList methods ***/
     HRESULT (STDMETHODCALLTYPE *HrInit)(
-        ITaskbarList4* This);
+        ITaskbarList4 *This);
 
     HRESULT (STDMETHODCALLTYPE *AddTab)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *DeleteTab)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *ActivateTab)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *SetActiveAlt)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd);
 
     /*** ITaskbarList2 methods ***/
     HRESULT (STDMETHODCALLTYPE *MarkFullscreenWindow)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         WINBOOL fFullscreen);
 
     /*** ITaskbarList3 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetProgressValue)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         ULONGLONG ullCompleted,
         ULONGLONG ullTotal);
 
     HRESULT (STDMETHODCALLTYPE *SetProgressState)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         TBPFLAG tbpFlags);
 
     HRESULT (STDMETHODCALLTYPE *RegisterTab)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwndTab,
         HWND hwndMDI);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterTab)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwndTab);
 
     HRESULT (STDMETHODCALLTYPE *SetTabOrder)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwndTab,
         HWND hwndInsertBefore);
 
     HRESULT (STDMETHODCALLTYPE *SetTabActive)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwndTab,
         HWND hwndMDI,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ThumbBarAddButtons)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         UINT cButtons,
         LPTHUMBBUTTON pButton);
 
     HRESULT (STDMETHODCALLTYPE *ThumbBarUpdateButtons)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         UINT cButtons,
         LPTHUMBBUTTON pButton);
 
     HRESULT (STDMETHODCALLTYPE *ThumbBarSetImageList)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         HIMAGELIST himl);
 
     HRESULT (STDMETHODCALLTYPE *SetOverlayIcon)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         HICON hIcon,
         LPCWSTR pszDescription);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnailTooltip)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         LPCWSTR pszTip);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnailClip)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwnd,
         RECT *prcClip);
 
     /*** ITaskbarList4 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetTabProperties)(
-        ITaskbarList4* This,
+        ITaskbarList4 *This,
         HWND hwndTab,
         STPFLAG stpFlags);
 
     END_INTERFACE
 } ITaskbarList4Vtbl;
+
 interface ITaskbarList4 {
     CONST_VTBL ITaskbarList4Vtbl* lpVtbl;
 };
@@ -19918,15 +17024,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITaskbarList4_SetTabProperties_Proxy(
-    ITaskbarList4* This,
-    HWND hwndTab,
-    STPFLAG stpFlags);
-void __RPC_STUB ITaskbarList4_SetTabProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITaskbarList4_INTERFACE_DEFINED__ */
 
@@ -19955,23 +17052,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IStartMenuPinnedList* This,
+        IStartMenuPinnedList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IStartMenuPinnedList* This);
+        IStartMenuPinnedList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IStartMenuPinnedList* This);
+        IStartMenuPinnedList *This);
 
     /*** IStartMenuPinnedList methods ***/
     HRESULT (STDMETHODCALLTYPE *RemoveFromList)(
-        IStartMenuPinnedList* This,
+        IStartMenuPinnedList *This,
         IShellItem *pitem);
 
     END_INTERFACE
 } IStartMenuPinnedListVtbl;
+
 interface IStartMenuPinnedList {
     CONST_VTBL IStartMenuPinnedListVtbl* lpVtbl;
 };
@@ -20004,14 +17102,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IStartMenuPinnedList_RemoveFromList_Proxy(
-    IStartMenuPinnedList* This,
-    IShellItem *pitem);
-void __RPC_STUB IStartMenuPinnedList_RemoveFromList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IStartMenuPinnedList_INTERFACE_DEFINED__ */
 
@@ -20047,32 +17137,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICDBurn* This,
+        ICDBurn *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICDBurn* This);
+        ICDBurn *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICDBurn* This);
+        ICDBurn *This);
 
     /*** ICDBurn methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRecorderDriveLetter)(
-        ICDBurn* This,
+        ICDBurn *This,
         LPWSTR pszDrive,
         UINT cch);
 
     HRESULT (STDMETHODCALLTYPE *Burn)(
-        ICDBurn* This,
+        ICDBurn *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *HasRecordableDrive)(
-        ICDBurn* This,
+        ICDBurn *This,
         WINBOOL *pfHasRecorder);
 
     END_INTERFACE
 } ICDBurnVtbl;
+
 interface ICDBurn {
     CONST_VTBL ICDBurnVtbl* lpVtbl;
 };
@@ -20113,31 +17204,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICDBurn_GetRecorderDriveLetter_Proxy(
-    ICDBurn* This,
-    LPWSTR pszDrive,
-    UINT cch);
-void __RPC_STUB ICDBurn_GetRecorderDriveLetter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICDBurn_Burn_Proxy(
-    ICDBurn* This,
-    HWND hwnd);
-void __RPC_STUB ICDBurn_Burn_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICDBurn_HasRecordableDrive_Proxy(
-    ICDBurn* This,
-    WINBOOL *pfHasRecorder);
-void __RPC_STUB ICDBurn_HasRecordableDrive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICDBurn_INTERFACE_DEFINED__ */
 
@@ -20175,31 +17241,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWizardSite* This,
+        IWizardSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWizardSite* This);
+        IWizardSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWizardSite* This);
+        IWizardSite *This);
 
     /*** IWizardSite methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPreviousPage)(
-        IWizardSite* This,
+        IWizardSite *This,
         HPROPSHEETPAGE *phpage);
 
     HRESULT (STDMETHODCALLTYPE *GetNextPage)(
-        IWizardSite* This,
+        IWizardSite *This,
         HPROPSHEETPAGE *phpage);
 
     HRESULT (STDMETHODCALLTYPE *GetCancelledPage)(
-        IWizardSite* This,
+        IWizardSite *This,
         HPROPSHEETPAGE *phpage);
 
     END_INTERFACE
 } IWizardSiteVtbl;
+
 interface IWizardSite {
     CONST_VTBL IWizardSiteVtbl* lpVtbl;
 };
@@ -20240,30 +17307,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWizardSite_GetPreviousPage_Proxy(
-    IWizardSite* This,
-    HPROPSHEETPAGE *phpage);
-void __RPC_STUB IWizardSite_GetPreviousPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWizardSite_GetNextPage_Proxy(
-    IWizardSite* This,
-    HPROPSHEETPAGE *phpage);
-void __RPC_STUB IWizardSite_GetNextPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWizardSite_GetCancelledPage_Proxy(
-    IWizardSite* This,
-    HPROPSHEETPAGE *phpage);
-void __RPC_STUB IWizardSite_GetCancelledPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWizardSite_INTERFACE_DEFINED__ */
 
@@ -20302,33 +17345,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWizardExtension* This,
+        IWizardExtension *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWizardExtension* This);
+        IWizardExtension *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWizardExtension* This);
+        IWizardExtension *This);
 
     /*** IWizardExtension methods ***/
     HRESULT (STDMETHODCALLTYPE *AddPages)(
-        IWizardExtension* This,
+        IWizardExtension *This,
         HPROPSHEETPAGE *aPages,
         UINT cPages,
         UINT *pnPagesAdded);
 
     HRESULT (STDMETHODCALLTYPE *GetFirstPage)(
-        IWizardExtension* This,
+        IWizardExtension *This,
         HPROPSHEETPAGE *phpage);
 
     HRESULT (STDMETHODCALLTYPE *GetLastPage)(
-        IWizardExtension* This,
+        IWizardExtension *This,
         HPROPSHEETPAGE *phpage);
 
     END_INTERFACE
 } IWizardExtensionVtbl;
+
 interface IWizardExtension {
     CONST_VTBL IWizardExtensionVtbl* lpVtbl;
 };
@@ -20369,32 +17413,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWizardExtension_AddPages_Proxy(
-    IWizardExtension* This,
-    HPROPSHEETPAGE *aPages,
-    UINT cPages,
-    UINT *pnPagesAdded);
-void __RPC_STUB IWizardExtension_AddPages_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWizardExtension_GetFirstPage_Proxy(
-    IWizardExtension* This,
-    HPROPSHEETPAGE *phpage);
-void __RPC_STUB IWizardExtension_GetFirstPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWizardExtension_GetLastPage_Proxy(
-    IWizardExtension* This,
-    HPROPSHEETPAGE *phpage);
-void __RPC_STUB IWizardExtension_GetLastPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWizardExtension_INTERFACE_DEFINED__ */
 
@@ -20426,42 +17444,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWebWizardExtension* This,
+        IWebWizardExtension *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWebWizardExtension* This);
+        IWebWizardExtension *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWebWizardExtension* This);
+        IWebWizardExtension *This);
 
     /*** IWizardExtension methods ***/
     HRESULT (STDMETHODCALLTYPE *AddPages)(
-        IWebWizardExtension* This,
+        IWebWizardExtension *This,
         HPROPSHEETPAGE *aPages,
         UINT cPages,
         UINT *pnPagesAdded);
 
     HRESULT (STDMETHODCALLTYPE *GetFirstPage)(
-        IWebWizardExtension* This,
+        IWebWizardExtension *This,
         HPROPSHEETPAGE *phpage);
 
     HRESULT (STDMETHODCALLTYPE *GetLastPage)(
-        IWebWizardExtension* This,
+        IWebWizardExtension *This,
         HPROPSHEETPAGE *phpage);
 
     /*** IWebWizardExtension methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInitialURL)(
-        IWebWizardExtension* This,
+        IWebWizardExtension *This,
         LPCWSTR pszURL);
 
     HRESULT (STDMETHODCALLTYPE *SetErrorURL)(
-        IWebWizardExtension* This,
+        IWebWizardExtension *This,
         LPCWSTR pszErrorURL);
 
     END_INTERFACE
 } IWebWizardExtensionVtbl;
+
 interface IWebWizardExtension {
     CONST_VTBL IWebWizardExtensionVtbl* lpVtbl;
 };
@@ -20512,22 +17531,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWebWizardExtension_SetInitialURL_Proxy(
-    IWebWizardExtension* This,
-    LPCWSTR pszURL);
-void __RPC_STUB IWebWizardExtension_SetInitialURL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWebWizardExtension_SetErrorURL_Proxy(
-    IWebWizardExtension* This,
-    LPCWSTR pszErrorURL);
-void __RPC_STUB IWebWizardExtension_SetErrorURL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWebWizardExtension_INTERFACE_DEFINED__ */
 
@@ -20546,6 +17549,9 @@
 #ifndef __IXMLDOMDocument_FWD_DEFINED__
 #define __IXMLDOMDocument_FWD_DEFINED__
 typedef interface IXMLDOMDocument IXMLDOMDocument;
+#ifdef __cplusplus
+interface IXMLDOMDocument;
+#endif /* __cplusplus */
 #endif
 
 
@@ -20579,45 +17585,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPublishingWizard* This,
+        IPublishingWizard *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPublishingWizard* This);
+        IPublishingWizard *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPublishingWizard* This);
+        IPublishingWizard *This);
 
     /*** IWizardExtension methods ***/
     HRESULT (STDMETHODCALLTYPE *AddPages)(
-        IPublishingWizard* This,
+        IPublishingWizard *This,
         HPROPSHEETPAGE *aPages,
         UINT cPages,
         UINT *pnPagesAdded);
 
     HRESULT (STDMETHODCALLTYPE *GetFirstPage)(
-        IPublishingWizard* This,
+        IPublishingWizard *This,
         HPROPSHEETPAGE *phpage);
 
     HRESULT (STDMETHODCALLTYPE *GetLastPage)(
-        IPublishingWizard* This,
+        IPublishingWizard *This,
         HPROPSHEETPAGE *phpage);
 
     /*** IPublishingWizard methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IPublishingWizard* This,
+        IPublishingWizard *This,
         IDataObject *pdo,
         DWORD dwOptions,
         LPCWSTR pszServiceScope);
 
     HRESULT (STDMETHODCALLTYPE *GetTransferManifest)(
-        IPublishingWizard* This,
+        IPublishingWizard *This,
         HRESULT *phrFromTransfer,
         IXMLDOMDocument **pdocManifest);
 
     END_INTERFACE
 } IPublishingWizardVtbl;
+
 interface IPublishingWizard {
     CONST_VTBL IPublishingWizardVtbl* lpVtbl;
 };
@@ -20668,25 +17675,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPublishingWizard_Initialize_Proxy(
-    IPublishingWizard* This,
-    IDataObject *pdo,
-    DWORD dwOptions,
-    LPCWSTR pszServiceScope);
-void __RPC_STUB IPublishingWizard_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPublishingWizard_GetTransferManifest_Proxy(
-    IPublishingWizard* This,
-    HRESULT *phrFromTransfer,
-    IXMLDOMDocument **pdocManifest);
-void __RPC_STUB IPublishingWizard_GetTransferManifest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPublishingWizard_INTERFACE_DEFINED__ */
 
@@ -20717,25 +17705,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderViewHost* This,
+        IFolderViewHost *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderViewHost* This);
+        IFolderViewHost *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderViewHost* This);
+        IFolderViewHost *This);
 
     /*** IFolderViewHost methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IFolderViewHost* This,
+        IFolderViewHost *This,
         HWND hwndParent,
         IDataObject *pdo,
         RECT *prc);
 
     END_INTERFACE
 } IFolderViewHostVtbl;
+
 interface IFolderViewHost {
     CONST_VTBL IFolderViewHostVtbl* lpVtbl;
 };
@@ -20768,16 +17757,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderViewHost_Initialize_Proxy(
-    IFolderViewHost* This,
-    HWND hwndParent,
-    IDataObject *pdo,
-    RECT *prc);
-void __RPC_STUB IFolderViewHost_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderViewHost_INTERFACE_DEFINED__ */
 
@@ -20816,35 +17795,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExplorerBrowserEvents* This,
+        IExplorerBrowserEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExplorerBrowserEvents* This);
+        IExplorerBrowserEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExplorerBrowserEvents* This);
+        IExplorerBrowserEvents *This);
 
     /*** IExplorerBrowserEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnNavigationPending)(
-        IExplorerBrowserEvents* This,
+        IExplorerBrowserEvents *This,
         PCIDLIST_ABSOLUTE pidlFolder);
 
     HRESULT (STDMETHODCALLTYPE *OnViewCreated)(
-        IExplorerBrowserEvents* This,
+        IExplorerBrowserEvents *This,
         IShellView *psv);
 
     HRESULT (STDMETHODCALLTYPE *OnNavigationComplete)(
-        IExplorerBrowserEvents* This,
+        IExplorerBrowserEvents *This,
         PCIDLIST_ABSOLUTE pidlFolder);
 
     HRESULT (STDMETHODCALLTYPE *OnNavigationFailed)(
-        IExplorerBrowserEvents* This,
+        IExplorerBrowserEvents *This,
         PCIDLIST_ABSOLUTE pidlFolder);
 
     END_INTERFACE
 } IExplorerBrowserEventsVtbl;
+
 interface IExplorerBrowserEvents {
     CONST_VTBL IExplorerBrowserEventsVtbl* lpVtbl;
 };
@@ -20889,38 +17869,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnNavigationPending_Proxy(
-    IExplorerBrowserEvents* This,
-    PCIDLIST_ABSOLUTE pidlFolder);
-void __RPC_STUB IExplorerBrowserEvents_OnNavigationPending_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnViewCreated_Proxy(
-    IExplorerBrowserEvents* This,
-    IShellView *psv);
-void __RPC_STUB IExplorerBrowserEvents_OnViewCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnNavigationComplete_Proxy(
-    IExplorerBrowserEvents* This,
-    PCIDLIST_ABSOLUTE pidlFolder);
-void __RPC_STUB IExplorerBrowserEvents_OnNavigationComplete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowserEvents_OnNavigationFailed_Proxy(
-    IExplorerBrowserEvents* This,
-    PCIDLIST_ABSOLUTE pidlFolder);
-void __RPC_STUB IExplorerBrowserEvents_OnNavigationFailed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExplorerBrowserEvents_INTERFACE_DEFINED__ */
 
@@ -21021,85 +17969,86 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExplorerBrowser* This);
+        IExplorerBrowser *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExplorerBrowser* This);
+        IExplorerBrowser *This);
 
     /*** IExplorerBrowser methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         HWND hwndParent,
         const RECT *prc,
         const FOLDERSETTINGS *pfs);
 
     HRESULT (STDMETHODCALLTYPE *Destroy)(
-        IExplorerBrowser* This);
+        IExplorerBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *SetRect)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         HDWP *phdwp,
         RECT rcBrowser);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyBag)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         LPCWSTR pszPropertyBag);
 
     HRESULT (STDMETHODCALLTYPE *SetEmptyText)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         LPCWSTR pszEmptyText);
 
     HRESULT (STDMETHODCALLTYPE *SetFolderSettings)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         const FOLDERSETTINGS *pfs);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         IExplorerBrowserEvents *psbe,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *SetOptions)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         EXPLORER_BROWSER_OPTIONS dwFlag);
 
     HRESULT (STDMETHODCALLTYPE *GetOptions)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         EXPLORER_BROWSER_OPTIONS *pdwFlag);
 
     HRESULT (STDMETHODCALLTYPE *BrowseToIDList)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         PCUIDLIST_RELATIVE pidl,
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *BrowseToObject)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         IUnknown *punk,
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *FillFromObject)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         IUnknown *punk,
         EXPLORER_BROWSER_FILL_FLAGS dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAll)(
-        IExplorerBrowser* This);
+        IExplorerBrowser *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentView)(
-        IExplorerBrowser* This,
+        IExplorerBrowser *This,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IExplorerBrowserVtbl;
+
 interface IExplorerBrowser {
     CONST_VTBL IExplorerBrowserVtbl* lpVtbl;
 };
@@ -21188,113 +18137,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_Destroy_Proxy(
-    IExplorerBrowser* This);
-void __RPC_STUB IExplorerBrowser_Destroy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetPropertyBag_Proxy(
-    IExplorerBrowser* This,
-    LPCWSTR pszPropertyBag);
-void __RPC_STUB IExplorerBrowser_SetPropertyBag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetEmptyText_Proxy(
-    IExplorerBrowser* This,
-    LPCWSTR pszEmptyText);
-void __RPC_STUB IExplorerBrowser_SetEmptyText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetFolderSettings_Proxy(
-    IExplorerBrowser* This,
-    const FOLDERSETTINGS *pfs);
-void __RPC_STUB IExplorerBrowser_SetFolderSettings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_Advise_Proxy(
-    IExplorerBrowser* This,
-    IExplorerBrowserEvents *psbe,
-    DWORD *pdwCookie);
-void __RPC_STUB IExplorerBrowser_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_Unadvise_Proxy(
-    IExplorerBrowser* This,
-    DWORD dwCookie);
-void __RPC_STUB IExplorerBrowser_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_SetOptions_Proxy(
-    IExplorerBrowser* This,
-    EXPLORER_BROWSER_OPTIONS dwFlag);
-void __RPC_STUB IExplorerBrowser_SetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_GetOptions_Proxy(
-    IExplorerBrowser* This,
-    EXPLORER_BROWSER_OPTIONS *pdwFlag);
-void __RPC_STUB IExplorerBrowser_GetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_BrowseToIDList_Proxy(
-    IExplorerBrowser* This,
-    PCUIDLIST_RELATIVE pidl,
-    UINT uFlags);
-void __RPC_STUB IExplorerBrowser_BrowseToIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_BrowseToObject_Proxy(
-    IExplorerBrowser* This,
-    IUnknown *punk,
-    UINT uFlags);
-void __RPC_STUB IExplorerBrowser_BrowseToObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_FillFromObject_Proxy(
-    IExplorerBrowser* This,
-    IUnknown *punk,
-    EXPLORER_BROWSER_FILL_FLAGS dwFlags);
-void __RPC_STUB IExplorerBrowser_FillFromObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_RemoveAll_Proxy(
-    IExplorerBrowser* This);
-void __RPC_STUB IExplorerBrowser_RemoveAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerBrowser_GetCurrentView_Proxy(
-    IExplorerBrowser* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IExplorerBrowser_GetCurrentView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExplorerBrowser_INTERFACE_DEFINED__ */
 
@@ -21323,23 +18165,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAccessibleObject* This,
+        IAccessibleObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAccessibleObject* This);
+        IAccessibleObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAccessibleObject* This);
+        IAccessibleObject *This);
 
     /*** IAccessibleObject methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAccessibleName)(
-        IAccessibleObject* This,
+        IAccessibleObject *This,
         LPCWSTR pszName);
 
     END_INTERFACE
 } IAccessibleObjectVtbl;
+
 interface IAccessibleObject {
     CONST_VTBL IAccessibleObjectVtbl* lpVtbl;
 };
@@ -21372,14 +18215,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAccessibleObject_SetAccessibleName_Proxy(
-    IAccessibleObject* This,
-    LPCWSTR pszName);
-void __RPC_STUB IAccessibleObject_SetAccessibleName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAccessibleObject_INTERFACE_DEFINED__ */
 
@@ -21422,39 +18257,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IResultsFolder* This,
+        IResultsFolder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IResultsFolder* This);
+        IResultsFolder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IResultsFolder* This);
+        IResultsFolder *This);
 
     /*** IResultsFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *AddItem)(
-        IResultsFolder* This,
+        IResultsFolder *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *AddIDList)(
-        IResultsFolder* This,
+        IResultsFolder *This,
         PCIDLIST_ABSOLUTE pidl,
         PITEMID_CHILD *ppidlAdded);
 
     HRESULT (STDMETHODCALLTYPE *RemoveItem)(
-        IResultsFolder* This,
+        IResultsFolder *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *RemoveIDList)(
-        IResultsFolder* This,
+        IResultsFolder *This,
         PCIDLIST_ABSOLUTE pidl);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAll)(
-        IResultsFolder* This);
+        IResultsFolder *This);
 
     END_INTERFACE
 } IResultsFolderVtbl;
+
 interface IResultsFolder {
     CONST_VTBL IResultsFolderVtbl* lpVtbl;
 };
@@ -21503,14 +18339,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IResultsFolder_AddItem_Proxy(
-    IResultsFolder* This,
-    IShellItem *psi);
-void __RPC_STUB IResultsFolder_AddItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IResultsFolder_RemoteAddIDList_Proxy(
     IResultsFolder* This,
     PCIDLIST_ABSOLUTE pidl,
@@ -21520,29 +18348,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResultsFolder_RemoveItem_Proxy(
-    IResultsFolder* This,
-    IShellItem *psi);
-void __RPC_STUB IResultsFolder_RemoveItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResultsFolder_RemoveIDList_Proxy(
-    IResultsFolder* This,
-    PCIDLIST_ABSOLUTE pidl);
-void __RPC_STUB IResultsFolder_RemoveIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResultsFolder_RemoveAll_Proxy(
-    IResultsFolder* This);
-void __RPC_STUB IResultsFolder_RemoveAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IResultsFolder_AddIDList_Proxy(
     IResultsFolder* This,
     PCIDLIST_ABSOLUTE pidl,
@@ -21591,37 +18396,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumObjects* This,
+        IEnumObjects *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumObjects* This);
+        IEnumObjects *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumObjects* This);
+        IEnumObjects *This);
 
     /*** IEnumObjects methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumObjects* This,
+        IEnumObjects *This,
         ULONG celt,
         REFIID riid,
         void **rgelt,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumObjects* This,
+        IEnumObjects *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumObjects* This);
+        IEnumObjects *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumObjects* This,
+        IEnumObjects *This,
         IEnumObjects **ppenum);
 
     END_INTERFACE
 } IEnumObjectsVtbl;
+
 interface IEnumObjects {
     CONST_VTBL IEnumObjectsVtbl* lpVtbl;
 };
@@ -21677,29 +18483,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumObjects_Skip_Proxy(
-    IEnumObjects* This,
-    ULONG celt);
-void __RPC_STUB IEnumObjects_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumObjects_Reset_Proxy(
-    IEnumObjects* This);
-void __RPC_STUB IEnumObjects_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumObjects_Clone_Proxy(
-    IEnumObjects* This,
-    IEnumObjects **ppenum);
-void __RPC_STUB IEnumObjects_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumObjects_Next_Proxy(
     IEnumObjects* This,
     ULONG celt,
@@ -21726,7 +18509,6 @@
     OPPROGDLG_DONTDISPLAYLOCATIONS = 0x1000
 };
 
-
 typedef DWORD OPPROGDLGF;
 
 /*****************************************************************************
@@ -21744,7 +18526,6 @@
     PDM_INDETERMINATE = 0x10
 };
 
-
 typedef DWORD PDMODE;
 
 typedef enum PDOPSTATUS {
@@ -21812,35 +18593,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOperationsProgressDialog* This);
+        IOperationsProgressDialog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOperationsProgressDialog* This);
+        IOperationsProgressDialog *This);
 
     /*** IOperationsProgressDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *StartProgressDialog)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         HWND hwndOwner,
         OPPROGDLGF flags);
 
     HRESULT (STDMETHODCALLTYPE *StopProgressDialog)(
-        IOperationsProgressDialog* This);
+        IOperationsProgressDialog *This);
 
     HRESULT (STDMETHODCALLTYPE *SetOperation)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         SPACTION action);
 
     HRESULT (STDMETHODCALLTYPE *SetMode)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         PDMODE mode);
 
     HRESULT (STDMETHODCALLTYPE *UpdateProgress)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         ULONGLONG ullPointsCurrent,
         ULONGLONG ullPointsTotal,
         ULONGLONG ullSizeCurrent,
@@ -21849,31 +18630,32 @@
         ULONGLONG ullItemsTotal);
 
     HRESULT (STDMETHODCALLTYPE *UpdateLocations)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         IShellItem *psiSource,
         IShellItem *psiTarget,
         IShellItem *psiItem);
 
     HRESULT (STDMETHODCALLTYPE *ResetTimer)(
-        IOperationsProgressDialog* This);
+        IOperationsProgressDialog *This);
 
     HRESULT (STDMETHODCALLTYPE *PauseTimer)(
-        IOperationsProgressDialog* This);
+        IOperationsProgressDialog *This);
 
     HRESULT (STDMETHODCALLTYPE *ResumeTimer)(
-        IOperationsProgressDialog* This);
+        IOperationsProgressDialog *This);
 
     HRESULT (STDMETHODCALLTYPE *GetMilliseconds)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         ULONGLONG *pullElapsed,
         ULONGLONG *pullRemaining);
 
     HRESULT (STDMETHODCALLTYPE *GetOperationStatus)(
-        IOperationsProgressDialog* This,
+        IOperationsProgressDialog *This,
         PDOPSTATUS *popstatus);
 
     END_INTERFACE
 } IOperationsProgressDialogVtbl;
+
 interface IOperationsProgressDialog {
     CONST_VTBL IOperationsProgressDialogVtbl* lpVtbl;
 };
@@ -21946,99 +18728,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_StartProgressDialog_Proxy(
-    IOperationsProgressDialog* This,
-    HWND hwndOwner,
-    OPPROGDLGF flags);
-void __RPC_STUB IOperationsProgressDialog_StartProgressDialog_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_StopProgressDialog_Proxy(
-    IOperationsProgressDialog* This);
-void __RPC_STUB IOperationsProgressDialog_StopProgressDialog_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_SetOperation_Proxy(
-    IOperationsProgressDialog* This,
-    SPACTION action);
-void __RPC_STUB IOperationsProgressDialog_SetOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_SetMode_Proxy(
-    IOperationsProgressDialog* This,
-    PDMODE mode);
-void __RPC_STUB IOperationsProgressDialog_SetMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_UpdateProgress_Proxy(
-    IOperationsProgressDialog* This,
-    ULONGLONG ullPointsCurrent,
-    ULONGLONG ullPointsTotal,
-    ULONGLONG ullSizeCurrent,
-    ULONGLONG ullSizeTotal,
-    ULONGLONG ullItemsCurrent,
-    ULONGLONG ullItemsTotal);
-void __RPC_STUB IOperationsProgressDialog_UpdateProgress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_UpdateLocations_Proxy(
-    IOperationsProgressDialog* This,
-    IShellItem *psiSource,
-    IShellItem *psiTarget,
-    IShellItem *psiItem);
-void __RPC_STUB IOperationsProgressDialog_UpdateLocations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_ResetTimer_Proxy(
-    IOperationsProgressDialog* This);
-void __RPC_STUB IOperationsProgressDialog_ResetTimer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_PauseTimer_Proxy(
-    IOperationsProgressDialog* This);
-void __RPC_STUB IOperationsProgressDialog_PauseTimer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_ResumeTimer_Proxy(
-    IOperationsProgressDialog* This);
-void __RPC_STUB IOperationsProgressDialog_ResumeTimer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_GetMilliseconds_Proxy(
-    IOperationsProgressDialog* This,
-    ULONGLONG *pullElapsed,
-    ULONGLONG *pullRemaining);
-void __RPC_STUB IOperationsProgressDialog_GetMilliseconds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOperationsProgressDialog_GetOperationStatus_Proxy(
-    IOperationsProgressDialog* This,
-    PDOPSTATUS *popstatus);
-void __RPC_STUB IOperationsProgressDialog_GetOperationStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOperationsProgressDialog_INTERFACE_DEFINED__ */
 
@@ -22072,29 +18761,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IIOCancelInformation* This,
+        IIOCancelInformation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IIOCancelInformation* This);
+        IIOCancelInformation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IIOCancelInformation* This);
+        IIOCancelInformation *This);
 
     /*** IIOCancelInformation methods ***/
     HRESULT (STDMETHODCALLTYPE *SetCancelInformation)(
-        IIOCancelInformation* This,
+        IIOCancelInformation *This,
         DWORD dwThreadID,
         UINT uMsgCancel);
 
     HRESULT (STDMETHODCALLTYPE *GetCancelInformation)(
-        IIOCancelInformation* This,
+        IIOCancelInformation *This,
         DWORD *pdwThreadID,
         UINT *puMsgCancel);
 
     END_INTERFACE
 } IIOCancelInformationVtbl;
+
 interface IIOCancelInformation {
     CONST_VTBL IIOCancelInformationVtbl* lpVtbl;
 };
@@ -22131,24 +18821,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IIOCancelInformation_SetCancelInformation_Proxy(
-    IIOCancelInformation* This,
-    DWORD dwThreadID,
-    UINT uMsgCancel);
-void __RPC_STUB IIOCancelInformation_SetCancelInformation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IIOCancelInformation_GetCancelInformation_Proxy(
-    IIOCancelInformation* This,
-    DWORD *pdwThreadID,
-    UINT *puMsgCancel);
-void __RPC_STUB IIOCancelInformation_GetCancelInformation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IIOCancelInformation_INTERFACE_DEFINED__ */
 
@@ -22268,100 +18940,100 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileOperation* This,
+        IFileOperation *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileOperation* This);
+        IFileOperation *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileOperation* This);
+        IFileOperation *This);
 
     /*** IFileOperation methods ***/
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IFileOperation* This,
+        IFileOperation *This,
         IFileOperationProgressSink *pfops,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IFileOperation* This,
+        IFileOperation *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *SetOperationFlags)(
-        IFileOperation* This,
+        IFileOperation *This,
         DWORD dwOperationFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetProgressMessage)(
-        IFileOperation* This,
+        IFileOperation *This,
         LPCWSTR pszMessage);
 
     HRESULT (STDMETHODCALLTYPE *SetProgressDialog)(
-        IFileOperation* This,
+        IFileOperation *This,
         IOperationsProgressDialog *popd);
 
     HRESULT (STDMETHODCALLTYPE *SetProperties)(
-        IFileOperation* This,
+        IFileOperation *This,
         IPropertyChangeArray *pproparray);
 
     HRESULT (STDMETHODCALLTYPE *SetOwnerWindow)(
-        IFileOperation* This,
+        IFileOperation *This,
         HWND hwndOwner);
 
     HRESULT (STDMETHODCALLTYPE *ApplyPropertiesToItem)(
-        IFileOperation* This,
+        IFileOperation *This,
         IShellItem *psiItem);
 
     HRESULT (STDMETHODCALLTYPE *ApplyPropertiesToItems)(
-        IFileOperation* This,
+        IFileOperation *This,
         IUnknown *punkItems);
 
     HRESULT (STDMETHODCALLTYPE *RenameItem)(
-        IFileOperation* This,
+        IFileOperation *This,
         IShellItem *psiItem,
         LPCWSTR pszNewName,
         IFileOperationProgressSink *pfopsItem);
 
     HRESULT (STDMETHODCALLTYPE *RenameItems)(
-        IFileOperation* This,
+        IFileOperation *This,
         IUnknown *pUnkItems,
         LPCWSTR pszNewName);
 
     HRESULT (STDMETHODCALLTYPE *MoveItem)(
-        IFileOperation* This,
+        IFileOperation *This,
         IShellItem *psiItem,
         IShellItem *psiDestinationFolder,
         LPCWSTR pszNewName,
         IFileOperationProgressSink *pfopsItem);
 
     HRESULT (STDMETHODCALLTYPE *MoveItems)(
-        IFileOperation* This,
+        IFileOperation *This,
         IUnknown *punkItems,
         IShellItem *psiDestinationFolder);
 
     HRESULT (STDMETHODCALLTYPE *CopyItem)(
-        IFileOperation* This,
+        IFileOperation *This,
         IShellItem *psiItem,
         IShellItem *psiDestinationFolder,
         LPCWSTR pszCopyName,
         IFileOperationProgressSink *pfopsItem);
 
     HRESULT (STDMETHODCALLTYPE *CopyItems)(
-        IFileOperation* This,
+        IFileOperation *This,
         IUnknown *punkItems,
         IShellItem *psiDestinationFolder);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IFileOperation* This,
+        IFileOperation *This,
         IShellItem *psiItem,
         IFileOperationProgressSink *pfopsItem);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItems)(
-        IFileOperation* This,
+        IFileOperation *This,
         IUnknown *punkItems);
 
     HRESULT (STDMETHODCALLTYPE *NewItem)(
-        IFileOperation* This,
+        IFileOperation *This,
         IShellItem *psiDestinationFolder,
         DWORD dwFileAttributes,
         LPCWSTR pszName,
@@ -22369,14 +19041,15 @@
         IFileOperationProgressSink *pfopsItem);
 
     HRESULT (STDMETHODCALLTYPE *PerformOperations)(
-        IFileOperation* This);
+        IFileOperation *This);
 
     HRESULT (STDMETHODCALLTYPE *GetAnyOperationsAborted)(
-        IFileOperation* This,
+        IFileOperation *This,
         WINBOOL *pfAnyOperationsAborted);
 
     END_INTERFACE
 } IFileOperationVtbl;
+
 interface IFileOperation {
     CONST_VTBL IFileOperationVtbl* lpVtbl;
 };
@@ -22485,182 +19158,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileOperation_Advise_Proxy(
-    IFileOperation* This,
-    IFileOperationProgressSink *pfops,
-    DWORD *pdwCookie);
-void __RPC_STUB IFileOperation_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_Unadvise_Proxy(
-    IFileOperation* This,
-    DWORD dwCookie);
-void __RPC_STUB IFileOperation_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_SetOperationFlags_Proxy(
-    IFileOperation* This,
-    DWORD dwOperationFlags);
-void __RPC_STUB IFileOperation_SetOperationFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_SetProgressMessage_Proxy(
-    IFileOperation* This,
-    LPCWSTR pszMessage);
-void __RPC_STUB IFileOperation_SetProgressMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_SetProgressDialog_Proxy(
-    IFileOperation* This,
-    IOperationsProgressDialog *popd);
-void __RPC_STUB IFileOperation_SetProgressDialog_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_SetProperties_Proxy(
-    IFileOperation* This,
-    IPropertyChangeArray *pproparray);
-void __RPC_STUB IFileOperation_SetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_SetOwnerWindow_Proxy(
-    IFileOperation* This,
-    HWND hwndOwner);
-void __RPC_STUB IFileOperation_SetOwnerWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_ApplyPropertiesToItem_Proxy(
-    IFileOperation* This,
-    IShellItem *psiItem);
-void __RPC_STUB IFileOperation_ApplyPropertiesToItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_ApplyPropertiesToItems_Proxy(
-    IFileOperation* This,
-    IUnknown *punkItems);
-void __RPC_STUB IFileOperation_ApplyPropertiesToItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_RenameItem_Proxy(
-    IFileOperation* This,
-    IShellItem *psiItem,
-    LPCWSTR pszNewName,
-    IFileOperationProgressSink *pfopsItem);
-void __RPC_STUB IFileOperation_RenameItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_RenameItems_Proxy(
-    IFileOperation* This,
-    IUnknown *pUnkItems,
-    LPCWSTR pszNewName);
-void __RPC_STUB IFileOperation_RenameItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_MoveItem_Proxy(
-    IFileOperation* This,
-    IShellItem *psiItem,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszNewName,
-    IFileOperationProgressSink *pfopsItem);
-void __RPC_STUB IFileOperation_MoveItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_MoveItems_Proxy(
-    IFileOperation* This,
-    IUnknown *punkItems,
-    IShellItem *psiDestinationFolder);
-void __RPC_STUB IFileOperation_MoveItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_CopyItem_Proxy(
-    IFileOperation* This,
-    IShellItem *psiItem,
-    IShellItem *psiDestinationFolder,
-    LPCWSTR pszCopyName,
-    IFileOperationProgressSink *pfopsItem);
-void __RPC_STUB IFileOperation_CopyItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_CopyItems_Proxy(
-    IFileOperation* This,
-    IUnknown *punkItems,
-    IShellItem *psiDestinationFolder);
-void __RPC_STUB IFileOperation_CopyItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_DeleteItem_Proxy(
-    IFileOperation* This,
-    IShellItem *psiItem,
-    IFileOperationProgressSink *pfopsItem);
-void __RPC_STUB IFileOperation_DeleteItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_DeleteItems_Proxy(
-    IFileOperation* This,
-    IUnknown *punkItems);
-void __RPC_STUB IFileOperation_DeleteItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_NewItem_Proxy(
-    IFileOperation* This,
-    IShellItem *psiDestinationFolder,
-    DWORD dwFileAttributes,
-    LPCWSTR pszName,
-    LPCWSTR pszTemplateName,
-    IFileOperationProgressSink *pfopsItem);
-void __RPC_STUB IFileOperation_NewItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_PerformOperations_Proxy(
-    IFileOperation* This);
-void __RPC_STUB IFileOperation_PerformOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOperation_GetAnyOperationsAborted_Proxy(
-    IFileOperation* This,
-    WINBOOL *pfAnyOperationsAborted);
-void __RPC_STUB IFileOperation_GetAnyOperationsAborted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileOperation_INTERFACE_DEFINED__ */
 
@@ -22691,25 +19188,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectProvider* This,
+        IObjectProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectProvider* This);
+        IObjectProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectProvider* This);
+        IObjectProvider *This);
 
     /*** IObjectProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryObject)(
-        IObjectProvider* This,
+        IObjectProvider *This,
         REFGUID guidObject,
         REFIID riid,
         void **ppvOut);
 
     END_INTERFACE
 } IObjectProviderVtbl;
+
 interface IObjectProvider {
     CONST_VTBL IObjectProviderVtbl* lpVtbl;
 };
@@ -22742,16 +19240,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectProvider_QueryObject_Proxy(
-    IObjectProvider* This,
-    REFGUID guidObject,
-    REFIID riid,
-    void **ppvOut);
-void __RPC_STUB IObjectProvider_QueryObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectProvider_INTERFACE_DEFINED__ */
 
@@ -22794,39 +19282,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INamespaceWalkCB* This,
+        INamespaceWalkCB *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INamespaceWalkCB* This);
+        INamespaceWalkCB *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INamespaceWalkCB* This);
+        INamespaceWalkCB *This);
 
     /*** INamespaceWalkCB methods ***/
     HRESULT (STDMETHODCALLTYPE *FoundItem)(
-        INamespaceWalkCB* This,
+        INamespaceWalkCB *This,
         IShellFolder *psf,
         PCUITEMID_CHILD pidl);
 
     HRESULT (STDMETHODCALLTYPE *EnterFolder)(
-        INamespaceWalkCB* This,
+        INamespaceWalkCB *This,
         IShellFolder *psf,
         PCUITEMID_CHILD pidl);
 
     HRESULT (STDMETHODCALLTYPE *LeaveFolder)(
-        INamespaceWalkCB* This,
+        INamespaceWalkCB *This,
         IShellFolder *psf,
         PCUITEMID_CHILD pidl);
 
     HRESULT (STDMETHODCALLTYPE *InitializeProgressDialog)(
-        INamespaceWalkCB* This,
+        INamespaceWalkCB *This,
         LPWSTR *ppszTitle,
         LPWSTR *ppszCancel);
 
     END_INTERFACE
 } INamespaceWalkCBVtbl;
+
 interface INamespaceWalkCB {
     CONST_VTBL INamespaceWalkCBVtbl* lpVtbl;
 };
@@ -22871,42 +19360,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INamespaceWalkCB_FoundItem_Proxy(
-    INamespaceWalkCB* This,
-    IShellFolder *psf,
-    PCUITEMID_CHILD pidl);
-void __RPC_STUB INamespaceWalkCB_FoundItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INamespaceWalkCB_EnterFolder_Proxy(
-    INamespaceWalkCB* This,
-    IShellFolder *psf,
-    PCUITEMID_CHILD pidl);
-void __RPC_STUB INamespaceWalkCB_EnterFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INamespaceWalkCB_LeaveFolder_Proxy(
-    INamespaceWalkCB* This,
-    IShellFolder *psf,
-    PCUITEMID_CHILD pidl);
-void __RPC_STUB INamespaceWalkCB_LeaveFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INamespaceWalkCB_InitializeProgressDialog_Proxy(
-    INamespaceWalkCB* This,
-    LPWSTR *ppszTitle,
-    LPWSTR *ppszCancel);
-void __RPC_STUB INamespaceWalkCB_InitializeProgressDialog_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INamespaceWalkCB_INTERFACE_DEFINED__ */
 
@@ -22936,44 +19389,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INamespaceWalkCB2* This,
+        INamespaceWalkCB2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INamespaceWalkCB2* This);
+        INamespaceWalkCB2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INamespaceWalkCB2* This);
+        INamespaceWalkCB2 *This);
 
     /*** INamespaceWalkCB methods ***/
     HRESULT (STDMETHODCALLTYPE *FoundItem)(
-        INamespaceWalkCB2* This,
+        INamespaceWalkCB2 *This,
         IShellFolder *psf,
         PCUITEMID_CHILD pidl);
 
     HRESULT (STDMETHODCALLTYPE *EnterFolder)(
-        INamespaceWalkCB2* This,
+        INamespaceWalkCB2 *This,
         IShellFolder *psf,
         PCUITEMID_CHILD pidl);
 
     HRESULT (STDMETHODCALLTYPE *LeaveFolder)(
-        INamespaceWalkCB2* This,
+        INamespaceWalkCB2 *This,
         IShellFolder *psf,
         PCUITEMID_CHILD pidl);
 
     HRESULT (STDMETHODCALLTYPE *InitializeProgressDialog)(
-        INamespaceWalkCB2* This,
+        INamespaceWalkCB2 *This,
         LPWSTR *ppszTitle,
         LPWSTR *ppszCancel);
 
     /*** INamespaceWalkCB2 methods ***/
     HRESULT (STDMETHODCALLTYPE *WalkComplete)(
-        INamespaceWalkCB2* This,
+        INamespaceWalkCB2 *This,
         HRESULT hr);
 
     END_INTERFACE
 } INamespaceWalkCB2Vtbl;
+
 interface INamespaceWalkCB2 {
     CONST_VTBL INamespaceWalkCB2Vtbl* lpVtbl;
 };
@@ -23024,14 +19478,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INamespaceWalkCB2_WalkComplete_Proxy(
-    INamespaceWalkCB2* This,
-    HRESULT hr);
-void __RPC_STUB INamespaceWalkCB2_WalkComplete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INamespaceWalkCB2_INTERFACE_DEFINED__ */
 
@@ -23093,31 +19539,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INamespaceWalk* This,
+        INamespaceWalk *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INamespaceWalk* This);
+        INamespaceWalk *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INamespaceWalk* This);
+        INamespaceWalk *This);
 
     /*** INamespaceWalk methods ***/
     HRESULT (STDMETHODCALLTYPE *Walk)(
-        INamespaceWalk* This,
+        INamespaceWalk *This,
         IUnknown *punkToWalk,
         DWORD dwFlags,
         int cDepth,
         INamespaceWalkCB *pnswcb);
 
     HRESULT (STDMETHODCALLTYPE *GetIDArrayResult)(
-        INamespaceWalk* This,
+        INamespaceWalk *This,
         UINT *pcItems,
         PIDLIST_ABSOLUTE **prgpidl);
 
     END_INTERFACE
 } INamespaceWalkVtbl;
+
 interface INamespaceWalk {
     CONST_VTBL INamespaceWalkVtbl* lpVtbl;
 };
@@ -23154,26 +19601,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INamespaceWalk_Walk_Proxy(
-    INamespaceWalk* This,
-    IUnknown *punkToWalk,
-    DWORD dwFlags,
-    int cDepth,
-    INamespaceWalkCB *pnswcb);
-void __RPC_STUB INamespaceWalk_Walk_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INamespaceWalk_GetIDArrayResult_Proxy(
-    INamespaceWalk* This,
-    UINT *pcItems,
-    PIDLIST_ABSOLUTE **prgpidl);
-void __RPC_STUB INamespaceWalk_GetIDArrayResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INamespaceWalk_INTERFACE_DEFINED__ */
 
@@ -23233,27 +19660,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAutoCompleteDropDown* This,
+        IAutoCompleteDropDown *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAutoCompleteDropDown* This);
+        IAutoCompleteDropDown *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAutoCompleteDropDown* This);
+        IAutoCompleteDropDown *This);
 
     /*** IAutoCompleteDropDown methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDropDownStatus)(
-        IAutoCompleteDropDown* This,
+        IAutoCompleteDropDown *This,
         DWORD *pdwFlags,
         LPWSTR *ppwszString);
 
     HRESULT (STDMETHODCALLTYPE *ResetEnumerator)(
-        IAutoCompleteDropDown* This);
+        IAutoCompleteDropDown *This);
 
     END_INTERFACE
 } IAutoCompleteDropDownVtbl;
+
 interface IAutoCompleteDropDown {
     CONST_VTBL IAutoCompleteDropDownVtbl* lpVtbl;
 };
@@ -23290,22 +19718,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAutoCompleteDropDown_GetDropDownStatus_Proxy(
-    IAutoCompleteDropDown* This,
-    DWORD *pdwFlags,
-    LPWSTR *ppwszString);
-void __RPC_STUB IAutoCompleteDropDown_GetDropDownStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAutoCompleteDropDown_ResetEnumerator_Proxy(
-    IAutoCompleteDropDown* This);
-void __RPC_STUB IAutoCompleteDropDown_ResetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAutoCompleteDropDown_INTERFACE_DEFINED__ */
 
@@ -23322,7 +19734,6 @@
     BSID_BANDREMOVED = 1
 };
 
-
 #define BSIM_STATE 0x00000001
 #define BSIM_STYLE 0x00000002
 
@@ -23402,28 +19813,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBandSite* This,
+        IBandSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBandSite* This);
+        IBandSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBandSite* This);
+        IBandSite *This);
 
     /*** IBandSite methods ***/
     HRESULT (STDMETHODCALLTYPE *AddBand)(
-        IBandSite* This,
+        IBandSite *This,
         IUnknown *punk);
 
     HRESULT (STDMETHODCALLTYPE *EnumBands)(
-        IBandSite* This,
+        IBandSite *This,
         UINT uBand,
         DWORD *pdwBandID);
 
     HRESULT (STDMETHODCALLTYPE *QueryBand)(
-        IBandSite* This,
+        IBandSite *This,
         DWORD dwBandID,
         IDeskBand **ppstb,
         DWORD *pdwState,
@@ -23431,31 +19842,32 @@
         int cchName);
 
     HRESULT (STDMETHODCALLTYPE *SetBandState)(
-        IBandSite* This,
+        IBandSite *This,
         DWORD dwBandID,
         DWORD dwMask,
         DWORD dwState);
 
     HRESULT (STDMETHODCALLTYPE *RemoveBand)(
-        IBandSite* This,
+        IBandSite *This,
         DWORD dwBandID);
 
     HRESULT (STDMETHODCALLTYPE *GetBandObject)(
-        IBandSite* This,
+        IBandSite *This,
         DWORD dwBandID,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetBandSiteInfo)(
-        IBandSite* This,
+        IBandSite *This,
         const BANDSITEINFO *pbsinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBandSiteInfo)(
-        IBandSite* This,
+        IBandSite *This,
         BANDSITEINFO *pbsinfo);
 
     END_INTERFACE
 } IBandSiteVtbl;
+
 interface IBandSite {
     CONST_VTBL IBandSiteVtbl* lpVtbl;
 };
@@ -23516,23 +19928,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBandSite_AddBand_Proxy(
-    IBandSite* This,
-    IUnknown *punk);
-void __RPC_STUB IBandSite_AddBand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandSite_EnumBands_Proxy(
-    IBandSite* This,
-    UINT uBand,
-    DWORD *pdwBandID);
-void __RPC_STUB IBandSite_EnumBands_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IBandSite_RemoteQueryBand_Proxy(
     IBandSite* This,
     DWORD dwBandID,
@@ -23545,50 +19940,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandSite_SetBandState_Proxy(
-    IBandSite* This,
-    DWORD dwBandID,
-    DWORD dwMask,
-    DWORD dwState);
-void __RPC_STUB IBandSite_SetBandState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandSite_RemoveBand_Proxy(
-    IBandSite* This,
-    DWORD dwBandID);
-void __RPC_STUB IBandSite_RemoveBand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandSite_GetBandObject_Proxy(
-    IBandSite* This,
-    DWORD dwBandID,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IBandSite_GetBandObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandSite_SetBandSiteInfo_Proxy(
-    IBandSite* This,
-    const BANDSITEINFO *pbsinfo);
-void __RPC_STUB IBandSite_SetBandSiteInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandSite_GetBandSiteInfo_Proxy(
-    IBandSite* This,
-    BANDSITEINFO *pbsinfo);
-void __RPC_STUB IBandSite_GetBandSiteInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IBandSite_QueryBand_Proxy(
     IBandSite* This,
     DWORD dwBandID,
@@ -23631,23 +19982,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IModalWindow* This,
+        IModalWindow *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IModalWindow* This);
+        IModalWindow *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IModalWindow* This);
+        IModalWindow *This);
 
     /*** IModalWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IModalWindow* This,
+        IModalWindow *This,
         HWND hwndOwner);
 
     END_INTERFACE
 } IModalWindowVtbl;
+
 interface IModalWindow {
     CONST_VTBL IModalWindowVtbl* lpVtbl;
 };
@@ -23706,7 +20058,6 @@
     CDBE_RET_STOPWIZARD = 0x2
 };
 
-
 #define SID_CDWizardHost IID_ICDBurnExt
 
 enum _CDBE_ACTIONS {
@@ -23715,7 +20066,6 @@
     CDBE_TYPE_ALL = (int)0xffffffff
 };
 
-
 typedef DWORD CDBE_ACTIONS;
 
 /*****************************************************************************
@@ -23742,23 +20092,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICDBurnExt* This,
+        ICDBurnExt *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICDBurnExt* This);
+        ICDBurnExt *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICDBurnExt* This);
+        ICDBurnExt *This);
 
     /*** ICDBurnExt methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSupportedActionTypes)(
-        ICDBurnExt* This,
+        ICDBurnExt *This,
         CDBE_ACTIONS *pdwActions);
 
     END_INTERFACE
 } ICDBurnExtVtbl;
+
 interface ICDBurnExt {
     CONST_VTBL ICDBurnExtVtbl* lpVtbl;
 };
@@ -23791,14 +20142,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICDBurnExt_GetSupportedActionTypes_Proxy(
-    ICDBurnExt* This,
-    CDBE_ACTIONS *pdwActions);
-void __RPC_STUB ICDBurnExt_GetSupportedActionTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICDBurnExt_INTERFACE_DEFINED__ */
 
@@ -23829,25 +20172,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenuSite* This,
+        IContextMenuSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenuSite* This);
+        IContextMenuSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenuSite* This);
+        IContextMenuSite *This);
 
     /*** IContextMenuSite methods ***/
     HRESULT (STDMETHODCALLTYPE *DoContextMenuPopup)(
-        IContextMenuSite* This,
+        IContextMenuSite *This,
         IUnknown *punkContextMenu,
         UINT fFlags,
         POINT pt);
 
     END_INTERFACE
 } IContextMenuSiteVtbl;
+
 interface IContextMenuSite {
     CONST_VTBL IContextMenuSiteVtbl* lpVtbl;
 };
@@ -23880,16 +20224,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IContextMenuSite_DoContextMenuPopup_Proxy(
-    IContextMenuSite* This,
-    IUnknown *punkContextMenu,
-    UINT fFlags,
-    POINT pt);
-void __RPC_STUB IContextMenuSite_DoContextMenuPopup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IContextMenuSite_INTERFACE_DEFINED__ */
 
@@ -23918,22 +20252,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumReadyCallback* This,
+        IEnumReadyCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumReadyCallback* This);
+        IEnumReadyCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumReadyCallback* This);
+        IEnumReadyCallback *This);
 
     /*** IEnumReadyCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumReady)(
-        IEnumReadyCallback* This);
+        IEnumReadyCallback *This);
 
     END_INTERFACE
 } IEnumReadyCallbackVtbl;
+
 interface IEnumReadyCallback {
     CONST_VTBL IEnumReadyCallbackVtbl* lpVtbl;
 };
@@ -23966,13 +20301,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumReadyCallback_EnumReady_Proxy(
-    IEnumReadyCallback* This);
-void __RPC_STUB IEnumReadyCallback_EnumReady_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumReadyCallback_INTERFACE_DEFINED__ */
 
@@ -24006,29 +20334,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumerableView* This,
+        IEnumerableView *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumerableView* This);
+        IEnumerableView *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumerableView* This);
+        IEnumerableView *This);
 
     /*** IEnumerableView methods ***/
     HRESULT (STDMETHODCALLTYPE *SetEnumReadyCallback)(
-        IEnumerableView* This,
+        IEnumerableView *This,
         IEnumReadyCallback *percb);
 
     HRESULT (STDMETHODCALLTYPE *CreateEnumIDListFromContents)(
-        IEnumerableView* This,
+        IEnumerableView *This,
         PCIDLIST_ABSOLUTE pidlFolder,
         DWORD dwEnumFlags,
         IEnumIDList **ppEnumIDList);
 
     END_INTERFACE
 } IEnumerableViewVtbl;
+
 interface IEnumerableView {
     CONST_VTBL IEnumerableViewVtbl* lpVtbl;
 };
@@ -24065,24 +20394,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumerableView_SetEnumReadyCallback_Proxy(
-    IEnumerableView* This,
-    IEnumReadyCallback *percb);
-void __RPC_STUB IEnumerableView_SetEnumReadyCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumerableView_CreateEnumIDListFromContents_Proxy(
-    IEnumerableView* This,
-    PCIDLIST_ABSOLUTE pidlFolder,
-    DWORD dwEnumFlags,
-    IEnumIDList **ppEnumIDList);
-void __RPC_STUB IEnumerableView_CreateEnumIDListFromContents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumerableView_INTERFACE_DEFINED__ */
 
@@ -24113,23 +20424,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInsertItem* This,
+        IInsertItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInsertItem* This);
+        IInsertItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInsertItem* This);
+        IInsertItem *This);
 
     /*** IInsertItem methods ***/
     HRESULT (STDMETHODCALLTYPE *InsertItem)(
-        IInsertItem* This,
+        IInsertItem *This,
         PCUIDLIST_RELATIVE pidl);
 
     END_INTERFACE
 } IInsertItemVtbl;
+
 interface IInsertItem {
     CONST_VTBL IInsertItemVtbl* lpVtbl;
 };
@@ -24162,14 +20474,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInsertItem_InsertItem_Proxy(
-    IInsertItem* This,
-    PCUIDLIST_RELATIVE pidl);
-void __RPC_STUB IInsertItem_InsertItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInsertItem_INTERFACE_DEFINED__ */
 
@@ -24184,7 +20488,6 @@
     MBHANDCID_PIDLSELECT = 0
 };
 
-
 DEFINE_GUID(IID_IMenuBand, 0x568804cd, 0xcbd7, 0x11d0, 0x98,0x16, 0x00,0xc0,0x4f,0xd9,0x19,0x72);
 #if defined(__cplusplus) && !defined(CINTERFACE)
 MIDL_INTERFACE("568804cd-cbd7-11d0-9816-00c04fd91972")
@@ -24207,28 +20510,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMenuBand* This,
+        IMenuBand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMenuBand* This);
+        IMenuBand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMenuBand* This);
+        IMenuBand *This);
 
     /*** IMenuBand methods ***/
     HRESULT (STDMETHODCALLTYPE *IsMenuMessage)(
-        IMenuBand* This,
+        IMenuBand *This,
         MSG *pmsg);
 
     HRESULT (STDMETHODCALLTYPE *TranslateMenuMessage)(
-        IMenuBand* This,
+        IMenuBand *This,
         MSG *pmsg,
         LRESULT *plRet);
 
     END_INTERFACE
 } IMenuBandVtbl;
+
 interface IMenuBand {
     CONST_VTBL IMenuBandVtbl* lpVtbl;
 };
@@ -24265,23 +20569,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMenuBand_IsMenuMessage_Proxy(
-    IMenuBand* This,
-    MSG *pmsg);
-void __RPC_STUB IMenuBand_IsMenuMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMenuBand_TranslateMenuMessage_Proxy(
-    IMenuBand* This,
-    MSG *pmsg,
-    LRESULT *plRet);
-void __RPC_STUB IMenuBand_TranslateMenuMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMenuBand_INTERFACE_DEFINED__ */
 
@@ -24319,35 +20606,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFolderBandPriv* This,
+        IFolderBandPriv *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFolderBandPriv* This);
+        IFolderBandPriv *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFolderBandPriv* This);
+        IFolderBandPriv *This);
 
     /*** IFolderBandPriv methods ***/
     HRESULT (STDMETHODCALLTYPE *SetCascade)(
-        IFolderBandPriv* This,
+        IFolderBandPriv *This,
         WINBOOL fCascade);
 
     HRESULT (STDMETHODCALLTYPE *SetAccelerators)(
-        IFolderBandPriv* This,
+        IFolderBandPriv *This,
         WINBOOL fAccelerators);
 
     HRESULT (STDMETHODCALLTYPE *SetNoIcons)(
-        IFolderBandPriv* This,
+        IFolderBandPriv *This,
         WINBOOL fNoIcons);
 
     HRESULT (STDMETHODCALLTYPE *SetNoText)(
-        IFolderBandPriv* This,
+        IFolderBandPriv *This,
         WINBOOL fNoText);
 
     END_INTERFACE
 } IFolderBandPrivVtbl;
+
 interface IFolderBandPriv {
     CONST_VTBL IFolderBandPrivVtbl* lpVtbl;
 };
@@ -24392,38 +20680,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetCascade_Proxy(
-    IFolderBandPriv* This,
-    WINBOOL fCascade);
-void __RPC_STUB IFolderBandPriv_SetCascade_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetAccelerators_Proxy(
-    IFolderBandPriv* This,
-    WINBOOL fAccelerators);
-void __RPC_STUB IFolderBandPriv_SetAccelerators_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetNoIcons_Proxy(
-    IFolderBandPriv* This,
-    WINBOOL fNoIcons);
-void __RPC_STUB IFolderBandPriv_SetNoIcons_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFolderBandPriv_SetNoText_Proxy(
-    IFolderBandPriv* This,
-    WINBOOL fNoText);
-void __RPC_STUB IFolderBandPriv_SetNoText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFolderBandPriv_INTERFACE_DEFINED__ */
 
@@ -24455,27 +20711,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRegTreeItem* This,
+        IRegTreeItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRegTreeItem* This);
+        IRegTreeItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRegTreeItem* This);
+        IRegTreeItem *This);
 
     /*** IRegTreeItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCheckState)(
-        IRegTreeItem* This,
+        IRegTreeItem *This,
         WINBOOL *pbCheck);
 
     HRESULT (STDMETHODCALLTYPE *SetCheckState)(
-        IRegTreeItem* This,
+        IRegTreeItem *This,
         WINBOOL bCheck);
 
     END_INTERFACE
 } IRegTreeItemVtbl;
+
 interface IRegTreeItem {
     CONST_VTBL IRegTreeItemVtbl* lpVtbl;
 };
@@ -24512,22 +20769,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IRegTreeItem_GetCheckState_Proxy(
-    IRegTreeItem* This,
-    WINBOOL *pbCheck);
-void __RPC_STUB IRegTreeItem_GetCheckState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRegTreeItem_SetCheckState_Proxy(
-    IRegTreeItem* This,
-    WINBOOL bCheck);
-void __RPC_STUB IRegTreeItem_SetCheckState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IRegTreeItem_INTERFACE_DEFINED__ */
 
@@ -24561,19 +20802,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IImageRecompress* This,
+        IImageRecompress *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IImageRecompress* This);
+        IImageRecompress *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IImageRecompress* This);
+        IImageRecompress *This);
 
     /*** IImageRecompress methods ***/
     HRESULT (STDMETHODCALLTYPE *RecompressImage)(
-        IImageRecompress* This,
+        IImageRecompress *This,
         IShellItem *psi,
         int cx,
         int cy,
@@ -24583,6 +20824,7 @@
 
     END_INTERFACE
 } IImageRecompressVtbl;
+
 interface IImageRecompress {
     CONST_VTBL IImageRecompressVtbl* lpVtbl;
 };
@@ -24615,19 +20857,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IImageRecompress_RecompressImage_Proxy(
-    IImageRecompress* This,
-    IShellItem *psi,
-    int cx,
-    int cy,
-    int iQuality,
-    IStorage *pstg,
-    IStream **ppstrmOut);
-void __RPC_STUB IImageRecompress_RecompressImage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IImageRecompress_INTERFACE_DEFINED__ */
 
@@ -24663,40 +20892,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDeskBar* This,
+        IDeskBar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDeskBar* This);
+        IDeskBar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDeskBar* This);
+        IDeskBar *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IDeskBar* This,
+        IDeskBar *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IDeskBar* This,
+        IDeskBar *This,
         WINBOOL fEnterMode);
 
     /*** IDeskBar methods ***/
     HRESULT (STDMETHODCALLTYPE *SetClient)(
-        IDeskBar* This,
+        IDeskBar *This,
         IUnknown *punkClient);
 
     HRESULT (STDMETHODCALLTYPE *GetClient)(
-        IDeskBar* This,
+        IDeskBar *This,
         IUnknown **ppunkClient);
 
     HRESULT (STDMETHODCALLTYPE *OnPosRectChangeDB)(
-        IDeskBar* This,
+        IDeskBar *This,
         RECT *prc);
 
     END_INTERFACE
 } IDeskBarVtbl;
+
 interface IDeskBar {
     CONST_VTBL IDeskBarVtbl* lpVtbl;
 };
@@ -24747,30 +20977,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDeskBar_SetClient_Proxy(
-    IDeskBar* This,
-    IUnknown *punkClient);
-void __RPC_STUB IDeskBar_SetClient_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDeskBar_GetClient_Proxy(
-    IDeskBar* This,
-    IUnknown **ppunkClient);
-void __RPC_STUB IDeskBar_GetClient_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDeskBar_OnPosRectChangeDB_Proxy(
-    IDeskBar* This,
-    RECT *prc);
-void __RPC_STUB IDeskBar_OnPosRectChangeDB_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDeskBar_INTERFACE_DEFINED__ */
 
@@ -24790,7 +20996,6 @@
     MPOS_CHILDTRACKING = 5
 };
 
-
 enum tagMENUPOPUPPOPUPFLAGS {
     MPPF_SETFOCUS = 0x1,
     MPPF_INITIALSELECT = 0x2,
@@ -24808,7 +21013,6 @@
     MPPF_ALIGN_RIGHT = 0x4000000
 };
 
-
 typedef int MP_POPUPFLAGS;
 
 DEFINE_GUID(IID_IMenuPopup, 0xd1e7afeb, 0x6a2e, 0x11d0, 0x8c,0x78, 0x00,0xc0,0x4f,0xd9,0x18,0xb4);
@@ -24838,56 +21042,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMenuPopup* This);
+        IMenuPopup *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMenuPopup* This);
+        IMenuPopup *This);
 
     /*** IOleWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *ContextSensitiveHelp)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         WINBOOL fEnterMode);
 
     /*** IDeskBar methods ***/
     HRESULT (STDMETHODCALLTYPE *SetClient)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         IUnknown *punkClient);
 
     HRESULT (STDMETHODCALLTYPE *GetClient)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         IUnknown **ppunkClient);
 
     HRESULT (STDMETHODCALLTYPE *OnPosRectChangeDB)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         RECT *prc);
 
     /*** IMenuPopup methods ***/
     HRESULT (STDMETHODCALLTYPE *Popup)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         POINTL *ppt,
         RECTL *prcExclude,
         MP_POPUPFLAGS dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *OnSelect)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         DWORD dwSelectType);
 
     HRESULT (STDMETHODCALLTYPE *SetSubMenu)(
-        IMenuPopup* This,
+        IMenuPopup *This,
         IMenuPopup *pmp,
         WINBOOL fSet);
 
     END_INTERFACE
 } IMenuPopupVtbl;
+
 interface IMenuPopup {
     CONST_VTBL IMenuPopupVtbl* lpVtbl;
 };
@@ -24952,33 +21157,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMenuPopup_Popup_Proxy(
-    IMenuPopup* This,
-    POINTL *ppt,
-    RECTL *prcExclude,
-    MP_POPUPFLAGS dwFlags);
-void __RPC_STUB IMenuPopup_Popup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMenuPopup_OnSelect_Proxy(
-    IMenuPopup* This,
-    DWORD dwSelectType);
-void __RPC_STUB IMenuPopup_OnSelect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMenuPopup_SetSubMenu_Proxy(
-    IMenuPopup* This,
-    IMenuPopup *pmp,
-    WINBOOL fSet);
-void __RPC_STUB IMenuPopup_SetSubMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMenuPopup_INTERFACE_DEFINED__ */
 
@@ -25030,38 +21208,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileIsInUse* This,
+        IFileIsInUse *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileIsInUse* This);
+        IFileIsInUse *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileIsInUse* This);
+        IFileIsInUse *This);
 
     /*** IFileIsInUse methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAppName)(
-        IFileIsInUse* This,
+        IFileIsInUse *This,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetUsage)(
-        IFileIsInUse* This,
+        IFileIsInUse *This,
         FILE_USAGE_TYPE *pfut);
 
     HRESULT (STDMETHODCALLTYPE *GetCapabilities)(
-        IFileIsInUse* This,
+        IFileIsInUse *This,
         DWORD *pdwCapFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSwitchToHWND)(
-        IFileIsInUse* This,
+        IFileIsInUse *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *CloseFile)(
-        IFileIsInUse* This);
+        IFileIsInUse *This);
 
     END_INTERFACE
 } IFileIsInUseVtbl;
+
 interface IFileIsInUse {
     CONST_VTBL IFileIsInUseVtbl* lpVtbl;
 };
@@ -25110,45 +21289,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileIsInUse_GetAppName_Proxy(
-    IFileIsInUse* This,
-    LPWSTR *ppszName);
-void __RPC_STUB IFileIsInUse_GetAppName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileIsInUse_GetUsage_Proxy(
-    IFileIsInUse* This,
-    FILE_USAGE_TYPE *pfut);
-void __RPC_STUB IFileIsInUse_GetUsage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileIsInUse_GetCapabilities_Proxy(
-    IFileIsInUse* This,
-    DWORD *pdwCapFlags);
-void __RPC_STUB IFileIsInUse_GetCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileIsInUse_GetSwitchToHWND_Proxy(
-    IFileIsInUse* This,
-    HWND *phwnd);
-void __RPC_STUB IFileIsInUse_GetSwitchToHWND_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileIsInUse_CloseFile_Proxy(
-    IFileIsInUse* This);
-void __RPC_STUB IFileIsInUse_CloseFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileIsInUse_INTERFACE_DEFINED__ */
 
@@ -25156,6 +21296,9 @@
 #ifndef __IFileDialog_FWD_DEFINED__
 #define __IFileDialog_FWD_DEFINED__
 typedef interface IFileDialog IFileDialog;
+#ifdef __cplusplus
+interface IFileDialog;
+#endif /* __cplusplus */
 #endif
 
 
@@ -25223,52 +21366,53 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileDialogEvents* This);
+        IFileDialogEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileDialogEvents* This);
+        IFileDialogEvents *This);
 
     /*** IFileDialogEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnFileOk)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         IFileDialog *pfd);
 
     HRESULT (STDMETHODCALLTYPE *OnFolderChanging)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         IFileDialog *pfd,
         IShellItem *psiFolder);
 
     HRESULT (STDMETHODCALLTYPE *OnFolderChange)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         IFileDialog *pfd);
 
     HRESULT (STDMETHODCALLTYPE *OnSelectionChange)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         IFileDialog *pfd);
 
     HRESULT (STDMETHODCALLTYPE *OnShareViolation)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         IFileDialog *pfd,
         IShellItem *psi,
         FDE_SHAREVIOLATION_RESPONSE *pResponse);
 
     HRESULT (STDMETHODCALLTYPE *OnTypeChange)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         IFileDialog *pfd);
 
     HRESULT (STDMETHODCALLTYPE *OnOverwrite)(
-        IFileDialogEvents* This,
+        IFileDialogEvents *This,
         IFileDialog *pfd,
         IShellItem *psi,
         FDE_OVERWRITE_RESPONSE *pResponse);
 
     END_INTERFACE
 } IFileDialogEventsVtbl;
+
 interface IFileDialogEvents {
     CONST_VTBL IFileDialogEventsVtbl* lpVtbl;
 };
@@ -25325,67 +21469,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnFileOk_Proxy(
-    IFileDialogEvents* This,
-    IFileDialog *pfd);
-void __RPC_STUB IFileDialogEvents_OnFileOk_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnFolderChanging_Proxy(
-    IFileDialogEvents* This,
-    IFileDialog *pfd,
-    IShellItem *psiFolder);
-void __RPC_STUB IFileDialogEvents_OnFolderChanging_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnFolderChange_Proxy(
-    IFileDialogEvents* This,
-    IFileDialog *pfd);
-void __RPC_STUB IFileDialogEvents_OnFolderChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnSelectionChange_Proxy(
-    IFileDialogEvents* This,
-    IFileDialog *pfd);
-void __RPC_STUB IFileDialogEvents_OnSelectionChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnShareViolation_Proxy(
-    IFileDialogEvents* This,
-    IFileDialog *pfd,
-    IShellItem *psi,
-    FDE_SHAREVIOLATION_RESPONSE *pResponse);
-void __RPC_STUB IFileDialogEvents_OnShareViolation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnTypeChange_Proxy(
-    IFileDialogEvents* This,
-    IFileDialog *pfd);
-void __RPC_STUB IFileDialogEvents_OnTypeChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogEvents_OnOverwrite_Proxy(
-    IFileDialogEvents* This,
-    IFileDialog *pfd,
-    IShellItem *psi,
-    FDE_OVERWRITE_RESPONSE *pResponse);
-void __RPC_STUB IFileDialogEvents_OnOverwrite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileDialogEvents_INTERFACE_DEFINED__ */
 
@@ -25393,6 +21476,9 @@
 #ifndef __IShellItemFilter_FWD_DEFINED__
 #define __IShellItemFilter_FWD_DEFINED__
 typedef interface IShellItemFilter IShellItemFilter;
+#ifdef __cplusplus
+interface IShellItemFilter;
+#endif /* __cplusplus */
 #endif
 
 
@@ -25426,7 +21512,6 @@
     FOS_FORCEPREVIEWPANEON = 0x40000000
 };
 
-
 typedef DWORD FILEOPENDIALOGOPTIONS;
 
 DEFINE_GUID(IID_IFileDialog, 0x42f85136, 0xdb7e, 0x439c, 0x85,0xf1, 0xe4,0x07,0x5d,0x13,0x5f,0xc8);
@@ -25516,118 +21601,119 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileDialog* This,
+        IFileDialog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileDialog* This);
+        IFileDialog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileDialog* This);
+        IFileDialog *This);
 
     /*** IModalWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IFileDialog* This,
+        IFileDialog *This,
         HWND hwndOwner);
 
     /*** IFileDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFileTypes)(
-        IFileDialog* This,
+        IFileDialog *This,
         UINT cFileTypes,
         const COMDLG_FILTERSPEC *rgFilterSpec);
 
     HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)(
-        IFileDialog* This,
+        IFileDialog *This,
         UINT iFileType);
 
     HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)(
-        IFileDialog* This,
+        IFileDialog *This,
         UINT *piFileType);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IFileDialog* This,
+        IFileDialog *This,
         IFileDialogEvents *pfde,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IFileDialog* This,
+        IFileDialog *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *SetOptions)(
-        IFileDialog* This,
+        IFileDialog *This,
         FILEOPENDIALOGOPTIONS fos);
 
     HRESULT (STDMETHODCALLTYPE *GetOptions)(
-        IFileDialog* This,
+        IFileDialog *This,
         FILEOPENDIALOGOPTIONS *pfos);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)(
-        IFileDialog* This,
+        IFileDialog *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *SetFolder)(
-        IFileDialog* This,
+        IFileDialog *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *GetFolder)(
-        IFileDialog* This,
+        IFileDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)(
-        IFileDialog* This,
+        IFileDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *SetFileName)(
-        IFileDialog* This,
+        IFileDialog *This,
         LPCWSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *GetFileName)(
-        IFileDialog* This,
+        IFileDialog *This,
         LPWSTR *pszName);
 
     HRESULT (STDMETHODCALLTYPE *SetTitle)(
-        IFileDialog* This,
+        IFileDialog *This,
         LPCWSTR pszTitle);
 
     HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)(
-        IFileDialog* This,
+        IFileDialog *This,
         LPCWSTR pszText);
 
     HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)(
-        IFileDialog* This,
+        IFileDialog *This,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *GetResult)(
-        IFileDialog* This,
+        IFileDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *AddPlace)(
-        IFileDialog* This,
+        IFileDialog *This,
         IShellItem *psi,
         FDAP fdap);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)(
-        IFileDialog* This,
+        IFileDialog *This,
         LPCWSTR pszDefaultExtension);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IFileDialog* This,
+        IFileDialog *This,
         HRESULT hr);
 
     HRESULT (STDMETHODCALLTYPE *SetClientGuid)(
-        IFileDialog* This,
+        IFileDialog *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *ClearClientData)(
-        IFileDialog* This);
+        IFileDialog *This);
 
     HRESULT (STDMETHODCALLTYPE *SetFilter)(
-        IFileDialog* This,
+        IFileDialog *This,
         IShellItemFilter *pFilter);
 
     END_INTERFACE
 } IFileDialogVtbl;
+
 interface IFileDialog {
     CONST_VTBL IFileDialogVtbl* lpVtbl;
 };
@@ -25754,192 +21840,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileDialog_SetFileTypes_Proxy(
-    IFileDialog* This,
-    UINT cFileTypes,
-    const COMDLG_FILTERSPEC *rgFilterSpec);
-void __RPC_STUB IFileDialog_SetFileTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetFileTypeIndex_Proxy(
-    IFileDialog* This,
-    UINT iFileType);
-void __RPC_STUB IFileDialog_SetFileTypeIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_GetFileTypeIndex_Proxy(
-    IFileDialog* This,
-    UINT *piFileType);
-void __RPC_STUB IFileDialog_GetFileTypeIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_Advise_Proxy(
-    IFileDialog* This,
-    IFileDialogEvents *pfde,
-    DWORD *pdwCookie);
-void __RPC_STUB IFileDialog_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_Unadvise_Proxy(
-    IFileDialog* This,
-    DWORD dwCookie);
-void __RPC_STUB IFileDialog_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetOptions_Proxy(
-    IFileDialog* This,
-    FILEOPENDIALOGOPTIONS fos);
-void __RPC_STUB IFileDialog_SetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_GetOptions_Proxy(
-    IFileDialog* This,
-    FILEOPENDIALOGOPTIONS *pfos);
-void __RPC_STUB IFileDialog_GetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetDefaultFolder_Proxy(
-    IFileDialog* This,
-    IShellItem *psi);
-void __RPC_STUB IFileDialog_SetDefaultFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetFolder_Proxy(
-    IFileDialog* This,
-    IShellItem *psi);
-void __RPC_STUB IFileDialog_SetFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_GetFolder_Proxy(
-    IFileDialog* This,
-    IShellItem **ppsi);
-void __RPC_STUB IFileDialog_GetFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_GetCurrentSelection_Proxy(
-    IFileDialog* This,
-    IShellItem **ppsi);
-void __RPC_STUB IFileDialog_GetCurrentSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetFileName_Proxy(
-    IFileDialog* This,
-    LPCWSTR pszName);
-void __RPC_STUB IFileDialog_SetFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_GetFileName_Proxy(
-    IFileDialog* This,
-    LPWSTR *pszName);
-void __RPC_STUB IFileDialog_GetFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetTitle_Proxy(
-    IFileDialog* This,
-    LPCWSTR pszTitle);
-void __RPC_STUB IFileDialog_SetTitle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetOkButtonLabel_Proxy(
-    IFileDialog* This,
-    LPCWSTR pszText);
-void __RPC_STUB IFileDialog_SetOkButtonLabel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetFileNameLabel_Proxy(
-    IFileDialog* This,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialog_SetFileNameLabel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_GetResult_Proxy(
-    IFileDialog* This,
-    IShellItem **ppsi);
-void __RPC_STUB IFileDialog_GetResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_AddPlace_Proxy(
-    IFileDialog* This,
-    IShellItem *psi,
-    FDAP fdap);
-void __RPC_STUB IFileDialog_AddPlace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetDefaultExtension_Proxy(
-    IFileDialog* This,
-    LPCWSTR pszDefaultExtension);
-void __RPC_STUB IFileDialog_SetDefaultExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_Close_Proxy(
-    IFileDialog* This,
-    HRESULT hr);
-void __RPC_STUB IFileDialog_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetClientGuid_Proxy(
-    IFileDialog* This,
-    REFGUID guid);
-void __RPC_STUB IFileDialog_SetClientGuid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_ClearClientData_Proxy(
-    IFileDialog* This);
-void __RPC_STUB IFileDialog_ClearClientData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog_SetFilter_Proxy(
-    IFileDialog* This,
-    IShellItemFilter *pFilter);
-void __RPC_STUB IFileDialog_SetFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileDialog_INTERFACE_DEFINED__ */
 
@@ -25984,136 +21884,136 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSaveDialog* This);
+        IFileSaveDialog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSaveDialog* This);
+        IFileSaveDialog *This);
 
     /*** IModalWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         HWND hwndOwner);
 
     /*** IFileDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFileTypes)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         UINT cFileTypes,
         const COMDLG_FILTERSPEC *rgFilterSpec);
 
     HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         UINT iFileType);
 
     HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         UINT *piFileType);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IFileDialogEvents *pfde,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *SetOptions)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         FILEOPENDIALOGOPTIONS fos);
 
     HRESULT (STDMETHODCALLTYPE *GetOptions)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         FILEOPENDIALOGOPTIONS *pfos);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *SetFolder)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *GetFolder)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *SetFileName)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         LPCWSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *GetFileName)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         LPWSTR *pszName);
 
     HRESULT (STDMETHODCALLTYPE *SetTitle)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         LPCWSTR pszTitle);
 
     HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         LPCWSTR pszText);
 
     HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *GetResult)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *AddPlace)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem *psi,
         FDAP fdap);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         LPCWSTR pszDefaultExtension);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         HRESULT hr);
 
     HRESULT (STDMETHODCALLTYPE *SetClientGuid)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *ClearClientData)(
-        IFileSaveDialog* This);
+        IFileSaveDialog *This);
 
     HRESULT (STDMETHODCALLTYPE *SetFilter)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItemFilter *pFilter);
 
     /*** IFileSaveDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSaveAsItem)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *SetProperties)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IPropertyStore *pStore);
 
     HRESULT (STDMETHODCALLTYPE *SetCollectedProperties)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IPropertyDescriptionList *pList,
         WINBOOL fAppendDefault);
 
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IPropertyStore **ppStore);
 
     HRESULT (STDMETHODCALLTYPE *ApplyProperties)(
-        IFileSaveDialog* This,
+        IFileSaveDialog *This,
         IShellItem *psi,
         IPropertyStore *pStore,
         HWND hwnd,
@@ -26121,6 +22021,7 @@
 
     END_INTERFACE
 } IFileSaveDialogVtbl;
+
 interface IFileSaveDialog {
     CONST_VTBL IFileSaveDialogVtbl* lpVtbl;
 };
@@ -26269,50 +22170,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileSaveDialog_SetSaveAsItem_Proxy(
-    IFileSaveDialog* This,
-    IShellItem *psi);
-void __RPC_STUB IFileSaveDialog_SetSaveAsItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSaveDialog_SetProperties_Proxy(
-    IFileSaveDialog* This,
-    IPropertyStore *pStore);
-void __RPC_STUB IFileSaveDialog_SetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSaveDialog_SetCollectedProperties_Proxy(
-    IFileSaveDialog* This,
-    IPropertyDescriptionList *pList,
-    WINBOOL fAppendDefault);
-void __RPC_STUB IFileSaveDialog_SetCollectedProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSaveDialog_GetProperties_Proxy(
-    IFileSaveDialog* This,
-    IPropertyStore **ppStore);
-void __RPC_STUB IFileSaveDialog_GetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSaveDialog_ApplyProperties_Proxy(
-    IFileSaveDialog* This,
-    IShellItem *psi,
-    IPropertyStore *pStore,
-    HWND hwnd,
-    IFileOperationProgressSink *pSink);
-void __RPC_STUB IFileSaveDialog_ApplyProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileSaveDialog_INTERFACE_DEFINED__ */
 
@@ -26344,127 +22201,128 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileOpenDialog* This);
+        IFileOpenDialog *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileOpenDialog* This);
+        IFileOpenDialog *This);
 
     /*** IModalWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         HWND hwndOwner);
 
     /*** IFileDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFileTypes)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         UINT cFileTypes,
         const COMDLG_FILTERSPEC *rgFilterSpec);
 
     HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         UINT iFileType);
 
     HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         UINT *piFileType);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IFileDialogEvents *pfde,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *SetOptions)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         FILEOPENDIALOGOPTIONS fos);
 
     HRESULT (STDMETHODCALLTYPE *GetOptions)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         FILEOPENDIALOGOPTIONS *pfos);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *SetFolder)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *GetFolder)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *SetFileName)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         LPCWSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *GetFileName)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         LPWSTR *pszName);
 
     HRESULT (STDMETHODCALLTYPE *SetTitle)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         LPCWSTR pszTitle);
 
     HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         LPCWSTR pszText);
 
     HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *GetResult)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *AddPlace)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItem *psi,
         FDAP fdap);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         LPCWSTR pszDefaultExtension);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         HRESULT hr);
 
     HRESULT (STDMETHODCALLTYPE *SetClientGuid)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *ClearClientData)(
-        IFileOpenDialog* This);
+        IFileOpenDialog *This);
 
     HRESULT (STDMETHODCALLTYPE *SetFilter)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItemFilter *pFilter);
 
     /*** IFileOpenDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResults)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItemArray **ppenum);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectedItems)(
-        IFileOpenDialog* This,
+        IFileOpenDialog *This,
         IShellItemArray **ppsai);
 
     END_INTERFACE
 } IFileOpenDialogVtbl;
+
 interface IFileOpenDialog {
     CONST_VTBL IFileOpenDialogVtbl* lpVtbl;
 };
@@ -26601,22 +22459,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileOpenDialog_GetResults_Proxy(
-    IFileOpenDialog* This,
-    IShellItemArray **ppenum);
-void __RPC_STUB IFileOpenDialog_GetResults_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileOpenDialog_GetSelectedItems_Proxy(
-    IFileOpenDialog* This,
-    IShellItemArray **ppsai);
-void __RPC_STUB IFileOpenDialog_GetSelectedItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileOpenDialog_INTERFACE_DEFINED__ */
 
@@ -26757,151 +22599,152 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileDialogCustomize* This);
+        IFileDialogCustomize *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileDialogCustomize* This);
+        IFileDialogCustomize *This);
 
     /*** IFileDialogCustomize methods ***/
     HRESULT (STDMETHODCALLTYPE *EnableOpenDropDown)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl);
 
     HRESULT (STDMETHODCALLTYPE *AddMenu)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *AddPushButton)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *AddComboBox)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl);
 
     HRESULT (STDMETHODCALLTYPE *AddRadioButtonList)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl);
 
     HRESULT (STDMETHODCALLTYPE *AddCheckButton)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszLabel,
         WINBOOL bChecked);
 
     HRESULT (STDMETHODCALLTYPE *AddEditBox)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszText);
 
     HRESULT (STDMETHODCALLTYPE *AddSeparator)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl);
 
     HRESULT (STDMETHODCALLTYPE *AddText)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszText);
 
     HRESULT (STDMETHODCALLTYPE *SetControlLabel)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *GetControlState)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         CDCONTROLSTATEF *pdwState);
 
     HRESULT (STDMETHODCALLTYPE *SetControlState)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         CDCONTROLSTATEF dwState);
 
     HRESULT (STDMETHODCALLTYPE *GetEditBoxText)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         WCHAR **ppszText);
 
     HRESULT (STDMETHODCALLTYPE *SetEditBoxText)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszText);
 
     HRESULT (STDMETHODCALLTYPE *GetCheckButtonState)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         WINBOOL *pbChecked);
 
     HRESULT (STDMETHODCALLTYPE *SetCheckButtonState)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         WINBOOL bChecked);
 
     HRESULT (STDMETHODCALLTYPE *AddControlItem)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         DWORD dwIDItem,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *RemoveControlItem)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         DWORD dwIDItem);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAllControlItems)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl);
 
     HRESULT (STDMETHODCALLTYPE *GetControlItemState)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         DWORD dwIDItem,
         CDCONTROLSTATEF *pdwState);
 
     HRESULT (STDMETHODCALLTYPE *SetControlItemState)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         DWORD dwIDItem,
         CDCONTROLSTATEF dwState);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectedControlItem)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         DWORD *pdwIDItem);
 
     HRESULT (STDMETHODCALLTYPE *SetSelectedControlItem)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         DWORD dwIDItem);
 
     HRESULT (STDMETHODCALLTYPE *StartVisualGroup)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *EndVisualGroup)(
-        IFileDialogCustomize* This);
+        IFileDialogCustomize *This);
 
     HRESULT (STDMETHODCALLTYPE *MakeProminent)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl);
 
     HRESULT (STDMETHODCALLTYPE *SetControlItemText)(
-        IFileDialogCustomize* This,
+        IFileDialogCustomize *This,
         DWORD dwIDCtl,
         DWORD dwIDItem,
         LPCWSTR pszLabel);
 
     END_INTERFACE
 } IFileDialogCustomizeVtbl;
+
 interface IFileDialogCustomize {
     CONST_VTBL IFileDialogCustomizeVtbl* lpVtbl;
 };
@@ -27038,246 +22881,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_EnableOpenDropDown_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogCustomize_EnableOpenDropDown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddMenu_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialogCustomize_AddMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddPushButton_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialogCustomize_AddPushButton_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddComboBox_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogCustomize_AddComboBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddRadioButtonList_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogCustomize_AddRadioButtonList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddCheckButton_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszLabel,
-    WINBOOL bChecked);
-void __RPC_STUB IFileDialogCustomize_AddCheckButton_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddEditBox_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszText);
-void __RPC_STUB IFileDialogCustomize_AddEditBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddSeparator_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogCustomize_AddSeparator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddText_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszText);
-void __RPC_STUB IFileDialogCustomize_AddText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlLabel_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialogCustomize_SetControlLabel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetControlState_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    CDCONTROLSTATEF *pdwState);
-void __RPC_STUB IFileDialogCustomize_GetControlState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlState_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    CDCONTROLSTATEF dwState);
-void __RPC_STUB IFileDialogCustomize_SetControlState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetEditBoxText_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    WCHAR **ppszText);
-void __RPC_STUB IFileDialogCustomize_GetEditBoxText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetEditBoxText_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszText);
-void __RPC_STUB IFileDialogCustomize_SetEditBoxText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetCheckButtonState_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    WINBOOL *pbChecked);
-void __RPC_STUB IFileDialogCustomize_GetCheckButtonState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetCheckButtonState_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    WINBOOL bChecked);
-void __RPC_STUB IFileDialogCustomize_SetCheckButtonState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_AddControlItem_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    DWORD dwIDItem,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialogCustomize_AddControlItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_RemoveControlItem_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    DWORD dwIDItem);
-void __RPC_STUB IFileDialogCustomize_RemoveControlItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_RemoveAllControlItems_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogCustomize_RemoveAllControlItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetControlItemState_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    DWORD dwIDItem,
-    CDCONTROLSTATEF *pdwState);
-void __RPC_STUB IFileDialogCustomize_GetControlItemState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlItemState_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    DWORD dwIDItem,
-    CDCONTROLSTATEF dwState);
-void __RPC_STUB IFileDialogCustomize_SetControlItemState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_GetSelectedControlItem_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    DWORD *pdwIDItem);
-void __RPC_STUB IFileDialogCustomize_GetSelectedControlItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetSelectedControlItem_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    DWORD dwIDItem);
-void __RPC_STUB IFileDialogCustomize_SetSelectedControlItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_StartVisualGroup_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialogCustomize_StartVisualGroup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_EndVisualGroup_Proxy(
-    IFileDialogCustomize* This);
-void __RPC_STUB IFileDialogCustomize_EndVisualGroup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_MakeProminent_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogCustomize_MakeProminent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogCustomize_SetControlItemText_Proxy(
-    IFileDialogCustomize* This,
-    DWORD dwIDCtl,
-    DWORD dwIDItem,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialogCustomize_SetControlItemText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileDialogCustomize_INTERFACE_DEFINED__ */
 
@@ -27321,41 +22924,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileDialogControlEvents* This,
+        IFileDialogControlEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileDialogControlEvents* This);
+        IFileDialogControlEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileDialogControlEvents* This);
+        IFileDialogControlEvents *This);
 
     /*** IFileDialogControlEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnItemSelected)(
-        IFileDialogControlEvents* This,
+        IFileDialogControlEvents *This,
         IFileDialogCustomize *pfdc,
         DWORD dwIDCtl,
         DWORD dwIDItem);
 
     HRESULT (STDMETHODCALLTYPE *OnButtonClicked)(
-        IFileDialogControlEvents* This,
+        IFileDialogControlEvents *This,
         IFileDialogCustomize *pfdc,
         DWORD dwIDCtl);
 
     HRESULT (STDMETHODCALLTYPE *OnCheckButtonToggled)(
-        IFileDialogControlEvents* This,
+        IFileDialogControlEvents *This,
         IFileDialogCustomize *pfdc,
         DWORD dwIDCtl,
         WINBOOL bChecked);
 
     HRESULT (STDMETHODCALLTYPE *OnControlActivating)(
-        IFileDialogControlEvents* This,
+        IFileDialogControlEvents *This,
         IFileDialogCustomize *pfdc,
         DWORD dwIDCtl);
 
     END_INTERFACE
 } IFileDialogControlEventsVtbl;
+
 interface IFileDialogControlEvents {
     CONST_VTBL IFileDialogControlEventsVtbl* lpVtbl;
 };
@@ -27400,44 +23004,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnItemSelected_Proxy(
-    IFileDialogControlEvents* This,
-    IFileDialogCustomize *pfdc,
-    DWORD dwIDCtl,
-    DWORD dwIDItem);
-void __RPC_STUB IFileDialogControlEvents_OnItemSelected_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnButtonClicked_Proxy(
-    IFileDialogControlEvents* This,
-    IFileDialogCustomize *pfdc,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogControlEvents_OnButtonClicked_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnCheckButtonToggled_Proxy(
-    IFileDialogControlEvents* This,
-    IFileDialogCustomize *pfdc,
-    DWORD dwIDCtl,
-    WINBOOL bChecked);
-void __RPC_STUB IFileDialogControlEvents_OnCheckButtonToggled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialogControlEvents_OnControlActivating_Proxy(
-    IFileDialogControlEvents* This,
-    IFileDialogCustomize *pfdc,
-    DWORD dwIDCtl);
-void __RPC_STUB IFileDialogControlEvents_OnControlActivating_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileDialogControlEvents_INTERFACE_DEFINED__ */
 
@@ -27469,127 +23035,128 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileDialog2* This);
+        IFileDialog2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileDialog2* This);
+        IFileDialog2 *This);
 
     /*** IModalWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *Show)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         HWND hwndOwner);
 
     /*** IFileDialog methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFileTypes)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         UINT cFileTypes,
         const COMDLG_FILTERSPEC *rgFilterSpec);
 
     HRESULT (STDMETHODCALLTYPE *SetFileTypeIndex)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         UINT iFileType);
 
     HRESULT (STDMETHODCALLTYPE *GetFileTypeIndex)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         UINT *piFileType);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IFileDialogEvents *pfde,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *SetOptions)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         FILEOPENDIALOGOPTIONS fos);
 
     HRESULT (STDMETHODCALLTYPE *GetOptions)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         FILEOPENDIALOGOPTIONS *pfos);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultFolder)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *SetFolder)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *GetFolder)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentSelection)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *SetFileName)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         LPCWSTR pszName);
 
     HRESULT (STDMETHODCALLTYPE *GetFileName)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         LPWSTR *pszName);
 
     HRESULT (STDMETHODCALLTYPE *SetTitle)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         LPCWSTR pszTitle);
 
     HRESULT (STDMETHODCALLTYPE *SetOkButtonLabel)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         LPCWSTR pszText);
 
     HRESULT (STDMETHODCALLTYPE *SetFileNameLabel)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *GetResult)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItem **ppsi);
 
     HRESULT (STDMETHODCALLTYPE *AddPlace)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItem *psi,
         FDAP fdap);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultExtension)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         LPCWSTR pszDefaultExtension);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         HRESULT hr);
 
     HRESULT (STDMETHODCALLTYPE *SetClientGuid)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *ClearClientData)(
-        IFileDialog2* This);
+        IFileDialog2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetFilter)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItemFilter *pFilter);
 
     /*** IFileDialog2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetCancelButtonLabel)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         LPCWSTR pszLabel);
 
     HRESULT (STDMETHODCALLTYPE *SetNavigationRoot)(
-        IFileDialog2* This,
+        IFileDialog2 *This,
         IShellItem *psi);
 
     END_INTERFACE
 } IFileDialog2Vtbl;
+
 interface IFileDialog2 {
     CONST_VTBL IFileDialog2Vtbl* lpVtbl;
 };
@@ -27726,22 +23293,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileDialog2_SetCancelButtonLabel_Proxy(
-    IFileDialog2* This,
-    LPCWSTR pszLabel);
-void __RPC_STUB IFileDialog2_SetCancelButtonLabel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileDialog2_SetNavigationRoot_Proxy(
-    IFileDialog2* This,
-    IShellItem *psi);
-void __RPC_STUB IFileDialog2_SetNavigationRoot_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileDialog2_INTERFACE_DEFINED__ */
 
@@ -27809,26 +23360,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationAssociationRegistration* This,
+        IApplicationAssociationRegistration *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationAssociationRegistration* This);
+        IApplicationAssociationRegistration *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationAssociationRegistration* This);
+        IApplicationAssociationRegistration *This);
 
     /*** IApplicationAssociationRegistration methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryCurrentDefault)(
-        IApplicationAssociationRegistration* This,
+        IApplicationAssociationRegistration *This,
         LPCWSTR pszQuery,
         ASSOCIATIONTYPE atQueryType,
         ASSOCIATIONLEVEL alQueryLevel,
         LPWSTR *ppszAssociation);
 
     HRESULT (STDMETHODCALLTYPE *QueryAppIsDefault)(
-        IApplicationAssociationRegistration* This,
+        IApplicationAssociationRegistration *This,
         LPCWSTR pszQuery,
         ASSOCIATIONTYPE atQueryType,
         ASSOCIATIONLEVEL alQueryLevel,
@@ -27836,26 +23387,27 @@
         WINBOOL *pfDefault);
 
     HRESULT (STDMETHODCALLTYPE *QueryAppIsDefaultAll)(
-        IApplicationAssociationRegistration* This,
+        IApplicationAssociationRegistration *This,
         ASSOCIATIONLEVEL alQueryLevel,
         LPCWSTR pszAppRegistryName,
         WINBOOL *pfDefault);
 
     HRESULT (STDMETHODCALLTYPE *SetAppAsDefault)(
-        IApplicationAssociationRegistration* This,
+        IApplicationAssociationRegistration *This,
         LPCWSTR pszAppRegistryName,
         LPCWSTR pszSet,
         ASSOCIATIONTYPE atSetType);
 
     HRESULT (STDMETHODCALLTYPE *SetAppAsDefaultAll)(
-        IApplicationAssociationRegistration* This,
+        IApplicationAssociationRegistration *This,
         LPCWSTR pszAppRegistryName);
 
     HRESULT (STDMETHODCALLTYPE *ClearUserAssociations)(
-        IApplicationAssociationRegistration* This);
+        IApplicationAssociationRegistration *This);
 
     END_INTERFACE
 } IApplicationAssociationRegistrationVtbl;
+
 interface IApplicationAssociationRegistration {
     CONST_VTBL IApplicationAssociationRegistrationVtbl* lpVtbl;
 };
@@ -27908,64 +23460,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_QueryCurrentDefault_Proxy(
-    IApplicationAssociationRegistration* This,
-    LPCWSTR pszQuery,
-    ASSOCIATIONTYPE atQueryType,
-    ASSOCIATIONLEVEL alQueryLevel,
-    LPWSTR *ppszAssociation);
-void __RPC_STUB IApplicationAssociationRegistration_QueryCurrentDefault_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_QueryAppIsDefault_Proxy(
-    IApplicationAssociationRegistration* This,
-    LPCWSTR pszQuery,
-    ASSOCIATIONTYPE atQueryType,
-    ASSOCIATIONLEVEL alQueryLevel,
-    LPCWSTR pszAppRegistryName,
-    WINBOOL *pfDefault);
-void __RPC_STUB IApplicationAssociationRegistration_QueryAppIsDefault_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_QueryAppIsDefaultAll_Proxy(
-    IApplicationAssociationRegistration* This,
-    ASSOCIATIONLEVEL alQueryLevel,
-    LPCWSTR pszAppRegistryName,
-    WINBOOL *pfDefault);
-void __RPC_STUB IApplicationAssociationRegistration_QueryAppIsDefaultAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_SetAppAsDefault_Proxy(
-    IApplicationAssociationRegistration* This,
-    LPCWSTR pszAppRegistryName,
-    LPCWSTR pszSet,
-    ASSOCIATIONTYPE atSetType);
-void __RPC_STUB IApplicationAssociationRegistration_SetAppAsDefault_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_SetAppAsDefaultAll_Proxy(
-    IApplicationAssociationRegistration* This,
-    LPCWSTR pszAppRegistryName);
-void __RPC_STUB IApplicationAssociationRegistration_SetAppAsDefaultAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistration_ClearUserAssociations_Proxy(
-    IApplicationAssociationRegistration* This);
-void __RPC_STUB IApplicationAssociationRegistration_ClearUserAssociations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationAssociationRegistration_INTERFACE_DEFINED__ */
 
@@ -27996,23 +23490,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationAssociationRegistrationUI* This,
+        IApplicationAssociationRegistrationUI *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationAssociationRegistrationUI* This);
+        IApplicationAssociationRegistrationUI *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationAssociationRegistrationUI* This);
+        IApplicationAssociationRegistrationUI *This);
 
     /*** IApplicationAssociationRegistrationUI methods ***/
     HRESULT (STDMETHODCALLTYPE *LaunchAdvancedAssociationUI)(
-        IApplicationAssociationRegistrationUI* This,
+        IApplicationAssociationRegistrationUI *This,
         LPCWSTR pszAppRegistryName);
 
     END_INTERFACE
 } IApplicationAssociationRegistrationUIVtbl;
+
 interface IApplicationAssociationRegistrationUI {
     CONST_VTBL IApplicationAssociationRegistrationUIVtbl* lpVtbl;
 };
@@ -28045,14 +23540,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationAssociationRegistrationUI_LaunchAdvancedAssociationUI_Proxy(
-    IApplicationAssociationRegistrationUI* This,
-    LPCWSTR pszAppRegistryName);
-void __RPC_STUB IApplicationAssociationRegistrationUI_LaunchAdvancedAssociationUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationAssociationRegistrationUI_INTERFACE_DEFINED__ */
 
@@ -28094,23 +23581,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDelegateFolder* This,
+        IDelegateFolder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDelegateFolder* This);
+        IDelegateFolder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDelegateFolder* This);
+        IDelegateFolder *This);
 
     /*** IDelegateFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *SetItemAlloc)(
-        IDelegateFolder* This,
+        IDelegateFolder *This,
         IMalloc *pmalloc);
 
     END_INTERFACE
 } IDelegateFolderVtbl;
+
 interface IDelegateFolder {
     CONST_VTBL IDelegateFolderVtbl* lpVtbl;
 };
@@ -28143,14 +23631,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDelegateFolder_SetItemAlloc_Proxy(
-    IDelegateFolder* This,
-    IMalloc *pmalloc);
-void __RPC_STUB IDelegateFolder_SetItemAlloc_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDelegateFolder_INTERFACE_DEFINED__ */
 
@@ -28187,7 +23667,6 @@
     BFO_QUERY_ALL = (int)0xffffffff
 };
 
-
 typedef DWORD BROWSERFRAMEOPTIONS;
 
 DEFINE_GUID(IID_IBrowserFrameOptions, 0x10df43c8, 0x1dbe, 0x11d3, 0x8b,0x34, 0x00,0x60,0x97,0xdf,0x5b,0xd4);
@@ -28209,24 +23688,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBrowserFrameOptions* This,
+        IBrowserFrameOptions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBrowserFrameOptions* This);
+        IBrowserFrameOptions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBrowserFrameOptions* This);
+        IBrowserFrameOptions *This);
 
     /*** IBrowserFrameOptions methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFrameOptions)(
-        IBrowserFrameOptions* This,
+        IBrowserFrameOptions *This,
         BROWSERFRAMEOPTIONS dwMask,
         BROWSERFRAMEOPTIONS *pdwOptions);
 
     END_INTERFACE
 } IBrowserFrameOptionsVtbl;
+
 interface IBrowserFrameOptions {
     CONST_VTBL IBrowserFrameOptionsVtbl* lpVtbl;
 };
@@ -28259,15 +23739,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBrowserFrameOptions_GetFrameOptions_Proxy(
-    IBrowserFrameOptions* This,
-    BROWSERFRAMEOPTIONS dwMask,
-    BROWSERFRAMEOPTIONS *pdwOptions);
-void __RPC_STUB IBrowserFrameOptions_GetFrameOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IBrowserFrameOptions_INTERFACE_DEFINED__ */
 
@@ -28325,19 +23796,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INewWindowManager* This,
+        INewWindowManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INewWindowManager* This);
+        INewWindowManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INewWindowManager* This);
+        INewWindowManager *This);
 
     /*** INewWindowManager methods ***/
     HRESULT (STDMETHODCALLTYPE *EvaluateNewWindow)(
-        INewWindowManager* This,
+        INewWindowManager *This,
         LPCWSTR pszUrl,
         LPCWSTR pszName,
         LPCWSTR pszUrlContext,
@@ -28348,6 +23819,7 @@
 
     END_INTERFACE
 } INewWindowManagerVtbl;
+
 interface INewWindowManager {
     CONST_VTBL INewWindowManagerVtbl* lpVtbl;
 };
@@ -28380,20 +23852,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INewWindowManager_EvaluateNewWindow_Proxy(
-    INewWindowManager* This,
-    LPCWSTR pszUrl,
-    LPCWSTR pszName,
-    LPCWSTR pszUrlContext,
-    LPCWSTR pszFeatures,
-    WINBOOL fReplace,
-    DWORD dwFlags,
-    DWORD dwUserActionTime);
-void __RPC_STUB INewWindowManager_EvaluateNewWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INewWindowManager_INTERFACE_DEFINED__ */
 
@@ -28472,68 +23930,69 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAttachmentExecute* This);
+        IAttachmentExecute *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAttachmentExecute* This);
+        IAttachmentExecute *This);
 
     /*** IAttachmentExecute methods ***/
     HRESULT (STDMETHODCALLTYPE *SetClientTitle)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         LPCWSTR pszTitle);
 
     HRESULT (STDMETHODCALLTYPE *SetClientGuid)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         REFGUID guid);
 
     HRESULT (STDMETHODCALLTYPE *SetLocalPath)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         LPCWSTR pszLocalPath);
 
     HRESULT (STDMETHODCALLTYPE *SetFileName)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         LPCWSTR pszFileName);
 
     HRESULT (STDMETHODCALLTYPE *SetSource)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         LPCWSTR pszSource);
 
     HRESULT (STDMETHODCALLTYPE *SetReferrer)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         LPCWSTR pszReferrer);
 
     HRESULT (STDMETHODCALLTYPE *CheckPolicy)(
-        IAttachmentExecute* This);
+        IAttachmentExecute *This);
 
     HRESULT (STDMETHODCALLTYPE *Prompt)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         HWND hwnd,
         ATTACHMENT_PROMPT prompt,
         ATTACHMENT_ACTION *paction);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IAttachmentExecute* This);
+        IAttachmentExecute *This);
 
     HRESULT (STDMETHODCALLTYPE *Execute)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         HWND hwnd,
         LPCWSTR pszVerb,
         HANDLE *phProcess);
 
     HRESULT (STDMETHODCALLTYPE *SaveWithUI)(
-        IAttachmentExecute* This,
+        IAttachmentExecute *This,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *ClearClientState)(
-        IAttachmentExecute* This);
+        IAttachmentExecute *This);
 
     END_INTERFACE
 } IAttachmentExecuteVtbl;
+
 interface IAttachmentExecute {
     CONST_VTBL IAttachmentExecuteVtbl* lpVtbl;
 };
@@ -28610,103 +24069,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetClientTitle_Proxy(
-    IAttachmentExecute* This,
-    LPCWSTR pszTitle);
-void __RPC_STUB IAttachmentExecute_SetClientTitle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetClientGuid_Proxy(
-    IAttachmentExecute* This,
-    REFGUID guid);
-void __RPC_STUB IAttachmentExecute_SetClientGuid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetLocalPath_Proxy(
-    IAttachmentExecute* This,
-    LPCWSTR pszLocalPath);
-void __RPC_STUB IAttachmentExecute_SetLocalPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetFileName_Proxy(
-    IAttachmentExecute* This,
-    LPCWSTR pszFileName);
-void __RPC_STUB IAttachmentExecute_SetFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetSource_Proxy(
-    IAttachmentExecute* This,
-    LPCWSTR pszSource);
-void __RPC_STUB IAttachmentExecute_SetSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_SetReferrer_Proxy(
-    IAttachmentExecute* This,
-    LPCWSTR pszReferrer);
-void __RPC_STUB IAttachmentExecute_SetReferrer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_CheckPolicy_Proxy(
-    IAttachmentExecute* This);
-void __RPC_STUB IAttachmentExecute_CheckPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_Prompt_Proxy(
-    IAttachmentExecute* This,
-    HWND hwnd,
-    ATTACHMENT_PROMPT prompt,
-    ATTACHMENT_ACTION *paction);
-void __RPC_STUB IAttachmentExecute_Prompt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_Save_Proxy(
-    IAttachmentExecute* This);
-void __RPC_STUB IAttachmentExecute_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_Execute_Proxy(
-    IAttachmentExecute* This,
-    HWND hwnd,
-    LPCWSTR pszVerb,
-    HANDLE *phProcess);
-void __RPC_STUB IAttachmentExecute_Execute_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_SaveWithUI_Proxy(
-    IAttachmentExecute* This,
-    HWND hwnd);
-void __RPC_STUB IAttachmentExecute_SaveWithUI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAttachmentExecute_ClearClientState_Proxy(
-    IAttachmentExecute* This);
-void __RPC_STUB IAttachmentExecute_ClearClientState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAttachmentExecute_INTERFACE_DEFINED__ */
 
@@ -28757,13 +24119,11 @@
     SMIM_ICON = 0x4
 };
 
-
 enum tagSMINFOTYPE {
     SMIT_SEPARATOR = 0x1,
     SMIT_STRING = 0x2
 };
 
-
 enum tagSMINFOFLAGS {
     SMIF_ICON = 0x1,
     SMIF_ACCELERATOR = 0x2,
@@ -28780,7 +24140,6 @@
     SMIF_NEW = 0x2000
 };
 
-
 #define SMC_INITMENU 0x00000001
 #define SMC_CREATE 0x00000002
 #define SMC_EXITMENU 0x00000003
@@ -28844,19 +24203,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellMenuCallback* This,
+        IShellMenuCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellMenuCallback* This);
+        IShellMenuCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellMenuCallback* This);
+        IShellMenuCallback *This);
 
     /*** IShellMenuCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *CallbackSM)(
-        IShellMenuCallback* This,
+        IShellMenuCallback *This,
         LPSMDATA psmd,
         UINT uMsg,
         WPARAM wParam,
@@ -28864,6 +24223,7 @@
 
     END_INTERFACE
 } IShellMenuCallbackVtbl;
+
 interface IShellMenuCallback {
     CONST_VTBL IShellMenuCallbackVtbl* lpVtbl;
 };
@@ -28896,17 +24256,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellMenuCallback_CallbackSM_Proxy(
-    IShellMenuCallback* This,
-    LPSMDATA psmd,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IShellMenuCallback_CallbackSM_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellMenuCallback_INTERFACE_DEFINED__ */
 
@@ -28999,73 +24348,74 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellMenu* This,
+        IShellMenu *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellMenu* This);
+        IShellMenu *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellMenu* This);
+        IShellMenu *This);
 
     /*** IShellMenu methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IShellMenu* This,
+        IShellMenu *This,
         IShellMenuCallback *psmc,
         UINT uId,
         UINT uIdAncestor,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetMenuInfo)(
-        IShellMenu* This,
+        IShellMenu *This,
         IShellMenuCallback **ppsmc,
         UINT *puId,
         UINT *puIdAncestor,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetShellFolder)(
-        IShellMenu* This,
+        IShellMenu *This,
         IShellFolder *psf,
         PCIDLIST_ABSOLUTE pidlFolder,
         HKEY hKey,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetShellFolder)(
-        IShellMenu* This,
+        IShellMenu *This,
         DWORD *pdwFlags,
         PIDLIST_ABSOLUTE *ppidl,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetMenu)(
-        IShellMenu* This,
+        IShellMenu *This,
         HMENU hmenu,
         HWND hwnd,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetMenu)(
-        IShellMenu* This,
+        IShellMenu *This,
         HMENU *phmenu,
         HWND *phwnd,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *InvalidateItem)(
-        IShellMenu* This,
+        IShellMenu *This,
         LPSMDATA psmd,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IShellMenu* This,
+        IShellMenu *This,
         LPSMDATA psmd);
 
     HRESULT (STDMETHODCALLTYPE *SetMenuToolbar)(
-        IShellMenu* This,
+        IShellMenu *This,
         IUnknown *punk,
         DWORD dwFlags);
 
     END_INTERFACE
 } IShellMenuVtbl;
+
 interface IShellMenu {
     CONST_VTBL IShellMenuVtbl* lpVtbl;
 };
@@ -29130,96 +24480,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellMenu_Initialize_Proxy(
-    IShellMenu* This,
-    IShellMenuCallback *psmc,
-    UINT uId,
-    UINT uIdAncestor,
-    DWORD dwFlags);
-void __RPC_STUB IShellMenu_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_GetMenuInfo_Proxy(
-    IShellMenu* This,
-    IShellMenuCallback **ppsmc,
-    UINT *puId,
-    UINT *puIdAncestor,
-    DWORD *pdwFlags);
-void __RPC_STUB IShellMenu_GetMenuInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_SetShellFolder_Proxy(
-    IShellMenu* This,
-    IShellFolder *psf,
-    PCIDLIST_ABSOLUTE pidlFolder,
-    HKEY hKey,
-    DWORD dwFlags);
-void __RPC_STUB IShellMenu_SetShellFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_GetShellFolder_Proxy(
-    IShellMenu* This,
-    DWORD *pdwFlags,
-    PIDLIST_ABSOLUTE *ppidl,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellMenu_GetShellFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_SetMenu_Proxy(
-    IShellMenu* This,
-    HMENU hmenu,
-    HWND hwnd,
-    DWORD dwFlags);
-void __RPC_STUB IShellMenu_SetMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_GetMenu_Proxy(
-    IShellMenu* This,
-    HMENU *phmenu,
-    HWND *phwnd,
-    DWORD *pdwFlags);
-void __RPC_STUB IShellMenu_GetMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_InvalidateItem_Proxy(
-    IShellMenu* This,
-    LPSMDATA psmd,
-    DWORD dwFlags);
-void __RPC_STUB IShellMenu_InvalidateItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_GetState_Proxy(
-    IShellMenu* This,
-    LPSMDATA psmd);
-void __RPC_STUB IShellMenu_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellMenu_SetMenuToolbar_Proxy(
-    IShellMenu* This,
-    IUnknown *punk,
-    DWORD dwFlags);
-void __RPC_STUB IShellMenu_SetMenuToolbar_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellMenu_INTERFACE_DEFINED__ */
 
@@ -29249,23 +24509,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellRunDll* This,
+        IShellRunDll *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellRunDll* This);
+        IShellRunDll *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellRunDll* This);
+        IShellRunDll *This);
 
     /*** IShellRunDll methods ***/
     HRESULT (STDMETHODCALLTYPE *Run)(
-        IShellRunDll* This,
+        IShellRunDll *This,
         LPCWSTR pszArgs);
 
     END_INTERFACE
 } IShellRunDllVtbl;
+
 interface IShellRunDll {
     CONST_VTBL IShellRunDllVtbl* lpVtbl;
 };
@@ -29298,14 +24559,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellRunDll_Run_Proxy(
-    IShellRunDll* This,
-    LPCWSTR pszArgs);
-void __RPC_STUB IShellRunDll_Run_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellRunDll_INTERFACE_DEFINED__ */
 
@@ -29326,7 +24579,6 @@
     KFDF_PUBLISHEXPANDEDPATH = 0x20
 };
 
-
 typedef DWORD KF_DEFINITION_FLAGS;
 
 enum _KF_REDIRECT_FLAGS {
@@ -29343,7 +24595,6 @@
     KF_REDIRECT_EXCLUDE_ALL_KNOWN_SUBFOLDERS = 0x800
 };
 
-
 typedef DWORD KF_REDIRECT_FLAGS;
 
 enum _KF_REDIRECTION_CAPABILITIES {
@@ -29355,7 +24606,6 @@
     KF_REDIRECTION_CAPABILITIES_DENY_PERMISSIONS = 0x400
 };
 
-
 typedef DWORD KF_REDIRECTION_CAPABILITIES;
 
 typedef struct KNOWNFOLDER_DEFINITION {
@@ -29427,60 +24677,61 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IKnownFolder* This);
+        IKnownFolder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IKnownFolder* This);
+        IKnownFolder *This);
 
     /*** IKnownFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         KNOWNFOLDERID *pkfid);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         KF_CATEGORY *pCategory);
 
     HRESULT (STDMETHODCALLTYPE *GetShellItem)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         DWORD dwFlags,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         DWORD dwFlags,
         LPWSTR *ppszPath);
 
     HRESULT (STDMETHODCALLTYPE *SetPath)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         DWORD dwFlags,
         LPCWSTR pszPath);
 
     HRESULT (STDMETHODCALLTYPE *GetIDList)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         DWORD dwFlags,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderType)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         FOLDERTYPEID *pftid);
 
     HRESULT (STDMETHODCALLTYPE *GetRedirectionCapabilities)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         KF_REDIRECTION_CAPABILITIES *pCapabilities);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderDefinition)(
-        IKnownFolder* This,
+        IKnownFolder *This,
         KNOWNFOLDER_DEFINITION *pKFD);
 
     END_INTERFACE
 } IKnownFolderVtbl;
+
 interface IKnownFolder {
     CONST_VTBL IKnownFolderVtbl* lpVtbl;
 };
@@ -29545,83 +24796,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetId_Proxy(
-    IKnownFolder* This,
-    KNOWNFOLDERID *pkfid);
-void __RPC_STUB IKnownFolder_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetCategory_Proxy(
-    IKnownFolder* This,
-    KF_CATEGORY *pCategory);
-void __RPC_STUB IKnownFolder_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetShellItem_Proxy(
-    IKnownFolder* This,
-    DWORD dwFlags,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IKnownFolder_GetShellItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetPath_Proxy(
-    IKnownFolder* This,
-    DWORD dwFlags,
-    LPWSTR *ppszPath);
-void __RPC_STUB IKnownFolder_GetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_SetPath_Proxy(
-    IKnownFolder* This,
-    DWORD dwFlags,
-    LPCWSTR pszPath);
-void __RPC_STUB IKnownFolder_SetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetIDList_Proxy(
-    IKnownFolder* This,
-    DWORD dwFlags,
-    PIDLIST_ABSOLUTE *ppidl);
-void __RPC_STUB IKnownFolder_GetIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetFolderType_Proxy(
-    IKnownFolder* This,
-    FOLDERTYPEID *pftid);
-void __RPC_STUB IKnownFolder_GetFolderType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetRedirectionCapabilities_Proxy(
-    IKnownFolder* This,
-    KF_REDIRECTION_CAPABILITIES *pCapabilities);
-void __RPC_STUB IKnownFolder_GetRedirectionCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolder_GetFolderDefinition_Proxy(
-    IKnownFolder* This,
-    KNOWNFOLDER_DEFINITION *pKFD);
-void __RPC_STUB IKnownFolder_GetFolderDefinition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IKnownFolder_INTERFACE_DEFINED__ */
 
@@ -29697,64 +24871,64 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IKnownFolderManager* This);
+        IKnownFolderManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IKnownFolderManager* This);
+        IKnownFolderManager *This);
 
     /*** IKnownFolderManager methods ***/
     HRESULT (STDMETHODCALLTYPE *FolderIdFromCsidl)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         int nCsidl,
         KNOWNFOLDERID *pfid);
 
     HRESULT (STDMETHODCALLTYPE *FolderIdToCsidl)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         REFKNOWNFOLDERID rfid,
         int *pnCsidl);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderIds)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         KNOWNFOLDERID **ppKFId,
         UINT *pCount);
 
     HRESULT (STDMETHODCALLTYPE *GetFolder)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         REFKNOWNFOLDERID rfid,
         IKnownFolder **ppkf);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderByName)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         LPCWSTR pszCanonicalName,
         IKnownFolder **ppkf);
 
     HRESULT (STDMETHODCALLTYPE *RegisterFolder)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         REFKNOWNFOLDERID rfid,
         const KNOWNFOLDER_DEFINITION *pKFD);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterFolder)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         REFKNOWNFOLDERID rfid);
 
     HRESULT (STDMETHODCALLTYPE *FindFolderFromPath)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         LPCWSTR pszPath,
         FFFP_MODE mode,
         IKnownFolder **ppkf);
 
     HRESULT (STDMETHODCALLTYPE *FindFolderFromIDList)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         PCIDLIST_ABSOLUTE pidl,
         IKnownFolder **ppkf);
 
     HRESULT (STDMETHODCALLTYPE *Redirect)(
-        IKnownFolderManager* This,
+        IKnownFolderManager *This,
         REFKNOWNFOLDERID rfid,
         HWND hwnd,
         KF_REDIRECT_FLAGS flags,
@@ -29765,6 +24939,7 @@
 
     END_INTERFACE
 } IKnownFolderManagerVtbl;
+
 interface IKnownFolderManager {
     CONST_VTBL IKnownFolderManagerVtbl* lpVtbl;
 };
@@ -29833,87 +25008,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_FolderIdFromCsidl_Proxy(
-    IKnownFolderManager* This,
-    int nCsidl,
-    KNOWNFOLDERID *pfid);
-void __RPC_STUB IKnownFolderManager_FolderIdFromCsidl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_FolderIdToCsidl_Proxy(
-    IKnownFolderManager* This,
-    REFKNOWNFOLDERID rfid,
-    int *pnCsidl);
-void __RPC_STUB IKnownFolderManager_FolderIdToCsidl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_GetFolderIds_Proxy(
-    IKnownFolderManager* This,
-    KNOWNFOLDERID **ppKFId,
-    UINT *pCount);
-void __RPC_STUB IKnownFolderManager_GetFolderIds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_GetFolder_Proxy(
-    IKnownFolderManager* This,
-    REFKNOWNFOLDERID rfid,
-    IKnownFolder **ppkf);
-void __RPC_STUB IKnownFolderManager_GetFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_GetFolderByName_Proxy(
-    IKnownFolderManager* This,
-    LPCWSTR pszCanonicalName,
-    IKnownFolder **ppkf);
-void __RPC_STUB IKnownFolderManager_GetFolderByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_RegisterFolder_Proxy(
-    IKnownFolderManager* This,
-    REFKNOWNFOLDERID rfid,
-    const KNOWNFOLDER_DEFINITION *pKFD);
-void __RPC_STUB IKnownFolderManager_RegisterFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_UnregisterFolder_Proxy(
-    IKnownFolderManager* This,
-    REFKNOWNFOLDERID rfid);
-void __RPC_STUB IKnownFolderManager_UnregisterFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_FindFolderFromPath_Proxy(
-    IKnownFolderManager* This,
-    LPCWSTR pszPath,
-    FFFP_MODE mode,
-    IKnownFolder **ppkf);
-void __RPC_STUB IKnownFolderManager_FindFolderFromPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKnownFolderManager_FindFolderFromIDList_Proxy(
-    IKnownFolderManager* This,
-    PCIDLIST_ABSOLUTE pidl,
-    IKnownFolder **ppkf);
-void __RPC_STUB IKnownFolderManager_FindFolderFromIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IKnownFolderManager_RemoteRedirect_Proxy(
     IKnownFolderManager* This,
     REFKNOWNFOLDERID rfid,
@@ -30020,46 +25114,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISharingConfigurationManager* This,
+        ISharingConfigurationManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISharingConfigurationManager* This);
+        ISharingConfigurationManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISharingConfigurationManager* This);
+        ISharingConfigurationManager *This);
 
     /*** ISharingConfigurationManager methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateShare)(
-        ISharingConfigurationManager* This,
+        ISharingConfigurationManager *This,
         DEF_SHARE_ID dsid,
         SHARE_ROLE role);
 
     HRESULT (STDMETHODCALLTYPE *DeleteShare)(
-        ISharingConfigurationManager* This,
+        ISharingConfigurationManager *This,
         DEF_SHARE_ID dsid);
 
     HRESULT (STDMETHODCALLTYPE *ShareExists)(
-        ISharingConfigurationManager* This,
+        ISharingConfigurationManager *This,
         DEF_SHARE_ID dsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSharePermissions)(
-        ISharingConfigurationManager* This,
+        ISharingConfigurationManager *This,
         DEF_SHARE_ID dsid,
         SHARE_ROLE *pRole);
 
     HRESULT (STDMETHODCALLTYPE *SharePrinters)(
-        ISharingConfigurationManager* This);
+        ISharingConfigurationManager *This);
 
     HRESULT (STDMETHODCALLTYPE *StopSharingPrinters)(
-        ISharingConfigurationManager* This);
+        ISharingConfigurationManager *This);
 
     HRESULT (STDMETHODCALLTYPE *ArePrintersShared)(
-        ISharingConfigurationManager* This);
+        ISharingConfigurationManager *This);
 
     END_INTERFACE
 } ISharingConfigurationManagerVtbl;
+
 interface ISharingConfigurationManager {
     CONST_VTBL ISharingConfigurationManagerVtbl* lpVtbl;
 };
@@ -30116,61 +25211,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_CreateShare_Proxy(
-    ISharingConfigurationManager* This,
-    DEF_SHARE_ID dsid,
-    SHARE_ROLE role);
-void __RPC_STUB ISharingConfigurationManager_CreateShare_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_DeleteShare_Proxy(
-    ISharingConfigurationManager* This,
-    DEF_SHARE_ID dsid);
-void __RPC_STUB ISharingConfigurationManager_DeleteShare_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_ShareExists_Proxy(
-    ISharingConfigurationManager* This,
-    DEF_SHARE_ID dsid);
-void __RPC_STUB ISharingConfigurationManager_ShareExists_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_GetSharePermissions_Proxy(
-    ISharingConfigurationManager* This,
-    DEF_SHARE_ID dsid,
-    SHARE_ROLE *pRole);
-void __RPC_STUB ISharingConfigurationManager_GetSharePermissions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_SharePrinters_Proxy(
-    ISharingConfigurationManager* This);
-void __RPC_STUB ISharingConfigurationManager_SharePrinters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_StopSharingPrinters_Proxy(
-    ISharingConfigurationManager* This);
-void __RPC_STUB ISharingConfigurationManager_StopSharingPrinters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISharingConfigurationManager_ArePrintersShared_Proxy(
-    ISharingConfigurationManager* This);
-void __RPC_STUB ISharingConfigurationManager_ArePrintersShared_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISharingConfigurationManager_INTERFACE_DEFINED__ */
 
@@ -30202,25 +25242,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPreviousVersionsInfo* This,
+        IPreviousVersionsInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPreviousVersionsInfo* This);
+        IPreviousVersionsInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPreviousVersionsInfo* This);
+        IPreviousVersionsInfo *This);
 
     /*** IPreviousVersionsInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *AreSnapshotsAvailable)(
-        IPreviousVersionsInfo* This,
+        IPreviousVersionsInfo *This,
         LPCWSTR pszPath,
         WINBOOL fOkToBeSlow,
         WINBOOL *pfAvailable);
 
     END_INTERFACE
 } IPreviousVersionsInfoVtbl;
+
 interface IPreviousVersionsInfo {
     CONST_VTBL IPreviousVersionsInfoVtbl* lpVtbl;
 };
@@ -30253,16 +25294,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPreviousVersionsInfo_AreSnapshotsAvailable_Proxy(
-    IPreviousVersionsInfo* This,
-    LPCWSTR pszPath,
-    WINBOOL fOkToBeSlow,
-    WINBOOL *pfAvailable);
-void __RPC_STUB IPreviousVersionsInfo_AreSnapshotsAvailable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPreviousVersionsInfo_INTERFACE_DEFINED__ */
 
@@ -30295,27 +25326,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRelatedItem* This,
+        IRelatedItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRelatedItem* This);
+        IRelatedItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRelatedItem* This);
+        IRelatedItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        IRelatedItem* This,
+        IRelatedItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IRelatedItem* This,
+        IRelatedItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } IRelatedItemVtbl;
+
 interface IRelatedItem {
     CONST_VTBL IRelatedItemVtbl* lpVtbl;
 };
@@ -30352,22 +25384,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IRelatedItem_GetItemIDList_Proxy(
-    IRelatedItem* This,
-    PIDLIST_ABSOLUTE *ppidl);
-void __RPC_STUB IRelatedItem_GetItemIDList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IRelatedItem_GetItem_Proxy(
-    IRelatedItem* This,
-    IShellItem **ppsi);
-void __RPC_STUB IRelatedItem_GetItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IRelatedItem_INTERFACE_DEFINED__ */
 
@@ -30393,27 +25409,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IIdentityName* This,
+        IIdentityName *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IIdentityName* This);
+        IIdentityName *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IIdentityName* This);
+        IIdentityName *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        IIdentityName* This,
+        IIdentityName *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IIdentityName* This,
+        IIdentityName *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } IIdentityNameVtbl;
+
 interface IIdentityName {
     CONST_VTBL IIdentityNameVtbl* lpVtbl;
 };
@@ -30475,27 +25492,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDelegateItem* This,
+        IDelegateItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDelegateItem* This);
+        IDelegateItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDelegateItem* This);
+        IDelegateItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        IDelegateItem* This,
+        IDelegateItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IDelegateItem* This,
+        IDelegateItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } IDelegateItemVtbl;
+
 interface IDelegateItem {
     CONST_VTBL IDelegateItemVtbl* lpVtbl;
 };
@@ -30557,27 +25575,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICurrentItem* This,
+        ICurrentItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICurrentItem* This);
+        ICurrentItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICurrentItem* This);
+        ICurrentItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        ICurrentItem* This,
+        ICurrentItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        ICurrentItem* This,
+        ICurrentItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } ICurrentItemVtbl;
+
 interface ICurrentItem {
     CONST_VTBL ICurrentItemVtbl* lpVtbl;
 };
@@ -30639,27 +25658,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITransferMediumItem* This,
+        ITransferMediumItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITransferMediumItem* This);
+        ITransferMediumItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITransferMediumItem* This);
+        ITransferMediumItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        ITransferMediumItem* This,
+        ITransferMediumItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        ITransferMediumItem* This,
+        ITransferMediumItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } ITransferMediumItemVtbl;
+
 interface ITransferMediumItem {
     CONST_VTBL ITransferMediumItemVtbl* lpVtbl;
 };
@@ -30721,27 +25741,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUseToBrowseItem* This,
+        IUseToBrowseItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUseToBrowseItem* This);
+        IUseToBrowseItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUseToBrowseItem* This);
+        IUseToBrowseItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        IUseToBrowseItem* This,
+        IUseToBrowseItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IUseToBrowseItem* This,
+        IUseToBrowseItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } IUseToBrowseItemVtbl;
+
 interface IUseToBrowseItem {
     CONST_VTBL IUseToBrowseItemVtbl* lpVtbl;
 };
@@ -30803,27 +25824,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDisplayItem* This,
+        IDisplayItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDisplayItem* This);
+        IDisplayItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDisplayItem* This);
+        IDisplayItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        IDisplayItem* This,
+        IDisplayItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IDisplayItem* This,
+        IDisplayItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } IDisplayItemVtbl;
+
 interface IDisplayItem {
     CONST_VTBL IDisplayItemVtbl* lpVtbl;
 };
@@ -30885,27 +25907,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IViewStateIdentityItem* This,
+        IViewStateIdentityItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IViewStateIdentityItem* This);
+        IViewStateIdentityItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IViewStateIdentityItem* This);
+        IViewStateIdentityItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        IViewStateIdentityItem* This,
+        IViewStateIdentityItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IViewStateIdentityItem* This,
+        IViewStateIdentityItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } IViewStateIdentityItemVtbl;
+
 interface IViewStateIdentityItem {
     CONST_VTBL IViewStateIdentityItemVtbl* lpVtbl;
 };
@@ -30967,27 +25990,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPreviewItem* This,
+        IPreviewItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPreviewItem* This);
+        IPreviewItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPreviewItem* This);
+        IPreviewItem *This);
 
     /*** IRelatedItem methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItemIDList)(
-        IPreviewItem* This,
+        IPreviewItem *This,
         PIDLIST_ABSOLUTE *ppidl);
 
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IPreviewItem* This,
+        IPreviewItem *This,
         IShellItem **ppsi);
 
     END_INTERFACE
 } IPreviewItemVtbl;
+
 interface IPreviewItem {
     CONST_VTBL IPreviewItemVtbl* lpVtbl;
 };
@@ -31053,23 +26077,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDestinationStreamFactory* This,
+        IDestinationStreamFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDestinationStreamFactory* This);
+        IDestinationStreamFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDestinationStreamFactory* This);
+        IDestinationStreamFactory *This);
 
     /*** IDestinationStreamFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDestinationStream)(
-        IDestinationStreamFactory* This,
+        IDestinationStreamFactory *This,
         IStream **ppstm);
 
     END_INTERFACE
 } IDestinationStreamFactoryVtbl;
+
 interface IDestinationStreamFactory {
     CONST_VTBL IDestinationStreamFactoryVtbl* lpVtbl;
 };
@@ -31102,14 +26127,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDestinationStreamFactory_GetDestinationStream_Proxy(
-    IDestinationStreamFactory* This,
-    IStream **ppstm);
-void __RPC_STUB IDestinationStreamFactory_GetDestinationStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDestinationStreamFactory_INTERFACE_DEFINED__ */
 
@@ -31120,7 +26137,6 @@
     NMCII_FOLDERS = 0x2
 };
 
-
 typedef int NMCII_FLAGS;
 
 enum _NMCSAEI_FLAGS {
@@ -31128,7 +26144,6 @@
     NMCSAEI_EDIT = 0x1
 };
 
-
 typedef int NMCSAEI_FLAGS;
 
 /*****************************************************************************
@@ -31159,28 +26174,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INewMenuClient* This,
+        INewMenuClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INewMenuClient* This);
+        INewMenuClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INewMenuClient* This);
+        INewMenuClient *This);
 
     /*** INewMenuClient methods ***/
     HRESULT (STDMETHODCALLTYPE *IncludeItems)(
-        INewMenuClient* This,
+        INewMenuClient *This,
         NMCII_FLAGS *pflags);
 
     HRESULT (STDMETHODCALLTYPE *SelectAndEditItem)(
-        INewMenuClient* This,
+        INewMenuClient *This,
         PCIDLIST_ABSOLUTE pidlItem,
         NMCSAEI_FLAGS flags);
 
     END_INTERFACE
 } INewMenuClientVtbl;
+
 interface INewMenuClient {
     CONST_VTBL INewMenuClientVtbl* lpVtbl;
 };
@@ -31217,23 +26233,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INewMenuClient_IncludeItems_Proxy(
-    INewMenuClient* This,
-    NMCII_FLAGS *pflags);
-void __RPC_STUB INewMenuClient_IncludeItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INewMenuClient_SelectAndEditItem_Proxy(
-    INewMenuClient* This,
-    PCIDLIST_ABSOLUTE pidlItem,
-    NMCSAEI_FLAGS flags);
-void __RPC_STUB INewMenuClient_SelectAndEditItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INewMenuClient_INTERFACE_DEFINED__ */
 
@@ -31267,23 +26266,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeWithBindCtx* This,
+        IInitializeWithBindCtx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeWithBindCtx* This);
+        IInitializeWithBindCtx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeWithBindCtx* This);
+        IInitializeWithBindCtx *This);
 
     /*** IInitializeWithBindCtx methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeWithBindCtx* This,
+        IInitializeWithBindCtx *This,
         IBindCtx *pbc);
 
     END_INTERFACE
 } IInitializeWithBindCtxVtbl;
+
 interface IInitializeWithBindCtx {
     CONST_VTBL IInitializeWithBindCtxVtbl* lpVtbl;
 };
@@ -31316,14 +26316,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInitializeWithBindCtx_Initialize_Proxy(
-    IInitializeWithBindCtx* This,
-    IBindCtx *pbc);
-void __RPC_STUB IInitializeWithBindCtx_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInitializeWithBindCtx_INTERFACE_DEFINED__ */
 
@@ -31356,28 +26348,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellItemFilter* This,
+        IShellItemFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellItemFilter* This);
+        IShellItemFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellItemFilter* This);
+        IShellItemFilter *This);
 
     /*** IShellItemFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *IncludeItem)(
-        IShellItemFilter* This,
+        IShellItemFilter *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumFlagsForItem)(
-        IShellItemFilter* This,
+        IShellItemFilter *This,
         IShellItem *psi,
         SHCONTF *pgrfFlags);
 
     END_INTERFACE
 } IShellItemFilterVtbl;
+
 interface IShellItemFilter {
     CONST_VTBL IShellItemFilterVtbl* lpVtbl;
 };
@@ -31414,23 +26407,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellItemFilter_IncludeItem_Proxy(
-    IShellItemFilter* This,
-    IShellItem *psi);
-void __RPC_STUB IShellItemFilter_IncludeItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellItemFilter_GetEnumFlagsForItem_Proxy(
-    IShellItemFilter* This,
-    IShellItem *psi,
-    SHCONTF *pgrfFlags);
-void __RPC_STUB IShellItemFilter_GetEnumFlagsForItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellItemFilter_INTERFACE_DEFINED__ */
 
@@ -31475,7 +26451,6 @@
     NSTCS_SHOWREFRESHBUTTON = (int)0x80000000
 };
 
-
 typedef DWORD NSTCSTYLE;
 
 enum _NSTCROOTSTYLE {
@@ -31484,7 +26459,6 @@
     NSTCRS_EXPANDED = 0x2
 };
 
-
 typedef DWORD NSTCROOTSTYLE;
 
 enum _NSTCITEMSTATE {
@@ -31496,7 +26470,6 @@
     NSTCIS_SELECTEDNOEXPAND = 0x10
 };
 
-
 typedef DWORD NSTCITEMSTATE;
 
 typedef enum NSTCGNI {
@@ -31602,41 +26575,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INameSpaceTreeControl* This);
+        INameSpaceTreeControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INameSpaceTreeControl* This);
+        INameSpaceTreeControl *This);
 
     /*** INameSpaceTreeControl methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         HWND hwndParent,
         RECT *prc,
         NSTCSTYLE nsctsFlags);
 
     HRESULT (STDMETHODCALLTYPE *TreeAdvise)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IUnknown *punk,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *TreeUnadvise)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *AppendRoot)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psiRoot,
         SHCONTF grfEnumFlags,
         NSTCROOTSTYLE grfRootStyle,
         IShellItemFilter *pif);
 
     HRESULT (STDMETHODCALLTYPE *InsertRoot)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         int iIndex,
         IShellItem *psiRoot,
         SHCONTF grfEnumFlags,
@@ -31644,71 +26617,72 @@
         IShellItemFilter *pif);
 
     HRESULT (STDMETHODCALLTYPE *RemoveRoot)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psiRoot);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAllRoots)(
-        INameSpaceTreeControl* This);
+        INameSpaceTreeControl *This);
 
     HRESULT (STDMETHODCALLTYPE *GetRootItems)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItemArray **ppsiaRootItems);
 
     HRESULT (STDMETHODCALLTYPE *SetItemState)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psi,
         NSTCITEMSTATE nstcisMask,
         NSTCITEMSTATE nstcisFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetItemState)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psi,
         NSTCITEMSTATE nstcisMask,
         NSTCITEMSTATE *pnstcisFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectedItems)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItemArray **psiaItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemCustomState)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psi,
         int *piStateNumber);
 
     HRESULT (STDMETHODCALLTYPE *SetItemCustomState)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psi,
         int iStateNumber);
 
     HRESULT (STDMETHODCALLTYPE *EnsureItemVisible)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *SetTheme)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         LPCWSTR pszTheme);
 
     HRESULT (STDMETHODCALLTYPE *GetNextItem)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psi,
         NSTCGNI nstcgi,
         IShellItem **ppsiNext);
 
     HRESULT (STDMETHODCALLTYPE *HitTest)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         POINT *ppt,
         IShellItem **ppsiOut);
 
     HRESULT (STDMETHODCALLTYPE *GetItemRect)(
-        INameSpaceTreeControl* This,
+        INameSpaceTreeControl *This,
         IShellItem *psi,
         RECT *prect);
 
     HRESULT (STDMETHODCALLTYPE *CollapseAll)(
-        INameSpaceTreeControl* This);
+        INameSpaceTreeControl *This);
 
     END_INTERFACE
 } INameSpaceTreeControlVtbl;
+
 interface INameSpaceTreeControl {
     CONST_VTBL INameSpaceTreeControlVtbl* lpVtbl;
 };
@@ -31813,176 +26787,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_Initialize_Proxy(
-    INameSpaceTreeControl* This,
-    HWND hwndParent,
-    RECT *prc,
-    NSTCSTYLE nsctsFlags);
-void __RPC_STUB INameSpaceTreeControl_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_TreeAdvise_Proxy(
-    INameSpaceTreeControl* This,
-    IUnknown *punk,
-    DWORD *pdwCookie);
-void __RPC_STUB INameSpaceTreeControl_TreeAdvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_TreeUnadvise_Proxy(
-    INameSpaceTreeControl* This,
-    DWORD dwCookie);
-void __RPC_STUB INameSpaceTreeControl_TreeUnadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_AppendRoot_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psiRoot,
-    SHCONTF grfEnumFlags,
-    NSTCROOTSTYLE grfRootStyle,
-    IShellItemFilter *pif);
-void __RPC_STUB INameSpaceTreeControl_AppendRoot_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_InsertRoot_Proxy(
-    INameSpaceTreeControl* This,
-    int iIndex,
-    IShellItem *psiRoot,
-    SHCONTF grfEnumFlags,
-    NSTCROOTSTYLE grfRootStyle,
-    IShellItemFilter *pif);
-void __RPC_STUB INameSpaceTreeControl_InsertRoot_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_RemoveRoot_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psiRoot);
-void __RPC_STUB INameSpaceTreeControl_RemoveRoot_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_RemoveAllRoots_Proxy(
-    INameSpaceTreeControl* This);
-void __RPC_STUB INameSpaceTreeControl_RemoveAllRoots_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetRootItems_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItemArray **ppsiaRootItems);
-void __RPC_STUB INameSpaceTreeControl_GetRootItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_SetItemState_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psi,
-    NSTCITEMSTATE nstcisMask,
-    NSTCITEMSTATE nstcisFlags);
-void __RPC_STUB INameSpaceTreeControl_SetItemState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetItemState_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psi,
-    NSTCITEMSTATE nstcisMask,
-    NSTCITEMSTATE *pnstcisFlags);
-void __RPC_STUB INameSpaceTreeControl_GetItemState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetSelectedItems_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItemArray **psiaItems);
-void __RPC_STUB INameSpaceTreeControl_GetSelectedItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetItemCustomState_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psi,
-    int *piStateNumber);
-void __RPC_STUB INameSpaceTreeControl_GetItemCustomState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_SetItemCustomState_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psi,
-    int iStateNumber);
-void __RPC_STUB INameSpaceTreeControl_SetItemCustomState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_EnsureItemVisible_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControl_EnsureItemVisible_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_SetTheme_Proxy(
-    INameSpaceTreeControl* This,
-    LPCWSTR pszTheme);
-void __RPC_STUB INameSpaceTreeControl_SetTheme_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetNextItem_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psi,
-    NSTCGNI nstcgi,
-    IShellItem **ppsiNext);
-void __RPC_STUB INameSpaceTreeControl_GetNextItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_HitTest_Proxy(
-    INameSpaceTreeControl* This,
-    POINT *ppt,
-    IShellItem **ppsiOut);
-void __RPC_STUB INameSpaceTreeControl_HitTest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_GetItemRect_Proxy(
-    INameSpaceTreeControl* This,
-    IShellItem *psi,
-    RECT *prect);
-void __RPC_STUB INameSpaceTreeControl_GetItemRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl_CollapseAll_Proxy(
-    INameSpaceTreeControl* This);
-void __RPC_STUB INameSpaceTreeControl_CollapseAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INameSpaceTreeControl_INTERFACE_DEFINED__ */
 
@@ -32036,41 +26840,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INameSpaceTreeControl2* This);
+        INameSpaceTreeControl2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INameSpaceTreeControl2* This);
+        INameSpaceTreeControl2 *This);
 
     /*** INameSpaceTreeControl methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         HWND hwndParent,
         RECT *prc,
         NSTCSTYLE nsctsFlags);
 
     HRESULT (STDMETHODCALLTYPE *TreeAdvise)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IUnknown *punk,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *TreeUnadvise)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *AppendRoot)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psiRoot,
         SHCONTF grfEnumFlags,
         NSTCROOTSTYLE grfRootStyle,
         IShellItemFilter *pif);
 
     HRESULT (STDMETHODCALLTYPE *InsertRoot)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         int iIndex,
         IShellItem *psiRoot,
         SHCONTF grfEnumFlags,
@@ -32078,92 +26882,93 @@
         IShellItemFilter *pif);
 
     HRESULT (STDMETHODCALLTYPE *RemoveRoot)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psiRoot);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAllRoots)(
-        INameSpaceTreeControl2* This);
+        INameSpaceTreeControl2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetRootItems)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItemArray **ppsiaRootItems);
 
     HRESULT (STDMETHODCALLTYPE *SetItemState)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psi,
         NSTCITEMSTATE nstcisMask,
         NSTCITEMSTATE nstcisFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetItemState)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psi,
         NSTCITEMSTATE nstcisMask,
         NSTCITEMSTATE *pnstcisFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectedItems)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItemArray **psiaItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemCustomState)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psi,
         int *piStateNumber);
 
     HRESULT (STDMETHODCALLTYPE *SetItemCustomState)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psi,
         int iStateNumber);
 
     HRESULT (STDMETHODCALLTYPE *EnsureItemVisible)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *SetTheme)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         LPCWSTR pszTheme);
 
     HRESULT (STDMETHODCALLTYPE *GetNextItem)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psi,
         NSTCGNI nstcgi,
         IShellItem **ppsiNext);
 
     HRESULT (STDMETHODCALLTYPE *HitTest)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         POINT *ppt,
         IShellItem **ppsiOut);
 
     HRESULT (STDMETHODCALLTYPE *GetItemRect)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         IShellItem *psi,
         RECT *prect);
 
     HRESULT (STDMETHODCALLTYPE *CollapseAll)(
-        INameSpaceTreeControl2* This);
+        INameSpaceTreeControl2 *This);
 
     /*** INameSpaceTreeControl2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetControlStyle)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         NSTCSTYLE nstcsMask,
         NSTCSTYLE nstcsStyle);
 
     HRESULT (STDMETHODCALLTYPE *GetControlStyle)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         NSTCSTYLE nstcsMask,
         NSTCSTYLE *pnstcsStyle);
 
     HRESULT (STDMETHODCALLTYPE *SetControlStyle2)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         NSTCSTYLE2 nstcsMask,
         NSTCSTYLE2 nstcsStyle);
 
     HRESULT (STDMETHODCALLTYPE *GetControlStyle2)(
-        INameSpaceTreeControl2* This,
+        INameSpaceTreeControl2 *This,
         NSTCSTYLE2 nstcsMask,
         NSTCSTYLE2 *pnstcsStyle);
 
     END_INTERFACE
 } INameSpaceTreeControl2Vtbl;
+
 interface INameSpaceTreeControl2 {
     CONST_VTBL INameSpaceTreeControl2Vtbl* lpVtbl;
 };
@@ -32286,42 +27091,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_SetControlStyle_Proxy(
-    INameSpaceTreeControl2* This,
-    NSTCSTYLE nstcsMask,
-    NSTCSTYLE nstcsStyle);
-void __RPC_STUB INameSpaceTreeControl2_SetControlStyle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_GetControlStyle_Proxy(
-    INameSpaceTreeControl2* This,
-    NSTCSTYLE nstcsMask,
-    NSTCSTYLE *pnstcsStyle);
-void __RPC_STUB INameSpaceTreeControl2_GetControlStyle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_SetControlStyle2_Proxy(
-    INameSpaceTreeControl2* This,
-    NSTCSTYLE2 nstcsMask,
-    NSTCSTYLE2 nstcsStyle);
-void __RPC_STUB INameSpaceTreeControl2_SetControlStyle2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControl2_GetControlStyle2_Proxy(
-    INameSpaceTreeControl2* This,
-    NSTCSTYLE2 nstcsMask,
-    NSTCSTYLE2 *pnstcsStyle);
-void __RPC_STUB INameSpaceTreeControl2_GetControlStyle2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INameSpaceTreeControl2_INTERFACE_DEFINED__ */
 
@@ -32352,7 +27121,6 @@
     NSTCEHT_ONITEMTABBUTTON = 0x1000
 };
 
-
 typedef DWORD NSTCEHITTEST;
 
 enum _NSTCECLICKTYPE {
@@ -32363,7 +27131,6 @@
     NSTCECT_DBLCLICK = 0x4
 };
 
-
 typedef DWORD NSTCECLICKTYPE;
 
 DEFINE_GUID(IID_INameSpaceTreeControlEvents, 0x93d77985, 0xb3d8, 0x4484, 0x83,0x18, 0x67,0x2c,0xdd,0xa0,0x02,0xce);
@@ -32454,110 +27221,111 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INameSpaceTreeControlEvents* This);
+        INameSpaceTreeControlEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INameSpaceTreeControlEvents* This);
+        INameSpaceTreeControlEvents *This);
 
     /*** INameSpaceTreeControlEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnItemClick)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         NSTCEHITTEST nstceHitTest,
         NSTCECLICKTYPE nstceClickType);
 
     HRESULT (STDMETHODCALLTYPE *OnPropertyItemCommit)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnItemStateChanging)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         NSTCITEMSTATE nstcisMask,
         NSTCITEMSTATE nstcisState);
 
     HRESULT (STDMETHODCALLTYPE *OnItemStateChanged)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         NSTCITEMSTATE nstcisMask,
         NSTCITEMSTATE nstcisState);
 
     HRESULT (STDMETHODCALLTYPE *OnSelectionChanged)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItemArray *psiaSelection);
 
     HRESULT (STDMETHODCALLTYPE *OnKeyboardInput)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         UINT uMsg,
         WPARAM wParam,
         LPARAM lParam);
 
     HRESULT (STDMETHODCALLTYPE *OnBeforeExpand)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnAfterExpand)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnBeginLabelEdit)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnEndLabelEdit)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnGetToolTip)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         LPWSTR pszTip,
         int cchTip);
 
     HRESULT (STDMETHODCALLTYPE *OnBeforeItemDelete)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnItemAdded)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         WINBOOL fIsRoot);
 
     HRESULT (STDMETHODCALLTYPE *OnItemDeleted)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         WINBOOL fIsRoot);
 
     HRESULT (STDMETHODCALLTYPE *OnBeforeContextMenu)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *OnAfterContextMenu)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         IContextMenu *pcmIn,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *OnBeforeStateImageChange)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnGetDefaultIconIndex)(
-        INameSpaceTreeControlEvents* This,
+        INameSpaceTreeControlEvents *This,
         IShellItem *psi,
         int *piDefaultIcon,
         int *piOpenIcon);
 
     END_INTERFACE
 } INameSpaceTreeControlEventsVtbl;
+
 interface INameSpaceTreeControlEvents {
     CONST_VTBL INameSpaceTreeControlEventsVtbl* lpVtbl;
 };
@@ -32658,169 +27426,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemClick_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    NSTCEHITTEST nstceHitTest,
-    NSTCECLICKTYPE nstceClickType);
-void __RPC_STUB INameSpaceTreeControlEvents_OnItemClick_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnPropertyItemCommit_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControlEvents_OnPropertyItemCommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemStateChanging_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    NSTCITEMSTATE nstcisMask,
-    NSTCITEMSTATE nstcisState);
-void __RPC_STUB INameSpaceTreeControlEvents_OnItemStateChanging_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemStateChanged_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    NSTCITEMSTATE nstcisMask,
-    NSTCITEMSTATE nstcisState);
-void __RPC_STUB INameSpaceTreeControlEvents_OnItemStateChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnSelectionChanged_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItemArray *psiaSelection);
-void __RPC_STUB INameSpaceTreeControlEvents_OnSelectionChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnKeyboardInput_Proxy(
-    INameSpaceTreeControlEvents* This,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB INameSpaceTreeControlEvents_OnKeyboardInput_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeExpand_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeExpand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnAfterExpand_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControlEvents_OnAfterExpand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeginLabelEdit_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControlEvents_OnBeginLabelEdit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnEndLabelEdit_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControlEvents_OnEndLabelEdit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnGetToolTip_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    LPWSTR pszTip,
-    int cchTip);
-void __RPC_STUB INameSpaceTreeControlEvents_OnGetToolTip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeItemDelete_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeItemDelete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemAdded_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    WINBOOL fIsRoot);
-void __RPC_STUB INameSpaceTreeControlEvents_OnItemAdded_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnItemDeleted_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    WINBOOL fIsRoot);
-void __RPC_STUB INameSpaceTreeControlEvents_OnItemDeleted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeContextMenu_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeContextMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnAfterContextMenu_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    IContextMenu *pcmIn,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB INameSpaceTreeControlEvents_OnAfterContextMenu_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnBeforeStateImageChange_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeControlEvents_OnBeforeStateImageChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlEvents_OnGetDefaultIconIndex_Proxy(
-    INameSpaceTreeControlEvents* This,
-    IShellItem *psi,
-    int *piDefaultIcon,
-    int *piOpenIcon);
-void __RPC_STUB INameSpaceTreeControlEvents_OnGetDefaultIconIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INameSpaceTreeControlEvents_INTERFACE_DEFINED__ */
 
@@ -32883,19 +27488,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INameSpaceTreeControlDropHandler* This,
+        INameSpaceTreeControlDropHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INameSpaceTreeControlDropHandler* This);
+        INameSpaceTreeControlDropHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INameSpaceTreeControlDropHandler* This);
+        INameSpaceTreeControlDropHandler *This);
 
     /*** INameSpaceTreeControlDropHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *OnDragEnter)(
-        INameSpaceTreeControlDropHandler* This,
+        INameSpaceTreeControlDropHandler *This,
         IShellItem *psiOver,
         IShellItemArray *psiaData,
         WINBOOL fOutsideSource,
@@ -32903,21 +27508,21 @@
         DWORD *pdwEffect);
 
     HRESULT (STDMETHODCALLTYPE *OnDragOver)(
-        INameSpaceTreeControlDropHandler* This,
+        INameSpaceTreeControlDropHandler *This,
         IShellItem *psiOver,
         IShellItemArray *psiaData,
         DWORD grfKeyState,
         DWORD *pdwEffect);
 
     HRESULT (STDMETHODCALLTYPE *OnDragPosition)(
-        INameSpaceTreeControlDropHandler* This,
+        INameSpaceTreeControlDropHandler *This,
         IShellItem *psiOver,
         IShellItemArray *psiaData,
         int iNewPosition,
         int iOldPosition);
 
     HRESULT (STDMETHODCALLTYPE *OnDrop)(
-        INameSpaceTreeControlDropHandler* This,
+        INameSpaceTreeControlDropHandler *This,
         IShellItem *psiOver,
         IShellItemArray *psiaData,
         int iPosition,
@@ -32925,18 +27530,19 @@
         DWORD *pdwEffect);
 
     HRESULT (STDMETHODCALLTYPE *OnDropPosition)(
-        INameSpaceTreeControlDropHandler* This,
+        INameSpaceTreeControlDropHandler *This,
         IShellItem *psiOver,
         IShellItemArray *psiaData,
         int iNewPosition,
         int iOldPosition);
 
     HRESULT (STDMETHODCALLTYPE *OnDragLeave)(
-        INameSpaceTreeControlDropHandler* This,
+        INameSpaceTreeControlDropHandler *This,
         IShellItem *psiOver);
 
     END_INTERFACE
 } INameSpaceTreeControlDropHandlerVtbl;
+
 interface INameSpaceTreeControlDropHandler {
     CONST_VTBL INameSpaceTreeControlDropHandlerVtbl* lpVtbl;
 };
@@ -32989,71 +27595,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragEnter_Proxy(
-    INameSpaceTreeControlDropHandler* This,
-    IShellItem *psiOver,
-    IShellItemArray *psiaData,
-    WINBOOL fOutsideSource,
-    DWORD grfKeyState,
-    DWORD *pdwEffect);
-void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragEnter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragOver_Proxy(
-    INameSpaceTreeControlDropHandler* This,
-    IShellItem *psiOver,
-    IShellItemArray *psiaData,
-    DWORD grfKeyState,
-    DWORD *pdwEffect);
-void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragOver_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragPosition_Proxy(
-    INameSpaceTreeControlDropHandler* This,
-    IShellItem *psiOver,
-    IShellItemArray *psiaData,
-    int iNewPosition,
-    int iOldPosition);
-void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDrop_Proxy(
-    INameSpaceTreeControlDropHandler* This,
-    IShellItem *psiOver,
-    IShellItemArray *psiaData,
-    int iPosition,
-    DWORD grfKeyState,
-    DWORD *pdwEffect);
-void __RPC_STUB INameSpaceTreeControlDropHandler_OnDrop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDropPosition_Proxy(
-    INameSpaceTreeControlDropHandler* This,
-    IShellItem *psiOver,
-    IShellItemArray *psiaData,
-    int iNewPosition,
-    int iOldPosition);
-void __RPC_STUB INameSpaceTreeControlDropHandler_OnDropPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlDropHandler_OnDragLeave_Proxy(
-    INameSpaceTreeControlDropHandler* This,
-    IShellItem *psiOver);
-void __RPC_STUB INameSpaceTreeControlDropHandler_OnDragLeave_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INameSpaceTreeControlDropHandler_INTERFACE_DEFINED__ */
 
@@ -33090,33 +27631,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INameSpaceTreeAccessible* This,
+        INameSpaceTreeAccessible *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INameSpaceTreeAccessible* This);
+        INameSpaceTreeAccessible *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INameSpaceTreeAccessible* This);
+        INameSpaceTreeAccessible *This);
 
     /*** INameSpaceTreeAccessible methods ***/
     HRESULT (STDMETHODCALLTYPE *OnGetDefaultAccessibilityAction)(
-        INameSpaceTreeAccessible* This,
+        INameSpaceTreeAccessible *This,
         IShellItem *psi,
         BSTR *pbstrDefaultAction);
 
     HRESULT (STDMETHODCALLTYPE *OnDoDefaultAccessibilityAction)(
-        INameSpaceTreeAccessible* This,
+        INameSpaceTreeAccessible *This,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *OnGetAccessibilityRole)(
-        INameSpaceTreeAccessible* This,
+        INameSpaceTreeAccessible *This,
         IShellItem *psi,
         VARIANT *pvarRole);
 
     END_INTERFACE
 } INameSpaceTreeAccessibleVtbl;
+
 interface INameSpaceTreeAccessible {
     CONST_VTBL INameSpaceTreeAccessibleVtbl* lpVtbl;
 };
@@ -33157,32 +27699,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INameSpaceTreeAccessible_OnGetDefaultAccessibilityAction_Proxy(
-    INameSpaceTreeAccessible* This,
-    IShellItem *psi,
-    BSTR *pbstrDefaultAction);
-void __RPC_STUB INameSpaceTreeAccessible_OnGetDefaultAccessibilityAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeAccessible_OnDoDefaultAccessibilityAction_Proxy(
-    INameSpaceTreeAccessible* This,
-    IShellItem *psi);
-void __RPC_STUB INameSpaceTreeAccessible_OnDoDefaultAccessibilityAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeAccessible_OnGetAccessibilityRole_Proxy(
-    INameSpaceTreeAccessible* This,
-    IShellItem *psi,
-    VARIANT *pvarRole);
-void __RPC_STUB INameSpaceTreeAccessible_OnGetAccessibilityRole_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INameSpaceTreeAccessible_INTERFACE_DEFINED__ */
 
@@ -33241,30 +27757,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INameSpaceTreeControlCustomDraw* This,
+        INameSpaceTreeControlCustomDraw *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INameSpaceTreeControlCustomDraw* This);
+        INameSpaceTreeControlCustomDraw *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INameSpaceTreeControlCustomDraw* This);
+        INameSpaceTreeControlCustomDraw *This);
 
     /*** INameSpaceTreeControlCustomDraw methods ***/
     HRESULT (STDMETHODCALLTYPE *PrePaint)(
-        INameSpaceTreeControlCustomDraw* This,
+        INameSpaceTreeControlCustomDraw *This,
         HDC hdc,
         RECT *prc,
         LRESULT *plres);
 
     HRESULT (STDMETHODCALLTYPE *PostPaint)(
-        INameSpaceTreeControlCustomDraw* This,
+        INameSpaceTreeControlCustomDraw *This,
         HDC hdc,
         RECT *prc);
 
     HRESULT (STDMETHODCALLTYPE *ItemPrePaint)(
-        INameSpaceTreeControlCustomDraw* This,
+        INameSpaceTreeControlCustomDraw *This,
         HDC hdc,
         RECT *prc,
         NSTCCUSTOMDRAW *pnstccdItem,
@@ -33273,13 +27789,14 @@
         LRESULT *plres);
 
     HRESULT (STDMETHODCALLTYPE *ItemPostPaint)(
-        INameSpaceTreeControlCustomDraw* This,
+        INameSpaceTreeControlCustomDraw *This,
         HDC hdc,
         RECT *prc,
         NSTCCUSTOMDRAW *pnstccdItem);
 
     END_INTERFACE
 } INameSpaceTreeControlCustomDrawVtbl;
+
 interface INameSpaceTreeControlCustomDraw {
     CONST_VTBL INameSpaceTreeControlCustomDrawVtbl* lpVtbl;
 };
@@ -33324,48 +27841,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_PrePaint_Proxy(
-    INameSpaceTreeControlCustomDraw* This,
-    HDC hdc,
-    RECT *prc,
-    LRESULT *plres);
-void __RPC_STUB INameSpaceTreeControlCustomDraw_PrePaint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_PostPaint_Proxy(
-    INameSpaceTreeControlCustomDraw* This,
-    HDC hdc,
-    RECT *prc);
-void __RPC_STUB INameSpaceTreeControlCustomDraw_PostPaint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_ItemPrePaint_Proxy(
-    INameSpaceTreeControlCustomDraw* This,
-    HDC hdc,
-    RECT *prc,
-    NSTCCUSTOMDRAW *pnstccdItem,
-    COLORREF *pclrText,
-    COLORREF *pclrTextBk,
-    LRESULT *plres);
-void __RPC_STUB INameSpaceTreeControlCustomDraw_ItemPrePaint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlCustomDraw_ItemPostPaint_Proxy(
-    INameSpaceTreeControlCustomDraw* This,
-    HDC hdc,
-    RECT *prc,
-    NSTCCUSTOMDRAW *pnstccdItem);
-void __RPC_STUB INameSpaceTreeControlCustomDraw_ItemPostPaint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INameSpaceTreeControlCustomDraw_INTERFACE_DEFINED__ */
 
@@ -33404,24 +27879,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        INameSpaceTreeControlFolderCapabilities* This,
+        INameSpaceTreeControlFolderCapabilities *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        INameSpaceTreeControlFolderCapabilities* This);
+        INameSpaceTreeControlFolderCapabilities *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        INameSpaceTreeControlFolderCapabilities* This);
+        INameSpaceTreeControlFolderCapabilities *This);
 
     /*** INameSpaceTreeControlFolderCapabilities methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFolderCapabilities)(
-        INameSpaceTreeControlFolderCapabilities* This,
+        INameSpaceTreeControlFolderCapabilities *This,
         NSTCFOLDERCAPABILITIES nfcMask,
         NSTCFOLDERCAPABILITIES *pnfcValue);
 
     END_INTERFACE
 } INameSpaceTreeControlFolderCapabilitiesVtbl;
+
 interface INameSpaceTreeControlFolderCapabilities {
     CONST_VTBL INameSpaceTreeControlFolderCapabilitiesVtbl* lpVtbl;
 };
@@ -33454,15 +27930,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE INameSpaceTreeControlFolderCapabilities_GetFolderCapabilities_Proxy(
-    INameSpaceTreeControlFolderCapabilities* This,
-    NSTCFOLDERCAPABILITIES nfcMask,
-    NSTCFOLDERCAPABILITIES *pnfcValue);
-void __RPC_STUB INameSpaceTreeControlFolderCapabilities_GetFolderCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __INameSpaceTreeControlFolderCapabilities_INTERFACE_DEFINED__ */
 
@@ -33516,45 +27983,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPreviewHandler* This,
+        IPreviewHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPreviewHandler* This);
+        IPreviewHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPreviewHandler* This);
+        IPreviewHandler *This);
 
     /*** IPreviewHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *SetWindow)(
-        IPreviewHandler* This,
+        IPreviewHandler *This,
         HWND hwnd,
         const RECT *prc);
 
     HRESULT (STDMETHODCALLTYPE *SetRect)(
-        IPreviewHandler* This,
+        IPreviewHandler *This,
         const RECT *prc);
 
     HRESULT (STDMETHODCALLTYPE *DoPreview)(
-        IPreviewHandler* This);
+        IPreviewHandler *This);
 
     HRESULT (STDMETHODCALLTYPE *Unload)(
-        IPreviewHandler* This);
+        IPreviewHandler *This);
 
     HRESULT (STDMETHODCALLTYPE *SetFocus)(
-        IPreviewHandler* This);
+        IPreviewHandler *This);
 
     HRESULT (STDMETHODCALLTYPE *QueryFocus)(
-        IPreviewHandler* This,
+        IPreviewHandler *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IPreviewHandler* This,
+        IPreviewHandler *This,
         MSG *pmsg);
 
     END_INTERFACE
 } IPreviewHandlerVtbl;
+
 interface IPreviewHandler {
     CONST_VTBL IPreviewHandlerVtbl* lpVtbl;
 };
@@ -33611,60 +28079,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPreviewHandler_SetWindow_Proxy(
-    IPreviewHandler* This,
-    HWND hwnd,
-    const RECT *prc);
-void __RPC_STUB IPreviewHandler_SetWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandler_SetRect_Proxy(
-    IPreviewHandler* This,
-    const RECT *prc);
-void __RPC_STUB IPreviewHandler_SetRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandler_DoPreview_Proxy(
-    IPreviewHandler* This);
-void __RPC_STUB IPreviewHandler_DoPreview_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandler_Unload_Proxy(
-    IPreviewHandler* This);
-void __RPC_STUB IPreviewHandler_Unload_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandler_SetFocus_Proxy(
-    IPreviewHandler* This);
-void __RPC_STUB IPreviewHandler_SetFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandler_QueryFocus_Proxy(
-    IPreviewHandler* This,
-    HWND *phwnd);
-void __RPC_STUB IPreviewHandler_QueryFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandler_TranslateAccelerator_Proxy(
-    IPreviewHandler* This,
-    MSG *pmsg);
-void __RPC_STUB IPreviewHandler_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPreviewHandler_INTERFACE_DEFINED__ */
 
@@ -33701,27 +28115,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPreviewHandlerFrame* This,
+        IPreviewHandlerFrame *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPreviewHandlerFrame* This);
+        IPreviewHandlerFrame *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPreviewHandlerFrame* This);
+        IPreviewHandlerFrame *This);
 
     /*** IPreviewHandlerFrame methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindowContext)(
-        IPreviewHandlerFrame* This,
+        IPreviewHandlerFrame *This,
         PREVIEWHANDLERFRAMEINFO *pinfo);
 
     HRESULT (STDMETHODCALLTYPE *TranslateAccelerator)(
-        IPreviewHandlerFrame* This,
+        IPreviewHandlerFrame *This,
         MSG *pmsg);
 
     END_INTERFACE
 } IPreviewHandlerFrameVtbl;
+
 interface IPreviewHandlerFrame {
     CONST_VTBL IPreviewHandlerFrameVtbl* lpVtbl;
 };
@@ -33758,22 +28173,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPreviewHandlerFrame_GetWindowContext_Proxy(
-    IPreviewHandlerFrame* This,
-    PREVIEWHANDLERFRAMEINFO *pinfo);
-void __RPC_STUB IPreviewHandlerFrame_GetWindowContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPreviewHandlerFrame_TranslateAccelerator_Proxy(
-    IPreviewHandlerFrame* This,
-    MSG *pmsg);
-void __RPC_STUB IPreviewHandlerFrame_TranslateAccelerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPreviewHandlerFrame_INTERFACE_DEFINED__ */
 
@@ -33812,34 +28211,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITrayDeskBand* This,
+        ITrayDeskBand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITrayDeskBand* This);
+        ITrayDeskBand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITrayDeskBand* This);
+        ITrayDeskBand *This);
 
     /*** ITrayDeskBand methods ***/
     HRESULT (STDMETHODCALLTYPE *ShowDeskBand)(
-        ITrayDeskBand* This,
+        ITrayDeskBand *This,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *HideDeskBand)(
-        ITrayDeskBand* This,
+        ITrayDeskBand *This,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *IsDeskBandShown)(
-        ITrayDeskBand* This,
+        ITrayDeskBand *This,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *DeskBandRegistrationChanged)(
-        ITrayDeskBand* This);
+        ITrayDeskBand *This);
 
     END_INTERFACE
 } ITrayDeskBandVtbl;
+
 interface ITrayDeskBand {
     CONST_VTBL ITrayDeskBandVtbl* lpVtbl;
 };
@@ -33884,37 +28284,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITrayDeskBand_ShowDeskBand_Proxy(
-    ITrayDeskBand* This,
-    REFCLSID clsid);
-void __RPC_STUB ITrayDeskBand_ShowDeskBand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITrayDeskBand_HideDeskBand_Proxy(
-    ITrayDeskBand* This,
-    REFCLSID clsid);
-void __RPC_STUB ITrayDeskBand_HideDeskBand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITrayDeskBand_IsDeskBandShown_Proxy(
-    ITrayDeskBand* This,
-    REFCLSID clsid);
-void __RPC_STUB ITrayDeskBand_IsDeskBandShown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITrayDeskBand_DeskBandRegistrationChanged_Proxy(
-    ITrayDeskBand* This);
-void __RPC_STUB ITrayDeskBand_DeskBandRegistrationChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITrayDeskBand_INTERFACE_DEFINED__ */
 
@@ -33954,19 +28323,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBandHost* This,
+        IBandHost *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBandHost* This);
+        IBandHost *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBandHost* This);
+        IBandHost *This);
 
     /*** IBandHost methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateBand)(
-        IBandHost* This,
+        IBandHost *This,
         REFCLSID rclsidBand,
         WINBOOL fAvailable,
         WINBOOL fVisible,
@@ -33974,16 +28343,17 @@
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetBandAvailability)(
-        IBandHost* This,
+        IBandHost *This,
         REFCLSID rclsidBand,
         WINBOOL fAvailable);
 
     HRESULT (STDMETHODCALLTYPE *DestroyBand)(
-        IBandHost* This,
+        IBandHost *This,
         REFCLSID rclsidBand);
 
     END_INTERFACE
 } IBandHostVtbl;
+
 interface IBandHost {
     CONST_VTBL IBandHostVtbl* lpVtbl;
 };
@@ -34024,35 +28394,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBandHost_CreateBand_Proxy(
-    IBandHost* This,
-    REFCLSID rclsidBand,
-    WINBOOL fAvailable,
-    WINBOOL fVisible,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IBandHost_CreateBand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandHost_SetBandAvailability_Proxy(
-    IBandHost* This,
-    REFCLSID rclsidBand,
-    WINBOOL fAvailable);
-void __RPC_STUB IBandHost_SetBandAvailability_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBandHost_DestroyBand_Proxy(
-    IBandHost* This,
-    REFCLSID rclsidBand);
-void __RPC_STUB IBandHost_DestroyBand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IBandHost_INTERFACE_DEFINED__ */
 
@@ -34086,7 +28427,6 @@
     EPS_FORCE = 0x20000
 };
 
-
 typedef DWORD EXPLORERPANESTATE;
 
 DEFINE_GUID(IID_IExplorerPaneVisibility, 0xe07010ec, 0xbc17, 0x44c0, 0x97,0xb0, 0x46,0xc7,0xc9,0x5b,0x9e,0xdc);
@@ -34108,24 +28448,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExplorerPaneVisibility* This,
+        IExplorerPaneVisibility *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExplorerPaneVisibility* This);
+        IExplorerPaneVisibility *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExplorerPaneVisibility* This);
+        IExplorerPaneVisibility *This);
 
     /*** IExplorerPaneVisibility methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPaneState)(
-        IExplorerPaneVisibility* This,
+        IExplorerPaneVisibility *This,
         REFEXPLORERPANE ep,
         EXPLORERPANESTATE *peps);
 
     END_INTERFACE
 } IExplorerPaneVisibilityVtbl;
+
 interface IExplorerPaneVisibility {
     CONST_VTBL IExplorerPaneVisibilityVtbl* lpVtbl;
 };
@@ -34158,15 +28499,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExplorerPaneVisibility_GetPaneState_Proxy(
-    IExplorerPaneVisibility* This,
-    REFEXPLORERPANE ep,
-    EXPLORERPANESTATE *peps);
-void __RPC_STUB IExplorerPaneVisibility_GetPaneState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExplorerPaneVisibility_INTERFACE_DEFINED__ */
 
@@ -34202,19 +28534,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IContextMenuCB* This,
+        IContextMenuCB *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IContextMenuCB* This);
+        IContextMenuCB *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IContextMenuCB* This);
+        IContextMenuCB *This);
 
     /*** IContextMenuCB methods ***/
     HRESULT (STDMETHODCALLTYPE *CallBack)(
-        IContextMenuCB* This,
+        IContextMenuCB *This,
         IShellFolder *psf,
         HWND hwndOwner,
         IDataObject *pdtobj,
@@ -34224,6 +28556,7 @@
 
     END_INTERFACE
 } IContextMenuCBVtbl;
+
 interface IContextMenuCB {
     CONST_VTBL IContextMenuCBVtbl* lpVtbl;
 };
@@ -34256,19 +28589,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IContextMenuCB_CallBack_Proxy(
-    IContextMenuCB* This,
-    IShellFolder *psf,
-    HWND hwndOwner,
-    IDataObject *pdtobj,
-    UINT uMsg,
-    WPARAM wParam,
-    LPARAM lParam);
-void __RPC_STUB IContextMenuCB_CallBack_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IContextMenuCB_INTERFACE_DEFINED__ */
 
@@ -34317,47 +28637,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDefaultExtractIconInit* This,
+        IDefaultExtractIconInit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDefaultExtractIconInit* This);
+        IDefaultExtractIconInit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDefaultExtractIconInit* This);
+        IDefaultExtractIconInit *This);
 
     /*** IDefaultExtractIconInit methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IDefaultExtractIconInit* This,
+        IDefaultExtractIconInit *This,
         UINT uFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetKey)(
-        IDefaultExtractIconInit* This,
+        IDefaultExtractIconInit *This,
         HKEY hkey);
 
     HRESULT (STDMETHODCALLTYPE *SetNormalIcon)(
-        IDefaultExtractIconInit* This,
+        IDefaultExtractIconInit *This,
         LPCWSTR pszFile,
         int iIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetOpenIcon)(
-        IDefaultExtractIconInit* This,
+        IDefaultExtractIconInit *This,
         LPCWSTR pszFile,
         int iIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetShortcutIcon)(
-        IDefaultExtractIconInit* This,
+        IDefaultExtractIconInit *This,
         LPCWSTR pszFile,
         int iIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultIcon)(
-        IDefaultExtractIconInit* This,
+        IDefaultExtractIconInit *This,
         LPCWSTR pszFile,
         int iIcon);
 
     END_INTERFACE
 } IDefaultExtractIconInitVtbl;
+
 interface IDefaultExtractIconInit {
     CONST_VTBL IDefaultExtractIconInitVtbl* lpVtbl;
 };
@@ -34410,58 +28731,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetFlags_Proxy(
-    IDefaultExtractIconInit* This,
-    UINT uFlags);
-void __RPC_STUB IDefaultExtractIconInit_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetKey_Proxy(
-    IDefaultExtractIconInit* This,
-    HKEY hkey);
-void __RPC_STUB IDefaultExtractIconInit_SetKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetNormalIcon_Proxy(
-    IDefaultExtractIconInit* This,
-    LPCWSTR pszFile,
-    int iIcon);
-void __RPC_STUB IDefaultExtractIconInit_SetNormalIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetOpenIcon_Proxy(
-    IDefaultExtractIconInit* This,
-    LPCWSTR pszFile,
-    int iIcon);
-void __RPC_STUB IDefaultExtractIconInit_SetOpenIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetShortcutIcon_Proxy(
-    IDefaultExtractIconInit* This,
-    LPCWSTR pszFile,
-    int iIcon);
-void __RPC_STUB IDefaultExtractIconInit_SetShortcutIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultExtractIconInit_SetDefaultIcon_Proxy(
-    IDefaultExtractIconInit* This,
-    LPCWSTR pszFile,
-    int iIcon);
-void __RPC_STUB IDefaultExtractIconInit_SetDefaultIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDefaultExtractIconInit_INTERFACE_DEFINED__ */
 
@@ -34471,6 +28740,9 @@
 #ifndef __IEnumExplorerCommand_FWD_DEFINED__
 #define __IEnumExplorerCommand_FWD_DEFINED__
 typedef interface IEnumExplorerCommand IEnumExplorerCommand;
+#ifdef __cplusplus
+interface IEnumExplorerCommand;
+#endif /* __cplusplus */
 #endif
 
 
@@ -34489,7 +28761,6 @@
     ECS_RADIOCHECK = 0x10
 };
 
-
 typedef DWORD EXPCMDSTATE;
 
 enum _EXPCMDFLAGS {
@@ -34506,7 +28777,6 @@
     ECF_AUTOMENUICONS = 0x200
 };
 
-
 typedef DWORD EXPCMDFLAGS;
 
 DEFINE_GUID(IID_IExplorerCommand, 0xa08ce4d0, 0xfa25, 0x44ab, 0xb5,0x7c, 0xc7,0xb1,0xc3,0x23,0xe0,0xb9);
@@ -34554,57 +28824,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExplorerCommand* This);
+        IExplorerCommand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExplorerCommand* This);
+        IExplorerCommand *This);
 
     /*** IExplorerCommand methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTitle)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         IShellItemArray *psiItemArray,
         LPWSTR *ppszName);
 
     HRESULT (STDMETHODCALLTYPE *GetIcon)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         IShellItemArray *psiItemArray,
         LPWSTR *ppszIcon);
 
     HRESULT (STDMETHODCALLTYPE *GetToolTip)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         IShellItemArray *psiItemArray,
         LPWSTR *ppszInfotip);
 
     HRESULT (STDMETHODCALLTYPE *GetCanonicalName)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         GUID *pguidCommandName);
 
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         IShellItemArray *psiItemArray,
         WINBOOL fOkToBeSlow,
         EXPCMDSTATE *pCmdState);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         IShellItemArray *psiItemArray,
         IBindCtx *pbc);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         EXPCMDFLAGS *pFlags);
 
     HRESULT (STDMETHODCALLTYPE *EnumSubCommands)(
-        IExplorerCommand* This,
+        IExplorerCommand *This,
         IEnumExplorerCommand **ppEnum);
 
     END_INTERFACE
 } IExplorerCommandVtbl;
+
 interface IExplorerCommand {
     CONST_VTBL IExplorerCommandVtbl* lpVtbl;
 };
@@ -34665,76 +28936,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExplorerCommand_GetTitle_Proxy(
-    IExplorerCommand* This,
-    IShellItemArray *psiItemArray,
-    LPWSTR *ppszName);
-void __RPC_STUB IExplorerCommand_GetTitle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommand_GetIcon_Proxy(
-    IExplorerCommand* This,
-    IShellItemArray *psiItemArray,
-    LPWSTR *ppszIcon);
-void __RPC_STUB IExplorerCommand_GetIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommand_GetToolTip_Proxy(
-    IExplorerCommand* This,
-    IShellItemArray *psiItemArray,
-    LPWSTR *ppszInfotip);
-void __RPC_STUB IExplorerCommand_GetToolTip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommand_GetCanonicalName_Proxy(
-    IExplorerCommand* This,
-    GUID *pguidCommandName);
-void __RPC_STUB IExplorerCommand_GetCanonicalName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommand_GetState_Proxy(
-    IExplorerCommand* This,
-    IShellItemArray *psiItemArray,
-    WINBOOL fOkToBeSlow,
-    EXPCMDSTATE *pCmdState);
-void __RPC_STUB IExplorerCommand_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommand_Invoke_Proxy(
-    IExplorerCommand* This,
-    IShellItemArray *psiItemArray,
-    IBindCtx *pbc);
-void __RPC_STUB IExplorerCommand_Invoke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommand_GetFlags_Proxy(
-    IExplorerCommand* This,
-    EXPCMDFLAGS *pFlags);
-void __RPC_STUB IExplorerCommand_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommand_EnumSubCommands_Proxy(
-    IExplorerCommand* This,
-    IEnumExplorerCommand **ppEnum);
-void __RPC_STUB IExplorerCommand_EnumSubCommands_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExplorerCommand_INTERFACE_DEFINED__ */
 
@@ -34765,25 +28966,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExplorerCommandState* This,
+        IExplorerCommandState *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExplorerCommandState* This);
+        IExplorerCommandState *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExplorerCommandState* This);
+        IExplorerCommandState *This);
 
     /*** IExplorerCommandState methods ***/
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IExplorerCommandState* This,
+        IExplorerCommandState *This,
         IShellItemArray *psiItemArray,
         WINBOOL fOkToBeSlow,
         EXPCMDSTATE *pCmdState);
 
     END_INTERFACE
 } IExplorerCommandStateVtbl;
+
 interface IExplorerCommandState {
     CONST_VTBL IExplorerCommandStateVtbl* lpVtbl;
 };
@@ -34816,16 +29018,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExplorerCommandState_GetState_Proxy(
-    IExplorerCommandState* This,
-    IShellItemArray *psiItemArray,
-    WINBOOL fOkToBeSlow,
-    EXPCMDSTATE *pCmdState);
-void __RPC_STUB IExplorerCommandState_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExplorerCommandState_INTERFACE_DEFINED__ */
 
@@ -34855,24 +29047,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeCommand* This,
+        IInitializeCommand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeCommand* This);
+        IInitializeCommand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeCommand* This);
+        IInitializeCommand *This);
 
     /*** IInitializeCommand methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeCommand* This,
+        IInitializeCommand *This,
         LPCWSTR pszCommandName,
         IPropertyBag *ppb);
 
     END_INTERFACE
 } IInitializeCommandVtbl;
+
 interface IInitializeCommand {
     CONST_VTBL IInitializeCommandVtbl* lpVtbl;
 };
@@ -34905,15 +29098,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInitializeCommand_Initialize_Proxy(
-    IInitializeCommand* This,
-    LPCWSTR pszCommandName,
-    IPropertyBag *ppb);
-void __RPC_STUB IInitializeCommand_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInitializeCommand_INTERFACE_DEFINED__ */
 
@@ -34953,36 +29137,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumExplorerCommand* This,
+        IEnumExplorerCommand *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumExplorerCommand* This);
+        IEnumExplorerCommand *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumExplorerCommand* This);
+        IEnumExplorerCommand *This);
 
     /*** IEnumExplorerCommand methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumExplorerCommand* This,
+        IEnumExplorerCommand *This,
         ULONG celt,
         IExplorerCommand **pUICommand,
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumExplorerCommand* This,
+        IEnumExplorerCommand *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumExplorerCommand* This);
+        IEnumExplorerCommand *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumExplorerCommand* This,
+        IEnumExplorerCommand *This,
         IEnumExplorerCommand **ppenum);
 
     END_INTERFACE
 } IEnumExplorerCommandVtbl;
+
 interface IEnumExplorerCommand {
     CONST_VTBL IEnumExplorerCommandVtbl* lpVtbl;
 };
@@ -35037,29 +29222,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumExplorerCommand_Skip_Proxy(
-    IEnumExplorerCommand* This,
-    ULONG celt);
-void __RPC_STUB IEnumExplorerCommand_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumExplorerCommand_Reset_Proxy(
-    IEnumExplorerCommand* This);
-void __RPC_STUB IEnumExplorerCommand_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumExplorerCommand_Clone_Proxy(
-    IEnumExplorerCommand* This,
-    IEnumExplorerCommand **ppenum);
-void __RPC_STUB IEnumExplorerCommand_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IEnumExplorerCommand_Next_Proxy(
     IEnumExplorerCommand* This,
     ULONG celt,
@@ -35105,31 +29267,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExplorerCommandProvider* This,
+        IExplorerCommandProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExplorerCommandProvider* This);
+        IExplorerCommandProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExplorerCommandProvider* This);
+        IExplorerCommandProvider *This);
 
     /*** IExplorerCommandProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCommands)(
-        IExplorerCommandProvider* This,
+        IExplorerCommandProvider *This,
         IUnknown *punkSite,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetCommand)(
-        IExplorerCommandProvider* This,
+        IExplorerCommandProvider *This,
         REFGUID rguidCommandId,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IExplorerCommandProviderVtbl;
+
 interface IExplorerCommandProvider {
     CONST_VTBL IExplorerCommandProviderVtbl* lpVtbl;
 };
@@ -35166,26 +29329,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExplorerCommandProvider_GetCommands_Proxy(
-    IExplorerCommandProvider* This,
-    IUnknown *punkSite,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IExplorerCommandProvider_GetCommands_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IExplorerCommandProvider_GetCommand_Proxy(
-    IExplorerCommandProvider* This,
-    REFGUID rguidCommandId,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IExplorerCommandProvider_GetCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExplorerCommandProvider_INTERFACE_DEFINED__ */
 
@@ -35220,19 +29363,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeNetworkFolder* This,
+        IInitializeNetworkFolder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeNetworkFolder* This);
+        IInitializeNetworkFolder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeNetworkFolder* This);
+        IInitializeNetworkFolder *This);
 
     /*** IInitializeNetworkFolder methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeNetworkFolder* This,
+        IInitializeNetworkFolder *This,
         PCIDLIST_ABSOLUTE pidl,
         PCIDLIST_ABSOLUTE pidlTarget,
         UINT uDisplayType,
@@ -35241,6 +29384,7 @@
 
     END_INTERFACE
 } IInitializeNetworkFolderVtbl;
+
 interface IInitializeNetworkFolder {
     CONST_VTBL IInitializeNetworkFolderVtbl* lpVtbl;
 };
@@ -35273,18 +29417,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInitializeNetworkFolder_Initialize_Proxy(
-    IInitializeNetworkFolder* This,
-    PCIDLIST_ABSOLUTE pidl,
-    PCIDLIST_ABSOLUTE pidlTarget,
-    UINT uDisplayType,
-    LPCWSTR pszResName,
-    LPCWSTR pszProvider);
-void __RPC_STUB IInitializeNetworkFolder_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInitializeNetworkFolder_INTERFACE_DEFINED__ */
 
@@ -35330,35 +29462,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpenControlPanel* This,
+        IOpenControlPanel *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpenControlPanel* This);
+        IOpenControlPanel *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpenControlPanel* This);
+        IOpenControlPanel *This);
 
     /*** IOpenControlPanel methods ***/
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IOpenControlPanel* This,
+        IOpenControlPanel *This,
         LPCWSTR pszName,
         LPCWSTR pszPage,
         IUnknown *punkSite);
 
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IOpenControlPanel* This,
+        IOpenControlPanel *This,
         LPCWSTR pszName,
         LPWSTR pszPath,
         UINT cchPath);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentView)(
-        IOpenControlPanel* This,
+        IOpenControlPanel *This,
         CPVIEW *pView);
 
     END_INTERFACE
 } IOpenControlPanelVtbl;
+
 interface IOpenControlPanel {
     CONST_VTBL IOpenControlPanelVtbl* lpVtbl;
 };
@@ -35399,34 +29532,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpenControlPanel_Open_Proxy(
-    IOpenControlPanel* This,
-    LPCWSTR pszName,
-    LPCWSTR pszPage,
-    IUnknown *punkSite);
-void __RPC_STUB IOpenControlPanel_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpenControlPanel_GetPath_Proxy(
-    IOpenControlPanel* This,
-    LPCWSTR pszName,
-    LPWSTR pszPath,
-    UINT cchPath);
-void __RPC_STUB IOpenControlPanel_GetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOpenControlPanel_GetCurrentView_Proxy(
-    IOpenControlPanel* This,
-    CPVIEW *pView);
-void __RPC_STUB IOpenControlPanel_GetCurrentView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpenControlPanel_INTERFACE_DEFINED__ */
 
@@ -35455,22 +29560,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IComputerInfoChangeNotify* This,
+        IComputerInfoChangeNotify *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IComputerInfoChangeNotify* This);
+        IComputerInfoChangeNotify *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IComputerInfoChangeNotify* This);
+        IComputerInfoChangeNotify *This);
 
     /*** IComputerInfoChangeNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *ComputerInfoChanged)(
-        IComputerInfoChangeNotify* This);
+        IComputerInfoChangeNotify *This);
 
     END_INTERFACE
 } IComputerInfoChangeNotifyVtbl;
+
 interface IComputerInfoChangeNotify {
     CONST_VTBL IComputerInfoChangeNotifyVtbl* lpVtbl;
 };
@@ -35503,13 +29609,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IComputerInfoChangeNotify_ComputerInfoChanged_Proxy(
-    IComputerInfoChangeNotify* This);
-void __RPC_STUB IComputerInfoChangeNotify_ComputerInfoChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IComputerInfoChangeNotify_INTERFACE_DEFINED__ */
 
@@ -35543,27 +29642,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSystemBindData* This,
+        IFileSystemBindData *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSystemBindData* This);
+        IFileSystemBindData *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSystemBindData* This);
+        IFileSystemBindData *This);
 
     /*** IFileSystemBindData methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFindData)(
-        IFileSystemBindData* This,
+        IFileSystemBindData *This,
         const WIN32_FIND_DATAW *pfd);
 
     HRESULT (STDMETHODCALLTYPE *GetFindData)(
-        IFileSystemBindData* This,
+        IFileSystemBindData *This,
         WIN32_FIND_DATAW *pfd);
 
     END_INTERFACE
 } IFileSystemBindDataVtbl;
+
 interface IFileSystemBindData {
     CONST_VTBL IFileSystemBindDataVtbl* lpVtbl;
 };
@@ -35600,22 +29700,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileSystemBindData_SetFindData_Proxy(
-    IFileSystemBindData* This,
-    const WIN32_FIND_DATAW *pfd);
-void __RPC_STUB IFileSystemBindData_SetFindData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSystemBindData_GetFindData_Proxy(
-    IFileSystemBindData* This,
-    WIN32_FIND_DATAW *pfd);
-void __RPC_STUB IFileSystemBindData_GetFindData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileSystemBindData_INTERFACE_DEFINED__ */
 
@@ -35653,44 +29737,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSystemBindData2* This,
+        IFileSystemBindData2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSystemBindData2* This);
+        IFileSystemBindData2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSystemBindData2* This);
+        IFileSystemBindData2 *This);
 
     /*** IFileSystemBindData methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFindData)(
-        IFileSystemBindData2* This,
+        IFileSystemBindData2 *This,
         const WIN32_FIND_DATAW *pfd);
 
     HRESULT (STDMETHODCALLTYPE *GetFindData)(
-        IFileSystemBindData2* This,
+        IFileSystemBindData2 *This,
         WIN32_FIND_DATAW *pfd);
 
     /*** IFileSystemBindData2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFileID)(
-        IFileSystemBindData2* This,
+        IFileSystemBindData2 *This,
         LARGE_INTEGER liFileID);
 
     HRESULT (STDMETHODCALLTYPE *GetFileID)(
-        IFileSystemBindData2* This,
+        IFileSystemBindData2 *This,
         LARGE_INTEGER *pliFileID);
 
     HRESULT (STDMETHODCALLTYPE *SetJunctionCLSID)(
-        IFileSystemBindData2* This,
+        IFileSystemBindData2 *This,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *GetJunctionCLSID)(
-        IFileSystemBindData2* This,
+        IFileSystemBindData2 *This,
         CLSID *pclsid);
 
     END_INTERFACE
 } IFileSystemBindData2Vtbl;
+
 interface IFileSystemBindData2 {
     CONST_VTBL IFileSystemBindData2Vtbl* lpVtbl;
 };
@@ -35745,38 +29830,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileSystemBindData2_SetFileID_Proxy(
-    IFileSystemBindData2* This,
-    LARGE_INTEGER liFileID);
-void __RPC_STUB IFileSystemBindData2_SetFileID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSystemBindData2_GetFileID_Proxy(
-    IFileSystemBindData2* This,
-    LARGE_INTEGER *pliFileID);
-void __RPC_STUB IFileSystemBindData2_GetFileID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSystemBindData2_SetJunctionCLSID_Proxy(
-    IFileSystemBindData2* This,
-    REFCLSID clsid);
-void __RPC_STUB IFileSystemBindData2_SetJunctionCLSID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSystemBindData2_GetJunctionCLSID_Proxy(
-    IFileSystemBindData2* This,
-    CLSID *pclsid);
-void __RPC_STUB IFileSystemBindData2_GetJunctionCLSID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileSystemBindData2_INTERFACE_DEFINED__ */
 
@@ -35839,57 +29892,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICustomDestinationList* This);
+        ICustomDestinationList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICustomDestinationList* This);
+        ICustomDestinationList *This);
 
     /*** ICustomDestinationList methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAppID)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         LPCWSTR pszAppID);
 
     HRESULT (STDMETHODCALLTYPE *BeginList)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         UINT *pcMinSlots,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *AppendCategory)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         LPCWSTR pszCategory,
         IObjectArray *poa);
 
     HRESULT (STDMETHODCALLTYPE *AppendKnownCategory)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         KNOWNDESTCATEGORY category);
 
     HRESULT (STDMETHODCALLTYPE *AddUserTasks)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         IObjectArray *poa);
 
     HRESULT (STDMETHODCALLTYPE *CommitList)(
-        ICustomDestinationList* This);
+        ICustomDestinationList *This);
 
     HRESULT (STDMETHODCALLTYPE *GetRemovedDestinations)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *DeleteList)(
-        ICustomDestinationList* This,
+        ICustomDestinationList *This,
         LPCWSTR pszAppID);
 
     HRESULT (STDMETHODCALLTYPE *AbortList)(
-        ICustomDestinationList* This);
+        ICustomDestinationList *This);
 
     END_INTERFACE
 } ICustomDestinationListVtbl;
+
 interface ICustomDestinationList {
     CONST_VTBL ICustomDestinationListVtbl* lpVtbl;
 };
@@ -35954,80 +30008,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_SetAppID_Proxy(
-    ICustomDestinationList* This,
-    LPCWSTR pszAppID);
-void __RPC_STUB ICustomDestinationList_SetAppID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_BeginList_Proxy(
-    ICustomDestinationList* This,
-    UINT *pcMinSlots,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ICustomDestinationList_BeginList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_AppendCategory_Proxy(
-    ICustomDestinationList* This,
-    LPCWSTR pszCategory,
-    IObjectArray *poa);
-void __RPC_STUB ICustomDestinationList_AppendCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_AppendKnownCategory_Proxy(
-    ICustomDestinationList* This,
-    KNOWNDESTCATEGORY category);
-void __RPC_STUB ICustomDestinationList_AppendKnownCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_AddUserTasks_Proxy(
-    ICustomDestinationList* This,
-    IObjectArray *poa);
-void __RPC_STUB ICustomDestinationList_AddUserTasks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_CommitList_Proxy(
-    ICustomDestinationList* This);
-void __RPC_STUB ICustomDestinationList_CommitList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_GetRemovedDestinations_Proxy(
-    ICustomDestinationList* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ICustomDestinationList_GetRemovedDestinations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_DeleteList_Proxy(
-    ICustomDestinationList* This,
-    LPCWSTR pszAppID);
-void __RPC_STUB ICustomDestinationList_DeleteList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICustomDestinationList_AbortList_Proxy(
-    ICustomDestinationList* This);
-void __RPC_STUB ICustomDestinationList_AbortList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICustomDestinationList_INTERFACE_DEFINED__ */
 
@@ -36062,30 +30042,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationDestinations* This,
+        IApplicationDestinations *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationDestinations* This);
+        IApplicationDestinations *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationDestinations* This);
+        IApplicationDestinations *This);
 
     /*** IApplicationDestinations methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAppID)(
-        IApplicationDestinations* This,
+        IApplicationDestinations *This,
         LPCWSTR pszAppID);
 
     HRESULT (STDMETHODCALLTYPE *RemoveDestination)(
-        IApplicationDestinations* This,
+        IApplicationDestinations *This,
         IUnknown *punk);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAllDestinations)(
-        IApplicationDestinations* This);
+        IApplicationDestinations *This);
 
     END_INTERFACE
 } IApplicationDestinationsVtbl;
+
 interface IApplicationDestinations {
     CONST_VTBL IApplicationDestinationsVtbl* lpVtbl;
 };
@@ -36126,29 +30107,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationDestinations_SetAppID_Proxy(
-    IApplicationDestinations* This,
-    LPCWSTR pszAppID);
-void __RPC_STUB IApplicationDestinations_SetAppID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDestinations_RemoveDestination_Proxy(
-    IApplicationDestinations* This,
-    IUnknown *punk);
-void __RPC_STUB IApplicationDestinations_RemoveDestination_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDestinations_RemoveAllDestinations_Proxy(
-    IApplicationDestinations* This);
-void __RPC_STUB IApplicationDestinations_RemoveAllDestinations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationDestinations_INTERFACE_DEFINED__ */
 
@@ -36188,23 +30146,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationDocumentLists* This,
+        IApplicationDocumentLists *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationDocumentLists* This);
+        IApplicationDocumentLists *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationDocumentLists* This);
+        IApplicationDocumentLists *This);
 
     /*** IApplicationDocumentLists methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAppID)(
-        IApplicationDocumentLists* This,
+        IApplicationDocumentLists *This,
         LPCWSTR pszAppID);
 
     HRESULT (STDMETHODCALLTYPE *GetList)(
-        IApplicationDocumentLists* This,
+        IApplicationDocumentLists *This,
         APPDOCLISTTYPE listtype,
         UINT cItemsDesired,
         REFIID riid,
@@ -36212,6 +30170,7 @@
 
     END_INTERFACE
 } IApplicationDocumentListsVtbl;
+
 interface IApplicationDocumentLists {
     CONST_VTBL IApplicationDocumentListsVtbl* lpVtbl;
 };
@@ -36248,25 +30207,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationDocumentLists_SetAppID_Proxy(
-    IApplicationDocumentLists* This,
-    LPCWSTR pszAppID);
-void __RPC_STUB IApplicationDocumentLists_SetAppID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDocumentLists_GetList_Proxy(
-    IApplicationDocumentLists* This,
-    APPDOCLISTTYPE listtype,
-    UINT cItemsDesired,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IApplicationDocumentLists_GetList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationDocumentLists_INTERFACE_DEFINED__ */
 
@@ -36298,27 +30238,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithAppUserModelID* This,
+        IObjectWithAppUserModelID *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithAppUserModelID* This);
+        IObjectWithAppUserModelID *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithAppUserModelID* This);
+        IObjectWithAppUserModelID *This);
 
     /*** IObjectWithAppUserModelID methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAppID)(
-        IObjectWithAppUserModelID* This,
+        IObjectWithAppUserModelID *This,
         LPCWSTR pszAppID);
 
     HRESULT (STDMETHODCALLTYPE *GetAppID)(
-        IObjectWithAppUserModelID* This,
+        IObjectWithAppUserModelID *This,
         LPWSTR *ppszAppID);
 
     END_INTERFACE
 } IObjectWithAppUserModelIDVtbl;
+
 interface IObjectWithAppUserModelID {
     CONST_VTBL IObjectWithAppUserModelIDVtbl* lpVtbl;
 };
@@ -36355,22 +30296,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithAppUserModelID_SetAppID_Proxy(
-    IObjectWithAppUserModelID* This,
-    LPCWSTR pszAppID);
-void __RPC_STUB IObjectWithAppUserModelID_SetAppID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IObjectWithAppUserModelID_GetAppID_Proxy(
-    IObjectWithAppUserModelID* This,
-    LPWSTR *ppszAppID);
-void __RPC_STUB IObjectWithAppUserModelID_GetAppID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithAppUserModelID_INTERFACE_DEFINED__ */
 
@@ -36402,27 +30327,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IObjectWithProgID* This,
+        IObjectWithProgID *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IObjectWithProgID* This);
+        IObjectWithProgID *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IObjectWithProgID* This);
+        IObjectWithProgID *This);
 
     /*** IObjectWithProgID methods ***/
     HRESULT (STDMETHODCALLTYPE *SetProgID)(
-        IObjectWithProgID* This,
+        IObjectWithProgID *This,
         LPCWSTR pszProgID);
 
     HRESULT (STDMETHODCALLTYPE *GetProgID)(
-        IObjectWithProgID* This,
+        IObjectWithProgID *This,
         LPWSTR *ppszProgID);
 
     END_INTERFACE
 } IObjectWithProgIDVtbl;
+
 interface IObjectWithProgID {
     CONST_VTBL IObjectWithProgIDVtbl* lpVtbl;
 };
@@ -36459,22 +30385,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IObjectWithProgID_SetProgID_Proxy(
-    IObjectWithProgID* This,
-    LPCWSTR pszProgID);
-void __RPC_STUB IObjectWithProgID_SetProgID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IObjectWithProgID_GetProgID_Proxy(
-    IObjectWithProgID* This,
-    LPWSTR *ppszProgID);
-void __RPC_STUB IObjectWithProgID_GetProgID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IObjectWithProgID_INTERFACE_DEFINED__ */
 
@@ -36505,25 +30415,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUpdateIDList* This,
+        IUpdateIDList *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUpdateIDList* This);
+        IUpdateIDList *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUpdateIDList* This);
+        IUpdateIDList *This);
 
     /*** IUpdateIDList methods ***/
     HRESULT (STDMETHODCALLTYPE *Update)(
-        IUpdateIDList* This,
+        IUpdateIDList *This,
         IBindCtx *pbc,
         PCUITEMID_CHILD pidlIn,
         PITEMID_CHILD *ppidlOut);
 
     END_INTERFACE
 } IUpdateIDListVtbl;
+
 interface IUpdateIDList {
     CONST_VTBL IUpdateIDListVtbl* lpVtbl;
 };
@@ -36556,16 +30467,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUpdateIDList_Update_Proxy(
-    IUpdateIDList* This,
-    IBindCtx *pbc,
-    PCUITEMID_CHILD pidlIn,
-    PITEMID_CHILD *ppidlOut);
-void __RPC_STUB IUpdateIDList_Update_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUpdateIDList_INTERFACE_DEFINED__ */
 
@@ -36598,23 +30499,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDesktopGadget* This,
+        IDesktopGadget *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDesktopGadget* This);
+        IDesktopGadget *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDesktopGadget* This);
+        IDesktopGadget *This);
 
     /*** IDesktopGadget methods ***/
     HRESULT (STDMETHODCALLTYPE *RunGadget)(
-        IDesktopGadget* This,
+        IDesktopGadget *This,
         LPCWSTR gadgetPath);
 
     END_INTERFACE
 } IDesktopGadgetVtbl;
+
 interface IDesktopGadget {
     CONST_VTBL IDesktopGadgetVtbl* lpVtbl;
 };
@@ -36647,14 +30549,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDesktopGadget_RunGadget_Proxy(
-    IDesktopGadget* This,
-    LPCWSTR gadgetPath);
-void __RPC_STUB IDesktopGadget_RunGadget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDesktopGadget_INTERFACE_DEFINED__ */
 
@@ -36764,90 +30658,91 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDesktopWallpaper* This);
+        IDesktopWallpaper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDesktopWallpaper* This);
+        IDesktopWallpaper *This);
 
     /*** IDesktopWallpaper methods ***/
     HRESULT (STDMETHODCALLTYPE *SetWallpaper)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         LPCWSTR monitorID,
         LPCWSTR wallpaper);
 
     HRESULT (STDMETHODCALLTYPE *GetWallpaper)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         LPCWSTR monitorID,
         LPWSTR *wallpaper);
 
     HRESULT (STDMETHODCALLTYPE *GetMonitorDevicePathAt)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         UINT monitorIndex,
         LPWSTR *monitorID);
 
     HRESULT (STDMETHODCALLTYPE *GetMonitorDevicePathCount)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         UINT *count);
 
     HRESULT (STDMETHODCALLTYPE *GetMonitorRECT)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         LPCWSTR monitorID,
         RECT *displayRect);
 
     HRESULT (STDMETHODCALLTYPE *SetBackgroundColor)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         COLORREF color);
 
     HRESULT (STDMETHODCALLTYPE *GetBackgroundColor)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         COLORREF *color);
 
     HRESULT (STDMETHODCALLTYPE *SetPosition)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         DESKTOP_WALLPAPER_POSITION position);
 
     HRESULT (STDMETHODCALLTYPE *GetPosition)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         DESKTOP_WALLPAPER_POSITION *position);
 
     HRESULT (STDMETHODCALLTYPE *SetSlideshow)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         IShellItemArray *items);
 
     HRESULT (STDMETHODCALLTYPE *GetSlideshow)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         IShellItemArray **items);
 
     HRESULT (STDMETHODCALLTYPE *SetSlideshowOptions)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         DESKTOP_SLIDESHOW_OPTIONS options,
         UINT slideshowTick);
 
     HRESULT (STDMETHODCALLTYPE *GetSlideshowOptions)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         DESKTOP_SLIDESHOW_OPTIONS *options,
         UINT *slideshowTick);
 
     HRESULT (STDMETHODCALLTYPE *AdvanceSlideshow)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         LPCWSTR monitorID,
         DESKTOP_SLIDESHOW_DIRECTION direction);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         DESKTOP_SLIDESHOW_STATE *state);
 
     HRESULT (STDMETHODCALLTYPE *Enable)(
-        IDesktopWallpaper* This,
+        IDesktopWallpaper *This,
         WINBOOL enable);
 
     END_INTERFACE
 } IDesktopWallpaperVtbl;
+
 interface IDesktopWallpaper {
     CONST_VTBL IDesktopWallpaperVtbl* lpVtbl;
 };
@@ -36940,141 +30835,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetWallpaper_Proxy(
-    IDesktopWallpaper* This,
-    LPCWSTR monitorID,
-    LPCWSTR wallpaper);
-void __RPC_STUB IDesktopWallpaper_SetWallpaper_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetWallpaper_Proxy(
-    IDesktopWallpaper* This,
-    LPCWSTR monitorID,
-    LPWSTR *wallpaper);
-void __RPC_STUB IDesktopWallpaper_GetWallpaper_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetMonitorDevicePathAt_Proxy(
-    IDesktopWallpaper* This,
-    UINT monitorIndex,
-    LPWSTR *monitorID);
-void __RPC_STUB IDesktopWallpaper_GetMonitorDevicePathAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetMonitorDevicePathCount_Proxy(
-    IDesktopWallpaper* This,
-    UINT *count);
-void __RPC_STUB IDesktopWallpaper_GetMonitorDevicePathCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetMonitorRECT_Proxy(
-    IDesktopWallpaper* This,
-    LPCWSTR monitorID,
-    RECT *displayRect);
-void __RPC_STUB IDesktopWallpaper_GetMonitorRECT_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetBackgroundColor_Proxy(
-    IDesktopWallpaper* This,
-    COLORREF color);
-void __RPC_STUB IDesktopWallpaper_SetBackgroundColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetBackgroundColor_Proxy(
-    IDesktopWallpaper* This,
-    COLORREF *color);
-void __RPC_STUB IDesktopWallpaper_GetBackgroundColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetPosition_Proxy(
-    IDesktopWallpaper* This,
-    DESKTOP_WALLPAPER_POSITION position);
-void __RPC_STUB IDesktopWallpaper_SetPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetPosition_Proxy(
-    IDesktopWallpaper* This,
-    DESKTOP_WALLPAPER_POSITION *position);
-void __RPC_STUB IDesktopWallpaper_GetPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetSlideshow_Proxy(
-    IDesktopWallpaper* This,
-    IShellItemArray *items);
-void __RPC_STUB IDesktopWallpaper_SetSlideshow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetSlideshow_Proxy(
-    IDesktopWallpaper* This,
-    IShellItemArray **items);
-void __RPC_STUB IDesktopWallpaper_GetSlideshow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_SetSlideshowOptions_Proxy(
-    IDesktopWallpaper* This,
-    DESKTOP_SLIDESHOW_OPTIONS options,
-    UINT slideshowTick);
-void __RPC_STUB IDesktopWallpaper_SetSlideshowOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetSlideshowOptions_Proxy(
-    IDesktopWallpaper* This,
-    DESKTOP_SLIDESHOW_OPTIONS *options,
-    UINT *slideshowTick);
-void __RPC_STUB IDesktopWallpaper_GetSlideshowOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_AdvanceSlideshow_Proxy(
-    IDesktopWallpaper* This,
-    LPCWSTR monitorID,
-    DESKTOP_SLIDESHOW_DIRECTION direction);
-void __RPC_STUB IDesktopWallpaper_AdvanceSlideshow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_GetStatus_Proxy(
-    IDesktopWallpaper* This,
-    DESKTOP_SLIDESHOW_STATE *state);
-void __RPC_STUB IDesktopWallpaper_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDesktopWallpaper_Enable_Proxy(
-    IDesktopWallpaper* This,
-    WINBOOL enable);
-void __RPC_STUB IDesktopWallpaper_Enable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDesktopWallpaper_INTERFACE_DEFINED__ */
 
@@ -37122,28 +30882,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHomeGroup* This,
+        IHomeGroup *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHomeGroup* This);
+        IHomeGroup *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHomeGroup* This);
+        IHomeGroup *This);
 
     /*** IHomeGroup methods ***/
     HRESULT (STDMETHODCALLTYPE *IsMember)(
-        IHomeGroup* This,
+        IHomeGroup *This,
         WINBOOL *member);
 
     HRESULT (STDMETHODCALLTYPE *ShowSharingWizard)(
-        IHomeGroup* This,
+        IHomeGroup *This,
         HWND owner,
         HOMEGROUPSHARINGCHOICES *sharingchoices);
 
     END_INTERFACE
 } IHomeGroupVtbl;
+
 interface IHomeGroup {
     CONST_VTBL IHomeGroupVtbl* lpVtbl;
 };
@@ -37180,23 +30941,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHomeGroup_IsMember_Proxy(
-    IHomeGroup* This,
-    WINBOOL *member);
-void __RPC_STUB IHomeGroup_IsMember_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHomeGroup_ShowSharingWizard_Proxy(
-    IHomeGroup* This,
-    HWND owner,
-    HOMEGROUPSHARINGCHOICES *sharingchoices);
-void __RPC_STUB IHomeGroup_ShowSharingWizard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHomeGroup_INTERFACE_DEFINED__ */
 
@@ -37225,23 +30969,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeWithPropertyStore* This,
+        IInitializeWithPropertyStore *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeWithPropertyStore* This);
+        IInitializeWithPropertyStore *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeWithPropertyStore* This);
+        IInitializeWithPropertyStore *This);
 
     /*** IInitializeWithPropertyStore methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeWithPropertyStore* This,
+        IInitializeWithPropertyStore *This,
         IPropertyStore *pps);
 
     END_INTERFACE
 } IInitializeWithPropertyStoreVtbl;
+
 interface IInitializeWithPropertyStore {
     CONST_VTBL IInitializeWithPropertyStoreVtbl* lpVtbl;
 };
@@ -37274,14 +31019,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInitializeWithPropertyStore_Initialize_Proxy(
-    IInitializeWithPropertyStore* This,
-    IPropertyStore *pps);
-void __RPC_STUB IInitializeWithPropertyStore_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInitializeWithPropertyStore_INTERFACE_DEFINED__ */
 
@@ -37315,19 +31052,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOpenSearchSource* This,
+        IOpenSearchSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOpenSearchSource* This);
+        IOpenSearchSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOpenSearchSource* This);
+        IOpenSearchSource *This);
 
     /*** IOpenSearchSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResults)(
-        IOpenSearchSource* This,
+        IOpenSearchSource *This,
         HWND hwnd,
         LPCWSTR pszQuery,
         DWORD dwStartIndex,
@@ -37337,6 +31074,7 @@
 
     END_INTERFACE
 } IOpenSearchSourceVtbl;
+
 interface IOpenSearchSource {
     CONST_VTBL IOpenSearchSourceVtbl* lpVtbl;
 };
@@ -37369,19 +31107,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOpenSearchSource_GetResults_Proxy(
-    IOpenSearchSource* This,
-    HWND hwnd,
-    LPCWSTR pszQuery,
-    DWORD dwStartIndex,
-    DWORD dwCount,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IOpenSearchSource_GetResults_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOpenSearchSource_INTERFACE_DEFINED__ */
 
@@ -37503,96 +31228,96 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IShellLibrary* This);
+        IShellLibrary *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IShellLibrary* This);
+        IShellLibrary *This);
 
     /*** IShellLibrary methods ***/
     HRESULT (STDMETHODCALLTYPE *LoadLibraryFromItem)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         IShellItem *psiLibrary,
         DWORD grfMode);
 
     HRESULT (STDMETHODCALLTYPE *LoadLibraryFromKnownFolder)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         REFKNOWNFOLDERID kfidLibrary,
         DWORD grfMode);
 
     HRESULT (STDMETHODCALLTYPE *AddFolder)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         IShellItem *psiLocation);
 
     HRESULT (STDMETHODCALLTYPE *RemoveFolder)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         IShellItem *psiLocation);
 
     HRESULT (STDMETHODCALLTYPE *GetFolders)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         LIBRARYFOLDERFILTER lff,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *ResolveFolder)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         IShellItem *psiFolderToResolve,
         DWORD dwTimeout,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultSaveFolder)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         DEFAULTSAVEFOLDERTYPE dsft,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultSaveFolder)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         DEFAULTSAVEFOLDERTYPE dsft,
         IShellItem *psi);
 
     HRESULT (STDMETHODCALLTYPE *GetOptions)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         LIBRARYOPTIONFLAGS *plofOptions);
 
     HRESULT (STDMETHODCALLTYPE *SetOptions)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         LIBRARYOPTIONFLAGS lofMask,
         LIBRARYOPTIONFLAGS lofOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetFolderType)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         FOLDERTYPEID *pftid);
 
     HRESULT (STDMETHODCALLTYPE *SetFolderType)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         REFFOLDERTYPEID ftid);
 
     HRESULT (STDMETHODCALLTYPE *GetIcon)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         LPWSTR *ppszIcon);
 
     HRESULT (STDMETHODCALLTYPE *SetIcon)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         LPCWSTR pszIcon);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IShellLibrary* This);
+        IShellLibrary *This);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         IShellItem *psiFolderToSaveIn,
         LPCWSTR pszLibraryName,
         LIBRARYSAVEFLAGS lsf,
         IShellItem **ppsiSavedTo);
 
     HRESULT (STDMETHODCALLTYPE *SaveInKnownFolder)(
-        IShellLibrary* This,
+        IShellLibrary *This,
         REFKNOWNFOLDERID kfidToSaveIn,
         LPCWSTR pszLibraryName,
         LIBRARYSAVEFLAGS lsf,
@@ -37600,6 +31325,7 @@
 
     END_INTERFACE
 } IShellLibraryVtbl;
+
 interface IShellLibrary {
     CONST_VTBL IShellLibraryVtbl* lpVtbl;
 };
@@ -37696,158 +31422,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IShellLibrary_LoadLibraryFromItem_Proxy(
-    IShellLibrary* This,
-    IShellItem *psiLibrary,
-    DWORD grfMode);
-void __RPC_STUB IShellLibrary_LoadLibraryFromItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_LoadLibraryFromKnownFolder_Proxy(
-    IShellLibrary* This,
-    REFKNOWNFOLDERID kfidLibrary,
-    DWORD grfMode);
-void __RPC_STUB IShellLibrary_LoadLibraryFromKnownFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_AddFolder_Proxy(
-    IShellLibrary* This,
-    IShellItem *psiLocation);
-void __RPC_STUB IShellLibrary_AddFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_RemoveFolder_Proxy(
-    IShellLibrary* This,
-    IShellItem *psiLocation);
-void __RPC_STUB IShellLibrary_RemoveFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_GetFolders_Proxy(
-    IShellLibrary* This,
-    LIBRARYFOLDERFILTER lff,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellLibrary_GetFolders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_ResolveFolder_Proxy(
-    IShellLibrary* This,
-    IShellItem *psiFolderToResolve,
-    DWORD dwTimeout,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellLibrary_ResolveFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_GetDefaultSaveFolder_Proxy(
-    IShellLibrary* This,
-    DEFAULTSAVEFOLDERTYPE dsft,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IShellLibrary_GetDefaultSaveFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_SetDefaultSaveFolder_Proxy(
-    IShellLibrary* This,
-    DEFAULTSAVEFOLDERTYPE dsft,
-    IShellItem *psi);
-void __RPC_STUB IShellLibrary_SetDefaultSaveFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_GetOptions_Proxy(
-    IShellLibrary* This,
-    LIBRARYOPTIONFLAGS *plofOptions);
-void __RPC_STUB IShellLibrary_GetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_SetOptions_Proxy(
-    IShellLibrary* This,
-    LIBRARYOPTIONFLAGS lofMask,
-    LIBRARYOPTIONFLAGS lofOptions);
-void __RPC_STUB IShellLibrary_SetOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_GetFolderType_Proxy(
-    IShellLibrary* This,
-    FOLDERTYPEID *pftid);
-void __RPC_STUB IShellLibrary_GetFolderType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_SetFolderType_Proxy(
-    IShellLibrary* This,
-    REFFOLDERTYPEID ftid);
-void __RPC_STUB IShellLibrary_SetFolderType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_GetIcon_Proxy(
-    IShellLibrary* This,
-    LPWSTR *ppszIcon);
-void __RPC_STUB IShellLibrary_GetIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_SetIcon_Proxy(
-    IShellLibrary* This,
-    LPCWSTR pszIcon);
-void __RPC_STUB IShellLibrary_SetIcon_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_Commit_Proxy(
-    IShellLibrary* This);
-void __RPC_STUB IShellLibrary_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_Save_Proxy(
-    IShellLibrary* This,
-    IShellItem *psiFolderToSaveIn,
-    LPCWSTR pszLibraryName,
-    LIBRARYSAVEFLAGS lsf,
-    IShellItem **ppsiSavedTo);
-void __RPC_STUB IShellLibrary_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IShellLibrary_SaveInKnownFolder_Proxy(
-    IShellLibrary* This,
-    REFKNOWNFOLDERID kfidToSaveIn,
-    LPCWSTR pszLibraryName,
-    LIBRARYSAVEFLAGS lsf,
-    IShellItem **ppsiSavedTo);
-void __RPC_STUB IShellLibrary_SaveInKnownFolder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IShellLibrary_INTERFACE_DEFINED__ */
 
@@ -37882,24 +31456,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPlaybackManagerEvents* This,
+        IPlaybackManagerEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPlaybackManagerEvents* This);
+        IPlaybackManagerEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPlaybackManagerEvents* This);
+        IPlaybackManagerEvents *This);
 
     /*** IPlaybackManagerEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *OnPlaybackManagerEvent)(
-        IPlaybackManagerEvents* This,
+        IPlaybackManagerEvents *This,
         DWORD dwSessionId,
         PBM_EVENT mediaEvent);
 
     END_INTERFACE
 } IPlaybackManagerEventsVtbl;
+
 interface IPlaybackManagerEvents {
     CONST_VTBL IPlaybackManagerEventsVtbl* lpVtbl;
 };
@@ -37932,15 +31507,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPlaybackManagerEvents_OnPlaybackManagerEvent_Proxy(
-    IPlaybackManagerEvents* This,
-    DWORD dwSessionId,
-    PBM_EVENT mediaEvent);
-void __RPC_STUB IPlaybackManagerEvents_OnPlaybackManagerEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPlaybackManagerEvents_INTERFACE_DEFINED__ */
 
@@ -37995,35 +31561,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPlaybackManager* This,
+        IPlaybackManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPlaybackManager* This);
+        IPlaybackManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPlaybackManager* This);
+        IPlaybackManager *This);
 
     /*** IPlaybackManager methods ***/
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IPlaybackManager* This,
+        IPlaybackManager *This,
         PBM_SESSION_TYPE type,
         IPlaybackManagerEvents *pEvents,
         DWORD *pdwSessionId);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IPlaybackManager* This,
+        IPlaybackManager *This,
         DWORD dwSessionId);
 
     HRESULT (STDMETHODCALLTYPE *ChangeSessionState)(
-        IPlaybackManager* This,
+        IPlaybackManager *This,
         DWORD dwSessionId,
         PBM_PLAY_STATE state,
         PBM_MUTE_STATE mute);
 
     END_INTERFACE
 } IPlaybackManagerVtbl;
+
 interface IPlaybackManager {
     CONST_VTBL IPlaybackManagerVtbl* lpVtbl;
 };
@@ -38064,34 +31631,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPlaybackManager_Advise_Proxy(
-    IPlaybackManager* This,
-    PBM_SESSION_TYPE type,
-    IPlaybackManagerEvents *pEvents,
-    DWORD *pdwSessionId);
-void __RPC_STUB IPlaybackManager_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPlaybackManager_Unadvise_Proxy(
-    IPlaybackManager* This,
-    DWORD dwSessionId);
-void __RPC_STUB IPlaybackManager_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPlaybackManager_ChangeSessionState_Proxy(
-    IPlaybackManager* This,
-    DWORD dwSessionId,
-    PBM_PLAY_STATE state,
-    PBM_MUTE_STATE mute);
-void __RPC_STUB IPlaybackManager_ChangeSessionState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPlaybackManager_INTERFACE_DEFINED__ */
 
@@ -38152,19 +31691,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDefaultFolderMenuInitialize* This,
+        IDefaultFolderMenuInitialize *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDefaultFolderMenuInitialize* This);
+        IDefaultFolderMenuInitialize *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDefaultFolderMenuInitialize* This);
+        IDefaultFolderMenuInitialize *This);
 
     /*** IDefaultFolderMenuInitialize methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IDefaultFolderMenuInitialize* This,
+        IDefaultFolderMenuInitialize *This,
         HWND hwnd,
         IContextMenuCB *pcmcb,
         PCIDLIST_ABSOLUTE pidlFolder,
@@ -38176,20 +31715,21 @@
         const HKEY *aKeys);
 
     HRESULT (STDMETHODCALLTYPE *SetMenuRestrictions)(
-        IDefaultFolderMenuInitialize* This,
+        IDefaultFolderMenuInitialize *This,
         DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrValues);
 
     HRESULT (STDMETHODCALLTYPE *GetMenuRestrictions)(
-        IDefaultFolderMenuInitialize* This,
+        IDefaultFolderMenuInitialize *This,
         DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrMask,
         DEFAULT_FOLDER_MENU_RESTRICTIONS *pdfmrValues);
 
     HRESULT (STDMETHODCALLTYPE *SetHandlerClsid)(
-        IDefaultFolderMenuInitialize* This,
+        IDefaultFolderMenuInitialize *This,
         REFCLSID rclsid);
 
     END_INTERFACE
 } IDefaultFolderMenuInitializeVtbl;
+
 interface IDefaultFolderMenuInitialize {
     CONST_VTBL IDefaultFolderMenuInitializeVtbl* lpVtbl;
 };
@@ -38234,47 +31774,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_Initialize_Proxy(
-    IDefaultFolderMenuInitialize* This,
-    HWND hwnd,
-    IContextMenuCB *pcmcb,
-    PCIDLIST_ABSOLUTE pidlFolder,
-    IShellFolder *psf,
-    UINT cidl,
-    PCUITEMID_CHILD_ARRAY apidl,
-    IUnknown *punkAssociation,
-    UINT cKeys,
-    const HKEY *aKeys);
-void __RPC_STUB IDefaultFolderMenuInitialize_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_SetMenuRestrictions_Proxy(
-    IDefaultFolderMenuInitialize* This,
-    DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrValues);
-void __RPC_STUB IDefaultFolderMenuInitialize_SetMenuRestrictions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_GetMenuRestrictions_Proxy(
-    IDefaultFolderMenuInitialize* This,
-    DEFAULT_FOLDER_MENU_RESTRICTIONS dfmrMask,
-    DEFAULT_FOLDER_MENU_RESTRICTIONS *pdfmrValues);
-void __RPC_STUB IDefaultFolderMenuInitialize_GetMenuRestrictions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDefaultFolderMenuInitialize_SetHandlerClsid_Proxy(
-    IDefaultFolderMenuInitialize* This,
-    REFCLSID rclsid);
-void __RPC_STUB IDefaultFolderMenuInitialize_SetHandlerClsid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDefaultFolderMenuInitialize_INTERFACE_DEFINED__ */
 
@@ -38327,39 +31826,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationActivationManager* This,
+        IApplicationActivationManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationActivationManager* This);
+        IApplicationActivationManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationActivationManager* This);
+        IApplicationActivationManager *This);
 
     /*** IApplicationActivationManager methods ***/
     HRESULT (STDMETHODCALLTYPE *ActivateApplication)(
-        IApplicationActivationManager* This,
+        IApplicationActivationManager *This,
         LPCWSTR appUserModelId,
         LPCWSTR arguments,
         ACTIVATEOPTIONS options,
         DWORD *processId);
 
     HRESULT (STDMETHODCALLTYPE *ActivateForFile)(
-        IApplicationActivationManager* This,
+        IApplicationActivationManager *This,
         LPCWSTR appUserModelId,
         IShellItemArray *itemArray,
         LPCWSTR verb,
         DWORD *processId);
 
     HRESULT (STDMETHODCALLTYPE *ActivateForProtocol)(
-        IApplicationActivationManager* This,
+        IApplicationActivationManager *This,
         LPCWSTR appUserModelId,
         IShellItemArray *itemArray,
         DWORD *processId);
 
     END_INTERFACE
 } IApplicationActivationManagerVtbl;
+
 interface IApplicationActivationManager {
     CONST_VTBL IApplicationActivationManagerVtbl* lpVtbl;
 };
@@ -38400,38 +31900,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationActivationManager_ActivateApplication_Proxy(
-    IApplicationActivationManager* This,
-    LPCWSTR appUserModelId,
-    LPCWSTR arguments,
-    ACTIVATEOPTIONS options,
-    DWORD *processId);
-void __RPC_STUB IApplicationActivationManager_ActivateApplication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationActivationManager_ActivateForFile_Proxy(
-    IApplicationActivationManager* This,
-    LPCWSTR appUserModelId,
-    IShellItemArray *itemArray,
-    LPCWSTR verb,
-    DWORD *processId);
-void __RPC_STUB IApplicationActivationManager_ActivateForFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationActivationManager_ActivateForProtocol_Proxy(
-    IApplicationActivationManager* This,
-    LPCWSTR appUserModelId,
-    IShellItemArray *itemArray,
-    DWORD *processId);
-void __RPC_STUB IApplicationActivationManager_ActivateForProtocol_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationActivationManager_INTERFACE_DEFINED__ */
 
@@ -39493,25 +32961,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAssocHandlerInvoker* This,
+        IAssocHandlerInvoker *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAssocHandlerInvoker* This);
+        IAssocHandlerInvoker *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAssocHandlerInvoker* This);
+        IAssocHandlerInvoker *This);
 
     /*** IAssocHandlerInvoker methods ***/
     HRESULT (STDMETHODCALLTYPE *SupportsSelection)(
-        IAssocHandlerInvoker* This);
+        IAssocHandlerInvoker *This);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IAssocHandlerInvoker* This);
+        IAssocHandlerInvoker *This);
 
     END_INTERFACE
 } IAssocHandlerInvokerVtbl;
+
 interface IAssocHandlerInvoker {
     CONST_VTBL IAssocHandlerInvokerVtbl* lpVtbl;
 };
@@ -39548,20 +33017,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAssocHandlerInvoker_SupportsSelection_Proxy(
-    IAssocHandlerInvoker* This);
-void __RPC_STUB IAssocHandlerInvoker_SupportsSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAssocHandlerInvoker_Invoke_Proxy(
-    IAssocHandlerInvoker* This);
-void __RPC_STUB IAssocHandlerInvoker_Invoke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAssocHandlerInvoker_INTERFACE_DEFINED__ */
 
@@ -39610,48 +33065,49 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAssocHandler* This,
+        IAssocHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAssocHandler* This);
+        IAssocHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAssocHandler* This);
+        IAssocHandler *This);
 
     /*** IAssocHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IAssocHandler* This,
+        IAssocHandler *This,
         LPWSTR *ppsz);
 
     HRESULT (STDMETHODCALLTYPE *GetUIName)(
-        IAssocHandler* This,
+        IAssocHandler *This,
         LPWSTR *ppsz);
 
     HRESULT (STDMETHODCALLTYPE *GetIconLocation)(
-        IAssocHandler* This,
+        IAssocHandler *This,
         LPWSTR *ppszPath,
         int *pIndex);
 
     HRESULT (STDMETHODCALLTYPE *IsRecommended)(
-        IAssocHandler* This);
+        IAssocHandler *This);
 
     HRESULT (STDMETHODCALLTYPE *MakeDefault)(
-        IAssocHandler* This,
+        IAssocHandler *This,
         LPCWSTR pszDescription);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IAssocHandler* This,
+        IAssocHandler *This,
         IDataObject *pdo);
 
     HRESULT (STDMETHODCALLTYPE *CreateInvoker)(
-        IAssocHandler* This,
+        IAssocHandler *This,
         IDataObject *pdo,
         IAssocHandlerInvoker **ppInvoker);
 
     END_INTERFACE
 } IAssocHandlerVtbl;
+
 interface IAssocHandler {
     CONST_VTBL IAssocHandlerVtbl* lpVtbl;
 };
@@ -39708,63 +33164,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAssocHandler_GetName_Proxy(
-    IAssocHandler* This,
-    LPWSTR *ppsz);
-void __RPC_STUB IAssocHandler_GetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAssocHandler_GetUIName_Proxy(
-    IAssocHandler* This,
-    LPWSTR *ppsz);
-void __RPC_STUB IAssocHandler_GetUIName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAssocHandler_GetIconLocation_Proxy(
-    IAssocHandler* This,
-    LPWSTR *ppszPath,
-    int *pIndex);
-void __RPC_STUB IAssocHandler_GetIconLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAssocHandler_IsRecommended_Proxy(
-    IAssocHandler* This);
-void __RPC_STUB IAssocHandler_IsRecommended_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAssocHandler_MakeDefault_Proxy(
-    IAssocHandler* This,
-    LPCWSTR pszDescription);
-void __RPC_STUB IAssocHandler_MakeDefault_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAssocHandler_Invoke_Proxy(
-    IAssocHandler* This,
-    IDataObject *pdo);
-void __RPC_STUB IAssocHandler_Invoke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAssocHandler_CreateInvoker_Proxy(
-    IAssocHandler* This,
-    IDataObject *pdo,
-    IAssocHandlerInvoker **ppInvoker);
-void __RPC_STUB IAssocHandler_CreateInvoker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAssocHandler_INTERFACE_DEFINED__ */
 
@@ -39795,25 +33194,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumAssocHandlers* This,
+        IEnumAssocHandlers *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumAssocHandlers* This);
+        IEnumAssocHandlers *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumAssocHandlers* This);
+        IEnumAssocHandlers *This);
 
     /*** IEnumAssocHandlers methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumAssocHandlers* This,
+        IEnumAssocHandlers *This,
         ULONG celt,
         IAssocHandler **rgelt,
         ULONG *pceltFetched);
 
     END_INTERFACE
 } IEnumAssocHandlersVtbl;
+
 interface IEnumAssocHandlers {
     CONST_VTBL IEnumAssocHandlersVtbl* lpVtbl;
 };
@@ -39846,16 +33246,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumAssocHandlers_Next_Proxy(
-    IEnumAssocHandlers* This,
-    ULONG celt,
-    IAssocHandler **rgelt,
-    ULONG *pceltFetched);
-void __RPC_STUB IEnumAssocHandlers_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumAssocHandlers_INTERFACE_DEFINED__ */
 
@@ -39902,27 +33292,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDataObjectProvider* This,
+        IDataObjectProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDataObjectProvider* This);
+        IDataObjectProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDataObjectProvider* This);
+        IDataObjectProvider *This);
 
     /*** IDataObjectProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDataObject)(
-        IDataObjectProvider* This,
+        IDataObjectProvider *This,
         IDataObject **dataObject);
 
     HRESULT (STDMETHODCALLTYPE *SetDataObject)(
-        IDataObjectProvider* This,
+        IDataObjectProvider *This,
         IDataObject *dataObject);
 
     END_INTERFACE
 } IDataObjectProviderVtbl;
+
 interface IDataObjectProvider {
     CONST_VTBL IDataObjectProviderVtbl* lpVtbl;
 };
@@ -39959,14 +33350,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDataObjectProvider_GetDataObject_Proxy(
-    IDataObjectProvider* This,
-    IDataObject **dataObject);
-void __RPC_STUB IDataObjectProvider_GetDataObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDataObjectProvider_INTERFACE_DEFINED__ */
 
@@ -40000,29 +33383,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDataTransferManagerInterop* This,
+        IDataTransferManagerInterop *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDataTransferManagerInterop* This);
+        IDataTransferManagerInterop *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDataTransferManagerInterop* This);
+        IDataTransferManagerInterop *This);
 
     /*** IDataTransferManagerInterop methods ***/
     HRESULT (STDMETHODCALLTYPE *GetForWindow)(
-        IDataTransferManagerInterop* This,
+        IDataTransferManagerInterop *This,
         HWND appWindow,
         REFIID riid,
         void **dataTransferManager);
 
     HRESULT (STDMETHODCALLTYPE *ShowShareUIForWindow)(
-        IDataTransferManagerInterop* This,
+        IDataTransferManagerInterop *This,
         HWND appWindow);
 
     END_INTERFACE
 } IDataTransferManagerInteropVtbl;
+
 interface IDataTransferManagerInterop {
     CONST_VTBL IDataTransferManagerInteropVtbl* lpVtbl;
 };
@@ -40059,24 +33443,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDataTransferManagerInterop_GetForWindow_Proxy(
-    IDataTransferManagerInterop* This,
-    HWND appWindow,
-    REFIID riid,
-    void **dataTransferManager);
-void __RPC_STUB IDataTransferManagerInterop_GetForWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataTransferManagerInterop_ShowShareUIForWindow_Proxy(
-    IDataTransferManagerInterop* This,
-    HWND appWindow);
-void __RPC_STUB IDataTransferManagerInterop_ShowShareUIForWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDataTransferManagerInterop_INTERFACE_DEFINED__ */
 
@@ -40109,28 +33475,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFrameworkInputPaneHandler* This,
+        IFrameworkInputPaneHandler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFrameworkInputPaneHandler* This);
+        IFrameworkInputPaneHandler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFrameworkInputPaneHandler* This);
+        IFrameworkInputPaneHandler *This);
 
     /*** IFrameworkInputPaneHandler methods ***/
     HRESULT (STDMETHODCALLTYPE *Showing)(
-        IFrameworkInputPaneHandler* This,
+        IFrameworkInputPaneHandler *This,
         RECT *prcInputPaneScreenLocation,
         WINBOOL fEnsureFocusedElementInView);
 
     HRESULT (STDMETHODCALLTYPE *Hiding)(
-        IFrameworkInputPaneHandler* This,
+        IFrameworkInputPaneHandler *This,
         WINBOOL fEnsureFocusedElementInView);
 
     END_INTERFACE
 } IFrameworkInputPaneHandlerVtbl;
+
 interface IFrameworkInputPaneHandler {
     CONST_VTBL IFrameworkInputPaneHandlerVtbl* lpVtbl;
 };
@@ -40167,23 +33534,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFrameworkInputPaneHandler_Showing_Proxy(
-    IFrameworkInputPaneHandler* This,
-    RECT *prcInputPaneScreenLocation,
-    WINBOOL fEnsureFocusedElementInView);
-void __RPC_STUB IFrameworkInputPaneHandler_Showing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFrameworkInputPaneHandler_Hiding_Proxy(
-    IFrameworkInputPaneHandler* This,
-    WINBOOL fEnsureFocusedElementInView);
-void __RPC_STUB IFrameworkInputPaneHandler_Hiding_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFrameworkInputPaneHandler_INTERFACE_DEFINED__ */
 
@@ -40225,39 +33575,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFrameworkInputPane* This,
+        IFrameworkInputPane *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFrameworkInputPane* This);
+        IFrameworkInputPane *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFrameworkInputPane* This);
+        IFrameworkInputPane *This);
 
     /*** IFrameworkInputPane methods ***/
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IFrameworkInputPane* This,
+        IFrameworkInputPane *This,
         IUnknown *pWindow,
         IFrameworkInputPaneHandler *pHandler,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *AdviseWithHWND)(
-        IFrameworkInputPane* This,
+        IFrameworkInputPane *This,
         HWND hwnd,
         IFrameworkInputPaneHandler *pHandler,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IFrameworkInputPane* This,
+        IFrameworkInputPane *This,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Location)(
-        IFrameworkInputPane* This,
+        IFrameworkInputPane *This,
         RECT *prcInputPaneScreenLocation);
 
     END_INTERFACE
 } IFrameworkInputPaneVtbl;
+
 interface IFrameworkInputPane {
     CONST_VTBL IFrameworkInputPaneVtbl* lpVtbl;
 };
@@ -40302,42 +33653,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFrameworkInputPane_Advise_Proxy(
-    IFrameworkInputPane* This,
-    IUnknown *pWindow,
-    IFrameworkInputPaneHandler *pHandler,
-    DWORD *pdwCookie);
-void __RPC_STUB IFrameworkInputPane_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFrameworkInputPane_AdviseWithHWND_Proxy(
-    IFrameworkInputPane* This,
-    HWND hwnd,
-    IFrameworkInputPaneHandler *pHandler,
-    DWORD *pdwCookie);
-void __RPC_STUB IFrameworkInputPane_AdviseWithHWND_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFrameworkInputPane_Unadvise_Proxy(
-    IFrameworkInputPane* This,
-    DWORD dwCookie);
-void __RPC_STUB IFrameworkInputPane_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFrameworkInputPane_Location_Proxy(
-    IFrameworkInputPane* This,
-    RECT *prcInputPaneScreenLocation);
-void __RPC_STUB IFrameworkInputPane_Location_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFrameworkInputPane_INTERFACE_DEFINED__ */
 
@@ -40387,23 +33702,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISearchableApplication* This,
+        ISearchableApplication *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISearchableApplication* This);
+        ISearchableApplication *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISearchableApplication* This);
+        ISearchableApplication *This);
 
     /*** ISearchableApplication methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSearchWindow)(
-        ISearchableApplication* This,
+        ISearchableApplication *This,
         HWND *hwnd);
 
     END_INTERFACE
 } ISearchableApplicationVtbl;
+
 interface ISearchableApplication {
     CONST_VTBL ISearchableApplicationVtbl* lpVtbl;
 };
@@ -40436,14 +33752,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISearchableApplication_GetSearchWindow_Proxy(
-    ISearchableApplication* This,
-    HWND *hwnd);
-void __RPC_STUB ISearchableApplication_GetSearchWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISearchableApplication_INTERFACE_DEFINED__ */
 
@@ -40477,23 +33785,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAccessibilityDockingServiceCallback* This,
+        IAccessibilityDockingServiceCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAccessibilityDockingServiceCallback* This);
+        IAccessibilityDockingServiceCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAccessibilityDockingServiceCallback* This);
+        IAccessibilityDockingServiceCallback *This);
 
     /*** IAccessibilityDockingServiceCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *Undocked)(
-        IAccessibilityDockingServiceCallback* This,
+        IAccessibilityDockingServiceCallback *This,
         UNDOCK_REASON undockReason);
 
     END_INTERFACE
 } IAccessibilityDockingServiceCallbackVtbl;
+
 interface IAccessibilityDockingServiceCallback {
     CONST_VTBL IAccessibilityDockingServiceCallbackVtbl* lpVtbl;
 };
@@ -40526,14 +33835,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAccessibilityDockingServiceCallback_Undocked_Proxy(
-    IAccessibilityDockingServiceCallback* This,
-    UNDOCK_REASON undockReason);
-void __RPC_STUB IAccessibilityDockingServiceCallback_Undocked_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAccessibilityDockingServiceCallback_INTERFACE_DEFINED__ */
 
@@ -40573,36 +33874,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAccessibilityDockingService* This,
+        IAccessibilityDockingService *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAccessibilityDockingService* This);
+        IAccessibilityDockingService *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAccessibilityDockingService* This);
+        IAccessibilityDockingService *This);
 
     /*** IAccessibilityDockingService methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAvailableSize)(
-        IAccessibilityDockingService* This,
+        IAccessibilityDockingService *This,
         HMONITOR hMonitor,
         UINT *pcxFixed,
         UINT *pcyMax);
 
     HRESULT (STDMETHODCALLTYPE *DockWindow)(
-        IAccessibilityDockingService* This,
+        IAccessibilityDockingService *This,
         HWND hwnd,
         HMONITOR hMonitor,
         UINT cyRequested,
         IAccessibilityDockingServiceCallback *pCallback);
 
     HRESULT (STDMETHODCALLTYPE *UndockWindow)(
-        IAccessibilityDockingService* This,
+        IAccessibilityDockingService *This,
         HWND hwnd);
 
     END_INTERFACE
 } IAccessibilityDockingServiceVtbl;
+
 interface IAccessibilityDockingService {
     CONST_VTBL IAccessibilityDockingServiceVtbl* lpVtbl;
 };
@@ -40643,35 +33945,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAccessibilityDockingService_GetAvailableSize_Proxy(
-    IAccessibilityDockingService* This,
-    HMONITOR hMonitor,
-    UINT *pcxFixed,
-    UINT *pcyMax);
-void __RPC_STUB IAccessibilityDockingService_GetAvailableSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessibilityDockingService_DockWindow_Proxy(
-    IAccessibilityDockingService* This,
-    HWND hwnd,
-    HMONITOR hMonitor,
-    UINT cyRequested,
-    IAccessibilityDockingServiceCallback *pCallback);
-void __RPC_STUB IAccessibilityDockingService_DockWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAccessibilityDockingService_UndockWindow_Proxy(
-    IAccessibilityDockingService* This,
-    HWND hwnd);
-void __RPC_STUB IAccessibilityDockingService_UndockWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAccessibilityDockingService_INTERFACE_DEFINED__ */
 
@@ -40711,29 +33984,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAppVisibilityEvents* This,
+        IAppVisibilityEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAppVisibilityEvents* This);
+        IAppVisibilityEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAppVisibilityEvents* This);
+        IAppVisibilityEvents *This);
 
     /*** IAppVisibilityEvents methods ***/
     HRESULT (STDMETHODCALLTYPE *AppVisibilityOnMonitorChanged)(
-        IAppVisibilityEvents* This,
+        IAppVisibilityEvents *This,
         HMONITOR hMonitor,
         MONITOR_APP_VISIBILITY previousMode,
         MONITOR_APP_VISIBILITY currentMode);
 
     HRESULT (STDMETHODCALLTYPE *LauncherVisibilityChange)(
-        IAppVisibilityEvents* This,
+        IAppVisibilityEvents *This,
         WINBOOL currentVisibleState);
 
     END_INTERFACE
 } IAppVisibilityEventsVtbl;
+
 interface IAppVisibilityEvents {
     CONST_VTBL IAppVisibilityEventsVtbl* lpVtbl;
 };
@@ -40770,24 +34044,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAppVisibilityEvents_AppVisibilityOnMonitorChanged_Proxy(
-    IAppVisibilityEvents* This,
-    HMONITOR hMonitor,
-    MONITOR_APP_VISIBILITY previousMode,
-    MONITOR_APP_VISIBILITY currentMode);
-void __RPC_STUB IAppVisibilityEvents_AppVisibilityOnMonitorChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAppVisibilityEvents_LauncherVisibilityChange_Proxy(
-    IAppVisibilityEvents* This,
-    WINBOOL currentVisibleState);
-void __RPC_STUB IAppVisibilityEvents_LauncherVisibilityChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAppVisibilityEvents_INTERFACE_DEFINED__ */
 
@@ -40827,37 +34083,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAppVisibility* This,
+        IAppVisibility *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAppVisibility* This);
+        IAppVisibility *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAppVisibility* This);
+        IAppVisibility *This);
 
     /*** IAppVisibility methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAppVisibilityOnMonitor)(
-        IAppVisibility* This,
+        IAppVisibility *This,
         HMONITOR hMonitor,
         MONITOR_APP_VISIBILITY *pMode);
 
     HRESULT (STDMETHODCALLTYPE *IsLauncherVisible)(
-        IAppVisibility* This,
+        IAppVisibility *This,
         WINBOOL *pfVisible);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IAppVisibility* This,
+        IAppVisibility *This,
         IAppVisibilityEvents *pCallback,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IAppVisibility* This,
+        IAppVisibility *This,
         DWORD dwCookie);
 
     END_INTERFACE
 } IAppVisibilityVtbl;
+
 interface IAppVisibility {
     CONST_VTBL IAppVisibilityVtbl* lpVtbl;
 };
@@ -40902,40 +34159,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAppVisibility_GetAppVisibilityOnMonitor_Proxy(
-    IAppVisibility* This,
-    HMONITOR hMonitor,
-    MONITOR_APP_VISIBILITY *pMode);
-void __RPC_STUB IAppVisibility_GetAppVisibilityOnMonitor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAppVisibility_IsLauncherVisible_Proxy(
-    IAppVisibility* This,
-    WINBOOL *pfVisible);
-void __RPC_STUB IAppVisibility_IsLauncherVisible_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAppVisibility_Advise_Proxy(
-    IAppVisibility* This,
-    IAppVisibilityEvents *pCallback,
-    DWORD *pdwCookie);
-void __RPC_STUB IAppVisibility_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAppVisibility_Unadvise_Proxy(
-    IAppVisibility* This,
-    DWORD dwCookie);
-void __RPC_STUB IAppVisibility_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAppVisibility_INTERFACE_DEFINED__ */
 
@@ -40977,24 +34200,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPackageExecutionStateChangeNotification* This,
+        IPackageExecutionStateChangeNotification *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPackageExecutionStateChangeNotification* This);
+        IPackageExecutionStateChangeNotification *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPackageExecutionStateChangeNotification* This);
+        IPackageExecutionStateChangeNotification *This);
 
     /*** IPackageExecutionStateChangeNotification methods ***/
     HRESULT (STDMETHODCALLTYPE *OnStateChanged)(
-        IPackageExecutionStateChangeNotification* This,
+        IPackageExecutionStateChangeNotification *This,
         LPCWSTR pszPackageFullName,
         PACKAGE_EXECUTION_STATE pesNewState);
 
     END_INTERFACE
 } IPackageExecutionStateChangeNotificationVtbl;
+
 interface IPackageExecutionStateChangeNotification {
     CONST_VTBL IPackageExecutionStateChangeNotificationVtbl* lpVtbl;
 };
@@ -41027,15 +34251,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPackageExecutionStateChangeNotification_OnStateChanged_Proxy(
-    IPackageExecutionStateChangeNotification* This,
-    LPCWSTR pszPackageFullName,
-    PACKAGE_EXECUTION_STATE pesNewState);
-void __RPC_STUB IPackageExecutionStateChangeNotification_OnStateChanged_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPackageExecutionStateChangeNotification_INTERFACE_DEFINED__ */
 
@@ -41115,88 +34330,89 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPackageDebugSettings* This);
+        IPackageDebugSettings *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPackageDebugSettings* This);
+        IPackageDebugSettings *This);
 
     /*** IPackageDebugSettings methods ***/
     HRESULT (STDMETHODCALLTYPE *EnableDebugging)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName,
         LPCWSTR debuggerCommandLine,
         PZZWSTR environment);
 
     HRESULT (STDMETHODCALLTYPE *DisableDebugging)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName);
 
     HRESULT (STDMETHODCALLTYPE *TerminateAllProcesses)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName);
 
     HRESULT (STDMETHODCALLTYPE *SetTargetSessionId)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         ULONG sessionId);
 
     HRESULT (STDMETHODCALLTYPE *EnumerateBackgroundTasks)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName,
         ULONG *taskCount,
         LPCGUID *taskIds,
         LPCWSTR **taskNames);
 
     HRESULT (STDMETHODCALLTYPE *ActivateBackgroundTask)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCGUID taskId);
 
     HRESULT (STDMETHODCALLTYPE *StartServicing)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName);
 
     HRESULT (STDMETHODCALLTYPE *StopServicing)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName);
 
     HRESULT (STDMETHODCALLTYPE *StartSessionRedirection)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName,
         ULONG sessionId);
 
     HRESULT (STDMETHODCALLTYPE *StopSessionRedirection)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName);
 
     HRESULT (STDMETHODCALLTYPE *GetPackageExecutionState)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName,
         PACKAGE_EXECUTION_STATE *packageExecutionState);
 
     HRESULT (STDMETHODCALLTYPE *RegisterForPackageStateChanges)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         LPCWSTR packageFullName,
         IPackageExecutionStateChangeNotification *pPackageExecutionStateChangeNotification,
         DWORD *pdwCookie);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterForPackageStateChanges)(
-        IPackageDebugSettings* This,
+        IPackageDebugSettings *This,
         DWORD dwCookie);
 
     END_INTERFACE
 } IPackageDebugSettingsVtbl;
+
 interface IPackageDebugSettings {
     CONST_VTBL IPackageDebugSettingsVtbl* lpVtbl;
 };
@@ -41285,135 +34501,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_EnableDebugging_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName,
-    LPCWSTR debuggerCommandLine,
-    PZZWSTR environment);
-void __RPC_STUB IPackageDebugSettings_EnableDebugging_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_DisableDebugging_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName);
-void __RPC_STUB IPackageDebugSettings_DisableDebugging_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_Suspend_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName);
-void __RPC_STUB IPackageDebugSettings_Suspend_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_Resume_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName);
-void __RPC_STUB IPackageDebugSettings_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_TerminateAllProcesses_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName);
-void __RPC_STUB IPackageDebugSettings_TerminateAllProcesses_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_SetTargetSessionId_Proxy(
-    IPackageDebugSettings* This,
-    ULONG sessionId);
-void __RPC_STUB IPackageDebugSettings_SetTargetSessionId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_EnumerateBackgroundTasks_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName,
-    ULONG *taskCount,
-    LPCGUID *taskIds,
-    LPCWSTR **taskNames);
-void __RPC_STUB IPackageDebugSettings_EnumerateBackgroundTasks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_ActivateBackgroundTask_Proxy(
-    IPackageDebugSettings* This,
-    LPCGUID taskId);
-void __RPC_STUB IPackageDebugSettings_ActivateBackgroundTask_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StartServicing_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName);
-void __RPC_STUB IPackageDebugSettings_StartServicing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StopServicing_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName);
-void __RPC_STUB IPackageDebugSettings_StopServicing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StartSessionRedirection_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName,
-    ULONG sessionId);
-void __RPC_STUB IPackageDebugSettings_StartSessionRedirection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_StopSessionRedirection_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName);
-void __RPC_STUB IPackageDebugSettings_StopSessionRedirection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_GetPackageExecutionState_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName,
-    PACKAGE_EXECUTION_STATE *packageExecutionState);
-void __RPC_STUB IPackageDebugSettings_GetPackageExecutionState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_RegisterForPackageStateChanges_Proxy(
-    IPackageDebugSettings* This,
-    LPCWSTR packageFullName,
-    IPackageExecutionStateChangeNotification *pPackageExecutionStateChangeNotification,
-    DWORD *pdwCookie);
-void __RPC_STUB IPackageDebugSettings_RegisterForPackageStateChanges_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPackageDebugSettings_UnregisterForPackageStateChanges_Proxy(
-    IPackageDebugSettings* This,
-    DWORD dwCookie);
-void __RPC_STUB IPackageDebugSettings_UnregisterForPackageStateChanges_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPackageDebugSettings_INTERFACE_DEFINED__ */
 
@@ -41447,23 +34534,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExecuteCommandApplicationHostEnvironment* This,
+        IExecuteCommandApplicationHostEnvironment *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExecuteCommandApplicationHostEnvironment* This);
+        IExecuteCommandApplicationHostEnvironment *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExecuteCommandApplicationHostEnvironment* This);
+        IExecuteCommandApplicationHostEnvironment *This);
 
     /*** IExecuteCommandApplicationHostEnvironment methods ***/
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IExecuteCommandApplicationHostEnvironment* This,
+        IExecuteCommandApplicationHostEnvironment *This,
         AHE_TYPE *pahe);
 
     END_INTERFACE
 } IExecuteCommandApplicationHostEnvironmentVtbl;
+
 interface IExecuteCommandApplicationHostEnvironment {
     CONST_VTBL IExecuteCommandApplicationHostEnvironmentVtbl* lpVtbl;
 };
@@ -41496,14 +34584,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExecuteCommandApplicationHostEnvironment_GetValue_Proxy(
-    IExecuteCommandApplicationHostEnvironment* This,
-    AHE_TYPE *pahe);
-void __RPC_STUB IExecuteCommandApplicationHostEnvironment_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExecuteCommandApplicationHostEnvironment_INTERFACE_DEFINED__ */
 
@@ -41538,23 +34618,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IExecuteCommandHost* This,
+        IExecuteCommandHost *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IExecuteCommandHost* This);
+        IExecuteCommandHost *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IExecuteCommandHost* This);
+        IExecuteCommandHost *This);
 
     /*** IExecuteCommandHost methods ***/
     HRESULT (STDMETHODCALLTYPE *GetUIMode)(
-        IExecuteCommandHost* This,
+        IExecuteCommandHost *This,
         EC_HOST_UI_MODE *pUIMode);
 
     END_INTERFACE
 } IExecuteCommandHostVtbl;
+
 interface IExecuteCommandHost {
     CONST_VTBL IExecuteCommandHostVtbl* lpVtbl;
 };
@@ -41587,14 +34668,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IExecuteCommandHost_GetUIMode_Proxy(
-    IExecuteCommandHost* This,
-    EC_HOST_UI_MODE *pUIMode);
-void __RPC_STUB IExecuteCommandHost_GetUIMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IExecuteCommandHost_INTERFACE_DEFINED__ */
 
@@ -41656,46 +34729,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IApplicationDesignModeSettings* This,
+        IApplicationDesignModeSettings *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IApplicationDesignModeSettings* This);
+        IApplicationDesignModeSettings *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IApplicationDesignModeSettings* This);
+        IApplicationDesignModeSettings *This);
 
     /*** IApplicationDesignModeSettings methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNativeDisplaySize)(
-        IApplicationDesignModeSettings* This,
+        IApplicationDesignModeSettings *This,
         SIZE sizeNativeDisplay);
 
     HRESULT (STDMETHODCALLTYPE *SetScaleFactor)(
-        IApplicationDesignModeSettings* This,
+        IApplicationDesignModeSettings *This,
         DEVICE_SCALE_FACTOR scaleFactor);
 
     HRESULT (STDMETHODCALLTYPE *SetApplicationViewState)(
-        IApplicationDesignModeSettings* This,
+        IApplicationDesignModeSettings *This,
         APPLICATION_VIEW_STATE viewState);
 
     HRESULT (STDMETHODCALLTYPE *ComputeApplicationSize)(
-        IApplicationDesignModeSettings* This,
+        IApplicationDesignModeSettings *This,
         SIZE *psizeApplication);
 
     HRESULT (STDMETHODCALLTYPE *IsApplicationViewStateSupported)(
-        IApplicationDesignModeSettings* This,
+        IApplicationDesignModeSettings *This,
         APPLICATION_VIEW_STATE viewState,
         SIZE sizeNativeDisplay,
         DEVICE_SCALE_FACTOR scaleFactor,
         WINBOOL *pfSupported);
 
     HRESULT (STDMETHODCALLTYPE *TriggerEdgeGesture)(
-        IApplicationDesignModeSettings* This,
+        IApplicationDesignModeSettings *This,
         EDGE_GESTURE_KIND edgeGestureKind);
 
     END_INTERFACE
 } IApplicationDesignModeSettingsVtbl;
+
 interface IApplicationDesignModeSettings {
     CONST_VTBL IApplicationDesignModeSettingsVtbl* lpVtbl;
 };
@@ -41748,57 +34822,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_SetNativeDisplaySize_Proxy(
-    IApplicationDesignModeSettings* This,
-    SIZE sizeNativeDisplay);
-void __RPC_STUB IApplicationDesignModeSettings_SetNativeDisplaySize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_SetScaleFactor_Proxy(
-    IApplicationDesignModeSettings* This,
-    DEVICE_SCALE_FACTOR scaleFactor);
-void __RPC_STUB IApplicationDesignModeSettings_SetScaleFactor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_SetApplicationViewState_Proxy(
-    IApplicationDesignModeSettings* This,
-    APPLICATION_VIEW_STATE viewState);
-void __RPC_STUB IApplicationDesignModeSettings_SetApplicationViewState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_ComputeApplicationSize_Proxy(
-    IApplicationDesignModeSettings* This,
-    SIZE *psizeApplication);
-void __RPC_STUB IApplicationDesignModeSettings_ComputeApplicationSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_IsApplicationViewStateSupported_Proxy(
-    IApplicationDesignModeSettings* This,
-    APPLICATION_VIEW_STATE viewState,
-    SIZE sizeNativeDisplay,
-    DEVICE_SCALE_FACTOR scaleFactor,
-    WINBOOL *pfSupported);
-void __RPC_STUB IApplicationDesignModeSettings_IsApplicationViewStateSupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IApplicationDesignModeSettings_TriggerEdgeGesture_Proxy(
-    IApplicationDesignModeSettings* This,
-    EDGE_GESTURE_KIND edgeGestureKind);
-void __RPC_STUB IApplicationDesignModeSettings_TriggerEdgeGesture_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IApplicationDesignModeSettings_INTERFACE_DEFINED__ */
 
@@ -41827,23 +34850,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInitializeWithWindow* This,
+        IInitializeWithWindow *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInitializeWithWindow* This);
+        IInitializeWithWindow *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInitializeWithWindow* This);
+        IInitializeWithWindow *This);
 
     /*** IInitializeWithWindow methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IInitializeWithWindow* This,
+        IInitializeWithWindow *This,
         HWND hwnd);
 
     END_INTERFACE
 } IInitializeWithWindowVtbl;
+
 interface IInitializeWithWindow {
     CONST_VTBL IInitializeWithWindowVtbl* lpVtbl;
 };
@@ -41876,14 +34900,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInitializeWithWindow_Initialize_Proxy(
-    IInitializeWithWindow* This,
-    HWND hwnd);
-void __RPC_STUB IInitializeWithWindow_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInitializeWithWindow_INTERFACE_DEFINED__ */
 
@@ -41918,31 +34934,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHandlerInfo* This,
+        IHandlerInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHandlerInfo* This);
+        IHandlerInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHandlerInfo* This);
+        IHandlerInfo *This);
 
     /*** IHandlerInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetApplicationDisplayName)(
-        IHandlerInfo* This,
+        IHandlerInfo *This,
         LPWSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *GetApplicationPublisher)(
-        IHandlerInfo* This,
+        IHandlerInfo *This,
         LPWSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *GetApplicationIconReference)(
-        IHandlerInfo* This,
+        IHandlerInfo *This,
         LPWSTR *value);
 
     END_INTERFACE
 } IHandlerInfoVtbl;
+
 interface IHandlerInfo {
     CONST_VTBL IHandlerInfoVtbl* lpVtbl;
 };
@@ -41983,30 +35000,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHandlerInfo_GetApplicationDisplayName_Proxy(
-    IHandlerInfo* This,
-    LPWSTR *value);
-void __RPC_STUB IHandlerInfo_GetApplicationDisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHandlerInfo_GetApplicationPublisher_Proxy(
-    IHandlerInfo* This,
-    LPWSTR *value);
-void __RPC_STUB IHandlerInfo_GetApplicationPublisher_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHandlerInfo_GetApplicationIconReference_Proxy(
-    IHandlerInfo* This,
-    LPWSTR *value);
-void __RPC_STUB IHandlerInfo_GetApplicationIconReference_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHandlerInfo_INTERFACE_DEFINED__ */
 
@@ -42042,31 +35035,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHandlerActivationHost* This,
+        IHandlerActivationHost *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHandlerActivationHost* This);
+        IHandlerActivationHost *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHandlerActivationHost* This);
+        IHandlerActivationHost *This);
 
     /*** IHandlerActivationHost methods ***/
     HRESULT (STDMETHODCALLTYPE *BeforeCoCreateInstance)(
-        IHandlerActivationHost* This,
+        IHandlerActivationHost *This,
         REFCLSID clsidHandler,
         IShellItemArray *itemsBeingActivated,
         IHandlerInfo *handlerInfo);
 
     HRESULT (STDMETHODCALLTYPE *BeforeCreateProcess)(
-        IHandlerActivationHost* This,
+        IHandlerActivationHost *This,
         LPCWSTR applicationPath,
         LPCWSTR commandLine,
         IHandlerInfo *handlerInfo);
 
     END_INTERFACE
 } IHandlerActivationHostVtbl;
+
 interface IHandlerActivationHost {
     CONST_VTBL IHandlerActivationHostVtbl* lpVtbl;
 };
@@ -42103,26 +35097,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHandlerActivationHost_BeforeCoCreateInstance_Proxy(
-    IHandlerActivationHost* This,
-    REFCLSID clsidHandler,
-    IShellItemArray *itemsBeingActivated,
-    IHandlerInfo *handlerInfo);
-void __RPC_STUB IHandlerActivationHost_BeforeCoCreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHandlerActivationHost_BeforeCreateProcess_Proxy(
-    IHandlerActivationHost* This,
-    LPCWSTR applicationPath,
-    LPCWSTR commandLine,
-    IHandlerInfo *handlerInfo);
-void __RPC_STUB IHandlerActivationHost_BeforeCreateProcess_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHandlerActivationHost_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/shtypes.h b/mingw-w64-headers/include/shtypes.h
index 8398c46..4b7e06a 100644
--- a/mingw-w64-headers/include/shtypes.h
+++ b/mingw-w64-headers/include/shtypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/shtypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/shtypes.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/strmif.h b/mingw-w64-headers/include/strmif.h
index 4aaeb80..0c6624c 100644
--- a/mingw-w64-headers/include/strmif.h
+++ b/mingw-w64-headers/include/strmif.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/strmif.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/strmif.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,291 +20,465 @@
 #ifndef __ICreateDevEnum_FWD_DEFINED__
 #define __ICreateDevEnum_FWD_DEFINED__
 typedef interface ICreateDevEnum ICreateDevEnum;
+#ifdef __cplusplus
+interface ICreateDevEnum;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPin_FWD_DEFINED__
 #define __IPin_FWD_DEFINED__
 typedef interface IPin IPin;
+#ifdef __cplusplus
+interface IPin;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumPins_FWD_DEFINED__
 #define __IEnumPins_FWD_DEFINED__
 typedef interface IEnumPins IEnumPins;
+#ifdef __cplusplus
+interface IEnumPins;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumMediaTypes_FWD_DEFINED__
 #define __IEnumMediaTypes_FWD_DEFINED__
 typedef interface IEnumMediaTypes IEnumMediaTypes;
+#ifdef __cplusplus
+interface IEnumMediaTypes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterGraph_FWD_DEFINED__
 #define __IFilterGraph_FWD_DEFINED__
 typedef interface IFilterGraph IFilterGraph;
+#ifdef __cplusplus
+interface IFilterGraph;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumFilters_FWD_DEFINED__
 #define __IEnumFilters_FWD_DEFINED__
 typedef interface IEnumFilters IEnumFilters;
+#ifdef __cplusplus
+interface IEnumFilters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaFilter_FWD_DEFINED__
 #define __IMediaFilter_FWD_DEFINED__
 typedef interface IMediaFilter IMediaFilter;
+#ifdef __cplusplus
+interface IMediaFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBaseFilter_FWD_DEFINED__
 #define __IBaseFilter_FWD_DEFINED__
 typedef interface IBaseFilter IBaseFilter;
+#ifdef __cplusplus
+interface IBaseFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IReferenceClock_FWD_DEFINED__
 #define __IReferenceClock_FWD_DEFINED__
 typedef interface IReferenceClock IReferenceClock;
+#ifdef __cplusplus
+interface IReferenceClock;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IReferenceClockTimerControl_FWD_DEFINED__
 #define __IReferenceClockTimerControl_FWD_DEFINED__
 typedef interface IReferenceClockTimerControl IReferenceClockTimerControl;
+#ifdef __cplusplus
+interface IReferenceClockTimerControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IReferenceClock2_FWD_DEFINED__
 #define __IReferenceClock2_FWD_DEFINED__
 typedef interface IReferenceClock2 IReferenceClock2;
+#ifdef __cplusplus
+interface IReferenceClock2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaSample_FWD_DEFINED__
 #define __IMediaSample_FWD_DEFINED__
 typedef interface IMediaSample IMediaSample;
+#ifdef __cplusplus
+interface IMediaSample;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaSample2_FWD_DEFINED__
 #define __IMediaSample2_FWD_DEFINED__
 typedef interface IMediaSample2 IMediaSample2;
+#ifdef __cplusplus
+interface IMediaSample2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaSample2Config_FWD_DEFINED__
 #define __IMediaSample2Config_FWD_DEFINED__
 typedef interface IMediaSample2Config IMediaSample2Config;
+#ifdef __cplusplus
+interface IMediaSample2Config;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemAllocator_FWD_DEFINED__
 #define __IMemAllocator_FWD_DEFINED__
 typedef interface IMemAllocator IMemAllocator;
+#ifdef __cplusplus
+interface IMemAllocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemAllocatorCallbackTemp_FWD_DEFINED__
 #define __IMemAllocatorCallbackTemp_FWD_DEFINED__
 typedef interface IMemAllocatorCallbackTemp IMemAllocatorCallbackTemp;
+#ifdef __cplusplus
+interface IMemAllocatorCallbackTemp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__
 #define __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__
 typedef interface IMemAllocatorNotifyCallbackTemp IMemAllocatorNotifyCallbackTemp;
+#ifdef __cplusplus
+interface IMemAllocatorNotifyCallbackTemp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemInputPin_FWD_DEFINED__
 #define __IMemInputPin_FWD_DEFINED__
 typedef interface IMemInputPin IMemInputPin;
+#ifdef __cplusplus
+interface IMemInputPin;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMovieSetup_FWD_DEFINED__
 #define __IAMovieSetup_FWD_DEFINED__
 typedef interface IAMovieSetup IAMovieSetup;
+#ifdef __cplusplus
+interface IAMovieSetup;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaSeeking_FWD_DEFINED__
 #define __IMediaSeeking_FWD_DEFINED__
 typedef interface IMediaSeeking IMediaSeeking;
+#ifdef __cplusplus
+interface IMediaSeeking;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumRegFilters_FWD_DEFINED__
 #define __IEnumRegFilters_FWD_DEFINED__
 typedef interface IEnumRegFilters IEnumRegFilters;
+#ifdef __cplusplus
+interface IEnumRegFilters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterMapper_FWD_DEFINED__
 #define __IFilterMapper_FWD_DEFINED__
 typedef interface IFilterMapper IFilterMapper;
+#ifdef __cplusplus
+interface IFilterMapper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterMapper2_FWD_DEFINED__
 #define __IFilterMapper2_FWD_DEFINED__
 typedef interface IFilterMapper2 IFilterMapper2;
+#ifdef __cplusplus
+interface IFilterMapper2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterMapper3_FWD_DEFINED__
 #define __IFilterMapper3_FWD_DEFINED__
 typedef interface IFilterMapper3 IFilterMapper3;
+#ifdef __cplusplus
+interface IFilterMapper3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IQualityControl_FWD_DEFINED__
 #define __IQualityControl_FWD_DEFINED__
 typedef interface IQualityControl IQualityControl;
+#ifdef __cplusplus
+interface IQualityControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOverlayNotify_FWD_DEFINED__
 #define __IOverlayNotify_FWD_DEFINED__
 typedef interface IOverlayNotify IOverlayNotify;
+#ifdef __cplusplus
+interface IOverlayNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOverlayNotify2_FWD_DEFINED__
 #define __IOverlayNotify2_FWD_DEFINED__
 typedef interface IOverlayNotify2 IOverlayNotify2;
+#ifdef __cplusplus
+interface IOverlayNotify2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOverlay_FWD_DEFINED__
 #define __IOverlay_FWD_DEFINED__
 typedef interface IOverlay IOverlay;
+#ifdef __cplusplus
+interface IOverlay;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaEventSink_FWD_DEFINED__
 #define __IMediaEventSink_FWD_DEFINED__
 typedef interface IMediaEventSink IMediaEventSink;
+#ifdef __cplusplus
+interface IMediaEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSourceFilter_FWD_DEFINED__
 #define __IFileSourceFilter_FWD_DEFINED__
 typedef interface IFileSourceFilter IFileSourceFilter;
+#ifdef __cplusplus
+interface IFileSourceFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSinkFilter_FWD_DEFINED__
 #define __IFileSinkFilter_FWD_DEFINED__
 typedef interface IFileSinkFilter IFileSinkFilter;
+#ifdef __cplusplus
+interface IFileSinkFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSinkFilter2_FWD_DEFINED__
 #define __IFileSinkFilter2_FWD_DEFINED__
 typedef interface IFileSinkFilter2 IFileSinkFilter2;
+#ifdef __cplusplus
+interface IFileSinkFilter2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IGraphBuilder_FWD_DEFINED__
 #define __IGraphBuilder_FWD_DEFINED__
 typedef interface IGraphBuilder IGraphBuilder;
+#ifdef __cplusplus
+interface IGraphBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICaptureGraphBuilder_FWD_DEFINED__
 #define __ICaptureGraphBuilder_FWD_DEFINED__
 typedef interface ICaptureGraphBuilder ICaptureGraphBuilder;
+#ifdef __cplusplus
+interface ICaptureGraphBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMCopyCaptureFileProgress_FWD_DEFINED__
 #define __IAMCopyCaptureFileProgress_FWD_DEFINED__
 typedef interface IAMCopyCaptureFileProgress IAMCopyCaptureFileProgress;
+#ifdef __cplusplus
+interface IAMCopyCaptureFileProgress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICaptureGraphBuilder2_FWD_DEFINED__
 #define __ICaptureGraphBuilder2_FWD_DEFINED__
 typedef interface ICaptureGraphBuilder2 ICaptureGraphBuilder2;
+#ifdef __cplusplus
+interface ICaptureGraphBuilder2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConfigAviMux_FWD_DEFINED__
 #define __IConfigAviMux_FWD_DEFINED__
 typedef interface IConfigAviMux IConfigAviMux;
+#ifdef __cplusplus
+interface IConfigAviMux;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConfigInterleaving_FWD_DEFINED__
 #define __IConfigInterleaving_FWD_DEFINED__
 typedef interface IConfigInterleaving IConfigInterleaving;
+#ifdef __cplusplus
+interface IConfigInterleaving;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMClockSlave_FWD_DEFINED__
 #define __IAMClockSlave_FWD_DEFINED__
 typedef interface IAMClockSlave IAMClockSlave;
+#ifdef __cplusplus
+interface IAMClockSlave;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMCertifiedOutputProtection_FWD_DEFINED__
 #define __IAMCertifiedOutputProtection_FWD_DEFINED__
 typedef interface IAMCertifiedOutputProtection IAMCertifiedOutputProtection;
+#ifdef __cplusplus
+interface IAMCertifiedOutputProtection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterGraph2_FWD_DEFINED__
 #define __IFilterGraph2_FWD_DEFINED__
 typedef interface IFilterGraph2 IFilterGraph2;
+#ifdef __cplusplus
+interface IFilterGraph2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IStreamBuilder_FWD_DEFINED__
 #define __IStreamBuilder_FWD_DEFINED__
 typedef interface IStreamBuilder IStreamBuilder;
+#ifdef __cplusplus
+interface IStreamBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMStreamConfig_FWD_DEFINED__
 #define __IAMStreamConfig_FWD_DEFINED__
 typedef interface IAMStreamConfig IAMStreamConfig;
+#ifdef __cplusplus
+interface IAMStreamConfig;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMVideoProcAmp_FWD_DEFINED__
 #define __IAMVideoProcAmp_FWD_DEFINED__
 typedef interface IAMVideoProcAmp IAMVideoProcAmp;
+#ifdef __cplusplus
+interface IAMVideoProcAmp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAsyncReader_FWD_DEFINED__
 #define __IAsyncReader_FWD_DEFINED__
 typedef interface IAsyncReader IAsyncReader;
+#ifdef __cplusplus
+interface IAsyncReader;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IGraphVersion_FWD_DEFINED__
 #define __IGraphVersion_FWD_DEFINED__
 typedef interface IGraphVersion IGraphVersion;
+#ifdef __cplusplus
+interface IGraphVersion;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IResourceConsumer_FWD_DEFINED__
 #define __IResourceConsumer_FWD_DEFINED__
 typedef interface IResourceConsumer IResourceConsumer;
+#ifdef __cplusplus
+interface IResourceConsumer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IResourceManager_FWD_DEFINED__
 #define __IResourceManager_FWD_DEFINED__
 typedef interface IResourceManager IResourceManager;
+#ifdef __cplusplus
+interface IResourceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMStreamControl_FWD_DEFINED__
 #define __IAMStreamControl_FWD_DEFINED__
 typedef interface IAMStreamControl IAMStreamControl;
+#ifdef __cplusplus
+interface IAMStreamControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IKsPropertySet_FWD_DEFINED__
 #define __IKsPropertySet_FWD_DEFINED__
 typedef interface IKsPropertySet IKsPropertySet;
+#ifdef __cplusplus
+interface IKsPropertySet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaPropertyBag_FWD_DEFINED__
 #define __IMediaPropertyBag_FWD_DEFINED__
 typedef interface IMediaPropertyBag IMediaPropertyBag;
+#ifdef __cplusplus
+interface IMediaPropertyBag;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPersistMediaPropertyBag_FWD_DEFINED__
 #define __IPersistMediaPropertyBag_FWD_DEFINED__
 typedef interface IPersistMediaPropertyBag IPersistMediaPropertyBag;
+#ifdef __cplusplus
+interface IPersistMediaPropertyBag;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISeekingPassThru_FWD_DEFINED__
 #define __ISeekingPassThru_FWD_DEFINED__
 typedef interface ISeekingPassThru ISeekingPassThru;
+#ifdef __cplusplus
+interface ISeekingPassThru;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMFilterMiscFlags_FWD_DEFINED__
 #define __IAMFilterMiscFlags_FWD_DEFINED__
 typedef interface IAMFilterMiscFlags IAMFilterMiscFlags;
+#ifdef __cplusplus
+interface IAMFilterMiscFlags;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMGraphBuilderCallback_FWD_DEFINED__
 #define __IAMGraphBuilderCallback_FWD_DEFINED__
 typedef interface IAMGraphBuilderCallback IAMGraphBuilderCallback;
+#ifdef __cplusplus
+interface IAMGraphBuilderCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMVfwCaptureDialogs_FWD_DEFINED__
 #define __IAMVfwCaptureDialogs_FWD_DEFINED__
 typedef interface IAMVfwCaptureDialogs IAMVfwCaptureDialogs;
+#ifdef __cplusplus
+interface IAMVfwCaptureDialogs;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMAsyncReaderTimestampScaling_FWD_DEFINED__
 #define __IAMAsyncReaderTimestampScaling_FWD_DEFINED__
 typedef interface IAMAsyncReaderTimestampScaling IAMAsyncReaderTimestampScaling;
+#ifdef __cplusplus
+interface IAMAsyncReaderTimestampScaling;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMPluginControl_FWD_DEFINED__
 #define __IAMPluginControl_FWD_DEFINED__
 typedef interface IAMPluginControl IAMPluginControl;
+#ifdef __cplusplus
+interface IAMPluginControl;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -363,25 +537,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICreateDevEnum* This,
+        ICreateDevEnum *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICreateDevEnum* This);
+        ICreateDevEnum *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICreateDevEnum* This);
+        ICreateDevEnum *This);
 
     /*** ICreateDevEnum methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateClassEnumerator)(
-        ICreateDevEnum* This,
+        ICreateDevEnum *This,
         REFCLSID clsidDeviceClass,
         IEnumMoniker **ppEnumMoniker,
         DWORD dwFlags);
 
     END_INTERFACE
 } ICreateDevEnumVtbl;
+
 interface ICreateDevEnum {
     CONST_VTBL ICreateDevEnumVtbl* lpVtbl;
 };
@@ -414,16 +589,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICreateDevEnum_CreateClassEnumerator_Proxy(
-    ICreateDevEnum* This,
-    REFCLSID clsidDeviceClass,
-    IEnumMoniker **ppEnumMoniker,
-    DWORD dwFlags);
-void __RPC_STUB ICreateDevEnum_CreateClassEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICreateDevEnum_INTERFACE_DEFINED__ */
 
@@ -486,71 +651,113 @@
 #ifndef __IAMovieSetup_FWD_DEFINED__
 #define __IAMovieSetup_FWD_DEFINED__
 typedef interface IAMovieSetup IAMovieSetup;
+#ifdef __cplusplus
+interface IAMovieSetup;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumFilters_FWD_DEFINED__
 #define __IEnumFilters_FWD_DEFINED__
 typedef interface IEnumFilters IEnumFilters;
+#ifdef __cplusplus
+interface IEnumFilters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumMediaTypes_FWD_DEFINED__
 #define __IEnumMediaTypes_FWD_DEFINED__
 typedef interface IEnumMediaTypes IEnumMediaTypes;
+#ifdef __cplusplus
+interface IEnumMediaTypes;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumPins_FWD_DEFINED__
 #define __IEnumPins_FWD_DEFINED__
 typedef interface IEnumPins IEnumPins;
+#ifdef __cplusplus
+interface IEnumPins;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBaseFilter_FWD_DEFINED__
 #define __IBaseFilter_FWD_DEFINED__
 typedef interface IBaseFilter IBaseFilter;
+#ifdef __cplusplus
+interface IBaseFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterGraph_FWD_DEFINED__
 #define __IFilterGraph_FWD_DEFINED__
 typedef interface IFilterGraph IFilterGraph;
+#ifdef __cplusplus
+interface IFilterGraph;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaFilter_FWD_DEFINED__
 #define __IMediaFilter_FWD_DEFINED__
 typedef interface IMediaFilter IMediaFilter;
+#ifdef __cplusplus
+interface IMediaFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaSample_FWD_DEFINED__
 #define __IMediaSample_FWD_DEFINED__
 typedef interface IMediaSample IMediaSample;
+#ifdef __cplusplus
+interface IMediaSample;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemAllocator_FWD_DEFINED__
 #define __IMemAllocator_FWD_DEFINED__
 typedef interface IMemAllocator IMemAllocator;
+#ifdef __cplusplus
+interface IMemAllocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemAllocatorCallbackTemp_FWD_DEFINED__
 #define __IMemAllocatorCallbackTemp_FWD_DEFINED__
 typedef interface IMemAllocatorCallbackTemp IMemAllocatorCallbackTemp;
+#ifdef __cplusplus
+interface IMemAllocatorCallbackTemp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__
 #define __IMemAllocatorNotifyCallbackTemp_FWD_DEFINED__
 typedef interface IMemAllocatorNotifyCallbackTemp IMemAllocatorNotifyCallbackTemp;
+#ifdef __cplusplus
+interface IMemAllocatorNotifyCallbackTemp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMemInputPin_FWD_DEFINED__
 #define __IMemInputPin_FWD_DEFINED__
 typedef interface IMemInputPin IMemInputPin;
+#ifdef __cplusplus
+interface IMemInputPin;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IPin_FWD_DEFINED__
 #define __IPin_FWD_DEFINED__
 typedef interface IPin IPin;
+#ifdef __cplusplus
+interface IPin;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IReferenceClock_FWD_DEFINED__
 #define __IReferenceClock_FWD_DEFINED__
 typedef interface IReferenceClock IReferenceClock;
+#ifdef __cplusplus
+interface IReferenceClock;
+#endif /* __cplusplus */
 #endif
 
 
@@ -631,80 +838,81 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPin* This,
+        IPin *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPin* This);
+        IPin *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPin* This);
+        IPin *This);
 
     /*** IPin methods ***/
     HRESULT (STDMETHODCALLTYPE *Connect)(
-        IPin* This,
+        IPin *This,
         IPin *pReceivePin,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *ReceiveConnection)(
-        IPin* This,
+        IPin *This,
         IPin *pConnector,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *Disconnect)(
-        IPin* This);
+        IPin *This);
 
     HRESULT (STDMETHODCALLTYPE *ConnectedTo)(
-        IPin* This,
+        IPin *This,
         IPin **pPin);
 
     HRESULT (STDMETHODCALLTYPE *ConnectionMediaType)(
-        IPin* This,
+        IPin *This,
         AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *QueryPinInfo)(
-        IPin* This,
+        IPin *This,
         PIN_INFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *QueryDirection)(
-        IPin* This,
+        IPin *This,
         PIN_DIRECTION *pPinDir);
 
     HRESULT (STDMETHODCALLTYPE *QueryId)(
-        IPin* This,
+        IPin *This,
         LPWSTR *Id);
 
     HRESULT (STDMETHODCALLTYPE *QueryAccept)(
-        IPin* This,
+        IPin *This,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *EnumMediaTypes)(
-        IPin* This,
+        IPin *This,
         IEnumMediaTypes **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *QueryInternalConnections)(
-        IPin* This,
+        IPin *This,
         IPin **apPin,
         ULONG *nPin);
 
     HRESULT (STDMETHODCALLTYPE *EndOfStream)(
-        IPin* This);
+        IPin *This);
 
     HRESULT (STDMETHODCALLTYPE *BeginFlush)(
-        IPin* This);
+        IPin *This);
 
     HRESULT (STDMETHODCALLTYPE *EndFlush)(
-        IPin* This);
+        IPin *This);
 
     HRESULT (STDMETHODCALLTYPE *NewSegment)(
-        IPin* This,
+        IPin *This,
         REFERENCE_TIME tStart,
         REFERENCE_TIME tStop,
         double dRate);
 
     END_INTERFACE
 } IPinVtbl;
+
 interface IPin {
     CONST_VTBL IPinVtbl* lpVtbl;
 };
@@ -793,127 +1001,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPin_Connect_Proxy(
-    IPin* This,
-    IPin *pReceivePin,
-    const AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IPin_Connect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_ReceiveConnection_Proxy(
-    IPin* This,
-    IPin *pConnector,
-    const AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IPin_ReceiveConnection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_Disconnect_Proxy(
-    IPin* This);
-void __RPC_STUB IPin_Disconnect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_ConnectedTo_Proxy(
-    IPin* This,
-    IPin **pPin);
-void __RPC_STUB IPin_ConnectedTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_ConnectionMediaType_Proxy(
-    IPin* This,
-    AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IPin_ConnectionMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_QueryPinInfo_Proxy(
-    IPin* This,
-    PIN_INFO *pInfo);
-void __RPC_STUB IPin_QueryPinInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_QueryDirection_Proxy(
-    IPin* This,
-    PIN_DIRECTION *pPinDir);
-void __RPC_STUB IPin_QueryDirection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_QueryId_Proxy(
-    IPin* This,
-    LPWSTR *Id);
-void __RPC_STUB IPin_QueryId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_QueryAccept_Proxy(
-    IPin* This,
-    const AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IPin_QueryAccept_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_EnumMediaTypes_Proxy(
-    IPin* This,
-    IEnumMediaTypes **ppEnum);
-void __RPC_STUB IPin_EnumMediaTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_QueryInternalConnections_Proxy(
-    IPin* This,
-    IPin **apPin,
-    ULONG *nPin);
-void __RPC_STUB IPin_QueryInternalConnections_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_EndOfStream_Proxy(
-    IPin* This);
-void __RPC_STUB IPin_EndOfStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_BeginFlush_Proxy(
-    IPin* This);
-void __RPC_STUB IPin_BeginFlush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_EndFlush_Proxy(
-    IPin* This);
-void __RPC_STUB IPin_EndFlush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPin_NewSegment_Proxy(
-    IPin* This,
-    REFERENCE_TIME tStart,
-    REFERENCE_TIME tStop,
-    double dRate);
-void __RPC_STUB IPin_NewSegment_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPin_INTERFACE_DEFINED__ */
 
@@ -954,36 +1041,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumPins* This,
+        IEnumPins *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumPins* This);
+        IEnumPins *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumPins* This);
+        IEnumPins *This);
 
     /*** IEnumPins methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumPins* This,
+        IEnumPins *This,
         ULONG cPins,
         IPin **ppPins,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumPins* This,
+        IEnumPins *This,
         ULONG cPins);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumPins* This);
+        IEnumPins *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumPins* This,
+        IEnumPins *This,
         IEnumPins **ppEnum);
 
     END_INTERFACE
 } IEnumPinsVtbl;
+
 interface IEnumPins {
     CONST_VTBL IEnumPinsVtbl* lpVtbl;
 };
@@ -1028,39 +1116,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumPins_Next_Proxy(
-    IEnumPins* This,
-    ULONG cPins,
-    IPin **ppPins,
-    ULONG *pcFetched);
-void __RPC_STUB IEnumPins_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumPins_Skip_Proxy(
-    IEnumPins* This,
-    ULONG cPins);
-void __RPC_STUB IEnumPins_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumPins_Reset_Proxy(
-    IEnumPins* This);
-void __RPC_STUB IEnumPins_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumPins_Clone_Proxy(
-    IEnumPins* This,
-    IEnumPins **ppEnum);
-void __RPC_STUB IEnumPins_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumPins_INTERFACE_DEFINED__ */
 
@@ -1101,36 +1156,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumMediaTypes* This,
+        IEnumMediaTypes *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumMediaTypes* This);
+        IEnumMediaTypes *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumMediaTypes* This);
+        IEnumMediaTypes *This);
 
     /*** IEnumMediaTypes methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumMediaTypes* This,
+        IEnumMediaTypes *This,
         ULONG cMediaTypes,
         AM_MEDIA_TYPE **ppMediaTypes,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumMediaTypes* This,
+        IEnumMediaTypes *This,
         ULONG cMediaTypes);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumMediaTypes* This);
+        IEnumMediaTypes *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumMediaTypes* This,
+        IEnumMediaTypes *This,
         IEnumMediaTypes **ppEnum);
 
     END_INTERFACE
 } IEnumMediaTypesVtbl;
+
 interface IEnumMediaTypes {
     CONST_VTBL IEnumMediaTypesVtbl* lpVtbl;
 };
@@ -1175,39 +1231,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Next_Proxy(
-    IEnumMediaTypes* This,
-    ULONG cMediaTypes,
-    AM_MEDIA_TYPE **ppMediaTypes,
-    ULONG *pcFetched);
-void __RPC_STUB IEnumMediaTypes_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Skip_Proxy(
-    IEnumMediaTypes* This,
-    ULONG cMediaTypes);
-void __RPC_STUB IEnumMediaTypes_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Reset_Proxy(
-    IEnumMediaTypes* This);
-void __RPC_STUB IEnumMediaTypes_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumMediaTypes_Clone_Proxy(
-    IEnumMediaTypes* This,
-    IEnumMediaTypes **ppEnum);
-void __RPC_STUB IEnumMediaTypes_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumMediaTypes_INTERFACE_DEFINED__ */
 
@@ -1262,54 +1285,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFilterGraph* This);
+        IFilterGraph *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFilterGraph* This);
+        IFilterGraph *This);
 
     /*** IFilterGraph methods ***/
     HRESULT (STDMETHODCALLTYPE *AddFilter)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         IBaseFilter *pFilter,
         LPCWSTR pName);
 
     HRESULT (STDMETHODCALLTYPE *RemoveFilter)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         IBaseFilter *pFilter);
 
     HRESULT (STDMETHODCALLTYPE *EnumFilters)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         IEnumFilters **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *FindFilterByName)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         LPCWSTR pName,
         IBaseFilter **ppFilter);
 
     HRESULT (STDMETHODCALLTYPE *ConnectDirect)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         IPin *ppinOut,
         IPin *ppinIn,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *Reconnect)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         IPin *ppin);
 
     HRESULT (STDMETHODCALLTYPE *Disconnect)(
-        IFilterGraph* This,
+        IFilterGraph *This,
         IPin *ppin);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultSyncSource)(
-        IFilterGraph* This);
+        IFilterGraph *This);
 
     END_INTERFACE
 } IFilterGraphVtbl;
+
 interface IFilterGraph {
     CONST_VTBL IFilterGraphVtbl* lpVtbl;
 };
@@ -1370,73 +1394,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFilterGraph_AddFilter_Proxy(
-    IFilterGraph* This,
-    IBaseFilter *pFilter,
-    LPCWSTR pName);
-void __RPC_STUB IFilterGraph_AddFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph_RemoveFilter_Proxy(
-    IFilterGraph* This,
-    IBaseFilter *pFilter);
-void __RPC_STUB IFilterGraph_RemoveFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph_EnumFilters_Proxy(
-    IFilterGraph* This,
-    IEnumFilters **ppEnum);
-void __RPC_STUB IFilterGraph_EnumFilters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph_FindFilterByName_Proxy(
-    IFilterGraph* This,
-    LPCWSTR pName,
-    IBaseFilter **ppFilter);
-void __RPC_STUB IFilterGraph_FindFilterByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph_ConnectDirect_Proxy(
-    IFilterGraph* This,
-    IPin *ppinOut,
-    IPin *ppinIn,
-    const AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IFilterGraph_ConnectDirect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph_Reconnect_Proxy(
-    IFilterGraph* This,
-    IPin *ppin);
-void __RPC_STUB IFilterGraph_Reconnect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph_Disconnect_Proxy(
-    IFilterGraph* This,
-    IPin *ppin);
-void __RPC_STUB IFilterGraph_Disconnect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph_SetDefaultSyncSource_Proxy(
-    IFilterGraph* This);
-void __RPC_STUB IFilterGraph_SetDefaultSyncSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFilterGraph_INTERFACE_DEFINED__ */
 
@@ -1477,36 +1434,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumFilters* This,
+        IEnumFilters *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumFilters* This);
+        IEnumFilters *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumFilters* This);
+        IEnumFilters *This);
 
     /*** IEnumFilters methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumFilters* This,
+        IEnumFilters *This,
         ULONG cFilters,
         IBaseFilter **ppFilter,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumFilters* This,
+        IEnumFilters *This,
         ULONG cFilters);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumFilters* This);
+        IEnumFilters *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumFilters* This,
+        IEnumFilters *This,
         IEnumFilters **ppEnum);
 
     END_INTERFACE
 } IEnumFiltersVtbl;
+
 interface IEnumFilters {
     CONST_VTBL IEnumFiltersVtbl* lpVtbl;
 };
@@ -1551,39 +1509,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumFilters_Next_Proxy(
-    IEnumFilters* This,
-    ULONG cFilters,
-    IBaseFilter **ppFilter,
-    ULONG *pcFetched);
-void __RPC_STUB IEnumFilters_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumFilters_Skip_Proxy(
-    IEnumFilters* This,
-    ULONG cFilters);
-void __RPC_STUB IEnumFilters_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumFilters_Reset_Proxy(
-    IEnumFilters* This);
-void __RPC_STUB IEnumFilters_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumFilters_Clone_Proxy(
-    IEnumFilters* This,
-    IEnumFilters **ppEnum);
-void __RPC_STUB IEnumFilters_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumFilters_INTERFACE_DEFINED__ */
 
@@ -1635,47 +1560,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaFilter* This,
+        IMediaFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaFilter* This);
+        IMediaFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaFilter* This);
+        IMediaFilter *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IMediaFilter* This,
+        IMediaFilter *This,
         CLSID *pClassID);
 
     /*** IMediaFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IMediaFilter* This);
+        IMediaFilter *This);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        IMediaFilter* This);
+        IMediaFilter *This);
 
     HRESULT (STDMETHODCALLTYPE *Run)(
-        IMediaFilter* This,
+        IMediaFilter *This,
         REFERENCE_TIME tStart);
 
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IMediaFilter* This,
+        IMediaFilter *This,
         DWORD dwMilliSecsTimeout,
         FILTER_STATE *State);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncSource)(
-        IMediaFilter* This,
+        IMediaFilter *This,
         IReferenceClock *pClock);
 
     HRESULT (STDMETHODCALLTYPE *GetSyncSource)(
-        IMediaFilter* This,
+        IMediaFilter *This,
         IReferenceClock **pClock);
 
     END_INTERFACE
 } IMediaFilterVtbl;
+
 interface IMediaFilter {
     CONST_VTBL IMediaFilterVtbl* lpVtbl;
 };
@@ -1734,53 +1660,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaFilter_Stop_Proxy(
-    IMediaFilter* This);
-void __RPC_STUB IMediaFilter_Stop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaFilter_Pause_Proxy(
-    IMediaFilter* This);
-void __RPC_STUB IMediaFilter_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaFilter_Run_Proxy(
-    IMediaFilter* This,
-    REFERENCE_TIME tStart);
-void __RPC_STUB IMediaFilter_Run_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaFilter_GetState_Proxy(
-    IMediaFilter* This,
-    DWORD dwMilliSecsTimeout,
-    FILTER_STATE *State);
-void __RPC_STUB IMediaFilter_GetState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaFilter_SetSyncSource_Proxy(
-    IMediaFilter* This,
-    IReferenceClock *pClock);
-void __RPC_STUB IMediaFilter_SetSyncSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaFilter_GetSyncSource_Proxy(
-    IMediaFilter* This,
-    IReferenceClock **pClock);
-void __RPC_STUB IMediaFilter_GetSyncSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaFilter_INTERFACE_DEFINED__ */
 
@@ -1829,70 +1708,71 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBaseFilter* This);
+        IBaseFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBaseFilter* This);
+        IBaseFilter *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         CLSID *pClassID);
 
     /*** IMediaFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IBaseFilter* This);
+        IBaseFilter *This);
 
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        IBaseFilter* This);
+        IBaseFilter *This);
 
     HRESULT (STDMETHODCALLTYPE *Run)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         REFERENCE_TIME tStart);
 
     HRESULT (STDMETHODCALLTYPE *GetState)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         DWORD dwMilliSecsTimeout,
         FILTER_STATE *State);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncSource)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         IReferenceClock *pClock);
 
     HRESULT (STDMETHODCALLTYPE *GetSyncSource)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         IReferenceClock **pClock);
 
     /*** IBaseFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumPins)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         IEnumPins **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *FindPin)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         LPCWSTR Id,
         IPin **ppPin);
 
     HRESULT (STDMETHODCALLTYPE *QueryFilterInfo)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         FILTER_INFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *JoinFilterGraph)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         IFilterGraph *pGraph,
         LPCWSTR pName);
 
     HRESULT (STDMETHODCALLTYPE *QueryVendorInfo)(
-        IBaseFilter* This,
+        IBaseFilter *This,
         LPWSTR *pVendorInfo);
 
     END_INTERFACE
 } IBaseFilterVtbl;
+
 interface IBaseFilter {
     CONST_VTBL IBaseFilterVtbl* lpVtbl;
 };
@@ -1973,48 +1853,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBaseFilter_EnumPins_Proxy(
-    IBaseFilter* This,
-    IEnumPins **ppEnum);
-void __RPC_STUB IBaseFilter_EnumPins_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBaseFilter_FindPin_Proxy(
-    IBaseFilter* This,
-    LPCWSTR Id,
-    IPin **ppPin);
-void __RPC_STUB IBaseFilter_FindPin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBaseFilter_QueryFilterInfo_Proxy(
-    IBaseFilter* This,
-    FILTER_INFO *pInfo);
-void __RPC_STUB IBaseFilter_QueryFilterInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBaseFilter_JoinFilterGraph_Proxy(
-    IBaseFilter* This,
-    IFilterGraph *pGraph,
-    LPCWSTR pName);
-void __RPC_STUB IBaseFilter_JoinFilterGraph_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBaseFilter_QueryVendorInfo_Proxy(
-    IBaseFilter* This,
-    LPWSTR *pVendorInfo);
-void __RPC_STUB IBaseFilter_QueryVendorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IBaseFilter_INTERFACE_DEFINED__ */
 
@@ -2059,41 +1897,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IReferenceClock* This,
+        IReferenceClock *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IReferenceClock* This);
+        IReferenceClock *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IReferenceClock* This);
+        IReferenceClock *This);
 
     /*** IReferenceClock methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTime)(
-        IReferenceClock* This,
+        IReferenceClock *This,
         REFERENCE_TIME *pTime);
 
     HRESULT (STDMETHODCALLTYPE *AdviseTime)(
-        IReferenceClock* This,
+        IReferenceClock *This,
         REFERENCE_TIME baseTime,
         REFERENCE_TIME streamTime,
         HEVENT hEvent,
         DWORD_PTR *pdwAdviseCookie);
 
     HRESULT (STDMETHODCALLTYPE *AdvisePeriodic)(
-        IReferenceClock* This,
+        IReferenceClock *This,
         REFERENCE_TIME startTime,
         REFERENCE_TIME periodTime,
         HSEMAPHORE hSemaphore,
         DWORD_PTR *pdwAdviseCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IReferenceClock* This,
+        IReferenceClock *This,
         DWORD_PTR dwAdviseCookie);
 
     END_INTERFACE
 } IReferenceClockVtbl;
+
 interface IReferenceClock {
     CONST_VTBL IReferenceClockVtbl* lpVtbl;
 };
@@ -2138,44 +1977,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IReferenceClock_GetTime_Proxy(
-    IReferenceClock* This,
-    REFERENCE_TIME *pTime);
-void __RPC_STUB IReferenceClock_GetTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IReferenceClock_AdviseTime_Proxy(
-    IReferenceClock* This,
-    REFERENCE_TIME baseTime,
-    REFERENCE_TIME streamTime,
-    HEVENT hEvent,
-    DWORD_PTR *pdwAdviseCookie);
-void __RPC_STUB IReferenceClock_AdviseTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IReferenceClock_AdvisePeriodic_Proxy(
-    IReferenceClock* This,
-    REFERENCE_TIME startTime,
-    REFERENCE_TIME periodTime,
-    HSEMAPHORE hSemaphore,
-    DWORD_PTR *pdwAdviseCookie);
-void __RPC_STUB IReferenceClock_AdvisePeriodic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IReferenceClock_Unadvise_Proxy(
-    IReferenceClock* This,
-    DWORD_PTR dwAdviseCookie);
-void __RPC_STUB IReferenceClock_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IReferenceClock_INTERFACE_DEFINED__ */
 
@@ -2208,27 +2009,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IReferenceClockTimerControl* This,
+        IReferenceClockTimerControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IReferenceClockTimerControl* This);
+        IReferenceClockTimerControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IReferenceClockTimerControl* This);
+        IReferenceClockTimerControl *This);
 
     /*** IReferenceClockTimerControl methods ***/
     HRESULT (STDMETHODCALLTYPE *SetDefaultTimerResolution)(
-        IReferenceClockTimerControl* This,
+        IReferenceClockTimerControl *This,
         REFERENCE_TIME timerResolution);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultTimerResolution)(
-        IReferenceClockTimerControl* This,
+        IReferenceClockTimerControl *This,
         REFERENCE_TIME *pTimerResolution);
 
     END_INTERFACE
 } IReferenceClockTimerControlVtbl;
+
 interface IReferenceClockTimerControl {
     CONST_VTBL IReferenceClockTimerControlVtbl* lpVtbl;
 };
@@ -2265,22 +2067,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IReferenceClockTimerControl_SetDefaultTimerResolution_Proxy(
-    IReferenceClockTimerControl* This,
-    REFERENCE_TIME timerResolution);
-void __RPC_STUB IReferenceClockTimerControl_SetDefaultTimerResolution_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IReferenceClockTimerControl_GetDefaultTimerResolution_Proxy(
-    IReferenceClockTimerControl* This,
-    REFERENCE_TIME *pTimerResolution);
-void __RPC_STUB IReferenceClockTimerControl_GetDefaultTimerResolution_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IReferenceClockTimerControl_INTERFACE_DEFINED__ */
 
@@ -2306,41 +2092,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IReferenceClock2* This,
+        IReferenceClock2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IReferenceClock2* This);
+        IReferenceClock2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IReferenceClock2* This);
+        IReferenceClock2 *This);
 
     /*** IReferenceClock methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTime)(
-        IReferenceClock2* This,
+        IReferenceClock2 *This,
         REFERENCE_TIME *pTime);
 
     HRESULT (STDMETHODCALLTYPE *AdviseTime)(
-        IReferenceClock2* This,
+        IReferenceClock2 *This,
         REFERENCE_TIME baseTime,
         REFERENCE_TIME streamTime,
         HEVENT hEvent,
         DWORD_PTR *pdwAdviseCookie);
 
     HRESULT (STDMETHODCALLTYPE *AdvisePeriodic)(
-        IReferenceClock2* This,
+        IReferenceClock2 *This,
         REFERENCE_TIME startTime,
         REFERENCE_TIME periodTime,
         HSEMAPHORE hSemaphore,
         DWORD_PTR *pdwAdviseCookie);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IReferenceClock2* This,
+        IReferenceClock2 *This,
         DWORD_PTR dwAdviseCookie);
 
     END_INTERFACE
 } IReferenceClock2Vtbl;
+
 interface IReferenceClock2 {
     CONST_VTBL IReferenceClock2Vtbl* lpVtbl;
 };
@@ -2463,82 +2250,83 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaSample* This,
+        IMediaSample *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaSample* This);
+        IMediaSample *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaSample* This);
+        IMediaSample *This);
 
     /*** IMediaSample methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPointer)(
-        IMediaSample* This,
+        IMediaSample *This,
         BYTE **ppBuffer);
 
     LONG (STDMETHODCALLTYPE *GetSize)(
-        IMediaSample* This);
+        IMediaSample *This);
 
     HRESULT (STDMETHODCALLTYPE *GetTime)(
-        IMediaSample* This,
+        IMediaSample *This,
         REFERENCE_TIME *pTimeStart,
         REFERENCE_TIME *pTimeEnd);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IMediaSample* This,
+        IMediaSample *This,
         REFERENCE_TIME *pTimeStart,
         REFERENCE_TIME *pTimeEnd);
 
     HRESULT (STDMETHODCALLTYPE *IsSyncPoint)(
-        IMediaSample* This);
+        IMediaSample *This);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncPoint)(
-        IMediaSample* This,
+        IMediaSample *This,
         WINBOOL bIsSyncPoint);
 
     HRESULT (STDMETHODCALLTYPE *IsPreroll)(
-        IMediaSample* This);
+        IMediaSample *This);
 
     HRESULT (STDMETHODCALLTYPE *SetPreroll)(
-        IMediaSample* This,
+        IMediaSample *This,
         WINBOOL bIsPreroll);
 
     LONG (STDMETHODCALLTYPE *GetActualDataLength)(
-        IMediaSample* This);
+        IMediaSample *This);
 
     HRESULT (STDMETHODCALLTYPE *SetActualDataLength)(
-        IMediaSample* This,
+        IMediaSample *This,
         LONG a);
 
     HRESULT (STDMETHODCALLTYPE *GetMediaType)(
-        IMediaSample* This,
+        IMediaSample *This,
         AM_MEDIA_TYPE **ppMediaType);
 
     HRESULT (STDMETHODCALLTYPE *SetMediaType)(
-        IMediaSample* This,
+        IMediaSample *This,
         AM_MEDIA_TYPE *pMediaType);
 
     HRESULT (STDMETHODCALLTYPE *IsDiscontinuity)(
-        IMediaSample* This);
+        IMediaSample *This);
 
     HRESULT (STDMETHODCALLTYPE *SetDiscontinuity)(
-        IMediaSample* This,
+        IMediaSample *This,
         WINBOOL bDiscontinuity);
 
     HRESULT (STDMETHODCALLTYPE *GetMediaTime)(
-        IMediaSample* This,
+        IMediaSample *This,
         LONGLONG *pTimeStart,
         LONGLONG *pTimeEnd);
 
     HRESULT (STDMETHODCALLTYPE *SetMediaTime)(
-        IMediaSample* This,
+        IMediaSample *This,
         LONGLONG *pTimeStart,
         LONGLONG *pTimeEnd);
 
     END_INTERFACE
 } IMediaSampleVtbl;
+
 interface IMediaSample {
     CONST_VTBL IMediaSampleVtbl* lpVtbl;
 };
@@ -2631,133 +2419,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaSample_GetPointer_Proxy(
-    IMediaSample* This,
-    BYTE **ppBuffer);
-void __RPC_STUB IMediaSample_GetPointer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-LONG STDMETHODCALLTYPE IMediaSample_GetSize_Proxy(
-    IMediaSample* This);
-void __RPC_STUB IMediaSample_GetSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_GetTime_Proxy(
-    IMediaSample* This,
-    REFERENCE_TIME *pTimeStart,
-    REFERENCE_TIME *pTimeEnd);
-void __RPC_STUB IMediaSample_GetTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_SetTime_Proxy(
-    IMediaSample* This,
-    REFERENCE_TIME *pTimeStart,
-    REFERENCE_TIME *pTimeEnd);
-void __RPC_STUB IMediaSample_SetTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_IsSyncPoint_Proxy(
-    IMediaSample* This);
-void __RPC_STUB IMediaSample_IsSyncPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_SetSyncPoint_Proxy(
-    IMediaSample* This,
-    WINBOOL bIsSyncPoint);
-void __RPC_STUB IMediaSample_SetSyncPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_IsPreroll_Proxy(
-    IMediaSample* This);
-void __RPC_STUB IMediaSample_IsPreroll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_SetPreroll_Proxy(
-    IMediaSample* This,
-    WINBOOL bIsPreroll);
-void __RPC_STUB IMediaSample_SetPreroll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-LONG STDMETHODCALLTYPE IMediaSample_GetActualDataLength_Proxy(
-    IMediaSample* This);
-void __RPC_STUB IMediaSample_GetActualDataLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_SetActualDataLength_Proxy(
-    IMediaSample* This,
-    LONG a);
-void __RPC_STUB IMediaSample_SetActualDataLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_GetMediaType_Proxy(
-    IMediaSample* This,
-    AM_MEDIA_TYPE **ppMediaType);
-void __RPC_STUB IMediaSample_GetMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_SetMediaType_Proxy(
-    IMediaSample* This,
-    AM_MEDIA_TYPE *pMediaType);
-void __RPC_STUB IMediaSample_SetMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_IsDiscontinuity_Proxy(
-    IMediaSample* This);
-void __RPC_STUB IMediaSample_IsDiscontinuity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_SetDiscontinuity_Proxy(
-    IMediaSample* This,
-    WINBOOL bDiscontinuity);
-void __RPC_STUB IMediaSample_SetDiscontinuity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_GetMediaTime_Proxy(
-    IMediaSample* This,
-    LONGLONG *pTimeStart,
-    LONGLONG *pTimeEnd);
-void __RPC_STUB IMediaSample_GetMediaTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample_SetMediaTime_Proxy(
-    IMediaSample* This,
-    LONGLONG *pTimeStart,
-    LONGLONG *pTimeEnd);
-void __RPC_STUB IMediaSample_SetMediaTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaSample_INTERFACE_DEFINED__ */
 
@@ -2777,7 +2438,6 @@
     AM_STREAM_CONTROL = 1
 };
 
-
 typedef struct tagAM_SAMPLE2_PROPERTIES {
     DWORD cbData;
     DWORD dwTypeSpecificFlags;
@@ -2820,93 +2480,94 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaSample2* This);
+        IMediaSample2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaSample2* This);
+        IMediaSample2 *This);
 
     /*** IMediaSample methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPointer)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         BYTE **ppBuffer);
 
     LONG (STDMETHODCALLTYPE *GetSize)(
-        IMediaSample2* This);
+        IMediaSample2 *This);
 
     HRESULT (STDMETHODCALLTYPE *GetTime)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         REFERENCE_TIME *pTimeStart,
         REFERENCE_TIME *pTimeEnd);
 
     HRESULT (STDMETHODCALLTYPE *SetTime)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         REFERENCE_TIME *pTimeStart,
         REFERENCE_TIME *pTimeEnd);
 
     HRESULT (STDMETHODCALLTYPE *IsSyncPoint)(
-        IMediaSample2* This);
+        IMediaSample2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncPoint)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         WINBOOL bIsSyncPoint);
 
     HRESULT (STDMETHODCALLTYPE *IsPreroll)(
-        IMediaSample2* This);
+        IMediaSample2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetPreroll)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         WINBOOL bIsPreroll);
 
     LONG (STDMETHODCALLTYPE *GetActualDataLength)(
-        IMediaSample2* This);
+        IMediaSample2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetActualDataLength)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         LONG a);
 
     HRESULT (STDMETHODCALLTYPE *GetMediaType)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         AM_MEDIA_TYPE **ppMediaType);
 
     HRESULT (STDMETHODCALLTYPE *SetMediaType)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         AM_MEDIA_TYPE *pMediaType);
 
     HRESULT (STDMETHODCALLTYPE *IsDiscontinuity)(
-        IMediaSample2* This);
+        IMediaSample2 *This);
 
     HRESULT (STDMETHODCALLTYPE *SetDiscontinuity)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         WINBOOL bDiscontinuity);
 
     HRESULT (STDMETHODCALLTYPE *GetMediaTime)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         LONGLONG *pTimeStart,
         LONGLONG *pTimeEnd);
 
     HRESULT (STDMETHODCALLTYPE *SetMediaTime)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         LONGLONG *pTimeStart,
         LONGLONG *pTimeEnd);
 
     /*** IMediaSample2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         DWORD cbProperties,
         BYTE *pbProperties);
 
     HRESULT (STDMETHODCALLTYPE *SetProperties)(
-        IMediaSample2* This,
+        IMediaSample2 *This,
         DWORD cbProperties,
         const BYTE *pbProperties);
 
     END_INTERFACE
 } IMediaSample2Vtbl;
+
 interface IMediaSample2 {
     CONST_VTBL IMediaSample2Vtbl* lpVtbl;
 };
@@ -3009,24 +2670,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaSample2_GetProperties_Proxy(
-    IMediaSample2* This,
-    DWORD cbProperties,
-    BYTE *pbProperties);
-void __RPC_STUB IMediaSample2_GetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSample2_SetProperties_Proxy(
-    IMediaSample2* This,
-    DWORD cbProperties,
-    const BYTE *pbProperties);
-void __RPC_STUB IMediaSample2_SetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaSample2_INTERFACE_DEFINED__ */
 
@@ -3056,23 +2699,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaSample2Config* This,
+        IMediaSample2Config *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaSample2Config* This);
+        IMediaSample2Config *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaSample2Config* This);
+        IMediaSample2Config *This);
 
     /*** IMediaSample2Config methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSurface)(
-        IMediaSample2Config* This,
+        IMediaSample2Config *This,
         IUnknown **ppDirect3DSurface9);
 
     END_INTERFACE
 } IMediaSample2ConfigVtbl;
+
 interface IMediaSample2Config {
     CONST_VTBL IMediaSample2ConfigVtbl* lpVtbl;
 };
@@ -3105,14 +2749,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaSample2Config_GetSurface_Proxy(
-    IMediaSample2Config* This,
-    IUnknown **ppDirect3DSurface9);
-void __RPC_STUB IMediaSample2Config_GetSurface_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaSample2Config_INTERFACE_DEFINED__ */
 
@@ -3165,45 +2801,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMemAllocator* This,
+        IMemAllocator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMemAllocator* This);
+        IMemAllocator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMemAllocator* This);
+        IMemAllocator *This);
 
     /*** IMemAllocator methods ***/
     HRESULT (STDMETHODCALLTYPE *SetProperties)(
-        IMemAllocator* This,
+        IMemAllocator *This,
         ALLOCATOR_PROPERTIES *pRequest,
         ALLOCATOR_PROPERTIES *pActual);
 
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        IMemAllocator* This,
+        IMemAllocator *This,
         ALLOCATOR_PROPERTIES *pProps);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IMemAllocator* This);
+        IMemAllocator *This);
 
     HRESULT (STDMETHODCALLTYPE *Decommit)(
-        IMemAllocator* This);
+        IMemAllocator *This);
 
     HRESULT (STDMETHODCALLTYPE *GetBuffer)(
-        IMemAllocator* This,
+        IMemAllocator *This,
         IMediaSample **ppBuffer,
         REFERENCE_TIME *pStartTime,
         REFERENCE_TIME *pEndTime,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)(
-        IMemAllocator* This,
+        IMemAllocator *This,
         IMediaSample *pBuffer);
 
     END_INTERFACE
 } IMemAllocatorVtbl;
+
 interface IMemAllocator {
     CONST_VTBL IMemAllocatorVtbl* lpVtbl;
 };
@@ -3256,56 +2893,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMemAllocator_SetProperties_Proxy(
-    IMemAllocator* This,
-    ALLOCATOR_PROPERTIES *pRequest,
-    ALLOCATOR_PROPERTIES *pActual);
-void __RPC_STUB IMemAllocator_SetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemAllocator_GetProperties_Proxy(
-    IMemAllocator* This,
-    ALLOCATOR_PROPERTIES *pProps);
-void __RPC_STUB IMemAllocator_GetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemAllocator_Commit_Proxy(
-    IMemAllocator* This);
-void __RPC_STUB IMemAllocator_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemAllocator_Decommit_Proxy(
-    IMemAllocator* This);
-void __RPC_STUB IMemAllocator_Decommit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemAllocator_GetBuffer_Proxy(
-    IMemAllocator* This,
-    IMediaSample **ppBuffer,
-    REFERENCE_TIME *pStartTime,
-    REFERENCE_TIME *pEndTime,
-    DWORD dwFlags);
-void __RPC_STUB IMemAllocator_GetBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemAllocator_ReleaseBuffer_Proxy(
-    IMemAllocator* This,
-    IMediaSample *pBuffer);
-void __RPC_STUB IMemAllocator_ReleaseBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMemAllocator_INTERFACE_DEFINED__ */
 
@@ -3338,54 +2925,55 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMemAllocatorCallbackTemp* This,
+        IMemAllocatorCallbackTemp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMemAllocatorCallbackTemp* This);
+        IMemAllocatorCallbackTemp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMemAllocatorCallbackTemp* This);
+        IMemAllocatorCallbackTemp *This);
 
     /*** IMemAllocator methods ***/
     HRESULT (STDMETHODCALLTYPE *SetProperties)(
-        IMemAllocatorCallbackTemp* This,
+        IMemAllocatorCallbackTemp *This,
         ALLOCATOR_PROPERTIES *pRequest,
         ALLOCATOR_PROPERTIES *pActual);
 
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        IMemAllocatorCallbackTemp* This,
+        IMemAllocatorCallbackTemp *This,
         ALLOCATOR_PROPERTIES *pProps);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IMemAllocatorCallbackTemp* This);
+        IMemAllocatorCallbackTemp *This);
 
     HRESULT (STDMETHODCALLTYPE *Decommit)(
-        IMemAllocatorCallbackTemp* This);
+        IMemAllocatorCallbackTemp *This);
 
     HRESULT (STDMETHODCALLTYPE *GetBuffer)(
-        IMemAllocatorCallbackTemp* This,
+        IMemAllocatorCallbackTemp *This,
         IMediaSample **ppBuffer,
         REFERENCE_TIME *pStartTime,
         REFERENCE_TIME *pEndTime,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseBuffer)(
-        IMemAllocatorCallbackTemp* This,
+        IMemAllocatorCallbackTemp *This,
         IMediaSample *pBuffer);
 
     /*** IMemAllocatorCallbackTemp methods ***/
     HRESULT (STDMETHODCALLTYPE *SetNotify)(
-        IMemAllocatorCallbackTemp* This,
+        IMemAllocatorCallbackTemp *This,
         IMemAllocatorNotifyCallbackTemp *pNotify);
 
     HRESULT (STDMETHODCALLTYPE *GetFreeCount)(
-        IMemAllocatorCallbackTemp* This,
+        IMemAllocatorCallbackTemp *This,
         LONG *plBuffersFree);
 
     END_INTERFACE
 } IMemAllocatorCallbackTempVtbl;
+
 interface IMemAllocatorCallbackTemp {
     CONST_VTBL IMemAllocatorCallbackTempVtbl* lpVtbl;
 };
@@ -3448,22 +3036,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMemAllocatorCallbackTemp_SetNotify_Proxy(
-    IMemAllocatorCallbackTemp* This,
-    IMemAllocatorNotifyCallbackTemp *pNotify);
-void __RPC_STUB IMemAllocatorCallbackTemp_SetNotify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemAllocatorCallbackTemp_GetFreeCount_Proxy(
-    IMemAllocatorCallbackTemp* This,
-    LONG *plBuffersFree);
-void __RPC_STUB IMemAllocatorCallbackTemp_GetFreeCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMemAllocatorCallbackTemp_INTERFACE_DEFINED__ */
 
@@ -3492,22 +3064,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMemAllocatorNotifyCallbackTemp* This,
+        IMemAllocatorNotifyCallbackTemp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMemAllocatorNotifyCallbackTemp* This);
+        IMemAllocatorNotifyCallbackTemp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMemAllocatorNotifyCallbackTemp* This);
+        IMemAllocatorNotifyCallbackTemp *This);
 
     /*** IMemAllocatorNotifyCallbackTemp methods ***/
     HRESULT (STDMETHODCALLTYPE *NotifyRelease)(
-        IMemAllocatorNotifyCallbackTemp* This);
+        IMemAllocatorNotifyCallbackTemp *This);
 
     END_INTERFACE
 } IMemAllocatorNotifyCallbackTempVtbl;
+
 interface IMemAllocatorNotifyCallbackTemp {
     CONST_VTBL IMemAllocatorNotifyCallbackTempVtbl* lpVtbl;
 };
@@ -3540,13 +3113,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMemAllocatorNotifyCallbackTemp_NotifyRelease_Proxy(
-    IMemAllocatorNotifyCallbackTemp* This);
-void __RPC_STUB IMemAllocatorNotifyCallbackTemp_NotifyRelease_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMemAllocatorNotifyCallbackTemp_INTERFACE_DEFINED__ */
 
@@ -3593,45 +3159,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMemInputPin* This,
+        IMemInputPin *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMemInputPin* This);
+        IMemInputPin *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMemInputPin* This);
+        IMemInputPin *This);
 
     /*** IMemInputPin methods ***/
     HRESULT (STDMETHODCALLTYPE *GetAllocator)(
-        IMemInputPin* This,
+        IMemInputPin *This,
         IMemAllocator **ppAllocator);
 
     HRESULT (STDMETHODCALLTYPE *NotifyAllocator)(
-        IMemInputPin* This,
+        IMemInputPin *This,
         IMemAllocator *pAllocator,
         WINBOOL bReadOnly);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatorRequirements)(
-        IMemInputPin* This,
+        IMemInputPin *This,
         ALLOCATOR_PROPERTIES *pProps);
 
     HRESULT (STDMETHODCALLTYPE *Receive)(
-        IMemInputPin* This,
+        IMemInputPin *This,
         IMediaSample *pSample);
 
     HRESULT (STDMETHODCALLTYPE *ReceiveMultiple)(
-        IMemInputPin* This,
+        IMemInputPin *This,
         IMediaSample **pSamples,
         LONG nSamples,
         LONG *nSamplesProcessed);
 
     HRESULT (STDMETHODCALLTYPE *ReceiveCanBlock)(
-        IMemInputPin* This);
+        IMemInputPin *This);
 
     END_INTERFACE
 } IMemInputPinVtbl;
+
 interface IMemInputPin {
     CONST_VTBL IMemInputPinVtbl* lpVtbl;
 };
@@ -3684,56 +3251,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMemInputPin_GetAllocator_Proxy(
-    IMemInputPin* This,
-    IMemAllocator **ppAllocator);
-void __RPC_STUB IMemInputPin_GetAllocator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemInputPin_NotifyAllocator_Proxy(
-    IMemInputPin* This,
-    IMemAllocator *pAllocator,
-    WINBOOL bReadOnly);
-void __RPC_STUB IMemInputPin_NotifyAllocator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemInputPin_GetAllocatorRequirements_Proxy(
-    IMemInputPin* This,
-    ALLOCATOR_PROPERTIES *pProps);
-void __RPC_STUB IMemInputPin_GetAllocatorRequirements_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemInputPin_Receive_Proxy(
-    IMemInputPin* This,
-    IMediaSample *pSample);
-void __RPC_STUB IMemInputPin_Receive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemInputPin_ReceiveMultiple_Proxy(
-    IMemInputPin* This,
-    IMediaSample **pSamples,
-    LONG nSamples,
-    LONG *nSamplesProcessed);
-void __RPC_STUB IMemInputPin_ReceiveMultiple_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMemInputPin_ReceiveCanBlock_Proxy(
-    IMemInputPin* This);
-void __RPC_STUB IMemInputPin_ReceiveCanBlock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMemInputPin_INTERFACE_DEFINED__ */
 
@@ -3766,25 +3283,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMovieSetup* This,
+        IAMovieSetup *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMovieSetup* This);
+        IAMovieSetup *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMovieSetup* This);
+        IAMovieSetup *This);
 
     /*** IAMovieSetup methods ***/
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IAMovieSetup* This);
+        IAMovieSetup *This);
 
     HRESULT (STDMETHODCALLTYPE *Unregister)(
-        IAMovieSetup* This);
+        IAMovieSetup *This);
 
     END_INTERFACE
 } IAMovieSetupVtbl;
+
 interface IAMovieSetup {
     CONST_VTBL IAMovieSetupVtbl* lpVtbl;
 };
@@ -3821,20 +3339,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMovieSetup_Register_Proxy(
-    IAMovieSetup* This);
-void __RPC_STUB IAMovieSetup_Register_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMovieSetup_Unregister_Proxy(
-    IAMovieSetup* This);
-void __RPC_STUB IAMovieSetup_Unregister_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMovieSetup_INTERFACE_DEFINED__ */
 
@@ -3944,95 +3448,96 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaSeeking* This);
+        IMediaSeeking *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaSeeking* This);
+        IMediaSeeking *This);
 
     /*** IMediaSeeking methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCapabilities)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         DWORD *pCapabilities);
 
     HRESULT (STDMETHODCALLTYPE *CheckCapabilities)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         DWORD *pCapabilities);
 
     HRESULT (STDMETHODCALLTYPE *IsFormatSupported)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         const GUID *pFormat);
 
     HRESULT (STDMETHODCALLTYPE *QueryPreferredFormat)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         GUID *pFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetTimeFormat)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         GUID *pFormat);
 
     HRESULT (STDMETHODCALLTYPE *IsUsingTimeFormat)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         const GUID *pFormat);
 
     HRESULT (STDMETHODCALLTYPE *SetTimeFormat)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         const GUID *pFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetDuration)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pDuration);
 
     HRESULT (STDMETHODCALLTYPE *GetStopPosition)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pStop);
 
     HRESULT (STDMETHODCALLTYPE *GetCurrentPosition)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pCurrent);
 
     HRESULT (STDMETHODCALLTYPE *ConvertTimeFormat)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pTarget,
         const GUID *pTargetFormat,
         LONGLONG Source,
         const GUID *pSourceFormat);
 
     HRESULT (STDMETHODCALLTYPE *SetPositions)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pCurrent,
         DWORD dwCurrentFlags,
         LONGLONG *pStop,
         DWORD dwStopFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetPositions)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pCurrent,
         LONGLONG *pStop);
 
     HRESULT (STDMETHODCALLTYPE *GetAvailable)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pEarliest,
         LONGLONG *pLatest);
 
     HRESULT (STDMETHODCALLTYPE *SetRate)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         double dRate);
 
     HRESULT (STDMETHODCALLTYPE *GetRate)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         double *pdRate);
 
     HRESULT (STDMETHODCALLTYPE *GetPreroll)(
-        IMediaSeeking* This,
+        IMediaSeeking *This,
         LONGLONG *pllPreroll);
 
     END_INTERFACE
 } IMediaSeekingVtbl;
+
 interface IMediaSeeking {
     CONST_VTBL IMediaSeekingVtbl* lpVtbl;
 };
@@ -4129,150 +3634,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetCapabilities_Proxy(
-    IMediaSeeking* This,
-    DWORD *pCapabilities);
-void __RPC_STUB IMediaSeeking_GetCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_CheckCapabilities_Proxy(
-    IMediaSeeking* This,
-    DWORD *pCapabilities);
-void __RPC_STUB IMediaSeeking_CheckCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_IsFormatSupported_Proxy(
-    IMediaSeeking* This,
-    const GUID *pFormat);
-void __RPC_STUB IMediaSeeking_IsFormatSupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_QueryPreferredFormat_Proxy(
-    IMediaSeeking* This,
-    GUID *pFormat);
-void __RPC_STUB IMediaSeeking_QueryPreferredFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetTimeFormat_Proxy(
-    IMediaSeeking* This,
-    GUID *pFormat);
-void __RPC_STUB IMediaSeeking_GetTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_IsUsingTimeFormat_Proxy(
-    IMediaSeeking* This,
-    const GUID *pFormat);
-void __RPC_STUB IMediaSeeking_IsUsingTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_SetTimeFormat_Proxy(
-    IMediaSeeking* This,
-    const GUID *pFormat);
-void __RPC_STUB IMediaSeeking_SetTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetDuration_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pDuration);
-void __RPC_STUB IMediaSeeking_GetDuration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetStopPosition_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pStop);
-void __RPC_STUB IMediaSeeking_GetStopPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetCurrentPosition_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pCurrent);
-void __RPC_STUB IMediaSeeking_GetCurrentPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_ConvertTimeFormat_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pTarget,
-    const GUID *pTargetFormat,
-    LONGLONG Source,
-    const GUID *pSourceFormat);
-void __RPC_STUB IMediaSeeking_ConvertTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_SetPositions_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pCurrent,
-    DWORD dwCurrentFlags,
-    LONGLONG *pStop,
-    DWORD dwStopFlags);
-void __RPC_STUB IMediaSeeking_SetPositions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetPositions_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pCurrent,
-    LONGLONG *pStop);
-void __RPC_STUB IMediaSeeking_GetPositions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetAvailable_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pEarliest,
-    LONGLONG *pLatest);
-void __RPC_STUB IMediaSeeking_GetAvailable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_SetRate_Proxy(
-    IMediaSeeking* This,
-    double dRate);
-void __RPC_STUB IMediaSeeking_SetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetRate_Proxy(
-    IMediaSeeking* This,
-    double *pdRate);
-void __RPC_STUB IMediaSeeking_GetRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMediaSeeking_GetPreroll_Proxy(
-    IMediaSeeking* This,
-    LONGLONG *pllPreroll);
-void __RPC_STUB IMediaSeeking_GetPreroll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaSeeking_INTERFACE_DEFINED__ */
 
@@ -4286,276 +3647,441 @@
 #ifndef __IAMAnalogVideoDecoder_FWD_DEFINED__
 #define __IAMAnalogVideoDecoder_FWD_DEFINED__
 typedef interface IAMAnalogVideoDecoder IAMAnalogVideoDecoder;
+#ifdef __cplusplus
+interface IAMAnalogVideoDecoder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMAnalogVideoEncoder_FWD_DEFINED__
 #define __IAMAnalogVideoEncoder_FWD_DEFINED__
 typedef interface IAMAnalogVideoEncoder IAMAnalogVideoEncoder;
+#ifdef __cplusplus
+interface IAMAnalogVideoEncoder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMAudioInputMixer_FWD_DEFINED__
 #define __IAMAudioInputMixer_FWD_DEFINED__
 typedef interface IAMAudioInputMixer IAMAudioInputMixer;
+#ifdef __cplusplus
+interface IAMAudioInputMixer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMAudioRendererStats_FWD_DEFINED__
 #define __IAMAudioRendererStats_FWD_DEFINED__
 typedef interface IAMAudioRendererStats IAMAudioRendererStats;
+#ifdef __cplusplus
+interface IAMAudioRendererStats;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMBufferNegotiation_FWD_DEFINED__
 #define __IAMBufferNegotiation_FWD_DEFINED__
 typedef interface IAMBufferNegotiation IAMBufferNegotiation;
+#ifdef __cplusplus
+interface IAMBufferNegotiation;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMCameraControl_FWD_DEFINED__
 #define __IAMCameraControl_FWD_DEFINED__
 typedef interface IAMCameraControl IAMCameraControl;
+#ifdef __cplusplus
+interface IAMCameraControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMCertifiedOutputProtection_FWD_DEFINED__
 #define __IAMCertifiedOutputProtection_FWD_DEFINED__
 typedef interface IAMCertifiedOutputProtection IAMCertifiedOutputProtection;
+#ifdef __cplusplus
+interface IAMCertifiedOutputProtection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMClockSlave_FWD_DEFINED__
 #define __IAMClockSlave_FWD_DEFINED__
 typedef interface IAMClockSlave IAMClockSlave;
+#ifdef __cplusplus
+interface IAMClockSlave;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMCopyCaptureFileProgress_FWD_DEFINED__
 #define __IAMCopyCaptureFileProgress_FWD_DEFINED__
 typedef interface IAMCopyCaptureFileProgress IAMCopyCaptureFileProgress;
+#ifdef __cplusplus
+interface IAMCopyCaptureFileProgress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMCrossbar_FWD_DEFINED__
 #define __IAMCrossbar_FWD_DEFINED__
 typedef interface IAMCrossbar IAMCrossbar;
+#ifdef __cplusplus
+interface IAMCrossbar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMDevMemoryAllocator_FWD_DEFINED__
 #define __IAMDevMemoryAllocator_FWD_DEFINED__
 typedef interface IAMDevMemoryAllocator IAMDevMemoryAllocator;
+#ifdef __cplusplus
+interface IAMDevMemoryAllocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMDevMemoryControl_FWD_DEFINED__
 #define __IAMDevMemoryControl_FWD_DEFINED__
 typedef interface IAMDevMemoryControl IAMDevMemoryControl;
+#ifdef __cplusplus
+interface IAMDevMemoryControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMDroppedFrames_FWD_DEFINED__
 #define __IAMDroppedFrames_FWD_DEFINED__
 typedef interface IAMDroppedFrames IAMDroppedFrames;
+#ifdef __cplusplus
+interface IAMDroppedFrames;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMExtDevice_FWD_DEFINED__
 #define __IAMExtDevice_FWD_DEFINED__
 typedef interface IAMExtDevice IAMExtDevice;
+#ifdef __cplusplus
+interface IAMExtDevice;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMExtTransport_FWD_DEFINED__
 #define __IAMExtTransport_FWD_DEFINED__
 typedef interface IAMExtTransport IAMExtTransport;
+#ifdef __cplusplus
+interface IAMExtTransport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMGraphStreams_FWD_DEFINED__
 #define __IAMGraphStreams_FWD_DEFINED__
 typedef interface IAMGraphStreams IAMGraphStreams;
+#ifdef __cplusplus
+interface IAMGraphStreams;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMLatency_FWD_DEFINED__
 #define __IAMLatency_FWD_DEFINED__
 typedef interface IAMLatency IAMLatency;
+#ifdef __cplusplus
+interface IAMLatency;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMOpenProgress_FWD_DEFINED__
 #define __IAMOpenProgress_FWD_DEFINED__
 typedef interface IAMOpenProgress IAMOpenProgress;
+#ifdef __cplusplus
+interface IAMOpenProgress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMOverlayFX_FWD_DEFINED__
 #define __IAMOverlayFX_FWD_DEFINED__
 typedef interface IAMOverlayFX IAMOverlayFX;
+#ifdef __cplusplus
+interface IAMOverlayFX;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMPhysicalPinInfo_FWD_DEFINED__
 #define __IAMPhysicalPinInfo_FWD_DEFINED__
 typedef interface IAMPhysicalPinInfo IAMPhysicalPinInfo;
+#ifdef __cplusplus
+interface IAMPhysicalPinInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMPushSource_FWD_DEFINED__
 #define __IAMPushSource_FWD_DEFINED__
 typedef interface IAMPushSource IAMPushSource;
+#ifdef __cplusplus
+interface IAMPushSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMStreamConfig_FWD_DEFINED__
 #define __IAMStreamConfig_FWD_DEFINED__
 typedef interface IAMStreamConfig IAMStreamConfig;
+#ifdef __cplusplus
+interface IAMStreamConfig;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMTimecodeDisplay_FWD_DEFINED__
 #define __IAMTimecodeDisplay_FWD_DEFINED__
 typedef interface IAMTimecodeDisplay IAMTimecodeDisplay;
+#ifdef __cplusplus
+interface IAMTimecodeDisplay;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMTimecodeGenerator_FWD_DEFINED__
 #define __IAMTimecodeGenerator_FWD_DEFINED__
 typedef interface IAMTimecodeGenerator IAMTimecodeGenerator;
+#ifdef __cplusplus
+interface IAMTimecodeGenerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMTimecodeReader_FWD_DEFINED__
 #define __IAMTimecodeReader_FWD_DEFINED__
 typedef interface IAMTimecodeReader IAMTimecodeReader;
+#ifdef __cplusplus
+interface IAMTimecodeReader;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMTVTuner_FWD_DEFINED__
 #define __IAMTVTuner_FWD_DEFINED__
 typedef interface IAMTVTuner IAMTVTuner;
+#ifdef __cplusplus
+interface IAMTVTuner;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMVfwCaptureDialogs_FWD_DEFINED__
 #define __IAMVfwCaptureDialogs_FWD_DEFINED__
 typedef interface IAMVfwCaptureDialogs IAMVfwCaptureDialogs;
+#ifdef __cplusplus
+interface IAMVfwCaptureDialogs;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMVfwCompressDialogs_FWD_DEFINED__
 #define __IAMVfwCompressDialogs_FWD_DEFINED__
 typedef interface IAMVfwCompressDialogs IAMVfwCompressDialogs;
+#ifdef __cplusplus
+interface IAMVfwCompressDialogs;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMVideoCompression_FWD_DEFINED__
 #define __IAMVideoCompression_FWD_DEFINED__
 typedef interface IAMVideoCompression IAMVideoCompression;
+#ifdef __cplusplus
+interface IAMVideoCompression;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMVideoDecimationProperties_FWD_DEFINED__
 #define __IAMVideoDecimationProperties_FWD_DEFINED__
 typedef interface IAMVideoDecimationProperties IAMVideoDecimationProperties;
+#ifdef __cplusplus
+interface IAMVideoDecimationProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMVideoProcAmp_FWD_DEFINED__
 #define __IAMVideoProcAmp_FWD_DEFINED__
 typedef interface IAMVideoProcAmp IAMVideoProcAmp;
+#ifdef __cplusplus
+interface IAMVideoProcAmp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAMGraphBuilderCallback_FWD_DEFINED__
 #define __IAMGraphBuilderCallback_FWD_DEFINED__
 typedef interface IAMGraphBuilderCallback IAMGraphBuilderCallback;
+#ifdef __cplusplus
+interface IAMGraphBuilderCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICaptureGraphBuilder_FWD_DEFINED__
 #define __ICaptureGraphBuilder_FWD_DEFINED__
 typedef interface ICaptureGraphBuilder ICaptureGraphBuilder;
+#ifdef __cplusplus
+interface ICaptureGraphBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICaptureGraphBuilder2_FWD_DEFINED__
 #define __ICaptureGraphBuilder2_FWD_DEFINED__
 typedef interface ICaptureGraphBuilder2 ICaptureGraphBuilder2;
+#ifdef __cplusplus
+interface ICaptureGraphBuilder2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConfigAviMux_FWD_DEFINED__
 #define __IConfigAviMux_FWD_DEFINED__
 typedef interface IConfigAviMux IConfigAviMux;
+#ifdef __cplusplus
+interface IConfigAviMux;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IConfigInterleaving_FWD_DEFINED__
 #define __IConfigInterleaving_FWD_DEFINED__
 typedef interface IConfigInterleaving IConfigInterleaving;
+#ifdef __cplusplus
+interface IConfigInterleaving;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDecimateVideoImage_FWD_DEFINED__
 #define __IDecimateVideoImage_FWD_DEFINED__
 typedef interface IDecimateVideoImage IDecimateVideoImage;
+#ifdef __cplusplus
+interface IDecimateVideoImage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDrawVideoImage_FWD_DEFINED__
 #define __IDrawVideoImage_FWD_DEFINED__
 typedef interface IDrawVideoImage IDrawVideoImage;
+#ifdef __cplusplus
+interface IDrawVideoImage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumRegFilters_FWD_DEFINED__
 #define __IEnumRegFilters_FWD_DEFINED__
 typedef interface IEnumRegFilters IEnumRegFilters;
+#ifdef __cplusplus
+interface IEnumRegFilters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumStreamIdMap_FWD_DEFINED__
 #define __IEnumStreamIdMap_FWD_DEFINED__
 typedef interface IEnumStreamIdMap IEnumStreamIdMap;
+#ifdef __cplusplus
+interface IEnumStreamIdMap;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSourceFilter_FWD_DEFINED__
 #define __IFileSourceFilter_FWD_DEFINED__
 typedef interface IFileSourceFilter IFileSourceFilter;
+#ifdef __cplusplus
+interface IFileSourceFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSinkFilter_FWD_DEFINED__
 #define __IFileSinkFilter_FWD_DEFINED__
 typedef interface IFileSinkFilter IFileSinkFilter;
+#ifdef __cplusplus
+interface IFileSinkFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFileSinkFilter2_FWD_DEFINED__
 #define __IFileSinkFilter2_FWD_DEFINED__
 typedef interface IFileSinkFilter2 IFileSinkFilter2;
+#ifdef __cplusplus
+interface IFileSinkFilter2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterMapper_FWD_DEFINED__
 #define __IFilterMapper_FWD_DEFINED__
 typedef interface IFilterMapper IFilterMapper;
+#ifdef __cplusplus
+interface IFilterMapper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IFilterMapper2_FWD_DEFINED__
 #define __IFilterMapper2_FWD_DEFINED__
 typedef interface IFilterMapper2 IFilterMapper2;
+#ifdef __cplusplus
+interface IFilterMapper2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IGraphBuilder_FWD_DEFINED__
 #define __IGraphBuilder_FWD_DEFINED__
 typedef interface IGraphBuilder IGraphBuilder;
+#ifdef __cplusplus
+interface IGraphBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IKsPropertySet_FWD_DEFINED__
 #define __IKsPropertySet_FWD_DEFINED__
 typedef interface IKsPropertySet IKsPropertySet;
+#ifdef __cplusplus
+interface IKsPropertySet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMediaEventSink_FWD_DEFINED__
 #define __IMediaEventSink_FWD_DEFINED__
 typedef interface IMediaEventSink IMediaEventSink;
+#ifdef __cplusplus
+interface IMediaEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMpeg2Demultiplexer_FWD_DEFINED__
 #define __IMpeg2Demultiplexer_FWD_DEFINED__
 typedef interface IMpeg2Demultiplexer IMpeg2Demultiplexer;
+#ifdef __cplusplus
+interface IMpeg2Demultiplexer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMPEG2StreamIdMap_FWD_DEFINED__
 #define __IMPEG2StreamIdMap_FWD_DEFINED__
 typedef interface IMPEG2StreamIdMap IMPEG2StreamIdMap;
+#ifdef __cplusplus
+interface IMPEG2StreamIdMap;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOverlay_FWD_DEFINED__
 #define __IOverlay_FWD_DEFINED__
 typedef interface IOverlay IOverlay;
+#ifdef __cplusplus
+interface IOverlay;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOverlayNotify_FWD_DEFINED__
 #define __IOverlayNotify_FWD_DEFINED__
 typedef interface IOverlayNotify IOverlayNotify;
+#ifdef __cplusplus
+interface IOverlayNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IOverlayNotify2_FWD_DEFINED__
 #define __IOverlayNotify2_FWD_DEFINED__
 typedef interface IOverlayNotify2 IOverlayNotify2;
+#ifdef __cplusplus
+interface IOverlayNotify2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IQualityControl_FWD_DEFINED__
 #define __IQualityControl_FWD_DEFINED__
 typedef interface IQualityControl IQualityControl;
+#ifdef __cplusplus
+interface IQualityControl;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISeekingPassThru_FWD_DEFINED__
 #define __ISeekingPassThru_FWD_DEFINED__
 typedef interface ISeekingPassThru ISeekingPassThru;
+#ifdef __cplusplus
+interface ISeekingPassThru;
+#endif /* __cplusplus */
 #endif
 
 typedef enum tagAnalogVideoStandard {
@@ -4638,36 +4164,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumRegFilters* This,
+        IEnumRegFilters *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumRegFilters* This);
+        IEnumRegFilters *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumRegFilters* This);
+        IEnumRegFilters *This);
 
     /*** IEnumRegFilters methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumRegFilters* This,
+        IEnumRegFilters *This,
         ULONG cFilters,
         REGFILTER **apRegFilter,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumRegFilters* This,
+        IEnumRegFilters *This,
         ULONG cFilters);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumRegFilters* This);
+        IEnumRegFilters *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumRegFilters* This,
+        IEnumRegFilters *This,
         IEnumRegFilters **ppEnum);
 
     END_INTERFACE
 } IEnumRegFiltersVtbl;
+
 interface IEnumRegFilters {
     CONST_VTBL IEnumRegFiltersVtbl* lpVtbl;
 };
@@ -4712,39 +4239,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumRegFilters_Next_Proxy(
-    IEnumRegFilters* This,
-    ULONG cFilters,
-    REGFILTER **apRegFilter,
-    ULONG *pcFetched);
-void __RPC_STUB IEnumRegFilters_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegFilters_Skip_Proxy(
-    IEnumRegFilters* This,
-    ULONG cFilters);
-void __RPC_STUB IEnumRegFilters_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegFilters_Reset_Proxy(
-    IEnumRegFilters* This);
-void __RPC_STUB IEnumRegFilters_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumRegFilters_Clone_Proxy(
-    IEnumRegFilters* This,
-    IEnumRegFilters **ppEnum);
-void __RPC_STUB IEnumRegFilters_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumRegFilters_INTERFACE_DEFINED__ */
 
@@ -4763,7 +4257,6 @@
     MERIT_SW_COMPRESSOR = 0x100000,
     MERIT_HW_COMPRESSOR = 0x100050
 };
-
 DEFINE_GUID(IID_IFilterMapper, 0x56a868a3, 0x0ad4, 0x11ce, 0xb0,0x3a, 0x00,0x20,0xaf,0x0b,0xa7,0x70);
 #if defined(__cplusplus) && !defined(CINTERFACE)
 MIDL_INTERFACE("56a868a3-0ad4-11ce-b03a-0020af0ba770")
@@ -4826,31 +4319,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFilterMapper* This);
+        IFilterMapper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFilterMapper* This);
+        IFilterMapper *This);
 
     /*** IFilterMapper methods ***/
     HRESULT (STDMETHODCALLTYPE *RegisterFilter)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         CLSID clsid,
         LPCWSTR Name,
         DWORD dwMerit);
 
     HRESULT (STDMETHODCALLTYPE *RegisterFilterInstance)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         CLSID clsid,
         LPCWSTR Name,
         CLSID *MRId);
 
     HRESULT (STDMETHODCALLTYPE *RegisterPin)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         CLSID Filter,
         LPCWSTR Name,
         WINBOOL bRendered,
@@ -4861,27 +4354,27 @@
         LPCWSTR ConnectsToPin);
 
     HRESULT (STDMETHODCALLTYPE *RegisterPinType)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         CLSID clsFilter,
         LPCWSTR strName,
         CLSID clsMajorType,
         CLSID clsSubType);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterFilter)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         CLSID Filter);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterFilterInstance)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         CLSID MRId);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterPin)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         CLSID Filter,
         LPCWSTR Name);
 
     HRESULT (STDMETHODCALLTYPE *EnumMatchingFilters)(
-        IFilterMapper* This,
+        IFilterMapper *This,
         IEnumRegFilters **ppEnum,
         DWORD dwMerit,
         WINBOOL bInputNeeded,
@@ -4894,6 +4387,7 @@
 
     END_INTERFACE
 } IFilterMapperVtbl;
+
 interface IFilterMapper {
     CONST_VTBL IFilterMapperVtbl* lpVtbl;
 };
@@ -4954,93 +4448,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterFilter_Proxy(
-    IFilterMapper* This,
-    CLSID clsid,
-    LPCWSTR Name,
-    DWORD dwMerit);
-void __RPC_STUB IFilterMapper_RegisterFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterFilterInstance_Proxy(
-    IFilterMapper* This,
-    CLSID clsid,
-    LPCWSTR Name,
-    CLSID *MRId);
-void __RPC_STUB IFilterMapper_RegisterFilterInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterPin_Proxy(
-    IFilterMapper* This,
-    CLSID Filter,
-    LPCWSTR Name,
-    WINBOOL bRendered,
-    WINBOOL bOutput,
-    WINBOOL bZero,
-    WINBOOL bMany,
-    CLSID ConnectsToFilter,
-    LPCWSTR ConnectsToPin);
-void __RPC_STUB IFilterMapper_RegisterPin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper_RegisterPinType_Proxy(
-    IFilterMapper* This,
-    CLSID clsFilter,
-    LPCWSTR strName,
-    CLSID clsMajorType,
-    CLSID clsSubType);
-void __RPC_STUB IFilterMapper_RegisterPinType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper_UnregisterFilter_Proxy(
-    IFilterMapper* This,
-    CLSID Filter);
-void __RPC_STUB IFilterMapper_UnregisterFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper_UnregisterFilterInstance_Proxy(
-    IFilterMapper* This,
-    CLSID MRId);
-void __RPC_STUB IFilterMapper_UnregisterFilterInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper_UnregisterPin_Proxy(
-    IFilterMapper* This,
-    CLSID Filter,
-    LPCWSTR Name);
-void __RPC_STUB IFilterMapper_UnregisterPin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper_EnumMatchingFilters_Proxy(
-    IFilterMapper* This,
-    IEnumRegFilters **ppEnum,
-    DWORD dwMerit,
-    WINBOOL bInputNeeded,
-    CLSID clsInMaj,
-    CLSID clsInSub,
-    WINBOOL bRender,
-    WINBOOL bOututNeeded,
-    CLSID clsOutMaj,
-    CLSID clsOutSub);
-void __RPC_STUB IFilterMapper_EnumMatchingFilters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFilterMapper_INTERFACE_DEFINED__ */
 
@@ -5070,7 +4477,6 @@
     REG_PINFLAG_B_MANY = 0x4,
     REG_PINFLAG_B_OUTPUT = 0x8
 };
-
 typedef struct __WIDL_strmif_generated_name_00000006 {
     DWORD dwFlags;
     UINT cInstances;
@@ -5150,31 +4556,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFilterMapper2* This,
+        IFilterMapper2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFilterMapper2* This);
+        IFilterMapper2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFilterMapper2* This);
+        IFilterMapper2 *This);
 
     /*** IFilterMapper2 methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateCategory)(
-        IFilterMapper2* This,
+        IFilterMapper2 *This,
         REFCLSID clsidCategory,
         DWORD dwCategoryMerit,
         LPCWSTR Description);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterFilter)(
-        IFilterMapper2* This,
+        IFilterMapper2 *This,
         const CLSID *pclsidCategory,
         LPCOLESTR szInstance,
         REFCLSID Filter);
 
     HRESULT (STDMETHODCALLTYPE *RegisterFilter)(
-        IFilterMapper2* This,
+        IFilterMapper2 *This,
         REFCLSID clsidFilter,
         LPCWSTR Name,
         IMoniker **ppMoniker,
@@ -5183,7 +4589,7 @@
         const REGFILTER2 *prf2);
 
     HRESULT (STDMETHODCALLTYPE *EnumMatchingFilters)(
-        IFilterMapper2* This,
+        IFilterMapper2 *This,
         IEnumMoniker **ppEnum,
         DWORD dwFlags,
         WINBOOL bExactMatch,
@@ -5202,6 +4608,7 @@
 
     END_INTERFACE
 } IFilterMapper2Vtbl;
+
 interface IFilterMapper2 {
     CONST_VTBL IFilterMapper2Vtbl* lpVtbl;
 };
@@ -5246,61 +4653,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFilterMapper2_CreateCategory_Proxy(
-    IFilterMapper2* This,
-    REFCLSID clsidCategory,
-    DWORD dwCategoryMerit,
-    LPCWSTR Description);
-void __RPC_STUB IFilterMapper2_CreateCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper2_UnregisterFilter_Proxy(
-    IFilterMapper2* This,
-    const CLSID *pclsidCategory,
-    LPCOLESTR szInstance,
-    REFCLSID Filter);
-void __RPC_STUB IFilterMapper2_UnregisterFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper2_RegisterFilter_Proxy(
-    IFilterMapper2* This,
-    REFCLSID clsidFilter,
-    LPCWSTR Name,
-    IMoniker **ppMoniker,
-    const CLSID *pclsidCategory,
-    LPCOLESTR szInstance,
-    const REGFILTER2 *prf2);
-void __RPC_STUB IFilterMapper2_RegisterFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterMapper2_EnumMatchingFilters_Proxy(
-    IFilterMapper2* This,
-    IEnumMoniker **ppEnum,
-    DWORD dwFlags,
-    WINBOOL bExactMatch,
-    DWORD dwMerit,
-    WINBOOL bInputNeeded,
-    DWORD cInputTypes,
-    const GUID *pInputTypes,
-    const REGPINMEDIUM *pMedIn,
-    const CLSID *pPinCategoryIn,
-    WINBOOL bRender,
-    WINBOOL bOutputNeeded,
-    DWORD cOutputTypes,
-    const GUID *pOutputTypes,
-    const REGPINMEDIUM *pMedOut,
-    const CLSID *pPinCategoryOut);
-void __RPC_STUB IFilterMapper2_EnumMatchingFilters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFilterMapper2_INTERFACE_DEFINED__ */
 
@@ -5328,31 +4680,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFilterMapper3* This,
+        IFilterMapper3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFilterMapper3* This);
+        IFilterMapper3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFilterMapper3* This);
+        IFilterMapper3 *This);
 
     /*** IFilterMapper2 methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateCategory)(
-        IFilterMapper3* This,
+        IFilterMapper3 *This,
         REFCLSID clsidCategory,
         DWORD dwCategoryMerit,
         LPCWSTR Description);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterFilter)(
-        IFilterMapper3* This,
+        IFilterMapper3 *This,
         const CLSID *pclsidCategory,
         LPCOLESTR szInstance,
         REFCLSID Filter);
 
     HRESULT (STDMETHODCALLTYPE *RegisterFilter)(
-        IFilterMapper3* This,
+        IFilterMapper3 *This,
         REFCLSID clsidFilter,
         LPCWSTR Name,
         IMoniker **ppMoniker,
@@ -5361,7 +4713,7 @@
         const REGFILTER2 *prf2);
 
     HRESULT (STDMETHODCALLTYPE *EnumMatchingFilters)(
-        IFilterMapper3* This,
+        IFilterMapper3 *This,
         IEnumMoniker **ppEnum,
         DWORD dwFlags,
         WINBOOL bExactMatch,
@@ -5380,11 +4732,12 @@
 
     /*** IFilterMapper3 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetICreateDevEnum)(
-        IFilterMapper3* This,
+        IFilterMapper3 *This,
         ICreateDevEnum **ppEnum);
 
     END_INTERFACE
 } IFilterMapper3Vtbl;
+
 interface IFilterMapper3 {
     CONST_VTBL IFilterMapper3Vtbl* lpVtbl;
 };
@@ -5435,14 +4788,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFilterMapper3_GetICreateDevEnum_Proxy(
-    IFilterMapper3* This,
-    ICreateDevEnum **ppEnum);
-void __RPC_STUB IFilterMapper3_GetICreateDevEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFilterMapper3_INTERFACE_DEFINED__ */
 
@@ -5485,28 +4830,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IQualityControl* This,
+        IQualityControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IQualityControl* This);
+        IQualityControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IQualityControl* This);
+        IQualityControl *This);
 
     /*** IQualityControl methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        IQualityControl* This,
+        IQualityControl *This,
         IBaseFilter *pSelf,
         Quality q);
 
     HRESULT (STDMETHODCALLTYPE *SetSink)(
-        IQualityControl* This,
+        IQualityControl *This,
         IQualityControl *piqc);
 
     END_INTERFACE
 } IQualityControlVtbl;
+
 interface IQualityControl {
     CONST_VTBL IQualityControlVtbl* lpVtbl;
 };
@@ -5543,23 +4889,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IQualityControl_Notify_Proxy(
-    IQualityControl* This,
-    IBaseFilter *pSelf,
-    Quality q);
-void __RPC_STUB IQualityControl_Notify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IQualityControl_SetSink_Proxy(
-    IQualityControl* This,
-    IQualityControl *piqc);
-void __RPC_STUB IQualityControl_SetSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IQualityControl_INTERFACE_DEFINED__ */
 
@@ -5568,7 +4897,6 @@
     CK_INDEX = 0x1,
     CK_RGB = 0x2
 };
-
 typedef struct tagCOLORKEY {
     DWORD KeyType;
     DWORD PaletteIndex;
@@ -5583,7 +4911,6 @@
     ADVISE_POSITION = 0x8,
     ADVISE_DISPLAY_CHANGE = 0x10
 };
-
 #define ADVISE_ALL (((ADVISE_CLIPPING | ADVISE_PALETTE) | ADVISE_COLORKEY) | ADVISE_POSITION)
 
 #define ADVISE_ALL2 (ADVISE_ALL | ADVISE_DISPLAY_CHANGE)
@@ -5638,39 +4965,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOverlayNotify* This,
+        IOverlayNotify *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOverlayNotify* This);
+        IOverlayNotify *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOverlayNotify* This);
+        IOverlayNotify *This);
 
     /*** IOverlayNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *OnPaletteChange)(
-        IOverlayNotify* This,
+        IOverlayNotify *This,
         DWORD dwColors,
         const PALETTEENTRY *pPalette);
 
     HRESULT (STDMETHODCALLTYPE *OnClipChange)(
-        IOverlayNotify* This,
+        IOverlayNotify *This,
         const RECT *pSourceRect,
         const RECT *pDestinationRect,
         const RGNDATA *pRgnData);
 
     HRESULT (STDMETHODCALLTYPE *OnColorKeyChange)(
-        IOverlayNotify* This,
+        IOverlayNotify *This,
         const COLORKEY *pColorKey);
 
     HRESULT (STDMETHODCALLTYPE *OnPositionChange)(
-        IOverlayNotify* This,
+        IOverlayNotify *This,
         const RECT *pSourceRect,
         const RECT *pDestinationRect);
 
     END_INTERFACE
 } IOverlayNotifyVtbl;
+
 interface IOverlayNotify {
     CONST_VTBL IOverlayNotifyVtbl* lpVtbl;
 };
@@ -5715,42 +5043,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOverlayNotify_OnPaletteChange_Proxy(
-    IOverlayNotify* This,
-    DWORD dwColors,
-    const PALETTEENTRY *pPalette);
-void __RPC_STUB IOverlayNotify_OnPaletteChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlayNotify_OnClipChange_Proxy(
-    IOverlayNotify* This,
-    const RECT *pSourceRect,
-    const RECT *pDestinationRect,
-    const RGNDATA *pRgnData);
-void __RPC_STUB IOverlayNotify_OnClipChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlayNotify_OnColorKeyChange_Proxy(
-    IOverlayNotify* This,
-    const COLORKEY *pColorKey);
-void __RPC_STUB IOverlayNotify_OnColorKeyChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlayNotify_OnPositionChange_Proxy(
-    IOverlayNotify* This,
-    const RECT *pSourceRect,
-    const RECT *pDestinationRect);
-void __RPC_STUB IOverlayNotify_OnPositionChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOverlayNotify_INTERFACE_DEFINED__ */
 
@@ -5782,44 +5074,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOverlayNotify2* This,
+        IOverlayNotify2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOverlayNotify2* This);
+        IOverlayNotify2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOverlayNotify2* This);
+        IOverlayNotify2 *This);
 
     /*** IOverlayNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *OnPaletteChange)(
-        IOverlayNotify2* This,
+        IOverlayNotify2 *This,
         DWORD dwColors,
         const PALETTEENTRY *pPalette);
 
     HRESULT (STDMETHODCALLTYPE *OnClipChange)(
-        IOverlayNotify2* This,
+        IOverlayNotify2 *This,
         const RECT *pSourceRect,
         const RECT *pDestinationRect,
         const RGNDATA *pRgnData);
 
     HRESULT (STDMETHODCALLTYPE *OnColorKeyChange)(
-        IOverlayNotify2* This,
+        IOverlayNotify2 *This,
         const COLORKEY *pColorKey);
 
     HRESULT (STDMETHODCALLTYPE *OnPositionChange)(
-        IOverlayNotify2* This,
+        IOverlayNotify2 *This,
         const RECT *pSourceRect,
         const RECT *pDestinationRect);
 
     /*** IOverlayNotify2 methods ***/
     HRESULT (STDMETHODCALLTYPE *OnDisplayChange)(
-        IOverlayNotify2* This,
+        IOverlayNotify2 *This,
         HMONITOR hMonitor);
 
     END_INTERFACE
 } IOverlayNotify2Vtbl;
+
 interface IOverlayNotify2 {
     CONST_VTBL IOverlayNotify2Vtbl* lpVtbl;
 };
@@ -5870,14 +5163,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOverlayNotify2_OnDisplayChange_Proxy(
-    IOverlayNotify2* This,
-    HMONITOR hMonitor);
-void __RPC_STUB IOverlayNotify2_OnDisplayChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOverlayNotify2_INTERFACE_DEFINED__ */
 
@@ -5939,64 +5224,65 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IOverlay* This,
+        IOverlay *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IOverlay* This);
+        IOverlay *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IOverlay* This);
+        IOverlay *This);
 
     /*** IOverlay methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPalette)(
-        IOverlay* This,
+        IOverlay *This,
         DWORD *pdwColors,
         PALETTEENTRY **ppPalette);
 
     HRESULT (STDMETHODCALLTYPE *SetPalette)(
-        IOverlay* This,
+        IOverlay *This,
         DWORD dwColors,
         PALETTEENTRY *pPalette);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultColorKey)(
-        IOverlay* This,
+        IOverlay *This,
         COLORKEY *pColorKey);
 
     HRESULT (STDMETHODCALLTYPE *GetColorKey)(
-        IOverlay* This,
+        IOverlay *This,
         COLORKEY *pColorKey);
 
     HRESULT (STDMETHODCALLTYPE *SetColorKey)(
-        IOverlay* This,
+        IOverlay *This,
         COLORKEY *pColorKey);
 
     HRESULT (STDMETHODCALLTYPE *GetWindowHandle)(
-        IOverlay* This,
+        IOverlay *This,
         HWND *pHwnd);
 
     HRESULT (STDMETHODCALLTYPE *GetClipList)(
-        IOverlay* This,
+        IOverlay *This,
         RECT *pSourceRect,
         RECT *pDestinationRect,
         RGNDATA **ppRgnData);
 
     HRESULT (STDMETHODCALLTYPE *GetVideoPosition)(
-        IOverlay* This,
+        IOverlay *This,
         RECT *pSourceRect,
         RECT *pDestinationRect);
 
     HRESULT (STDMETHODCALLTYPE *Advise)(
-        IOverlay* This,
+        IOverlay *This,
         IOverlayNotify *pOverlayNotify,
         DWORD dwInterests);
 
     HRESULT (STDMETHODCALLTYPE *Unadvise)(
-        IOverlay* This);
+        IOverlay *This);
 
     END_INTERFACE
 } IOverlayVtbl;
+
 interface IOverlay {
     CONST_VTBL IOverlayVtbl* lpVtbl;
 };
@@ -6065,91 +5351,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IOverlay_GetPalette_Proxy(
-    IOverlay* This,
-    DWORD *pdwColors,
-    PALETTEENTRY **ppPalette);
-void __RPC_STUB IOverlay_GetPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_SetPalette_Proxy(
-    IOverlay* This,
-    DWORD dwColors,
-    PALETTEENTRY *pPalette);
-void __RPC_STUB IOverlay_SetPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_GetDefaultColorKey_Proxy(
-    IOverlay* This,
-    COLORKEY *pColorKey);
-void __RPC_STUB IOverlay_GetDefaultColorKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_GetColorKey_Proxy(
-    IOverlay* This,
-    COLORKEY *pColorKey);
-void __RPC_STUB IOverlay_GetColorKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_SetColorKey_Proxy(
-    IOverlay* This,
-    COLORKEY *pColorKey);
-void __RPC_STUB IOverlay_SetColorKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_GetWindowHandle_Proxy(
-    IOverlay* This,
-    HWND *pHwnd);
-void __RPC_STUB IOverlay_GetWindowHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_GetClipList_Proxy(
-    IOverlay* This,
-    RECT *pSourceRect,
-    RECT *pDestinationRect,
-    RGNDATA **ppRgnData);
-void __RPC_STUB IOverlay_GetClipList_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_GetVideoPosition_Proxy(
-    IOverlay* This,
-    RECT *pSourceRect,
-    RECT *pDestinationRect);
-void __RPC_STUB IOverlay_GetVideoPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_Advise_Proxy(
-    IOverlay* This,
-    IOverlayNotify *pOverlayNotify,
-    DWORD dwInterests);
-void __RPC_STUB IOverlay_Advise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IOverlay_Unadvise_Proxy(
-    IOverlay* This);
-void __RPC_STUB IOverlay_Unadvise_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IOverlay_INTERFACE_DEFINED__ */
 
@@ -6180,25 +5381,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaEventSink* This,
+        IMediaEventSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaEventSink* This);
+        IMediaEventSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaEventSink* This);
+        IMediaEventSink *This);
 
     /*** IMediaEventSink methods ***/
     HRESULT (STDMETHODCALLTYPE *Notify)(
-        IMediaEventSink* This,
+        IMediaEventSink *This,
         LONG EventCode,
         LONG_PTR EventParam1,
         LONG_PTR EventParam2);
 
     END_INTERFACE
 } IMediaEventSinkVtbl;
+
 interface IMediaEventSink {
     CONST_VTBL IMediaEventSinkVtbl* lpVtbl;
 };
@@ -6231,16 +5433,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaEventSink_Notify_Proxy(
-    IMediaEventSink* This,
-    LONG EventCode,
-    LONG_PTR EventParam1,
-    LONG_PTR EventParam2);
-void __RPC_STUB IMediaEventSink_Notify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaEventSink_INTERFACE_DEFINED__ */
 
@@ -6274,29 +5466,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSourceFilter* This,
+        IFileSourceFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSourceFilter* This);
+        IFileSourceFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSourceFilter* This);
+        IFileSourceFilter *This);
 
     /*** IFileSourceFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IFileSourceFilter* This,
+        IFileSourceFilter *This,
         LPCOLESTR pszFileName,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetCurFile)(
-        IFileSourceFilter* This,
+        IFileSourceFilter *This,
         LPOLESTR *ppszFileName,
         AM_MEDIA_TYPE *pmt);
 
     END_INTERFACE
 } IFileSourceFilterVtbl;
+
 interface IFileSourceFilter {
     CONST_VTBL IFileSourceFilterVtbl* lpVtbl;
 };
@@ -6333,24 +5526,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileSourceFilter_Load_Proxy(
-    IFileSourceFilter* This,
-    LPCOLESTR pszFileName,
-    const AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IFileSourceFilter_Load_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSourceFilter_GetCurFile_Proxy(
-    IFileSourceFilter* This,
-    LPOLESTR *ppszFileName,
-    AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IFileSourceFilter_GetCurFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileSourceFilter_INTERFACE_DEFINED__ */
 
@@ -6384,29 +5559,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSinkFilter* This,
+        IFileSinkFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSinkFilter* This);
+        IFileSinkFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSinkFilter* This);
+        IFileSinkFilter *This);
 
     /*** IFileSinkFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFileName)(
-        IFileSinkFilter* This,
+        IFileSinkFilter *This,
         LPCOLESTR pszFileName,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetCurFile)(
-        IFileSinkFilter* This,
+        IFileSinkFilter *This,
         LPOLESTR *ppszFileName,
         AM_MEDIA_TYPE *pmt);
 
     END_INTERFACE
 } IFileSinkFilterVtbl;
+
 interface IFileSinkFilter {
     CONST_VTBL IFileSinkFilterVtbl* lpVtbl;
 };
@@ -6443,24 +5619,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileSinkFilter_SetFileName_Proxy(
-    IFileSinkFilter* This,
-    LPCOLESTR pszFileName,
-    const AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IFileSinkFilter_SetFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSinkFilter_GetCurFile_Proxy(
-    IFileSinkFilter* This,
-    LPOLESTR *ppszFileName,
-    AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IFileSinkFilter_GetCurFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileSinkFilter_INTERFACE_DEFINED__ */
 
@@ -6492,38 +5650,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFileSinkFilter2* This,
+        IFileSinkFilter2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFileSinkFilter2* This);
+        IFileSinkFilter2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFileSinkFilter2* This);
+        IFileSinkFilter2 *This);
 
     /*** IFileSinkFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFileName)(
-        IFileSinkFilter2* This,
+        IFileSinkFilter2 *This,
         LPCOLESTR pszFileName,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetCurFile)(
-        IFileSinkFilter2* This,
+        IFileSinkFilter2 *This,
         LPOLESTR *ppszFileName,
         AM_MEDIA_TYPE *pmt);
 
     /*** IFileSinkFilter2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetMode)(
-        IFileSinkFilter2* This,
+        IFileSinkFilter2 *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetMode)(
-        IFileSinkFilter2* This,
+        IFileSinkFilter2 *This,
         DWORD *pdwFlags);
 
     END_INTERFACE
 } IFileSinkFilter2Vtbl;
+
 interface IFileSinkFilter2 {
     CONST_VTBL IFileSinkFilter2Vtbl* lpVtbl;
 };
@@ -6570,22 +5729,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFileSinkFilter2_SetMode_Proxy(
-    IFileSinkFilter2* This,
-    DWORD dwFlags);
-void __RPC_STUB IFileSinkFilter2_SetMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFileSinkFilter2_GetMode_Proxy(
-    IFileSinkFilter2* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IFileSinkFilter2_GetMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFileSinkFilter2_INTERFACE_DEFINED__ */
 
@@ -6639,85 +5782,86 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IGraphBuilder* This);
+        IGraphBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IGraphBuilder* This);
+        IGraphBuilder *This);
 
     /*** IFilterGraph methods ***/
     HRESULT (STDMETHODCALLTYPE *AddFilter)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IBaseFilter *pFilter,
         LPCWSTR pName);
 
     HRESULT (STDMETHODCALLTYPE *RemoveFilter)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IBaseFilter *pFilter);
 
     HRESULT (STDMETHODCALLTYPE *EnumFilters)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IEnumFilters **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *FindFilterByName)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         LPCWSTR pName,
         IBaseFilter **ppFilter);
 
     HRESULT (STDMETHODCALLTYPE *ConnectDirect)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IPin *ppinOut,
         IPin *ppinIn,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *Reconnect)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IPin *ppin);
 
     HRESULT (STDMETHODCALLTYPE *Disconnect)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IPin *ppin);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultSyncSource)(
-        IGraphBuilder* This);
+        IGraphBuilder *This);
 
     /*** IGraphBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *Connect)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IPin *ppinOut,
         IPin *ppinIn);
 
     HRESULT (STDMETHODCALLTYPE *Render)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         IPin *ppinOut);
 
     HRESULT (STDMETHODCALLTYPE *RenderFile)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         LPCWSTR lpcwstrFile,
         LPCWSTR lpcwstrPlayList);
 
     HRESULT (STDMETHODCALLTYPE *AddSourceFilter)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         LPCWSTR lpcwstrFileName,
         LPCWSTR lpcwstrFilterName,
         IBaseFilter **ppFilter);
 
     HRESULT (STDMETHODCALLTYPE *SetLogFile)(
-        IGraphBuilder* This,
+        IGraphBuilder *This,
         DWORD_PTR hFile);
 
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IGraphBuilder* This);
+        IGraphBuilder *This);
 
     HRESULT (STDMETHODCALLTYPE *ShouldOperationContinue)(
-        IGraphBuilder* This);
+        IGraphBuilder *This);
 
     END_INTERFACE
 } IGraphBuilderVtbl;
+
 interface IGraphBuilder {
     CONST_VTBL IGraphBuilderVtbl* lpVtbl;
 };
@@ -6808,64 +5952,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IGraphBuilder_Connect_Proxy(
-    IGraphBuilder* This,
-    IPin *ppinOut,
-    IPin *ppinIn);
-void __RPC_STUB IGraphBuilder_Connect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IGraphBuilder_Render_Proxy(
-    IGraphBuilder* This,
-    IPin *ppinOut);
-void __RPC_STUB IGraphBuilder_Render_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IGraphBuilder_RenderFile_Proxy(
-    IGraphBuilder* This,
-    LPCWSTR lpcwstrFile,
-    LPCWSTR lpcwstrPlayList);
-void __RPC_STUB IGraphBuilder_RenderFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IGraphBuilder_AddSourceFilter_Proxy(
-    IGraphBuilder* This,
-    LPCWSTR lpcwstrFileName,
-    LPCWSTR lpcwstrFilterName,
-    IBaseFilter **ppFilter);
-void __RPC_STUB IGraphBuilder_AddSourceFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IGraphBuilder_SetLogFile_Proxy(
-    IGraphBuilder* This,
-    DWORD_PTR hFile);
-void __RPC_STUB IGraphBuilder_SetLogFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IGraphBuilder_Abort_Proxy(
-    IGraphBuilder* This);
-void __RPC_STUB IGraphBuilder_Abort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IGraphBuilder_ShouldOperationContinue_Proxy(
-    IGraphBuilder* This);
-void __RPC_STUB IGraphBuilder_ShouldOperationContinue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IGraphBuilder_INTERFACE_DEFINED__ */
 
@@ -6932,48 +6018,48 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICaptureGraphBuilder* This);
+        ICaptureGraphBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICaptureGraphBuilder* This);
+        ICaptureGraphBuilder *This);
 
     /*** ICaptureGraphBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFiltergraph)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         IGraphBuilder *pfg);
 
     HRESULT (STDMETHODCALLTYPE *GetFiltergraph)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         IGraphBuilder **ppfg);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputFileName)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         const GUID *pType,
         LPCOLESTR lpstrFile,
         IBaseFilter **ppf,
         IFileSinkFilter **ppSink);
 
     HRESULT (STDMETHODCALLTYPE *FindInterface)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         const GUID *pCategory,
         IBaseFilter *pf,
         REFIID riid,
         void **ppint);
 
     HRESULT (STDMETHODCALLTYPE *RenderStream)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         const GUID *pCategory,
         IUnknown *pSource,
         IBaseFilter *pfCompressor,
         IBaseFilter *pfRenderer);
 
     HRESULT (STDMETHODCALLTYPE *ControlStream)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         const GUID *pCategory,
         IBaseFilter *pFilter,
         REFERENCE_TIME *pstart,
@@ -6982,12 +6068,12 @@
         WORD wStopCookie);
 
     HRESULT (STDMETHODCALLTYPE *AllocCapFile)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         LPCOLESTR lpstr,
         DWORDLONG dwlSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyCaptureFile)(
-        ICaptureGraphBuilder* This,
+        ICaptureGraphBuilder *This,
         LPOLESTR lpwstrOld,
         LPOLESTR lpwstrNew,
         int fAllowEscAbort,
@@ -6995,6 +6081,7 @@
 
     END_INTERFACE
 } ICaptureGraphBuilderVtbl;
+
 interface ICaptureGraphBuilder {
     CONST_VTBL ICaptureGraphBuilderVtbl* lpVtbl;
 };
@@ -7055,33 +6142,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_SetFiltergraph_Proxy(
-    ICaptureGraphBuilder* This,
-    IGraphBuilder *pfg);
-void __RPC_STUB ICaptureGraphBuilder_SetFiltergraph_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_GetFiltergraph_Proxy(
-    ICaptureGraphBuilder* This,
-    IGraphBuilder **ppfg);
-void __RPC_STUB ICaptureGraphBuilder_GetFiltergraph_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_SetOutputFileName_Proxy(
-    ICaptureGraphBuilder* This,
-    const GUID *pType,
-    LPCOLESTR lpstrFile,
-    IBaseFilter **ppf,
-    IFileSinkFilter **ppSink);
-void __RPC_STUB ICaptureGraphBuilder_SetOutputFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_RemoteFindInterface_Proxy(
     ICaptureGraphBuilder* This,
     const GUID *pCategory,
@@ -7093,50 +6153,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_RenderStream_Proxy(
-    ICaptureGraphBuilder* This,
-    const GUID *pCategory,
-    IUnknown *pSource,
-    IBaseFilter *pfCompressor,
-    IBaseFilter *pfRenderer);
-void __RPC_STUB ICaptureGraphBuilder_RenderStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_ControlStream_Proxy(
-    ICaptureGraphBuilder* This,
-    const GUID *pCategory,
-    IBaseFilter *pFilter,
-    REFERENCE_TIME *pstart,
-    REFERENCE_TIME *pstop,
-    WORD wStartCookie,
-    WORD wStopCookie);
-void __RPC_STUB ICaptureGraphBuilder_ControlStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_AllocCapFile_Proxy(
-    ICaptureGraphBuilder* This,
-    LPCOLESTR lpstr,
-    DWORDLONG dwlSize);
-void __RPC_STUB ICaptureGraphBuilder_AllocCapFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder_CopyCaptureFile_Proxy(
-    ICaptureGraphBuilder* This,
-    LPOLESTR lpwstrOld,
-    LPOLESTR lpwstrNew,
-    int fAllowEscAbort,
-    IAMCopyCaptureFileProgress *pCallback);
-void __RPC_STUB ICaptureGraphBuilder_CopyCaptureFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK ICaptureGraphBuilder_FindInterface_Proxy(
     ICaptureGraphBuilder* This,
     const GUID *pCategory,
@@ -7176,23 +6192,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMCopyCaptureFileProgress* This,
+        IAMCopyCaptureFileProgress *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMCopyCaptureFileProgress* This);
+        IAMCopyCaptureFileProgress *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMCopyCaptureFileProgress* This);
+        IAMCopyCaptureFileProgress *This);
 
     /*** IAMCopyCaptureFileProgress methods ***/
     HRESULT (STDMETHODCALLTYPE *Progress)(
-        IAMCopyCaptureFileProgress* This,
+        IAMCopyCaptureFileProgress *This,
         int iProgress);
 
     END_INTERFACE
 } IAMCopyCaptureFileProgressVtbl;
+
 interface IAMCopyCaptureFileProgress {
     CONST_VTBL IAMCopyCaptureFileProgressVtbl* lpVtbl;
 };
@@ -7225,14 +6242,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMCopyCaptureFileProgress_Progress_Proxy(
-    IAMCopyCaptureFileProgress* This,
-    int iProgress);
-void __RPC_STUB IAMCopyCaptureFileProgress_Progress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMCopyCaptureFileProgress_INTERFACE_DEFINED__ */
 
@@ -7311,34 +6320,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICaptureGraphBuilder2* This);
+        ICaptureGraphBuilder2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICaptureGraphBuilder2* This);
+        ICaptureGraphBuilder2 *This);
 
     /*** ICaptureGraphBuilder2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFiltergraph)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         IGraphBuilder *pfg);
 
     HRESULT (STDMETHODCALLTYPE *GetFiltergraph)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         IGraphBuilder **ppfg);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputFileName)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         const GUID *pType,
         LPCOLESTR lpstrFile,
         IBaseFilter **ppf,
         IFileSinkFilter **ppSink);
 
     HRESULT (STDMETHODCALLTYPE *FindInterface)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         const GUID *pCategory,
         const GUID *pType,
         IBaseFilter *pf,
@@ -7346,7 +6355,7 @@
         void **ppint);
 
     HRESULT (STDMETHODCALLTYPE *RenderStream)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         const GUID *pCategory,
         const GUID *pType,
         IUnknown *pSource,
@@ -7354,7 +6363,7 @@
         IBaseFilter *pfRenderer);
 
     HRESULT (STDMETHODCALLTYPE *ControlStream)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         const GUID *pCategory,
         const GUID *pType,
         IBaseFilter *pFilter,
@@ -7364,19 +6373,19 @@
         WORD wStopCookie);
 
     HRESULT (STDMETHODCALLTYPE *AllocCapFile)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         LPCOLESTR lpstr,
         DWORDLONG dwlSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyCaptureFile)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         LPOLESTR lpwstrOld,
         LPOLESTR lpwstrNew,
         int fAllowEscAbort,
         IAMCopyCaptureFileProgress *pCallback);
 
     HRESULT (STDMETHODCALLTYPE *FindPin)(
-        ICaptureGraphBuilder2* This,
+        ICaptureGraphBuilder2 *This,
         IUnknown *pSource,
         PIN_DIRECTION pindir,
         const GUID *pCategory,
@@ -7387,6 +6396,7 @@
 
     END_INTERFACE
 } ICaptureGraphBuilder2Vtbl;
+
 interface ICaptureGraphBuilder2 {
     CONST_VTBL ICaptureGraphBuilder2Vtbl* lpVtbl;
 };
@@ -7451,33 +6461,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_SetFiltergraph_Proxy(
-    ICaptureGraphBuilder2* This,
-    IGraphBuilder *pfg);
-void __RPC_STUB ICaptureGraphBuilder2_SetFiltergraph_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_GetFiltergraph_Proxy(
-    ICaptureGraphBuilder2* This,
-    IGraphBuilder **ppfg);
-void __RPC_STUB ICaptureGraphBuilder2_GetFiltergraph_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_SetOutputFileName_Proxy(
-    ICaptureGraphBuilder2* This,
-    const GUID *pType,
-    LPCOLESTR lpstrFile,
-    IBaseFilter **ppf,
-    IFileSinkFilter **ppSink);
-void __RPC_STUB ICaptureGraphBuilder2_SetOutputFileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_RemoteFindInterface_Proxy(
     ICaptureGraphBuilder2* This,
     const GUID *pCategory,
@@ -7490,66 +6473,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_RenderStream_Proxy(
-    ICaptureGraphBuilder2* This,
-    const GUID *pCategory,
-    const GUID *pType,
-    IUnknown *pSource,
-    IBaseFilter *pfCompressor,
-    IBaseFilter *pfRenderer);
-void __RPC_STUB ICaptureGraphBuilder2_RenderStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_ControlStream_Proxy(
-    ICaptureGraphBuilder2* This,
-    const GUID *pCategory,
-    const GUID *pType,
-    IBaseFilter *pFilter,
-    REFERENCE_TIME *pstart,
-    REFERENCE_TIME *pstop,
-    WORD wStartCookie,
-    WORD wStopCookie);
-void __RPC_STUB ICaptureGraphBuilder2_ControlStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_AllocCapFile_Proxy(
-    ICaptureGraphBuilder2* This,
-    LPCOLESTR lpstr,
-    DWORDLONG dwlSize);
-void __RPC_STUB ICaptureGraphBuilder2_AllocCapFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_CopyCaptureFile_Proxy(
-    ICaptureGraphBuilder2* This,
-    LPOLESTR lpwstrOld,
-    LPOLESTR lpwstrNew,
-    int fAllowEscAbort,
-    IAMCopyCaptureFileProgress *pCallback);
-void __RPC_STUB ICaptureGraphBuilder2_CopyCaptureFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICaptureGraphBuilder2_FindPin_Proxy(
-    ICaptureGraphBuilder2* This,
-    IUnknown *pSource,
-    PIN_DIRECTION pindir,
-    const GUID *pCategory,
-    const GUID *pType,
-    WINBOOL fUnconnected,
-    int num,
-    IPin **ppPin);
-void __RPC_STUB ICaptureGraphBuilder2_FindPin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK ICaptureGraphBuilder2_FindInterface_Proxy(
     ICaptureGraphBuilder2* This,
     const GUID *pCategory,
@@ -7600,35 +6523,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IConfigAviMux* This,
+        IConfigAviMux *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IConfigAviMux* This);
+        IConfigAviMux *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IConfigAviMux* This);
+        IConfigAviMux *This);
 
     /*** IConfigAviMux methods ***/
     HRESULT (STDMETHODCALLTYPE *SetMasterStream)(
-        IConfigAviMux* This,
+        IConfigAviMux *This,
         LONG iStream);
 
     HRESULT (STDMETHODCALLTYPE *GetMasterStream)(
-        IConfigAviMux* This,
+        IConfigAviMux *This,
         LONG *pStream);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputCompatibilityIndex)(
-        IConfigAviMux* This,
+        IConfigAviMux *This,
         WINBOOL fOldIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputCompatibilityIndex)(
-        IConfigAviMux* This,
+        IConfigAviMux *This,
         WINBOOL *pfOldIndex);
 
     END_INTERFACE
 } IConfigAviMuxVtbl;
+
 interface IConfigAviMux {
     CONST_VTBL IConfigAviMuxVtbl* lpVtbl;
 };
@@ -7673,38 +6597,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IConfigAviMux_SetMasterStream_Proxy(
-    IConfigAviMux* This,
-    LONG iStream);
-void __RPC_STUB IConfigAviMux_SetMasterStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConfigAviMux_GetMasterStream_Proxy(
-    IConfigAviMux* This,
-    LONG *pStream);
-void __RPC_STUB IConfigAviMux_GetMasterStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConfigAviMux_SetOutputCompatibilityIndex_Proxy(
-    IConfigAviMux* This,
-    WINBOOL fOldIndex);
-void __RPC_STUB IConfigAviMux_SetOutputCompatibilityIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConfigAviMux_GetOutputCompatibilityIndex_Proxy(
-    IConfigAviMux* This,
-    WINBOOL *pfOldIndex);
-void __RPC_STUB IConfigAviMux_GetOutputCompatibilityIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IConfigAviMux_INTERFACE_DEFINED__ */
 
@@ -7749,37 +6641,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IConfigInterleaving* This,
+        IConfigInterleaving *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IConfigInterleaving* This);
+        IConfigInterleaving *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IConfigInterleaving* This);
+        IConfigInterleaving *This);
 
     /*** IConfigInterleaving methods ***/
     HRESULT (STDMETHODCALLTYPE *put_Mode)(
-        IConfigInterleaving* This,
+        IConfigInterleaving *This,
         InterleavingMode mode);
 
     HRESULT (STDMETHODCALLTYPE *get_Mode)(
-        IConfigInterleaving* This,
+        IConfigInterleaving *This,
         InterleavingMode *pMode);
 
     HRESULT (STDMETHODCALLTYPE *put_Interleaving)(
-        IConfigInterleaving* This,
+        IConfigInterleaving *This,
         const REFERENCE_TIME *prtInterleave,
         const REFERENCE_TIME *prtPreroll);
 
     HRESULT (STDMETHODCALLTYPE *get_Interleaving)(
-        IConfigInterleaving* This,
+        IConfigInterleaving *This,
         REFERENCE_TIME *prtInterleave,
         REFERENCE_TIME *prtPreroll);
 
     END_INTERFACE
 } IConfigInterleavingVtbl;
+
 interface IConfigInterleaving {
     CONST_VTBL IConfigInterleavingVtbl* lpVtbl;
 };
@@ -7824,40 +6717,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IConfigInterleaving_put_Mode_Proxy(
-    IConfigInterleaving* This,
-    InterleavingMode mode);
-void __RPC_STUB IConfigInterleaving_put_Mode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConfigInterleaving_get_Mode_Proxy(
-    IConfigInterleaving* This,
-    InterleavingMode *pMode);
-void __RPC_STUB IConfigInterleaving_get_Mode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConfigInterleaving_put_Interleaving_Proxy(
-    IConfigInterleaving* This,
-    const REFERENCE_TIME *prtInterleave,
-    const REFERENCE_TIME *prtPreroll);
-void __RPC_STUB IConfigInterleaving_put_Interleaving_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IConfigInterleaving_get_Interleaving_Proxy(
-    IConfigInterleaving* This,
-    REFERENCE_TIME *prtInterleave,
-    REFERENCE_TIME *prtPreroll);
-void __RPC_STUB IConfigInterleaving_get_Interleaving_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IConfigInterleaving_INTERFACE_DEFINED__ */
 
@@ -7888,27 +6747,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMClockSlave* This,
+        IAMClockSlave *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMClockSlave* This);
+        IAMClockSlave *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMClockSlave* This);
+        IAMClockSlave *This);
 
     /*** IAMClockSlave methods ***/
     HRESULT (STDMETHODCALLTYPE *SetErrorTolerance)(
-        IAMClockSlave* This,
+        IAMClockSlave *This,
         DWORD dwTolerance);
 
     HRESULT (STDMETHODCALLTYPE *GetErrorTolerance)(
-        IAMClockSlave* This,
+        IAMClockSlave *This,
         DWORD *pdwTolerance);
 
     END_INTERFACE
 } IAMClockSlaveVtbl;
+
 interface IAMClockSlave {
     CONST_VTBL IAMClockSlaveVtbl* lpVtbl;
 };
@@ -7945,22 +6805,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMClockSlave_SetErrorTolerance_Proxy(
-    IAMClockSlave* This,
-    DWORD dwTolerance);
-void __RPC_STUB IAMClockSlave_SetErrorTolerance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMClockSlave_GetErrorTolerance_Proxy(
-    IAMClockSlave* This,
-    DWORD *pdwTolerance);
-void __RPC_STUB IAMClockSlave_GetErrorTolerance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMClockSlave_INTERFACE_DEFINED__ */
 
@@ -8025,38 +6869,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMCertifiedOutputProtection* This,
+        IAMCertifiedOutputProtection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMCertifiedOutputProtection* This);
+        IAMCertifiedOutputProtection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMCertifiedOutputProtection* This);
+        IAMCertifiedOutputProtection *This);
 
     /*** IAMCertifiedOutputProtection methods ***/
     HRESULT (STDMETHODCALLTYPE *KeyExchange)(
-        IAMCertifiedOutputProtection* This,
+        IAMCertifiedOutputProtection *This,
         GUID *pRandom,
         BYTE **VarLenCertGH,
         DWORD *pdwLengthCertGH);
 
     HRESULT (STDMETHODCALLTYPE *SessionSequenceStart)(
-        IAMCertifiedOutputProtection* This,
+        IAMCertifiedOutputProtection *This,
         AMCOPPSignature *pSig);
 
     HRESULT (STDMETHODCALLTYPE *ProtectionCommand)(
-        IAMCertifiedOutputProtection* This,
+        IAMCertifiedOutputProtection *This,
         const AMCOPPCommand *cmd);
 
     HRESULT (STDMETHODCALLTYPE *ProtectionStatus)(
-        IAMCertifiedOutputProtection* This,
+        IAMCertifiedOutputProtection *This,
         const AMCOPPStatusInput *pStatusInput,
         AMCOPPStatusOutput *pStatusOutput);
 
     END_INTERFACE
 } IAMCertifiedOutputProtectionVtbl;
+
 interface IAMCertifiedOutputProtection {
     CONST_VTBL IAMCertifiedOutputProtectionVtbl* lpVtbl;
 };
@@ -8101,48 +6946,12 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_KeyExchange_Proxy(
-    IAMCertifiedOutputProtection* This,
-    GUID *pRandom,
-    BYTE **VarLenCertGH,
-    DWORD *pdwLengthCertGH);
-void __RPC_STUB IAMCertifiedOutputProtection_KeyExchange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_SessionSequenceStart_Proxy(
-    IAMCertifiedOutputProtection* This,
-    AMCOPPSignature *pSig);
-void __RPC_STUB IAMCertifiedOutputProtection_SessionSequenceStart_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_ProtectionCommand_Proxy(
-    IAMCertifiedOutputProtection* This,
-    const AMCOPPCommand *cmd);
-void __RPC_STUB IAMCertifiedOutputProtection_ProtectionCommand_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMCertifiedOutputProtection_ProtectionStatus_Proxy(
-    IAMCertifiedOutputProtection* This,
-    const AMCOPPStatusInput *pStatusInput,
-    AMCOPPStatusOutput *pStatusOutput);
-void __RPC_STUB IAMCertifiedOutputProtection_ProtectionStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMCertifiedOutputProtection_INTERFACE_DEFINED__ */
 
 enum _AM_RENSDEREXFLAGS {
     AM_RENDEREX_RENDERTOEXISTINGRENDERERS = 0x1
 };
-
 /*****************************************************************************
  * IFilterGraph2 interface
  */
@@ -8179,104 +6988,105 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IFilterGraph2* This);
+        IFilterGraph2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IFilterGraph2* This);
+        IFilterGraph2 *This);
 
     /*** IFilterGraph methods ***/
     HRESULT (STDMETHODCALLTYPE *AddFilter)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IBaseFilter *pFilter,
         LPCWSTR pName);
 
     HRESULT (STDMETHODCALLTYPE *RemoveFilter)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IBaseFilter *pFilter);
 
     HRESULT (STDMETHODCALLTYPE *EnumFilters)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IEnumFilters **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *FindFilterByName)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         LPCWSTR pName,
         IBaseFilter **ppFilter);
 
     HRESULT (STDMETHODCALLTYPE *ConnectDirect)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IPin *ppinOut,
         IPin *ppinIn,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *Reconnect)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IPin *ppin);
 
     HRESULT (STDMETHODCALLTYPE *Disconnect)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IPin *ppin);
 
     HRESULT (STDMETHODCALLTYPE *SetDefaultSyncSource)(
-        IFilterGraph2* This);
+        IFilterGraph2 *This);
 
     /*** IGraphBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *Connect)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IPin *ppinOut,
         IPin *ppinIn);
 
     HRESULT (STDMETHODCALLTYPE *Render)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IPin *ppinOut);
 
     HRESULT (STDMETHODCALLTYPE *RenderFile)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         LPCWSTR lpcwstrFile,
         LPCWSTR lpcwstrPlayList);
 
     HRESULT (STDMETHODCALLTYPE *AddSourceFilter)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         LPCWSTR lpcwstrFileName,
         LPCWSTR lpcwstrFilterName,
         IBaseFilter **ppFilter);
 
     HRESULT (STDMETHODCALLTYPE *SetLogFile)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         DWORD_PTR hFile);
 
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IFilterGraph2* This);
+        IFilterGraph2 *This);
 
     HRESULT (STDMETHODCALLTYPE *ShouldOperationContinue)(
-        IFilterGraph2* This);
+        IFilterGraph2 *This);
 
     /*** IFilterGraph2 methods ***/
     HRESULT (STDMETHODCALLTYPE *AddSourceFilterForMoniker)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IMoniker *pMoniker,
         IBindCtx *pCtx,
         LPCWSTR lpcwstrFilterName,
         IBaseFilter **ppFilter);
 
     HRESULT (STDMETHODCALLTYPE *ReconnectEx)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IPin *ppin,
         const AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *RenderEx)(
-        IFilterGraph2* This,
+        IFilterGraph2 *This,
         IPin *pPinOut,
         DWORD dwFlags,
         DWORD *pvContext);
 
     END_INTERFACE
 } IFilterGraph2Vtbl;
+
 interface IFilterGraph2 {
     CONST_VTBL IFilterGraph2Vtbl* lpVtbl;
 };
@@ -8381,36 +7191,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IFilterGraph2_AddSourceFilterForMoniker_Proxy(
-    IFilterGraph2* This,
-    IMoniker *pMoniker,
-    IBindCtx *pCtx,
-    LPCWSTR lpcwstrFilterName,
-    IBaseFilter **ppFilter);
-void __RPC_STUB IFilterGraph2_AddSourceFilterForMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph2_ReconnectEx_Proxy(
-    IFilterGraph2* This,
-    IPin *ppin,
-    const AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IFilterGraph2_ReconnectEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IFilterGraph2_RenderEx_Proxy(
-    IFilterGraph2* This,
-    IPin *pPinOut,
-    DWORD dwFlags,
-    DWORD *pvContext);
-void __RPC_STUB IFilterGraph2_RenderEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IFilterGraph2_INTERFACE_DEFINED__ */
 
@@ -8443,29 +7223,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IStreamBuilder* This,
+        IStreamBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IStreamBuilder* This);
+        IStreamBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IStreamBuilder* This);
+        IStreamBuilder *This);
 
     /*** IStreamBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *Render)(
-        IStreamBuilder* This,
+        IStreamBuilder *This,
         IPin *ppinOut,
         IGraphBuilder *pGraph);
 
     HRESULT (STDMETHODCALLTYPE *Backout)(
-        IStreamBuilder* This,
+        IStreamBuilder *This,
         IPin *ppinOut,
         IGraphBuilder *pGraph);
 
     END_INTERFACE
 } IStreamBuilderVtbl;
+
 interface IStreamBuilder {
     CONST_VTBL IStreamBuilderVtbl* lpVtbl;
 };
@@ -8502,24 +7283,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IStreamBuilder_Render_Proxy(
-    IStreamBuilder* This,
-    IPin *ppinOut,
-    IGraphBuilder *pGraph);
-void __RPC_STUB IStreamBuilder_Render_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IStreamBuilder_Backout_Proxy(
-    IStreamBuilder* This,
-    IPin *ppinOut,
-    IGraphBuilder *pGraph);
-void __RPC_STUB IStreamBuilder_Backout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IStreamBuilder_INTERFACE_DEFINED__ */
 
@@ -8594,38 +7357,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMStreamConfig* This,
+        IAMStreamConfig *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMStreamConfig* This);
+        IAMStreamConfig *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMStreamConfig* This);
+        IAMStreamConfig *This);
 
     /*** IAMStreamConfig methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFormat)(
-        IAMStreamConfig* This,
+        IAMStreamConfig *This,
         AM_MEDIA_TYPE *pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetFormat)(
-        IAMStreamConfig* This,
+        IAMStreamConfig *This,
         AM_MEDIA_TYPE **pmt);
 
     HRESULT (STDMETHODCALLTYPE *GetNumberOfCapabilities)(
-        IAMStreamConfig* This,
+        IAMStreamConfig *This,
         int *piCount,
         int *piSize);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamCaps)(
-        IAMStreamConfig* This,
+        IAMStreamConfig *This,
         int iIndex,
         AM_MEDIA_TYPE **pmt,
         BYTE *pSCC);
 
     END_INTERFACE
 } IAMStreamConfigVtbl;
+
 interface IAMStreamConfig {
     CONST_VTBL IAMStreamConfigVtbl* lpVtbl;
 };
@@ -8670,41 +7434,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMStreamConfig_SetFormat_Proxy(
-    IAMStreamConfig* This,
-    AM_MEDIA_TYPE *pmt);
-void __RPC_STUB IAMStreamConfig_SetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMStreamConfig_GetFormat_Proxy(
-    IAMStreamConfig* This,
-    AM_MEDIA_TYPE **pmt);
-void __RPC_STUB IAMStreamConfig_GetFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMStreamConfig_GetNumberOfCapabilities_Proxy(
-    IAMStreamConfig* This,
-    int *piCount,
-    int *piSize);
-void __RPC_STUB IAMStreamConfig_GetNumberOfCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMStreamConfig_GetStreamCaps_Proxy(
-    IAMStreamConfig* This,
-    int iIndex,
-    AM_MEDIA_TYPE **pmt,
-    BYTE *pSCC);
-void __RPC_STUB IAMStreamConfig_GetStreamCaps_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMStreamConfig_INTERFACE_DEFINED__ */
 
@@ -8763,19 +7492,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMVideoProcAmp* This,
+        IAMVideoProcAmp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMVideoProcAmp* This);
+        IAMVideoProcAmp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMVideoProcAmp* This);
+        IAMVideoProcAmp *This);
 
     /*** IAMVideoProcAmp methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRange)(
-        IAMVideoProcAmp* This,
+        IAMVideoProcAmp *This,
         LONG Property,
         LONG *pMin,
         LONG *pMax,
@@ -8784,19 +7513,20 @@
         LONG *pCapsFlags);
 
     HRESULT (STDMETHODCALLTYPE *Set)(
-        IAMVideoProcAmp* This,
+        IAMVideoProcAmp *This,
         LONG Property,
         LONG lValue,
         LONG Flags);
 
     HRESULT (STDMETHODCALLTYPE *Get)(
-        IAMVideoProcAmp* This,
+        IAMVideoProcAmp *This,
         LONG Property,
         LONG *lValue,
         LONG *Flags);
 
     END_INTERFACE
 } IAMVideoProcAmpVtbl;
+
 interface IAMVideoProcAmp {
     CONST_VTBL IAMVideoProcAmpVtbl* lpVtbl;
 };
@@ -8837,39 +7567,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMVideoProcAmp_GetRange_Proxy(
-    IAMVideoProcAmp* This,
-    LONG Property,
-    LONG *pMin,
-    LONG *pMax,
-    LONG *pSteppingDelta,
-    LONG *pDefault,
-    LONG *pCapsFlags);
-void __RPC_STUB IAMVideoProcAmp_GetRange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMVideoProcAmp_Set_Proxy(
-    IAMVideoProcAmp* This,
-    LONG Property,
-    LONG lValue,
-    LONG Flags);
-void __RPC_STUB IAMVideoProcAmp_Set_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMVideoProcAmp_Get_Proxy(
-    IAMVideoProcAmp* This,
-    LONG Property,
-    LONG *lValue,
-    LONG *Flags);
-void __RPC_STUB IAMVideoProcAmp_Get_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMVideoProcAmp_INTERFACE_DEFINED__ */
 
@@ -8926,57 +7623,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAsyncReader* This,
+        IAsyncReader *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAsyncReader* This);
+        IAsyncReader *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAsyncReader* This);
+        IAsyncReader *This);
 
     /*** IAsyncReader methods ***/
     HRESULT (STDMETHODCALLTYPE *RequestAllocator)(
-        IAsyncReader* This,
+        IAsyncReader *This,
         IMemAllocator *pPreferred,
         ALLOCATOR_PROPERTIES *pProps,
         IMemAllocator **ppActual);
 
     HRESULT (STDMETHODCALLTYPE *Request)(
-        IAsyncReader* This,
+        IAsyncReader *This,
         IMediaSample *pSample,
         DWORD_PTR dwUser);
 
     HRESULT (STDMETHODCALLTYPE *WaitForNext)(
-        IAsyncReader* This,
+        IAsyncReader *This,
         DWORD dwTimeout,
         IMediaSample **ppSample,
         DWORD_PTR *pdwUser);
 
     HRESULT (STDMETHODCALLTYPE *SyncReadAligned)(
-        IAsyncReader* This,
+        IAsyncReader *This,
         IMediaSample *pSample);
 
     HRESULT (STDMETHODCALLTYPE *SyncRead)(
-        IAsyncReader* This,
+        IAsyncReader *This,
         LONGLONG llPosition,
         LONG lLength,
         BYTE *pBuffer);
 
     HRESULT (STDMETHODCALLTYPE *Length)(
-        IAsyncReader* This,
+        IAsyncReader *This,
         LONGLONG *pTotal,
         LONGLONG *pAvailable);
 
     HRESULT (STDMETHODCALLTYPE *BeginFlush)(
-        IAsyncReader* This);
+        IAsyncReader *This);
 
     HRESULT (STDMETHODCALLTYPE *EndFlush)(
-        IAsyncReader* This);
+        IAsyncReader *This);
 
     END_INTERFACE
 } IAsyncReaderVtbl;
+
 interface IAsyncReader {
     CONST_VTBL IAsyncReaderVtbl* lpVtbl;
 };
@@ -9037,76 +7735,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAsyncReader_RequestAllocator_Proxy(
-    IAsyncReader* This,
-    IMemAllocator *pPreferred,
-    ALLOCATOR_PROPERTIES *pProps,
-    IMemAllocator **ppActual);
-void __RPC_STUB IAsyncReader_RequestAllocator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAsyncReader_Request_Proxy(
-    IAsyncReader* This,
-    IMediaSample *pSample,
-    DWORD_PTR dwUser);
-void __RPC_STUB IAsyncReader_Request_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAsyncReader_WaitForNext_Proxy(
-    IAsyncReader* This,
-    DWORD dwTimeout,
-    IMediaSample **ppSample,
-    DWORD_PTR *pdwUser);
-void __RPC_STUB IAsyncReader_WaitForNext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAsyncReader_SyncReadAligned_Proxy(
-    IAsyncReader* This,
-    IMediaSample *pSample);
-void __RPC_STUB IAsyncReader_SyncReadAligned_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAsyncReader_SyncRead_Proxy(
-    IAsyncReader* This,
-    LONGLONG llPosition,
-    LONG lLength,
-    BYTE *pBuffer);
-void __RPC_STUB IAsyncReader_SyncRead_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAsyncReader_Length_Proxy(
-    IAsyncReader* This,
-    LONGLONG *pTotal,
-    LONGLONG *pAvailable);
-void __RPC_STUB IAsyncReader_Length_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAsyncReader_BeginFlush_Proxy(
-    IAsyncReader* This);
-void __RPC_STUB IAsyncReader_BeginFlush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAsyncReader_EndFlush_Proxy(
-    IAsyncReader* This);
-void __RPC_STUB IAsyncReader_EndFlush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAsyncReader_INTERFACE_DEFINED__ */
 
@@ -9134,23 +7762,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IGraphVersion* This,
+        IGraphVersion *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IGraphVersion* This);
+        IGraphVersion *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IGraphVersion* This);
+        IGraphVersion *This);
 
     /*** IGraphVersion methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryVersion)(
-        IGraphVersion* This,
+        IGraphVersion *This,
         LONG *pVersion);
 
     END_INTERFACE
 } IGraphVersionVtbl;
+
 interface IGraphVersion {
     CONST_VTBL IGraphVersionVtbl* lpVtbl;
 };
@@ -9183,14 +7812,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IGraphVersion_QueryVersion_Proxy(
-    IGraphVersion* This,
-    LONG *pVersion);
-void __RPC_STUB IGraphVersion_QueryVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IGraphVersion_INTERFACE_DEFINED__ */
 
@@ -9221,27 +7842,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IResourceConsumer* This,
+        IResourceConsumer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IResourceConsumer* This);
+        IResourceConsumer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IResourceConsumer* This);
+        IResourceConsumer *This);
 
     /*** IResourceConsumer methods ***/
     HRESULT (STDMETHODCALLTYPE *AcquireResource)(
-        IResourceConsumer* This,
+        IResourceConsumer *This,
         LONG idResource);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseResource)(
-        IResourceConsumer* This,
+        IResourceConsumer *This,
         LONG idResource);
 
     END_INTERFACE
 } IResourceConsumerVtbl;
+
 interface IResourceConsumer {
     CONST_VTBL IResourceConsumerVtbl* lpVtbl;
 };
@@ -9278,22 +7900,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IResourceConsumer_AcquireResource_Proxy(
-    IResourceConsumer* This,
-    LONG idResource);
-void __RPC_STUB IResourceConsumer_AcquireResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceConsumer_ReleaseResource_Proxy(
-    IResourceConsumer* This,
-    LONG idResource);
-void __RPC_STUB IResourceConsumer_ReleaseResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IResourceConsumer_INTERFACE_DEFINED__ */
 
@@ -9354,63 +7960,64 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IResourceManager* This,
+        IResourceManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IResourceManager* This);
+        IResourceManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IResourceManager* This);
+        IResourceManager *This);
 
     /*** IResourceManager methods ***/
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IResourceManager* This,
+        IResourceManager *This,
         LPCWSTR pName,
         LONG cResource,
         LONG *plToken);
 
     HRESULT (STDMETHODCALLTYPE *RegisterGroup)(
-        IResourceManager* This,
+        IResourceManager *This,
         LPCWSTR pName,
         LONG cResource,
         LONG *palTokens,
         LONG *plToken);
 
     HRESULT (STDMETHODCALLTYPE *RequestResource)(
-        IResourceManager* This,
+        IResourceManager *This,
         LONG idResource,
         IUnknown *pFocusObject,
         IResourceConsumer *pConsumer);
 
     HRESULT (STDMETHODCALLTYPE *NotifyAcquire)(
-        IResourceManager* This,
+        IResourceManager *This,
         LONG idResource,
         IResourceConsumer *pConsumer,
         HRESULT hr);
 
     HRESULT (STDMETHODCALLTYPE *NotifyRelease)(
-        IResourceManager* This,
+        IResourceManager *This,
         LONG idResource,
         IResourceConsumer *pConsumer,
         WINBOOL bStillWant);
 
     HRESULT (STDMETHODCALLTYPE *CancelRequest)(
-        IResourceManager* This,
+        IResourceManager *This,
         LONG idResource,
         IResourceConsumer *pConsumer);
 
     HRESULT (STDMETHODCALLTYPE *SetFocus)(
-        IResourceManager* This,
+        IResourceManager *This,
         IUnknown *pFocusObject);
 
     HRESULT (STDMETHODCALLTYPE *ReleaseFocus)(
-        IResourceManager* This,
+        IResourceManager *This,
         IUnknown *pFocusObject);
 
     END_INTERFACE
 } IResourceManagerVtbl;
+
 interface IResourceManager {
     CONST_VTBL IResourceManagerVtbl* lpVtbl;
 };
@@ -9471,82 +8078,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IResourceManager_Register_Proxy(
-    IResourceManager* This,
-    LPCWSTR pName,
-    LONG cResource,
-    LONG *plToken);
-void __RPC_STUB IResourceManager_Register_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceManager_RegisterGroup_Proxy(
-    IResourceManager* This,
-    LPCWSTR pName,
-    LONG cResource,
-    LONG *palTokens,
-    LONG *plToken);
-void __RPC_STUB IResourceManager_RegisterGroup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceManager_RequestResource_Proxy(
-    IResourceManager* This,
-    LONG idResource,
-    IUnknown *pFocusObject,
-    IResourceConsumer *pConsumer);
-void __RPC_STUB IResourceManager_RequestResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceManager_NotifyAcquire_Proxy(
-    IResourceManager* This,
-    LONG idResource,
-    IResourceConsumer *pConsumer,
-    HRESULT hr);
-void __RPC_STUB IResourceManager_NotifyAcquire_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceManager_NotifyRelease_Proxy(
-    IResourceManager* This,
-    LONG idResource,
-    IResourceConsumer *pConsumer,
-    WINBOOL bStillWant);
-void __RPC_STUB IResourceManager_NotifyRelease_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceManager_CancelRequest_Proxy(
-    IResourceManager* This,
-    LONG idResource,
-    IResourceConsumer *pConsumer);
-void __RPC_STUB IResourceManager_CancelRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceManager_SetFocus_Proxy(
-    IResourceManager* This,
-    IUnknown *pFocusObject);
-void __RPC_STUB IResourceManager_SetFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IResourceManager_ReleaseFocus_Proxy(
-    IResourceManager* This,
-    IUnknown *pFocusObject);
-void __RPC_STUB IResourceManager_ReleaseFocus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IResourceManager_INTERFACE_DEFINED__ */
 
@@ -9596,34 +8127,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMStreamControl* This,
+        IAMStreamControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMStreamControl* This);
+        IAMStreamControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMStreamControl* This);
+        IAMStreamControl *This);
 
     /*** IAMStreamControl methods ***/
     HRESULT (STDMETHODCALLTYPE *StartAt)(
-        IAMStreamControl* This,
+        IAMStreamControl *This,
         const REFERENCE_TIME *ptStart,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *StopAt)(
-        IAMStreamControl* This,
+        IAMStreamControl *This,
         const REFERENCE_TIME *ptStop,
         WINBOOL bSendExtra,
         DWORD dwCookie);
 
     HRESULT (STDMETHODCALLTYPE *GetInfo)(
-        IAMStreamControl* This,
+        IAMStreamControl *This,
         AM_STREAM_INFO *pInfo);
 
     END_INTERFACE
 } IAMStreamControlVtbl;
+
 interface IAMStreamControl {
     CONST_VTBL IAMStreamControlVtbl* lpVtbl;
 };
@@ -9664,33 +8196,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMStreamControl_StartAt_Proxy(
-    IAMStreamControl* This,
-    const REFERENCE_TIME *ptStart,
-    DWORD dwCookie);
-void __RPC_STUB IAMStreamControl_StartAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMStreamControl_StopAt_Proxy(
-    IAMStreamControl* This,
-    const REFERENCE_TIME *ptStop,
-    WINBOOL bSendExtra,
-    DWORD dwCookie);
-void __RPC_STUB IAMStreamControl_StopAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMStreamControl_GetInfo_Proxy(
-    IAMStreamControl* This,
-    AM_STREAM_INFO *pInfo);
-void __RPC_STUB IAMStreamControl_GetInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMStreamControl_INTERFACE_DEFINED__ */
 
@@ -9741,19 +8246,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IKsPropertySet* This,
+        IKsPropertySet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IKsPropertySet* This);
+        IKsPropertySet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IKsPropertySet* This);
+        IKsPropertySet *This);
 
     /*** IKsPropertySet methods ***/
     HRESULT (STDMETHODCALLTYPE *Set)(
-        IKsPropertySet* This,
+        IKsPropertySet *This,
         REFGUID guidPropSet,
         DWORD dwPropID,
         LPVOID pInstanceData,
@@ -9762,7 +8267,7 @@
         DWORD cbPropData);
 
     HRESULT (STDMETHODCALLTYPE *Get)(
-        IKsPropertySet* This,
+        IKsPropertySet *This,
         REFGUID guidPropSet,
         DWORD dwPropID,
         LPVOID pInstanceData,
@@ -9772,13 +8277,14 @@
         DWORD *pcbReturned);
 
     HRESULT (STDMETHODCALLTYPE *QuerySupported)(
-        IKsPropertySet* This,
+        IKsPropertySet *This,
         REFGUID guidPropSet,
         DWORD dwPropID,
         DWORD *pTypeSupport);
 
     END_INTERFACE
 } IKsPropertySetVtbl;
+
 interface IKsPropertySet {
     CONST_VTBL IKsPropertySetVtbl* lpVtbl;
 };
@@ -9819,43 +8325,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IKsPropertySet_Set_Proxy(
-    IKsPropertySet* This,
-    REFGUID guidPropSet,
-    DWORD dwPropID,
-    LPVOID pInstanceData,
-    DWORD cbInstanceData,
-    LPVOID pPropData,
-    DWORD cbPropData);
-void __RPC_STUB IKsPropertySet_Set_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKsPropertySet_Get_Proxy(
-    IKsPropertySet* This,
-    REFGUID guidPropSet,
-    DWORD dwPropID,
-    LPVOID pInstanceData,
-    DWORD cbInstanceData,
-    LPVOID pPropData,
-    DWORD cbPropData,
-    DWORD *pcbReturned);
-void __RPC_STUB IKsPropertySet_Get_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IKsPropertySet_QuerySupported_Proxy(
-    IKsPropertySet* This,
-    REFGUID guidPropSet,
-    DWORD dwPropID,
-    DWORD *pTypeSupport);
-void __RPC_STUB IKsPropertySet_QuerySupported_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IKsPropertySet_INTERFACE_DEFINED__ */
 
@@ -9887,37 +8356,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMediaPropertyBag* This,
+        IMediaPropertyBag *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMediaPropertyBag* This);
+        IMediaPropertyBag *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMediaPropertyBag* This);
+        IMediaPropertyBag *This);
 
     /*** IPropertyBag methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IMediaPropertyBag* This,
+        IMediaPropertyBag *This,
         LPCOLESTR pszPropName,
         VARIANT *pVar,
         IErrorLog *pErrorLog);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IMediaPropertyBag* This,
+        IMediaPropertyBag *This,
         LPCOLESTR pszPropName,
         VARIANT *pVar);
 
     /*** IMediaPropertyBag methods ***/
     HRESULT (STDMETHODCALLTYPE *EnumProperty)(
-        IMediaPropertyBag* This,
+        IMediaPropertyBag *This,
         ULONG iProperty,
         VARIANT *pvarPropertyName,
         VARIANT *pvarPropertyValue);
 
     END_INTERFACE
 } IMediaPropertyBagVtbl;
+
 interface IMediaPropertyBag {
     CONST_VTBL IMediaPropertyBagVtbl* lpVtbl;
 };
@@ -9960,16 +8430,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMediaPropertyBag_EnumProperty_Proxy(
-    IMediaPropertyBag* This,
-    ULONG iProperty,
-    VARIANT *pvarPropertyName,
-    VARIANT *pvarPropertyValue);
-void __RPC_STUB IMediaPropertyBag_EnumProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMediaPropertyBag_INTERFACE_DEFINED__ */
 
@@ -10007,38 +8467,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistMediaPropertyBag* This,
+        IPersistMediaPropertyBag *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistMediaPropertyBag* This);
+        IPersistMediaPropertyBag *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistMediaPropertyBag* This);
+        IPersistMediaPropertyBag *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistMediaPropertyBag* This,
+        IPersistMediaPropertyBag *This,
         CLSID *pClassID);
 
     /*** IPersistMediaPropertyBag methods ***/
     HRESULT (STDMETHODCALLTYPE *InitNew)(
-        IPersistMediaPropertyBag* This);
+        IPersistMediaPropertyBag *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IPersistMediaPropertyBag* This,
+        IPersistMediaPropertyBag *This,
         IMediaPropertyBag *pPropBag,
         IErrorLog *pErrorLog);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IPersistMediaPropertyBag* This,
+        IPersistMediaPropertyBag *This,
         IMediaPropertyBag *pPropBag,
         WINBOOL fClearDirty,
         WINBOOL fSaveAllProperties);
 
     END_INTERFACE
 } IPersistMediaPropertyBagVtbl;
+
 interface IPersistMediaPropertyBag {
     CONST_VTBL IPersistMediaPropertyBagVtbl* lpVtbl;
 };
@@ -10085,32 +8546,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistMediaPropertyBag_InitNew_Proxy(
-    IPersistMediaPropertyBag* This);
-void __RPC_STUB IPersistMediaPropertyBag_InitNew_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMediaPropertyBag_Load_Proxy(
-    IPersistMediaPropertyBag* This,
-    IMediaPropertyBag *pPropBag,
-    IErrorLog *pErrorLog);
-void __RPC_STUB IPersistMediaPropertyBag_Load_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMediaPropertyBag_Save_Proxy(
-    IPersistMediaPropertyBag* This,
-    IMediaPropertyBag *pPropBag,
-    WINBOOL fClearDirty,
-    WINBOOL fSaveAllProperties);
-void __RPC_STUB IPersistMediaPropertyBag_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistMediaPropertyBag_INTERFACE_DEFINED__ */
 
@@ -10139,24 +8574,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISeekingPassThru* This,
+        ISeekingPassThru *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISeekingPassThru* This);
+        ISeekingPassThru *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISeekingPassThru* This);
+        ISeekingPassThru *This);
 
     /*** ISeekingPassThru methods ***/
     HRESULT (STDMETHODCALLTYPE *Init)(
-        ISeekingPassThru* This,
+        ISeekingPassThru *This,
         WINBOOL bSupportRendering,
         IPin *pPin);
 
     END_INTERFACE
 } ISeekingPassThruVtbl;
+
 interface ISeekingPassThru {
     CONST_VTBL ISeekingPassThruVtbl* lpVtbl;
 };
@@ -10189,15 +8625,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISeekingPassThru_Init_Proxy(
-    ISeekingPassThru* This,
-    WINBOOL bSupportRendering,
-    IPin *pPin);
-void __RPC_STUB ISeekingPassThru_Init_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISeekingPassThru_INTERFACE_DEFINED__ */
 
@@ -10205,7 +8632,6 @@
     AM_FILTER_MISC_FLAGS_IS_RENDERER = 0x1,
     AM_FILTER_MISC_FLAGS_IS_SOURCE = 0x2
 };
-
 /*****************************************************************************
  * IAMFilterMiscFlags interface
  */
@@ -10230,22 +8656,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMFilterMiscFlags* This,
+        IAMFilterMiscFlags *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMFilterMiscFlags* This);
+        IAMFilterMiscFlags *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMFilterMiscFlags* This);
+        IAMFilterMiscFlags *This);
 
     /*** IAMFilterMiscFlags methods ***/
     ULONG (STDMETHODCALLTYPE *GetMiscFlags)(
-        IAMFilterMiscFlags* This);
+        IAMFilterMiscFlags *This);
 
     END_INTERFACE
 } IAMFilterMiscFlagsVtbl;
+
 interface IAMFilterMiscFlags {
     CONST_VTBL IAMFilterMiscFlagsVtbl* lpVtbl;
 };
@@ -10278,13 +8705,6 @@
 
 #endif
 
-ULONG STDMETHODCALLTYPE IAMFilterMiscFlags_GetMiscFlags_Proxy(
-    IAMFilterMiscFlags* This);
-void __RPC_STUB IAMFilterMiscFlags_GetMiscFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMFilterMiscFlags_INTERFACE_DEFINED__ */
 
@@ -10315,27 +8735,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMGraphBuilderCallback* This,
+        IAMGraphBuilderCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMGraphBuilderCallback* This);
+        IAMGraphBuilderCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMGraphBuilderCallback* This);
+        IAMGraphBuilderCallback *This);
 
     /*** IAMGraphBuilderCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *SelectedFilter)(
-        IAMGraphBuilderCallback* This,
+        IAMGraphBuilderCallback *This,
         IMoniker *pMon);
 
     HRESULT (STDMETHODCALLTYPE *CreatedFilter)(
-        IAMGraphBuilderCallback* This,
+        IAMGraphBuilderCallback *This,
         IBaseFilter *pFil);
 
     END_INTERFACE
 } IAMGraphBuilderCallbackVtbl;
+
 interface IAMGraphBuilderCallback {
     CONST_VTBL IAMGraphBuilderCallbackVtbl* lpVtbl;
 };
@@ -10372,22 +8793,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMGraphBuilderCallback_SelectedFilter_Proxy(
-    IAMGraphBuilderCallback* This,
-    IMoniker *pMon);
-void __RPC_STUB IAMGraphBuilderCallback_SelectedFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMGraphBuilderCallback_CreatedFilter_Proxy(
-    IAMGraphBuilderCallback* This,
-    IBaseFilter *pFil);
-void __RPC_STUB IAMGraphBuilderCallback_CreatedFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMGraphBuilderCallback_INTERFACE_DEFINED__ */
 
@@ -10425,28 +8830,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMVfwCaptureDialogs* This,
+        IAMVfwCaptureDialogs *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMVfwCaptureDialogs* This);
+        IAMVfwCaptureDialogs *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMVfwCaptureDialogs* This);
+        IAMVfwCaptureDialogs *This);
 
     /*** IAMVfwCaptureDialogs methods ***/
     HRESULT (STDMETHODCALLTYPE *HasDialog)(
-        IAMVfwCaptureDialogs* This,
+        IAMVfwCaptureDialogs *This,
         int dialog);
 
     HRESULT (STDMETHODCALLTYPE *ShowDialog)(
-        IAMVfwCaptureDialogs* This,
+        IAMVfwCaptureDialogs *This,
         int dialog,
         HWND hwnd);
 
     HRESULT (STDMETHODCALLTYPE *SendDriverMessage)(
-        IAMVfwCaptureDialogs* This,
+        IAMVfwCaptureDialogs *This,
         int dialog,
         int msg,
         LONG data1,
@@ -10454,6 +8859,7 @@
 
     END_INTERFACE
 } IAMVfwCaptureDialogsVtbl;
+
 interface IAMVfwCaptureDialogs {
     CONST_VTBL IAMVfwCaptureDialogsVtbl* lpVtbl;
 };
@@ -10494,34 +8900,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMVfwCaptureDialogs_HasDialog_Proxy(
-    IAMVfwCaptureDialogs* This,
-    int dialog);
-void __RPC_STUB IAMVfwCaptureDialogs_HasDialog_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMVfwCaptureDialogs_ShowDialog_Proxy(
-    IAMVfwCaptureDialogs* This,
-    int dialog,
-    HWND hwnd);
-void __RPC_STUB IAMVfwCaptureDialogs_ShowDialog_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMVfwCaptureDialogs_SendDriverMessage_Proxy(
-    IAMVfwCaptureDialogs* This,
-    int dialog,
-    int msg,
-    LONG data1,
-    LONG data2);
-void __RPC_STUB IAMVfwCaptureDialogs_SendDriverMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMVfwCaptureDialogs_INTERFACE_DEFINED__ */
 
@@ -10553,27 +8931,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMAsyncReaderTimestampScaling* This,
+        IAMAsyncReaderTimestampScaling *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMAsyncReaderTimestampScaling* This);
+        IAMAsyncReaderTimestampScaling *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMAsyncReaderTimestampScaling* This);
+        IAMAsyncReaderTimestampScaling *This);
 
     /*** IAMAsyncReaderTimestampScaling methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTimestampMode)(
-        IAMAsyncReaderTimestampScaling* This,
+        IAMAsyncReaderTimestampScaling *This,
         WINBOOL *pfRaw);
 
     HRESULT (STDMETHODCALLTYPE *SetTimestampMode)(
-        IAMAsyncReaderTimestampScaling* This,
+        IAMAsyncReaderTimestampScaling *This,
         WINBOOL fRaw);
 
     END_INTERFACE
 } IAMAsyncReaderTimestampScalingVtbl;
+
 interface IAMAsyncReaderTimestampScaling {
     CONST_VTBL IAMAsyncReaderTimestampScalingVtbl* lpVtbl;
 };
@@ -10610,22 +8989,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMAsyncReaderTimestampScaling_GetTimestampMode_Proxy(
-    IAMAsyncReaderTimestampScaling* This,
-    WINBOOL *pfRaw);
-void __RPC_STUB IAMAsyncReaderTimestampScaling_GetTimestampMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMAsyncReaderTimestampScaling_SetTimestampMode_Proxy(
-    IAMAsyncReaderTimestampScaling* This,
-    WINBOOL fRaw);
-void __RPC_STUB IAMAsyncReaderTimestampScaling_SetTimestampMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMAsyncReaderTimestampScaling_INTERFACE_DEFINED__ */
 
@@ -10677,53 +9040,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAMPluginControl* This);
+        IAMPluginControl *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAMPluginControl* This);
+        IAMPluginControl *This);
 
     /*** IAMPluginControl methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPreferredClsid)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         REFGUID subType,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *GetPreferredClsidByIndex)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         DWORD index,
         GUID *subType,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *SetPreferredClsid)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         REFGUID subType,
         const CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *IsDisabled)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         REFCLSID clsid);
 
     HRESULT (STDMETHODCALLTYPE *GetDisabledByIndex)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         DWORD index,
         CLSID *clsid);
 
     HRESULT (STDMETHODCALLTYPE *SetDisabled)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         REFCLSID clsid,
         WINBOOL disabled);
 
     HRESULT (STDMETHODCALLTYPE *IsLegacyDisabled)(
-        IAMPluginControl* This,
+        IAMPluginControl *This,
         LPCWSTR dllName);
 
     END_INTERFACE
 } IAMPluginControlVtbl;
+
 interface IAMPluginControl {
     CONST_VTBL IAMPluginControlVtbl* lpVtbl;
 };
@@ -10780,68 +9144,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAMPluginControl_GetPreferredClsid_Proxy(
-    IAMPluginControl* This,
-    REFGUID subType,
-    CLSID *clsid);
-void __RPC_STUB IAMPluginControl_GetPreferredClsid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMPluginControl_GetPreferredClsidByIndex_Proxy(
-    IAMPluginControl* This,
-    DWORD index,
-    GUID *subType,
-    CLSID *clsid);
-void __RPC_STUB IAMPluginControl_GetPreferredClsidByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMPluginControl_SetPreferredClsid_Proxy(
-    IAMPluginControl* This,
-    REFGUID subType,
-    const CLSID *clsid);
-void __RPC_STUB IAMPluginControl_SetPreferredClsid_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMPluginControl_IsDisabled_Proxy(
-    IAMPluginControl* This,
-    REFCLSID clsid);
-void __RPC_STUB IAMPluginControl_IsDisabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMPluginControl_GetDisabledByIndex_Proxy(
-    IAMPluginControl* This,
-    DWORD index,
-    CLSID *clsid);
-void __RPC_STUB IAMPluginControl_GetDisabledByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMPluginControl_SetDisabled_Proxy(
-    IAMPluginControl* This,
-    REFCLSID clsid,
-    WINBOOL disabled);
-void __RPC_STUB IAMPluginControl_SetDisabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IAMPluginControl_IsLegacyDisabled_Proxy(
-    IAMPluginControl* This,
-    LPCWSTR dllName);
-void __RPC_STUB IAMPluginControl_IsLegacyDisabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAMPluginControl_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/structuredquerycondition.h b/mingw-w64-headers/include/structuredquerycondition.h
index 2441936..5f0713c 100644
--- a/mingw-w64-headers/include/structuredquerycondition.h
+++ b/mingw-w64-headers/include/structuredquerycondition.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/structuredquerycondition.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/structuredquerycondition.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,16 +20,25 @@
 #ifndef __IRichChunk_FWD_DEFINED__
 #define __IRichChunk_FWD_DEFINED__
 typedef interface IRichChunk IRichChunk;
+#ifdef __cplusplus
+interface IRichChunk;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICondition_FWD_DEFINED__
 #define __ICondition_FWD_DEFINED__
 typedef interface ICondition ICondition;
+#ifdef __cplusplus
+interface ICondition;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICondition2_FWD_DEFINED__
 #define __ICondition2_FWD_DEFINED__
 typedef interface ICondition2 ICondition2;
+#ifdef __cplusplus
+interface ICondition2;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -103,19 +112,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IRichChunk* This,
+        IRichChunk *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IRichChunk* This);
+        IRichChunk *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IRichChunk* This);
+        IRichChunk *This);
 
     /*** IRichChunk methods ***/
     HRESULT (STDMETHODCALLTYPE *GetData)(
-        IRichChunk* This,
+        IRichChunk *This,
         ULONG *pFirstPos,
         ULONG *pLength,
         LPWSTR *ppsz,
@@ -123,6 +132,7 @@
 
     END_INTERFACE
 } IRichChunkVtbl;
+
 interface IRichChunk {
     CONST_VTBL IRichChunkVtbl* lpVtbl;
 };
@@ -229,74 +239,75 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICondition* This,
+        ICondition *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICondition* This);
+        ICondition *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICondition* This);
+        ICondition *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        ICondition* This,
+        ICondition *This,
         CLSID *pClassID);
 
     /*** IPersistStream methods ***/
     HRESULT (STDMETHODCALLTYPE *IsDirty)(
-        ICondition* This);
+        ICondition *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        ICondition* This,
+        ICondition *This,
         IStream *pStm);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        ICondition* This,
+        ICondition *This,
         IStream *pStm,
         WINBOOL fClearDirty);
 
     HRESULT (STDMETHODCALLTYPE *GetSizeMax)(
-        ICondition* This,
+        ICondition *This,
         ULARGE_INTEGER *pcbSize);
 
     /*** ICondition methods ***/
     HRESULT (STDMETHODCALLTYPE *GetConditionType)(
-        ICondition* This,
+        ICondition *This,
         CONDITION_TYPE *pNodeType);
 
     HRESULT (STDMETHODCALLTYPE *GetSubConditions)(
-        ICondition* This,
+        ICondition *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetComparisonInfo)(
-        ICondition* This,
+        ICondition *This,
         LPWSTR *ppszPropertyName,
         CONDITION_OPERATION *pcop,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *GetValueType)(
-        ICondition* This,
+        ICondition *This,
         LPWSTR *ppszValueTypeName);
 
     HRESULT (STDMETHODCALLTYPE *GetValueNormalization)(
-        ICondition* This,
+        ICondition *This,
         LPWSTR *ppszNormalization);
 
     HRESULT (STDMETHODCALLTYPE *GetInputTerms)(
-        ICondition* This,
+        ICondition *This,
         IRichChunk **ppPropertyTerm,
         IRichChunk **ppOperationTerm,
         IRichChunk **ppValueTerm);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ICondition* This,
+        ICondition *This,
         ICondition **ppc);
 
     END_INTERFACE
 } IConditionVtbl;
+
 interface ICondition {
     CONST_VTBL IConditionVtbl* lpVtbl;
 };
@@ -377,23 +388,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICondition_GetConditionType_Proxy(
-    ICondition* This,
-    CONDITION_TYPE *pNodeType);
-void __RPC_STUB ICondition_GetConditionType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICondition_GetSubConditions_Proxy(
-    ICondition* This,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB ICondition_GetSubConditions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ICondition_RemoteGetComparisonInfo_Proxy(
     ICondition* This,
     LPWSTR *ppszPropertyName,
@@ -404,22 +398,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICondition_GetValueType_Proxy(
-    ICondition* This,
-    LPWSTR *ppszValueTypeName);
-void __RPC_STUB ICondition_GetValueType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICondition_GetValueNormalization_Proxy(
-    ICondition* This,
-    LPWSTR *ppszNormalization);
-void __RPC_STUB ICondition_GetValueNormalization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ICondition_RemoteGetInputTerms_Proxy(
     ICondition* This,
     IRichChunk **ppPropertyTerm,
@@ -430,14 +408,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICondition_Clone_Proxy(
-    ICondition* This,
-    ICondition **ppc);
-void __RPC_STUB ICondition_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK ICondition_GetComparisonInfo_Proxy(
     ICondition* This,
     LPWSTR *ppszPropertyName,
@@ -491,85 +461,86 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICondition2* This,
+        ICondition2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICondition2* This);
+        ICondition2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICondition2* This);
+        ICondition2 *This);
 
     /*** IPersist methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        ICondition2* This,
+        ICondition2 *This,
         CLSID *pClassID);
 
     /*** IPersistStream methods ***/
     HRESULT (STDMETHODCALLTYPE *IsDirty)(
-        ICondition2* This);
+        ICondition2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        ICondition2* This,
+        ICondition2 *This,
         IStream *pStm);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        ICondition2* This,
+        ICondition2 *This,
         IStream *pStm,
         WINBOOL fClearDirty);
 
     HRESULT (STDMETHODCALLTYPE *GetSizeMax)(
-        ICondition2* This,
+        ICondition2 *This,
         ULARGE_INTEGER *pcbSize);
 
     /*** ICondition methods ***/
     HRESULT (STDMETHODCALLTYPE *GetConditionType)(
-        ICondition2* This,
+        ICondition2 *This,
         CONDITION_TYPE *pNodeType);
 
     HRESULT (STDMETHODCALLTYPE *GetSubConditions)(
-        ICondition2* This,
+        ICondition2 *This,
         REFIID riid,
         void **ppv);
 
     HRESULT (STDMETHODCALLTYPE *GetComparisonInfo)(
-        ICondition2* This,
+        ICondition2 *This,
         LPWSTR *ppszPropertyName,
         CONDITION_OPERATION *pcop,
         PROPVARIANT *ppropvar);
 
     HRESULT (STDMETHODCALLTYPE *GetValueType)(
-        ICondition2* This,
+        ICondition2 *This,
         LPWSTR *ppszValueTypeName);
 
     HRESULT (STDMETHODCALLTYPE *GetValueNormalization)(
-        ICondition2* This,
+        ICondition2 *This,
         LPWSTR *ppszNormalization);
 
     HRESULT (STDMETHODCALLTYPE *GetInputTerms)(
-        ICondition2* This,
+        ICondition2 *This,
         IRichChunk **ppPropertyTerm,
         IRichChunk **ppOperationTerm,
         IRichChunk **ppValueTerm);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ICondition2* This,
+        ICondition2 *This,
         ICondition **ppc);
 
     /*** ICondition2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLocale)(
-        ICondition2* This,
+        ICondition2 *This,
         LPWSTR *ppszLocaleName);
 
     HRESULT (STDMETHODCALLTYPE *GetLeafConditionInfo)(
-        ICondition2* This,
+        ICondition2 *This,
         PROPERTYKEY *ppropkey,
         CONDITION_OPERATION *pcop,
         PROPVARIANT *ppropvar);
 
     END_INTERFACE
 } ICondition2Vtbl;
+
 interface ICondition2 {
     CONST_VTBL ICondition2Vtbl* lpVtbl;
 };
@@ -660,14 +631,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICondition2_GetLocale_Proxy(
-    ICondition2* This,
-    LPWSTR *ppszLocaleName);
-void __RPC_STUB ICondition2_GetLocale_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE ICondition2_RemoteGetLeafConditionInfo_Proxy(
     ICondition2* This,
     PROPERTYKEY *ppropkey,
diff --git a/mingw-w64-headers/include/taskschd.h b/mingw-w64-headers/include/taskschd.h
index 9d4226e..7b5c339 100644
--- a/mingw-w64-headers/include/taskschd.h
+++ b/mingw-w64-headers/include/taskschd.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/taskschd.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/taskschd.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/textstor.h b/mingw-w64-headers/include/textstor.h
index 0e051d7..a83a5b2 100644
--- a/mingw-w64-headers/include/textstor.h
+++ b/mingw-w64-headers/include/textstor.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/textstor.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/textstor.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,11 +20,17 @@
 #ifndef __ITextStoreACPSink_FWD_DEFINED__
 #define __ITextStoreACPSink_FWD_DEFINED__
 typedef interface ITextStoreACPSink ITextStoreACPSink;
+#ifdef __cplusplus
+interface ITextStoreACPSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITextStoreACP_FWD_DEFINED__
 #define __ITextStoreACP_FWD_DEFINED__
 typedef interface ITextStoreACP ITextStoreACP;
+#ifdef __cplusplus
+interface ITextStoreACP;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -201,53 +207,54 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITextStoreACPSink* This,
+        ITextStoreACPSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITextStoreACPSink* This);
+        ITextStoreACPSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITextStoreACPSink* This);
+        ITextStoreACPSink *This);
 
     /*** ITextStoreACPSink methods ***/
     HRESULT (STDMETHODCALLTYPE *OnTextChange)(
-        ITextStoreACPSink* This,
+        ITextStoreACPSink *This,
         DWORD dwFlags,
         const TS_TEXTCHANGE *pChange);
 
     HRESULT (STDMETHODCALLTYPE *OnSelectionChange)(
-        ITextStoreACPSink* This);
+        ITextStoreACPSink *This);
 
     HRESULT (STDMETHODCALLTYPE *OnLayoutChange)(
-        ITextStoreACPSink* This,
+        ITextStoreACPSink *This,
         TsLayoutCode lcode,
         TsViewCookie vcView);
 
     HRESULT (STDMETHODCALLTYPE *OnStatusChange)(
-        ITextStoreACPSink* This,
+        ITextStoreACPSink *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *OnAttrsChange)(
-        ITextStoreACPSink* This,
+        ITextStoreACPSink *This,
         LONG acpStart,
         LONG acpEnd,
         ULONG cAttrs,
         const TS_ATTRID *paAttrs);
 
     HRESULT (STDMETHODCALLTYPE *OnLockGranted)(
-        ITextStoreACPSink* This,
+        ITextStoreACPSink *This,
         DWORD dwLockFlags);
 
     HRESULT (STDMETHODCALLTYPE *OnStartEditTransaction)(
-        ITextStoreACPSink* This);
+        ITextStoreACPSink *This);
 
     HRESULT (STDMETHODCALLTYPE *OnEndEditTransaction)(
-        ITextStoreACPSink* This);
+        ITextStoreACPSink *This);
 
     END_INTERFACE
 } ITextStoreACPSinkVtbl;
+
 interface ITextStoreACPSink {
     CONST_VTBL ITextStoreACPSinkVtbl* lpVtbl;
 };
@@ -308,72 +315,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnTextChange_Proxy(
-    ITextStoreACPSink* This,
-    DWORD dwFlags,
-    const TS_TEXTCHANGE *pChange);
-void __RPC_STUB ITextStoreACPSink_OnTextChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnSelectionChange_Proxy(
-    ITextStoreACPSink* This);
-void __RPC_STUB ITextStoreACPSink_OnSelectionChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnLayoutChange_Proxy(
-    ITextStoreACPSink* This,
-    TsLayoutCode lcode,
-    TsViewCookie vcView);
-void __RPC_STUB ITextStoreACPSink_OnLayoutChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnStatusChange_Proxy(
-    ITextStoreACPSink* This,
-    DWORD dwFlags);
-void __RPC_STUB ITextStoreACPSink_OnStatusChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnAttrsChange_Proxy(
-    ITextStoreACPSink* This,
-    LONG acpStart,
-    LONG acpEnd,
-    ULONG cAttrs,
-    const TS_ATTRID *paAttrs);
-void __RPC_STUB ITextStoreACPSink_OnAttrsChange_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnLockGranted_Proxy(
-    ITextStoreACPSink* This,
-    DWORD dwLockFlags);
-void __RPC_STUB ITextStoreACPSink_OnLockGranted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnStartEditTransaction_Proxy(
-    ITextStoreACPSink* This);
-void __RPC_STUB ITextStoreACPSink_OnStartEditTransaction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACPSink_OnEndEditTransaction_Proxy(
-    ITextStoreACPSink* This);
-void __RPC_STUB ITextStoreACPSink_OnEndEditTransaction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITextStoreACPSink_INTERFACE_DEFINED__ */
 
@@ -546,38 +487,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITextStoreACP* This);
+        ITextStoreACP *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITextStoreACP* This);
+        ITextStoreACP *This);
 
     /*** ITextStoreACP methods ***/
     HRESULT (STDMETHODCALLTYPE *AdviseSink)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         REFIID riid,
         IUnknown *punk,
         DWORD dwMask);
 
     HRESULT (STDMETHODCALLTYPE *UnadviseSink)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         IUnknown *punk);
 
     HRESULT (STDMETHODCALLTYPE *RequestLock)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         DWORD dwLockFlags,
         HRESULT *phrSession);
 
     HRESULT (STDMETHODCALLTYPE *GetStatus)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         TS_STATUS *pdcs);
 
     HRESULT (STDMETHODCALLTYPE *QueryInsert)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG acpTestStart,
         LONG acpTestEnd,
         ULONG cch,
@@ -585,19 +526,19 @@
         LONG *pacpResultEnd);
 
     HRESULT (STDMETHODCALLTYPE *GetSelection)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         ULONG ulIndex,
         ULONG ulCount,
         TS_SELECTION_ACP *pSelection,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *SetSelection)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         ULONG ulCount,
         const TS_SELECTION_ACP *pSelection);
 
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG acpStart,
         LONG acpEnd,
         WCHAR *pchPlain,
@@ -609,7 +550,7 @@
         LONG *pacpNext);
 
     HRESULT (STDMETHODCALLTYPE *SetText)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         DWORD dwFlags,
         LONG acpStart,
         LONG acpEnd,
@@ -618,26 +559,26 @@
         TS_TEXTCHANGE *pChange);
 
     HRESULT (STDMETHODCALLTYPE *GetFormattedText)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG acpStart,
         LONG acpEnd,
         IDataObject **ppDataObject);
 
     HRESULT (STDMETHODCALLTYPE *GetEmbedded)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG acpPos,
         REFGUID rguidService,
         REFIID riid,
         IUnknown **ppunk);
 
     HRESULT (STDMETHODCALLTYPE *QueryInsertEmbedded)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         const GUID *pguidService,
         const FORMATETC *pFormatEtc,
         WINBOOL *pfInsertable);
 
     HRESULT (STDMETHODCALLTYPE *InsertEmbedded)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         DWORD dwFlags,
         LONG acpStart,
         LONG acpEnd,
@@ -645,7 +586,7 @@
         TS_TEXTCHANGE *pChange);
 
     HRESULT (STDMETHODCALLTYPE *InsertTextAtSelection)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         DWORD dwFlags,
         const WCHAR *pchText,
         ULONG cch,
@@ -654,7 +595,7 @@
         TS_TEXTCHANGE *pChange);
 
     HRESULT (STDMETHODCALLTYPE *InsertEmbeddedAtSelection)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         DWORD dwFlags,
         IDataObject *pDataObject,
         LONG *pacpStart,
@@ -662,27 +603,27 @@
         TS_TEXTCHANGE *pChange);
 
     HRESULT (STDMETHODCALLTYPE *RequestSupportedAttrs)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         DWORD dwFlags,
         ULONG cFilterAttrs,
         const TS_ATTRID *paFilterAttrs);
 
     HRESULT (STDMETHODCALLTYPE *RequestAttrsAtPosition)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG acpPos,
         ULONG cFilterAttrs,
         const TS_ATTRID *paFilterAttrs,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *RequestAttrsTransitioningAtPosition)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG acpPos,
         ULONG cFilterAttrs,
         const TS_ATTRID *paFilterAttrs,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *FindNextAttrTransition)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG acpStart,
         LONG acpHalt,
         ULONG cFilterAttrs,
@@ -693,28 +634,28 @@
         LONG *plFoundOffset);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveRequestedAttrs)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         ULONG ulCount,
         TS_ATTRVAL *paAttrVals,
         ULONG *pcFetched);
 
     HRESULT (STDMETHODCALLTYPE *GetEndACP)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         LONG *pacp);
 
     HRESULT (STDMETHODCALLTYPE *GetActiveView)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         TsViewCookie *pvcView);
 
     HRESULT (STDMETHODCALLTYPE *GetACPFromPoint)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         TsViewCookie vcView,
         const POINT *ptScreen,
         DWORD dwFlags,
         LONG *pacp);
 
     HRESULT (STDMETHODCALLTYPE *GetTextExt)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         TsViewCookie vcView,
         LONG acpStart,
         LONG acpEnd,
@@ -722,17 +663,18 @@
         WINBOOL *pfClipped);
 
     HRESULT (STDMETHODCALLTYPE *GetScreenExt)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         TsViewCookie vcView,
         RECT *prc);
 
     HRESULT (STDMETHODCALLTYPE *GetWnd)(
-        ITextStoreACP* This,
+        ITextStoreACP *This,
         TsViewCookie vcView,
         HWND *phwnd);
 
     END_INTERFACE
 } ITextStoreACPVtbl;
+
 interface ITextStoreACP {
     CONST_VTBL ITextStoreACPVtbl* lpVtbl;
 };
@@ -865,284 +807,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITextStoreACP_AdviseSink_Proxy(
-    ITextStoreACP* This,
-    REFIID riid,
-    IUnknown *punk,
-    DWORD dwMask);
-void __RPC_STUB ITextStoreACP_AdviseSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_UnadviseSink_Proxy(
-    ITextStoreACP* This,
-    IUnknown *punk);
-void __RPC_STUB ITextStoreACP_UnadviseSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestLock_Proxy(
-    ITextStoreACP* This,
-    DWORD dwLockFlags,
-    HRESULT *phrSession);
-void __RPC_STUB ITextStoreACP_RequestLock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetStatus_Proxy(
-    ITextStoreACP* This,
-    TS_STATUS *pdcs);
-void __RPC_STUB ITextStoreACP_GetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_QueryInsert_Proxy(
-    ITextStoreACP* This,
-    LONG acpTestStart,
-    LONG acpTestEnd,
-    ULONG cch,
-    LONG *pacpResultStart,
-    LONG *pacpResultEnd);
-void __RPC_STUB ITextStoreACP_QueryInsert_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetSelection_Proxy(
-    ITextStoreACP* This,
-    ULONG ulIndex,
-    ULONG ulCount,
-    TS_SELECTION_ACP *pSelection,
-    ULONG *pcFetched);
-void __RPC_STUB ITextStoreACP_GetSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_SetSelection_Proxy(
-    ITextStoreACP* This,
-    ULONG ulCount,
-    const TS_SELECTION_ACP *pSelection);
-void __RPC_STUB ITextStoreACP_SetSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetText_Proxy(
-    ITextStoreACP* This,
-    LONG acpStart,
-    LONG acpEnd,
-    WCHAR *pchPlain,
-    ULONG cchPlainReq,
-    ULONG *pcchPlainRet,
-    TS_RUNINFO *prgRunInfo,
-    ULONG cRunInfoReq,
-    ULONG *pcRunInfoRet,
-    LONG *pacpNext);
-void __RPC_STUB ITextStoreACP_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_SetText_Proxy(
-    ITextStoreACP* This,
-    DWORD dwFlags,
-    LONG acpStart,
-    LONG acpEnd,
-    const WCHAR *pchText,
-    ULONG cch,
-    TS_TEXTCHANGE *pChange);
-void __RPC_STUB ITextStoreACP_SetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetFormattedText_Proxy(
-    ITextStoreACP* This,
-    LONG acpStart,
-    LONG acpEnd,
-    IDataObject **ppDataObject);
-void __RPC_STUB ITextStoreACP_GetFormattedText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetEmbedded_Proxy(
-    ITextStoreACP* This,
-    LONG acpPos,
-    REFGUID rguidService,
-    REFIID riid,
-    IUnknown **ppunk);
-void __RPC_STUB ITextStoreACP_GetEmbedded_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_QueryInsertEmbedded_Proxy(
-    ITextStoreACP* This,
-    const GUID *pguidService,
-    const FORMATETC *pFormatEtc,
-    WINBOOL *pfInsertable);
-void __RPC_STUB ITextStoreACP_QueryInsertEmbedded_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_InsertEmbedded_Proxy(
-    ITextStoreACP* This,
-    DWORD dwFlags,
-    LONG acpStart,
-    LONG acpEnd,
-    IDataObject *pDataObject,
-    TS_TEXTCHANGE *pChange);
-void __RPC_STUB ITextStoreACP_InsertEmbedded_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_InsertTextAtSelection_Proxy(
-    ITextStoreACP* This,
-    DWORD dwFlags,
-    const WCHAR *pchText,
-    ULONG cch,
-    LONG *pacpStart,
-    LONG *pacpEnd,
-    TS_TEXTCHANGE *pChange);
-void __RPC_STUB ITextStoreACP_InsertTextAtSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_InsertEmbeddedAtSelection_Proxy(
-    ITextStoreACP* This,
-    DWORD dwFlags,
-    IDataObject *pDataObject,
-    LONG *pacpStart,
-    LONG *pacpEnd,
-    TS_TEXTCHANGE *pChange);
-void __RPC_STUB ITextStoreACP_InsertEmbeddedAtSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestSupportedAttrs_Proxy(
-    ITextStoreACP* This,
-    DWORD dwFlags,
-    ULONG cFilterAttrs,
-    const TS_ATTRID *paFilterAttrs);
-void __RPC_STUB ITextStoreACP_RequestSupportedAttrs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestAttrsAtPosition_Proxy(
-    ITextStoreACP* This,
-    LONG acpPos,
-    ULONG cFilterAttrs,
-    const TS_ATTRID *paFilterAttrs,
-    DWORD dwFlags);
-void __RPC_STUB ITextStoreACP_RequestAttrsAtPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_RequestAttrsTransitioningAtPosition_Proxy(
-    ITextStoreACP* This,
-    LONG acpPos,
-    ULONG cFilterAttrs,
-    const TS_ATTRID *paFilterAttrs,
-    DWORD dwFlags);
-void __RPC_STUB ITextStoreACP_RequestAttrsTransitioningAtPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_FindNextAttrTransition_Proxy(
-    ITextStoreACP* This,
-    LONG acpStart,
-    LONG acpHalt,
-    ULONG cFilterAttrs,
-    const TS_ATTRID *paFilterAttrs,
-    DWORD dwFlags,
-    LONG *pacpNext,
-    WINBOOL *pfFound,
-    LONG *plFoundOffset);
-void __RPC_STUB ITextStoreACP_FindNextAttrTransition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_RetrieveRequestedAttrs_Proxy(
-    ITextStoreACP* This,
-    ULONG ulCount,
-    TS_ATTRVAL *paAttrVals,
-    ULONG *pcFetched);
-void __RPC_STUB ITextStoreACP_RetrieveRequestedAttrs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetEndACP_Proxy(
-    ITextStoreACP* This,
-    LONG *pacp);
-void __RPC_STUB ITextStoreACP_GetEndACP_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetActiveView_Proxy(
-    ITextStoreACP* This,
-    TsViewCookie *pvcView);
-void __RPC_STUB ITextStoreACP_GetActiveView_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetACPFromPoint_Proxy(
-    ITextStoreACP* This,
-    TsViewCookie vcView,
-    const POINT *ptScreen,
-    DWORD dwFlags,
-    LONG *pacp);
-void __RPC_STUB ITextStoreACP_GetACPFromPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetTextExt_Proxy(
-    ITextStoreACP* This,
-    TsViewCookie vcView,
-    LONG acpStart,
-    LONG acpEnd,
-    RECT *prc,
-    WINBOOL *pfClipped);
-void __RPC_STUB ITextStoreACP_GetTextExt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetScreenExt_Proxy(
-    ITextStoreACP* This,
-    TsViewCookie vcView,
-    RECT *prc);
-void __RPC_STUB ITextStoreACP_GetScreenExt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITextStoreACP_GetWnd_Proxy(
-    ITextStoreACP* This,
-    TsViewCookie vcView,
-    HWND *phwnd);
-void __RPC_STUB ITextStoreACP_GetWnd_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITextStoreACP_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/tlbref.h b/mingw-w64-headers/include/tlbref.h
index 7ecc3cd..633a5b7 100644
--- a/mingw-w64-headers/include/tlbref.h
+++ b/mingw-w64-headers/include/tlbref.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/tlbref.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/tlbref.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __ITypeLibResolver_FWD_DEFINED__
 #define __ITypeLibResolver_FWD_DEFINED__
 typedef interface ITypeLibResolver ITypeLibResolver;
+#ifdef __cplusplus
+interface ITypeLibResolver;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -67,19 +70,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITypeLibResolver* This,
+        ITypeLibResolver *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITypeLibResolver* This);
+        ITypeLibResolver *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITypeLibResolver* This);
+        ITypeLibResolver *This);
 
     /*** ITypeLibResolver methods ***/
     HRESULT (STDMETHODCALLTYPE *ResolveTypeLib)(
-        ITypeLibResolver* This,
+        ITypeLibResolver *This,
         BSTR bstrSimpleName,
         GUID tlbid,
         LCID lcid,
@@ -90,6 +93,7 @@
 
     END_INTERFACE
 } ITypeLibResolverVtbl;
+
 interface ITypeLibResolver {
     CONST_VTBL ITypeLibResolverVtbl* lpVtbl;
 };
@@ -122,20 +126,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITypeLibResolver_ResolveTypeLib_Proxy(
-    ITypeLibResolver* This,
-    BSTR bstrSimpleName,
-    GUID tlbid,
-    LCID lcid,
-    USHORT wMajorVersion,
-    USHORT wMinorVersion,
-    SYSKIND syskind,
-    BSTR *pbstrResolvedTlbName);
-void __RPC_STUB ITypeLibResolver_ResolveTypeLib_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITypeLibResolver_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/tlogstg.h b/mingw-w64-headers/include/tlogstg.h
index cb46f01..d9020f7 100644
--- a/mingw-w64-headers/include/tlogstg.h
+++ b/mingw-w64-headers/include/tlogstg.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/tlogstg.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/tlogstg.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __ITravelLogEntry_FWD_DEFINED__
 #define __ITravelLogEntry_FWD_DEFINED__
 typedef interface ITravelLogEntry ITravelLogEntry;
+#ifdef __cplusplus
+interface ITravelLogEntry;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITravelLogClient_FWD_DEFINED__
 #define __ITravelLogClient_FWD_DEFINED__
 typedef interface ITravelLogClient ITravelLogClient;
+#ifdef __cplusplus
+interface ITravelLogClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumTravelLogEntry_FWD_DEFINED__
 #define __IEnumTravelLogEntry_FWD_DEFINED__
 typedef interface IEnumTravelLogEntry IEnumTravelLogEntry;
+#ifdef __cplusplus
+interface IEnumTravelLogEntry;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ITravelLogStg_FWD_DEFINED__
 #define __ITravelLogStg_FWD_DEFINED__
 typedef interface ITravelLogStg ITravelLogStg;
+#ifdef __cplusplus
+interface ITravelLogStg;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -65,7 +77,6 @@
     TLEF_ABSOLUTE = 0x31,
     TLEF_EXCLUDE_SUBFRAME_ENTRIES = 0x80
 };
-
 typedef struct _WINDOWDATA {
     DWORD dwWindowID;
     UINT uiCP;
@@ -104,27 +115,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITravelLogEntry* This,
+        ITravelLogEntry *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITravelLogEntry* This);
+        ITravelLogEntry *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITravelLogEntry* This);
+        ITravelLogEntry *This);
 
     /*** ITravelLogEntry methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTitle)(
-        ITravelLogEntry* This,
+        ITravelLogEntry *This,
         LPWSTR *ppszTitle);
 
     HRESULT (STDMETHODCALLTYPE *GetURL)(
-        ITravelLogEntry* This,
+        ITravelLogEntry *This,
         LPWSTR *ppszURL);
 
     END_INTERFACE
 } ITravelLogEntryVtbl;
+
 interface ITravelLogEntry {
     CONST_VTBL ITravelLogEntryVtbl* lpVtbl;
 };
@@ -161,22 +173,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITravelLogEntry_GetTitle_Proxy(
-    ITravelLogEntry* This,
-    LPWSTR *ppszTitle);
-void __RPC_STUB ITravelLogEntry_GetTitle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogEntry_GetURL_Proxy(
-    ITravelLogEntry* This,
-    LPWSTR *ppszURL);
-void __RPC_STUB ITravelLogEntry_GetURL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITravelLogEntry_INTERFACE_DEFINED__ */
 
@@ -213,34 +209,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITravelLogClient* This,
+        ITravelLogClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITravelLogClient* This);
+        ITravelLogClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITravelLogClient* This);
+        ITravelLogClient *This);
 
     /*** ITravelLogClient methods ***/
     HRESULT (STDMETHODCALLTYPE *FindWindowByIndex)(
-        ITravelLogClient* This,
+        ITravelLogClient *This,
         DWORD dwID,
         IUnknown **ppunk);
 
     HRESULT (STDMETHODCALLTYPE *GetWindowData)(
-        ITravelLogClient* This,
+        ITravelLogClient *This,
         IStream *pStream,
         LPWINDOWDATA pWinData);
 
     HRESULT (STDMETHODCALLTYPE *LoadHistoryPosition)(
-        ITravelLogClient* This,
+        ITravelLogClient *This,
         LPWSTR pszUrlLocation,
         DWORD dwPosition);
 
     END_INTERFACE
 } ITravelLogClientVtbl;
+
 interface ITravelLogClient {
     CONST_VTBL ITravelLogClientVtbl* lpVtbl;
 };
@@ -281,33 +278,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITravelLogClient_FindWindowByIndex_Proxy(
-    ITravelLogClient* This,
-    DWORD dwID,
-    IUnknown **ppunk);
-void __RPC_STUB ITravelLogClient_FindWindowByIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogClient_GetWindowData_Proxy(
-    ITravelLogClient* This,
-    IStream *pStream,
-    LPWINDOWDATA pWinData);
-void __RPC_STUB ITravelLogClient_GetWindowData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogClient_LoadHistoryPosition_Proxy(
-    ITravelLogClient* This,
-    LPWSTR pszUrlLocation,
-    DWORD dwPosition);
-void __RPC_STUB ITravelLogClient_LoadHistoryPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITravelLogClient_INTERFACE_DEFINED__ */
 
@@ -346,36 +316,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumTravelLogEntry* This,
+        IEnumTravelLogEntry *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumTravelLogEntry* This);
+        IEnumTravelLogEntry *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumTravelLogEntry* This);
+        IEnumTravelLogEntry *This);
 
     /*** IEnumTravelLogEntry methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumTravelLogEntry* This,
+        IEnumTravelLogEntry *This,
         ULONG cElt,
         ITravelLogEntry **rgElt,
         ULONG *pcEltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumTravelLogEntry* This,
+        IEnumTravelLogEntry *This,
         ULONG cElt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumTravelLogEntry* This);
+        IEnumTravelLogEntry *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumTravelLogEntry* This,
+        IEnumTravelLogEntry *This,
         IEnumTravelLogEntry **ppEnum);
 
     END_INTERFACE
 } IEnumTravelLogEntryVtbl;
+
 interface IEnumTravelLogEntry {
     CONST_VTBL IEnumTravelLogEntryVtbl* lpVtbl;
 };
@@ -420,39 +391,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Next_Proxy(
-    IEnumTravelLogEntry* This,
-    ULONG cElt,
-    ITravelLogEntry **rgElt,
-    ULONG *pcEltFetched);
-void __RPC_STUB IEnumTravelLogEntry_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Skip_Proxy(
-    IEnumTravelLogEntry* This,
-    ULONG cElt);
-void __RPC_STUB IEnumTravelLogEntry_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Reset_Proxy(
-    IEnumTravelLogEntry* This);
-void __RPC_STUB IEnumTravelLogEntry_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumTravelLogEntry_Clone_Proxy(
-    IEnumTravelLogEntry* This,
-    IEnumTravelLogEntry **ppEnum);
-void __RPC_STUB IEnumTravelLogEntry_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumTravelLogEntry_INTERFACE_DEFINED__ */
 
@@ -507,19 +445,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ITravelLogStg* This);
+        ITravelLogStg *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ITravelLogStg* This);
+        ITravelLogStg *This);
 
     /*** ITravelLogStg methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateEntry)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         LPCWSTR pszUrl,
         LPCWSTR pszTitle,
         ITravelLogEntry *ptleRelativeTo,
@@ -527,36 +465,37 @@
         ITravelLogEntry **pptle);
 
     HRESULT (STDMETHODCALLTYPE *TravelTo)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         ITravelLogEntry *ptle);
 
     HRESULT (STDMETHODCALLTYPE *EnumEntries)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         TLENUMF flags,
         IEnumTravelLogEntry **ppenum);
 
     HRESULT (STDMETHODCALLTYPE *FindEntries)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         TLENUMF flags,
         LPCWSTR pszUrl,
         IEnumTravelLogEntry **ppenum);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         TLENUMF flags,
         DWORD *pcEntries);
 
     HRESULT (STDMETHODCALLTYPE *RemoveEntry)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         ITravelLogEntry *ptle);
 
     HRESULT (STDMETHODCALLTYPE *GetRelativeEntry)(
-        ITravelLogStg* This,
+        ITravelLogStg *This,
         int iOffset,
         ITravelLogEntry **ptle);
 
     END_INTERFACE
 } ITravelLogStgVtbl;
+
 interface ITravelLogStg {
     CONST_VTBL ITravelLogStgVtbl* lpVtbl;
 };
@@ -613,71 +552,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ITravelLogStg_CreateEntry_Proxy(
-    ITravelLogStg* This,
-    LPCWSTR pszUrl,
-    LPCWSTR pszTitle,
-    ITravelLogEntry *ptleRelativeTo,
-    WINBOOL fPrepend,
-    ITravelLogEntry **pptle);
-void __RPC_STUB ITravelLogStg_CreateEntry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogStg_TravelTo_Proxy(
-    ITravelLogStg* This,
-    ITravelLogEntry *ptle);
-void __RPC_STUB ITravelLogStg_TravelTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogStg_EnumEntries_Proxy(
-    ITravelLogStg* This,
-    TLENUMF flags,
-    IEnumTravelLogEntry **ppenum);
-void __RPC_STUB ITravelLogStg_EnumEntries_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogStg_FindEntries_Proxy(
-    ITravelLogStg* This,
-    TLENUMF flags,
-    LPCWSTR pszUrl,
-    IEnumTravelLogEntry **ppenum);
-void __RPC_STUB ITravelLogStg_FindEntries_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogStg_GetCount_Proxy(
-    ITravelLogStg* This,
-    TLENUMF flags,
-    DWORD *pcEntries);
-void __RPC_STUB ITravelLogStg_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogStg_RemoveEntry_Proxy(
-    ITravelLogStg* This,
-    ITravelLogEntry *ptle);
-void __RPC_STUB ITravelLogStg_RemoveEntry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ITravelLogStg_GetRelativeEntry_Proxy(
-    ITravelLogStg* This,
-    int iOffset,
-    ITravelLogEntry **ptle);
-void __RPC_STUB ITravelLogStg_GetRelativeEntry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ITravelLogStg_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/tpcshrd.h b/mingw-w64-headers/include/tpcshrd.h
index b114270..3e57ad6 100644
--- a/mingw-w64-headers/include/tpcshrd.h
+++ b/mingw-w64-headers/include/tpcshrd.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/tpcshrd.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/tpcshrd.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/uianimation.h b/mingw-w64-headers/include/uianimation.h
index 0518c2a..e9e6da7 100644
--- a/mingw-w64-headers/include/uianimation.h
+++ b/mingw-w64-headers/include/uianimation.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.1 from include/uianimation.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/uianimation.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/uiautomationclient.h b/mingw-w64-headers/include/uiautomationclient.h
index 235e235..83c40c8 100644
--- a/mingw-w64-headers/include/uiautomationclient.h
+++ b/mingw-w64-headers/include/uiautomationclient.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/uiautomationclient.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/uiautomationclient.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/uiautomationcore.h b/mingw-w64-headers/include/uiautomationcore.h
index 7d34763..1cd0104 100644
--- a/mingw-w64-headers/include/uiautomationcore.h
+++ b/mingw-w64-headers/include/uiautomationcore.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/uiautomationcore.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/uiautomationcore.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/uiviewsettingsinterop.h b/mingw-w64-headers/include/uiviewsettingsinterop.h
index a097e9f..0cb6a1b 100644
--- a/mingw-w64-headers/include/uiviewsettingsinterop.h
+++ b/mingw-w64-headers/include/uiviewsettingsinterop.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/uiviewsettingsinterop.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/uiviewsettingsinterop.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IUIViewSettingsInterop_FWD_DEFINED__
 #define __IUIViewSettingsInterop_FWD_DEFINED__
 typedef interface IUIViewSettingsInterop IUIViewSettingsInterop;
+#ifdef __cplusplus
+interface IUIViewSettingsInterop;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -56,39 +59,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUIViewSettingsInterop* This,
+        IUIViewSettingsInterop *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUIViewSettingsInterop* This);
+        IUIViewSettingsInterop *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUIViewSettingsInterop* This);
+        IUIViewSettingsInterop *This);
 
     /*** IInspectable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetIids)(
-        IUIViewSettingsInterop* This,
+        IUIViewSettingsInterop *This,
         ULONG *iidCount,
         IID **iids);
 
     HRESULT (STDMETHODCALLTYPE *GetRuntimeClassName)(
-        IUIViewSettingsInterop* This,
+        IUIViewSettingsInterop *This,
         HSTRING *className);
 
     HRESULT (STDMETHODCALLTYPE *GetTrustLevel)(
-        IUIViewSettingsInterop* This,
+        IUIViewSettingsInterop *This,
         TrustLevel *trustLevel);
 
     /*** IUIViewSettingsInterop methods ***/
     HRESULT (STDMETHODCALLTYPE *GetForWindow)(
-        IUIViewSettingsInterop* This,
+        IUIViewSettingsInterop *This,
         HWND hwnd,
         REFIID riid,
         void **ppv);
 
     END_INTERFACE
 } IUIViewSettingsInteropVtbl;
+
 interface IUIViewSettingsInterop {
     CONST_VTBL IUIViewSettingsInteropVtbl* lpVtbl;
 };
@@ -135,16 +139,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUIViewSettingsInterop_GetForWindow_Proxy(
-    IUIViewSettingsInterop* This,
-    HWND hwnd,
-    REFIID riid,
-    void **ppv);
-void __RPC_STUB IUIViewSettingsInterop_GetForWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUIViewSettingsInterop_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/unknwn.h b/mingw-w64-headers/include/unknwn.h
index f3942e9..3a94db5 100644
--- a/mingw-w64-headers/include/unknwn.h
+++ b/mingw-w64-headers/include/unknwn.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/unknwn.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/unknwn.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,16 +20,25 @@
 #ifndef __IUnknown_FWD_DEFINED__
 #define __IUnknown_FWD_DEFINED__
 typedef interface IUnknown IUnknown;
+#ifdef __cplusplus
+interface IUnknown;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __AsyncIUnknown_FWD_DEFINED__
 #define __AsyncIUnknown_FWD_DEFINED__
 typedef interface AsyncIUnknown AsyncIUnknown;
+#ifdef __cplusplus
+interface AsyncIUnknown;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IClassFactory_FWD_DEFINED__
 #define __IClassFactory_FWD_DEFINED__
 typedef interface IClassFactory IClassFactory;
+#ifdef __cplusplus
+interface IClassFactory;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -93,6 +102,7 @@
 MIDL_INTERFACE("00000000-0000-0000-c000-000000000046")
 IUnknown
 {
+
     BEGIN_INTERFACE
 
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(
@@ -106,6 +116,7 @@
         ) = 0;
 
     END_INTERFACE
+
 };
 #ifdef __CRT_UUID_DECL
 __CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46)
@@ -116,18 +127,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUnknown* This,
+        IUnknown *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUnknown* This);
+        IUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUnknown* This);
+        IUnknown *This);
 
     END_INTERFACE
 } IUnknownVtbl;
+
 interface IUnknown {
     CONST_VTBL IUnknownVtbl* lpVtbl;
 };
@@ -154,29 +166,6 @@
 
 #endif
 
-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);
 
 #endif  /* __IUnknown_INTERFACE_DEFINED__ */
 
@@ -223,39 +212,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        AsyncIUnknown* This,
+        AsyncIUnknown *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     /*** AsyncIUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *Begin_QueryInterface)(
-        AsyncIUnknown* This,
+        AsyncIUnknown *This,
         REFIID riid);
 
     HRESULT (STDMETHODCALLTYPE *Finish_QueryInterface)(
-        AsyncIUnknown* This,
+        AsyncIUnknown *This,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *Begin_AddRef)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Finish_AddRef)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     HRESULT (STDMETHODCALLTYPE *Begin_Release)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Finish_Release)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     END_INTERFACE
 } AsyncIUnknownVtbl;
+
 interface AsyncIUnknown {
     CONST_VTBL AsyncIUnknownVtbl* lpVtbl;
 };
@@ -308,50 +298,6 @@
 
 #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__ */
 
@@ -389,29 +335,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IClassFactory* This,
+        IClassFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IClassFactory* This);
+        IClassFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IClassFactory* This);
+        IClassFactory *This);
 
     /*** IClassFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        IClassFactory* This,
+        IClassFactory *This,
         IUnknown *pUnkOuter,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *LockServer)(
-        IClassFactory* This,
+        IClassFactory *This,
         WINBOOL fLock);
 
     END_INTERFACE
 } IClassFactoryVtbl;
+
 interface IClassFactory {
     CONST_VTBL IClassFactoryVtbl* lpVtbl;
 };
diff --git a/mingw-w64-headers/include/unknwnbase.h b/mingw-w64-headers/include/unknwnbase.h
index 297f884..54ea256 100644
--- a/mingw-w64-headers/include/unknwnbase.h
+++ b/mingw-w64-headers/include/unknwnbase.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/unknwnbase.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/unknwnbase.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,16 +20,25 @@
 #ifndef __IUnknown_FWD_DEFINED__
 #define __IUnknown_FWD_DEFINED__
 typedef interface IUnknown IUnknown;
+#ifdef __cplusplus
+interface IUnknown;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __AsyncIUnknown_FWD_DEFINED__
 #define __AsyncIUnknown_FWD_DEFINED__
 typedef interface AsyncIUnknown AsyncIUnknown;
+#ifdef __cplusplus
+interface AsyncIUnknown;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IClassFactory_FWD_DEFINED__
 #define __IClassFactory_FWD_DEFINED__
 typedef interface IClassFactory IClassFactory;
+#ifdef __cplusplus
+interface IClassFactory;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -89,6 +98,7 @@
 MIDL_INTERFACE("00000000-0000-0000-c000-000000000046")
 IUnknown
 {
+
     BEGIN_INTERFACE
 
     virtual HRESULT STDMETHODCALLTYPE QueryInterface(
@@ -102,6 +112,7 @@
         ) = 0;
 
     END_INTERFACE
+
 };
 #ifdef __CRT_UUID_DECL
 __CRT_UUID_DECL(IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,0x00,0x00,0x00,0x46)
@@ -112,18 +123,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUnknown* This,
+        IUnknown *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUnknown* This);
+        IUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUnknown* This);
+        IUnknown *This);
 
     END_INTERFACE
 } IUnknownVtbl;
+
 interface IUnknown {
     CONST_VTBL IUnknownVtbl* lpVtbl;
 };
@@ -150,29 +162,6 @@
 
 #endif
 
-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);
 
 #endif  /* __IUnknown_INTERFACE_DEFINED__ */
 
@@ -219,39 +208,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        AsyncIUnknown* This,
+        AsyncIUnknown *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     /*** AsyncIUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *Begin_QueryInterface)(
-        AsyncIUnknown* This,
+        AsyncIUnknown *This,
         REFIID riid);
 
     HRESULT (STDMETHODCALLTYPE *Finish_QueryInterface)(
-        AsyncIUnknown* This,
+        AsyncIUnknown *This,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *Begin_AddRef)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Finish_AddRef)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     HRESULT (STDMETHODCALLTYPE *Begin_Release)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     ULONG (STDMETHODCALLTYPE *Finish_Release)(
-        AsyncIUnknown* This);
+        AsyncIUnknown *This);
 
     END_INTERFACE
 } AsyncIUnknownVtbl;
+
 interface AsyncIUnknown {
     CONST_VTBL AsyncIUnknownVtbl* lpVtbl;
 };
@@ -304,50 +294,6 @@
 
 #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__ */
 
@@ -385,29 +331,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IClassFactory* This,
+        IClassFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IClassFactory* This);
+        IClassFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IClassFactory* This);
+        IClassFactory *This);
 
     /*** IClassFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        IClassFactory* This,
+        IClassFactory *This,
         IUnknown *pUnkOuter,
         REFIID riid,
         void **ppvObject);
 
     HRESULT (STDMETHODCALLTYPE *LockServer)(
-        IClassFactory* This,
+        IClassFactory *This,
         WINBOOL fLock);
 
     END_INTERFACE
 } IClassFactoryVtbl;
+
 interface IClassFactory {
     CONST_VTBL IClassFactoryVtbl* lpVtbl;
 };
diff --git a/mingw-w64-headers/include/urlhist.h b/mingw-w64-headers/include/urlhist.h
index bf63573..cb69b2f 100644
--- a/mingw-w64-headers/include/urlhist.h
+++ b/mingw-w64-headers/include/urlhist.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/urlhist.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/urlhist.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/urlmon.h b/mingw-w64-headers/include/urlmon.h
index e1b6287..473f488 100644
--- a/mingw-w64-headers/include/urlmon.h
+++ b/mingw-w64-headers/include/urlmon.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/urlmon.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/urlmon.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,266 +20,425 @@
 #ifndef __IPersistMoniker_FWD_DEFINED__
 #define __IPersistMoniker_FWD_DEFINED__
 typedef interface IPersistMoniker IPersistMoniker;
+#ifdef __cplusplus
+interface IPersistMoniker;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMonikerProp_FWD_DEFINED__
 #define __IMonikerProp_FWD_DEFINED__
 typedef interface IMonikerProp IMonikerProp;
+#ifdef __cplusplus
+interface IMonikerProp;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindProtocol_FWD_DEFINED__
 #define __IBindProtocol_FWD_DEFINED__
 typedef interface IBindProtocol IBindProtocol;
+#ifdef __cplusplus
+interface IBindProtocol;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBinding_FWD_DEFINED__
 #define __IBinding_FWD_DEFINED__
 typedef interface IBinding IBinding;
+#ifdef __cplusplus
+interface IBinding;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindStatusCallback_FWD_DEFINED__
 #define __IBindStatusCallback_FWD_DEFINED__
 typedef interface IBindStatusCallback IBindStatusCallback;
+#ifdef __cplusplus
+interface IBindStatusCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindStatusCallbackEx_FWD_DEFINED__
 #define __IBindStatusCallbackEx_FWD_DEFINED__
 typedef interface IBindStatusCallbackEx IBindStatusCallbackEx;
+#ifdef __cplusplus
+interface IBindStatusCallbackEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAuthenticate_FWD_DEFINED__
 #define __IAuthenticate_FWD_DEFINED__
 typedef interface IAuthenticate IAuthenticate;
+#ifdef __cplusplus
+interface IAuthenticate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAuthenticateEx_FWD_DEFINED__
 #define __IAuthenticateEx_FWD_DEFINED__
 typedef interface IAuthenticateEx IAuthenticateEx;
+#ifdef __cplusplus
+interface IAuthenticateEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHttpNegotiate_FWD_DEFINED__
 #define __IHttpNegotiate_FWD_DEFINED__
 typedef interface IHttpNegotiate IHttpNegotiate;
+#ifdef __cplusplus
+interface IHttpNegotiate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHttpNegotiate2_FWD_DEFINED__
 #define __IHttpNegotiate2_FWD_DEFINED__
 typedef interface IHttpNegotiate2 IHttpNegotiate2;
+#ifdef __cplusplus
+interface IHttpNegotiate2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHttpNegotiate3_FWD_DEFINED__
 #define __IHttpNegotiate3_FWD_DEFINED__
 typedef interface IHttpNegotiate3 IHttpNegotiate3;
+#ifdef __cplusplus
+interface IHttpNegotiate3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWinInetFileStream_FWD_DEFINED__
 #define __IWinInetFileStream_FWD_DEFINED__
 typedef interface IWinInetFileStream IWinInetFileStream;
+#ifdef __cplusplus
+interface IWinInetFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWindowForBindingUI_FWD_DEFINED__
 #define __IWindowForBindingUI_FWD_DEFINED__
 typedef interface IWindowForBindingUI IWindowForBindingUI;
+#ifdef __cplusplus
+interface IWindowForBindingUI;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICodeInstall_FWD_DEFINED__
 #define __ICodeInstall_FWD_DEFINED__
 typedef interface ICodeInstall ICodeInstall;
+#ifdef __cplusplus
+interface ICodeInstall;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUri_FWD_DEFINED__
 #define __IUri_FWD_DEFINED__
 typedef interface IUri IUri;
+#ifdef __cplusplus
+interface IUri;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUriContainer_FWD_DEFINED__
 #define __IUriContainer_FWD_DEFINED__
 typedef interface IUriContainer IUriContainer;
+#ifdef __cplusplus
+interface IUriContainer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUriBuilder_FWD_DEFINED__
 #define __IUriBuilder_FWD_DEFINED__
 typedef interface IUriBuilder IUriBuilder;
+#ifdef __cplusplus
+interface IUriBuilder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUriBuilderFactory_FWD_DEFINED__
 #define __IUriBuilderFactory_FWD_DEFINED__
 typedef interface IUriBuilderFactory IUriBuilderFactory;
+#ifdef __cplusplus
+interface IUriBuilderFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWinInetInfo_FWD_DEFINED__
 #define __IWinInetInfo_FWD_DEFINED__
 typedef interface IWinInetInfo IWinInetInfo;
+#ifdef __cplusplus
+interface IWinInetInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHttpSecurity_FWD_DEFINED__
 #define __IHttpSecurity_FWD_DEFINED__
 typedef interface IHttpSecurity IHttpSecurity;
+#ifdef __cplusplus
+interface IHttpSecurity;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWinInetHttpInfo_FWD_DEFINED__
 #define __IWinInetHttpInfo_FWD_DEFINED__
 typedef interface IWinInetHttpInfo IWinInetHttpInfo;
+#ifdef __cplusplus
+interface IWinInetHttpInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWinInetHttpTimeouts_FWD_DEFINED__
 #define __IWinInetHttpTimeouts_FWD_DEFINED__
 typedef interface IWinInetHttpTimeouts IWinInetHttpTimeouts;
+#ifdef __cplusplus
+interface IWinInetHttpTimeouts;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWinInetCacheHints_FWD_DEFINED__
 #define __IWinInetCacheHints_FWD_DEFINED__
 typedef interface IWinInetCacheHints IWinInetCacheHints;
+#ifdef __cplusplus
+interface IWinInetCacheHints;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWinInetCacheHints2_FWD_DEFINED__
 #define __IWinInetCacheHints2_FWD_DEFINED__
 typedef interface IWinInetCacheHints2 IWinInetCacheHints2;
+#ifdef __cplusplus
+interface IWinInetCacheHints2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindHost_FWD_DEFINED__
 #define __IBindHost_FWD_DEFINED__
 typedef interface IBindHost IBindHost;
+#ifdef __cplusplus
+interface IBindHost;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternet_FWD_DEFINED__
 #define __IInternet_FWD_DEFINED__
 typedef interface IInternet IInternet;
+#ifdef __cplusplus
+interface IInternet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetBindInfo_FWD_DEFINED__
 #define __IInternetBindInfo_FWD_DEFINED__
 typedef interface IInternetBindInfo IInternetBindInfo;
+#ifdef __cplusplus
+interface IInternetBindInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetBindInfoEx_FWD_DEFINED__
 #define __IInternetBindInfoEx_FWD_DEFINED__
 typedef interface IInternetBindInfoEx IInternetBindInfoEx;
+#ifdef __cplusplus
+interface IInternetBindInfoEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolRoot_FWD_DEFINED__
 #define __IInternetProtocolRoot_FWD_DEFINED__
 typedef interface IInternetProtocolRoot IInternetProtocolRoot;
+#ifdef __cplusplus
+interface IInternetProtocolRoot;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocol_FWD_DEFINED__
 #define __IInternetProtocol_FWD_DEFINED__
 typedef interface IInternetProtocol IInternetProtocol;
+#ifdef __cplusplus
+interface IInternetProtocol;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolEx_FWD_DEFINED__
 #define __IInternetProtocolEx_FWD_DEFINED__
 typedef interface IInternetProtocolEx IInternetProtocolEx;
+#ifdef __cplusplus
+interface IInternetProtocolEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolSink_FWD_DEFINED__
 #define __IInternetProtocolSink_FWD_DEFINED__
 typedef interface IInternetProtocolSink IInternetProtocolSink;
+#ifdef __cplusplus
+interface IInternetProtocolSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolSinkStackable_FWD_DEFINED__
 #define __IInternetProtocolSinkStackable_FWD_DEFINED__
 typedef interface IInternetProtocolSinkStackable IInternetProtocolSinkStackable;
+#ifdef __cplusplus
+interface IInternetProtocolSinkStackable;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetSession_FWD_DEFINED__
 #define __IInternetSession_FWD_DEFINED__
 typedef interface IInternetSession IInternetSession;
+#ifdef __cplusplus
+interface IInternetSession;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetThreadSwitch_FWD_DEFINED__
 #define __IInternetThreadSwitch_FWD_DEFINED__
 typedef interface IInternetThreadSwitch IInternetThreadSwitch;
+#ifdef __cplusplus
+interface IInternetThreadSwitch;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetPriority_FWD_DEFINED__
 #define __IInternetPriority_FWD_DEFINED__
 typedef interface IInternetPriority IInternetPriority;
+#ifdef __cplusplus
+interface IInternetPriority;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolInfo_FWD_DEFINED__
 #define __IInternetProtocolInfo_FWD_DEFINED__
 typedef interface IInternetProtocolInfo IInternetProtocolInfo;
+#ifdef __cplusplus
+interface IInternetProtocolInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetSecurityMgrSite_FWD_DEFINED__
 #define __IInternetSecurityMgrSite_FWD_DEFINED__
 typedef interface IInternetSecurityMgrSite IInternetSecurityMgrSite;
+#ifdef __cplusplus
+interface IInternetSecurityMgrSite;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetSecurityManager_FWD_DEFINED__
 #define __IInternetSecurityManager_FWD_DEFINED__
 typedef interface IInternetSecurityManager IInternetSecurityManager;
+#ifdef __cplusplus
+interface IInternetSecurityManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetSecurityManagerEx_FWD_DEFINED__
 #define __IInternetSecurityManagerEx_FWD_DEFINED__
 typedef interface IInternetSecurityManagerEx IInternetSecurityManagerEx;
+#ifdef __cplusplus
+interface IInternetSecurityManagerEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetSecurityManagerEx2_FWD_DEFINED__
 #define __IInternetSecurityManagerEx2_FWD_DEFINED__
 typedef interface IInternetSecurityManagerEx2 IInternetSecurityManagerEx2;
+#ifdef __cplusplus
+interface IInternetSecurityManagerEx2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IZoneIdentifier_FWD_DEFINED__
 #define __IZoneIdentifier_FWD_DEFINED__
 typedef interface IZoneIdentifier IZoneIdentifier;
+#ifdef __cplusplus
+interface IZoneIdentifier;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetHostSecurityManager_FWD_DEFINED__
 #define __IInternetHostSecurityManager_FWD_DEFINED__
 typedef interface IInternetHostSecurityManager IInternetHostSecurityManager;
+#ifdef __cplusplus
+interface IInternetHostSecurityManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetZoneManager_FWD_DEFINED__
 #define __IInternetZoneManager_FWD_DEFINED__
 typedef interface IInternetZoneManager IInternetZoneManager;
+#ifdef __cplusplus
+interface IInternetZoneManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetZoneManagerEx_FWD_DEFINED__
 #define __IInternetZoneManagerEx_FWD_DEFINED__
 typedef interface IInternetZoneManagerEx IInternetZoneManagerEx;
+#ifdef __cplusplus
+interface IInternetZoneManagerEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetZoneManagerEx2_FWD_DEFINED__
 #define __IInternetZoneManagerEx2_FWD_DEFINED__
 typedef interface IInternetZoneManagerEx2 IInternetZoneManagerEx2;
+#ifdef __cplusplus
+interface IInternetZoneManagerEx2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISoftDistExt_FWD_DEFINED__
 #define __ISoftDistExt_FWD_DEFINED__
 typedef interface ISoftDistExt ISoftDistExt;
+#ifdef __cplusplus
+interface ISoftDistExt;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICatalogFileInfo_FWD_DEFINED__
 #define __ICatalogFileInfo_FWD_DEFINED__
 typedef interface ICatalogFileInfo ICatalogFileInfo;
+#ifdef __cplusplus
+interface ICatalogFileInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IDataFilter_FWD_DEFINED__
 #define __IDataFilter_FWD_DEFINED__
 typedef interface IDataFilter IDataFilter;
+#ifdef __cplusplus
+interface IDataFilter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEncodingFilterFactory_FWD_DEFINED__
 #define __IEncodingFilterFactory_FWD_DEFINED__
 typedef interface IEncodingFilterFactory IEncodingFilterFactory;
+#ifdef __cplusplus
+interface IEncodingFilterFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWrappedProtocol_FWD_DEFINED__
 #define __IWrappedProtocol_FWD_DEFINED__
 typedef interface IWrappedProtocol IWrappedProtocol;
+#ifdef __cplusplus
+interface IWrappedProtocol;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IGetBindHandle_FWD_DEFINED__
 #define __IGetBindHandle_FWD_DEFINED__
 typedef interface IGetBindHandle IGetBindHandle;
+#ifdef __cplusplus
+interface IGetBindHandle;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindCallbackRedirect_FWD_DEFINED__
 #define __IBindCallbackRedirect_FWD_DEFINED__
 typedef interface IBindCallbackRedirect IBindCallbackRedirect;
+#ifdef __cplusplus
+interface IBindCallbackRedirect;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -306,76 +465,121 @@
 #ifndef __IPersistMoniker_FWD_DEFINED__
 #define __IPersistMoniker_FWD_DEFINED__
 typedef interface IPersistMoniker IPersistMoniker;
+#ifdef __cplusplus
+interface IPersistMoniker;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindProtocol_FWD_DEFINED__
 #define __IBindProtocol_FWD_DEFINED__
 typedef interface IBindProtocol IBindProtocol;
+#ifdef __cplusplus
+interface IBindProtocol;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBinding_FWD_DEFINED__
 #define __IBinding_FWD_DEFINED__
 typedef interface IBinding IBinding;
+#ifdef __cplusplus
+interface IBinding;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindStatusCallback_FWD_DEFINED__
 #define __IBindStatusCallback_FWD_DEFINED__
 typedef interface IBindStatusCallback IBindStatusCallback;
+#ifdef __cplusplus
+interface IBindStatusCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindStatusCallbackEx_FWD_DEFINED__
 #define __IBindStatusCallbackEx_FWD_DEFINED__
 typedef interface IBindStatusCallbackEx IBindStatusCallbackEx;
+#ifdef __cplusplus
+interface IBindStatusCallbackEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IBindStatusCallbackMsg_FWD_DEFINED__
 #define __IBindStatusCallbackMsg_FWD_DEFINED__
 typedef interface IBindStatusCallbackMsg IBindStatusCallbackMsg;
+#ifdef __cplusplus
+interface IBindStatusCallbackMsg;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAuthenticate_FWD_DEFINED__
 #define __IAuthenticate_FWD_DEFINED__
 typedef interface IAuthenticate IAuthenticate;
+#ifdef __cplusplus
+interface IAuthenticate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IAuthenticateEx_FWD_DEFINED__
 #define __IAuthenticateEx_FWD_DEFINED__
 typedef interface IAuthenticateEx IAuthenticateEx;
+#ifdef __cplusplus
+interface IAuthenticateEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWindowForBindingUI_FWD_DEFINED__
 #define __IWindowForBindingUI_FWD_DEFINED__
 typedef interface IWindowForBindingUI IWindowForBindingUI;
+#ifdef __cplusplus
+interface IWindowForBindingUI;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ICodeInstall_FWD_DEFINED__
 #define __ICodeInstall_FWD_DEFINED__
 typedef interface ICodeInstall ICodeInstall;
+#ifdef __cplusplus
+interface ICodeInstall;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHttpNegotiate_FWD_DEFINED__
 #define __IHttpNegotiate_FWD_DEFINED__
 typedef interface IHttpNegotiate IHttpNegotiate;
+#ifdef __cplusplus
+interface IHttpNegotiate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHttpNegotiate2_FWD_DEFINED__
 #define __IHttpNegotiate2_FWD_DEFINED__
 typedef interface IHttpNegotiate2 IHttpNegotiate2;
+#ifdef __cplusplus
+interface IHttpNegotiate2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IHttpNegotiate3_FWD_DEFINED__
 #define __IHttpNegotiate3_FWD_DEFINED__
 typedef interface IHttpNegotiate3 IHttpNegotiate3;
+#ifdef __cplusplus
+interface IHttpNegotiate3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWinInetFileStream_FWD_DEFINED__
 #define __IWinInetFileStream_FWD_DEFINED__
 typedef interface IWinInetFileStream IWinInetFileStream;
+#ifdef __cplusplus
+interface IWinInetFileStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXMLElement_FWD_DEFINED__
 #define __IXMLElement_FWD_DEFINED__
 typedef interface IXMLElement IXMLElement;
+#ifdef __cplusplus
+interface IXMLElement;
+#endif /* __cplusplus */
 #endif
 
 
@@ -628,48 +832,49 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IPersistMoniker* This,
+        IPersistMoniker *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IPersistMoniker* This);
+        IPersistMoniker *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IPersistMoniker* This);
+        IPersistMoniker *This);
 
     /*** IPersistMoniker methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClassID)(
-        IPersistMoniker* This,
+        IPersistMoniker *This,
         CLSID *pClassID);
 
     HRESULT (STDMETHODCALLTYPE *IsDirty)(
-        IPersistMoniker* This);
+        IPersistMoniker *This);
 
     HRESULT (STDMETHODCALLTYPE *Load)(
-        IPersistMoniker* This,
+        IPersistMoniker *This,
         WINBOOL fFullyAvailable,
         IMoniker *pimkName,
         LPBC pibc,
         DWORD grfMode);
 
     HRESULT (STDMETHODCALLTYPE *Save)(
-        IPersistMoniker* This,
+        IPersistMoniker *This,
         IMoniker *pimkName,
         LPBC pbc,
         WINBOOL fRemember);
 
     HRESULT (STDMETHODCALLTYPE *SaveCompleted)(
-        IPersistMoniker* This,
+        IPersistMoniker *This,
         IMoniker *pimkName,
         LPBC pibc);
 
     HRESULT (STDMETHODCALLTYPE *GetCurMoniker)(
-        IPersistMoniker* This,
+        IPersistMoniker *This,
         IMoniker **ppimkName);
 
     END_INTERFACE
 } IPersistMonikerVtbl;
+
 interface IPersistMoniker {
     CONST_VTBL IPersistMonikerVtbl* lpVtbl;
 };
@@ -722,59 +927,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IPersistMoniker_GetClassID_Proxy(
-    IPersistMoniker* This,
-    CLSID *pClassID);
-void __RPC_STUB IPersistMoniker_GetClassID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMoniker_IsDirty_Proxy(
-    IPersistMoniker* This);
-void __RPC_STUB IPersistMoniker_IsDirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMoniker_Load_Proxy(
-    IPersistMoniker* This,
-    WINBOOL fFullyAvailable,
-    IMoniker *pimkName,
-    LPBC pibc,
-    DWORD grfMode);
-void __RPC_STUB IPersistMoniker_Load_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMoniker_Save_Proxy(
-    IPersistMoniker* This,
-    IMoniker *pimkName,
-    LPBC pbc,
-    WINBOOL fRemember);
-void __RPC_STUB IPersistMoniker_Save_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMoniker_SaveCompleted_Proxy(
-    IPersistMoniker* This,
-    IMoniker *pimkName,
-    LPBC pibc);
-void __RPC_STUB IPersistMoniker_SaveCompleted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IPersistMoniker_GetCurMoniker_Proxy(
-    IPersistMoniker* This,
-    IMoniker **ppimkName);
-void __RPC_STUB IPersistMoniker_GetCurMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IPersistMoniker_INTERFACE_DEFINED__ */
 
@@ -817,24 +969,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMonikerProp* This,
+        IMonikerProp *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMonikerProp* This);
+        IMonikerProp *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMonikerProp* This);
+        IMonikerProp *This);
 
     /*** IMonikerProp methods ***/
     HRESULT (STDMETHODCALLTYPE *PutProperty)(
-        IMonikerProp* This,
+        IMonikerProp *This,
         MONIKERPROPERTY mkp,
         LPCWSTR val);
 
     END_INTERFACE
 } IMonikerPropVtbl;
+
 interface IMonikerProp {
     CONST_VTBL IMonikerPropVtbl* lpVtbl;
 };
@@ -867,15 +1020,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMonikerProp_PutProperty_Proxy(
-    IMonikerProp* This,
-    MONIKERPROPERTY mkp,
-    LPCWSTR val);
-void __RPC_STUB IMonikerProp_PutProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMonikerProp_INTERFACE_DEFINED__ */
 
@@ -912,25 +1056,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBindProtocol* This,
+        IBindProtocol *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBindProtocol* This);
+        IBindProtocol *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBindProtocol* This);
+        IBindProtocol *This);
 
     /*** IBindProtocol methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateBinding)(
-        IBindProtocol* This,
+        IBindProtocol *This,
         LPCWSTR szUrl,
         IBindCtx *pbc,
         IBinding **ppb);
 
     END_INTERFACE
 } IBindProtocolVtbl;
+
 interface IBindProtocol {
     CONST_VTBL IBindProtocolVtbl* lpVtbl;
 };
@@ -963,16 +1108,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBindProtocol_CreateBinding_Proxy(
-    IBindProtocol* This,
-    LPCWSTR szUrl,
-    IBindCtx *pbc,
-    IBinding **ppb);
-void __RPC_STUB IBindProtocol_CreateBinding_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IBindProtocol_INTERFACE_DEFINED__ */
 
@@ -1025,36 +1160,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBinding* This,
+        IBinding *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBinding* This);
+        IBinding *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBinding* This);
+        IBinding *This);
 
     /*** IBinding methods ***/
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IBinding* This);
+        IBinding *This);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IBinding* This);
+        IBinding *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IBinding* This);
+        IBinding *This);
 
     HRESULT (STDMETHODCALLTYPE *SetPriority)(
-        IBinding* This,
+        IBinding *This,
         LONG nPriority);
 
     HRESULT (STDMETHODCALLTYPE *GetPriority)(
-        IBinding* This,
+        IBinding *This,
         LONG *pnPriority);
 
     HRESULT (STDMETHODCALLTYPE *GetBindResult)(
-        IBinding* This,
+        IBinding *This,
         CLSID *pclsidProtocol,
         DWORD *pdwResult,
         LPOLESTR *pszResult,
@@ -1062,6 +1197,7 @@
 
     END_INTERFACE
 } IBindingVtbl;
+
 interface IBinding {
     CONST_VTBL IBindingVtbl* lpVtbl;
 };
@@ -1114,43 +1250,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBinding_Abort_Proxy(
-    IBinding* This);
-void __RPC_STUB IBinding_Abort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBinding_Suspend_Proxy(
-    IBinding* This);
-void __RPC_STUB IBinding_Suspend_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBinding_Resume_Proxy(
-    IBinding* This);
-void __RPC_STUB IBinding_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBinding_SetPriority_Proxy(
-    IBinding* This,
-    LONG nPriority);
-void __RPC_STUB IBinding_SetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBinding_GetPriority_Proxy(
-    IBinding* This,
-    LONG *pnPriority);
-void __RPC_STUB IBinding_GetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IBinding_RemoteGetBindResult_Proxy(
     IBinding* This,
     CLSID *pclsidProtocol,
@@ -1443,61 +1542,62 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBindStatusCallback* This);
+        IBindStatusCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBindStatusCallback* This);
+        IBindStatusCallback *This);
 
     /*** IBindStatusCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *OnStartBinding)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         DWORD dwReserved,
         IBinding *pib);
 
     HRESULT (STDMETHODCALLTYPE *GetPriority)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         LONG *pnPriority);
 
     HRESULT (STDMETHODCALLTYPE *OnLowResource)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         DWORD reserved);
 
     HRESULT (STDMETHODCALLTYPE *OnProgress)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         ULONG ulProgress,
         ULONG ulProgressMax,
         ULONG ulStatusCode,
         LPCWSTR szStatusText);
 
     HRESULT (STDMETHODCALLTYPE *OnStopBinding)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         HRESULT hresult,
         LPCWSTR szError);
 
     HRESULT (STDMETHODCALLTYPE *GetBindInfo)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         DWORD *grfBINDF,
         BINDINFO *pbindinfo);
 
     HRESULT (STDMETHODCALLTYPE *OnDataAvailable)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         DWORD grfBSCF,
         DWORD dwSize,
         FORMATETC *pformatetc,
         STGMEDIUM *pstgmed);
 
     HRESULT (STDMETHODCALLTYPE *OnObjectAvailable)(
-        IBindStatusCallback* This,
+        IBindStatusCallback *This,
         REFIID riid,
         IUnknown *punk);
 
     END_INTERFACE
 } IBindStatusCallbackVtbl;
+
 interface IBindStatusCallback {
     CONST_VTBL IBindStatusCallbackVtbl* lpVtbl;
 };
@@ -1558,51 +1658,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnStartBinding_Proxy(
-    IBindStatusCallback* This,
-    DWORD dwReserved,
-    IBinding *pib);
-void __RPC_STUB IBindStatusCallback_OnStartBinding_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBindStatusCallback_GetPriority_Proxy(
-    IBindStatusCallback* This,
-    LONG *pnPriority);
-void __RPC_STUB IBindStatusCallback_GetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnLowResource_Proxy(
-    IBindStatusCallback* This,
-    DWORD reserved);
-void __RPC_STUB IBindStatusCallback_OnLowResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnProgress_Proxy(
-    IBindStatusCallback* This,
-    ULONG ulProgress,
-    ULONG ulProgressMax,
-    ULONG ulStatusCode,
-    LPCWSTR szStatusText);
-void __RPC_STUB IBindStatusCallback_OnProgress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnStopBinding_Proxy(
-    IBindStatusCallback* This,
-    HRESULT hresult,
-    LPCWSTR szError);
-void __RPC_STUB IBindStatusCallback_OnStopBinding_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IBindStatusCallback_RemoteGetBindInfo_Proxy(
     IBindStatusCallback* This,
     DWORD *grfBINDF,
@@ -1624,15 +1679,6 @@
     IRpcChannelBuffer* pRpcChannelBuffer,
     PRPC_MESSAGE pRpcMessage,
     DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IBindStatusCallback_OnObjectAvailable_Proxy(
-    IBindStatusCallback* This,
-    REFIID riid,
-    IUnknown *punk);
-void __RPC_STUB IBindStatusCallback_OnObjectAvailable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT CALLBACK IBindStatusCallback_GetBindInfo_Proxy(
     IBindStatusCallback* This,
     DWORD *grfBINDF,
@@ -1719,62 +1765,62 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBindStatusCallbackEx* This);
+        IBindStatusCallbackEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBindStatusCallbackEx* This);
+        IBindStatusCallbackEx *This);
 
     /*** IBindStatusCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *OnStartBinding)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         DWORD dwReserved,
         IBinding *pib);
 
     HRESULT (STDMETHODCALLTYPE *GetPriority)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         LONG *pnPriority);
 
     HRESULT (STDMETHODCALLTYPE *OnLowResource)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         DWORD reserved);
 
     HRESULT (STDMETHODCALLTYPE *OnProgress)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         ULONG ulProgress,
         ULONG ulProgressMax,
         ULONG ulStatusCode,
         LPCWSTR szStatusText);
 
     HRESULT (STDMETHODCALLTYPE *OnStopBinding)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         HRESULT hresult,
         LPCWSTR szError);
 
     HRESULT (STDMETHODCALLTYPE *GetBindInfo)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         DWORD *grfBINDF,
         BINDINFO *pbindinfo);
 
     HRESULT (STDMETHODCALLTYPE *OnDataAvailable)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         DWORD grfBSCF,
         DWORD dwSize,
         FORMATETC *pformatetc,
         STGMEDIUM *pstgmed);
 
     HRESULT (STDMETHODCALLTYPE *OnObjectAvailable)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         REFIID riid,
         IUnknown *punk);
 
     /*** IBindStatusCallbackEx methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBindInfoEx)(
-        IBindStatusCallbackEx* This,
+        IBindStatusCallbackEx *This,
         DWORD *grfBINDF,
         BINDINFO *pbindinfo,
         DWORD *grfBINDF2,
@@ -1782,6 +1828,7 @@
 
     END_INTERFACE
 } IBindStatusCallbackExVtbl;
+
 interface IBindStatusCallbackEx {
     CONST_VTBL IBindStatusCallbackExVtbl* lpVtbl;
 };
@@ -1909,25 +1956,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAuthenticate* This,
+        IAuthenticate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAuthenticate* This);
+        IAuthenticate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAuthenticate* This);
+        IAuthenticate *This);
 
     /*** IAuthenticate methods ***/
     HRESULT (STDMETHODCALLTYPE *Authenticate)(
-        IAuthenticate* This,
+        IAuthenticate *This,
         HWND *phwnd,
         LPWSTR *pszUsername,
         LPWSTR *pszPassword);
 
     END_INTERFACE
 } IAuthenticateVtbl;
+
 interface IAuthenticate {
     CONST_VTBL IAuthenticateVtbl* lpVtbl;
 };
@@ -1960,16 +2008,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAuthenticate_Authenticate_Proxy(
-    IAuthenticate* This,
-    HWND *phwnd,
-    LPWSTR *pszUsername,
-    LPWSTR *pszPassword);
-void __RPC_STUB IAuthenticate_Authenticate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAuthenticate_INTERFACE_DEFINED__ */
 
@@ -2018,26 +2056,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IAuthenticateEx* This,
+        IAuthenticateEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IAuthenticateEx* This);
+        IAuthenticateEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IAuthenticateEx* This);
+        IAuthenticateEx *This);
 
     /*** IAuthenticate methods ***/
     HRESULT (STDMETHODCALLTYPE *Authenticate)(
-        IAuthenticateEx* This,
+        IAuthenticateEx *This,
         HWND *phwnd,
         LPWSTR *pszUsername,
         LPWSTR *pszPassword);
 
     /*** IAuthenticateEx methods ***/
     HRESULT (STDMETHODCALLTYPE *AuthenticateEx)(
-        IAuthenticateEx* This,
+        IAuthenticateEx *This,
         HWND *phwnd,
         LPWSTR *pszUsername,
         LPWSTR *pszPassword,
@@ -2045,6 +2083,7 @@
 
     END_INTERFACE
 } IAuthenticateExVtbl;
+
 interface IAuthenticateEx {
     CONST_VTBL IAuthenticateExVtbl* lpVtbl;
 };
@@ -2083,17 +2122,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IAuthenticateEx_AuthenticateEx_Proxy(
-    IAuthenticateEx* This,
-    HWND *phwnd,
-    LPWSTR *pszUsername,
-    LPWSTR *pszPassword,
-    AUTHENTICATEINFO *pauthinfo);
-void __RPC_STUB IAuthenticateEx_AuthenticateEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IAuthenticateEx_INTERFACE_DEFINED__ */
 
@@ -2137,26 +2165,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHttpNegotiate* This,
+        IHttpNegotiate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHttpNegotiate* This);
+        IHttpNegotiate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHttpNegotiate* This);
+        IHttpNegotiate *This);
 
     /*** IHttpNegotiate methods ***/
     HRESULT (STDMETHODCALLTYPE *BeginningTransaction)(
-        IHttpNegotiate* This,
+        IHttpNegotiate *This,
         LPCWSTR szURL,
         LPCWSTR szHeaders,
         DWORD dwReserved,
         LPWSTR *pszAdditionalHeaders);
 
     HRESULT (STDMETHODCALLTYPE *OnResponse)(
-        IHttpNegotiate* This,
+        IHttpNegotiate *This,
         DWORD dwResponseCode,
         LPCWSTR szResponseHeaders,
         LPCWSTR szRequestHeaders,
@@ -2164,6 +2192,7 @@
 
     END_INTERFACE
 } IHttpNegotiateVtbl;
+
 interface IHttpNegotiate {
     CONST_VTBL IHttpNegotiateVtbl* lpVtbl;
 };
@@ -2200,28 +2229,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHttpNegotiate_BeginningTransaction_Proxy(
-    IHttpNegotiate* This,
-    LPCWSTR szURL,
-    LPCWSTR szHeaders,
-    DWORD dwReserved,
-    LPWSTR *pszAdditionalHeaders);
-void __RPC_STUB IHttpNegotiate_BeginningTransaction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IHttpNegotiate_OnResponse_Proxy(
-    IHttpNegotiate* This,
-    DWORD dwResponseCode,
-    LPCWSTR szResponseHeaders,
-    LPCWSTR szRequestHeaders,
-    LPWSTR *pszAdditionalRequestHeaders);
-void __RPC_STUB IHttpNegotiate_OnResponse_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHttpNegotiate_INTERFACE_DEFINED__ */
 
@@ -2258,26 +2265,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHttpNegotiate2* This,
+        IHttpNegotiate2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHttpNegotiate2* This);
+        IHttpNegotiate2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHttpNegotiate2* This);
+        IHttpNegotiate2 *This);
 
     /*** IHttpNegotiate methods ***/
     HRESULT (STDMETHODCALLTYPE *BeginningTransaction)(
-        IHttpNegotiate2* This,
+        IHttpNegotiate2 *This,
         LPCWSTR szURL,
         LPCWSTR szHeaders,
         DWORD dwReserved,
         LPWSTR *pszAdditionalHeaders);
 
     HRESULT (STDMETHODCALLTYPE *OnResponse)(
-        IHttpNegotiate2* This,
+        IHttpNegotiate2 *This,
         DWORD dwResponseCode,
         LPCWSTR szResponseHeaders,
         LPCWSTR szRequestHeaders,
@@ -2285,13 +2292,14 @@
 
     /*** IHttpNegotiate2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRootSecurityId)(
-        IHttpNegotiate2* This,
+        IHttpNegotiate2 *This,
         BYTE *pbSecurityId,
         DWORD *pcbSecurityId,
         DWORD_PTR dwReserved);
 
     END_INTERFACE
 } IHttpNegotiate2Vtbl;
+
 interface IHttpNegotiate2 {
     CONST_VTBL IHttpNegotiate2Vtbl* lpVtbl;
 };
@@ -2334,16 +2342,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHttpNegotiate2_GetRootSecurityId_Proxy(
-    IHttpNegotiate2* This,
-    BYTE *pbSecurityId,
-    DWORD *pcbSecurityId,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IHttpNegotiate2_GetRootSecurityId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHttpNegotiate2_INTERFACE_DEFINED__ */
 
@@ -2379,26 +2377,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHttpNegotiate3* This,
+        IHttpNegotiate3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHttpNegotiate3* This);
+        IHttpNegotiate3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHttpNegotiate3* This);
+        IHttpNegotiate3 *This);
 
     /*** IHttpNegotiate methods ***/
     HRESULT (STDMETHODCALLTYPE *BeginningTransaction)(
-        IHttpNegotiate3* This,
+        IHttpNegotiate3 *This,
         LPCWSTR szURL,
         LPCWSTR szHeaders,
         DWORD dwReserved,
         LPWSTR *pszAdditionalHeaders);
 
     HRESULT (STDMETHODCALLTYPE *OnResponse)(
-        IHttpNegotiate3* This,
+        IHttpNegotiate3 *This,
         DWORD dwResponseCode,
         LPCWSTR szResponseHeaders,
         LPCWSTR szRequestHeaders,
@@ -2406,19 +2404,20 @@
 
     /*** IHttpNegotiate2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRootSecurityId)(
-        IHttpNegotiate3* This,
+        IHttpNegotiate3 *This,
         BYTE *pbSecurityId,
         DWORD *pcbSecurityId,
         DWORD_PTR dwReserved);
 
     /*** IHttpNegotiate3 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSerializedClientCertContext)(
-        IHttpNegotiate3* This,
+        IHttpNegotiate3 *This,
         BYTE **ppbCert,
         DWORD *pcbCert);
 
     END_INTERFACE
 } IHttpNegotiate3Vtbl;
+
 interface IHttpNegotiate3 {
     CONST_VTBL IHttpNegotiate3Vtbl* lpVtbl;
 };
@@ -2467,15 +2466,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHttpNegotiate3_GetSerializedClientCertContext_Proxy(
-    IHttpNegotiate3* This,
-    BYTE **ppbCert,
-    DWORD *pcbCert);
-void __RPC_STUB IHttpNegotiate3_GetSerializedClientCertContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHttpNegotiate3_INTERFACE_DEFINED__ */
 
@@ -2514,28 +2504,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWinInetFileStream* This,
+        IWinInetFileStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWinInetFileStream* This);
+        IWinInetFileStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWinInetFileStream* This);
+        IWinInetFileStream *This);
 
     /*** IWinInetFileStream methods ***/
     HRESULT (STDMETHODCALLTYPE *SetHandleForUnlock)(
-        IWinInetFileStream* This,
+        IWinInetFileStream *This,
         DWORD_PTR hWinInetLockHandle,
         DWORD_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetDeleteFile)(
-        IWinInetFileStream* This,
+        IWinInetFileStream *This,
         DWORD_PTR dwReserved);
 
     END_INTERFACE
 } IWinInetFileStreamVtbl;
+
 interface IWinInetFileStream {
     CONST_VTBL IWinInetFileStreamVtbl* lpVtbl;
 };
@@ -2572,23 +2563,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWinInetFileStream_SetHandleForUnlock_Proxy(
-    IWinInetFileStream* This,
-    DWORD_PTR hWinInetLockHandle,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IWinInetFileStream_SetHandleForUnlock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWinInetFileStream_SetDeleteFile_Proxy(
-    IWinInetFileStream* This,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IWinInetFileStream_SetDeleteFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWinInetFileStream_INTERFACE_DEFINED__ */
 
@@ -2624,24 +2598,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWindowForBindingUI* This,
+        IWindowForBindingUI *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWindowForBindingUI* This);
+        IWindowForBindingUI *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWindowForBindingUI* This);
+        IWindowForBindingUI *This);
 
     /*** IWindowForBindingUI methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IWindowForBindingUI* This,
+        IWindowForBindingUI *This,
         REFGUID rguidReason,
         HWND *phwnd);
 
     END_INTERFACE
 } IWindowForBindingUIVtbl;
+
 interface IWindowForBindingUI {
     CONST_VTBL IWindowForBindingUIVtbl* lpVtbl;
 };
@@ -2674,15 +2649,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWindowForBindingUI_GetWindow_Proxy(
-    IWindowForBindingUI* This,
-    REFGUID rguidReason,
-    HWND *phwnd);
-void __RPC_STUB IWindowForBindingUI_GetWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWindowForBindingUI_INTERFACE_DEFINED__ */
 
@@ -2733,25 +2699,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICodeInstall* This,
+        ICodeInstall *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICodeInstall* This);
+        ICodeInstall *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICodeInstall* This);
+        ICodeInstall *This);
 
     /*** IWindowForBindingUI methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        ICodeInstall* This,
+        ICodeInstall *This,
         REFGUID rguidReason,
         HWND *phwnd);
 
     /*** ICodeInstall methods ***/
     HRESULT (STDMETHODCALLTYPE *OnCodeInstallProblem)(
-        ICodeInstall* This,
+        ICodeInstall *This,
         ULONG ulStatusCode,
         LPCWSTR szDestination,
         LPCWSTR szSource,
@@ -2759,6 +2725,7 @@
 
     END_INTERFACE
 } ICodeInstallVtbl;
+
 interface ICodeInstall {
     CONST_VTBL ICodeInstallVtbl* lpVtbl;
 };
@@ -2797,17 +2764,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICodeInstall_OnCodeInstallProblem_Proxy(
-    ICodeInstall* This,
-    ULONG ulStatusCode,
-    LPCWSTR szDestination,
-    LPCWSTR szSource,
-    DWORD dwReserved);
-void __RPC_STUB ICodeInstall_OnCodeInstallProblem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICodeInstall_INTERFACE_DEFINED__ */
 
@@ -2956,127 +2912,128 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUri* This,
+        IUri *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUri* This);
+        IUri *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUri* This);
+        IUri *This);
 
     /*** IUri methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyBSTR)(
-        IUri* This,
+        IUri *This,
         Uri_PROPERTY uriProp,
         BSTR *pbstrProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyLength)(
-        IUri* This,
+        IUri *This,
         Uri_PROPERTY uriProp,
         DWORD *pcchProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyDWORD)(
-        IUri* This,
+        IUri *This,
         Uri_PROPERTY uriProp,
         DWORD *pdwProperty,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *HasProperty)(
-        IUri* This,
+        IUri *This,
         Uri_PROPERTY uriProp,
         WINBOOL *pfHasProperty);
 
     HRESULT (STDMETHODCALLTYPE *GetAbsoluteUri)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrAbsoluteUri);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthority)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrAuthority);
 
     HRESULT (STDMETHODCALLTYPE *GetDisplayUri)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrDisplayString);
 
     HRESULT (STDMETHODCALLTYPE *GetDomain)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrDomain);
 
     HRESULT (STDMETHODCALLTYPE *GetExtension)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrExtension);
 
     HRESULT (STDMETHODCALLTYPE *GetFragment)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrFragment);
 
     HRESULT (STDMETHODCALLTYPE *GetHost)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrHost);
 
     HRESULT (STDMETHODCALLTYPE *GetPassword)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrPassword);
 
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrPath);
 
     HRESULT (STDMETHODCALLTYPE *GetPathAndQuery)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrPathAndQuery);
 
     HRESULT (STDMETHODCALLTYPE *GetQuery)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrQuery);
 
     HRESULT (STDMETHODCALLTYPE *GetRawUri)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrRawUri);
 
     HRESULT (STDMETHODCALLTYPE *GetSchemeName)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrSchemeName);
 
     HRESULT (STDMETHODCALLTYPE *GetUserInfo)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrUserInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetUserName)(
-        IUri* This,
+        IUri *This,
         BSTR *pbstrUserName);
 
     HRESULT (STDMETHODCALLTYPE *GetHostType)(
-        IUri* This,
+        IUri *This,
         DWORD *pdwHostType);
 
     HRESULT (STDMETHODCALLTYPE *GetPort)(
-        IUri* This,
+        IUri *This,
         DWORD *pdwPort);
 
     HRESULT (STDMETHODCALLTYPE *GetScheme)(
-        IUri* This,
+        IUri *This,
         DWORD *pdwScheme);
 
     HRESULT (STDMETHODCALLTYPE *GetZone)(
-        IUri* This,
+        IUri *This,
         DWORD *pdwZone);
 
     HRESULT (STDMETHODCALLTYPE *GetProperties)(
-        IUri* This,
+        IUri *This,
         LPDWORD pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *IsEqual)(
-        IUri* This,
+        IUri *This,
         IUri *pUri,
         WINBOOL *pfEqual);
 
     END_INTERFACE
 } IUriVtbl;
+
 interface IUri {
     CONST_VTBL IUriVtbl* lpVtbl;
 };
@@ -3205,214 +3162,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUri_GetPropertyBSTR_Proxy(
-    IUri* This,
-    Uri_PROPERTY uriProp,
-    BSTR *pbstrProperty,
-    DWORD dwFlags);
-void __RPC_STUB IUri_GetPropertyBSTR_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetPropertyLength_Proxy(
-    IUri* This,
-    Uri_PROPERTY uriProp,
-    DWORD *pcchProperty,
-    DWORD dwFlags);
-void __RPC_STUB IUri_GetPropertyLength_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetPropertyDWORD_Proxy(
-    IUri* This,
-    Uri_PROPERTY uriProp,
-    DWORD *pdwProperty,
-    DWORD dwFlags);
-void __RPC_STUB IUri_GetPropertyDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_HasProperty_Proxy(
-    IUri* This,
-    Uri_PROPERTY uriProp,
-    WINBOOL *pfHasProperty);
-void __RPC_STUB IUri_HasProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetAbsoluteUri_Proxy(
-    IUri* This,
-    BSTR *pbstrAbsoluteUri);
-void __RPC_STUB IUri_GetAbsoluteUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetAuthority_Proxy(
-    IUri* This,
-    BSTR *pbstrAuthority);
-void __RPC_STUB IUri_GetAuthority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetDisplayUri_Proxy(
-    IUri* This,
-    BSTR *pbstrDisplayString);
-void __RPC_STUB IUri_GetDisplayUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetDomain_Proxy(
-    IUri* This,
-    BSTR *pbstrDomain);
-void __RPC_STUB IUri_GetDomain_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetExtension_Proxy(
-    IUri* This,
-    BSTR *pbstrExtension);
-void __RPC_STUB IUri_GetExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetFragment_Proxy(
-    IUri* This,
-    BSTR *pbstrFragment);
-void __RPC_STUB IUri_GetFragment_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetHost_Proxy(
-    IUri* This,
-    BSTR *pbstrHost);
-void __RPC_STUB IUri_GetHost_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetPassword_Proxy(
-    IUri* This,
-    BSTR *pbstrPassword);
-void __RPC_STUB IUri_GetPassword_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetPath_Proxy(
-    IUri* This,
-    BSTR *pbstrPath);
-void __RPC_STUB IUri_GetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetPathAndQuery_Proxy(
-    IUri* This,
-    BSTR *pbstrPathAndQuery);
-void __RPC_STUB IUri_GetPathAndQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetQuery_Proxy(
-    IUri* This,
-    BSTR *pbstrQuery);
-void __RPC_STUB IUri_GetQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetRawUri_Proxy(
-    IUri* This,
-    BSTR *pbstrRawUri);
-void __RPC_STUB IUri_GetRawUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetSchemeName_Proxy(
-    IUri* This,
-    BSTR *pbstrSchemeName);
-void __RPC_STUB IUri_GetSchemeName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetUserInfo_Proxy(
-    IUri* This,
-    BSTR *pbstrUserInfo);
-void __RPC_STUB IUri_GetUserInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetUserName_Proxy(
-    IUri* This,
-    BSTR *pbstrUserName);
-void __RPC_STUB IUri_GetUserName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetHostType_Proxy(
-    IUri* This,
-    DWORD *pdwHostType);
-void __RPC_STUB IUri_GetHostType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetPort_Proxy(
-    IUri* This,
-    DWORD *pdwPort);
-void __RPC_STUB IUri_GetPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetScheme_Proxy(
-    IUri* This,
-    DWORD *pdwScheme);
-void __RPC_STUB IUri_GetScheme_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetZone_Proxy(
-    IUri* This,
-    DWORD *pdwZone);
-void __RPC_STUB IUri_GetZone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_GetProperties_Proxy(
-    IUri* This,
-    LPDWORD pdwFlags);
-void __RPC_STUB IUri_GetProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUri_IsEqual_Proxy(
-    IUri* This,
-    IUri *pUri,
-    WINBOOL *pfEqual);
-void __RPC_STUB IUri_IsEqual_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUri_INTERFACE_DEFINED__ */
 
@@ -3509,23 +3258,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUriContainer* This,
+        IUriContainer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUriContainer* This);
+        IUriContainer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUriContainer* This);
+        IUriContainer *This);
 
     /*** IUriContainer methods ***/
     HRESULT (STDMETHODCALLTYPE *GetIUri)(
-        IUriContainer* This,
+        IUriContainer *This,
         IUri **ppIUri);
 
     END_INTERFACE
 } IUriContainerVtbl;
+
 interface IUriContainer {
     CONST_VTBL IUriContainerVtbl* lpVtbl;
 };
@@ -3558,14 +3308,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUriContainer_GetIUri_Proxy(
-    IUriContainer* This,
-    IUri **ppIUri);
-void __RPC_STUB IUriContainer_GetIUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUriContainer_INTERFACE_DEFINED__ */
 
@@ -3678,32 +3420,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUriBuilder* This);
+        IUriBuilder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUriBuilder* This);
+        IUriBuilder *This);
 
     /*** IUriBuilder methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateUriSimple)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD dwAllowEncodingPropertyMask,
         DWORD_PTR dwReserved,
         IUri **ppIUri);
 
     HRESULT (STDMETHODCALLTYPE *CreateUri)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD dwCreateFlags,
         DWORD dwAllowEncodingPropertyMask,
         DWORD_PTR dwReserved,
         IUri **ppIUri);
 
     HRESULT (STDMETHODCALLTYPE *CreateUriWithFlags)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD dwCreateFlags,
         DWORD dwUriBuilderFlags,
         DWORD dwAllowEncodingPropertyMask,
@@ -3711,96 +3453,97 @@
         IUri **ppIUri);
 
     HRESULT (STDMETHODCALLTYPE *GetIUri)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         IUri **ppIUri);
 
     HRESULT (STDMETHODCALLTYPE *SetIUri)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         IUri *pIUri);
 
     HRESULT (STDMETHODCALLTYPE *GetFragment)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD *pcchFragment,
         LPCWSTR *ppwzFragment);
 
     HRESULT (STDMETHODCALLTYPE *GetHost)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD *pcchHost,
         LPCWSTR *ppwzHost);
 
     HRESULT (STDMETHODCALLTYPE *GetPassword)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD *pcchPassword,
         LPCWSTR *ppwzPassword);
 
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD *pcchPath,
         LPCWSTR *ppwzPath);
 
     HRESULT (STDMETHODCALLTYPE *GetPort)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         WINBOOL *pfHasPort,
         DWORD *pdwPort);
 
     HRESULT (STDMETHODCALLTYPE *GetQuery)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD *pcchQuery,
         LPCWSTR *ppwzQuery);
 
     HRESULT (STDMETHODCALLTYPE *GetSchemeName)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD *pcchSchemeName,
         LPCWSTR *ppwzSchemeName);
 
     HRESULT (STDMETHODCALLTYPE *GetUserName)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD *pcchUserName,
         LPCWSTR *ppwzUserName);
 
     HRESULT (STDMETHODCALLTYPE *SetFragment)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         LPCWSTR pwzNewValue);
 
     HRESULT (STDMETHODCALLTYPE *SetHost)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         LPCWSTR pwzNewValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPassword)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         LPCWSTR pwzNewValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPath)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         LPCWSTR pwzNewValue);
 
     HRESULT (STDMETHODCALLTYPE *SetPort)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         WINBOOL fHasPort,
         DWORD dwNewValue);
 
     HRESULT (STDMETHODCALLTYPE *SetQuery)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         LPCWSTR pwzNewValue);
 
     HRESULT (STDMETHODCALLTYPE *SetSchemeName)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         LPCWSTR pwzNewValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUserName)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         LPCWSTR pwzNewValue);
 
     HRESULT (STDMETHODCALLTYPE *RemoveProperties)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         DWORD dwPropertyMask);
 
     HRESULT (STDMETHODCALLTYPE *HasBeenModified)(
-        IUriBuilder* This,
+        IUriBuilder *This,
         WINBOOL *pfModified);
 
     END_INTERFACE
 } IUriBuilderVtbl;
+
 interface IUriBuilder {
     CONST_VTBL IUriBuilderVtbl* lpVtbl;
 };
@@ -3921,208 +3664,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUriBuilder_CreateUriSimple_Proxy(
-    IUriBuilder* This,
-    DWORD dwAllowEncodingPropertyMask,
-    DWORD_PTR dwReserved,
-    IUri **ppIUri);
-void __RPC_STUB IUriBuilder_CreateUriSimple_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_CreateUri_Proxy(
-    IUriBuilder* This,
-    DWORD dwCreateFlags,
-    DWORD dwAllowEncodingPropertyMask,
-    DWORD_PTR dwReserved,
-    IUri **ppIUri);
-void __RPC_STUB IUriBuilder_CreateUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_CreateUriWithFlags_Proxy(
-    IUriBuilder* This,
-    DWORD dwCreateFlags,
-    DWORD dwUriBuilderFlags,
-    DWORD dwAllowEncodingPropertyMask,
-    DWORD_PTR dwReserved,
-    IUri **ppIUri);
-void __RPC_STUB IUriBuilder_CreateUriWithFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetIUri_Proxy(
-    IUriBuilder* This,
-    IUri **ppIUri);
-void __RPC_STUB IUriBuilder_GetIUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetIUri_Proxy(
-    IUriBuilder* This,
-    IUri *pIUri);
-void __RPC_STUB IUriBuilder_SetIUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetFragment_Proxy(
-    IUriBuilder* This,
-    DWORD *pcchFragment,
-    LPCWSTR *ppwzFragment);
-void __RPC_STUB IUriBuilder_GetFragment_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetHost_Proxy(
-    IUriBuilder* This,
-    DWORD *pcchHost,
-    LPCWSTR *ppwzHost);
-void __RPC_STUB IUriBuilder_GetHost_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetPassword_Proxy(
-    IUriBuilder* This,
-    DWORD *pcchPassword,
-    LPCWSTR *ppwzPassword);
-void __RPC_STUB IUriBuilder_GetPassword_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetPath_Proxy(
-    IUriBuilder* This,
-    DWORD *pcchPath,
-    LPCWSTR *ppwzPath);
-void __RPC_STUB IUriBuilder_GetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetPort_Proxy(
-    IUriBuilder* This,
-    WINBOOL *pfHasPort,
-    DWORD *pdwPort);
-void __RPC_STUB IUriBuilder_GetPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetQuery_Proxy(
-    IUriBuilder* This,
-    DWORD *pcchQuery,
-    LPCWSTR *ppwzQuery);
-void __RPC_STUB IUriBuilder_GetQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetSchemeName_Proxy(
-    IUriBuilder* This,
-    DWORD *pcchSchemeName,
-    LPCWSTR *ppwzSchemeName);
-void __RPC_STUB IUriBuilder_GetSchemeName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_GetUserName_Proxy(
-    IUriBuilder* This,
-    DWORD *pcchUserName,
-    LPCWSTR *ppwzUserName);
-void __RPC_STUB IUriBuilder_GetUserName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetFragment_Proxy(
-    IUriBuilder* This,
-    LPCWSTR pwzNewValue);
-void __RPC_STUB IUriBuilder_SetFragment_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetHost_Proxy(
-    IUriBuilder* This,
-    LPCWSTR pwzNewValue);
-void __RPC_STUB IUriBuilder_SetHost_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetPassword_Proxy(
-    IUriBuilder* This,
-    LPCWSTR pwzNewValue);
-void __RPC_STUB IUriBuilder_SetPassword_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetPath_Proxy(
-    IUriBuilder* This,
-    LPCWSTR pwzNewValue);
-void __RPC_STUB IUriBuilder_SetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetPort_Proxy(
-    IUriBuilder* This,
-    WINBOOL fHasPort,
-    DWORD dwNewValue);
-void __RPC_STUB IUriBuilder_SetPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetQuery_Proxy(
-    IUriBuilder* This,
-    LPCWSTR pwzNewValue);
-void __RPC_STUB IUriBuilder_SetQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetSchemeName_Proxy(
-    IUriBuilder* This,
-    LPCWSTR pwzNewValue);
-void __RPC_STUB IUriBuilder_SetSchemeName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_SetUserName_Proxy(
-    IUriBuilder* This,
-    LPCWSTR pwzNewValue);
-void __RPC_STUB IUriBuilder_SetUserName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_RemoveProperties_Proxy(
-    IUriBuilder* This,
-    DWORD dwPropertyMask);
-void __RPC_STUB IUriBuilder_RemoveProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilder_HasBeenModified_Proxy(
-    IUriBuilder* This,
-    WINBOOL *pfModified);
-void __RPC_STUB IUriBuilder_HasBeenModified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUriBuilder_INTERFACE_DEFINED__ */
 
@@ -4158,31 +3699,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUriBuilderFactory* This,
+        IUriBuilderFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUriBuilderFactory* This);
+        IUriBuilderFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUriBuilderFactory* This);
+        IUriBuilderFactory *This);
 
     /*** IUriBuilderFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateIUriBuilder)(
-        IUriBuilderFactory* This,
+        IUriBuilderFactory *This,
         DWORD dwFlags,
         DWORD_PTR dwReserved,
         IUriBuilder **ppIUriBuilder);
 
     HRESULT (STDMETHODCALLTYPE *CreateInitializedIUriBuilder)(
-        IUriBuilderFactory* This,
+        IUriBuilderFactory *This,
         DWORD dwFlags,
         DWORD_PTR dwReserved,
         IUriBuilder **ppIUriBuilder);
 
     END_INTERFACE
 } IUriBuilderFactoryVtbl;
+
 interface IUriBuilderFactory {
     CONST_VTBL IUriBuilderFactoryVtbl* lpVtbl;
 };
@@ -4219,26 +3761,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUriBuilderFactory_CreateIUriBuilder_Proxy(
-    IUriBuilderFactory* This,
-    DWORD dwFlags,
-    DWORD_PTR dwReserved,
-    IUriBuilder **ppIUriBuilder);
-void __RPC_STUB IUriBuilderFactory_CreateIUriBuilder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IUriBuilderFactory_CreateInitializedIUriBuilder_Proxy(
-    IUriBuilderFactory* This,
-    DWORD dwFlags,
-    DWORD_PTR dwReserved,
-    IUriBuilder **ppIUriBuilder);
-void __RPC_STUB IUriBuilderFactory_CreateInitializedIUriBuilder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUriBuilderFactory_INTERFACE_DEFINED__ */
 
@@ -4278,25 +3800,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWinInetInfo* This,
+        IWinInetInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWinInetInfo* This);
+        IWinInetInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWinInetInfo* This);
+        IWinInetInfo *This);
 
     /*** IWinInetInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryOption)(
-        IWinInetInfo* This,
+        IWinInetInfo *This,
         DWORD dwOption,
         LPVOID pBuffer,
         DWORD *pcbBuf);
 
     END_INTERFACE
 } IWinInetInfoVtbl;
+
 interface IWinInetInfo {
     CONST_VTBL IWinInetInfoVtbl* lpVtbl;
 };
@@ -4385,29 +3908,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IHttpSecurity* This,
+        IHttpSecurity *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IHttpSecurity* This);
+        IHttpSecurity *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IHttpSecurity* This);
+        IHttpSecurity *This);
 
     /*** IWindowForBindingUI methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IHttpSecurity* This,
+        IHttpSecurity *This,
         REFGUID rguidReason,
         HWND *phwnd);
 
     /*** IHttpSecurity methods ***/
     HRESULT (STDMETHODCALLTYPE *OnSecurityProblem)(
-        IHttpSecurity* This,
+        IHttpSecurity *This,
         DWORD dwProblem);
 
     END_INTERFACE
 } IHttpSecurityVtbl;
+
 interface IHttpSecurity {
     CONST_VTBL IHttpSecurityVtbl* lpVtbl;
 };
@@ -4446,14 +3970,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IHttpSecurity_OnSecurityProblem_Proxy(
-    IHttpSecurity* This,
-    DWORD dwProblem);
-void __RPC_STUB IHttpSecurity_OnSecurityProblem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IHttpSecurity_INTERFACE_DEFINED__ */
 
@@ -4492,26 +4008,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWinInetHttpInfo* This,
+        IWinInetHttpInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWinInetHttpInfo* This);
+        IWinInetHttpInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWinInetHttpInfo* This);
+        IWinInetHttpInfo *This);
 
     /*** IWinInetInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryOption)(
-        IWinInetHttpInfo* This,
+        IWinInetHttpInfo *This,
         DWORD dwOption,
         LPVOID pBuffer,
         DWORD *pcbBuf);
 
     /*** IWinInetHttpInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInfo)(
-        IWinInetHttpInfo* This,
+        IWinInetHttpInfo *This,
         DWORD dwOption,
         LPVOID pBuffer,
         DWORD *pcbBuf,
@@ -4520,6 +4036,7 @@
 
     END_INTERFACE
 } IWinInetHttpInfoVtbl;
+
 interface IWinInetHttpInfo {
     CONST_VTBL IWinInetHttpInfoVtbl* lpVtbl;
 };
@@ -4617,25 +4134,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWinInetHttpTimeouts* This,
+        IWinInetHttpTimeouts *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWinInetHttpTimeouts* This);
+        IWinInetHttpTimeouts *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWinInetHttpTimeouts* This);
+        IWinInetHttpTimeouts *This);
 
     /*** IWinInetHttpTimeouts methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRequestTimeouts)(
-        IWinInetHttpTimeouts* This,
+        IWinInetHttpTimeouts *This,
         DWORD *pdwConnectTimeout,
         DWORD *pdwSendTimeout,
         DWORD *pdwReceiveTimeout);
 
     END_INTERFACE
 } IWinInetHttpTimeoutsVtbl;
+
 interface IWinInetHttpTimeouts {
     CONST_VTBL IWinInetHttpTimeoutsVtbl* lpVtbl;
 };
@@ -4668,16 +4186,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWinInetHttpTimeouts_GetRequestTimeouts_Proxy(
-    IWinInetHttpTimeouts* This,
-    DWORD *pdwConnectTimeout,
-    DWORD *pdwSendTimeout,
-    DWORD *pdwReceiveTimeout);
-void __RPC_STUB IWinInetHttpTimeouts_GetRequestTimeouts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWinInetHttpTimeouts_INTERFACE_DEFINED__ */
 
@@ -4717,19 +4225,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWinInetCacheHints* This,
+        IWinInetCacheHints *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWinInetCacheHints* This);
+        IWinInetCacheHints *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWinInetCacheHints* This);
+        IWinInetCacheHints *This);
 
     /*** IWinInetCacheHints methods ***/
     HRESULT (STDMETHODCALLTYPE *SetCacheExtension)(
-        IWinInetCacheHints* This,
+        IWinInetCacheHints *This,
         LPCWSTR pwzExt,
         LPVOID pszCacheFile,
         DWORD *pcbCacheFile,
@@ -4738,6 +4246,7 @@
 
     END_INTERFACE
 } IWinInetCacheHintsVtbl;
+
 interface IWinInetCacheHints {
     CONST_VTBL IWinInetCacheHintsVtbl* lpVtbl;
 };
@@ -4770,18 +4279,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWinInetCacheHints_SetCacheExtension_Proxy(
-    IWinInetCacheHints* This,
-    LPCWSTR pwzExt,
-    LPVOID pszCacheFile,
-    DWORD *pcbCacheFile,
-    DWORD *pdwWinInetError,
-    DWORD *pdwReserved);
-void __RPC_STUB IWinInetCacheHints_SetCacheExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWinInetCacheHints_INTERFACE_DEFINED__ */
 
@@ -4822,19 +4319,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWinInetCacheHints2* This,
+        IWinInetCacheHints2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWinInetCacheHints2* This);
+        IWinInetCacheHints2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWinInetCacheHints2* This);
+        IWinInetCacheHints2 *This);
 
     /*** IWinInetCacheHints methods ***/
     HRESULT (STDMETHODCALLTYPE *SetCacheExtension)(
-        IWinInetCacheHints2* This,
+        IWinInetCacheHints2 *This,
         LPCWSTR pwzExt,
         LPVOID pszCacheFile,
         DWORD *pcbCacheFile,
@@ -4843,7 +4340,7 @@
 
     /*** IWinInetCacheHints2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetCacheExtension2)(
-        IWinInetCacheHints2* This,
+        IWinInetCacheHints2 *This,
         LPCWSTR pwzExt,
         WCHAR *pwzCacheFile,
         DWORD *pcchCacheFile,
@@ -4852,6 +4349,7 @@
 
     END_INTERFACE
 } IWinInetCacheHints2Vtbl;
+
 interface IWinInetCacheHints2 {
     CONST_VTBL IWinInetCacheHints2Vtbl* lpVtbl;
 };
@@ -4890,18 +4388,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWinInetCacheHints2_SetCacheExtension2_Proxy(
-    IWinInetCacheHints2* This,
-    LPCWSTR pwzExt,
-    WCHAR *pwzCacheFile,
-    DWORD *pcchCacheFile,
-    DWORD *pdwWinInetError,
-    DWORD *pdwReserved);
-void __RPC_STUB IWinInetCacheHints2_SetCacheExtension2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWinInetCacheHints2_INTERFACE_DEFINED__ */
 
@@ -4959,26 +4445,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBindHost* This,
+        IBindHost *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBindHost* This);
+        IBindHost *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBindHost* This);
+        IBindHost *This);
 
     /*** IBindHost methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateMoniker)(
-        IBindHost* This,
+        IBindHost *This,
         LPOLESTR szName,
         IBindCtx *pBC,
         IMoniker **ppmk,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *MonikerBindToStorage)(
-        IBindHost* This,
+        IBindHost *This,
         IMoniker *pMk,
         IBindCtx *pBC,
         IBindStatusCallback *pBSC,
@@ -4986,7 +4472,7 @@
         void **ppvObj);
 
     HRESULT (STDMETHODCALLTYPE *MonikerBindToObject)(
-        IBindHost* This,
+        IBindHost *This,
         IMoniker *pMk,
         IBindCtx *pBC,
         IBindStatusCallback *pBSC,
@@ -4995,6 +4481,7 @@
 
     END_INTERFACE
 } IBindHostVtbl;
+
 interface IBindHost {
     CONST_VTBL IBindHostVtbl* lpVtbl;
 };
@@ -5035,17 +4522,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBindHost_CreateMoniker_Proxy(
-    IBindHost* This,
-    LPOLESTR szName,
-    IBindCtx *pBC,
-    IMoniker **ppmk,
-    DWORD dwReserved);
-void __RPC_STUB IBindHost_CreateMoniker_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 HRESULT STDMETHODCALLTYPE IBindHost_RemoteMonikerBindToStorage_Proxy(
     IBindHost* This,
     IMoniker *pMk,
@@ -5136,51 +4612,81 @@
 #ifndef __IInternet_FWD_DEFINED__
 #define __IInternet_FWD_DEFINED__
 typedef interface IInternet IInternet;
+#ifdef __cplusplus
+interface IInternet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetBindInfo_FWD_DEFINED__
 #define __IInternetBindInfo_FWD_DEFINED__
 typedef interface IInternetBindInfo IInternetBindInfo;
+#ifdef __cplusplus
+interface IInternetBindInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetBindInfoEx_FWD_DEFINED__
 #define __IInternetBindInfoEx_FWD_DEFINED__
 typedef interface IInternetBindInfoEx IInternetBindInfoEx;
+#ifdef __cplusplus
+interface IInternetBindInfoEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolRoot_FWD_DEFINED__
 #define __IInternetProtocolRoot_FWD_DEFINED__
 typedef interface IInternetProtocolRoot IInternetProtocolRoot;
+#ifdef __cplusplus
+interface IInternetProtocolRoot;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocol_FWD_DEFINED__
 #define __IInternetProtocol_FWD_DEFINED__
 typedef interface IInternetProtocol IInternetProtocol;
+#ifdef __cplusplus
+interface IInternetProtocol;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolEx_FWD_DEFINED__
 #define __IInternetProtocolEx_FWD_DEFINED__
 typedef interface IInternetProtocolEx IInternetProtocolEx;
+#ifdef __cplusplus
+interface IInternetProtocolEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolSink_FWD_DEFINED__
 #define __IInternetProtocolSink_FWD_DEFINED__
 typedef interface IInternetProtocolSink IInternetProtocolSink;
+#ifdef __cplusplus
+interface IInternetProtocolSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolInfo_FWD_DEFINED__
 #define __IInternetProtocolInfo_FWD_DEFINED__
 typedef interface IInternetProtocolInfo IInternetProtocolInfo;
+#ifdef __cplusplus
+interface IInternetProtocolInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetSession_FWD_DEFINED__
 #define __IInternetSession_FWD_DEFINED__
 typedef interface IInternetSession IInternetSession;
+#ifdef __cplusplus
+interface IInternetSession;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IInternetProtocolSinkStackable_FWD_DEFINED__
 #define __IInternetProtocolSinkStackable_FWD_DEFINED__
 typedef interface IInternetProtocolSinkStackable IInternetProtocolSinkStackable;
+#ifdef __cplusplus
+interface IInternetProtocolSinkStackable;
+#endif /* __cplusplus */
 #endif
 
 
@@ -5209,18 +4715,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternet* This,
+        IInternet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternet* This);
+        IInternet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternet* This);
+        IInternet *This);
 
     END_INTERFACE
 } IInternetVtbl;
+
 interface IInternet {
     CONST_VTBL IInternetVtbl* lpVtbl;
 };
@@ -5314,24 +4821,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetBindInfo* This,
+        IInternetBindInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetBindInfo* This);
+        IInternetBindInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetBindInfo* This);
+        IInternetBindInfo *This);
 
     /*** IInternetBindInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBindInfo)(
-        IInternetBindInfo* This,
+        IInternetBindInfo *This,
         DWORD *grfBINDF,
         BINDINFO *pbindinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBindString)(
-        IInternetBindInfo* This,
+        IInternetBindInfo *This,
         ULONG ulStringType,
         LPOLESTR *ppwzStr,
         ULONG cEl,
@@ -5339,6 +4846,7 @@
 
     END_INTERFACE
 } IInternetBindInfoVtbl;
+
 interface IInternetBindInfo {
     CONST_VTBL IInternetBindInfoVtbl* lpVtbl;
 };
@@ -5375,26 +4883,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetBindInfo_GetBindInfo_Proxy(
-    IInternetBindInfo* This,
-    DWORD *grfBINDF,
-    BINDINFO *pbindinfo);
-void __RPC_STUB IInternetBindInfo_GetBindInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetBindInfo_GetBindString_Proxy(
-    IInternetBindInfo* This,
-    ULONG ulStringType,
-    LPOLESTR *ppwzStr,
-    ULONG cEl,
-    ULONG *pcElFetched);
-void __RPC_STUB IInternetBindInfo_GetBindString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetBindInfo_INTERFACE_DEFINED__ */
 
@@ -5432,24 +4920,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetBindInfoEx* This,
+        IInternetBindInfoEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetBindInfoEx* This);
+        IInternetBindInfoEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetBindInfoEx* This);
+        IInternetBindInfoEx *This);
 
     /*** IInternetBindInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBindInfo)(
-        IInternetBindInfoEx* This,
+        IInternetBindInfoEx *This,
         DWORD *grfBINDF,
         BINDINFO *pbindinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetBindString)(
-        IInternetBindInfoEx* This,
+        IInternetBindInfoEx *This,
         ULONG ulStringType,
         LPOLESTR *ppwzStr,
         ULONG cEl,
@@ -5457,7 +4945,7 @@
 
     /*** IInternetBindInfoEx methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBindInfoEx)(
-        IInternetBindInfoEx* This,
+        IInternetBindInfoEx *This,
         DWORD *grfBINDF,
         BINDINFO *pbindinfo,
         DWORD *grfBINDF2,
@@ -5465,6 +4953,7 @@
 
     END_INTERFACE
 } IInternetBindInfoExVtbl;
+
 interface IInternetBindInfoEx {
     CONST_VTBL IInternetBindInfoExVtbl* lpVtbl;
 };
@@ -5507,17 +4996,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetBindInfoEx_GetBindInfoEx_Proxy(
-    IInternetBindInfoEx* This,
-    DWORD *grfBINDF,
-    BINDINFO *pbindinfo,
-    DWORD *grfBINDF2,
-    DWORD *pdwReserved);
-void __RPC_STUB IInternetBindInfoEx_GetBindInfoEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetBindInfoEx_INTERFACE_DEFINED__ */
 
@@ -5602,19 +5080,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetProtocolRoot* This,
+        IInternetProtocolRoot *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetProtocolRoot* This);
+        IInternetProtocolRoot *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetProtocolRoot* This);
+        IInternetProtocolRoot *This);
 
     /*** IInternetProtocolRoot methods ***/
     HRESULT (STDMETHODCALLTYPE *Start)(
-        IInternetProtocolRoot* This,
+        IInternetProtocolRoot *This,
         LPCWSTR szUrl,
         IInternetProtocolSink *pOIProtSink,
         IInternetBindInfo *pOIBindInfo,
@@ -5622,26 +5100,27 @@
         HANDLE_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Continue)(
-        IInternetProtocolRoot* This,
+        IInternetProtocolRoot *This,
         PROTOCOLDATA *pProtocolData);
 
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IInternetProtocolRoot* This,
+        IInternetProtocolRoot *This,
         HRESULT hrReason,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *Terminate)(
-        IInternetProtocolRoot* This,
+        IInternetProtocolRoot *This,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IInternetProtocolRoot* This);
+        IInternetProtocolRoot *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IInternetProtocolRoot* This);
+        IInternetProtocolRoot *This);
 
     END_INTERFACE
 } IInternetProtocolRootVtbl;
+
 interface IInternetProtocolRoot {
     CONST_VTBL IInternetProtocolRootVtbl* lpVtbl;
 };
@@ -5694,57 +5173,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Start_Proxy(
-    IInternetProtocolRoot* This,
-    LPCWSTR szUrl,
-    IInternetProtocolSink *pOIProtSink,
-    IInternetBindInfo *pOIBindInfo,
-    DWORD grfPI,
-    HANDLE_PTR dwReserved);
-void __RPC_STUB IInternetProtocolRoot_Start_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Continue_Proxy(
-    IInternetProtocolRoot* This,
-    PROTOCOLDATA *pProtocolData);
-void __RPC_STUB IInternetProtocolRoot_Continue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Abort_Proxy(
-    IInternetProtocolRoot* This,
-    HRESULT hrReason,
-    DWORD dwOptions);
-void __RPC_STUB IInternetProtocolRoot_Abort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Terminate_Proxy(
-    IInternetProtocolRoot* This,
-    DWORD dwOptions);
-void __RPC_STUB IInternetProtocolRoot_Terminate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Suspend_Proxy(
-    IInternetProtocolRoot* This);
-void __RPC_STUB IInternetProtocolRoot_Suspend_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolRoot_Resume_Proxy(
-    IInternetProtocolRoot* This);
-void __RPC_STUB IInternetProtocolRoot_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetProtocolRoot_INTERFACE_DEFINED__ */
 
@@ -5792,19 +5220,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetProtocol* This);
+        IInternetProtocol *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetProtocol* This);
+        IInternetProtocol *This);
 
     /*** IInternetProtocolRoot methods ***/
     HRESULT (STDMETHODCALLTYPE *Start)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         LPCWSTR szUrl,
         IInternetProtocolSink *pOIProtSink,
         IInternetBindInfo *pOIBindInfo,
@@ -5812,46 +5240,47 @@
         HANDLE_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Continue)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         PROTOCOLDATA *pProtocolData);
 
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         HRESULT hrReason,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *Terminate)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IInternetProtocol* This);
+        IInternetProtocol *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IInternetProtocol* This);
+        IInternetProtocol *This);
 
     /*** IInternetProtocol methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *LockRequest)(
-        IInternetProtocol* This,
+        IInternetProtocol *This,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRequest)(
-        IInternetProtocol* This);
+        IInternetProtocol *This);
 
     END_INTERFACE
 } IInternetProtocolVtbl;
+
 interface IInternetProtocol {
     CONST_VTBL IInternetProtocolVtbl* lpVtbl;
 };
@@ -5922,41 +5351,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetProtocol_Read_Proxy(
-    IInternetProtocol* This,
-    void *pv,
-    ULONG cb,
-    ULONG *pcbRead);
-void __RPC_STUB IInternetProtocol_Read_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocol_Seek_Proxy(
-    IInternetProtocol* This,
-    LARGE_INTEGER dlibMove,
-    DWORD dwOrigin,
-    ULARGE_INTEGER *plibNewPosition);
-void __RPC_STUB IInternetProtocol_Seek_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocol_LockRequest_Proxy(
-    IInternetProtocol* This,
-    DWORD dwOptions);
-void __RPC_STUB IInternetProtocol_LockRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocol_UnlockRequest_Proxy(
-    IInternetProtocol* This);
-void __RPC_STUB IInternetProtocol_UnlockRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetProtocol_INTERFACE_DEFINED__ */
 
@@ -5994,19 +5388,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetProtocolEx* This);
+        IInternetProtocolEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetProtocolEx* This);
+        IInternetProtocolEx *This);
 
     /*** IInternetProtocolRoot methods ***/
     HRESULT (STDMETHODCALLTYPE *Start)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         LPCWSTR szUrl,
         IInternetProtocolSink *pOIProtSink,
         IInternetBindInfo *pOIBindInfo,
@@ -6014,47 +5408,47 @@
         HANDLE_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *Continue)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         PROTOCOLDATA *pProtocolData);
 
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         HRESULT hrReason,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *Terminate)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *Suspend)(
-        IInternetProtocolEx* This);
+        IInternetProtocolEx *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IInternetProtocolEx* This);
+        IInternetProtocolEx *This);
 
     /*** IInternetProtocol methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *LockRequest)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         DWORD dwOptions);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRequest)(
-        IInternetProtocolEx* This);
+        IInternetProtocolEx *This);
 
     /*** IInternetProtocolEx methods ***/
     HRESULT (STDMETHODCALLTYPE *StartEx)(
-        IInternetProtocolEx* This,
+        IInternetProtocolEx *This,
         IUri *pUri,
         IInternetProtocolSink *pOIProtSink,
         IInternetBindInfo *pOIBindInfo,
@@ -6063,6 +5457,7 @@
 
     END_INTERFACE
 } IInternetProtocolExVtbl;
+
 interface IInternetProtocolEx {
     CONST_VTBL IInternetProtocolExVtbl* lpVtbl;
 };
@@ -6139,18 +5534,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetProtocolEx_StartEx_Proxy(
-    IInternetProtocolEx* This,
-    IUri *pUri,
-    IInternetProtocolSink *pOIProtSink,
-    IInternetBindInfo *pOIBindInfo,
-    DWORD grfPI,
-    HANDLE_PTR dwReserved);
-void __RPC_STUB IInternetProtocolEx_StartEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetProtocolEx_INTERFACE_DEFINED__ */
 
@@ -6199,40 +5582,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetProtocolSink* This,
+        IInternetProtocolSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetProtocolSink* This);
+        IInternetProtocolSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetProtocolSink* This);
+        IInternetProtocolSink *This);
 
     /*** IInternetProtocolSink methods ***/
     HRESULT (STDMETHODCALLTYPE *Switch)(
-        IInternetProtocolSink* This,
+        IInternetProtocolSink *This,
         PROTOCOLDATA *pProtocolData);
 
     HRESULT (STDMETHODCALLTYPE *ReportProgress)(
-        IInternetProtocolSink* This,
+        IInternetProtocolSink *This,
         ULONG ulStatusCode,
         LPCWSTR szStatusText);
 
     HRESULT (STDMETHODCALLTYPE *ReportData)(
-        IInternetProtocolSink* This,
+        IInternetProtocolSink *This,
         DWORD grfBSCF,
         ULONG ulProgress,
         ULONG ulProgressMax);
 
     HRESULT (STDMETHODCALLTYPE *ReportResult)(
-        IInternetProtocolSink* This,
+        IInternetProtocolSink *This,
         HRESULT hrResult,
         DWORD dwError,
         LPCWSTR szResult);
 
     END_INTERFACE
 } IInternetProtocolSinkVtbl;
+
 interface IInternetProtocolSink {
     CONST_VTBL IInternetProtocolSinkVtbl* lpVtbl;
 };
@@ -6277,43 +5661,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetProtocolSink_Switch_Proxy(
-    IInternetProtocolSink* This,
-    PROTOCOLDATA *pProtocolData);
-void __RPC_STUB IInternetProtocolSink_Switch_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolSink_ReportProgress_Proxy(
-    IInternetProtocolSink* This,
-    ULONG ulStatusCode,
-    LPCWSTR szStatusText);
-void __RPC_STUB IInternetProtocolSink_ReportProgress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolSink_ReportData_Proxy(
-    IInternetProtocolSink* This,
-    DWORD grfBSCF,
-    ULONG ulProgress,
-    ULONG ulProgressMax);
-void __RPC_STUB IInternetProtocolSink_ReportData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolSink_ReportResult_Proxy(
-    IInternetProtocolSink* This,
-    HRESULT hrResult,
-    DWORD dwError,
-    LPCWSTR szResult);
-void __RPC_STUB IInternetProtocolSink_ReportResult_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetProtocolSink_INTERFACE_DEFINED__ */
 
@@ -6354,29 +5701,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetProtocolSinkStackable* This,
+        IInternetProtocolSinkStackable *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetProtocolSinkStackable* This);
+        IInternetProtocolSinkStackable *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetProtocolSinkStackable* This);
+        IInternetProtocolSinkStackable *This);
 
     /*** IInternetProtocolSinkStackable methods ***/
     HRESULT (STDMETHODCALLTYPE *SwitchSink)(
-        IInternetProtocolSinkStackable* This,
+        IInternetProtocolSinkStackable *This,
         IInternetProtocolSink *pOIProtSink);
 
     HRESULT (STDMETHODCALLTYPE *CommitSwitch)(
-        IInternetProtocolSinkStackable* This);
+        IInternetProtocolSinkStackable *This);
 
     HRESULT (STDMETHODCALLTYPE *RollbackSwitch)(
-        IInternetProtocolSinkStackable* This);
+        IInternetProtocolSinkStackable *This);
 
     END_INTERFACE
 } IInternetProtocolSinkStackableVtbl;
+
 interface IInternetProtocolSinkStackable {
     CONST_VTBL IInternetProtocolSinkStackableVtbl* lpVtbl;
 };
@@ -6417,28 +5765,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetProtocolSinkStackable_SwitchSink_Proxy(
-    IInternetProtocolSinkStackable* This,
-    IInternetProtocolSink *pOIProtSink);
-void __RPC_STUB IInternetProtocolSinkStackable_SwitchSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolSinkStackable_CommitSwitch_Proxy(
-    IInternetProtocolSinkStackable* This);
-void __RPC_STUB IInternetProtocolSinkStackable_CommitSwitch_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolSinkStackable_RollbackSwitch_Proxy(
-    IInternetProtocolSinkStackable* This);
-void __RPC_STUB IInternetProtocolSinkStackable_RollbackSwitch_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetProtocolSinkStackable_INTERFACE_DEFINED__ */
 
@@ -6516,19 +5842,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetSession* This,
+        IInternetSession *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetSession* This);
+        IInternetSession *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetSession* This);
+        IInternetSession *This);
 
     /*** IInternetSession methods ***/
     HRESULT (STDMETHODCALLTYPE *RegisterNameSpace)(
-        IInternetSession* This,
+        IInternetSession *This,
         IClassFactory *pCF,
         REFCLSID rclsid,
         LPCWSTR pwzProtocol,
@@ -6537,23 +5863,23 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterNameSpace)(
-        IInternetSession* This,
+        IInternetSession *This,
         IClassFactory *pCF,
         LPCWSTR pszProtocol);
 
     HRESULT (STDMETHODCALLTYPE *RegisterMimeFilter)(
-        IInternetSession* This,
+        IInternetSession *This,
         IClassFactory *pCF,
         REFCLSID rclsid,
         LPCWSTR pwzType);
 
     HRESULT (STDMETHODCALLTYPE *UnregisterMimeFilter)(
-        IInternetSession* This,
+        IInternetSession *This,
         IClassFactory *pCF,
         LPCWSTR pwzType);
 
     HRESULT (STDMETHODCALLTYPE *CreateBinding)(
-        IInternetSession* This,
+        IInternetSession *This,
         LPBC pBC,
         LPCWSTR szUrl,
         IUnknown *pUnkOuter,
@@ -6562,14 +5888,14 @@
         DWORD dwOption);
 
     HRESULT (STDMETHODCALLTYPE *SetSessionOption)(
-        IInternetSession* This,
+        IInternetSession *This,
         DWORD dwOption,
         LPVOID pBuffer,
         DWORD dwBufferLength,
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *GetSessionOption)(
-        IInternetSession* This,
+        IInternetSession *This,
         DWORD dwOption,
         LPVOID pBuffer,
         DWORD *pdwBufferLength,
@@ -6577,6 +5903,7 @@
 
     END_INTERFACE
 } IInternetSessionVtbl;
+
 interface IInternetSession {
     CONST_VTBL IInternetSessionVtbl* lpVtbl;
 };
@@ -6633,82 +5960,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetSession_RegisterNameSpace_Proxy(
-    IInternetSession* This,
-    IClassFactory *pCF,
-    REFCLSID rclsid,
-    LPCWSTR pwzProtocol,
-    ULONG cPatterns,
-    const LPCWSTR *ppwzPatterns,
-    DWORD dwReserved);
-void __RPC_STUB IInternetSession_RegisterNameSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSession_UnregisterNameSpace_Proxy(
-    IInternetSession* This,
-    IClassFactory *pCF,
-    LPCWSTR pszProtocol);
-void __RPC_STUB IInternetSession_UnregisterNameSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSession_RegisterMimeFilter_Proxy(
-    IInternetSession* This,
-    IClassFactory *pCF,
-    REFCLSID rclsid,
-    LPCWSTR pwzType);
-void __RPC_STUB IInternetSession_RegisterMimeFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSession_UnregisterMimeFilter_Proxy(
-    IInternetSession* This,
-    IClassFactory *pCF,
-    LPCWSTR pwzType);
-void __RPC_STUB IInternetSession_UnregisterMimeFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSession_CreateBinding_Proxy(
-    IInternetSession* This,
-    LPBC pBC,
-    LPCWSTR szUrl,
-    IUnknown *pUnkOuter,
-    IUnknown **ppUnk,
-    IInternetProtocol **ppOInetProt,
-    DWORD dwOption);
-void __RPC_STUB IInternetSession_CreateBinding_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSession_SetSessionOption_Proxy(
-    IInternetSession* This,
-    DWORD dwOption,
-    LPVOID pBuffer,
-    DWORD dwBufferLength,
-    DWORD dwReserved);
-void __RPC_STUB IInternetSession_SetSessionOption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSession_GetSessionOption_Proxy(
-    IInternetSession* This,
-    DWORD dwOption,
-    LPVOID pBuffer,
-    DWORD *pdwBufferLength,
-    DWORD dwReserved);
-void __RPC_STUB IInternetSession_GetSessionOption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetSession_INTERFACE_DEFINED__ */
 
@@ -6746,25 +5997,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetThreadSwitch* This,
+        IInternetThreadSwitch *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetThreadSwitch* This);
+        IInternetThreadSwitch *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetThreadSwitch* This);
+        IInternetThreadSwitch *This);
 
     /*** IInternetThreadSwitch methods ***/
     HRESULT (STDMETHODCALLTYPE *Prepare)(
-        IInternetThreadSwitch* This);
+        IInternetThreadSwitch *This);
 
     HRESULT (STDMETHODCALLTYPE *Continue)(
-        IInternetThreadSwitch* This);
+        IInternetThreadSwitch *This);
 
     END_INTERFACE
 } IInternetThreadSwitchVtbl;
+
 interface IInternetThreadSwitch {
     CONST_VTBL IInternetThreadSwitchVtbl* lpVtbl;
 };
@@ -6801,20 +6053,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetThreadSwitch_Prepare_Proxy(
-    IInternetThreadSwitch* This);
-void __RPC_STUB IInternetThreadSwitch_Prepare_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetThreadSwitch_Continue_Proxy(
-    IInternetThreadSwitch* This);
-void __RPC_STUB IInternetThreadSwitch_Continue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetThreadSwitch_INTERFACE_DEFINED__ */
 
@@ -6852,27 +6090,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetPriority* This,
+        IInternetPriority *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetPriority* This);
+        IInternetPriority *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetPriority* This);
+        IInternetPriority *This);
 
     /*** IInternetPriority methods ***/
     HRESULT (STDMETHODCALLTYPE *SetPriority)(
-        IInternetPriority* This,
+        IInternetPriority *This,
         LONG nPriority);
 
     HRESULT (STDMETHODCALLTYPE *GetPriority)(
-        IInternetPriority* This,
+        IInternetPriority *This,
         LONG *pnPriority);
 
     END_INTERFACE
 } IInternetPriorityVtbl;
+
 interface IInternetPriority {
     CONST_VTBL IInternetPriorityVtbl* lpVtbl;
 };
@@ -6909,22 +6148,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetPriority_SetPriority_Proxy(
-    IInternetPriority* This,
-    LONG nPriority);
-void __RPC_STUB IInternetPriority_SetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetPriority_GetPriority_Proxy(
-    IInternetPriority* This,
-    LONG *pnPriority);
-void __RPC_STUB IInternetPriority_GetPriority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetPriority_INTERFACE_DEFINED__ */
 
@@ -7034,19 +6257,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetProtocolInfo* This,
+        IInternetProtocolInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetProtocolInfo* This);
+        IInternetProtocolInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetProtocolInfo* This);
+        IInternetProtocolInfo *This);
 
     /*** IInternetProtocolInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *ParseUrl)(
-        IInternetProtocolInfo* This,
+        IInternetProtocolInfo *This,
         LPCWSTR pwzUrl,
         PARSEACTION ParseAction,
         DWORD dwParseFlags,
@@ -7056,7 +6279,7 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *CombineUrl)(
-        IInternetProtocolInfo* This,
+        IInternetProtocolInfo *This,
         LPCWSTR pwzBaseUrl,
         LPCWSTR pwzRelativeUrl,
         DWORD dwCombineFlags,
@@ -7066,13 +6289,13 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *CompareUrl)(
-        IInternetProtocolInfo* This,
+        IInternetProtocolInfo *This,
         LPCWSTR pwzUrl1,
         LPCWSTR pwzUrl2,
         DWORD dwCompareFlags);
 
     HRESULT (STDMETHODCALLTYPE *QueryInfo)(
-        IInternetProtocolInfo* This,
+        IInternetProtocolInfo *This,
         LPCWSTR pwzUrl,
         QUERYOPTION OueryOption,
         DWORD dwQueryFlags,
@@ -7083,6 +6306,7 @@
 
     END_INTERFACE
 } IInternetProtocolInfoVtbl;
+
 interface IInternetProtocolInfo {
     CONST_VTBL IInternetProtocolInfoVtbl* lpVtbl;
 };
@@ -7127,58 +6351,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_ParseUrl_Proxy(
-    IInternetProtocolInfo* This,
-    LPCWSTR pwzUrl,
-    PARSEACTION ParseAction,
-    DWORD dwParseFlags,
-    LPWSTR pwzResult,
-    DWORD cchResult,
-    DWORD *pcchResult,
-    DWORD dwReserved);
-void __RPC_STUB IInternetProtocolInfo_ParseUrl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_CombineUrl_Proxy(
-    IInternetProtocolInfo* This,
-    LPCWSTR pwzBaseUrl,
-    LPCWSTR pwzRelativeUrl,
-    DWORD dwCombineFlags,
-    LPWSTR pwzResult,
-    DWORD cchResult,
-    DWORD *pcchResult,
-    DWORD dwReserved);
-void __RPC_STUB IInternetProtocolInfo_CombineUrl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_CompareUrl_Proxy(
-    IInternetProtocolInfo* This,
-    LPCWSTR pwzUrl1,
-    LPCWSTR pwzUrl2,
-    DWORD dwCompareFlags);
-void __RPC_STUB IInternetProtocolInfo_CompareUrl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetProtocolInfo_QueryInfo_Proxy(
-    IInternetProtocolInfo* This,
-    LPCWSTR pwzUrl,
-    QUERYOPTION OueryOption,
-    DWORD dwQueryFlags,
-    LPVOID pBuffer,
-    DWORD cbBuffer,
-    DWORD *pcbBuf,
-    DWORD dwReserved);
-void __RPC_STUB IInternetProtocolInfo_QueryInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetProtocolInfo_INTERFACE_DEFINED__ */
 
@@ -7389,27 +6561,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetSecurityMgrSite* This,
+        IInternetSecurityMgrSite *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetSecurityMgrSite* This);
+        IInternetSecurityMgrSite *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetSecurityMgrSite* This);
+        IInternetSecurityMgrSite *This);
 
     /*** IInternetSecurityMgrSite methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWindow)(
-        IInternetSecurityMgrSite* This,
+        IInternetSecurityMgrSite *This,
         HWND *phwnd);
 
     HRESULT (STDMETHODCALLTYPE *EnableModeless)(
-        IInternetSecurityMgrSite* This,
+        IInternetSecurityMgrSite *This,
         WINBOOL fEnable);
 
     END_INTERFACE
 } IInternetSecurityMgrSiteVtbl;
+
 interface IInternetSecurityMgrSite {
     CONST_VTBL IInternetSecurityMgrSiteVtbl* lpVtbl;
 };
@@ -7446,22 +6619,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetSecurityMgrSite_GetWindow_Proxy(
-    IInternetSecurityMgrSite* This,
-    HWND *phwnd);
-void __RPC_STUB IInternetSecurityMgrSite_GetWindow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityMgrSite_EnableModeless_Proxy(
-    IInternetSecurityMgrSite* This,
-    WINBOOL fEnable);
-void __RPC_STUB IInternetSecurityMgrSite_EnableModeless_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetSecurityMgrSite_INTERFACE_DEFINED__ */
 
@@ -7587,40 +6744,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetSecurityManager* This);
+        IInternetSecurityManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetSecurityManager* This);
+        IInternetSecurityManager *This);
 
     /*** IInternetSecurityManager methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSecuritySite)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         IInternetSecurityMgrSite *pSite);
 
     HRESULT (STDMETHODCALLTYPE *GetSecuritySite)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         IInternetSecurityMgrSite **ppSite);
 
     HRESULT (STDMETHODCALLTYPE *MapUrlToZone)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         LPCWSTR pwszUrl,
         DWORD *pdwZone,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSecurityId)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         LPCWSTR pwszUrl,
         BYTE *pbSecurityId,
         DWORD *pcbSecurityId,
         DWORD_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         LPCWSTR pwszUrl,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -7631,7 +6788,7 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         LPCWSTR pwszUrl,
         REFGUID guidKey,
         BYTE **ppPolicy,
@@ -7641,19 +6798,20 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneMapping)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         DWORD dwZone,
         LPCWSTR lpszPattern,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneMappings)(
-        IInternetSecurityManager* This,
+        IInternetSecurityManager *This,
         DWORD dwZone,
         IEnumString **ppenumString,
         DWORD dwFlags);
 
     END_INTERFACE
 } IInternetSecurityManagerVtbl;
+
 interface IInternetSecurityManager {
     CONST_VTBL IInternetSecurityManagerVtbl* lpVtbl;
 };
@@ -7714,92 +6872,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_SetSecuritySite_Proxy(
-    IInternetSecurityManager* This,
-    IInternetSecurityMgrSite *pSite);
-void __RPC_STUB IInternetSecurityManager_SetSecuritySite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_GetSecuritySite_Proxy(
-    IInternetSecurityManager* This,
-    IInternetSecurityMgrSite **ppSite);
-void __RPC_STUB IInternetSecurityManager_GetSecuritySite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_MapUrlToZone_Proxy(
-    IInternetSecurityManager* This,
-    LPCWSTR pwszUrl,
-    DWORD *pdwZone,
-    DWORD dwFlags);
-void __RPC_STUB IInternetSecurityManager_MapUrlToZone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_GetSecurityId_Proxy(
-    IInternetSecurityManager* This,
-    LPCWSTR pwszUrl,
-    BYTE *pbSecurityId,
-    DWORD *pcbSecurityId,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IInternetSecurityManager_GetSecurityId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_ProcessUrlAction_Proxy(
-    IInternetSecurityManager* This,
-    LPCWSTR pwszUrl,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    BYTE *pContext,
-    DWORD cbContext,
-    DWORD dwFlags,
-    DWORD dwReserved);
-void __RPC_STUB IInternetSecurityManager_ProcessUrlAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_QueryCustomPolicy_Proxy(
-    IInternetSecurityManager* This,
-    LPCWSTR pwszUrl,
-    REFGUID guidKey,
-    BYTE **ppPolicy,
-    DWORD *pcbPolicy,
-    BYTE *pContext,
-    DWORD cbContext,
-    DWORD dwReserved);
-void __RPC_STUB IInternetSecurityManager_QueryCustomPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_SetZoneMapping_Proxy(
-    IInternetSecurityManager* This,
-    DWORD dwZone,
-    LPCWSTR lpszPattern,
-    DWORD dwFlags);
-void __RPC_STUB IInternetSecurityManager_SetZoneMapping_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManager_GetZoneMappings_Proxy(
-    IInternetSecurityManager* This,
-    DWORD dwZone,
-    IEnumString **ppenumString,
-    DWORD dwFlags);
-void __RPC_STUB IInternetSecurityManager_GetZoneMappings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetSecurityManager_INTERFACE_DEFINED__ */
 
@@ -7841,40 +6913,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetSecurityManagerEx* This);
+        IInternetSecurityManagerEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetSecurityManagerEx* This);
+        IInternetSecurityManagerEx *This);
 
     /*** IInternetSecurityManager methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSecuritySite)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         IInternetSecurityMgrSite *pSite);
 
     HRESULT (STDMETHODCALLTYPE *GetSecuritySite)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         IInternetSecurityMgrSite **ppSite);
 
     HRESULT (STDMETHODCALLTYPE *MapUrlToZone)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         LPCWSTR pwszUrl,
         DWORD *pdwZone,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSecurityId)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         LPCWSTR pwszUrl,
         BYTE *pbSecurityId,
         DWORD *pcbSecurityId,
         DWORD_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         LPCWSTR pwszUrl,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -7885,7 +6957,7 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         LPCWSTR pwszUrl,
         REFGUID guidKey,
         BYTE **ppPolicy,
@@ -7895,20 +6967,20 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneMapping)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         DWORD dwZone,
         LPCWSTR lpszPattern,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneMappings)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         DWORD dwZone,
         IEnumString **ppenumString,
         DWORD dwFlags);
 
     /*** IInternetSecurityManagerEx methods ***/
     HRESULT (STDMETHODCALLTYPE *ProcessUrlActionEx)(
-        IInternetSecurityManagerEx* This,
+        IInternetSecurityManagerEx *This,
         LPCWSTR pwszUrl,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -7921,6 +6993,7 @@
 
     END_INTERFACE
 } IInternetSecurityManagerExVtbl;
+
 interface IInternetSecurityManagerEx {
     CONST_VTBL IInternetSecurityManagerExVtbl* lpVtbl;
 };
@@ -7987,22 +7060,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx_ProcessUrlActionEx_Proxy(
-    IInternetSecurityManagerEx* This,
-    LPCWSTR pwszUrl,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    BYTE *pContext,
-    DWORD cbContext,
-    DWORD dwFlags,
-    DWORD dwReserved,
-    DWORD *pdwOutFlags);
-void __RPC_STUB IInternetSecurityManagerEx_ProcessUrlActionEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetSecurityManagerEx_INTERFACE_DEFINED__ */
 
@@ -8067,40 +7124,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetSecurityManagerEx2* This);
+        IInternetSecurityManagerEx2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetSecurityManagerEx2* This);
+        IInternetSecurityManagerEx2 *This);
 
     /*** IInternetSecurityManager methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSecuritySite)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         IInternetSecurityMgrSite *pSite);
 
     HRESULT (STDMETHODCALLTYPE *GetSecuritySite)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         IInternetSecurityMgrSite **ppSite);
 
     HRESULT (STDMETHODCALLTYPE *MapUrlToZone)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         LPCWSTR pwszUrl,
         DWORD *pdwZone,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSecurityId)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         LPCWSTR pwszUrl,
         BYTE *pbSecurityId,
         DWORD *pcbSecurityId,
         DWORD_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         LPCWSTR pwszUrl,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -8111,7 +7168,7 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         LPCWSTR pwszUrl,
         REFGUID guidKey,
         BYTE **ppPolicy,
@@ -8121,20 +7178,20 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneMapping)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         DWORD dwZone,
         LPCWSTR lpszPattern,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneMappings)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         DWORD dwZone,
         IEnumString **ppenumString,
         DWORD dwFlags);
 
     /*** IInternetSecurityManagerEx methods ***/
     HRESULT (STDMETHODCALLTYPE *ProcessUrlActionEx)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         LPCWSTR pwszUrl,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -8147,7 +7204,7 @@
 
     /*** IInternetSecurityManagerEx2 methods ***/
     HRESULT (STDMETHODCALLTYPE *MapUrlToZoneEx2)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         IUri *pUri,
         DWORD *pdwZone,
         DWORD dwFlags,
@@ -8155,7 +7212,7 @@
         DWORD *pdwOutFlags);
 
     HRESULT (STDMETHODCALLTYPE *ProcessUrlActionEx2)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         IUri *pUri,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -8167,14 +7224,14 @@
         DWORD *pdwOutFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetSecurityIdEx2)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         IUri *pUri,
         BYTE *pbSecurityId,
         DWORD *pcbSecurityId,
         DWORD_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *QueryCustomPolicyEx2)(
-        IInternetSecurityManagerEx2* This,
+        IInternetSecurityManagerEx2 *This,
         IUri *pUri,
         REFGUID guidKey,
         BYTE **ppPolicy,
@@ -8185,6 +7242,7 @@
 
     END_INTERFACE
 } IInternetSecurityManagerEx2Vtbl;
+
 interface IInternetSecurityManagerEx2 {
     CONST_VTBL IInternetSecurityManagerEx2Vtbl* lpVtbl;
 };
@@ -8269,59 +7327,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_MapUrlToZoneEx2_Proxy(
-    IInternetSecurityManagerEx2* This,
-    IUri *pUri,
-    DWORD *pdwZone,
-    DWORD dwFlags,
-    LPWSTR *ppwszMappedUrl,
-    DWORD *pdwOutFlags);
-void __RPC_STUB IInternetSecurityManagerEx2_MapUrlToZoneEx2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_ProcessUrlActionEx2_Proxy(
-    IInternetSecurityManagerEx2* This,
-    IUri *pUri,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    BYTE *pContext,
-    DWORD cbContext,
-    DWORD dwFlags,
-    DWORD_PTR dwReserved,
-    DWORD *pdwOutFlags);
-void __RPC_STUB IInternetSecurityManagerEx2_ProcessUrlActionEx2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_GetSecurityIdEx2_Proxy(
-    IInternetSecurityManagerEx2* This,
-    IUri *pUri,
-    BYTE *pbSecurityId,
-    DWORD *pcbSecurityId,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IInternetSecurityManagerEx2_GetSecurityIdEx2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetSecurityManagerEx2_QueryCustomPolicyEx2_Proxy(
-    IInternetSecurityManagerEx2* This,
-    IUri *pUri,
-    REFGUID guidKey,
-    BYTE **ppPolicy,
-    DWORD *pcbPolicy,
-    BYTE *pContext,
-    DWORD cbContext,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IInternetSecurityManagerEx2_QueryCustomPolicyEx2_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetSecurityManagerEx2_INTERFACE_DEFINED__ */
 
@@ -8359,30 +7364,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IZoneIdentifier* This,
+        IZoneIdentifier *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IZoneIdentifier* This);
+        IZoneIdentifier *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IZoneIdentifier* This);
+        IZoneIdentifier *This);
 
     /*** IZoneIdentifier methods ***/
     HRESULT (STDMETHODCALLTYPE *GetId)(
-        IZoneIdentifier* This,
+        IZoneIdentifier *This,
         DWORD *pdwZone);
 
     HRESULT (STDMETHODCALLTYPE *SetId)(
-        IZoneIdentifier* This,
+        IZoneIdentifier *This,
         DWORD dwZone);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IZoneIdentifier* This);
+        IZoneIdentifier *This);
 
     END_INTERFACE
 } IZoneIdentifierVtbl;
+
 interface IZoneIdentifier {
     CONST_VTBL IZoneIdentifierVtbl* lpVtbl;
 };
@@ -8423,29 +7429,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IZoneIdentifier_GetId_Proxy(
-    IZoneIdentifier* This,
-    DWORD *pdwZone);
-void __RPC_STUB IZoneIdentifier_GetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IZoneIdentifier_SetId_Proxy(
-    IZoneIdentifier* This,
-    DWORD dwZone);
-void __RPC_STUB IZoneIdentifier_SetId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IZoneIdentifier_Remove_Proxy(
-    IZoneIdentifier* This);
-void __RPC_STUB IZoneIdentifier_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IZoneIdentifier_INTERFACE_DEFINED__ */
 
@@ -8497,25 +7480,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetHostSecurityManager* This,
+        IInternetHostSecurityManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetHostSecurityManager* This);
+        IInternetHostSecurityManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetHostSecurityManager* This);
+        IInternetHostSecurityManager *This);
 
     /*** IInternetHostSecurityManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSecurityId)(
-        IInternetHostSecurityManager* This,
+        IInternetHostSecurityManager *This,
         BYTE *pbSecurityId,
         DWORD *pcbSecurityId,
         DWORD_PTR dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *ProcessUrlAction)(
-        IInternetHostSecurityManager* This,
+        IInternetHostSecurityManager *This,
         DWORD dwAction,
         BYTE *pPolicy,
         DWORD cbPolicy,
@@ -8525,7 +7508,7 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *QueryCustomPolicy)(
-        IInternetHostSecurityManager* This,
+        IInternetHostSecurityManager *This,
         REFGUID guidKey,
         BYTE **ppPolicy,
         DWORD *pcbPolicy,
@@ -8535,6 +7518,7 @@
 
     END_INTERFACE
 } IInternetHostSecurityManagerVtbl;
+
 interface IInternetHostSecurityManager {
     CONST_VTBL IInternetHostSecurityManagerVtbl* lpVtbl;
 };
@@ -8575,43 +7559,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetHostSecurityManager_GetSecurityId_Proxy(
-    IInternetHostSecurityManager* This,
-    BYTE *pbSecurityId,
-    DWORD *pcbSecurityId,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IInternetHostSecurityManager_GetSecurityId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetHostSecurityManager_ProcessUrlAction_Proxy(
-    IInternetHostSecurityManager* This,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    BYTE *pContext,
-    DWORD cbContext,
-    DWORD dwFlags,
-    DWORD dwReserved);
-void __RPC_STUB IInternetHostSecurityManager_ProcessUrlAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetHostSecurityManager_QueryCustomPolicy_Proxy(
-    IInternetHostSecurityManager* This,
-    REFGUID guidKey,
-    BYTE **ppPolicy,
-    DWORD *pcbPolicy,
-    BYTE *pContext,
-    DWORD cbContext,
-    DWORD dwReserved);
-void __RPC_STUB IInternetHostSecurityManager_QueryCustomPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetHostSecurityManager_INTERFACE_DEFINED__ */
 
@@ -8862,7 +7809,6 @@
     MAX_ZONE_DESCRIPTION = 200
 };
 
-
 typedef enum __WIDL_urlmon_generated_name_00000011 {
     ZAFLAGS_CUSTOM_EDIT = 0x1,
     ZAFLAGS_ADD_SITES = 0x2,
@@ -8979,29 +7925,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetZoneManager* This);
+        IInternetZoneManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetZoneManager* This);
+        IInternetZoneManager *This);
 
     /*** IInternetZoneManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetZoneAttributes)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwZone,
         ZONEATTRIBUTES *pZoneAttributes);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneAttributes)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwZone,
         ZONEATTRIBUTES *pZoneAttributes);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneCustomPolicy)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwZone,
         REFGUID guidKey,
         BYTE **ppPolicy,
@@ -9009,7 +7955,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneCustomPolicy)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwZone,
         REFGUID guidKey,
         BYTE *pPolicy,
@@ -9017,7 +7963,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicy)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9025,7 +7971,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicy)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9033,7 +7979,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *PromptAction)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwAction,
         HWND hwndParent,
         LPCWSTR pwszUrl,
@@ -9041,36 +7987,37 @@
         DWORD dwPromptFlags);
 
     HRESULT (STDMETHODCALLTYPE *LogAction)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwAction,
         LPCWSTR pwszUrl,
         LPCWSTR pwszText,
         DWORD dwLogFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateZoneEnumerator)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD *pdwEnum,
         DWORD *pdwCount,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneAt)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwEnum,
         DWORD dwIndex,
         DWORD *pdwZone);
 
     HRESULT (STDMETHODCALLTYPE *DestroyZoneEnumerator)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwEnum);
 
     HRESULT (STDMETHODCALLTYPE *CopyTemplatePoliciesToZone)(
-        IInternetZoneManager* This,
+        IInternetZoneManager *This,
         DWORD dwTemplate,
         DWORD dwZone,
         DWORD dwReserved);
 
     END_INTERFACE
 } IInternetZoneManagerVtbl;
+
 interface IInternetZoneManager {
     CONST_VTBL IInternetZoneManagerVtbl* lpVtbl;
 };
@@ -9147,133 +8094,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneAttributes_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwZone,
-    ZONEATTRIBUTES *pZoneAttributes);
-void __RPC_STUB IInternetZoneManager_GetZoneAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_SetZoneAttributes_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwZone,
-    ZONEATTRIBUTES *pZoneAttributes);
-void __RPC_STUB IInternetZoneManager_SetZoneAttributes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneCustomPolicy_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwZone,
-    REFGUID guidKey,
-    BYTE **ppPolicy,
-    DWORD *pcbPolicy,
-    URLZONEREG urlZoneReg);
-void __RPC_STUB IInternetZoneManager_GetZoneCustomPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_SetZoneCustomPolicy_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwZone,
-    REFGUID guidKey,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    URLZONEREG urlZoneReg);
-void __RPC_STUB IInternetZoneManager_SetZoneCustomPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneActionPolicy_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwZone,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    URLZONEREG urlZoneReg);
-void __RPC_STUB IInternetZoneManager_GetZoneActionPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_SetZoneActionPolicy_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwZone,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    URLZONEREG urlZoneReg);
-void __RPC_STUB IInternetZoneManager_SetZoneActionPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_PromptAction_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwAction,
-    HWND hwndParent,
-    LPCWSTR pwszUrl,
-    LPCWSTR pwszText,
-    DWORD dwPromptFlags);
-void __RPC_STUB IInternetZoneManager_PromptAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_LogAction_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwAction,
-    LPCWSTR pwszUrl,
-    LPCWSTR pwszText,
-    DWORD dwLogFlags);
-void __RPC_STUB IInternetZoneManager_LogAction_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_CreateZoneEnumerator_Proxy(
-    IInternetZoneManager* This,
-    DWORD *pdwEnum,
-    DWORD *pdwCount,
-    DWORD dwFlags);
-void __RPC_STUB IInternetZoneManager_CreateZoneEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_GetZoneAt_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwEnum,
-    DWORD dwIndex,
-    DWORD *pdwZone);
-void __RPC_STUB IInternetZoneManager_GetZoneAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_DestroyZoneEnumerator_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwEnum);
-void __RPC_STUB IInternetZoneManager_DestroyZoneEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManager_CopyTemplatePoliciesToZone_Proxy(
-    IInternetZoneManager* This,
-    DWORD dwTemplate,
-    DWORD dwZone,
-    DWORD dwReserved);
-void __RPC_STUB IInternetZoneManager_CopyTemplatePoliciesToZone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetZoneManager_INTERFACE_DEFINED__ */
 
@@ -9320,29 +8140,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetZoneManagerEx* This);
+        IInternetZoneManagerEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetZoneManagerEx* This);
+        IInternetZoneManagerEx *This);
 
     /*** IInternetZoneManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetZoneAttributes)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         ZONEATTRIBUTES *pZoneAttributes);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneAttributes)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         ZONEATTRIBUTES *pZoneAttributes);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneCustomPolicy)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         REFGUID guidKey,
         BYTE **ppPolicy,
@@ -9350,7 +8170,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneCustomPolicy)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         REFGUID guidKey,
         BYTE *pPolicy,
@@ -9358,7 +8178,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicy)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9366,7 +8186,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicy)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9374,7 +8194,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *PromptAction)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwAction,
         HWND hwndParent,
         LPCWSTR pwszUrl,
@@ -9382,37 +8202,37 @@
         DWORD dwPromptFlags);
 
     HRESULT (STDMETHODCALLTYPE *LogAction)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwAction,
         LPCWSTR pwszUrl,
         LPCWSTR pwszText,
         DWORD dwLogFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateZoneEnumerator)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD *pdwEnum,
         DWORD *pdwCount,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneAt)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwEnum,
         DWORD dwIndex,
         DWORD *pdwZone);
 
     HRESULT (STDMETHODCALLTYPE *DestroyZoneEnumerator)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwEnum);
 
     HRESULT (STDMETHODCALLTYPE *CopyTemplatePoliciesToZone)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwTemplate,
         DWORD dwZone,
         DWORD dwReserved);
 
     /*** IInternetZoneManagerEx methods ***/
     HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicyEx)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9421,7 +8241,7 @@
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicyEx)(
-        IInternetZoneManagerEx* This,
+        IInternetZoneManagerEx *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9431,6 +8251,7 @@
 
     END_INTERFACE
 } IInternetZoneManagerExVtbl;
+
 interface IInternetZoneManagerEx {
     CONST_VTBL IInternetZoneManagerExVtbl* lpVtbl;
 };
@@ -9517,32 +8338,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx_GetZoneActionPolicyEx_Proxy(
-    IInternetZoneManagerEx* This,
-    DWORD dwZone,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    URLZONEREG urlZoneReg,
-    DWORD dwFlags);
-void __RPC_STUB IInternetZoneManagerEx_GetZoneActionPolicyEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx_SetZoneActionPolicyEx_Proxy(
-    IInternetZoneManagerEx* This,
-    DWORD dwZone,
-    DWORD dwAction,
-    BYTE *pPolicy,
-    DWORD cbPolicy,
-    URLZONEREG urlZoneReg,
-    DWORD dwFlags);
-void __RPC_STUB IInternetZoneManagerEx_SetZoneActionPolicyEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetZoneManagerEx_INTERFACE_DEFINED__ */
 
@@ -9597,29 +8392,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IInternetZoneManagerEx2* This);
+        IInternetZoneManagerEx2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IInternetZoneManagerEx2* This);
+        IInternetZoneManagerEx2 *This);
 
     /*** IInternetZoneManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetZoneAttributes)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         ZONEATTRIBUTES *pZoneAttributes);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneAttributes)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         ZONEATTRIBUTES *pZoneAttributes);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneCustomPolicy)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         REFGUID guidKey,
         BYTE **ppPolicy,
@@ -9627,7 +8422,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneCustomPolicy)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         REFGUID guidKey,
         BYTE *pPolicy,
@@ -9635,7 +8430,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicy)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9643,7 +8438,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicy)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9651,7 +8446,7 @@
         URLZONEREG urlZoneReg);
 
     HRESULT (STDMETHODCALLTYPE *PromptAction)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwAction,
         HWND hwndParent,
         LPCWSTR pwszUrl,
@@ -9659,37 +8454,37 @@
         DWORD dwPromptFlags);
 
     HRESULT (STDMETHODCALLTYPE *LogAction)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwAction,
         LPCWSTR pwszUrl,
         LPCWSTR pwszText,
         DWORD dwLogFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateZoneEnumerator)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD *pdwEnum,
         DWORD *pdwCount,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneAt)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwEnum,
         DWORD dwIndex,
         DWORD *pdwZone);
 
     HRESULT (STDMETHODCALLTYPE *DestroyZoneEnumerator)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwEnum);
 
     HRESULT (STDMETHODCALLTYPE *CopyTemplatePoliciesToZone)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwTemplate,
         DWORD dwZone,
         DWORD dwReserved);
 
     /*** IInternetZoneManagerEx methods ***/
     HRESULT (STDMETHODCALLTYPE *GetZoneActionPolicyEx)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9698,7 +8493,7 @@
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SetZoneActionPolicyEx)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         DWORD dwAction,
         BYTE *pPolicy,
@@ -9708,30 +8503,31 @@
 
     /*** IInternetZoneManagerEx2 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetZoneAttributesEx)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZone,
         ZONEATTRIBUTES *pZoneAttributes,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetZoneSecurityState)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         DWORD dwZoneIndex,
         WINBOOL fRespectPolicy,
         LPDWORD pdwState,
         WINBOOL *pfPolicyEncountered);
 
     HRESULT (STDMETHODCALLTYPE *GetIESecurityState)(
-        IInternetZoneManagerEx2* This,
+        IInternetZoneManagerEx2 *This,
         WINBOOL fRespectPolicy,
         LPDWORD pdwState,
         WINBOOL *pfPolicyEncountered,
         WINBOOL fNoCache);
 
     HRESULT (STDMETHODCALLTYPE *FixUnsecureSettings)(
-        IInternetZoneManagerEx2* This);
+        IInternetZoneManagerEx2 *This);
 
     END_INTERFACE
 } IInternetZoneManagerEx2Vtbl;
+
 interface IInternetZoneManagerEx2 {
     CONST_VTBL IInternetZoneManagerEx2Vtbl* lpVtbl;
 };
@@ -9836,45 +8632,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_GetZoneAttributesEx_Proxy(
-    IInternetZoneManagerEx2* This,
-    DWORD dwZone,
-    ZONEATTRIBUTES *pZoneAttributes,
-    DWORD dwFlags);
-void __RPC_STUB IInternetZoneManagerEx2_GetZoneAttributesEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_GetZoneSecurityState_Proxy(
-    IInternetZoneManagerEx2* This,
-    DWORD dwZoneIndex,
-    WINBOOL fRespectPolicy,
-    LPDWORD pdwState,
-    WINBOOL *pfPolicyEncountered);
-void __RPC_STUB IInternetZoneManagerEx2_GetZoneSecurityState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_GetIESecurityState_Proxy(
-    IInternetZoneManagerEx2* This,
-    WINBOOL fRespectPolicy,
-    LPDWORD pdwState,
-    WINBOOL *pfPolicyEncountered,
-    WINBOOL fNoCache);
-void __RPC_STUB IInternetZoneManagerEx2_GetIESecurityState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IInternetZoneManagerEx2_FixUnsecureSettings_Proxy(
-    IInternetZoneManagerEx2* This);
-void __RPC_STUB IInternetZoneManagerEx2_FixUnsecureSettings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IInternetZoneManagerEx2_INTERFACE_DEFINED__ */
 
@@ -9963,35 +8720,35 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISoftDistExt* This,
+        ISoftDistExt *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISoftDistExt* This);
+        ISoftDistExt *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISoftDistExt* This);
+        ISoftDistExt *This);
 
     /*** ISoftDistExt methods ***/
     HRESULT (STDMETHODCALLTYPE *ProcessSoftDist)(
-        ISoftDistExt* This,
+        ISoftDistExt *This,
         LPCWSTR szCDFURL,
         IXMLElement *pSoftDistElement,
         LPSOFTDISTINFO lpsdi);
 
     HRESULT (STDMETHODCALLTYPE *GetFirstCodeBase)(
-        ISoftDistExt* This,
+        ISoftDistExt *This,
         LPWSTR *szCodeBase,
         LPDWORD dwMaxSize);
 
     HRESULT (STDMETHODCALLTYPE *GetNextCodeBase)(
-        ISoftDistExt* This,
+        ISoftDistExt *This,
         LPWSTR *szCodeBase,
         LPDWORD dwMaxSize);
 
     HRESULT (STDMETHODCALLTYPE *AsyncInstallDistributionUnit)(
-        ISoftDistExt* This,
+        ISoftDistExt *This,
         IBindCtx *pbc,
         LPVOID pvReserved,
         DWORD flags,
@@ -9999,6 +8756,7 @@
 
     END_INTERFACE
 } ISoftDistExtVtbl;
+
 interface ISoftDistExt {
     CONST_VTBL ISoftDistExtVtbl* lpVtbl;
 };
@@ -10043,45 +8801,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISoftDistExt_ProcessSoftDist_Proxy(
-    ISoftDistExt* This,
-    LPCWSTR szCDFURL,
-    IXMLElement *pSoftDistElement,
-    LPSOFTDISTINFO lpsdi);
-void __RPC_STUB ISoftDistExt_ProcessSoftDist_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISoftDistExt_GetFirstCodeBase_Proxy(
-    ISoftDistExt* This,
-    LPWSTR *szCodeBase,
-    LPDWORD dwMaxSize);
-void __RPC_STUB ISoftDistExt_GetFirstCodeBase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISoftDistExt_GetNextCodeBase_Proxy(
-    ISoftDistExt* This,
-    LPWSTR *szCodeBase,
-    LPDWORD dwMaxSize);
-void __RPC_STUB ISoftDistExt_GetNextCodeBase_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISoftDistExt_AsyncInstallDistributionUnit_Proxy(
-    ISoftDistExt* This,
-    IBindCtx *pbc,
-    LPVOID pvReserved,
-    DWORD flags,
-    LPCODEBASEHOLD lpcbh);
-void __RPC_STUB ISoftDistExt_AsyncInstallDistributionUnit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISoftDistExt_INTERFACE_DEFINED__ */
 
@@ -10122,27 +8841,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ICatalogFileInfo* This,
+        ICatalogFileInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ICatalogFileInfo* This);
+        ICatalogFileInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ICatalogFileInfo* This);
+        ICatalogFileInfo *This);
 
     /*** ICatalogFileInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCatalogFile)(
-        ICatalogFileInfo* This,
+        ICatalogFileInfo *This,
         LPSTR *ppszCatalogFile);
 
     HRESULT (STDMETHODCALLTYPE *GetJavaTrust)(
-        ICatalogFileInfo* This,
+        ICatalogFileInfo *This,
         void **ppJavaTrust);
 
     END_INTERFACE
 } ICatalogFileInfoVtbl;
+
 interface ICatalogFileInfo {
     CONST_VTBL ICatalogFileInfoVtbl* lpVtbl;
 };
@@ -10179,22 +8899,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ICatalogFileInfo_GetCatalogFile_Proxy(
-    ICatalogFileInfo* This,
-    LPSTR *ppszCatalogFile);
-void __RPC_STUB ICatalogFileInfo_GetCatalogFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ICatalogFileInfo_GetJavaTrust_Proxy(
-    ICatalogFileInfo* This,
-    void **ppJavaTrust);
-void __RPC_STUB ICatalogFileInfo_GetJavaTrust_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ICatalogFileInfo_INTERFACE_DEFINED__ */
 
@@ -10251,19 +8955,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IDataFilter* This,
+        IDataFilter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IDataFilter* This);
+        IDataFilter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IDataFilter* This);
+        IDataFilter *This);
 
     /*** IDataFilter methods ***/
     HRESULT (STDMETHODCALLTYPE *DoEncode)(
-        IDataFilter* This,
+        IDataFilter *This,
         DWORD dwFlags,
         LONG lInBufferSize,
         BYTE *pbInBuffer,
@@ -10275,7 +8979,7 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *DoDecode)(
-        IDataFilter* This,
+        IDataFilter *This,
         DWORD dwFlags,
         LONG lInBufferSize,
         BYTE *pbInBuffer,
@@ -10287,11 +8991,12 @@
         DWORD dwReserved);
 
     HRESULT (STDMETHODCALLTYPE *SetEncodingLevel)(
-        IDataFilter* This,
+        IDataFilter *This,
         DWORD dwEncLevel);
 
     END_INTERFACE
 } IDataFilterVtbl;
+
 interface IDataFilter {
     CONST_VTBL IDataFilterVtbl* lpVtbl;
 };
@@ -10332,46 +9037,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IDataFilter_DoEncode_Proxy(
-    IDataFilter* This,
-    DWORD dwFlags,
-    LONG lInBufferSize,
-    BYTE *pbInBuffer,
-    LONG lOutBufferSize,
-    BYTE *pbOutBuffer,
-    LONG lInBytesAvailable,
-    LONG *plInBytesRead,
-    LONG *plOutBytesWritten,
-    DWORD dwReserved);
-void __RPC_STUB IDataFilter_DoEncode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataFilter_DoDecode_Proxy(
-    IDataFilter* This,
-    DWORD dwFlags,
-    LONG lInBufferSize,
-    BYTE *pbInBuffer,
-    LONG lOutBufferSize,
-    BYTE *pbOutBuffer,
-    LONG lInBytesAvailable,
-    LONG *plInBytesRead,
-    LONG *plOutBytesWritten,
-    DWORD dwReserved);
-void __RPC_STUB IDataFilter_DoDecode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IDataFilter_SetEncodingLevel_Proxy(
-    IDataFilter* This,
-    DWORD dwEncLevel);
-void __RPC_STUB IDataFilter_SetEncodingLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IDataFilter_INTERFACE_DEFINED__ */
 
@@ -10429,32 +9094,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEncodingFilterFactory* This,
+        IEncodingFilterFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEncodingFilterFactory* This);
+        IEncodingFilterFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEncodingFilterFactory* This);
+        IEncodingFilterFactory *This);
 
     /*** IEncodingFilterFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *FindBestFilter)(
-        IEncodingFilterFactory* This,
+        IEncodingFilterFactory *This,
         LPCWSTR pwzCodeIn,
         LPCWSTR pwzCodeOut,
         DATAINFO info,
         IDataFilter **ppDF);
 
     HRESULT (STDMETHODCALLTYPE *GetDefaultFilter)(
-        IEncodingFilterFactory* This,
+        IEncodingFilterFactory *This,
         LPCWSTR pwzCodeIn,
         LPCWSTR pwzCodeOut,
         IDataFilter **ppDF);
 
     END_INTERFACE
 } IEncodingFilterFactoryVtbl;
+
 interface IEncodingFilterFactory {
     CONST_VTBL IEncodingFilterFactoryVtbl* lpVtbl;
 };
@@ -10491,27 +9157,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEncodingFilterFactory_FindBestFilter_Proxy(
-    IEncodingFilterFactory* This,
-    LPCWSTR pwzCodeIn,
-    LPCWSTR pwzCodeOut,
-    DATAINFO info,
-    IDataFilter **ppDF);
-void __RPC_STUB IEncodingFilterFactory_FindBestFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEncodingFilterFactory_GetDefaultFilter_Proxy(
-    IEncodingFilterFactory* This,
-    LPCWSTR pwzCodeIn,
-    LPCWSTR pwzCodeOut,
-    IDataFilter **ppDF);
-void __RPC_STUB IEncodingFilterFactory_GetDefaultFilter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEncodingFilterFactory_INTERFACE_DEFINED__ */
 
@@ -10543,7 +9188,6 @@
     DWORD dwFlags;
 };
 
-
 EXTERN_C const GUID GUID_CUSTOM_CONFIRMOBJECTSAFETY;
 #endif
 
@@ -10577,24 +9221,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWrappedProtocol* This,
+        IWrappedProtocol *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWrappedProtocol* This);
+        IWrappedProtocol *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWrappedProtocol* This);
+        IWrappedProtocol *This);
 
     /*** IWrappedProtocol methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWrapperCode)(
-        IWrappedProtocol* This,
+        IWrappedProtocol *This,
         LONG *pnCode,
         DWORD_PTR dwReserved);
 
     END_INTERFACE
 } IWrappedProtocolVtbl;
+
 interface IWrappedProtocol {
     CONST_VTBL IWrappedProtocolVtbl* lpVtbl;
 };
@@ -10627,15 +9272,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWrappedProtocol_GetWrapperCode_Proxy(
-    IWrappedProtocol* This,
-    LONG *pnCode,
-    DWORD_PTR dwReserved);
-void __RPC_STUB IWrappedProtocol_GetWrapperCode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWrappedProtocol_INTERFACE_DEFINED__ */
 
@@ -10677,24 +9313,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IGetBindHandle* This,
+        IGetBindHandle *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IGetBindHandle* This);
+        IGetBindHandle *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IGetBindHandle* This);
+        IGetBindHandle *This);
 
     /*** IGetBindHandle methods ***/
     HRESULT (STDMETHODCALLTYPE *GetBindHandle)(
-        IGetBindHandle* This,
+        IGetBindHandle *This,
         BINDHANDLETYPES enumRequestedHandle,
         HANDLE *pRetHandle);
 
     END_INTERFACE
 } IGetBindHandleVtbl;
+
 interface IGetBindHandle {
     CONST_VTBL IGetBindHandleVtbl* lpVtbl;
 };
@@ -10727,15 +9364,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IGetBindHandle_GetBindHandle_Proxy(
-    IGetBindHandle* This,
-    BINDHANDLETYPES enumRequestedHandle,
-    HANDLE *pRetHandle);
-void __RPC_STUB IGetBindHandle_GetBindHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IGetBindHandle_INTERFACE_DEFINED__ */
 
@@ -10781,24 +9409,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IBindCallbackRedirect* This,
+        IBindCallbackRedirect *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IBindCallbackRedirect* This);
+        IBindCallbackRedirect *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IBindCallbackRedirect* This);
+        IBindCallbackRedirect *This);
 
     /*** IBindCallbackRedirect methods ***/
     HRESULT (STDMETHODCALLTYPE *Redirect)(
-        IBindCallbackRedirect* This,
+        IBindCallbackRedirect *This,
         LPCWSTR lpcUrl,
         VARIANT_BOOL *vbCancel);
 
     END_INTERFACE
 } IBindCallbackRedirectVtbl;
+
 interface IBindCallbackRedirect {
     CONST_VTBL IBindCallbackRedirectVtbl* lpVtbl;
 };
@@ -10831,15 +9460,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IBindCallbackRedirect_Redirect_Proxy(
-    IBindCallbackRedirect* This,
-    LPCWSTR lpcUrl,
-    VARIANT_BOOL *vbCancel);
-void __RPC_STUB IBindCallbackRedirect_Redirect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IBindCallbackRedirect_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wbemads.h b/mingw-w64-headers/include/wbemads.h
index e181dfc..ab0e7d6 100644
--- a/mingw-w64-headers/include/wbemads.h
+++ b/mingw-w64-headers/include/wbemads.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wbemads.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wbemads.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -29,6 +29,9 @@
 #ifndef __IWMIExtension_FWD_DEFINED__
 #define __IWMIExtension_FWD_DEFINED__
 typedef interface IWMIExtension IWMIExtension;
+#ifdef __cplusplus
+interface IWMIExtension;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -55,6 +58,9 @@
 #ifndef __IWMIExtension_FWD_DEFINED__
 #define __IWMIExtension_FWD_DEFINED__
 typedef interface IWMIExtension IWMIExtension;
+#ifdef __cplusplus
+interface IWMIExtension;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -100,29 +106,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWMIExtension* This);
+        IWMIExtension *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWMIExtension* This);
+        IWMIExtension *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -130,7 +136,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -142,19 +148,20 @@
 
     /*** IWMIExtension methods ***/
     HRESULT (STDMETHODCALLTYPE *get_WMIObjectPath)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         BSTR *strWMIObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *GetWMIObject)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         ISWbemObject **objWMIObject);
 
     HRESULT (STDMETHODCALLTYPE *GetWMIServices)(
-        IWMIExtension* This,
+        IWMIExtension *This,
         ISWbemServices **objWMIServices);
 
     END_INTERFACE
 } IWMIExtensionVtbl;
+
 interface IWMIExtension {
     CONST_VTBL IWMIExtensionVtbl* lpVtbl;
 };
@@ -213,30 +220,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWMIExtension_get_WMIObjectPath_Proxy(
-    IWMIExtension* This,
-    BSTR *strWMIObjectPath);
-void __RPC_STUB IWMIExtension_get_WMIObjectPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWMIExtension_GetWMIObject_Proxy(
-    IWMIExtension* This,
-    ISWbemObject **objWMIObject);
-void __RPC_STUB IWMIExtension_GetWMIObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWMIExtension_GetWMIServices_Proxy(
-    IWMIExtension* This,
-    ISWbemServices **objWMIServices);
-void __RPC_STUB IWMIExtension_GetWMIServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWMIExtension_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wbemcli.h b/mingw-w64-headers/include/wbemcli.h
index 6ff4fa9..6f5b243 100644
--- a/mingw-w64-headers/include/wbemcli.h
+++ b/mingw-w64-headers/include/wbemcli.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wbemcli.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wbemcli.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -101,106 +101,169 @@
 #ifndef __IWbemClassObject_FWD_DEFINED__
 #define __IWbemClassObject_FWD_DEFINED__
 typedef interface IWbemClassObject IWbemClassObject;
+#ifdef __cplusplus
+interface IWbemClassObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemQualifierSet_FWD_DEFINED__
 #define __IWbemQualifierSet_FWD_DEFINED__
 typedef interface IWbemQualifierSet IWbemQualifierSet;
+#ifdef __cplusplus
+interface IWbemQualifierSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemLocator_FWD_DEFINED__
 #define __IWbemLocator_FWD_DEFINED__
 typedef interface IWbemLocator IWbemLocator;
+#ifdef __cplusplus
+interface IWbemLocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemObjectSink_FWD_DEFINED__
 #define __IWbemObjectSink_FWD_DEFINED__
 typedef interface IWbemObjectSink IWbemObjectSink;
+#ifdef __cplusplus
+interface IWbemObjectSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemObjectSinkEx_FWD_DEFINED__
 #define __IWbemObjectSinkEx_FWD_DEFINED__
 typedef interface IWbemObjectSinkEx IWbemObjectSinkEx;
+#ifdef __cplusplus
+interface IWbemObjectSinkEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IEnumWbemClassObject_FWD_DEFINED__
 #define __IEnumWbemClassObject_FWD_DEFINED__
 typedef interface IEnumWbemClassObject IEnumWbemClassObject;
+#ifdef __cplusplus
+interface IEnumWbemClassObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemContext_FWD_DEFINED__
 #define __IWbemContext_FWD_DEFINED__
 typedef interface IWbemContext IWbemContext;
+#ifdef __cplusplus
+interface IWbemContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemCallResult_FWD_DEFINED__
 #define __IWbemCallResult_FWD_DEFINED__
 typedef interface IWbemCallResult IWbemCallResult;
+#ifdef __cplusplus
+interface IWbemCallResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemServices_FWD_DEFINED__
 #define __IWbemServices_FWD_DEFINED__
 typedef interface IWbemServices IWbemServices;
+#ifdef __cplusplus
+interface IWbemServices;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemShutdown_FWD_DEFINED__
 #define __IWbemShutdown_FWD_DEFINED__
 typedef interface IWbemShutdown IWbemShutdown;
+#ifdef __cplusplus
+interface IWbemShutdown;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemObjectTextSrc_FWD_DEFINED__
 #define __IWbemObjectTextSrc_FWD_DEFINED__
 typedef interface IWbemObjectTextSrc IWbemObjectTextSrc;
+#ifdef __cplusplus
+interface IWbemObjectTextSrc;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemObjectAccess_FWD_DEFINED__
 #define __IWbemObjectAccess_FWD_DEFINED__
 typedef interface IWbemObjectAccess IWbemObjectAccess;
+#ifdef __cplusplus
+interface IWbemObjectAccess;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMofCompiler_FWD_DEFINED__
 #define __IMofCompiler_FWD_DEFINED__
 typedef interface IMofCompiler IMofCompiler;
+#ifdef __cplusplus
+interface IMofCompiler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUnsecuredApartment_FWD_DEFINED__
 #define __IUnsecuredApartment_FWD_DEFINED__
 typedef interface IUnsecuredApartment IUnsecuredApartment;
+#ifdef __cplusplus
+interface IUnsecuredApartment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemUnsecuredApartment_FWD_DEFINED__
 #define __IWbemUnsecuredApartment_FWD_DEFINED__
 typedef interface IWbemUnsecuredApartment IWbemUnsecuredApartment;
+#ifdef __cplusplus
+interface IWbemUnsecuredApartment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemStatusCodeText_FWD_DEFINED__
 #define __IWbemStatusCodeText_FWD_DEFINED__
 typedef interface IWbemStatusCodeText IWbemStatusCodeText;
+#ifdef __cplusplus
+interface IWbemStatusCodeText;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemBackupRestore_FWD_DEFINED__
 #define __IWbemBackupRestore_FWD_DEFINED__
 typedef interface IWbemBackupRestore IWbemBackupRestore;
+#ifdef __cplusplus
+interface IWbemBackupRestore;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemBackupRestoreEx_FWD_DEFINED__
 #define __IWbemBackupRestoreEx_FWD_DEFINED__
 typedef interface IWbemBackupRestoreEx IWbemBackupRestoreEx;
+#ifdef __cplusplus
+interface IWbemBackupRestoreEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemRefresher_FWD_DEFINED__
 #define __IWbemRefresher_FWD_DEFINED__
 typedef interface IWbemRefresher IWbemRefresher;
+#ifdef __cplusplus
+interface IWbemRefresher;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemHiPerfEnum_FWD_DEFINED__
 #define __IWbemHiPerfEnum_FWD_DEFINED__
 typedef interface IWbemHiPerfEnum IWbemHiPerfEnum;
+#ifdef __cplusplus
+interface IWbemHiPerfEnum;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemConfigureRefresher_FWD_DEFINED__
 #define __IWbemConfigureRefresher_FWD_DEFINED__
 typedef interface IWbemConfigureRefresher IWbemConfigureRefresher;
+#ifdef __cplusplus
+interface IWbemConfigureRefresher;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -222,101 +285,161 @@
 #ifndef __IEnumWbemClassObject_FWD_DEFINED__
 #define __IEnumWbemClassObject_FWD_DEFINED__
 typedef interface IEnumWbemClassObject IEnumWbemClassObject;
+#ifdef __cplusplus
+interface IEnumWbemClassObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IUnsecuredApartment_FWD_DEFINED__
 #define __IUnsecuredApartment_FWD_DEFINED__
 typedef interface IUnsecuredApartment IUnsecuredApartment;
+#ifdef __cplusplus
+interface IUnsecuredApartment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemBackupRestore_FWD_DEFINED__
 #define __IWbemBackupRestore_FWD_DEFINED__
 typedef interface IWbemBackupRestore IWbemBackupRestore;
+#ifdef __cplusplus
+interface IWbemBackupRestore;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemBackupRestoreEx_FWD_DEFINED__
 #define __IWbemBackupRestoreEx_FWD_DEFINED__
 typedef interface IWbemBackupRestoreEx IWbemBackupRestoreEx;
+#ifdef __cplusplus
+interface IWbemBackupRestoreEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemCallResult_FWD_DEFINED__
 #define __IWbemCallResult_FWD_DEFINED__
 typedef interface IWbemCallResult IWbemCallResult;
+#ifdef __cplusplus
+interface IWbemCallResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemClassObject_FWD_DEFINED__
 #define __IWbemClassObject_FWD_DEFINED__
 typedef interface IWbemClassObject IWbemClassObject;
+#ifdef __cplusplus
+interface IWbemClassObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemConfigureRefresher_FWD_DEFINED__
 #define __IWbemConfigureRefresher_FWD_DEFINED__
 typedef interface IWbemConfigureRefresher IWbemConfigureRefresher;
+#ifdef __cplusplus
+interface IWbemConfigureRefresher;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemConnection_FWD_DEFINED__
 #define __IWbemConnection_FWD_DEFINED__
 typedef interface IWbemConnection IWbemConnection;
+#ifdef __cplusplus
+interface IWbemConnection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemContext_FWD_DEFINED__
 #define __IWbemContext_FWD_DEFINED__
 typedef interface IWbemContext IWbemContext;
+#ifdef __cplusplus
+interface IWbemContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventSink_FWD_DEFINED__
 #define __IWbemEventSink_FWD_DEFINED__
 typedef interface IWbemEventSink IWbemEventSink;
+#ifdef __cplusplus
+interface IWbemEventSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemHiPerfEnum_FWD_DEFINED__
 #define __IWbemHiPerfEnum_FWD_DEFINED__
 typedef interface IWbemHiPerfEnum IWbemHiPerfEnum;
+#ifdef __cplusplus
+interface IWbemHiPerfEnum;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemLocator_FWD_DEFINED__
 #define __IWbemLocator_FWD_DEFINED__
 typedef interface IWbemLocator IWbemLocator;
+#ifdef __cplusplus
+interface IWbemLocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemObjectAccess_FWD_DEFINED__
 #define __IWbemObjectAccess_FWD_DEFINED__
 typedef interface IWbemObjectAccess IWbemObjectAccess;
+#ifdef __cplusplus
+interface IWbemObjectAccess;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemObjectSink_FWD_DEFINED__
 #define __IWbemObjectSink_FWD_DEFINED__
 typedef interface IWbemObjectSink IWbemObjectSink;
+#ifdef __cplusplus
+interface IWbemObjectSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemQualifierSet_FWD_DEFINED__
 #define __IWbemQualifierSet_FWD_DEFINED__
 typedef interface IWbemQualifierSet IWbemQualifierSet;
+#ifdef __cplusplus
+interface IWbemQualifierSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemRefresher_FWD_DEFINED__
 #define __IWbemRefresher_FWD_DEFINED__
 typedef interface IWbemRefresher IWbemRefresher;
+#ifdef __cplusplus
+interface IWbemRefresher;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemSecureObjectSink_FWD_DEFINED__
 #define __IWbemSecureObjectSink_FWD_DEFINED__
 typedef interface IWbemSecureObjectSink IWbemSecureObjectSink;
+#ifdef __cplusplus
+interface IWbemSecureObjectSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemServices_FWD_DEFINED__
 #define __IWbemServices_FWD_DEFINED__
 typedef interface IWbemServices IWbemServices;
+#ifdef __cplusplus
+interface IWbemServices;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemStatusCodeText_FWD_DEFINED__
 #define __IWbemStatusCodeText_FWD_DEFINED__
 typedef interface IWbemStatusCodeText IWbemStatusCodeText;
+#ifdef __cplusplus
+interface IWbemStatusCodeText;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemUnsecuredApartment_FWD_DEFINED__
 #define __IWbemUnsecuredApartment_FWD_DEFINED__
 typedef interface IWbemUnsecuredApartment IWbemUnsecuredApartment;
+#ifdef __cplusplus
+interface IWbemUnsecuredApartment;
+#endif /* __cplusplus */
 #endif
 
 #include <winapifamily.h>
@@ -966,23 +1089,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemClassObject* This);
+        IWbemClassObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemClassObject* This);
+        IWbemClassObject *This);
 
     /*** IWbemClassObject methods ***/
     HRESULT (STDMETHODCALLTYPE *GetQualifierSet)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         IWbemQualifierSet **ppQualSet);
 
     HRESULT (STDMETHODCALLTYPE *Get)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszName,
         LONG lFlags,
         VARIANT *pVal,
@@ -990,29 +1113,29 @@
         LONG *plFlavor);
 
     HRESULT (STDMETHODCALLTYPE *Put)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszName,
         LONG lFlags,
         VARIANT *pVal,
         CIMTYPE Type);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszName);
 
     HRESULT (STDMETHODCALLTYPE *GetNames)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszQualifierName,
         LONG lFlags,
         VARIANT *pQualifierVal,
         SAFEARRAY **pNames);
 
     HRESULT (STDMETHODCALLTYPE *BeginEnumeration)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lEnumFlags);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lFlags,
         BSTR *strName,
         VARIANT *pVal,
@@ -1020,90 +1143,91 @@
         LONG *plFlavor);
 
     HRESULT (STDMETHODCALLTYPE *EndEnumeration)(
-        IWbemClassObject* This);
+        IWbemClassObject *This);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyQualifierSet)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszProperty,
         IWbemQualifierSet **ppQualSet);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         IWbemClassObject **ppCopy);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectText)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lFlags,
         BSTR *pstrObjectText);
 
     HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lFlags,
         IWbemClassObject **ppNewClass);
 
     HRESULT (STDMETHODCALLTYPE *SpawnInstance)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lFlags,
         IWbemClassObject **ppNewInstance);
 
     HRESULT (STDMETHODCALLTYPE *CompareTo)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lFlags,
         IWbemClassObject *pCompareTo);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyOrigin)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszName,
         BSTR *pstrClassName);
 
     HRESULT (STDMETHODCALLTYPE *InheritsFrom)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR strAncestor);
 
     HRESULT (STDMETHODCALLTYPE *GetMethod)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszName,
         LONG lFlags,
         IWbemClassObject **ppInSignature,
         IWbemClassObject **ppOutSignature);
 
     HRESULT (STDMETHODCALLTYPE *PutMethod)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszName,
         LONG lFlags,
         IWbemClassObject *pInSignature,
         IWbemClassObject *pOutSignature);
 
     HRESULT (STDMETHODCALLTYPE *DeleteMethod)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszName);
 
     HRESULT (STDMETHODCALLTYPE *BeginMethodEnumeration)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lEnumFlags);
 
     HRESULT (STDMETHODCALLTYPE *NextMethod)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LONG lFlags,
         BSTR *pstrName,
         IWbemClassObject **ppInSignature,
         IWbemClassObject **ppOutSignature);
 
     HRESULT (STDMETHODCALLTYPE *EndMethodEnumeration)(
-        IWbemClassObject* This);
+        IWbemClassObject *This);
 
     HRESULT (STDMETHODCALLTYPE *GetMethodQualifierSet)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszMethod,
         IWbemQualifierSet **ppQualSet);
 
     HRESULT (STDMETHODCALLTYPE *GetMethodOrigin)(
-        IWbemClassObject* This,
+        IWbemClassObject *This,
         LPCWSTR wszMethodName,
         BSTR *pstrClassName);
 
     END_INTERFACE
 } IWbemClassObjectVtbl;
+
 interface IWbemClassObject {
     CONST_VTBL IWbemClassObjectVtbl* lpVtbl;
 };
@@ -1228,227 +1352,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetQualifierSet_Proxy(
-    IWbemClassObject* This,
-    IWbemQualifierSet **ppQualSet);
-void __RPC_STUB IWbemClassObject_GetQualifierSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_Get_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszName,
-    LONG lFlags,
-    VARIANT *pVal,
-    CIMTYPE *pType,
-    LONG *plFlavor);
-void __RPC_STUB IWbemClassObject_Get_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_Put_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszName,
-    LONG lFlags,
-    VARIANT *pVal,
-    CIMTYPE Type);
-void __RPC_STUB IWbemClassObject_Put_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_Delete_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszName);
-void __RPC_STUB IWbemClassObject_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetNames_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszQualifierName,
-    LONG lFlags,
-    VARIANT *pQualifierVal,
-    SAFEARRAY **pNames);
-void __RPC_STUB IWbemClassObject_GetNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_BeginEnumeration_Proxy(
-    IWbemClassObject* This,
-    LONG lEnumFlags);
-void __RPC_STUB IWbemClassObject_BeginEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_Next_Proxy(
-    IWbemClassObject* This,
-    LONG lFlags,
-    BSTR *strName,
-    VARIANT *pVal,
-    CIMTYPE *pType,
-    LONG *plFlavor);
-void __RPC_STUB IWbemClassObject_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_EndEnumeration_Proxy(
-    IWbemClassObject* This);
-void __RPC_STUB IWbemClassObject_EndEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetPropertyQualifierSet_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszProperty,
-    IWbemQualifierSet **ppQualSet);
-void __RPC_STUB IWbemClassObject_GetPropertyQualifierSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_Clone_Proxy(
-    IWbemClassObject* This,
-    IWbemClassObject **ppCopy);
-void __RPC_STUB IWbemClassObject_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetObjectText_Proxy(
-    IWbemClassObject* This,
-    LONG lFlags,
-    BSTR *pstrObjectText);
-void __RPC_STUB IWbemClassObject_GetObjectText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_SpawnDerivedClass_Proxy(
-    IWbemClassObject* This,
-    LONG lFlags,
-    IWbemClassObject **ppNewClass);
-void __RPC_STUB IWbemClassObject_SpawnDerivedClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_SpawnInstance_Proxy(
-    IWbemClassObject* This,
-    LONG lFlags,
-    IWbemClassObject **ppNewInstance);
-void __RPC_STUB IWbemClassObject_SpawnInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_CompareTo_Proxy(
-    IWbemClassObject* This,
-    LONG lFlags,
-    IWbemClassObject *pCompareTo);
-void __RPC_STUB IWbemClassObject_CompareTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetPropertyOrigin_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszName,
-    BSTR *pstrClassName);
-void __RPC_STUB IWbemClassObject_GetPropertyOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_InheritsFrom_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR strAncestor);
-void __RPC_STUB IWbemClassObject_InheritsFrom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetMethod_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszName,
-    LONG lFlags,
-    IWbemClassObject **ppInSignature,
-    IWbemClassObject **ppOutSignature);
-void __RPC_STUB IWbemClassObject_GetMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_PutMethod_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszName,
-    LONG lFlags,
-    IWbemClassObject *pInSignature,
-    IWbemClassObject *pOutSignature);
-void __RPC_STUB IWbemClassObject_PutMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_DeleteMethod_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszName);
-void __RPC_STUB IWbemClassObject_DeleteMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_BeginMethodEnumeration_Proxy(
-    IWbemClassObject* This,
-    LONG lEnumFlags);
-void __RPC_STUB IWbemClassObject_BeginMethodEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_NextMethod_Proxy(
-    IWbemClassObject* This,
-    LONG lFlags,
-    BSTR *pstrName,
-    IWbemClassObject **ppInSignature,
-    IWbemClassObject **ppOutSignature);
-void __RPC_STUB IWbemClassObject_NextMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_EndMethodEnumeration_Proxy(
-    IWbemClassObject* This);
-void __RPC_STUB IWbemClassObject_EndMethodEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetMethodQualifierSet_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszMethod,
-    IWbemQualifierSet **ppQualSet);
-void __RPC_STUB IWbemClassObject_GetMethodQualifierSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClassObject_GetMethodOrigin_Proxy(
-    IWbemClassObject* This,
-    LPCWSTR wszMethodName,
-    BSTR *pstrClassName);
-void __RPC_STUB IWbemClassObject_GetMethodOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemClassObject_INTERFACE_DEFINED__ */
 
@@ -1503,55 +1406,56 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemQualifierSet* This,
+        IWbemQualifierSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemQualifierSet* This);
+        IWbemQualifierSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemQualifierSet* This);
+        IWbemQualifierSet *This);
 
     /*** IWbemQualifierSet methods ***/
     HRESULT (STDMETHODCALLTYPE *Get)(
-        IWbemQualifierSet* This,
+        IWbemQualifierSet *This,
         LPCWSTR wszName,
         LONG lFlags,
         VARIANT *pVal,
         LONG *plFlavor);
 
     HRESULT (STDMETHODCALLTYPE *Put)(
-        IWbemQualifierSet* This,
+        IWbemQualifierSet *This,
         LPCWSTR wszName,
         VARIANT *pVal,
         LONG lFlavor);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IWbemQualifierSet* This,
+        IWbemQualifierSet *This,
         LPCWSTR wszName);
 
     HRESULT (STDMETHODCALLTYPE *GetNames)(
-        IWbemQualifierSet* This,
+        IWbemQualifierSet *This,
         LONG lFlags,
         SAFEARRAY **pNames);
 
     HRESULT (STDMETHODCALLTYPE *BeginEnumeration)(
-        IWbemQualifierSet* This,
+        IWbemQualifierSet *This,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IWbemQualifierSet* This,
+        IWbemQualifierSet *This,
         LONG lFlags,
         BSTR *pstrName,
         VARIANT *pVal,
         LONG *plFlavor);
 
     HRESULT (STDMETHODCALLTYPE *EndEnumeration)(
-        IWbemQualifierSet* This);
+        IWbemQualifierSet *This);
 
     END_INTERFACE
 } IWbemQualifierSetVtbl;
+
 interface IWbemQualifierSet {
     CONST_VTBL IWbemQualifierSetVtbl* lpVtbl;
 };
@@ -1608,70 +1512,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Get_Proxy(
-    IWbemQualifierSet* This,
-    LPCWSTR wszName,
-    LONG lFlags,
-    VARIANT *pVal,
-    LONG *plFlavor);
-void __RPC_STUB IWbemQualifierSet_Get_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Put_Proxy(
-    IWbemQualifierSet* This,
-    LPCWSTR wszName,
-    VARIANT *pVal,
-    LONG lFlavor);
-void __RPC_STUB IWbemQualifierSet_Put_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Delete_Proxy(
-    IWbemQualifierSet* This,
-    LPCWSTR wszName);
-void __RPC_STUB IWbemQualifierSet_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemQualifierSet_GetNames_Proxy(
-    IWbemQualifierSet* This,
-    LONG lFlags,
-    SAFEARRAY **pNames);
-void __RPC_STUB IWbemQualifierSet_GetNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemQualifierSet_BeginEnumeration_Proxy(
-    IWbemQualifierSet* This,
-    LONG lFlags);
-void __RPC_STUB IWbemQualifierSet_BeginEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemQualifierSet_Next_Proxy(
-    IWbemQualifierSet* This,
-    LONG lFlags,
-    BSTR *pstrName,
-    VARIANT *pVal,
-    LONG *plFlavor);
-void __RPC_STUB IWbemQualifierSet_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemQualifierSet_EndEnumeration_Proxy(
-    IWbemQualifierSet* This);
-void __RPC_STUB IWbemQualifierSet_EndEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemQualifierSet_INTERFACE_DEFINED__ */
 
@@ -1706,19 +1546,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemLocator* This,
+        IWbemLocator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemLocator* This);
+        IWbemLocator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemLocator* This);
+        IWbemLocator *This);
 
     /*** IWbemLocator methods ***/
     HRESULT (STDMETHODCALLTYPE *ConnectServer)(
-        IWbemLocator* This,
+        IWbemLocator *This,
         const BSTR strNetworkResource,
         const BSTR strUser,
         const BSTR strPassword,
@@ -1730,6 +1570,7 @@
 
     END_INTERFACE
 } IWbemLocatorVtbl;
+
 interface IWbemLocator {
     CONST_VTBL IWbemLocatorVtbl* lpVtbl;
 };
@@ -1762,21 +1603,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemLocator_ConnectServer_Proxy(
-    IWbemLocator* This,
-    const BSTR strNetworkResource,
-    const BSTR strUser,
-    const BSTR strPassword,
-    const BSTR strLocale,
-    LONG lSecurityFlags,
-    const BSTR strAuthority,
-    IWbemContext *pCtx,
-    IWbemServices **ppNamespace);
-void __RPC_STUB IWbemLocator_ConnectServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemLocator_INTERFACE_DEFINED__ */
 
@@ -1811,24 +1637,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemObjectSink* This,
+        IWbemObjectSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemObjectSink* This);
+        IWbemObjectSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemObjectSink* This);
+        IWbemObjectSink *This);
 
     /*** IWbemObjectSink methods ***/
     HRESULT (STDMETHODCALLTYPE *Indicate)(
-        IWbemObjectSink* This,
+        IWbemObjectSink *This,
         LONG lObjectCount,
         IWbemClassObject **apObjArray);
 
     HRESULT (STDMETHODCALLTYPE *SetStatus)(
-        IWbemObjectSink* This,
+        IWbemObjectSink *This,
         LONG lFlags,
         HRESULT hResult,
         BSTR strParam,
@@ -1836,6 +1662,7 @@
 
     END_INTERFACE
 } IWbemObjectSinkVtbl;
+
 interface IWbemObjectSink {
     CONST_VTBL IWbemObjectSinkVtbl* lpVtbl;
 };
@@ -1872,26 +1699,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemObjectSink_Indicate_Proxy(
-    IWbemObjectSink* This,
-    LONG lObjectCount,
-    IWbemClassObject **apObjArray);
-void __RPC_STUB IWbemObjectSink_Indicate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectSink_SetStatus_Proxy(
-    IWbemObjectSink* This,
-    LONG lFlags,
-    HRESULT hResult,
-    BSTR strParam,
-    IWbemClassObject *pObjParam);
-void __RPC_STUB IWbemObjectSink_SetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemObjectSink_INTERFACE_DEFINED__ */
 
@@ -1942,24 +1749,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemObjectSinkEx* This);
+        IWbemObjectSinkEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemObjectSinkEx* This);
+        IWbemObjectSinkEx *This);
 
     /*** IWbemObjectSink methods ***/
     HRESULT (STDMETHODCALLTYPE *Indicate)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         LONG lObjectCount,
         IWbemClassObject **apObjArray);
 
     HRESULT (STDMETHODCALLTYPE *SetStatus)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         LONG lFlags,
         HRESULT hResult,
         BSTR strParam,
@@ -1967,23 +1774,23 @@
 
     /*** IWbemObjectSinkEx methods ***/
     HRESULT (STDMETHODCALLTYPE *WriteMessage)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         ULONG uChannel,
         const BSTR strMessage);
 
     HRESULT (STDMETHODCALLTYPE *WriteError)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         IWbemClassObject *pObjError,
         unsigned char *puReturned);
 
     HRESULT (STDMETHODCALLTYPE *PromptUser)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         const BSTR strMessage,
         unsigned char uPromptType,
         unsigned char *puReturned);
 
     HRESULT (STDMETHODCALLTYPE *WriteProgress)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         const BSTR strActivity,
         const BSTR strCurrentOperation,
         const BSTR strStatusDescription,
@@ -1991,7 +1798,7 @@
         ULONG uSecondsRemaining);
 
     HRESULT (STDMETHODCALLTYPE *WriteStreamParameter)(
-        IWbemObjectSinkEx* This,
+        IWbemObjectSinkEx *This,
         const BSTR strName,
         VARIANT *vtValue,
         ULONG ulType,
@@ -1999,6 +1806,7 @@
 
     END_INTERFACE
 } IWbemObjectSinkExVtbl;
+
 interface IWbemObjectSinkEx {
     CONST_VTBL IWbemObjectSinkExVtbl* lpVtbl;
 };
@@ -2057,57 +1865,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteMessage_Proxy(
-    IWbemObjectSinkEx* This,
-    ULONG uChannel,
-    const BSTR strMessage);
-void __RPC_STUB IWbemObjectSinkEx_WriteMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteError_Proxy(
-    IWbemObjectSinkEx* This,
-    IWbemClassObject *pObjError,
-    unsigned char *puReturned);
-void __RPC_STUB IWbemObjectSinkEx_WriteError_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_PromptUser_Proxy(
-    IWbemObjectSinkEx* This,
-    const BSTR strMessage,
-    unsigned char uPromptType,
-    unsigned char *puReturned);
-void __RPC_STUB IWbemObjectSinkEx_PromptUser_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteProgress_Proxy(
-    IWbemObjectSinkEx* This,
-    const BSTR strActivity,
-    const BSTR strCurrentOperation,
-    const BSTR strStatusDescription,
-    ULONG uPercentComplete,
-    ULONG uSecondsRemaining);
-void __RPC_STUB IWbemObjectSinkEx_WriteProgress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectSinkEx_WriteStreamParameter_Proxy(
-    IWbemObjectSinkEx* This,
-    const BSTR strName,
-    VARIANT *vtValue,
-    ULONG ulType,
-    ULONG ulFlags);
-void __RPC_STUB IWbemObjectSinkEx_WriteStreamParameter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemObjectSinkEx_INTERFACE_DEFINED__ */
 
@@ -2152,43 +1909,44 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IEnumWbemClassObject* This,
+        IEnumWbemClassObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IEnumWbemClassObject* This);
+        IEnumWbemClassObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IEnumWbemClassObject* This);
+        IEnumWbemClassObject *This);
 
     /*** IEnumWbemClassObject methods ***/
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IEnumWbemClassObject* This);
+        IEnumWbemClassObject *This);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IEnumWbemClassObject* This,
+        IEnumWbemClassObject *This,
         LONG lTimeout,
         ULONG uCount,
         IWbemClassObject **apObjects,
         ULONG *puReturned);
 
     HRESULT (STDMETHODCALLTYPE *NextAsync)(
-        IEnumWbemClassObject* This,
+        IEnumWbemClassObject *This,
         ULONG uCount,
         IWbemObjectSink *pSink);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IEnumWbemClassObject* This,
+        IEnumWbemClassObject *This,
         IEnumWbemClassObject **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IEnumWbemClassObject* This,
+        IEnumWbemClassObject *This,
         LONG lTimeout,
         ULONG nCount);
 
     END_INTERFACE
 } IEnumWbemClassObjectVtbl;
+
 interface IEnumWbemClassObject {
     CONST_VTBL IEnumWbemClassObjectVtbl* lpVtbl;
 };
@@ -2237,50 +1995,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Reset_Proxy(
-    IEnumWbemClassObject* This);
-void __RPC_STUB IEnumWbemClassObject_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Next_Proxy(
-    IEnumWbemClassObject* This,
-    LONG lTimeout,
-    ULONG uCount,
-    IWbemClassObject **apObjects,
-    ULONG *puReturned);
-void __RPC_STUB IEnumWbemClassObject_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_NextAsync_Proxy(
-    IEnumWbemClassObject* This,
-    ULONG uCount,
-    IWbemObjectSink *pSink);
-void __RPC_STUB IEnumWbemClassObject_NextAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Clone_Proxy(
-    IEnumWbemClassObject* This,
-    IEnumWbemClassObject **ppEnum);
-void __RPC_STUB IEnumWbemClassObject_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IEnumWbemClassObject_Skip_Proxy(
-    IEnumWbemClassObject* This,
-    LONG lTimeout,
-    ULONG nCount);
-void __RPC_STUB IEnumWbemClassObject_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IEnumWbemClassObject_INTERFACE_DEFINED__ */
 
@@ -2340,61 +2054,62 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemContext* This,
+        IWbemContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemContext* This);
+        IWbemContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemContext* This);
+        IWbemContext *This);
 
     /*** IWbemContext methods ***/
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWbemContext* This,
+        IWbemContext *This,
         IWbemContext **ppNewCopy);
 
     HRESULT (STDMETHODCALLTYPE *GetNames)(
-        IWbemContext* This,
+        IWbemContext *This,
         LONG lFlags,
         SAFEARRAY **pNames);
 
     HRESULT (STDMETHODCALLTYPE *BeginEnumeration)(
-        IWbemContext* This,
+        IWbemContext *This,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IWbemContext* This,
+        IWbemContext *This,
         LONG lFlags,
         BSTR *pstrName,
         VARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *EndEnumeration)(
-        IWbemContext* This);
+        IWbemContext *This);
 
     HRESULT (STDMETHODCALLTYPE *SetValue)(
-        IWbemContext* This,
+        IWbemContext *This,
         LPCWSTR wszName,
         LONG lFlags,
         VARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetValue)(
-        IWbemContext* This,
+        IWbemContext *This,
         LPCWSTR wszName,
         LONG lFlags,
         VARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *DeleteValue)(
-        IWbemContext* This,
+        IWbemContext *This,
         LPCWSTR wszName,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAll)(
-        IWbemContext* This);
+        IWbemContext *This);
 
     END_INTERFACE
 } IWbemContextVtbl;
+
 interface IWbemContext {
     CONST_VTBL IWbemContextVtbl* lpVtbl;
 };
@@ -2459,84 +2174,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemContext_Clone_Proxy(
-    IWbemContext* This,
-    IWbemContext **ppNewCopy);
-void __RPC_STUB IWbemContext_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_GetNames_Proxy(
-    IWbemContext* This,
-    LONG lFlags,
-    SAFEARRAY **pNames);
-void __RPC_STUB IWbemContext_GetNames_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_BeginEnumeration_Proxy(
-    IWbemContext* This,
-    LONG lFlags);
-void __RPC_STUB IWbemContext_BeginEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_Next_Proxy(
-    IWbemContext* This,
-    LONG lFlags,
-    BSTR *pstrName,
-    VARIANT *pValue);
-void __RPC_STUB IWbemContext_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_EndEnumeration_Proxy(
-    IWbemContext* This);
-void __RPC_STUB IWbemContext_EndEnumeration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_SetValue_Proxy(
-    IWbemContext* This,
-    LPCWSTR wszName,
-    LONG lFlags,
-    VARIANT *pValue);
-void __RPC_STUB IWbemContext_SetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_GetValue_Proxy(
-    IWbemContext* This,
-    LPCWSTR wszName,
-    LONG lFlags,
-    VARIANT *pValue);
-void __RPC_STUB IWbemContext_GetValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_DeleteValue_Proxy(
-    IWbemContext* This,
-    LPCWSTR wszName,
-    LONG lFlags);
-void __RPC_STUB IWbemContext_DeleteValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemContext_DeleteAll_Proxy(
-    IWbemContext* This);
-void __RPC_STUB IWbemContext_DeleteAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemContext_INTERFACE_DEFINED__ */
 
@@ -2577,39 +2214,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemCallResult* This,
+        IWbemCallResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemCallResult* This);
+        IWbemCallResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemCallResult* This);
+        IWbemCallResult *This);
 
     /*** IWbemCallResult methods ***/
     HRESULT (STDMETHODCALLTYPE *GetResultObject)(
-        IWbemCallResult* This,
+        IWbemCallResult *This,
         LONG lTimeout,
         IWbemClassObject **ppResultObject);
 
     HRESULT (STDMETHODCALLTYPE *GetResultString)(
-        IWbemCallResult* This,
+        IWbemCallResult *This,
         LONG lTimeout,
         BSTR *pstrResultString);
 
     HRESULT (STDMETHODCALLTYPE *GetResultServices)(
-        IWbemCallResult* This,
+        IWbemCallResult *This,
         LONG lTimeout,
         IWbemServices **ppServices);
 
     HRESULT (STDMETHODCALLTYPE *GetCallStatus)(
-        IWbemCallResult* This,
+        IWbemCallResult *This,
         LONG lTimeout,
         LONG *plStatus);
 
     END_INTERFACE
 } IWbemCallResultVtbl;
+
 interface IWbemCallResult {
     CONST_VTBL IWbemCallResultVtbl* lpVtbl;
 };
@@ -2654,42 +2292,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemCallResult_GetResultObject_Proxy(
-    IWbemCallResult* This,
-    LONG lTimeout,
-    IWbemClassObject **ppResultObject);
-void __RPC_STUB IWbemCallResult_GetResultObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemCallResult_GetResultString_Proxy(
-    IWbemCallResult* This,
-    LONG lTimeout,
-    BSTR *pstrResultString);
-void __RPC_STUB IWbemCallResult_GetResultString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemCallResult_GetResultServices_Proxy(
-    IWbemCallResult* This,
-    LONG lTimeout,
-    IWbemServices **ppServices);
-void __RPC_STUB IWbemCallResult_GetResultServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemCallResult_GetCallStatus_Proxy(
-    IWbemCallResult* This,
-    LONG lTimeout,
-    LONG *plStatus);
-void __RPC_STUB IWbemCallResult_GetCallStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemCallResult_INTERFACE_DEFINED__ */
 
@@ -2858,19 +2460,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemServices* This,
+        IWbemServices *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemServices* This);
+        IWbemServices *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemServices* This);
+        IWbemServices *This);
 
     /*** IWbemServices methods ***/
     HRESULT (STDMETHODCALLTYPE *OpenNamespace)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strNamespace,
         LONG lFlags,
         IWbemContext *pCtx,
@@ -2878,16 +2480,16 @@
         IWbemCallResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *CancelAsyncCall)(
-        IWbemServices* This,
+        IWbemServices *This,
         IWbemObjectSink *pSink);
 
     HRESULT (STDMETHODCALLTYPE *QueryObjectSink)(
-        IWbemServices* This,
+        IWbemServices *This,
         LONG lFlags,
         IWbemObjectSink **ppResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *GetObject)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strObjectPath,
         LONG lFlags,
         IWbemContext *pCtx,
@@ -2895,98 +2497,98 @@
         IWbemCallResult **ppCallResult);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strObjectPath,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *PutClass)(
-        IWbemServices* This,
+        IWbemServices *This,
         IWbemClassObject *pObject,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemCallResult **ppCallResult);
 
     HRESULT (STDMETHODCALLTYPE *PutClassAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         IWbemClassObject *pObject,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *DeleteClass)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strClass,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemCallResult **ppCallResult);
 
     HRESULT (STDMETHODCALLTYPE *DeleteClassAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strClass,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *CreateClassEnum)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strSuperclass,
         LONG lFlags,
         IWbemContext *pCtx,
         IEnumWbemClassObject **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *CreateClassEnumAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strSuperclass,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *PutInstance)(
-        IWbemServices* This,
+        IWbemServices *This,
         IWbemClassObject *pInst,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemCallResult **ppCallResult);
 
     HRESULT (STDMETHODCALLTYPE *PutInstanceAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         IWbemClassObject *pInst,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *DeleteInstance)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strObjectPath,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemCallResult **ppCallResult);
 
     HRESULT (STDMETHODCALLTYPE *DeleteInstanceAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strObjectPath,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstanceEnum)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strFilter,
         LONG lFlags,
         IWbemContext *pCtx,
         IEnumWbemClassObject **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstanceEnumAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strFilter,
         LONG lFlags,
         IWbemContext *pCtx,
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *ExecQuery)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strQueryLanguage,
         const BSTR strQuery,
         LONG lFlags,
@@ -2994,7 +2596,7 @@
         IEnumWbemClassObject **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *ExecQueryAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strQueryLanguage,
         const BSTR strQuery,
         LONG lFlags,
@@ -3002,7 +2604,7 @@
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *ExecNotificationQuery)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strQueryLanguage,
         const BSTR strQuery,
         LONG lFlags,
@@ -3010,7 +2612,7 @@
         IEnumWbemClassObject **ppEnum);
 
     HRESULT (STDMETHODCALLTYPE *ExecNotificationQueryAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strQueryLanguage,
         const BSTR strQuery,
         LONG lFlags,
@@ -3018,7 +2620,7 @@
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethod)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strObjectPath,
         const BSTR strMethodName,
         LONG lFlags,
@@ -3028,7 +2630,7 @@
         IWbemCallResult **ppCallResult);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethodAsync)(
-        IWbemServices* This,
+        IWbemServices *This,
         const BSTR strObjectPath,
         const BSTR strMethodName,
         LONG lFlags,
@@ -3038,6 +2640,7 @@
 
     END_INTERFACE
 } IWbemServicesVtbl;
+
 interface IWbemServices {
     CONST_VTBL IWbemServicesVtbl* lpVtbl;
 };
@@ -3158,265 +2761,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemServices_OpenNamespace_Proxy(
-    IWbemServices* This,
-    const BSTR strNamespace,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemServices **ppWorkingNamespace,
-    IWbemCallResult **ppResult);
-void __RPC_STUB IWbemServices_OpenNamespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_CancelAsyncCall_Proxy(
-    IWbemServices* This,
-    IWbemObjectSink *pSink);
-void __RPC_STUB IWbemServices_CancelAsyncCall_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_QueryObjectSink_Proxy(
-    IWbemServices* This,
-    LONG lFlags,
-    IWbemObjectSink **ppResponseHandler);
-void __RPC_STUB IWbemServices_QueryObjectSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_GetObject_Proxy(
-    IWbemServices* This,
-    const BSTR strObjectPath,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemClassObject **ppObject,
-    IWbemCallResult **ppCallResult);
-void __RPC_STUB IWbemServices_GetObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_GetObjectAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strObjectPath,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_GetObjectAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_PutClass_Proxy(
-    IWbemServices* This,
-    IWbemClassObject *pObject,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemCallResult **ppCallResult);
-void __RPC_STUB IWbemServices_PutClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_PutClassAsync_Proxy(
-    IWbemServices* This,
-    IWbemClassObject *pObject,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_PutClassAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_DeleteClass_Proxy(
-    IWbemServices* This,
-    const BSTR strClass,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemCallResult **ppCallResult);
-void __RPC_STUB IWbemServices_DeleteClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_DeleteClassAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strClass,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_DeleteClassAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_CreateClassEnum_Proxy(
-    IWbemServices* This,
-    const BSTR strSuperclass,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IEnumWbemClassObject **ppEnum);
-void __RPC_STUB IWbemServices_CreateClassEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_CreateClassEnumAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strSuperclass,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_CreateClassEnumAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_PutInstance_Proxy(
-    IWbemServices* This,
-    IWbemClassObject *pInst,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemCallResult **ppCallResult);
-void __RPC_STUB IWbemServices_PutInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_PutInstanceAsync_Proxy(
-    IWbemServices* This,
-    IWbemClassObject *pInst,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_PutInstanceAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_DeleteInstance_Proxy(
-    IWbemServices* This,
-    const BSTR strObjectPath,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemCallResult **ppCallResult);
-void __RPC_STUB IWbemServices_DeleteInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_DeleteInstanceAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strObjectPath,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_DeleteInstanceAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_CreateInstanceEnum_Proxy(
-    IWbemServices* This,
-    const BSTR strFilter,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IEnumWbemClassObject **ppEnum);
-void __RPC_STUB IWbemServices_CreateInstanceEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_CreateInstanceEnumAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strFilter,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_CreateInstanceEnumAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_ExecQuery_Proxy(
-    IWbemServices* This,
-    const BSTR strQueryLanguage,
-    const BSTR strQuery,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IEnumWbemClassObject **ppEnum);
-void __RPC_STUB IWbemServices_ExecQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_ExecQueryAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strQueryLanguage,
-    const BSTR strQuery,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_ExecQueryAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_ExecNotificationQuery_Proxy(
-    IWbemServices* This,
-    const BSTR strQueryLanguage,
-    const BSTR strQuery,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IEnumWbemClassObject **ppEnum);
-void __RPC_STUB IWbemServices_ExecNotificationQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_ExecNotificationQueryAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strQueryLanguage,
-    const BSTR strQuery,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_ExecNotificationQueryAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_ExecMethod_Proxy(
-    IWbemServices* This,
-    const BSTR strObjectPath,
-    const BSTR strMethodName,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemClassObject *pInParams,
-    IWbemClassObject **ppOutParams,
-    IWbemCallResult **ppCallResult);
-void __RPC_STUB IWbemServices_ExecMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemServices_ExecMethodAsync_Proxy(
-    IWbemServices* This,
-    const BSTR strObjectPath,
-    const BSTR strMethodName,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemClassObject *pInParams,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemServices_ExecMethodAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemServices_INTERFACE_DEFINED__ */
 
@@ -3446,25 +2790,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemShutdown* This,
+        IWbemShutdown *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemShutdown* This);
+        IWbemShutdown *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemShutdown* This);
+        IWbemShutdown *This);
 
     /*** IWbemShutdown methods ***/
     HRESULT (STDMETHODCALLTYPE *Shutdown)(
-        IWbemShutdown* This,
+        IWbemShutdown *This,
         LONG uReason,
         ULONG uMaxMilliseconds,
         IWbemContext *pCtx);
 
     END_INTERFACE
 } IWbemShutdownVtbl;
+
 interface IWbemShutdown {
     CONST_VTBL IWbemShutdownVtbl* lpVtbl;
 };
@@ -3497,16 +2842,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemShutdown_Shutdown_Proxy(
-    IWbemShutdown* This,
-    LONG uReason,
-    ULONG uMaxMilliseconds,
-    IWbemContext *pCtx);
-void __RPC_STUB IWbemShutdown_Shutdown_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemShutdown_INTERFACE_DEFINED__ */
 
@@ -3545,19 +2880,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemObjectTextSrc* This,
+        IWbemObjectTextSrc *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemObjectTextSrc* This);
+        IWbemObjectTextSrc *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemObjectTextSrc* This);
+        IWbemObjectTextSrc *This);
 
     /*** IWbemObjectTextSrc methods ***/
     HRESULT (STDMETHODCALLTYPE *GetText)(
-        IWbemObjectTextSrc* This,
+        IWbemObjectTextSrc *This,
         LONG lFlags,
         IWbemClassObject *pObj,
         ULONG uObjTextFormat,
@@ -3565,7 +2900,7 @@
         BSTR *strText);
 
     HRESULT (STDMETHODCALLTYPE *CreateFromText)(
-        IWbemObjectTextSrc* This,
+        IWbemObjectTextSrc *This,
         LONG lFlags,
         BSTR strText,
         ULONG uObjTextFormat,
@@ -3574,6 +2909,7 @@
 
     END_INTERFACE
 } IWbemObjectTextSrcVtbl;
+
 interface IWbemObjectTextSrc {
     CONST_VTBL IWbemObjectTextSrcVtbl* lpVtbl;
 };
@@ -3610,30 +2946,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemObjectTextSrc_GetText_Proxy(
-    IWbemObjectTextSrc* This,
-    LONG lFlags,
-    IWbemClassObject *pObj,
-    ULONG uObjTextFormat,
-    IWbemContext *pCtx,
-    BSTR *strText);
-void __RPC_STUB IWbemObjectTextSrc_GetText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectTextSrc_CreateFromText_Proxy(
-    IWbemObjectTextSrc* This,
-    LONG lFlags,
-    BSTR strText,
-    ULONG uObjTextFormat,
-    IWbemContext *pCtx,
-    IWbemClassObject **pNewObj);
-void __RPC_STUB IWbemObjectTextSrc_CreateFromText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemObjectTextSrc_INTERFACE_DEFINED__ */
 
@@ -3701,23 +3013,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemObjectAccess* This);
+        IWbemObjectAccess *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemObjectAccess* This);
+        IWbemObjectAccess *This);
 
     /*** IWbemClassObject methods ***/
     HRESULT (STDMETHODCALLTYPE *GetQualifierSet)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         IWbemQualifierSet **ppQualSet);
 
     HRESULT (STDMETHODCALLTYPE *Get)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszName,
         LONG lFlags,
         VARIANT *pVal,
@@ -3725,29 +3037,29 @@
         LONG *plFlavor);
 
     HRESULT (STDMETHODCALLTYPE *Put)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszName,
         LONG lFlags,
         VARIANT *pVal,
         CIMTYPE Type);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszName);
 
     HRESULT (STDMETHODCALLTYPE *GetNames)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszQualifierName,
         LONG lFlags,
         VARIANT *pQualifierVal,
         SAFEARRAY **pNames);
 
     HRESULT (STDMETHODCALLTYPE *BeginEnumeration)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lEnumFlags);
 
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags,
         BSTR *strName,
         VARIANT *pVal,
@@ -3755,144 +3067,145 @@
         LONG *plFlavor);
 
     HRESULT (STDMETHODCALLTYPE *EndEnumeration)(
-        IWbemObjectAccess* This);
+        IWbemObjectAccess *This);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyQualifierSet)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszProperty,
         IWbemQualifierSet **ppQualSet);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         IWbemClassObject **ppCopy);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectText)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags,
         BSTR *pstrObjectText);
 
     HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags,
         IWbemClassObject **ppNewClass);
 
     HRESULT (STDMETHODCALLTYPE *SpawnInstance)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags,
         IWbemClassObject **ppNewInstance);
 
     HRESULT (STDMETHODCALLTYPE *CompareTo)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags,
         IWbemClassObject *pCompareTo);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyOrigin)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszName,
         BSTR *pstrClassName);
 
     HRESULT (STDMETHODCALLTYPE *InheritsFrom)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR strAncestor);
 
     HRESULT (STDMETHODCALLTYPE *GetMethod)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszName,
         LONG lFlags,
         IWbemClassObject **ppInSignature,
         IWbemClassObject **ppOutSignature);
 
     HRESULT (STDMETHODCALLTYPE *PutMethod)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszName,
         LONG lFlags,
         IWbemClassObject *pInSignature,
         IWbemClassObject *pOutSignature);
 
     HRESULT (STDMETHODCALLTYPE *DeleteMethod)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszName);
 
     HRESULT (STDMETHODCALLTYPE *BeginMethodEnumeration)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lEnumFlags);
 
     HRESULT (STDMETHODCALLTYPE *NextMethod)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags,
         BSTR *pstrName,
         IWbemClassObject **ppInSignature,
         IWbemClassObject **ppOutSignature);
 
     HRESULT (STDMETHODCALLTYPE *EndMethodEnumeration)(
-        IWbemObjectAccess* This);
+        IWbemObjectAccess *This);
 
     HRESULT (STDMETHODCALLTYPE *GetMethodQualifierSet)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszMethod,
         IWbemQualifierSet **ppQualSet);
 
     HRESULT (STDMETHODCALLTYPE *GetMethodOrigin)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszMethodName,
         BSTR *pstrClassName);
 
     /*** IWbemObjectAccess methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPropertyHandle)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LPCWSTR wszPropertyName,
         CIMTYPE *pType,
         LONG *plHandle);
 
     HRESULT (STDMETHODCALLTYPE *WritePropertyValue)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lHandle,
         LONG lNumBytes,
         const byte *aData);
 
     HRESULT (STDMETHODCALLTYPE *ReadPropertyValue)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lHandle,
         LONG lBufferSize,
         LONG *plNumBytes,
         byte *aData);
 
     HRESULT (STDMETHODCALLTYPE *ReadDWORD)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lHandle,
         DWORD *pdw);
 
     HRESULT (STDMETHODCALLTYPE *WriteDWORD)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lHandle,
         DWORD dw);
 
     HRESULT (STDMETHODCALLTYPE *ReadQWORD)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lHandle,
         UINT64 *pqw);
 
     HRESULT (STDMETHODCALLTYPE *WriteQWORD)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lHandle,
         UINT64 pw);
 
     HRESULT (STDMETHODCALLTYPE *GetPropertyInfoByHandle)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lHandle,
         BSTR *pstrName,
         CIMTYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *Lock)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *Unlock)(
-        IWbemObjectAccess* This,
+        IWbemObjectAccess *This,
         LONG lFlags);
 
     END_INTERFACE
 } IWbemObjectAccessVtbl;
+
 interface IWbemObjectAccess {
     CONST_VTBL IWbemObjectAccessVtbl* lpVtbl;
 };
@@ -4059,99 +3372,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_GetPropertyHandle_Proxy(
-    IWbemObjectAccess* This,
-    LPCWSTR wszPropertyName,
-    CIMTYPE *pType,
-    LONG *plHandle);
-void __RPC_STUB IWbemObjectAccess_GetPropertyHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_WritePropertyValue_Proxy(
-    IWbemObjectAccess* This,
-    LONG lHandle,
-    LONG lNumBytes,
-    const byte *aData);
-void __RPC_STUB IWbemObjectAccess_WritePropertyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_ReadPropertyValue_Proxy(
-    IWbemObjectAccess* This,
-    LONG lHandle,
-    LONG lBufferSize,
-    LONG *plNumBytes,
-    byte *aData);
-void __RPC_STUB IWbemObjectAccess_ReadPropertyValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_ReadDWORD_Proxy(
-    IWbemObjectAccess* This,
-    LONG lHandle,
-    DWORD *pdw);
-void __RPC_STUB IWbemObjectAccess_ReadDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_WriteDWORD_Proxy(
-    IWbemObjectAccess* This,
-    LONG lHandle,
-    DWORD dw);
-void __RPC_STUB IWbemObjectAccess_WriteDWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_ReadQWORD_Proxy(
-    IWbemObjectAccess* This,
-    LONG lHandle,
-    UINT64 *pqw);
-void __RPC_STUB IWbemObjectAccess_ReadQWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_WriteQWORD_Proxy(
-    IWbemObjectAccess* This,
-    LONG lHandle,
-    UINT64 pw);
-void __RPC_STUB IWbemObjectAccess_WriteQWORD_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_GetPropertyInfoByHandle_Proxy(
-    IWbemObjectAccess* This,
-    LONG lHandle,
-    BSTR *pstrName,
-    CIMTYPE *pType);
-void __RPC_STUB IWbemObjectAccess_GetPropertyInfoByHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_Lock_Proxy(
-    IWbemObjectAccess* This,
-    LONG lFlags);
-void __RPC_STUB IWbemObjectAccess_Lock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemObjectAccess_Unlock_Proxy(
-    IWbemObjectAccess* This,
-    LONG lFlags);
-void __RPC_STUB IWbemObjectAccess_Unlock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemObjectAccess_INTERFACE_DEFINED__ */
 
@@ -4208,19 +3428,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMofCompiler* This,
+        IMofCompiler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMofCompiler* This);
+        IMofCompiler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMofCompiler* This);
+        IMofCompiler *This);
 
     /*** IMofCompiler methods ***/
     HRESULT (STDMETHODCALLTYPE *CompileFile)(
-        IMofCompiler* This,
+        IMofCompiler *This,
         LPWSTR FileName,
         LPWSTR ServerAndNamespace,
         LPWSTR User,
@@ -4232,7 +3452,7 @@
         WBEM_COMPILE_STATUS_INFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *CompileBuffer)(
-        IMofCompiler* This,
+        IMofCompiler *This,
         LONG BuffSize,
         BYTE *pBuffer,
         LPWSTR ServerAndNamespace,
@@ -4245,7 +3465,7 @@
         WBEM_COMPILE_STATUS_INFO *pInfo);
 
     HRESULT (STDMETHODCALLTYPE *CreateBMOF)(
-        IMofCompiler* This,
+        IMofCompiler *This,
         LPWSTR TextFileName,
         LPWSTR BMOFFileName,
         LPWSTR ServerAndNamespace,
@@ -4256,6 +3476,7 @@
 
     END_INTERFACE
 } IMofCompilerVtbl;
+
 interface IMofCompiler {
     CONST_VTBL IMofCompilerVtbl* lpVtbl;
 };
@@ -4296,53 +3517,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMofCompiler_CompileFile_Proxy(
-    IMofCompiler* This,
-    LPWSTR FileName,
-    LPWSTR ServerAndNamespace,
-    LPWSTR User,
-    LPWSTR Authority,
-    LPWSTR Password,
-    LONG lOptionFlags,
-    LONG lClassFlags,
-    LONG lInstanceFlags,
-    WBEM_COMPILE_STATUS_INFO *pInfo);
-void __RPC_STUB IMofCompiler_CompileFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMofCompiler_CompileBuffer_Proxy(
-    IMofCompiler* This,
-    LONG BuffSize,
-    BYTE *pBuffer,
-    LPWSTR ServerAndNamespace,
-    LPWSTR User,
-    LPWSTR Authority,
-    LPWSTR Password,
-    LONG lOptionFlags,
-    LONG lClassFlags,
-    LONG lInstanceFlags,
-    WBEM_COMPILE_STATUS_INFO *pInfo);
-void __RPC_STUB IMofCompiler_CompileBuffer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMofCompiler_CreateBMOF_Proxy(
-    IMofCompiler* This,
-    LPWSTR TextFileName,
-    LPWSTR BMOFFileName,
-    LPWSTR ServerAndNamespace,
-    LONG lOptionFlags,
-    LONG lClassFlags,
-    LONG lInstanceFlags,
-    WBEM_COMPILE_STATUS_INFO *pInfo);
-void __RPC_STUB IMofCompiler_CreateBMOF_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMofCompiler_INTERFACE_DEFINED__ */
 
@@ -4371,24 +3545,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IUnsecuredApartment* This,
+        IUnsecuredApartment *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IUnsecuredApartment* This);
+        IUnsecuredApartment *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IUnsecuredApartment* This);
+        IUnsecuredApartment *This);
 
     /*** IUnsecuredApartment methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateObjectStub)(
-        IUnsecuredApartment* This,
+        IUnsecuredApartment *This,
         IUnknown *pObject,
         IUnknown **ppStub);
 
     END_INTERFACE
 } IUnsecuredApartmentVtbl;
+
 interface IUnsecuredApartment {
     CONST_VTBL IUnsecuredApartmentVtbl* lpVtbl;
 };
@@ -4421,15 +3596,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IUnsecuredApartment_CreateObjectStub_Proxy(
-    IUnsecuredApartment* This,
-    IUnknown *pObject,
-    IUnknown **ppStub);
-void __RPC_STUB IUnsecuredApartment_CreateObjectStub_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IUnsecuredApartment_INTERFACE_DEFINED__ */
 
@@ -4460,25 +3626,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemUnsecuredApartment* This,
+        IWbemUnsecuredApartment *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemUnsecuredApartment* This);
+        IWbemUnsecuredApartment *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemUnsecuredApartment* This);
+        IWbemUnsecuredApartment *This);
 
     /*** IUnsecuredApartment methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateObjectStub)(
-        IWbemUnsecuredApartment* This,
+        IWbemUnsecuredApartment *This,
         IUnknown *pObject,
         IUnknown **ppStub);
 
     /*** IWbemUnsecuredApartment methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateSinkStub)(
-        IWbemUnsecuredApartment* This,
+        IWbemUnsecuredApartment *This,
         IWbemObjectSink *pSink,
         DWORD dwFlags,
         LPCWSTR wszReserved,
@@ -4486,6 +3652,7 @@
 
     END_INTERFACE
 } IWbemUnsecuredApartmentVtbl;
+
 interface IWbemUnsecuredApartment {
     CONST_VTBL IWbemUnsecuredApartmentVtbl* lpVtbl;
 };
@@ -4524,17 +3691,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemUnsecuredApartment_CreateSinkStub_Proxy(
-    IWbemUnsecuredApartment* This,
-    IWbemObjectSink *pSink,
-    DWORD dwFlags,
-    LPCWSTR wszReserved,
-    IWbemObjectSink **ppStub);
-void __RPC_STUB IWbemUnsecuredApartment_CreateSinkStub_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemUnsecuredApartment_INTERFACE_DEFINED__ */
 
@@ -4571,26 +3727,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemStatusCodeText* This,
+        IWbemStatusCodeText *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemStatusCodeText* This);
+        IWbemStatusCodeText *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemStatusCodeText* This);
+        IWbemStatusCodeText *This);
 
     /*** IWbemStatusCodeText methods ***/
     HRESULT (STDMETHODCALLTYPE *GetErrorCodeText)(
-        IWbemStatusCodeText* This,
+        IWbemStatusCodeText *This,
         HRESULT hRes,
         LCID LocaleId,
         LONG lFlags,
         BSTR *MessageText);
 
     HRESULT (STDMETHODCALLTYPE *GetFacilityCodeText)(
-        IWbemStatusCodeText* This,
+        IWbemStatusCodeText *This,
         HRESULT hRes,
         LCID LocaleId,
         LONG lFlags,
@@ -4598,6 +3754,7 @@
 
     END_INTERFACE
 } IWbemStatusCodeTextVtbl;
+
 interface IWbemStatusCodeText {
     CONST_VTBL IWbemStatusCodeTextVtbl* lpVtbl;
 };
@@ -4634,28 +3791,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemStatusCodeText_GetErrorCodeText_Proxy(
-    IWbemStatusCodeText* This,
-    HRESULT hRes,
-    LCID LocaleId,
-    LONG lFlags,
-    BSTR *MessageText);
-void __RPC_STUB IWbemStatusCodeText_GetErrorCodeText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemStatusCodeText_GetFacilityCodeText_Proxy(
-    IWbemStatusCodeText* This,
-    HRESULT hRes,
-    LCID LocaleId,
-    LONG lFlags,
-    BSTR *MessageText);
-void __RPC_STUB IWbemStatusCodeText_GetFacilityCodeText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemStatusCodeText_INTERFACE_DEFINED__ */
 
@@ -4688,29 +3823,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemBackupRestore* This,
+        IWbemBackupRestore *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemBackupRestore* This);
+        IWbemBackupRestore *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemBackupRestore* This);
+        IWbemBackupRestore *This);
 
     /*** IWbemBackupRestore methods ***/
     HRESULT (STDMETHODCALLTYPE *Backup)(
-        IWbemBackupRestore* This,
+        IWbemBackupRestore *This,
         LPCWSTR strBackupToFile,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *Restore)(
-        IWbemBackupRestore* This,
+        IWbemBackupRestore *This,
         LPCWSTR strRestoreFromFile,
         LONG lFlags);
 
     END_INTERFACE
 } IWbemBackupRestoreVtbl;
+
 interface IWbemBackupRestore {
     CONST_VTBL IWbemBackupRestoreVtbl* lpVtbl;
 };
@@ -4747,24 +3883,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemBackupRestore_Backup_Proxy(
-    IWbemBackupRestore* This,
-    LPCWSTR strBackupToFile,
-    LONG lFlags);
-void __RPC_STUB IWbemBackupRestore_Backup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemBackupRestore_Restore_Proxy(
-    IWbemBackupRestore* This,
-    LPCWSTR strRestoreFromFile,
-    LONG lFlags);
-void __RPC_STUB IWbemBackupRestore_Restore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemBackupRestore_INTERFACE_DEFINED__ */
 
@@ -4795,36 +3913,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemBackupRestoreEx* This,
+        IWbemBackupRestoreEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemBackupRestoreEx* This);
+        IWbemBackupRestoreEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemBackupRestoreEx* This);
+        IWbemBackupRestoreEx *This);
 
     /*** IWbemBackupRestore methods ***/
     HRESULT (STDMETHODCALLTYPE *Backup)(
-        IWbemBackupRestoreEx* This,
+        IWbemBackupRestoreEx *This,
         LPCWSTR strBackupToFile,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *Restore)(
-        IWbemBackupRestoreEx* This,
+        IWbemBackupRestoreEx *This,
         LPCWSTR strRestoreFromFile,
         LONG lFlags);
 
     /*** IWbemBackupRestoreEx methods ***/
     HRESULT (STDMETHODCALLTYPE *Pause)(
-        IWbemBackupRestoreEx* This);
+        IWbemBackupRestoreEx *This);
 
     HRESULT (STDMETHODCALLTYPE *Resume)(
-        IWbemBackupRestoreEx* This);
+        IWbemBackupRestoreEx *This);
 
     END_INTERFACE
 } IWbemBackupRestoreExVtbl;
+
 interface IWbemBackupRestoreEx {
     CONST_VTBL IWbemBackupRestoreExVtbl* lpVtbl;
 };
@@ -4871,20 +3990,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemBackupRestoreEx_Pause_Proxy(
-    IWbemBackupRestoreEx* This);
-void __RPC_STUB IWbemBackupRestoreEx_Pause_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemBackupRestoreEx_Resume_Proxy(
-    IWbemBackupRestoreEx* This);
-void __RPC_STUB IWbemBackupRestoreEx_Resume_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemBackupRestoreEx_INTERFACE_DEFINED__ */
 
@@ -4912,23 +4017,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemRefresher* This,
+        IWbemRefresher *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemRefresher* This);
+        IWbemRefresher *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemRefresher* This);
+        IWbemRefresher *This);
 
     /*** IWbemRefresher methods ***/
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWbemRefresher* This,
+        IWbemRefresher *This,
         LONG lFlags);
 
     END_INTERFACE
 } IWbemRefresherVtbl;
+
 interface IWbemRefresher {
     CONST_VTBL IWbemRefresherVtbl* lpVtbl;
 };
@@ -4961,14 +4067,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemRefresher_Refresh_Proxy(
-    IWbemRefresher* This,
-    LONG lFlags);
-void __RPC_STUB IWbemRefresher_Refresh_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemRefresher_INTERFACE_DEFINED__ */
 
@@ -5013,43 +4111,44 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemHiPerfEnum* This,
+        IWbemHiPerfEnum *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemHiPerfEnum* This);
+        IWbemHiPerfEnum *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemHiPerfEnum* This);
+        IWbemHiPerfEnum *This);
 
     /*** IWbemHiPerfEnum methods ***/
     HRESULT (STDMETHODCALLTYPE *AddObjects)(
-        IWbemHiPerfEnum* This,
+        IWbemHiPerfEnum *This,
         LONG lFlags,
         ULONG uNumObjects,
         LONG *apIds,
         IWbemObjectAccess **apObj);
 
     HRESULT (STDMETHODCALLTYPE *RemoveObjects)(
-        IWbemHiPerfEnum* This,
+        IWbemHiPerfEnum *This,
         LONG lFlags,
         ULONG uNumObjects,
         LONG *apIds);
 
     HRESULT (STDMETHODCALLTYPE *GetObjects)(
-        IWbemHiPerfEnum* This,
+        IWbemHiPerfEnum *This,
         LONG lFlags,
         ULONG uNumObjects,
         IWbemObjectAccess **apObj,
         ULONG *puReturned);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAll)(
-        IWbemHiPerfEnum* This,
+        IWbemHiPerfEnum *This,
         LONG lFlags);
 
     END_INTERFACE
 } IWbemHiPerfEnumVtbl;
+
 interface IWbemHiPerfEnum {
     CONST_VTBL IWbemHiPerfEnumVtbl* lpVtbl;
 };
@@ -5094,46 +4193,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_AddObjects_Proxy(
-    IWbemHiPerfEnum* This,
-    LONG lFlags,
-    ULONG uNumObjects,
-    LONG *apIds,
-    IWbemObjectAccess **apObj);
-void __RPC_STUB IWbemHiPerfEnum_AddObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_RemoveObjects_Proxy(
-    IWbemHiPerfEnum* This,
-    LONG lFlags,
-    ULONG uNumObjects,
-    LONG *apIds);
-void __RPC_STUB IWbemHiPerfEnum_RemoveObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_GetObjects_Proxy(
-    IWbemHiPerfEnum* This,
-    LONG lFlags,
-    ULONG uNumObjects,
-    IWbemObjectAccess **apObj,
-    ULONG *puReturned);
-void __RPC_STUB IWbemHiPerfEnum_GetObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfEnum_RemoveAll_Proxy(
-    IWbemHiPerfEnum* This,
-    LONG lFlags);
-void __RPC_STUB IWbemHiPerfEnum_RemoveAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemHiPerfEnum_INTERFACE_DEFINED__ */
 
@@ -5191,19 +4250,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemConfigureRefresher* This,
+        IWbemConfigureRefresher *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemConfigureRefresher* This);
+        IWbemConfigureRefresher *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemConfigureRefresher* This);
+        IWbemConfigureRefresher *This);
 
     /*** IWbemConfigureRefresher methods ***/
     HRESULT (STDMETHODCALLTYPE *AddObjectByPath)(
-        IWbemConfigureRefresher* This,
+        IWbemConfigureRefresher *This,
         IWbemServices *pNamespace,
         LPCWSTR wszPath,
         LONG lFlags,
@@ -5212,7 +4271,7 @@
         LONG *plId);
 
     HRESULT (STDMETHODCALLTYPE *AddObjectByTemplate)(
-        IWbemConfigureRefresher* This,
+        IWbemConfigureRefresher *This,
         IWbemServices *pNamespace,
         IWbemClassObject *pTemplate,
         LONG lFlags,
@@ -5221,18 +4280,18 @@
         LONG *plId);
 
     HRESULT (STDMETHODCALLTYPE *AddRefresher)(
-        IWbemConfigureRefresher* This,
+        IWbemConfigureRefresher *This,
         IWbemRefresher *pRefresher,
         LONG lFlags,
         LONG *plId);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IWbemConfigureRefresher* This,
+        IWbemConfigureRefresher *This,
         LONG lId,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *AddEnum)(
-        IWbemConfigureRefresher* This,
+        IWbemConfigureRefresher *This,
         IWbemServices *pNamespace,
         LPCWSTR wszClassName,
         LONG lFlags,
@@ -5242,6 +4301,7 @@
 
     END_INTERFACE
 } IWbemConfigureRefresherVtbl;
+
 interface IWbemConfigureRefresher {
     CONST_VTBL IWbemConfigureRefresherVtbl* lpVtbl;
 };
@@ -5290,64 +4350,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddObjectByPath_Proxy(
-    IWbemConfigureRefresher* This,
-    IWbemServices *pNamespace,
-    LPCWSTR wszPath,
-    LONG lFlags,
-    IWbemContext *pContext,
-    IWbemClassObject **ppRefreshable,
-    LONG *plId);
-void __RPC_STUB IWbemConfigureRefresher_AddObjectByPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddObjectByTemplate_Proxy(
-    IWbemConfigureRefresher* This,
-    IWbemServices *pNamespace,
-    IWbemClassObject *pTemplate,
-    LONG lFlags,
-    IWbemContext *pContext,
-    IWbemClassObject **ppRefreshable,
-    LONG *plId);
-void __RPC_STUB IWbemConfigureRefresher_AddObjectByTemplate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddRefresher_Proxy(
-    IWbemConfigureRefresher* This,
-    IWbemRefresher *pRefresher,
-    LONG lFlags,
-    LONG *plId);
-void __RPC_STUB IWbemConfigureRefresher_AddRefresher_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_Remove_Proxy(
-    IWbemConfigureRefresher* This,
-    LONG lId,
-    LONG lFlags);
-void __RPC_STUB IWbemConfigureRefresher_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemConfigureRefresher_AddEnum_Proxy(
-    IWbemConfigureRefresher* This,
-    IWbemServices *pNamespace,
-    LPCWSTR wszClassName,
-    LONG lFlags,
-    IWbemContext *pContext,
-    IWbemHiPerfEnum **ppEnum,
-    LONG *plId);
-void __RPC_STUB IWbemConfigureRefresher_AddEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemConfigureRefresher_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wbemdisp.h b/mingw-w64-headers/include/wbemdisp.h
index b892467..f98e95d 100644
--- a/mingw-w64-headers/include/wbemdisp.h
+++ b/mingw-w64-headers/include/wbemdisp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wbemdisp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wbemdisp.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -236,126 +236,201 @@
 #ifndef __ISWbemLocator_FWD_DEFINED__
 #define __ISWbemLocator_FWD_DEFINED__
 typedef interface ISWbemLocator ISWbemLocator;
+#ifdef __cplusplus
+interface ISWbemLocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemServices_FWD_DEFINED__
 #define __ISWbemServices_FWD_DEFINED__
 typedef interface ISWbemServices ISWbemServices;
+#ifdef __cplusplus
+interface ISWbemServices;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemServicesEx_FWD_DEFINED__
 #define __ISWbemServicesEx_FWD_DEFINED__
 typedef interface ISWbemServicesEx ISWbemServicesEx;
+#ifdef __cplusplus
+interface ISWbemServicesEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObject_FWD_DEFINED__
 #define __ISWbemObject_FWD_DEFINED__
 typedef interface ISWbemObject ISWbemObject;
+#ifdef __cplusplus
+interface ISWbemObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObjectEx_FWD_DEFINED__
 #define __ISWbemObjectEx_FWD_DEFINED__
 typedef interface ISWbemObjectEx ISWbemObjectEx;
+#ifdef __cplusplus
+interface ISWbemObjectEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemLastError_FWD_DEFINED__
 #define __ISWbemLastError_FWD_DEFINED__
 typedef interface ISWbemLastError ISWbemLastError;
+#ifdef __cplusplus
+interface ISWbemLastError;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObjectSet_FWD_DEFINED__
 #define __ISWbemObjectSet_FWD_DEFINED__
 typedef interface ISWbemObjectSet ISWbemObjectSet;
+#ifdef __cplusplus
+interface ISWbemObjectSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemNamedValueSet_FWD_DEFINED__
 #define __ISWbemNamedValueSet_FWD_DEFINED__
 typedef interface ISWbemNamedValueSet ISWbemNamedValueSet;
+#ifdef __cplusplus
+interface ISWbemNamedValueSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemNamedValue_FWD_DEFINED__
 #define __ISWbemNamedValue_FWD_DEFINED__
 typedef interface ISWbemNamedValue ISWbemNamedValue;
+#ifdef __cplusplus
+interface ISWbemNamedValue;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObjectPath_FWD_DEFINED__
 #define __ISWbemObjectPath_FWD_DEFINED__
 typedef interface ISWbemObjectPath ISWbemObjectPath;
+#ifdef __cplusplus
+interface ISWbemObjectPath;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemProperty_FWD_DEFINED__
 #define __ISWbemProperty_FWD_DEFINED__
 typedef interface ISWbemProperty ISWbemProperty;
+#ifdef __cplusplus
+interface ISWbemProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemPropertySet_FWD_DEFINED__
 #define __ISWbemPropertySet_FWD_DEFINED__
 typedef interface ISWbemPropertySet ISWbemPropertySet;
+#ifdef __cplusplus
+interface ISWbemPropertySet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemQualifier_FWD_DEFINED__
 #define __ISWbemQualifier_FWD_DEFINED__
 typedef interface ISWbemQualifier ISWbemQualifier;
+#ifdef __cplusplus
+interface ISWbemQualifier;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemQualifierSet_FWD_DEFINED__
 #define __ISWbemQualifierSet_FWD_DEFINED__
 typedef interface ISWbemQualifierSet ISWbemQualifierSet;
+#ifdef __cplusplus
+interface ISWbemQualifierSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemMethod_FWD_DEFINED__
 #define __ISWbemMethod_FWD_DEFINED__
 typedef interface ISWbemMethod ISWbemMethod;
+#ifdef __cplusplus
+interface ISWbemMethod;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemMethodSet_FWD_DEFINED__
 #define __ISWbemMethodSet_FWD_DEFINED__
 typedef interface ISWbemMethodSet ISWbemMethodSet;
+#ifdef __cplusplus
+interface ISWbemMethodSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemSink_FWD_DEFINED__
 #define __ISWbemSink_FWD_DEFINED__
 typedef interface ISWbemSink ISWbemSink;
+#ifdef __cplusplus
+interface ISWbemSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemSinkEvents_FWD_DEFINED__
 #define __ISWbemSinkEvents_FWD_DEFINED__
 typedef interface ISWbemSinkEvents ISWbemSinkEvents;
+#ifdef __cplusplus
+interface ISWbemSinkEvents;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemEventSource_FWD_DEFINED__
 #define __ISWbemEventSource_FWD_DEFINED__
 typedef interface ISWbemEventSource ISWbemEventSource;
+#ifdef __cplusplus
+interface ISWbemEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemSecurity_FWD_DEFINED__
 #define __ISWbemSecurity_FWD_DEFINED__
 typedef interface ISWbemSecurity ISWbemSecurity;
+#ifdef __cplusplus
+interface ISWbemSecurity;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemPrivilege_FWD_DEFINED__
 #define __ISWbemPrivilege_FWD_DEFINED__
 typedef interface ISWbemPrivilege ISWbemPrivilege;
+#ifdef __cplusplus
+interface ISWbemPrivilege;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemPrivilegeSet_FWD_DEFINED__
 #define __ISWbemPrivilegeSet_FWD_DEFINED__
 typedef interface ISWbemPrivilegeSet ISWbemPrivilegeSet;
+#ifdef __cplusplus
+interface ISWbemPrivilegeSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemDateTime_FWD_DEFINED__
 #define __ISWbemDateTime_FWD_DEFINED__
 typedef interface ISWbemDateTime ISWbemDateTime;
+#ifdef __cplusplus
+interface ISWbemDateTime;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemRefreshableItem_FWD_DEFINED__
 #define __ISWbemRefreshableItem_FWD_DEFINED__
 typedef interface ISWbemRefreshableItem ISWbemRefreshableItem;
+#ifdef __cplusplus
+interface ISWbemRefreshableItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemRefresher_FWD_DEFINED__
 #define __ISWbemRefresher_FWD_DEFINED__
 typedef interface ISWbemRefresher ISWbemRefresher;
+#ifdef __cplusplus
+interface ISWbemRefresher;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -380,126 +455,201 @@
 #ifndef __ISWbemDateTime_FWD_DEFINED__
 #define __ISWbemDateTime_FWD_DEFINED__
 typedef interface ISWbemDateTime ISWbemDateTime;
+#ifdef __cplusplus
+interface ISWbemDateTime;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemEventSource_FWD_DEFINED__
 #define __ISWbemEventSource_FWD_DEFINED__
 typedef interface ISWbemEventSource ISWbemEventSource;
+#ifdef __cplusplus
+interface ISWbemEventSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemLastError_FWD_DEFINED__
 #define __ISWbemLastError_FWD_DEFINED__
 typedef interface ISWbemLastError ISWbemLastError;
+#ifdef __cplusplus
+interface ISWbemLastError;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemLocator_FWD_DEFINED__
 #define __ISWbemLocator_FWD_DEFINED__
 typedef interface ISWbemLocator ISWbemLocator;
+#ifdef __cplusplus
+interface ISWbemLocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemMethod_FWD_DEFINED__
 #define __ISWbemMethod_FWD_DEFINED__
 typedef interface ISWbemMethod ISWbemMethod;
+#ifdef __cplusplus
+interface ISWbemMethod;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemMethodSet_FWD_DEFINED__
 #define __ISWbemMethodSet_FWD_DEFINED__
 typedef interface ISWbemMethodSet ISWbemMethodSet;
+#ifdef __cplusplus
+interface ISWbemMethodSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemNamedValue_FWD_DEFINED__
 #define __ISWbemNamedValue_FWD_DEFINED__
 typedef interface ISWbemNamedValue ISWbemNamedValue;
+#ifdef __cplusplus
+interface ISWbemNamedValue;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemNamedValueSet_FWD_DEFINED__
 #define __ISWbemNamedValueSet_FWD_DEFINED__
 typedef interface ISWbemNamedValueSet ISWbemNamedValueSet;
+#ifdef __cplusplus
+interface ISWbemNamedValueSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObject_FWD_DEFINED__
 #define __ISWbemObject_FWD_DEFINED__
 typedef interface ISWbemObject ISWbemObject;
+#ifdef __cplusplus
+interface ISWbemObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObjectEx_FWD_DEFINED__
 #define __ISWbemObjectEx_FWD_DEFINED__
 typedef interface ISWbemObjectEx ISWbemObjectEx;
+#ifdef __cplusplus
+interface ISWbemObjectEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObjectPath_FWD_DEFINED__
 #define __ISWbemObjectPath_FWD_DEFINED__
 typedef interface ISWbemObjectPath ISWbemObjectPath;
+#ifdef __cplusplus
+interface ISWbemObjectPath;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemObjectSet_FWD_DEFINED__
 #define __ISWbemObjectSet_FWD_DEFINED__
 typedef interface ISWbemObjectSet ISWbemObjectSet;
+#ifdef __cplusplus
+interface ISWbemObjectSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemQualifier_FWD_DEFINED__
 #define __ISWbemQualifier_FWD_DEFINED__
 typedef interface ISWbemQualifier ISWbemQualifier;
+#ifdef __cplusplus
+interface ISWbemQualifier;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemQualifierSet_FWD_DEFINED__
 #define __ISWbemQualifierSet_FWD_DEFINED__
 typedef interface ISWbemQualifierSet ISWbemQualifierSet;
+#ifdef __cplusplus
+interface ISWbemQualifierSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemPrivilege_FWD_DEFINED__
 #define __ISWbemPrivilege_FWD_DEFINED__
 typedef interface ISWbemPrivilege ISWbemPrivilege;
+#ifdef __cplusplus
+interface ISWbemPrivilege;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemPrivilegeSet_FWD_DEFINED__
 #define __ISWbemPrivilegeSet_FWD_DEFINED__
 typedef interface ISWbemPrivilegeSet ISWbemPrivilegeSet;
+#ifdef __cplusplus
+interface ISWbemPrivilegeSet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemProperty_FWD_DEFINED__
 #define __ISWbemProperty_FWD_DEFINED__
 typedef interface ISWbemProperty ISWbemProperty;
+#ifdef __cplusplus
+interface ISWbemProperty;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemPropertySet_FWD_DEFINED__
 #define __ISWbemPropertySet_FWD_DEFINED__
 typedef interface ISWbemPropertySet ISWbemPropertySet;
+#ifdef __cplusplus
+interface ISWbemPropertySet;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemRefresher_FWD_DEFINED__
 #define __ISWbemRefresher_FWD_DEFINED__
 typedef interface ISWbemRefresher ISWbemRefresher;
+#ifdef __cplusplus
+interface ISWbemRefresher;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemRefreshableItem_FWD_DEFINED__
 #define __ISWbemRefreshableItem_FWD_DEFINED__
 typedef interface ISWbemRefreshableItem ISWbemRefreshableItem;
+#ifdef __cplusplus
+interface ISWbemRefreshableItem;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemSecurity_FWD_DEFINED__
 #define __ISWbemSecurity_FWD_DEFINED__
 typedef interface ISWbemSecurity ISWbemSecurity;
+#ifdef __cplusplus
+interface ISWbemSecurity;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemServices_FWD_DEFINED__
 #define __ISWbemServices_FWD_DEFINED__
 typedef interface ISWbemServices ISWbemServices;
+#ifdef __cplusplus
+interface ISWbemServices;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemServicesEx_FWD_DEFINED__
 #define __ISWbemServicesEx_FWD_DEFINED__
 typedef interface ISWbemServicesEx ISWbemServicesEx;
+#ifdef __cplusplus
+interface ISWbemServicesEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemSink_FWD_DEFINED__
 #define __ISWbemSink_FWD_DEFINED__
 typedef interface ISWbemSink ISWbemSink;
+#ifdef __cplusplus
+interface ISWbemSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __ISWbemSinkEvents_FWD_DEFINED__
 #define __ISWbemSinkEvents_FWD_DEFINED__
 typedef interface ISWbemSinkEvents ISWbemSinkEvents;
+#ifdef __cplusplus
+interface ISWbemSinkEvents;
+#endif /* __cplusplus */
 #endif
 
 typedef enum WbemChangeFlagEnum {
@@ -1107,29 +1257,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemLocator* This,
+        ISWbemLocator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemLocator* This);
+        ISWbemLocator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemLocator* This);
+        ISWbemLocator *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemLocator* This,
+        ISWbemLocator *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemLocator* This,
+        ISWbemLocator *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemLocator* This,
+        ISWbemLocator *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1137,7 +1287,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemLocator* This,
+        ISWbemLocator *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1149,7 +1299,7 @@
 
     /*** ISWbemLocator methods ***/
     HRESULT (STDMETHODCALLTYPE *ConnectServer)(
-        ISWbemLocator* This,
+        ISWbemLocator *This,
         BSTR strServer,
         BSTR strNamespace,
         BSTR strUser,
@@ -1161,11 +1311,12 @@
         ISWbemServices **objWbemServices);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemLocator* This,
+        ISWbemLocator *This,
         ISWbemSecurity **objWbemSecurity);
 
     END_INTERFACE
 } ISWbemLocatorVtbl;
+
 interface ISWbemLocator {
     CONST_VTBL ISWbemLocatorVtbl* lpVtbl;
 };
@@ -1220,30 +1371,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemLocator_ConnectServer_Proxy(
-    ISWbemLocator* This,
-    BSTR strServer,
-    BSTR strNamespace,
-    BSTR strUser,
-    BSTR strPassword,
-    BSTR strLocale,
-    BSTR strAuthority,
-    LONG iSecurityFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemServices **objWbemServices);
-void __RPC_STUB ISWbemLocator_ConnectServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemLocator_get_Security__Proxy(
-    ISWbemLocator* This,
-    ISWbemSecurity **objWbemSecurity);
-void __RPC_STUB ISWbemLocator_get_Security__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemLocator_INTERFACE_DEFINED__ */
 
@@ -1421,29 +1548,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemServices* This);
+        ISWbemServices *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemServices* This);
+        ISWbemServices *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1451,7 +1578,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1463,14 +1590,14 @@
 
     /*** ISWbemServices methods ***/
     HRESULT (STDMETHODCALLTYPE *Get)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strObjectPath,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *GetAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         LONG iFlags,
@@ -1478,13 +1605,13 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strObjectPath,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         LONG iFlags,
@@ -1492,14 +1619,14 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *InstancesOf)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strClass,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *InstancesOfAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strClass,
         LONG iFlags,
@@ -1507,14 +1634,14 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *SubclassesOf)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strSuperclass,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *SubclassesOfAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strSuperclass,
         LONG iFlags,
@@ -1522,7 +1649,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecQuery)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strQuery,
         BSTR strQueryLanguage,
         LONG iFlags,
@@ -1530,7 +1657,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *ExecQueryAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strQuery,
         BSTR strQueryLanguage,
@@ -1539,7 +1666,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *AssociatorsOf)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strObjectPath,
         BSTR strAssocClass,
         BSTR strResultClass,
@@ -1554,7 +1681,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *AssociatorsOfAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         BSTR strAssocClass,
@@ -1570,7 +1697,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ReferencesTo)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strObjectPath,
         BSTR strResultClass,
         BSTR strRole,
@@ -1582,7 +1709,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *ReferencesToAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         BSTR strResultClass,
@@ -1595,7 +1722,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecNotificationQuery)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strQuery,
         BSTR strQueryLanguage,
         LONG iFlags,
@@ -1603,7 +1730,7 @@
         ISWbemEventSource **objWbemEventSource);
 
     HRESULT (STDMETHODCALLTYPE *ExecNotificationQueryAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strQuery,
         BSTR strQueryLanguage,
@@ -1612,7 +1739,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethod)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         BSTR strObjectPath,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
@@ -1621,7 +1748,7 @@
         ISWbemObject **objWbemOutParameters);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethodAsync)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         BSTR strMethodName,
@@ -1631,11 +1758,12 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemServices* This,
+        ISWbemServices *This,
         ISWbemSecurity **objWbemSecurity);
 
     END_INTERFACE
 } ISWbemServicesVtbl;
+
 interface ISWbemServices {
     CONST_VTBL ISWbemServicesVtbl* lpVtbl;
 };
@@ -1758,254 +1886,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemServices_Get_Proxy(
-    ISWbemServices* This,
-    BSTR strObjectPath,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObject **objWbemObject);
-void __RPC_STUB ISWbemServices_Get_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_GetAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strObjectPath,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_GetAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_Delete_Proxy(
-    ISWbemServices* This,
-    BSTR strObjectPath,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet);
-void __RPC_STUB ISWbemServices_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_DeleteAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strObjectPath,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_DeleteAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_InstancesOf_Proxy(
-    ISWbemServices* This,
-    BSTR strClass,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemServices_InstancesOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_InstancesOfAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strClass,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_InstancesOfAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_SubclassesOf_Proxy(
-    ISWbemServices* This,
-    BSTR strSuperclass,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemServices_SubclassesOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_SubclassesOfAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strSuperclass,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_SubclassesOfAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ExecQuery_Proxy(
-    ISWbemServices* This,
-    BSTR strQuery,
-    BSTR strQueryLanguage,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemServices_ExecQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ExecQueryAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strQuery,
-    BSTR strQueryLanguage,
-    LONG lFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_ExecQueryAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_AssociatorsOf_Proxy(
-    ISWbemServices* This,
-    BSTR strObjectPath,
-    BSTR strAssocClass,
-    BSTR strResultClass,
-    BSTR strResultRole,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredAssocQualifier,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemServices_AssociatorsOf_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_AssociatorsOfAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strObjectPath,
-    BSTR strAssocClass,
-    BSTR strResultClass,
-    BSTR strResultRole,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredAssocQualifier,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_AssociatorsOfAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ReferencesTo_Proxy(
-    ISWbemServices* This,
-    BSTR strObjectPath,
-    BSTR strResultClass,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemServices_ReferencesTo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ReferencesToAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strObjectPath,
-    BSTR strResultClass,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_ReferencesToAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ExecNotificationQuery_Proxy(
-    ISWbemServices* This,
-    BSTR strQuery,
-    BSTR strQueryLanguage,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemEventSource **objWbemEventSource);
-void __RPC_STUB ISWbemServices_ExecNotificationQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ExecNotificationQueryAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strQuery,
-    BSTR strQueryLanguage,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_ExecNotificationQueryAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ExecMethod_Proxy(
-    ISWbemServices* This,
-    BSTR strObjectPath,
-    BSTR strMethodName,
-    IDispatch *objWbemInParameters,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObject **objWbemOutParameters);
-void __RPC_STUB ISWbemServices_ExecMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_ExecMethodAsync_Proxy(
-    ISWbemServices* This,
-    IDispatch *objWbemSink,
-    BSTR strObjectPath,
-    BSTR strMethodName,
-    IDispatch *objWbemInParameters,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServices_ExecMethodAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServices_get_Security__Proxy(
-    ISWbemServices* This,
-    ISWbemSecurity **objWbemSecurity);
-void __RPC_STUB ISWbemServices_get_Security__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemServices_INTERFACE_DEFINED__ */
 
@@ -2043,29 +1923,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemServicesEx* This);
+        ISWbemServicesEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemServicesEx* This);
+        ISWbemServicesEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2073,7 +1953,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2085,14 +1965,14 @@
 
     /*** ISWbemServices methods ***/
     HRESULT (STDMETHODCALLTYPE *Get)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strObjectPath,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *GetAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         LONG iFlags,
@@ -2100,13 +1980,13 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strObjectPath,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         LONG iFlags,
@@ -2114,14 +1994,14 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *InstancesOf)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strClass,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *InstancesOfAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strClass,
         LONG iFlags,
@@ -2129,14 +2009,14 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *SubclassesOf)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strSuperclass,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *SubclassesOfAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strSuperclass,
         LONG iFlags,
@@ -2144,7 +2024,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecQuery)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strQuery,
         BSTR strQueryLanguage,
         LONG iFlags,
@@ -2152,7 +2032,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *ExecQueryAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strQuery,
         BSTR strQueryLanguage,
@@ -2161,7 +2041,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *AssociatorsOf)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strObjectPath,
         BSTR strAssocClass,
         BSTR strResultClass,
@@ -2176,7 +2056,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *AssociatorsOfAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         BSTR strAssocClass,
@@ -2192,7 +2072,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ReferencesTo)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strObjectPath,
         BSTR strResultClass,
         BSTR strRole,
@@ -2204,7 +2084,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *ReferencesToAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         BSTR strResultClass,
@@ -2217,7 +2097,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecNotificationQuery)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strQuery,
         BSTR strQueryLanguage,
         LONG iFlags,
@@ -2225,7 +2105,7 @@
         ISWbemEventSource **objWbemEventSource);
 
     HRESULT (STDMETHODCALLTYPE *ExecNotificationQueryAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strQuery,
         BSTR strQueryLanguage,
@@ -2234,7 +2114,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethod)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         BSTR strObjectPath,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
@@ -2243,7 +2123,7 @@
         ISWbemObject **objWbemOutParameters);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethodAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         IDispatch *objWbemSink,
         BSTR strObjectPath,
         BSTR strMethodName,
@@ -2253,19 +2133,19 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         ISWbemSecurity **objWbemSecurity);
 
     /*** ISWbemServicesEx methods ***/
     HRESULT (STDMETHODCALLTYPE *Put)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         ISWbemObjectEx *objWbemObject,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectPath **objWbemObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *PutAsync)(
-        ISWbemServicesEx* This,
+        ISWbemServicesEx *This,
         ISWbemSink *objWbemSink,
         ISWbemObjectEx *objWbemObject,
         LONG iFlags,
@@ -2274,6 +2154,7 @@
 
     END_INTERFACE
 } ISWbemServicesExVtbl;
+
 interface ISWbemServicesEx {
     CONST_VTBL ISWbemServicesExVtbl* lpVtbl;
 };
@@ -2406,29 +2287,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemServicesEx_Put_Proxy(
-    ISWbemServicesEx* This,
-    ISWbemObjectEx *objWbemObject,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectPath **objWbemObjectPath);
-void __RPC_STUB ISWbemServicesEx_Put_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemServicesEx_PutAsync_Proxy(
-    ISWbemServicesEx* This,
-    ISWbemSink *objWbemSink,
-    ISWbemObjectEx *objWbemObject,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemServicesEx_PutAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemServicesEx_INTERFACE_DEFINED__ */
 
@@ -2597,29 +2455,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemObject* This);
+        ISWbemObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemObject* This);
+        ISWbemObject *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2627,7 +2485,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2639,58 +2497,58 @@
 
     /*** ISWbemObject methods ***/
     HRESULT (STDMETHODCALLTYPE *Put_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectPath **objWbemObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *PutAsync_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Delete_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAsync_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Instances_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *InstancesAsync_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Subclasses_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *SubclassesAsync_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Associators_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         BSTR strAssocClass,
         BSTR strResultClass,
         BSTR strResultRole,
@@ -2704,7 +2562,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *AssociatorsAsync_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemSink,
         BSTR strAssocClass,
         BSTR strResultClass,
@@ -2719,7 +2577,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *References_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         BSTR strResultClass,
         BSTR strRole,
         VARIANT_BOOL bClassesOnly,
@@ -2730,7 +2588,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *ReferencesAsync_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemSink,
         BSTR strResultClass,
         BSTR strRole,
@@ -2742,7 +2600,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethod_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
         LONG iFlags,
@@ -2750,7 +2608,7 @@
         ISWbemObject **objWbemOutParameters);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethodAsync_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemSink,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
@@ -2759,56 +2617,57 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Clone_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectText_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         LONG iFlags,
         BSTR *strObjectText);
 
     HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         LONG iFlags,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *SpawnInstance_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         LONG iFlags,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *CompareTo_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         IDispatch *objWbemObject,
         LONG iFlags,
         VARIANT_BOOL *bResult);
 
     HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         ISWbemQualifierSet **objWbemQualifierSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Properties_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         ISWbemPropertySet **objWbemPropertySet);
 
     HRESULT (STDMETHODCALLTYPE *get_Methods_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         ISWbemMethodSet **objWbemMethodSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Derivation_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         VARIANT *strClassNameArray);
 
     HRESULT (STDMETHODCALLTYPE *get_Path_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         ISWbemObjectPath **objWbemObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemObject* This,
+        ISWbemObject *This,
         ISWbemSecurity **objWbemSecurity);
 
     END_INTERFACE
 } ISWbemObjectVtbl;
+
 interface ISWbemObject {
     CONST_VTBL ISWbemObjectVtbl* lpVtbl;
 };
@@ -2955,275 +2814,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemObject_Put__Proxy(
-    ISWbemObject* This,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectPath **objWbemObjectPath);
-void __RPC_STUB ISWbemObject_Put__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_PutAsync__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemSink,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemObject_PutAsync__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_Delete__Proxy(
-    ISWbemObject* This,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet);
-void __RPC_STUB ISWbemObject_Delete__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_DeleteAsync__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemSink,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemObject_DeleteAsync__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_Instances__Proxy(
-    ISWbemObject* This,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemObject_Instances__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_InstancesAsync__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemSink,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemObject_InstancesAsync__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_Subclasses__Proxy(
-    ISWbemObject* This,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemObject_Subclasses__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_SubclassesAsync__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemSink,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemObject_SubclassesAsync__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_Associators__Proxy(
-    ISWbemObject* This,
-    BSTR strAssocClass,
-    BSTR strResultClass,
-    BSTR strResultRole,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredAssocQualifier,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemObject_Associators__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_AssociatorsAsync__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemSink,
-    BSTR strAssocClass,
-    BSTR strResultClass,
-    BSTR strResultRole,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredAssocQualifier,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemObject_AssociatorsAsync__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_References__Proxy(
-    ISWbemObject* This,
-    BSTR strResultClass,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemObject_References__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_ReferencesAsync__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemSink,
-    BSTR strResultClass,
-    BSTR strRole,
-    VARIANT_BOOL bClassesOnly,
-    VARIANT_BOOL bSchemaOnly,
-    BSTR strRequiredQualifier,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemObject_ReferencesAsync__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_ExecMethod__Proxy(
-    ISWbemObject* This,
-    BSTR strMethodName,
-    IDispatch *objWbemInParameters,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemObject **objWbemOutParameters);
-void __RPC_STUB ISWbemObject_ExecMethod__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_ExecMethodAsync__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemSink,
-    BSTR strMethodName,
-    IDispatch *objWbemInParameters,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    IDispatch *objWbemAsyncContext);
-void __RPC_STUB ISWbemObject_ExecMethodAsync__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_Clone__Proxy(
-    ISWbemObject* This,
-    ISWbemObject **objWbemObject);
-void __RPC_STUB ISWbemObject_Clone__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_GetObjectText__Proxy(
-    ISWbemObject* This,
-    LONG iFlags,
-    BSTR *strObjectText);
-void __RPC_STUB ISWbemObject_GetObjectText__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_SpawnDerivedClass__Proxy(
-    ISWbemObject* This,
-    LONG iFlags,
-    ISWbemObject **objWbemObject);
-void __RPC_STUB ISWbemObject_SpawnDerivedClass__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_SpawnInstance__Proxy(
-    ISWbemObject* This,
-    LONG iFlags,
-    ISWbemObject **objWbemObject);
-void __RPC_STUB ISWbemObject_SpawnInstance__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_CompareTo__Proxy(
-    ISWbemObject* This,
-    IDispatch *objWbemObject,
-    LONG iFlags,
-    VARIANT_BOOL *bResult);
-void __RPC_STUB ISWbemObject_CompareTo__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_get_Qualifiers__Proxy(
-    ISWbemObject* This,
-    ISWbemQualifierSet **objWbemQualifierSet);
-void __RPC_STUB ISWbemObject_get_Qualifiers__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_get_Properties__Proxy(
-    ISWbemObject* This,
-    ISWbemPropertySet **objWbemPropertySet);
-void __RPC_STUB ISWbemObject_get_Properties__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_get_Methods__Proxy(
-    ISWbemObject* This,
-    ISWbemMethodSet **objWbemMethodSet);
-void __RPC_STUB ISWbemObject_get_Methods__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_get_Derivation__Proxy(
-    ISWbemObject* This,
-    VARIANT *strClassNameArray);
-void __RPC_STUB ISWbemObject_get_Derivation__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_get_Path__Proxy(
-    ISWbemObject* This,
-    ISWbemObjectPath **objWbemObjectPath);
-void __RPC_STUB ISWbemObject_get_Path__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObject_get_Security__Proxy(
-    ISWbemObject* This,
-    ISWbemSecurity **objWbemSecurity);
-void __RPC_STUB ISWbemObject_get_Security__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemObject_INTERFACE_DEFINED__ */
 
@@ -3267,29 +2857,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemObjectEx* This);
+        ISWbemObjectEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemObjectEx* This);
+        ISWbemObjectEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3297,7 +2887,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3309,58 +2899,58 @@
 
     /*** ISWbemObject methods ***/
     HRESULT (STDMETHODCALLTYPE *Put_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectPath **objWbemObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *PutAsync_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Delete_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAsync_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Instances_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *InstancesAsync_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Subclasses_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *SubclassesAsync_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Associators_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         BSTR strAssocClass,
         BSTR strResultClass,
         BSTR strResultRole,
@@ -3374,7 +2964,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *AssociatorsAsync_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemSink,
         BSTR strAssocClass,
         BSTR strResultClass,
@@ -3389,7 +2979,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *References_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         BSTR strResultClass,
         BSTR strRole,
         VARIANT_BOOL bClassesOnly,
@@ -3400,7 +2990,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *ReferencesAsync_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemSink,
         BSTR strResultClass,
         BSTR strRole,
@@ -3412,7 +3002,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethod_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
         LONG iFlags,
@@ -3420,7 +3010,7 @@
         ISWbemObject **objWbemOutParameters);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethodAsync_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemSink,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
@@ -3429,73 +3019,73 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Clone_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectText_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         BSTR *strObjectText);
 
     HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *SpawnInstance_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *CompareTo_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         IDispatch *objWbemObject,
         LONG iFlags,
         VARIANT_BOOL *bResult);
 
     HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         ISWbemQualifierSet **objWbemQualifierSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Properties_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         ISWbemPropertySet **objWbemPropertySet);
 
     HRESULT (STDMETHODCALLTYPE *get_Methods_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         ISWbemMethodSet **objWbemMethodSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Derivation_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         VARIANT *strClassNameArray);
 
     HRESULT (STDMETHODCALLTYPE *get_Path_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         ISWbemObjectPath **objWbemObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         ISWbemSecurity **objWbemSecurity);
 
     /*** ISWbemObjectEx methods ***/
     HRESULT (STDMETHODCALLTYPE *Refresh_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *get_SystemProperties_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         ISWbemPropertySet **objWbemPropertySet);
 
     HRESULT (STDMETHODCALLTYPE *GetText_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         WbemObjectTextFormatEnum iObjectTextFormat,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         BSTR *bsText);
 
     HRESULT (STDMETHODCALLTYPE *SetFromText_)(
-        ISWbemObjectEx* This,
+        ISWbemObjectEx *This,
         BSTR bsText,
         WbemObjectTextFormatEnum iObjectTextFormat,
         LONG iFlags,
@@ -3503,6 +3093,7 @@
 
     END_INTERFACE
 } ISWbemObjectExVtbl;
+
 interface ISWbemObjectEx {
     CONST_VTBL ISWbemObjectExVtbl* lpVtbl;
 };
@@ -3667,45 +3258,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemObjectEx_Refresh__Proxy(
-    ISWbemObjectEx* This,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet);
-void __RPC_STUB ISWbemObjectEx_Refresh__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectEx_get_SystemProperties__Proxy(
-    ISWbemObjectEx* This,
-    ISWbemPropertySet **objWbemPropertySet);
-void __RPC_STUB ISWbemObjectEx_get_SystemProperties__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectEx_GetText__Proxy(
-    ISWbemObjectEx* This,
-    WbemObjectTextFormatEnum iObjectTextFormat,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    BSTR *bsText);
-void __RPC_STUB ISWbemObjectEx_GetText__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectEx_SetFromText__Proxy(
-    ISWbemObjectEx* This,
-    BSTR bsText,
-    WbemObjectTextFormatEnum iObjectTextFormat,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet);
-void __RPC_STUB ISWbemObjectEx_SetFromText__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemObjectEx_INTERFACE_DEFINED__ */
 
@@ -3730,29 +3282,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemLastError* This);
+        ISWbemLastError *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemLastError* This);
+        ISWbemLastError *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3760,7 +3312,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3772,58 +3324,58 @@
 
     /*** ISWbemObject methods ***/
     HRESULT (STDMETHODCALLTYPE *Put_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectPath **objWbemObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *PutAsync_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Delete_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAsync_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Instances_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *InstancesAsync_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Subclasses_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *SubclassesAsync_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemSink,
         LONG iFlags,
         IDispatch *objWbemNamedValueSet,
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Associators_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         BSTR strAssocClass,
         BSTR strResultClass,
         BSTR strResultRole,
@@ -3837,7 +3389,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *AssociatorsAsync_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemSink,
         BSTR strAssocClass,
         BSTR strResultClass,
@@ -3852,7 +3404,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *References_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         BSTR strResultClass,
         BSTR strRole,
         VARIANT_BOOL bClassesOnly,
@@ -3863,7 +3415,7 @@
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *ReferencesAsync_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemSink,
         BSTR strResultClass,
         BSTR strRole,
@@ -3875,7 +3427,7 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethod_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
         LONG iFlags,
@@ -3883,7 +3435,7 @@
         ISWbemObject **objWbemOutParameters);
 
     HRESULT (STDMETHODCALLTYPE *ExecMethodAsync_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemSink,
         BSTR strMethodName,
         IDispatch *objWbemInParameters,
@@ -3892,56 +3444,57 @@
         IDispatch *objWbemAsyncContext);
 
     HRESULT (STDMETHODCALLTYPE *Clone_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *GetObjectText_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         LONG iFlags,
         BSTR *strObjectText);
 
     HRESULT (STDMETHODCALLTYPE *SpawnDerivedClass_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         LONG iFlags,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *SpawnInstance_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         LONG iFlags,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *CompareTo_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         IDispatch *objWbemObject,
         LONG iFlags,
         VARIANT_BOOL *bResult);
 
     HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         ISWbemQualifierSet **objWbemQualifierSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Properties_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         ISWbemPropertySet **objWbemPropertySet);
 
     HRESULT (STDMETHODCALLTYPE *get_Methods_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         ISWbemMethodSet **objWbemMethodSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Derivation_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         VARIANT *strClassNameArray);
 
     HRESULT (STDMETHODCALLTYPE *get_Path_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         ISWbemObjectPath **objWbemObjectPath);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemLastError* This,
+        ISWbemLastError *This,
         ISWbemSecurity **objWbemSecurity);
 
     END_INTERFACE
 } ISWbemLastErrorVtbl;
+
 interface ISWbemLastError {
     CONST_VTBL ISWbemLastErrorVtbl* lpVtbl;
 };
@@ -4130,29 +3683,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemObjectSet* This);
+        ISWbemObjectSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemObjectSet* This);
+        ISWbemObjectSet *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4160,7 +3713,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4172,30 +3725,31 @@
 
     /*** ISWbemObjectSet methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         IUnknown **pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         BSTR strObjectPath,
         LONG iFlags,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         LONG *iCount);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         ISWbemSecurity **objWbemSecurity);
 
     HRESULT (STDMETHODCALLTYPE *ItemIndex)(
-        ISWbemObjectSet* This,
+        ISWbemObjectSet *This,
         LONG lIndex,
         ISWbemObject **objWbemObject);
 
     END_INTERFACE
 } ISWbemObjectSetVtbl;
+
 interface ISWbemObjectSet {
     CONST_VTBL ISWbemObjectSetVtbl* lpVtbl;
 };
@@ -4262,49 +3816,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemObjectSet_get__NewEnum_Proxy(
-    ISWbemObjectSet* This,
-    IUnknown **pUnk);
-void __RPC_STUB ISWbemObjectSet_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectSet_Item_Proxy(
-    ISWbemObjectSet* This,
-    BSTR strObjectPath,
-    LONG iFlags,
-    ISWbemObject **objWbemObject);
-void __RPC_STUB ISWbemObjectSet_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectSet_get_Count_Proxy(
-    ISWbemObjectSet* This,
-    LONG *iCount);
-void __RPC_STUB ISWbemObjectSet_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectSet_get_Security__Proxy(
-    ISWbemObjectSet* This,
-    ISWbemSecurity **objWbemSecurity);
-void __RPC_STUB ISWbemObjectSet_get_Security__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectSet_ItemIndex_Proxy(
-    ISWbemObjectSet* This,
-    LONG lIndex,
-    ISWbemObject **objWbemObject);
-void __RPC_STUB ISWbemObjectSet_ItemIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemObjectSet_INTERFACE_DEFINED__ */
 
@@ -4356,29 +3867,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemNamedValueSet* This);
+        ISWbemNamedValueSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemNamedValueSet* This);
+        ISWbemNamedValueSet *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4386,7 +3897,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4398,40 +3909,41 @@
 
     /*** ISWbemNamedValueSet methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         IUnknown **pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         BSTR strName,
         LONG iFlags,
         ISWbemNamedValue **objWbemNamedValue);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         LONG *iCount);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         BSTR strName,
         VARIANT *varValue,
         LONG iFlags,
         ISWbemNamedValue **objWbemNamedValue);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         BSTR strName,
         LONG iFlags);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        ISWbemNamedValueSet* This,
+        ISWbemNamedValueSet *This,
         ISWbemNamedValueSet **objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAll)(
-        ISWbemNamedValueSet* This);
+        ISWbemNamedValueSet *This);
 
     END_INTERFACE
 } ISWbemNamedValueSetVtbl;
+
 interface ISWbemNamedValueSet {
     CONST_VTBL ISWbemNamedValueSetVtbl* lpVtbl;
 };
@@ -4506,67 +4018,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_get__NewEnum_Proxy(
-    ISWbemNamedValueSet* This,
-    IUnknown **pUnk);
-void __RPC_STUB ISWbemNamedValueSet_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Item_Proxy(
-    ISWbemNamedValueSet* This,
-    BSTR strName,
-    LONG iFlags,
-    ISWbemNamedValue **objWbemNamedValue);
-void __RPC_STUB ISWbemNamedValueSet_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_get_Count_Proxy(
-    ISWbemNamedValueSet* This,
-    LONG *iCount);
-void __RPC_STUB ISWbemNamedValueSet_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Add_Proxy(
-    ISWbemNamedValueSet* This,
-    BSTR strName,
-    VARIANT *varValue,
-    LONG iFlags,
-    ISWbemNamedValue **objWbemNamedValue);
-void __RPC_STUB ISWbemNamedValueSet_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Remove_Proxy(
-    ISWbemNamedValueSet* This,
-    BSTR strName,
-    LONG iFlags);
-void __RPC_STUB ISWbemNamedValueSet_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_Clone_Proxy(
-    ISWbemNamedValueSet* This,
-    ISWbemNamedValueSet **objWbemNamedValueSet);
-void __RPC_STUB ISWbemNamedValueSet_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValueSet_DeleteAll_Proxy(
-    ISWbemNamedValueSet* This);
-void __RPC_STUB ISWbemNamedValueSet_DeleteAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemNamedValueSet_INTERFACE_DEFINED__ */
 
@@ -4600,29 +4051,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemNamedValue* This);
+        ISWbemNamedValue *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemNamedValue* This);
+        ISWbemNamedValue *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4630,7 +4081,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4642,19 +4093,20 @@
 
     /*** ISWbemNamedValue methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         VARIANT *varValue);
 
     HRESULT (STDMETHODCALLTYPE *put_Value)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         VARIANT *varValue);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISWbemNamedValue* This,
+        ISWbemNamedValue *This,
         BSTR *strName);
 
     END_INTERFACE
 } ISWbemNamedValueVtbl;
+
 interface ISWbemNamedValue {
     CONST_VTBL ISWbemNamedValueVtbl* lpVtbl;
 };
@@ -4713,30 +4165,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemNamedValue_get_Value_Proxy(
-    ISWbemNamedValue* This,
-    VARIANT *varValue);
-void __RPC_STUB ISWbemNamedValue_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValue_put_Value_Proxy(
-    ISWbemNamedValue* This,
-    VARIANT *varValue);
-void __RPC_STUB ISWbemNamedValue_put_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemNamedValue_get_Name_Proxy(
-    ISWbemNamedValue* This,
-    BSTR *strName);
-void __RPC_STUB ISWbemNamedValue_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemNamedValue_INTERFACE_DEFINED__ */
 
@@ -4830,29 +4258,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemObjectPath* This);
+        ISWbemObjectPath *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemObjectPath* This);
+        ISWbemObjectPath *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4860,7 +4288,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4872,97 +4300,98 @@
 
     /*** ISWbemObjectPath methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Path)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strPath);
 
     HRESULT (STDMETHODCALLTYPE *put_Path)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strPath);
 
     HRESULT (STDMETHODCALLTYPE *get_RelPath)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strRelPath);
 
     HRESULT (STDMETHODCALLTYPE *put_RelPath)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strRelPath);
 
     HRESULT (STDMETHODCALLTYPE *get_Server)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strServer);
 
     HRESULT (STDMETHODCALLTYPE *put_Server)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strServer);
 
     HRESULT (STDMETHODCALLTYPE *get_Namespace)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strNamespace);
 
     HRESULT (STDMETHODCALLTYPE *put_Namespace)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strNamespace);
 
     HRESULT (STDMETHODCALLTYPE *get_ParentNamespace)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strParentNamespace);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayName)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strDisplayName);
 
     HRESULT (STDMETHODCALLTYPE *put_DisplayName)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strDisplayName);
 
     HRESULT (STDMETHODCALLTYPE *get_Class)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strClass);
 
     HRESULT (STDMETHODCALLTYPE *put_Class)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strClass);
 
     HRESULT (STDMETHODCALLTYPE *get_IsClass)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         VARIANT_BOOL *bIsClass);
 
     HRESULT (STDMETHODCALLTYPE *SetAsClass)(
-        ISWbemObjectPath* This);
+        ISWbemObjectPath *This);
 
     HRESULT (STDMETHODCALLTYPE *get_IsSingleton)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         VARIANT_BOOL *bIsSingleton);
 
     HRESULT (STDMETHODCALLTYPE *SetAsSingleton)(
-        ISWbemObjectPath* This);
+        ISWbemObjectPath *This);
 
     HRESULT (STDMETHODCALLTYPE *get_Keys)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         ISWbemNamedValueSet **objWbemNamedValueSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         ISWbemSecurity **objWbemSecurity);
 
     HRESULT (STDMETHODCALLTYPE *get_Locale)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strLocale);
 
     HRESULT (STDMETHODCALLTYPE *put_Locale)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strLocale);
 
     HRESULT (STDMETHODCALLTYPE *get_Authority)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR *strAuthority);
 
     HRESULT (STDMETHODCALLTYPE *put_Authority)(
-        ISWbemObjectPath* This,
+        ISWbemObjectPath *This,
         BSTR strAuthority);
 
     END_INTERFACE
 } ISWbemObjectPathVtbl;
+
 interface ISWbemObjectPath {
     CONST_VTBL ISWbemObjectPathVtbl* lpVtbl;
 };
@@ -5101,188 +4530,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Path_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strPath);
-void __RPC_STUB ISWbemObjectPath_get_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Path_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strPath);
-void __RPC_STUB ISWbemObjectPath_put_Path_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_RelPath_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strRelPath);
-void __RPC_STUB ISWbemObjectPath_get_RelPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_RelPath_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strRelPath);
-void __RPC_STUB ISWbemObjectPath_put_RelPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Server_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strServer);
-void __RPC_STUB ISWbemObjectPath_get_Server_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Server_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strServer);
-void __RPC_STUB ISWbemObjectPath_put_Server_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Namespace_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strNamespace);
-void __RPC_STUB ISWbemObjectPath_get_Namespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Namespace_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strNamespace);
-void __RPC_STUB ISWbemObjectPath_put_Namespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_ParentNamespace_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strParentNamespace);
-void __RPC_STUB ISWbemObjectPath_get_ParentNamespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_DisplayName_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strDisplayName);
-void __RPC_STUB ISWbemObjectPath_get_DisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_DisplayName_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strDisplayName);
-void __RPC_STUB ISWbemObjectPath_put_DisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Class_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strClass);
-void __RPC_STUB ISWbemObjectPath_get_Class_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Class_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strClass);
-void __RPC_STUB ISWbemObjectPath_put_Class_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_IsClass_Proxy(
-    ISWbemObjectPath* This,
-    VARIANT_BOOL *bIsClass);
-void __RPC_STUB ISWbemObjectPath_get_IsClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_SetAsClass_Proxy(
-    ISWbemObjectPath* This);
-void __RPC_STUB ISWbemObjectPath_SetAsClass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_IsSingleton_Proxy(
-    ISWbemObjectPath* This,
-    VARIANT_BOOL *bIsSingleton);
-void __RPC_STUB ISWbemObjectPath_get_IsSingleton_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_SetAsSingleton_Proxy(
-    ISWbemObjectPath* This);
-void __RPC_STUB ISWbemObjectPath_SetAsSingleton_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Keys_Proxy(
-    ISWbemObjectPath* This,
-    ISWbemNamedValueSet **objWbemNamedValueSet);
-void __RPC_STUB ISWbemObjectPath_get_Keys_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Security__Proxy(
-    ISWbemObjectPath* This,
-    ISWbemSecurity **objWbemSecurity);
-void __RPC_STUB ISWbemObjectPath_get_Security__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Locale_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strLocale);
-void __RPC_STUB ISWbemObjectPath_get_Locale_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Locale_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strLocale);
-void __RPC_STUB ISWbemObjectPath_put_Locale_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_get_Authority_Proxy(
-    ISWbemObjectPath* This,
-    BSTR *strAuthority);
-void __RPC_STUB ISWbemObjectPath_get_Authority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemObjectPath_put_Authority_Proxy(
-    ISWbemObjectPath* This,
-    BSTR strAuthority);
-void __RPC_STUB ISWbemObjectPath_put_Authority_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemObjectPath_INTERFACE_DEFINED__ */
 
@@ -5331,29 +4578,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemProperty* This);
+        ISWbemProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemProperty* This);
+        ISWbemProperty *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5361,7 +4608,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5373,39 +4620,40 @@
 
     /*** ISWbemProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         VARIANT *varValue);
 
     HRESULT (STDMETHODCALLTYPE *put_Value)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         VARIANT *varValue);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         BSTR *strName);
 
     HRESULT (STDMETHODCALLTYPE *get_IsLocal)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         VARIANT_BOOL *bIsLocal);
 
     HRESULT (STDMETHODCALLTYPE *get_Origin)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         BSTR *strOrigin);
 
     HRESULT (STDMETHODCALLTYPE *get_CIMType)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         WbemCimtypeEnum *iCimType);
 
     HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         ISWbemQualifierSet **objWbemQualifierSet);
 
     HRESULT (STDMETHODCALLTYPE *get_IsArray)(
-        ISWbemProperty* This,
+        ISWbemProperty *This,
         VARIANT_BOOL *bIsArray);
 
     END_INTERFACE
 } ISWbemPropertyVtbl;
+
 interface ISWbemProperty {
     CONST_VTBL ISWbemPropertyVtbl* lpVtbl;
 };
@@ -5484,70 +4732,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Value_Proxy(
-    ISWbemProperty* This,
-    VARIANT *varValue);
-void __RPC_STUB ISWbemProperty_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemProperty_put_Value_Proxy(
-    ISWbemProperty* This,
-    VARIANT *varValue);
-void __RPC_STUB ISWbemProperty_put_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Name_Proxy(
-    ISWbemProperty* This,
-    BSTR *strName);
-void __RPC_STUB ISWbemProperty_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemProperty_get_IsLocal_Proxy(
-    ISWbemProperty* This,
-    VARIANT_BOOL *bIsLocal);
-void __RPC_STUB ISWbemProperty_get_IsLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Origin_Proxy(
-    ISWbemProperty* This,
-    BSTR *strOrigin);
-void __RPC_STUB ISWbemProperty_get_Origin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemProperty_get_CIMType_Proxy(
-    ISWbemProperty* This,
-    WbemCimtypeEnum *iCimType);
-void __RPC_STUB ISWbemProperty_get_CIMType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemProperty_get_Qualifiers__Proxy(
-    ISWbemProperty* This,
-    ISWbemQualifierSet **objWbemQualifierSet);
-void __RPC_STUB ISWbemProperty_get_Qualifiers__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemProperty_get_IsArray_Proxy(
-    ISWbemProperty* This,
-    VARIANT_BOOL *bIsArray);
-void __RPC_STUB ISWbemProperty_get_IsArray_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemProperty_INTERFACE_DEFINED__ */
 
@@ -5594,29 +4778,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemPropertySet* This);
+        ISWbemPropertySet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemPropertySet* This);
+        ISWbemPropertySet *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5624,7 +4808,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5636,21 +4820,21 @@
 
     /*** ISWbemPropertySet methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         IUnknown **pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         BSTR strName,
         LONG iFlags,
         ISWbemProperty **objWbemProperty);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         LONG *iCount);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         BSTR strName,
         WbemCimtypeEnum iCIMType,
         VARIANT_BOOL bIsArray,
@@ -5658,12 +4842,13 @@
         ISWbemProperty **objWbemProperty);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISWbemPropertySet* This,
+        ISWbemPropertySet *This,
         BSTR strName,
         LONG iFlags);
 
     END_INTERFACE
 } ISWbemPropertySetVtbl;
+
 interface ISWbemPropertySet {
     CONST_VTBL ISWbemPropertySetVtbl* lpVtbl;
 };
@@ -5730,53 +4915,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemPropertySet_get__NewEnum_Proxy(
-    ISWbemPropertySet* This,
-    IUnknown **pUnk);
-void __RPC_STUB ISWbemPropertySet_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPropertySet_Item_Proxy(
-    ISWbemPropertySet* This,
-    BSTR strName,
-    LONG iFlags,
-    ISWbemProperty **objWbemProperty);
-void __RPC_STUB ISWbemPropertySet_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPropertySet_get_Count_Proxy(
-    ISWbemPropertySet* This,
-    LONG *iCount);
-void __RPC_STUB ISWbemPropertySet_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPropertySet_Add_Proxy(
-    ISWbemPropertySet* This,
-    BSTR strName,
-    WbemCimtypeEnum iCIMType,
-    VARIANT_BOOL bIsArray,
-    LONG iFlags,
-    ISWbemProperty **objWbemProperty);
-void __RPC_STUB ISWbemPropertySet_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPropertySet_Remove_Proxy(
-    ISWbemPropertySet* This,
-    BSTR strName,
-    LONG iFlags);
-void __RPC_STUB ISWbemPropertySet_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemPropertySet_INTERFACE_DEFINED__ */
 
@@ -5834,29 +4972,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemQualifier* This);
+        ISWbemQualifier *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemQualifier* This);
+        ISWbemQualifier *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5864,7 +5002,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5876,51 +5014,52 @@
 
     /*** ISWbemQualifier methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT *varValue);
 
     HRESULT (STDMETHODCALLTYPE *put_Value)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT *varValue);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         BSTR *strName);
 
     HRESULT (STDMETHODCALLTYPE *get_IsLocal)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL *bIsLocal);
 
     HRESULT (STDMETHODCALLTYPE *get_PropagatesToSubclass)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL *bPropagatesToSubclass);
 
     HRESULT (STDMETHODCALLTYPE *put_PropagatesToSubclass)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL bPropagatesToSubclass);
 
     HRESULT (STDMETHODCALLTYPE *get_PropagatesToInstance)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL *bPropagatesToInstance);
 
     HRESULT (STDMETHODCALLTYPE *put_PropagatesToInstance)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL bPropagatesToInstance);
 
     HRESULT (STDMETHODCALLTYPE *get_IsOverridable)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL *bIsOverridable);
 
     HRESULT (STDMETHODCALLTYPE *put_IsOverridable)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL bIsOverridable);
 
     HRESULT (STDMETHODCALLTYPE *get_IsAmended)(
-        ISWbemQualifier* This,
+        ISWbemQualifier *This,
         VARIANT_BOOL *bIsAmended);
 
     END_INTERFACE
 } ISWbemQualifierVtbl;
+
 interface ISWbemQualifier {
     CONST_VTBL ISWbemQualifierVtbl* lpVtbl;
 };
@@ -6011,94 +5150,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_Value_Proxy(
-    ISWbemQualifier* This,
-    VARIANT *varValue);
-void __RPC_STUB ISWbemQualifier_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_Value_Proxy(
-    ISWbemQualifier* This,
-    VARIANT *varValue);
-void __RPC_STUB ISWbemQualifier_put_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_Name_Proxy(
-    ISWbemQualifier* This,
-    BSTR *strName);
-void __RPC_STUB ISWbemQualifier_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_IsLocal_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL *bIsLocal);
-void __RPC_STUB ISWbemQualifier_get_IsLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_PropagatesToSubclass_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL *bPropagatesToSubclass);
-void __RPC_STUB ISWbemQualifier_get_PropagatesToSubclass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_PropagatesToSubclass_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL bPropagatesToSubclass);
-void __RPC_STUB ISWbemQualifier_put_PropagatesToSubclass_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_PropagatesToInstance_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL *bPropagatesToInstance);
-void __RPC_STUB ISWbemQualifier_get_PropagatesToInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_PropagatesToInstance_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL bPropagatesToInstance);
-void __RPC_STUB ISWbemQualifier_put_PropagatesToInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_IsOverridable_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL *bIsOverridable);
-void __RPC_STUB ISWbemQualifier_get_IsOverridable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_put_IsOverridable_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL bIsOverridable);
-void __RPC_STUB ISWbemQualifier_put_IsOverridable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifier_get_IsAmended_Proxy(
-    ISWbemQualifier* This,
-    VARIANT_BOOL *bIsAmended);
-void __RPC_STUB ISWbemQualifier_get_IsAmended_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemQualifier_INTERFACE_DEFINED__ */
 
@@ -6147,29 +5198,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemQualifierSet* This);
+        ISWbemQualifierSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemQualifierSet* This);
+        ISWbemQualifierSet *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6177,7 +5228,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6189,21 +5240,21 @@
 
     /*** ISWbemQualifierSet methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         IUnknown **pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         BSTR name,
         LONG iFlags,
         ISWbemQualifier **objWbemQualifier);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         LONG *iCount);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         BSTR strName,
         VARIANT *varVal,
         VARIANT_BOOL bPropagatesToSubclass,
@@ -6213,12 +5264,13 @@
         ISWbemQualifier **objWbemQualifier);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISWbemQualifierSet* This,
+        ISWbemQualifierSet *This,
         BSTR strName,
         LONG iFlags);
 
     END_INTERFACE
 } ISWbemQualifierSetVtbl;
+
 interface ISWbemQualifierSet {
     CONST_VTBL ISWbemQualifierSetVtbl* lpVtbl;
 };
@@ -6285,55 +5337,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_get__NewEnum_Proxy(
-    ISWbemQualifierSet* This,
-    IUnknown **pUnk);
-void __RPC_STUB ISWbemQualifierSet_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_Item_Proxy(
-    ISWbemQualifierSet* This,
-    BSTR name,
-    LONG iFlags,
-    ISWbemQualifier **objWbemQualifier);
-void __RPC_STUB ISWbemQualifierSet_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_get_Count_Proxy(
-    ISWbemQualifierSet* This,
-    LONG *iCount);
-void __RPC_STUB ISWbemQualifierSet_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_Add_Proxy(
-    ISWbemQualifierSet* This,
-    BSTR strName,
-    VARIANT *varVal,
-    VARIANT_BOOL bPropagatesToSubclass,
-    VARIANT_BOOL bPropagatesToInstance,
-    VARIANT_BOOL bIsOverridable,
-    LONG iFlags,
-    ISWbemQualifier **objWbemQualifier);
-void __RPC_STUB ISWbemQualifierSet_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemQualifierSet_Remove_Proxy(
-    ISWbemQualifierSet* This,
-    BSTR strName,
-    LONG iFlags);
-void __RPC_STUB ISWbemQualifierSet_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemQualifierSet_INTERFACE_DEFINED__ */
 
@@ -6373,29 +5376,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemMethod* This);
+        ISWbemMethod *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemMethod* This);
+        ISWbemMethod *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6403,7 +5406,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6415,27 +5418,28 @@
 
     /*** ISWbemMethod methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         BSTR *strName);
 
     HRESULT (STDMETHODCALLTYPE *get_Origin)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         BSTR *strOrigin);
 
     HRESULT (STDMETHODCALLTYPE *get_InParameters)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         ISWbemObject **objWbemInParameters);
 
     HRESULT (STDMETHODCALLTYPE *get_OutParameters)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         ISWbemObject **objWbemOutParameters);
 
     HRESULT (STDMETHODCALLTYPE *get_Qualifiers_)(
-        ISWbemMethod* This,
+        ISWbemMethod *This,
         ISWbemQualifierSet **objWbemQualifierSet);
 
     END_INTERFACE
 } ISWbemMethodVtbl;
+
 interface ISWbemMethod {
     CONST_VTBL ISWbemMethodVtbl* lpVtbl;
 };
@@ -6502,46 +5506,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemMethod_get_Name_Proxy(
-    ISWbemMethod* This,
-    BSTR *strName);
-void __RPC_STUB ISWbemMethod_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemMethod_get_Origin_Proxy(
-    ISWbemMethod* This,
-    BSTR *strOrigin);
-void __RPC_STUB ISWbemMethod_get_Origin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemMethod_get_InParameters_Proxy(
-    ISWbemMethod* This,
-    ISWbemObject **objWbemInParameters);
-void __RPC_STUB ISWbemMethod_get_InParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemMethod_get_OutParameters_Proxy(
-    ISWbemMethod* This,
-    ISWbemObject **objWbemOutParameters);
-void __RPC_STUB ISWbemMethod_get_OutParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemMethod_get_Qualifiers__Proxy(
-    ISWbemMethod* This,
-    ISWbemQualifierSet **objWbemQualifierSet);
-void __RPC_STUB ISWbemMethod_get_Qualifiers__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemMethod_INTERFACE_DEFINED__ */
 
@@ -6577,29 +5541,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemMethodSet* This);
+        ISWbemMethodSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemMethodSet* This);
+        ISWbemMethodSet *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6607,7 +5571,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6619,21 +5583,22 @@
 
     /*** ISWbemMethodSet methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         IUnknown **pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         BSTR strName,
         LONG iFlags,
         ISWbemMethod **objWbemMethod);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISWbemMethodSet* This,
+        ISWbemMethodSet *This,
         LONG *iCount);
 
     END_INTERFACE
 } ISWbemMethodSetVtbl;
+
 interface ISWbemMethodSet {
     CONST_VTBL ISWbemMethodSetVtbl* lpVtbl;
 };
@@ -6692,32 +5657,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemMethodSet_get__NewEnum_Proxy(
-    ISWbemMethodSet* This,
-    IUnknown **pUnk);
-void __RPC_STUB ISWbemMethodSet_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemMethodSet_Item_Proxy(
-    ISWbemMethodSet* This,
-    BSTR strName,
-    LONG iFlags,
-    ISWbemMethod **objWbemMethod);
-void __RPC_STUB ISWbemMethodSet_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemMethodSet_get_Count_Proxy(
-    ISWbemMethodSet* This,
-    LONG *iCount);
-void __RPC_STUB ISWbemMethodSet_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemMethodSet_INTERFACE_DEFINED__ */
 
@@ -6745,29 +5684,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemSink* This,
+        ISWbemSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemSink* This);
+        ISWbemSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemSink* This);
+        ISWbemSink *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemSink* This,
+        ISWbemSink *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemSink* This,
+        ISWbemSink *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemSink* This,
+        ISWbemSink *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6775,7 +5714,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemSink* This,
+        ISWbemSink *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6787,10 +5726,11 @@
 
     /*** ISWbemSink methods ***/
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        ISWbemSink* This);
+        ISWbemSink *This);
 
     END_INTERFACE
 } ISWbemSinkVtbl;
+
 interface ISWbemSink {
     CONST_VTBL ISWbemSinkVtbl* lpVtbl;
 };
@@ -6841,13 +5781,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemSink_Cancel_Proxy(
-    ISWbemSink* This);
-void __RPC_STUB ISWbemSink_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemSink_INTERFACE_DEFINED__ */
 
@@ -6872,29 +5805,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemSinkEvents* This,
+        ISWbemSinkEvents *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemSinkEvents* This);
+        ISWbemSinkEvents *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemSinkEvents* This);
+        ISWbemSinkEvents *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemSinkEvents* This,
+        ISWbemSinkEvents *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemSinkEvents* This,
+        ISWbemSinkEvents *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemSinkEvents* This,
+        ISWbemSinkEvents *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6902,7 +5835,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemSinkEvents* This,
+        ISWbemSinkEvents *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6914,6 +5847,7 @@
 
     END_INTERFACE
 } ISWbemSinkEventsVtbl;
+
 interface ISWbemSinkEvents {
     CONST_VTBL ISWbemSinkEventsVtbl* lpVtbl;
 };
@@ -6988,29 +5922,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemEventSource* This,
+        ISWbemEventSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemEventSource* This);
+        ISWbemEventSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemEventSource* This);
+        ISWbemEventSource *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemEventSource* This,
+        ISWbemEventSource *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemEventSource* This,
+        ISWbemEventSource *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemEventSource* This,
+        ISWbemEventSource *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7018,7 +5952,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemEventSource* This,
+        ISWbemEventSource *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7030,16 +5964,17 @@
 
     /*** ISWbemEventSource methods ***/
     HRESULT (STDMETHODCALLTYPE *NextEvent)(
-        ISWbemEventSource* This,
+        ISWbemEventSource *This,
         LONG iTimeoutMs,
         ISWbemObject **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *get_Security_)(
-        ISWbemEventSource* This,
+        ISWbemEventSource *This,
         ISWbemSecurity **objWbemSecurity);
 
     END_INTERFACE
 } ISWbemEventSourceVtbl;
+
 interface ISWbemEventSource {
     CONST_VTBL ISWbemEventSourceVtbl* lpVtbl;
 };
@@ -7094,23 +6029,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemEventSource_NextEvent_Proxy(
-    ISWbemEventSource* This,
-    LONG iTimeoutMs,
-    ISWbemObject **objWbemObject);
-void __RPC_STUB ISWbemEventSource_NextEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemEventSource_get_Security__Proxy(
-    ISWbemEventSource* This,
-    ISWbemSecurity **objWbemSecurity);
-void __RPC_STUB ISWbemEventSource_get_Security__Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemEventSource_INTERFACE_DEFINED__ */
 
@@ -7150,29 +6068,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemSecurity* This);
+        ISWbemSecurity *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemSecurity* This);
+        ISWbemSecurity *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7180,7 +6098,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7192,27 +6110,28 @@
 
     /*** ISWbemSecurity methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ImpersonationLevel)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         WbemImpersonationLevelEnum *iImpersonationLevel);
 
     HRESULT (STDMETHODCALLTYPE *put_ImpersonationLevel)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         WbemImpersonationLevelEnum iImpersonationLevel);
 
     HRESULT (STDMETHODCALLTYPE *get_AuthenticationLevel)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         WbemAuthenticationLevelEnum *iAuthenticationLevel);
 
     HRESULT (STDMETHODCALLTYPE *put_AuthenticationLevel)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         WbemAuthenticationLevelEnum iAuthenticationLevel);
 
     HRESULT (STDMETHODCALLTYPE *get_Privileges)(
-        ISWbemSecurity* This,
+        ISWbemSecurity *This,
         ISWbemPrivilegeSet **objWbemPrivilegeSet);
 
     END_INTERFACE
 } ISWbemSecurityVtbl;
+
 interface ISWbemSecurity {
     CONST_VTBL ISWbemSecurityVtbl* lpVtbl;
 };
@@ -7279,46 +6198,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemSecurity_get_ImpersonationLevel_Proxy(
-    ISWbemSecurity* This,
-    WbemImpersonationLevelEnum *iImpersonationLevel);
-void __RPC_STUB ISWbemSecurity_get_ImpersonationLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemSecurity_put_ImpersonationLevel_Proxy(
-    ISWbemSecurity* This,
-    WbemImpersonationLevelEnum iImpersonationLevel);
-void __RPC_STUB ISWbemSecurity_put_ImpersonationLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemSecurity_get_AuthenticationLevel_Proxy(
-    ISWbemSecurity* This,
-    WbemAuthenticationLevelEnum *iAuthenticationLevel);
-void __RPC_STUB ISWbemSecurity_get_AuthenticationLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemSecurity_put_AuthenticationLevel_Proxy(
-    ISWbemSecurity* This,
-    WbemAuthenticationLevelEnum iAuthenticationLevel);
-void __RPC_STUB ISWbemSecurity_put_AuthenticationLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemSecurity_get_Privileges_Proxy(
-    ISWbemSecurity* This,
-    ISWbemPrivilegeSet **objWbemPrivilegeSet);
-void __RPC_STUB ISWbemSecurity_get_Privileges_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemSecurity_INTERFACE_DEFINED__ */
 
@@ -7358,29 +6237,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemPrivilege* This);
+        ISWbemPrivilege *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemPrivilege* This);
+        ISWbemPrivilege *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7388,7 +6267,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7400,27 +6279,28 @@
 
     /*** ISWbemPrivilege methods ***/
     HRESULT (STDMETHODCALLTYPE *get_IsEnabled)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         VARIANT_BOOL *bIsEnabled);
 
     HRESULT (STDMETHODCALLTYPE *put_IsEnabled)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         VARIANT_BOOL bIsEnabled);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         BSTR *strDisplayName);
 
     HRESULT (STDMETHODCALLTYPE *get_DisplayName)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         BSTR *strDisplayName);
 
     HRESULT (STDMETHODCALLTYPE *get_Identifier)(
-        ISWbemPrivilege* This,
+        ISWbemPrivilege *This,
         WbemPrivilegeEnum *iPrivilege);
 
     END_INTERFACE
 } ISWbemPrivilegeVtbl;
+
 interface ISWbemPrivilege {
     CONST_VTBL ISWbemPrivilegeVtbl* lpVtbl;
 };
@@ -7487,46 +6367,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_IsEnabled_Proxy(
-    ISWbemPrivilege* This,
-    VARIANT_BOOL *bIsEnabled);
-void __RPC_STUB ISWbemPrivilege_get_IsEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilege_put_IsEnabled_Proxy(
-    ISWbemPrivilege* This,
-    VARIANT_BOOL bIsEnabled);
-void __RPC_STUB ISWbemPrivilege_put_IsEnabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_Name_Proxy(
-    ISWbemPrivilege* This,
-    BSTR *strDisplayName);
-void __RPC_STUB ISWbemPrivilege_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_DisplayName_Proxy(
-    ISWbemPrivilege* This,
-    BSTR *strDisplayName);
-void __RPC_STUB ISWbemPrivilege_get_DisplayName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilege_get_Identifier_Proxy(
-    ISWbemPrivilege* This,
-    WbemPrivilegeEnum *iPrivilege);
-void __RPC_STUB ISWbemPrivilege_get_Identifier_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemPrivilege_INTERFACE_DEFINED__ */
 
@@ -7577,29 +6417,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemPrivilegeSet* This);
+        ISWbemPrivilegeSet *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemPrivilegeSet* This);
+        ISWbemPrivilegeSet *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7607,7 +6447,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7619,39 +6459,40 @@
 
     /*** ISWbemPrivilegeSet methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         IUnknown **pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         WbemPrivilegeEnum iPrivilege,
         ISWbemPrivilege **objWbemPrivilege);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         LONG *iCount);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         WbemPrivilegeEnum iPrivilege,
         VARIANT_BOOL bIsEnabled,
         ISWbemPrivilege **objWbemPrivilege);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         WbemPrivilegeEnum iPrivilege);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAll)(
-        ISWbemPrivilegeSet* This);
+        ISWbemPrivilegeSet *This);
 
     HRESULT (STDMETHODCALLTYPE *AddAsString)(
-        ISWbemPrivilegeSet* This,
+        ISWbemPrivilegeSet *This,
         BSTR strPrivilege,
         VARIANT_BOOL bIsEnabled,
         ISWbemPrivilege **objWbemPrivilege);
 
     END_INTERFACE
 } ISWbemPrivilegeSetVtbl;
+
 interface ISWbemPrivilegeSet {
     CONST_VTBL ISWbemPrivilegeSetVtbl* lpVtbl;
 };
@@ -7726,66 +6567,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_get__NewEnum_Proxy(
-    ISWbemPrivilegeSet* This,
-    IUnknown **pUnk);
-void __RPC_STUB ISWbemPrivilegeSet_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_Item_Proxy(
-    ISWbemPrivilegeSet* This,
-    WbemPrivilegeEnum iPrivilege,
-    ISWbemPrivilege **objWbemPrivilege);
-void __RPC_STUB ISWbemPrivilegeSet_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_get_Count_Proxy(
-    ISWbemPrivilegeSet* This,
-    LONG *iCount);
-void __RPC_STUB ISWbemPrivilegeSet_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_Add_Proxy(
-    ISWbemPrivilegeSet* This,
-    WbemPrivilegeEnum iPrivilege,
-    VARIANT_BOOL bIsEnabled,
-    ISWbemPrivilege **objWbemPrivilege);
-void __RPC_STUB ISWbemPrivilegeSet_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_Remove_Proxy(
-    ISWbemPrivilegeSet* This,
-    WbemPrivilegeEnum iPrivilege);
-void __RPC_STUB ISWbemPrivilegeSet_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_DeleteAll_Proxy(
-    ISWbemPrivilegeSet* This);
-void __RPC_STUB ISWbemPrivilegeSet_DeleteAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemPrivilegeSet_AddAsString_Proxy(
-    ISWbemPrivilegeSet* This,
-    BSTR strPrivilege,
-    VARIANT_BOOL bIsEnabled,
-    ISWbemPrivilege **objWbemPrivilege);
-void __RPC_STUB ISWbemPrivilegeSet_AddAsString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemPrivilegeSet_INTERFACE_DEFINED__ */
 
@@ -7934,29 +6715,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemDateTime* This);
+        ISWbemDateTime *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemDateTime* This);
+        ISWbemDateTime *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -7964,7 +6745,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -7976,171 +6757,172 @@
 
     /*** ISWbemDateTime methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Value)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         BSTR *strValue);
 
     HRESULT (STDMETHODCALLTYPE *put_Value)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         BSTR strValue);
 
     HRESULT (STDMETHODCALLTYPE *get_Year)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iYear);
 
     HRESULT (STDMETHODCALLTYPE *put_Year)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iYear);
 
     HRESULT (STDMETHODCALLTYPE *get_YearSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bYearSpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_YearSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bYearSpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_Month)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iMonth);
 
     HRESULT (STDMETHODCALLTYPE *put_Month)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iMonth);
 
     HRESULT (STDMETHODCALLTYPE *get_MonthSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bMonthSpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_MonthSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bMonthSpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_Day)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iDay);
 
     HRESULT (STDMETHODCALLTYPE *put_Day)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iDay);
 
     HRESULT (STDMETHODCALLTYPE *get_DaySpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bDaySpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_DaySpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bDaySpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_Hours)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iHours);
 
     HRESULT (STDMETHODCALLTYPE *put_Hours)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iHours);
 
     HRESULT (STDMETHODCALLTYPE *get_HoursSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bHoursSpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_HoursSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bHoursSpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_Minutes)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iMinutes);
 
     HRESULT (STDMETHODCALLTYPE *put_Minutes)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iMinutes);
 
     HRESULT (STDMETHODCALLTYPE *get_MinutesSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bMinutesSpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_MinutesSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bMinutesSpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_Seconds)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iSeconds);
 
     HRESULT (STDMETHODCALLTYPE *put_Seconds)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iSeconds);
 
     HRESULT (STDMETHODCALLTYPE *get_SecondsSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bSecondsSpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_SecondsSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bSecondsSpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_Microseconds)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iMicroseconds);
 
     HRESULT (STDMETHODCALLTYPE *put_Microseconds)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iMicroseconds);
 
     HRESULT (STDMETHODCALLTYPE *get_MicrosecondsSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bMicrosecondsSpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_MicrosecondsSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bMicrosecondsSpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_UTC)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG *iUTC);
 
     HRESULT (STDMETHODCALLTYPE *put_UTC)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         LONG iUTC);
 
     HRESULT (STDMETHODCALLTYPE *get_UTCSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bUTCSpecified);
 
     HRESULT (STDMETHODCALLTYPE *put_UTCSpecified)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bUTCSpecified);
 
     HRESULT (STDMETHODCALLTYPE *get_IsInterval)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL *bIsInterval);
 
     HRESULT (STDMETHODCALLTYPE *put_IsInterval)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bIsInterval);
 
     HRESULT (STDMETHODCALLTYPE *GetVarDate)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bIsLocal,
         DATE *dVarDate);
 
     HRESULT (STDMETHODCALLTYPE *SetVarDate)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         DATE dVarDate,
         VARIANT_BOOL bIsLocal);
 
     HRESULT (STDMETHODCALLTYPE *GetFileTime)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         VARIANT_BOOL bIsLocal,
         BSTR *strFileTime);
 
     HRESULT (STDMETHODCALLTYPE *SetFileTime)(
-        ISWbemDateTime* This,
+        ISWbemDateTime *This,
         BSTR strFileTime,
         VARIANT_BOOL bIsLocal);
 
     END_INTERFACE
 } ISWbemDateTimeVtbl;
+
 interface ISWbemDateTime {
     CONST_VTBL ISWbemDateTimeVtbl* lpVtbl;
 };
@@ -8347,330 +7129,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Value_Proxy(
-    ISWbemDateTime* This,
-    BSTR *strValue);
-void __RPC_STUB ISWbemDateTime_get_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Value_Proxy(
-    ISWbemDateTime* This,
-    BSTR strValue);
-void __RPC_STUB ISWbemDateTime_put_Value_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Year_Proxy(
-    ISWbemDateTime* This,
-    LONG *iYear);
-void __RPC_STUB ISWbemDateTime_get_Year_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Year_Proxy(
-    ISWbemDateTime* This,
-    LONG iYear);
-void __RPC_STUB ISWbemDateTime_put_Year_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_YearSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bYearSpecified);
-void __RPC_STUB ISWbemDateTime_get_YearSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_YearSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bYearSpecified);
-void __RPC_STUB ISWbemDateTime_put_YearSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Month_Proxy(
-    ISWbemDateTime* This,
-    LONG *iMonth);
-void __RPC_STUB ISWbemDateTime_get_Month_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Month_Proxy(
-    ISWbemDateTime* This,
-    LONG iMonth);
-void __RPC_STUB ISWbemDateTime_put_Month_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_MonthSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bMonthSpecified);
-void __RPC_STUB ISWbemDateTime_get_MonthSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_MonthSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bMonthSpecified);
-void __RPC_STUB ISWbemDateTime_put_MonthSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Day_Proxy(
-    ISWbemDateTime* This,
-    LONG *iDay);
-void __RPC_STUB ISWbemDateTime_get_Day_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Day_Proxy(
-    ISWbemDateTime* This,
-    LONG iDay);
-void __RPC_STUB ISWbemDateTime_put_Day_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_DaySpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bDaySpecified);
-void __RPC_STUB ISWbemDateTime_get_DaySpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_DaySpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bDaySpecified);
-void __RPC_STUB ISWbemDateTime_put_DaySpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Hours_Proxy(
-    ISWbemDateTime* This,
-    LONG *iHours);
-void __RPC_STUB ISWbemDateTime_get_Hours_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Hours_Proxy(
-    ISWbemDateTime* This,
-    LONG iHours);
-void __RPC_STUB ISWbemDateTime_put_Hours_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_HoursSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bHoursSpecified);
-void __RPC_STUB ISWbemDateTime_get_HoursSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_HoursSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bHoursSpecified);
-void __RPC_STUB ISWbemDateTime_put_HoursSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Minutes_Proxy(
-    ISWbemDateTime* This,
-    LONG *iMinutes);
-void __RPC_STUB ISWbemDateTime_get_Minutes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Minutes_Proxy(
-    ISWbemDateTime* This,
-    LONG iMinutes);
-void __RPC_STUB ISWbemDateTime_put_Minutes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_MinutesSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bMinutesSpecified);
-void __RPC_STUB ISWbemDateTime_get_MinutesSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_MinutesSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bMinutesSpecified);
-void __RPC_STUB ISWbemDateTime_put_MinutesSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Seconds_Proxy(
-    ISWbemDateTime* This,
-    LONG *iSeconds);
-void __RPC_STUB ISWbemDateTime_get_Seconds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Seconds_Proxy(
-    ISWbemDateTime* This,
-    LONG iSeconds);
-void __RPC_STUB ISWbemDateTime_put_Seconds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_SecondsSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bSecondsSpecified);
-void __RPC_STUB ISWbemDateTime_get_SecondsSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_SecondsSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bSecondsSpecified);
-void __RPC_STUB ISWbemDateTime_put_SecondsSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_Microseconds_Proxy(
-    ISWbemDateTime* This,
-    LONG *iMicroseconds);
-void __RPC_STUB ISWbemDateTime_get_Microseconds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_Microseconds_Proxy(
-    ISWbemDateTime* This,
-    LONG iMicroseconds);
-void __RPC_STUB ISWbemDateTime_put_Microseconds_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_MicrosecondsSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bMicrosecondsSpecified);
-void __RPC_STUB ISWbemDateTime_get_MicrosecondsSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_MicrosecondsSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bMicrosecondsSpecified);
-void __RPC_STUB ISWbemDateTime_put_MicrosecondsSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_UTC_Proxy(
-    ISWbemDateTime* This,
-    LONG *iUTC);
-void __RPC_STUB ISWbemDateTime_get_UTC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_UTC_Proxy(
-    ISWbemDateTime* This,
-    LONG iUTC);
-void __RPC_STUB ISWbemDateTime_put_UTC_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_UTCSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bUTCSpecified);
-void __RPC_STUB ISWbemDateTime_get_UTCSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_UTCSpecified_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bUTCSpecified);
-void __RPC_STUB ISWbemDateTime_put_UTCSpecified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_get_IsInterval_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL *bIsInterval);
-void __RPC_STUB ISWbemDateTime_get_IsInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_put_IsInterval_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bIsInterval);
-void __RPC_STUB ISWbemDateTime_put_IsInterval_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_GetVarDate_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bIsLocal,
-    DATE *dVarDate);
-void __RPC_STUB ISWbemDateTime_GetVarDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_SetVarDate_Proxy(
-    ISWbemDateTime* This,
-    DATE dVarDate,
-    VARIANT_BOOL bIsLocal);
-void __RPC_STUB ISWbemDateTime_SetVarDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_GetFileTime_Proxy(
-    ISWbemDateTime* This,
-    VARIANT_BOOL bIsLocal,
-    BSTR *strFileTime);
-void __RPC_STUB ISWbemDateTime_GetFileTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemDateTime_SetFileTime_Proxy(
-    ISWbemDateTime* This,
-    BSTR strFileTime,
-    VARIANT_BOOL bIsLocal);
-void __RPC_STUB ISWbemDateTime_SetFileTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemDateTime_INTERFACE_DEFINED__ */
 
@@ -8713,29 +7171,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemRefreshableItem* This);
+        ISWbemRefreshableItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemRefreshableItem* This);
+        ISWbemRefreshableItem *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -8743,7 +7201,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -8755,31 +7213,32 @@
 
     /*** ISWbemRefreshableItem methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Index)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         LONG *iIndex);
 
     HRESULT (STDMETHODCALLTYPE *get_Refresher)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         ISWbemRefresher **objWbemRefresher);
 
     HRESULT (STDMETHODCALLTYPE *get_IsSet)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         VARIANT_BOOL *bIsSet);
 
     HRESULT (STDMETHODCALLTYPE *get_Object)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         ISWbemObjectEx **objWbemObject);
 
     HRESULT (STDMETHODCALLTYPE *get_ObjectSet)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         ISWbemObjectSet **objWbemObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISWbemRefreshableItem* This,
+        ISWbemRefreshableItem *This,
         LONG iFlags);
 
     END_INTERFACE
 } ISWbemRefreshableItemVtbl;
+
 interface ISWbemRefreshableItem {
     CONST_VTBL ISWbemRefreshableItemVtbl* lpVtbl;
 };
@@ -8850,54 +7309,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_Index_Proxy(
-    ISWbemRefreshableItem* This,
-    LONG *iIndex);
-void __RPC_STUB ISWbemRefreshableItem_get_Index_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_Refresher_Proxy(
-    ISWbemRefreshableItem* This,
-    ISWbemRefresher **objWbemRefresher);
-void __RPC_STUB ISWbemRefreshableItem_get_Refresher_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_IsSet_Proxy(
-    ISWbemRefreshableItem* This,
-    VARIANT_BOOL *bIsSet);
-void __RPC_STUB ISWbemRefreshableItem_get_IsSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_Object_Proxy(
-    ISWbemRefreshableItem* This,
-    ISWbemObjectEx **objWbemObject);
-void __RPC_STUB ISWbemRefreshableItem_get_Object_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_get_ObjectSet_Proxy(
-    ISWbemRefreshableItem* This,
-    ISWbemObjectSet **objWbemObjectSet);
-void __RPC_STUB ISWbemRefreshableItem_get_ObjectSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefreshableItem_Remove_Proxy(
-    ISWbemRefreshableItem* This,
-    LONG iFlags);
-void __RPC_STUB ISWbemRefreshableItem_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemRefreshableItem_INTERFACE_DEFINED__ */
 
@@ -8962,29 +7373,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        ISWbemRefresher* This);
+        ISWbemRefresher *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        ISWbemRefresher* This);
+        ISWbemRefresher *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -8992,7 +7403,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -9004,20 +7415,20 @@
 
     /*** ISWbemRefresher methods ***/
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         IUnknown **pUnk);
 
     HRESULT (STDMETHODCALLTYPE *Item)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         LONG iIndex,
         ISWbemRefreshableItem **objWbemRefreshableItem);
 
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         LONG *iCount);
 
     HRESULT (STDMETHODCALLTYPE *Add)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         ISWbemServicesEx *objWbemServices,
         BSTR bsInstancePath,
         LONG iFlags,
@@ -9025,7 +7436,7 @@
         ISWbemRefreshableItem **objWbemRefreshableItem);
 
     HRESULT (STDMETHODCALLTYPE *AddEnum)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         ISWbemServicesEx *objWbemServices,
         BSTR bsClassName,
         LONG iFlags,
@@ -9033,27 +7444,28 @@
         ISWbemRefreshableItem **objWbemRefreshableItem);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         LONG iIndex,
         LONG iFlags);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         LONG iFlags);
 
     HRESULT (STDMETHODCALLTYPE *get_AutoReconnect)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         VARIANT_BOOL *bCount);
 
     HRESULT (STDMETHODCALLTYPE *put_AutoReconnect)(
-        ISWbemRefresher* This,
+        ISWbemRefresher *This,
         VARIANT_BOOL bCount);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAll)(
-        ISWbemRefresher* This);
+        ISWbemRefresher *This);
 
     END_INTERFACE
 } ISWbemRefresherVtbl;
+
 interface ISWbemRefresher {
     CONST_VTBL ISWbemRefresherVtbl* lpVtbl;
 };
@@ -9140,95 +7552,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_get__NewEnum_Proxy(
-    ISWbemRefresher* This,
-    IUnknown **pUnk);
-void __RPC_STUB ISWbemRefresher_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_Item_Proxy(
-    ISWbemRefresher* This,
-    LONG iIndex,
-    ISWbemRefreshableItem **objWbemRefreshableItem);
-void __RPC_STUB ISWbemRefresher_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_get_Count_Proxy(
-    ISWbemRefresher* This,
-    LONG *iCount);
-void __RPC_STUB ISWbemRefresher_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_Add_Proxy(
-    ISWbemRefresher* This,
-    ISWbemServicesEx *objWbemServices,
-    BSTR bsInstancePath,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemRefreshableItem **objWbemRefreshableItem);
-void __RPC_STUB ISWbemRefresher_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_AddEnum_Proxy(
-    ISWbemRefresher* This,
-    ISWbemServicesEx *objWbemServices,
-    BSTR bsClassName,
-    LONG iFlags,
-    IDispatch *objWbemNamedValueSet,
-    ISWbemRefreshableItem **objWbemRefreshableItem);
-void __RPC_STUB ISWbemRefresher_AddEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_Remove_Proxy(
-    ISWbemRefresher* This,
-    LONG iIndex,
-    LONG iFlags);
-void __RPC_STUB ISWbemRefresher_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_Refresh_Proxy(
-    ISWbemRefresher* This,
-    LONG iFlags);
-void __RPC_STUB ISWbemRefresher_Refresh_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_get_AutoReconnect_Proxy(
-    ISWbemRefresher* This,
-    VARIANT_BOOL *bCount);
-void __RPC_STUB ISWbemRefresher_get_AutoReconnect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_put_AutoReconnect_Proxy(
-    ISWbemRefresher* This,
-    VARIANT_BOOL bCount);
-void __RPC_STUB ISWbemRefresher_put_AutoReconnect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE ISWbemRefresher_DeleteAll_Proxy(
-    ISWbemRefresher* This);
-void __RPC_STUB ISWbemRefresher_DeleteAll_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __ISWbemRefresher_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wbemprov.h b/mingw-w64-headers/include/wbemprov.h
index 8296fce..f480c47 100644
--- a/mingw-w64-headers/include/wbemprov.h
+++ b/mingw-w64-headers/include/wbemprov.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wbemprov.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wbemprov.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -65,66 +65,105 @@
 #ifndef __IWbemUnboundObjectSink_FWD_DEFINED__
 #define __IWbemUnboundObjectSink_FWD_DEFINED__
 typedef interface IWbemUnboundObjectSink IWbemUnboundObjectSink;
+#ifdef __cplusplus
+interface IWbemUnboundObjectSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemPropertyProvider_FWD_DEFINED__
 #define __IWbemPropertyProvider_FWD_DEFINED__
 typedef interface IWbemPropertyProvider IWbemPropertyProvider;
+#ifdef __cplusplus
+interface IWbemPropertyProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventProvider_FWD_DEFINED__
 #define __IWbemEventProvider_FWD_DEFINED__
 typedef interface IWbemEventProvider IWbemEventProvider;
+#ifdef __cplusplus
+interface IWbemEventProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventProviderQuerySink_FWD_DEFINED__
 #define __IWbemEventProviderQuerySink_FWD_DEFINED__
 typedef interface IWbemEventProviderQuerySink IWbemEventProviderQuerySink;
+#ifdef __cplusplus
+interface IWbemEventProviderQuerySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventProviderSecurity_FWD_DEFINED__
 #define __IWbemEventProviderSecurity_FWD_DEFINED__
 typedef interface IWbemEventProviderSecurity IWbemEventProviderSecurity;
+#ifdef __cplusplus
+interface IWbemEventProviderSecurity;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemProviderIdentity_FWD_DEFINED__
 #define __IWbemProviderIdentity_FWD_DEFINED__
 typedef interface IWbemProviderIdentity IWbemProviderIdentity;
+#ifdef __cplusplus
+interface IWbemProviderIdentity;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventConsumerProvider_FWD_DEFINED__
 #define __IWbemEventConsumerProvider_FWD_DEFINED__
 typedef interface IWbemEventConsumerProvider IWbemEventConsumerProvider;
+#ifdef __cplusplus
+interface IWbemEventConsumerProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemProviderInitSink_FWD_DEFINED__
 #define __IWbemProviderInitSink_FWD_DEFINED__
 typedef interface IWbemProviderInitSink IWbemProviderInitSink;
+#ifdef __cplusplus
+interface IWbemProviderInitSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemProviderInit_FWD_DEFINED__
 #define __IWbemProviderInit_FWD_DEFINED__
 typedef interface IWbemProviderInit IWbemProviderInit;
+#ifdef __cplusplus
+interface IWbemProviderInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemHiPerfProvider_FWD_DEFINED__
 #define __IWbemHiPerfProvider_FWD_DEFINED__
 typedef interface IWbemHiPerfProvider IWbemHiPerfProvider;
+#ifdef __cplusplus
+interface IWbemHiPerfProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemDecoupledRegistrar_FWD_DEFINED__
 #define __IWbemDecoupledRegistrar_FWD_DEFINED__
 typedef interface IWbemDecoupledRegistrar IWbemDecoupledRegistrar;
+#ifdef __cplusplus
+interface IWbemDecoupledRegistrar;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemDecoupledBasicEventProvider_FWD_DEFINED__
 #define __IWbemDecoupledBasicEventProvider_FWD_DEFINED__
 typedef interface IWbemDecoupledBasicEventProvider IWbemDecoupledBasicEventProvider;
+#ifdef __cplusplus
+interface IWbemDecoupledBasicEventProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventSink_FWD_DEFINED__
 #define __IWbemEventSink_FWD_DEFINED__
 typedef interface IWbemEventSink IWbemEventSink;
+#ifdef __cplusplus
+interface IWbemEventSink;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -157,51 +196,81 @@
 #ifndef __IWbemPropertyProvider_FWD_DEFINED__
 #define __IWbemPropertyProvider_FWD_DEFINED__
 typedef interface IWbemPropertyProvider IWbemPropertyProvider;
+#ifdef __cplusplus
+interface IWbemPropertyProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemUnboundObjectSink_FWD_DEFINED__
 #define __IWbemUnboundObjectSink_FWD_DEFINED__
 typedef interface IWbemUnboundObjectSink IWbemUnboundObjectSink;
+#ifdef __cplusplus
+interface IWbemUnboundObjectSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventProvider_FWD_DEFINED__
 #define __IWbemEventProvider_FWD_DEFINED__
 typedef interface IWbemEventProvider IWbemEventProvider;
+#ifdef __cplusplus
+interface IWbemEventProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventProviderQuerySink_FWD_DEFINED__
 #define __IWbemEventProviderQuerySink_FWD_DEFINED__
 typedef interface IWbemEventProviderQuerySink IWbemEventProviderQuerySink;
+#ifdef __cplusplus
+interface IWbemEventProviderQuerySink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventProviderSecurity_FWD_DEFINED__
 #define __IWbemEventProviderSecurity_FWD_DEFINED__
 typedef interface IWbemEventProviderSecurity IWbemEventProviderSecurity;
+#ifdef __cplusplus
+interface IWbemEventProviderSecurity;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemEventConsumerProvider_FWD_DEFINED__
 #define __IWbemEventConsumerProvider_FWD_DEFINED__
 typedef interface IWbemEventConsumerProvider IWbemEventConsumerProvider;
+#ifdef __cplusplus
+interface IWbemEventConsumerProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemProviderInitSink_FWD_DEFINED__
 #define __IWbemProviderInitSink_FWD_DEFINED__
 typedef interface IWbemProviderInitSink IWbemProviderInitSink;
+#ifdef __cplusplus
+interface IWbemProviderInitSink;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemProviderInit_FWD_DEFINED__
 #define __IWbemProviderInit_FWD_DEFINED__
 typedef interface IWbemProviderInit IWbemProviderInit;
+#ifdef __cplusplus
+interface IWbemProviderInit;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemHiPerfProvider_FWD_DEFINED__
 #define __IWbemHiPerfProvider_FWD_DEFINED__
 typedef interface IWbemHiPerfProvider IWbemHiPerfProvider;
+#ifdef __cplusplus
+interface IWbemHiPerfProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemDecoupledRegistrar_FWD_DEFINED__
 #define __IWbemDecoupledRegistrar_FWD_DEFINED__
 typedef interface IWbemDecoupledRegistrar IWbemDecoupledRegistrar;
+#ifdef __cplusplus
+interface IWbemDecoupledRegistrar;
+#endif /* __cplusplus */
 #endif
 
 
@@ -314,25 +383,26 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemUnboundObjectSink* This,
+        IWbemUnboundObjectSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemUnboundObjectSink* This);
+        IWbemUnboundObjectSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemUnboundObjectSink* This);
+        IWbemUnboundObjectSink *This);
 
     /*** IWbemUnboundObjectSink methods ***/
     HRESULT (STDMETHODCALLTYPE *IndicateToConsumer)(
-        IWbemUnboundObjectSink* This,
+        IWbemUnboundObjectSink *This,
         IWbemClassObject *pLogicalConsumer,
         LONG lNumObjects,
         IWbemClassObject **apObjects);
 
     END_INTERFACE
 } IWbemUnboundObjectSinkVtbl;
+
 interface IWbemUnboundObjectSink {
     CONST_VTBL IWbemUnboundObjectSinkVtbl* lpVtbl;
 };
@@ -365,16 +435,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemUnboundObjectSink_IndicateToConsumer_Proxy(
-    IWbemUnboundObjectSink* This,
-    IWbemClassObject *pLogicalConsumer,
-    LONG lNumObjects,
-    IWbemClassObject **apObjects);
-void __RPC_STUB IWbemUnboundObjectSink_IndicateToConsumer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemUnboundObjectSink_INTERFACE_DEFINED__ */
 
@@ -415,19 +475,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemPropertyProvider* This,
+        IWbemPropertyProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemPropertyProvider* This);
+        IWbemPropertyProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemPropertyProvider* This);
+        IWbemPropertyProvider *This);
 
     /*** IWbemPropertyProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *GetProperty)(
-        IWbemPropertyProvider* This,
+        IWbemPropertyProvider *This,
         LONG lFlags,
         const BSTR strLocale,
         const BSTR strClassMapping,
@@ -436,7 +496,7 @@
         VARIANT *pvValue);
 
     HRESULT (STDMETHODCALLTYPE *PutProperty)(
-        IWbemPropertyProvider* This,
+        IWbemPropertyProvider *This,
         LONG lFlags,
         const BSTR strLocale,
         const BSTR strClassMapping,
@@ -446,6 +506,7 @@
 
     END_INTERFACE
 } IWbemPropertyProviderVtbl;
+
 interface IWbemPropertyProvider {
     CONST_VTBL IWbemPropertyProviderVtbl* lpVtbl;
 };
@@ -482,32 +543,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemPropertyProvider_GetProperty_Proxy(
-    IWbemPropertyProvider* This,
-    LONG lFlags,
-    const BSTR strLocale,
-    const BSTR strClassMapping,
-    const BSTR strInstMapping,
-    const BSTR strPropMapping,
-    VARIANT *pvValue);
-void __RPC_STUB IWbemPropertyProvider_GetProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemPropertyProvider_PutProperty_Proxy(
-    IWbemPropertyProvider* This,
-    LONG lFlags,
-    const BSTR strLocale,
-    const BSTR strClassMapping,
-    const BSTR strInstMapping,
-    const BSTR strPropMapping,
-    const VARIANT *pvValue);
-void __RPC_STUB IWbemPropertyProvider_PutProperty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemPropertyProvider_INTERFACE_DEFINED__ */
 
@@ -536,24 +571,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemEventProvider* This,
+        IWbemEventProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemEventProvider* This);
+        IWbemEventProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemEventProvider* This);
+        IWbemEventProvider *This);
 
     /*** IWbemEventProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *ProvideEvents)(
-        IWbemEventProvider* This,
+        IWbemEventProvider *This,
         IWbemObjectSink *pSink,
         LONG lFlags);
 
     END_INTERFACE
 } IWbemEventProviderVtbl;
+
 interface IWbemEventProvider {
     CONST_VTBL IWbemEventProviderVtbl* lpVtbl;
 };
@@ -586,15 +622,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemEventProvider_ProvideEvents_Proxy(
-    IWbemEventProvider* This,
-    IWbemObjectSink *pSink,
-    LONG lFlags);
-void __RPC_STUB IWbemEventProvider_ProvideEvents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemEventProvider_INTERFACE_DEFINED__ */
 
@@ -627,29 +654,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemEventProviderQuerySink* This,
+        IWbemEventProviderQuerySink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemEventProviderQuerySink* This);
+        IWbemEventProviderQuerySink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemEventProviderQuerySink* This);
+        IWbemEventProviderQuerySink *This);
 
     /*** IWbemEventProviderQuerySink methods ***/
     HRESULT (STDMETHODCALLTYPE *NewQuery)(
-        IWbemEventProviderQuerySink* This,
+        IWbemEventProviderQuerySink *This,
         ULONG dwId,
         WBEM_WSTR wszQueryLanguage,
         WBEM_WSTR wszQuery);
 
     HRESULT (STDMETHODCALLTYPE *CancelQuery)(
-        IWbemEventProviderQuerySink* This,
+        IWbemEventProviderQuerySink *This,
         ULONG dwId);
 
     END_INTERFACE
 } IWbemEventProviderQuerySinkVtbl;
+
 interface IWbemEventProviderQuerySink {
     CONST_VTBL IWbemEventProviderQuerySinkVtbl* lpVtbl;
 };
@@ -686,24 +714,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemEventProviderQuerySink_NewQuery_Proxy(
-    IWbemEventProviderQuerySink* This,
-    ULONG dwId,
-    WBEM_WSTR wszQueryLanguage,
-    WBEM_WSTR wszQuery);
-void __RPC_STUB IWbemEventProviderQuerySink_NewQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemEventProviderQuerySink_CancelQuery_Proxy(
-    IWbemEventProviderQuerySink* This,
-    ULONG dwId);
-void __RPC_STUB IWbemEventProviderQuerySink_CancelQuery_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemEventProviderQuerySink_INTERFACE_DEFINED__ */
 
@@ -734,19 +744,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemEventProviderSecurity* This,
+        IWbemEventProviderSecurity *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemEventProviderSecurity* This);
+        IWbemEventProviderSecurity *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemEventProviderSecurity* This);
+        IWbemEventProviderSecurity *This);
 
     /*** IWbemEventProviderSecurity methods ***/
     HRESULT (STDMETHODCALLTYPE *AccessCheck)(
-        IWbemEventProviderSecurity* This,
+        IWbemEventProviderSecurity *This,
         WBEM_CWSTR wszQueryLanguage,
         WBEM_CWSTR wszQuery,
         LONG lSidLength,
@@ -754,6 +764,7 @@
 
     END_INTERFACE
 } IWbemEventProviderSecurityVtbl;
+
 interface IWbemEventProviderSecurity {
     CONST_VTBL IWbemEventProviderSecurityVtbl* lpVtbl;
 };
@@ -786,17 +797,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemEventProviderSecurity_AccessCheck_Proxy(
-    IWbemEventProviderSecurity* This,
-    WBEM_CWSTR wszQueryLanguage,
-    WBEM_CWSTR wszQuery,
-    LONG lSidLength,
-    const BYTE *pSid);
-void __RPC_STUB IWbemEventProviderSecurity_AccessCheck_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemEventProviderSecurity_INTERFACE_DEFINED__ */
 
@@ -825,24 +825,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemProviderIdentity* This,
+        IWbemProviderIdentity *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemProviderIdentity* This);
+        IWbemProviderIdentity *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemProviderIdentity* This);
+        IWbemProviderIdentity *This);
 
     /*** IWbemProviderIdentity methods ***/
     HRESULT (STDMETHODCALLTYPE *SetRegistrationObject)(
-        IWbemProviderIdentity* This,
+        IWbemProviderIdentity *This,
         LONG lFlags,
         IWbemClassObject *pProvReg);
 
     END_INTERFACE
 } IWbemProviderIdentityVtbl;
+
 interface IWbemProviderIdentity {
     CONST_VTBL IWbemProviderIdentityVtbl* lpVtbl;
 };
@@ -875,15 +876,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemProviderIdentity_SetRegistrationObject_Proxy(
-    IWbemProviderIdentity* This,
-    LONG lFlags,
-    IWbemClassObject *pProvReg);
-void __RPC_STUB IWbemProviderIdentity_SetRegistrationObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemProviderIdentity_INTERFACE_DEFINED__ */
 
@@ -912,24 +904,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemEventConsumerProvider* This,
+        IWbemEventConsumerProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemEventConsumerProvider* This);
+        IWbemEventConsumerProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemEventConsumerProvider* This);
+        IWbemEventConsumerProvider *This);
 
     /*** IWbemEventConsumerProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *FindConsumer)(
-        IWbemEventConsumerProvider* This,
+        IWbemEventConsumerProvider *This,
         IWbemClassObject *pLogicalConsumer,
         IWbemUnboundObjectSink **ppConsumer);
 
     END_INTERFACE
 } IWbemEventConsumerProviderVtbl;
+
 interface IWbemEventConsumerProvider {
     CONST_VTBL IWbemEventConsumerProviderVtbl* lpVtbl;
 };
@@ -962,15 +955,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemEventConsumerProvider_FindConsumer_Proxy(
-    IWbemEventConsumerProvider* This,
-    IWbemClassObject *pLogicalConsumer,
-    IWbemUnboundObjectSink **ppConsumer);
-void __RPC_STUB IWbemEventConsumerProvider_FindConsumer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemEventConsumerProvider_INTERFACE_DEFINED__ */
 
@@ -999,24 +983,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemProviderInitSink* This,
+        IWbemProviderInitSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemProviderInitSink* This);
+        IWbemProviderInitSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemProviderInitSink* This);
+        IWbemProviderInitSink *This);
 
     /*** IWbemProviderInitSink methods ***/
     HRESULT (STDMETHODCALLTYPE *SetStatus)(
-        IWbemProviderInitSink* This,
+        IWbemProviderInitSink *This,
         LONG lStatus,
         LONG lFlags);
 
     END_INTERFACE
 } IWbemProviderInitSinkVtbl;
+
 interface IWbemProviderInitSink {
     CONST_VTBL IWbemProviderInitSinkVtbl* lpVtbl;
 };
@@ -1049,15 +1034,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemProviderInitSink_SetStatus_Proxy(
-    IWbemProviderInitSink* This,
-    LONG lStatus,
-    LONG lFlags);
-void __RPC_STUB IWbemProviderInitSink_SetStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemProviderInitSink_INTERFACE_DEFINED__ */
 
@@ -1091,19 +1067,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemProviderInit* This,
+        IWbemProviderInit *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemProviderInit* This);
+        IWbemProviderInit *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemProviderInit* This);
+        IWbemProviderInit *This);
 
     /*** IWbemProviderInit methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWbemProviderInit* This,
+        IWbemProviderInit *This,
         LPWSTR wszUser,
         LONG lFlags,
         LPWSTR wszNamespace,
@@ -1114,6 +1090,7 @@
 
     END_INTERFACE
 } IWbemProviderInitVtbl;
+
 interface IWbemProviderInit {
     CONST_VTBL IWbemProviderInitVtbl* lpVtbl;
 };
@@ -1146,20 +1123,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemProviderInit_Initialize_Proxy(
-    IWbemProviderInit* This,
-    LPWSTR wszUser,
-    LONG lFlags,
-    LPWSTR wszNamespace,
-    LPWSTR wszLocale,
-    IWbemServices *pNamespace,
-    IWbemContext *pCtx,
-    IWbemProviderInitSink *pInitSink);
-void __RPC_STUB IWbemProviderInit_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemProviderInit_INTERFACE_DEFINED__ */
 
@@ -1226,19 +1189,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemHiPerfProvider* This,
+        IWbemHiPerfProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemHiPerfProvider* This);
+        IWbemHiPerfProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemHiPerfProvider* This);
+        IWbemHiPerfProvider *This);
 
     /*** IWbemHiPerfProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInstances)(
-        IWbemHiPerfProvider* This,
+        IWbemHiPerfProvider *This,
         IWbemServices *pNamespace,
         WCHAR *wszClass,
         LONG lFlags,
@@ -1246,13 +1209,13 @@
         IWbemObjectSink *pSink);
 
     HRESULT (STDMETHODCALLTYPE *CreateRefresher)(
-        IWbemHiPerfProvider* This,
+        IWbemHiPerfProvider *This,
         IWbemServices *pNamespace,
         LONG lFlags,
         IWbemRefresher **ppRefresher);
 
     HRESULT (STDMETHODCALLTYPE *CreateRefreshableObject)(
-        IWbemHiPerfProvider* This,
+        IWbemHiPerfProvider *This,
         IWbemServices *pNamespace,
         IWbemObjectAccess *pTemplate,
         IWbemRefresher *pRefresher,
@@ -1262,13 +1225,13 @@
         LONG *plId);
 
     HRESULT (STDMETHODCALLTYPE *StopRefreshing)(
-        IWbemHiPerfProvider* This,
+        IWbemHiPerfProvider *This,
         IWbemRefresher *pRefresher,
         LONG lId,
         LONG lFlags);
 
     HRESULT (STDMETHODCALLTYPE *CreateRefreshableEnum)(
-        IWbemHiPerfProvider* This,
+        IWbemHiPerfProvider *This,
         IWbemServices *pNamespace,
         LPCWSTR wszClass,
         IWbemRefresher *pRefresher,
@@ -1278,7 +1241,7 @@
         LONG *plId);
 
     HRESULT (STDMETHODCALLTYPE *GetObjects)(
-        IWbemHiPerfProvider* This,
+        IWbemHiPerfProvider *This,
         IWbemServices *pNamespace,
         LONG lNumObjects,
         IWbemObjectAccess **apObj,
@@ -1287,6 +1250,7 @@
 
     END_INTERFACE
 } IWbemHiPerfProviderVtbl;
+
 interface IWbemHiPerfProvider {
     CONST_VTBL IWbemHiPerfProviderVtbl* lpVtbl;
 };
@@ -1339,78 +1303,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_QueryInstances_Proxy(
-    IWbemHiPerfProvider* This,
-    IWbemServices *pNamespace,
-    WCHAR *wszClass,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemObjectSink *pSink);
-void __RPC_STUB IWbemHiPerfProvider_QueryInstances_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_CreateRefresher_Proxy(
-    IWbemHiPerfProvider* This,
-    IWbemServices *pNamespace,
-    LONG lFlags,
-    IWbemRefresher **ppRefresher);
-void __RPC_STUB IWbemHiPerfProvider_CreateRefresher_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_CreateRefreshableObject_Proxy(
-    IWbemHiPerfProvider* This,
-    IWbemServices *pNamespace,
-    IWbemObjectAccess *pTemplate,
-    IWbemRefresher *pRefresher,
-    LONG lFlags,
-    IWbemContext *pContext,
-    IWbemObjectAccess **ppRefreshable,
-    LONG *plId);
-void __RPC_STUB IWbemHiPerfProvider_CreateRefreshableObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_StopRefreshing_Proxy(
-    IWbemHiPerfProvider* This,
-    IWbemRefresher *pRefresher,
-    LONG lId,
-    LONG lFlags);
-void __RPC_STUB IWbemHiPerfProvider_StopRefreshing_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_CreateRefreshableEnum_Proxy(
-    IWbemHiPerfProvider* This,
-    IWbemServices *pNamespace,
-    LPCWSTR wszClass,
-    IWbemRefresher *pRefresher,
-    LONG lFlags,
-    IWbemContext *pContext,
-    IWbemHiPerfEnum *pHiPerfEnum,
-    LONG *plId);
-void __RPC_STUB IWbemHiPerfProvider_CreateRefreshableEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemHiPerfProvider_GetObjects_Proxy(
-    IWbemHiPerfProvider* This,
-    IWbemServices *pNamespace,
-    LONG lNumObjects,
-    IWbemObjectAccess **apObj,
-    LONG lFlags,
-    IWbemContext *pContext);
-void __RPC_STUB IWbemHiPerfProvider_GetObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemHiPerfProvider_INTERFACE_DEFINED__ */
 
@@ -1447,19 +1339,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemDecoupledRegistrar* This,
+        IWbemDecoupledRegistrar *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemDecoupledRegistrar* This);
+        IWbemDecoupledRegistrar *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemDecoupledRegistrar* This);
+        IWbemDecoupledRegistrar *This);
 
     /*** IWbemDecoupledRegistrar methods ***/
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IWbemDecoupledRegistrar* This,
+        IWbemDecoupledRegistrar *This,
         LONG a_Flags,
         IWbemContext *a_Context,
         LPCWSTR a_User,
@@ -1469,10 +1361,11 @@
         IUnknown *pIUnknown);
 
     HRESULT (STDMETHODCALLTYPE *UnRegister)(
-        IWbemDecoupledRegistrar* This);
+        IWbemDecoupledRegistrar *This);
 
     END_INTERFACE
 } IWbemDecoupledRegistrarVtbl;
+
 interface IWbemDecoupledRegistrar {
     CONST_VTBL IWbemDecoupledRegistrarVtbl* lpVtbl;
 };
@@ -1509,27 +1402,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemDecoupledRegistrar_Register_Proxy(
-    IWbemDecoupledRegistrar* This,
-    LONG a_Flags,
-    IWbemContext *a_Context,
-    LPCWSTR a_User,
-    LPCWSTR a_Locale,
-    LPCWSTR a_Scope,
-    LPCWSTR a_Registration,
-    IUnknown *pIUnknown);
-void __RPC_STUB IWbemDecoupledRegistrar_Register_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemDecoupledRegistrar_UnRegister_Proxy(
-    IWbemDecoupledRegistrar* This);
-void __RPC_STUB IWbemDecoupledRegistrar_UnRegister_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemDecoupledRegistrar_INTERFACE_DEFINED__ */
 
@@ -1564,19 +1436,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemDecoupledBasicEventProvider* This,
+        IWbemDecoupledBasicEventProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemDecoupledBasicEventProvider* This);
+        IWbemDecoupledBasicEventProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemDecoupledBasicEventProvider* This);
+        IWbemDecoupledBasicEventProvider *This);
 
     /*** IWbemDecoupledRegistrar methods ***/
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IWbemDecoupledBasicEventProvider* This,
+        IWbemDecoupledBasicEventProvider *This,
         LONG a_Flags,
         IWbemContext *a_Context,
         LPCWSTR a_User,
@@ -1586,23 +1458,24 @@
         IUnknown *pIUnknown);
 
     HRESULT (STDMETHODCALLTYPE *UnRegister)(
-        IWbemDecoupledBasicEventProvider* This);
+        IWbemDecoupledBasicEventProvider *This);
 
     /*** IWbemDecoupledBasicEventProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSink)(
-        IWbemDecoupledBasicEventProvider* This,
+        IWbemDecoupledBasicEventProvider *This,
         LONG a_Flags,
         IWbemContext *a_Context,
         IWbemObjectSink **a_Sink);
 
     HRESULT (STDMETHODCALLTYPE *GetService)(
-        IWbemDecoupledBasicEventProvider* This,
+        IWbemDecoupledBasicEventProvider *This,
         LONG a_Flags,
         IWbemContext *a_Context,
         IWbemServices **a_Service);
 
     END_INTERFACE
 } IWbemDecoupledBasicEventProviderVtbl;
+
 interface IWbemDecoupledBasicEventProvider {
     CONST_VTBL IWbemDecoupledBasicEventProviderVtbl* lpVtbl;
 };
@@ -1649,26 +1522,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemDecoupledBasicEventProvider_GetSink_Proxy(
-    IWbemDecoupledBasicEventProvider* This,
-    LONG a_Flags,
-    IWbemContext *a_Context,
-    IWbemObjectSink **a_Sink);
-void __RPC_STUB IWbemDecoupledBasicEventProvider_GetSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemDecoupledBasicEventProvider_GetService_Proxy(
-    IWbemDecoupledBasicEventProvider* This,
-    LONG a_Flags,
-    IWbemContext *a_Context,
-    IWbemServices **a_Service);
-void __RPC_STUB IWbemDecoupledBasicEventProvider_GetService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemDecoupledBasicEventProvider_INTERFACE_DEFINED__ */
 
@@ -1711,24 +1564,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemEventSink* This,
+        IWbemEventSink *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemEventSink* This);
+        IWbemEventSink *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemEventSink* This);
+        IWbemEventSink *This);
 
     /*** IWbemObjectSink methods ***/
     HRESULT (STDMETHODCALLTYPE *Indicate)(
-        IWbemEventSink* This,
+        IWbemEventSink *This,
         LONG lObjectCount,
         IWbemClassObject **apObjArray);
 
     HRESULT (STDMETHODCALLTYPE *SetStatus)(
-        IWbemEventSink* This,
+        IWbemEventSink *This,
         LONG lFlags,
         HRESULT hResult,
         BSTR strParam,
@@ -1736,28 +1589,29 @@
 
     /*** IWbemEventSink methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSinkSecurity)(
-        IWbemEventSink* This,
+        IWbemEventSink *This,
         LONG lSDLength,
         BYTE *pSD);
 
     HRESULT (STDMETHODCALLTYPE *IsActive)(
-        IWbemEventSink* This);
+        IWbemEventSink *This);
 
     HRESULT (STDMETHODCALLTYPE *GetRestrictedSink)(
-        IWbemEventSink* This,
+        IWbemEventSink *This,
         LONG lNumQueries,
         const LPCWSTR *awszQueries,
         IUnknown *pCallback,
         IWbemEventSink **ppSink);
 
     HRESULT (STDMETHODCALLTYPE *SetBatchingParameters)(
-        IWbemEventSink* This,
+        IWbemEventSink *This,
         LONG lFlags,
         DWORD dwMaxBufferSize,
         DWORD dwMaxSendLatency);
 
     END_INTERFACE
 } IWbemEventSinkVtbl;
+
 interface IWbemEventSink {
     CONST_VTBL IWbemEventSinkVtbl* lpVtbl;
 };
@@ -1812,43 +1666,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemEventSink_SetSinkSecurity_Proxy(
-    IWbemEventSink* This,
-    LONG lSDLength,
-    BYTE *pSD);
-void __RPC_STUB IWbemEventSink_SetSinkSecurity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemEventSink_IsActive_Proxy(
-    IWbemEventSink* This);
-void __RPC_STUB IWbemEventSink_IsActive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemEventSink_GetRestrictedSink_Proxy(
-    IWbemEventSink* This,
-    LONG lNumQueries,
-    const LPCWSTR *awszQueries,
-    IUnknown *pCallback,
-    IWbemEventSink **ppSink);
-void __RPC_STUB IWbemEventSink_GetRestrictedSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemEventSink_SetBatchingParameters_Proxy(
-    IWbemEventSink* This,
-    LONG lFlags,
-    DWORD dwMaxBufferSize,
-    DWORD dwMaxSendLatency);
-void __RPC_STUB IWbemEventSink_SetBatchingParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemEventSink_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wbemtran.h b/mingw-w64-headers/include/wbemtran.h
index 6e62803..d077fb7 100644
--- a/mingw-w64-headers/include/wbemtran.h
+++ b/mingw-w64-headers/include/wbemtran.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wbemtran.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wbemtran.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -56,36 +56,57 @@
 #ifndef __IWbemLevel1Login_FWD_DEFINED__
 #define __IWbemLevel1Login_FWD_DEFINED__
 typedef interface IWbemLevel1Login IWbemLevel1Login;
+#ifdef __cplusplus
+interface IWbemLevel1Login;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemConnectorLogin_FWD_DEFINED__
 #define __IWbemConnectorLogin_FWD_DEFINED__
 typedef interface IWbemConnectorLogin IWbemConnectorLogin;
+#ifdef __cplusplus
+interface IWbemConnectorLogin;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemAddressResolution_FWD_DEFINED__
 #define __IWbemAddressResolution_FWD_DEFINED__
 typedef interface IWbemAddressResolution IWbemAddressResolution;
+#ifdef __cplusplus
+interface IWbemAddressResolution;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemTransport_FWD_DEFINED__
 #define __IWbemTransport_FWD_DEFINED__
 typedef interface IWbemTransport IWbemTransport;
+#ifdef __cplusplus
+interface IWbemTransport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemConstructClassObject_FWD_DEFINED__
 #define __IWbemConstructClassObject_FWD_DEFINED__
 typedef interface IWbemConstructClassObject IWbemConstructClassObject;
+#ifdef __cplusplus
+interface IWbemConstructClassObject;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemClientTransport_FWD_DEFINED__
 #define __IWbemClientTransport_FWD_DEFINED__
 typedef interface IWbemClientTransport IWbemClientTransport;
+#ifdef __cplusplus
+interface IWbemClientTransport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemClientConnectionTransport_FWD_DEFINED__
 #define __IWbemClientConnectionTransport_FWD_DEFINED__
 typedef interface IWbemClientConnectionTransport IWbemClientConnectionTransport;
+#ifdef __cplusplus
+interface IWbemClientConnectionTransport;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -110,31 +131,49 @@
 #ifndef __IWbemTransport_FWD_DEFINED__
 #define __IWbemTransport_FWD_DEFINED__
 typedef interface IWbemTransport IWbemTransport;
+#ifdef __cplusplus
+interface IWbemTransport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemLevel1Login_FWD_DEFINED__
 #define __IWbemLevel1Login_FWD_DEFINED__
 typedef interface IWbemLevel1Login IWbemLevel1Login;
+#ifdef __cplusplus
+interface IWbemLevel1Login;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemConnectorLogin_FWD_DEFINED__
 #define __IWbemConnectorLogin_FWD_DEFINED__
 typedef interface IWbemConnectorLogin IWbemConnectorLogin;
+#ifdef __cplusplus
+interface IWbemConnectorLogin;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemAddressResolution_FWD_DEFINED__
 #define __IWbemAddressResolution_FWD_DEFINED__
 typedef interface IWbemAddressResolution IWbemAddressResolution;
+#ifdef __cplusplus
+interface IWbemAddressResolution;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemClientTransport_FWD_DEFINED__
 #define __IWbemClientTransport_FWD_DEFINED__
 typedef interface IWbemClientTransport IWbemClientTransport;
+#ifdef __cplusplus
+interface IWbemClientTransport;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWbemClientConnectionTransport_FWD_DEFINED__
 #define __IWbemClientConnectionTransport_FWD_DEFINED__
 typedef interface IWbemClientConnectionTransport IWbemClientConnectionTransport;
+#ifdef __cplusplus
+interface IWbemClientConnectionTransport;
+#endif /* __cplusplus */
 #endif
 
 typedef enum tag_WBEM_LOGIN_TYPE {
@@ -245,31 +284,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemLevel1Login* This,
+        IWbemLevel1Login *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemLevel1Login* This);
+        IWbemLevel1Login *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemLevel1Login* This);
+        IWbemLevel1Login *This);
 
     /*** IWbemLevel1Login methods ***/
     HRESULT (STDMETHODCALLTYPE *EstablishPosition)(
-        IWbemLevel1Login* This,
+        IWbemLevel1Login *This,
         LPWSTR wszLocaleList,
         DWORD dwNumLocales,
         DWORD *reserved);
 
     HRESULT (STDMETHODCALLTYPE *RequestChallenge)(
-        IWbemLevel1Login* This,
+        IWbemLevel1Login *This,
         LPWSTR wszNetworkResource,
         LPWSTR wszUser,
         WBEM_128BITS Nonce);
 
     HRESULT (STDMETHODCALLTYPE *WBEMLogin)(
-        IWbemLevel1Login* This,
+        IWbemLevel1Login *This,
         LPWSTR wszPreferredLocale,
         WBEM_128BITS AccessToken,
         LONG lFlags,
@@ -277,7 +316,7 @@
         IWbemServices **ppNamespace);
 
     HRESULT (STDMETHODCALLTYPE *NTLMLogin)(
-        IWbemLevel1Login* This,
+        IWbemLevel1Login *This,
         LPWSTR wszNetworkResource,
         LPWSTR wszPreferredLocale,
         LONG lFlags,
@@ -286,6 +325,7 @@
 
     END_INTERFACE
 } IWbemLevel1LoginVtbl;
+
 interface IWbemLevel1Login {
     CONST_VTBL IWbemLevel1LoginVtbl* lpVtbl;
 };
@@ -330,50 +370,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemLevel1Login_EstablishPosition_Proxy(
-    IWbemLevel1Login* This,
-    LPWSTR wszLocaleList,
-    DWORD dwNumLocales,
-    DWORD *reserved);
-void __RPC_STUB IWbemLevel1Login_EstablishPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemLevel1Login_RequestChallenge_Proxy(
-    IWbemLevel1Login* This,
-    LPWSTR wszNetworkResource,
-    LPWSTR wszUser,
-    WBEM_128BITS Nonce);
-void __RPC_STUB IWbemLevel1Login_RequestChallenge_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemLevel1Login_WBEMLogin_Proxy(
-    IWbemLevel1Login* This,
-    LPWSTR wszPreferredLocale,
-    WBEM_128BITS AccessToken,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemServices **ppNamespace);
-void __RPC_STUB IWbemLevel1Login_WBEMLogin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemLevel1Login_NTLMLogin_Proxy(
-    IWbemLevel1Login* This,
-    LPWSTR wszNetworkResource,
-    LPWSTR wszPreferredLocale,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    IWbemServices **ppNamespace);
-void __RPC_STUB IWbemLevel1Login_NTLMLogin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemLevel1Login_INTERFACE_DEFINED__ */
 
@@ -406,19 +402,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemConnectorLogin* This,
+        IWbemConnectorLogin *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemConnectorLogin* This);
+        IWbemConnectorLogin *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemConnectorLogin* This);
+        IWbemConnectorLogin *This);
 
     /*** IWbemConnectorLogin methods ***/
     HRESULT (STDMETHODCALLTYPE *ConnectorLogin)(
-        IWbemConnectorLogin* This,
+        IWbemConnectorLogin *This,
         LPWSTR wszNetworkResource,
         LPWSTR wszPreferredLocale,
         LONG lFlags,
@@ -428,6 +424,7 @@
 
     END_INTERFACE
 } IWbemConnectorLoginVtbl;
+
 interface IWbemConnectorLogin {
     CONST_VTBL IWbemConnectorLoginVtbl* lpVtbl;
 };
@@ -460,19 +457,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemConnectorLogin_ConnectorLogin_Proxy(
-    IWbemConnectorLogin* This,
-    LPWSTR wszNetworkResource,
-    LPWSTR wszPreferredLocale,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    REFIID riid,
-    void **pInterface);
-void __RPC_STUB IWbemConnectorLogin_ConnectorLogin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemConnectorLogin_INTERFACE_DEFINED__ */
 
@@ -503,19 +487,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemAddressResolution* This,
+        IWbemAddressResolution *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemAddressResolution* This);
+        IWbemAddressResolution *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemAddressResolution* This);
+        IWbemAddressResolution *This);
 
     /*** IWbemAddressResolution methods ***/
     HRESULT (STDMETHODCALLTYPE *Resolve)(
-        IWbemAddressResolution* This,
+        IWbemAddressResolution *This,
         LPWSTR wszNamespacePath,
         LPWSTR wszAddressType,
         DWORD *pdwAddressLength,
@@ -523,6 +507,7 @@
 
     END_INTERFACE
 } IWbemAddressResolutionVtbl;
+
 interface IWbemAddressResolution {
     CONST_VTBL IWbemAddressResolutionVtbl* lpVtbl;
 };
@@ -555,17 +540,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemAddressResolution_Resolve_Proxy(
-    IWbemAddressResolution* This,
-    LPWSTR wszNamespacePath,
-    LPWSTR wszAddressType,
-    DWORD *pdwAddressLength,
-    BYTE **pabBinaryAddress);
-void __RPC_STUB IWbemAddressResolution_Resolve_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemAddressResolution_INTERFACE_DEFINED__ */
 
@@ -593,22 +567,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemTransport* This,
+        IWbemTransport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemTransport* This);
+        IWbemTransport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemTransport* This);
+        IWbemTransport *This);
 
     /*** IWbemTransport methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWbemTransport* This);
+        IWbemTransport *This);
 
     END_INTERFACE
 } IWbemTransportVtbl;
+
 interface IWbemTransport {
     CONST_VTBL IWbemTransportVtbl* lpVtbl;
 };
@@ -641,13 +616,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemTransport_Initialize_Proxy(
-    IWbemTransport* This);
-void __RPC_STUB IWbemTransport_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemTransport_INTERFACE_DEFINED__ */
 
@@ -688,39 +656,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemConstructClassObject* This,
+        IWbemConstructClassObject *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemConstructClassObject* This);
+        IWbemConstructClassObject *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemConstructClassObject* This);
+        IWbemConstructClassObject *This);
 
     /*** IWbemConstructClassObject methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInheritanceChain)(
-        IWbemConstructClassObject* This,
+        IWbemConstructClassObject *This,
         LONG lNumAntecedents,
         LPWSTR *awszAntecedents);
 
     HRESULT (STDMETHODCALLTYPE *SetPropertyOrigin)(
-        IWbemConstructClassObject* This,
+        IWbemConstructClassObject *This,
         LPCWSTR wszPropertyName,
         LONG lOriginIndex);
 
     HRESULT (STDMETHODCALLTYPE *SetMethodOrigin)(
-        IWbemConstructClassObject* This,
+        IWbemConstructClassObject *This,
         LPCWSTR wszMethodName,
         LONG lOriginIndex);
 
     HRESULT (STDMETHODCALLTYPE *SetServerNamespace)(
-        IWbemConstructClassObject* This,
+        IWbemConstructClassObject *This,
         LPCWSTR wszServer,
         LPCWSTR wszNamespace);
 
     END_INTERFACE
 } IWbemConstructClassObjectVtbl;
+
 interface IWbemConstructClassObject {
     CONST_VTBL IWbemConstructClassObjectVtbl* lpVtbl;
 };
@@ -765,42 +734,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetInheritanceChain_Proxy(
-    IWbemConstructClassObject* This,
-    LONG lNumAntecedents,
-    LPWSTR *awszAntecedents);
-void __RPC_STUB IWbemConstructClassObject_SetInheritanceChain_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetPropertyOrigin_Proxy(
-    IWbemConstructClassObject* This,
-    LPCWSTR wszPropertyName,
-    LONG lOriginIndex);
-void __RPC_STUB IWbemConstructClassObject_SetPropertyOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetMethodOrigin_Proxy(
-    IWbemConstructClassObject* This,
-    LPCWSTR wszMethodName,
-    LONG lOriginIndex);
-void __RPC_STUB IWbemConstructClassObject_SetMethodOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemConstructClassObject_SetServerNamespace_Proxy(
-    IWbemConstructClassObject* This,
-    LPCWSTR wszServer,
-    LPCWSTR wszNamespace);
-void __RPC_STUB IWbemConstructClassObject_SetServerNamespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemConstructClassObject_INTERFACE_DEFINED__ */
 
@@ -838,19 +771,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemClientTransport* This,
+        IWbemClientTransport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemClientTransport* This);
+        IWbemClientTransport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemClientTransport* This);
+        IWbemClientTransport *This);
 
     /*** IWbemClientTransport methods ***/
     HRESULT (STDMETHODCALLTYPE *ConnectServer)(
-        IWbemClientTransport* This,
+        IWbemClientTransport *This,
         BSTR strAddressType,
         DWORD dwBinaryAddressLength,
         BYTE *abBinaryAddress,
@@ -865,6 +798,7 @@
 
     END_INTERFACE
 } IWbemClientTransportVtbl;
+
 interface IWbemClientTransport {
     CONST_VTBL IWbemClientTransportVtbl* lpVtbl;
 };
@@ -897,24 +831,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemClientTransport_ConnectServer_Proxy(
-    IWbemClientTransport* This,
-    BSTR strAddressType,
-    DWORD dwBinaryAddressLength,
-    BYTE *abBinaryAddress,
-    BSTR strNetworkResource,
-    BSTR strUser,
-    BSTR strPassword,
-    BSTR strLocale,
-    LONG lSecurityFlags,
-    BSTR strAuthority,
-    IWbemContext *pCtx,
-    IWbemServices **ppNamespace);
-void __RPC_STUB IWbemClientTransport_ConnectServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemClientTransport_INTERFACE_DEFINED__ */
 
@@ -970,19 +886,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWbemClientConnectionTransport* This,
+        IWbemClientConnectionTransport *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWbemClientConnectionTransport* This);
+        IWbemClientConnectionTransport *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWbemClientConnectionTransport* This);
+        IWbemClientConnectionTransport *This);
 
     /*** IWbemClientConnectionTransport methods ***/
     HRESULT (STDMETHODCALLTYPE *Open)(
-        IWbemClientConnectionTransport* This,
+        IWbemClientConnectionTransport *This,
         BSTR strAddressType,
         DWORD dwBinaryAddressLength,
         BYTE *abBinaryAddress,
@@ -997,7 +913,7 @@
         IWbemCallResult **pCallRes);
 
     HRESULT (STDMETHODCALLTYPE *OpenAsync)(
-        IWbemClientConnectionTransport* This,
+        IWbemClientConnectionTransport *This,
         BSTR strAddressType,
         DWORD dwBinaryAddressLength,
         BYTE *abBinaryAddress,
@@ -1011,12 +927,13 @@
         IWbemObjectSink *pResponseHandler);
 
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IWbemClientConnectionTransport* This,
+        IWbemClientConnectionTransport *This,
         LONG lFlags,
         IWbemObjectSink *pHandler);
 
     END_INTERFACE
 } IWbemClientConnectionTransportVtbl;
+
 interface IWbemClientConnectionTransport {
     CONST_VTBL IWbemClientConnectionTransportVtbl* lpVtbl;
 };
@@ -1057,52 +974,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWbemClientConnectionTransport_Open_Proxy(
-    IWbemClientConnectionTransport* This,
-    BSTR strAddressType,
-    DWORD dwBinaryAddressLength,
-    BYTE *abBinaryAddress,
-    const BSTR strObject,
-    const BSTR strUser,
-    const BSTR strPassword,
-    const BSTR strLocale,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    REFIID riid,
-    void **pInterface,
-    IWbemCallResult **pCallRes);
-void __RPC_STUB IWbemClientConnectionTransport_Open_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClientConnectionTransport_OpenAsync_Proxy(
-    IWbemClientConnectionTransport* This,
-    BSTR strAddressType,
-    DWORD dwBinaryAddressLength,
-    BYTE *abBinaryAddress,
-    const BSTR strObject,
-    const BSTR strUser,
-    const BSTR strPassword,
-    const BSTR strLocale,
-    LONG lFlags,
-    IWbemContext *pCtx,
-    REFIID riid,
-    IWbemObjectSink *pResponseHandler);
-void __RPC_STUB IWbemClientConnectionTransport_OpenAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWbemClientConnectionTransport_Cancel_Proxy(
-    IWbemClientConnectionTransport* This,
-    LONG lFlags,
-    IWbemObjectSink *pHandler);
-void __RPC_STUB IWbemClientConnectionTransport_Cancel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWbemClientConnectionTransport_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wdstptmgmt.h b/mingw-w64-headers/include/wdstptmgmt.h
index 2ee7f93..b5aef3e 100644
--- a/mingw-w64-headers/include/wdstptmgmt.h
+++ b/mingw-w64-headers/include/wdstptmgmt.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wdstptmgmt.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wdstptmgmt.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,126 +20,201 @@
 #ifndef __IWdsTransportCacheable_FWD_DEFINED__
 #define __IWdsTransportCacheable_FWD_DEFINED__
 typedef interface IWdsTransportCacheable IWdsTransportCacheable;
+#ifdef __cplusplus
+interface IWdsTransportCacheable;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportCollection_FWD_DEFINED__
 #define __IWdsTransportCollection_FWD_DEFINED__
 typedef interface IWdsTransportCollection IWdsTransportCollection;
+#ifdef __cplusplus
+interface IWdsTransportCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportConfigurationManager_FWD_DEFINED__
 #define __IWdsTransportConfigurationManager_FWD_DEFINED__
 typedef interface IWdsTransportConfigurationManager IWdsTransportConfigurationManager;
+#ifdef __cplusplus
+interface IWdsTransportConfigurationManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__
 #define __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__
 typedef interface IWdsTransportDiagnosticsPolicy IWdsTransportDiagnosticsPolicy;
+#ifdef __cplusplus
+interface IWdsTransportDiagnosticsPolicy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportConfigurationManager2_FWD_DEFINED__
 #define __IWdsTransportConfigurationManager2_FWD_DEFINED__
 typedef interface IWdsTransportConfigurationManager2 IWdsTransportConfigurationManager2;
+#ifdef __cplusplus
+interface IWdsTransportConfigurationManager2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportManager_FWD_DEFINED__
 #define __IWdsTransportManager_FWD_DEFINED__
 typedef interface IWdsTransportManager IWdsTransportManager;
+#ifdef __cplusplus
+interface IWdsTransportManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespace_FWD_DEFINED__
 #define __IWdsTransportNamespace_FWD_DEFINED__
 typedef interface IWdsTransportNamespace IWdsTransportNamespace;
+#ifdef __cplusplus
+interface IWdsTransportNamespace;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceAutoCast_FWD_DEFINED__
 #define __IWdsTransportNamespaceAutoCast_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceAutoCast IWdsTransportNamespaceAutoCast;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceAutoCast;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__
 #define __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceScheduledCast IWdsTransportNamespaceScheduledCast;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceScheduledCast;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__
 #define __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceScheduledCastManualStart IWdsTransportNamespaceScheduledCastManualStart;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceScheduledCastManualStart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__
 #define __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceScheduledCastAutoStart IWdsTransportNamespaceScheduledCastAutoStart;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceScheduledCastAutoStart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceManager_FWD_DEFINED__
 #define __IWdsTransportNamespaceManager_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceManager IWdsTransportNamespaceManager;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServer_FWD_DEFINED__
 #define __IWdsTransportServer_FWD_DEFINED__
 typedef interface IWdsTransportServer IWdsTransportServer;
+#ifdef __cplusplus
+interface IWdsTransportServer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServer2_FWD_DEFINED__
 #define __IWdsTransportServer2_FWD_DEFINED__
 typedef interface IWdsTransportServer2 IWdsTransportServer2;
+#ifdef __cplusplus
+interface IWdsTransportServer2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServicePolicy_FWD_DEFINED__
 #define __IWdsTransportServicePolicy_FWD_DEFINED__
 typedef interface IWdsTransportServicePolicy IWdsTransportServicePolicy;
+#ifdef __cplusplus
+interface IWdsTransportServicePolicy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServicePolicy2_FWD_DEFINED__
 #define __IWdsTransportServicePolicy2_FWD_DEFINED__
 typedef interface IWdsTransportServicePolicy2 IWdsTransportServicePolicy2;
+#ifdef __cplusplus
+interface IWdsTransportServicePolicy2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportSetupManager_FWD_DEFINED__
 #define __IWdsTransportSetupManager_FWD_DEFINED__
 typedef interface IWdsTransportSetupManager IWdsTransportSetupManager;
+#ifdef __cplusplus
+interface IWdsTransportSetupManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportSetupManager2_FWD_DEFINED__
 #define __IWdsTransportSetupManager2_FWD_DEFINED__
 typedef interface IWdsTransportSetupManager2 IWdsTransportSetupManager2;
+#ifdef __cplusplus
+interface IWdsTransportSetupManager2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportTftpManager_FWD_DEFINED__
 #define __IWdsTransportTftpManager_FWD_DEFINED__
 typedef interface IWdsTransportTftpManager IWdsTransportTftpManager;
+#ifdef __cplusplus
+interface IWdsTransportTftpManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__
 #define __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__
 typedef interface IWdsTransportMulticastSessionPolicy IWdsTransportMulticastSessionPolicy;
+#ifdef __cplusplus
+interface IWdsTransportMulticastSessionPolicy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportContent_FWD_DEFINED__
 #define __IWdsTransportContent_FWD_DEFINED__
 typedef interface IWdsTransportContent IWdsTransportContent;
+#ifdef __cplusplus
+interface IWdsTransportContent;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportSession_FWD_DEFINED__
 #define __IWdsTransportSession_FWD_DEFINED__
 typedef interface IWdsTransportSession IWdsTransportSession;
+#ifdef __cplusplus
+interface IWdsTransportSession;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportClient_FWD_DEFINED__
 #define __IWdsTransportClient_FWD_DEFINED__
 typedef interface IWdsTransportClient IWdsTransportClient;
+#ifdef __cplusplus
+interface IWdsTransportClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportTftpClient_FWD_DEFINED__
 #define __IWdsTransportTftpClient_FWD_DEFINED__
 typedef interface IWdsTransportTftpClient IWdsTransportTftpClient;
+#ifdef __cplusplus
+interface IWdsTransportTftpClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportContentProvider_FWD_DEFINED__
 #define __IWdsTransportContentProvider_FWD_DEFINED__
 typedef interface IWdsTransportContentProvider IWdsTransportContentProvider;
+#ifdef __cplusplus
+interface IWdsTransportContentProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __WdsTransportCacheable_FWD_DEFINED__
@@ -348,126 +423,201 @@
 #ifndef __IWdsTransportCacheable_FWD_DEFINED__
 #define __IWdsTransportCacheable_FWD_DEFINED__
 typedef interface IWdsTransportCacheable IWdsTransportCacheable;
+#ifdef __cplusplus
+interface IWdsTransportCacheable;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportClient_FWD_DEFINED__
 #define __IWdsTransportClient_FWD_DEFINED__
 typedef interface IWdsTransportClient IWdsTransportClient;
+#ifdef __cplusplus
+interface IWdsTransportClient;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportCollection_FWD_DEFINED__
 #define __IWdsTransportCollection_FWD_DEFINED__
 typedef interface IWdsTransportCollection IWdsTransportCollection;
+#ifdef __cplusplus
+interface IWdsTransportCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportConfigurationManager_FWD_DEFINED__
 #define __IWdsTransportConfigurationManager_FWD_DEFINED__
 typedef interface IWdsTransportConfigurationManager IWdsTransportConfigurationManager;
+#ifdef __cplusplus
+interface IWdsTransportConfigurationManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportConfigurationManager2_FWD_DEFINED__
 #define __IWdsTransportConfigurationManager2_FWD_DEFINED__
 typedef interface IWdsTransportConfigurationManager2 IWdsTransportConfigurationManager2;
+#ifdef __cplusplus
+interface IWdsTransportConfigurationManager2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportContent_FWD_DEFINED__
 #define __IWdsTransportContent_FWD_DEFINED__
 typedef interface IWdsTransportContent IWdsTransportContent;
+#ifdef __cplusplus
+interface IWdsTransportContent;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportContentProvider_FWD_DEFINED__
 #define __IWdsTransportContentProvider_FWD_DEFINED__
 typedef interface IWdsTransportContentProvider IWdsTransportContentProvider;
+#ifdef __cplusplus
+interface IWdsTransportContentProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__
 #define __IWdsTransportDiagnosticsPolicy_FWD_DEFINED__
 typedef interface IWdsTransportDiagnosticsPolicy IWdsTransportDiagnosticsPolicy;
+#ifdef __cplusplus
+interface IWdsTransportDiagnosticsPolicy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportManager_FWD_DEFINED__
 #define __IWdsTransportManager_FWD_DEFINED__
 typedef interface IWdsTransportManager IWdsTransportManager;
+#ifdef __cplusplus
+interface IWdsTransportManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespace_FWD_DEFINED__
 #define __IWdsTransportNamespace_FWD_DEFINED__
 typedef interface IWdsTransportNamespace IWdsTransportNamespace;
+#ifdef __cplusplus
+interface IWdsTransportNamespace;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceAutoCast_FWD_DEFINED__
 #define __IWdsTransportNamespaceAutoCast_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceAutoCast IWdsTransportNamespaceAutoCast;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceAutoCast;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceManager_FWD_DEFINED__
 #define __IWdsTransportNamespaceManager_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceManager IWdsTransportNamespaceManager;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__
 #define __IWdsTransportNamespaceScheduledCast_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceScheduledCast IWdsTransportNamespaceScheduledCast;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceScheduledCast;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__
 #define __IWdsTransportNamespaceScheduledCastAutoStart_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceScheduledCastAutoStart IWdsTransportNamespaceScheduledCastAutoStart;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceScheduledCastAutoStart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__
 #define __IWdsTransportNamespaceScheduledCastManualStart_FWD_DEFINED__
 typedef interface IWdsTransportNamespaceScheduledCastManualStart IWdsTransportNamespaceScheduledCastManualStart;
+#ifdef __cplusplus
+interface IWdsTransportNamespaceScheduledCastManualStart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServer_FWD_DEFINED__
 #define __IWdsTransportServer_FWD_DEFINED__
 typedef interface IWdsTransportServer IWdsTransportServer;
+#ifdef __cplusplus
+interface IWdsTransportServer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServer2_FWD_DEFINED__
 #define __IWdsTransportServer2_FWD_DEFINED__
 typedef interface IWdsTransportServer2 IWdsTransportServer2;
+#ifdef __cplusplus
+interface IWdsTransportServer2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServicePolicy_FWD_DEFINED__
 #define __IWdsTransportServicePolicy_FWD_DEFINED__
 typedef interface IWdsTransportServicePolicy IWdsTransportServicePolicy;
+#ifdef __cplusplus
+interface IWdsTransportServicePolicy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportServicePolicy2_FWD_DEFINED__
 #define __IWdsTransportServicePolicy2_FWD_DEFINED__
 typedef interface IWdsTransportServicePolicy2 IWdsTransportServicePolicy2;
+#ifdef __cplusplus
+interface IWdsTransportServicePolicy2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportSetupManager_FWD_DEFINED__
 #define __IWdsTransportSetupManager_FWD_DEFINED__
 typedef interface IWdsTransportSetupManager IWdsTransportSetupManager;
+#ifdef __cplusplus
+interface IWdsTransportSetupManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportSetupManager2_FWD_DEFINED__
 #define __IWdsTransportSetupManager2_FWD_DEFINED__
 typedef interface IWdsTransportSetupManager2 IWdsTransportSetupManager2;
+#ifdef __cplusplus
+interface IWdsTransportSetupManager2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportTftpManager_FWD_DEFINED__
 #define __IWdsTransportTftpManager_FWD_DEFINED__
 typedef interface IWdsTransportTftpManager IWdsTransportTftpManager;
+#ifdef __cplusplus
+interface IWdsTransportTftpManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__
 #define __IWdsTransportMulticastSessionPolicy_FWD_DEFINED__
 typedef interface IWdsTransportMulticastSessionPolicy IWdsTransportMulticastSessionPolicy;
+#ifdef __cplusplus
+interface IWdsTransportMulticastSessionPolicy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportSession_FWD_DEFINED__
 #define __IWdsTransportSession_FWD_DEFINED__
 typedef interface IWdsTransportSession IWdsTransportSession;
+#ifdef __cplusplus
+interface IWdsTransportSession;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWdsTransportTftpClient_FWD_DEFINED__
 #define __IWdsTransportTftpClient_FWD_DEFINED__
 typedef interface IWdsTransportTftpClient IWdsTransportTftpClient;
+#ifdef __cplusplus
+interface IWdsTransportTftpClient;
+#endif /* __cplusplus */
 #endif
 
 
@@ -595,29 +745,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportCacheable* This,
+        IWdsTransportCacheable *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportCacheable* This);
+        IWdsTransportCacheable *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportCacheable* This);
+        IWdsTransportCacheable *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportCacheable* This,
+        IWdsTransportCacheable *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportCacheable* This,
+        IWdsTransportCacheable *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportCacheable* This,
+        IWdsTransportCacheable *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -625,7 +775,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportCacheable* This,
+        IWdsTransportCacheable *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -637,20 +787,21 @@
 
     /*** IWdsTransportCacheable methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Dirty)(
-        IWdsTransportCacheable* This,
+        IWdsTransportCacheable *This,
         VARIANT_BOOL *pbDirty);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        IWdsTransportCacheable* This);
+        IWdsTransportCacheable *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportCacheable* This);
+        IWdsTransportCacheable *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWdsTransportCacheable* This);
+        IWdsTransportCacheable *This);
 
     END_INTERFACE
 } IWdsTransportCacheableVtbl;
+
 interface IWdsTransportCacheable {
     CONST_VTBL IWdsTransportCacheableVtbl* lpVtbl;
 };
@@ -713,35 +864,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_get_Dirty_Proxy(
-    IWdsTransportCacheable* This,
-    VARIANT_BOOL *pbDirty);
-void __RPC_STUB IWdsTransportCacheable_get_Dirty_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_Discard_Proxy(
-    IWdsTransportCacheable* This);
-void __RPC_STUB IWdsTransportCacheable_Discard_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_Refresh_Proxy(
-    IWdsTransportCacheable* This);
-void __RPC_STUB IWdsTransportCacheable_Refresh_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportCacheable_Commit_Proxy(
-    IWdsTransportCacheable* This);
-void __RPC_STUB IWdsTransportCacheable_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportCacheable_INTERFACE_DEFINED__ */
 
@@ -777,29 +899,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportCollection* This);
+        IWdsTransportCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportCollection* This);
+        IWdsTransportCollection *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -807,7 +929,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -819,20 +941,21 @@
 
     /*** IWdsTransportCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Count)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         ULONG *pulCount);
 
     HRESULT (STDMETHODCALLTYPE *get_Item)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         ULONG ulIndex,
         IDispatch **ppVal);
 
     HRESULT (STDMETHODCALLTYPE *get__NewEnum)(
-        IWdsTransportCollection* This,
+        IWdsTransportCollection *This,
         IUnknown **ppVal);
 
     END_INTERFACE
 } IWdsTransportCollectionVtbl;
+
 interface IWdsTransportCollection {
     CONST_VTBL IWdsTransportCollectionVtbl* lpVtbl;
 };
@@ -891,31 +1014,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportCollection_get_Count_Proxy(
-    IWdsTransportCollection* This,
-    ULONG *pulCount);
-void __RPC_STUB IWdsTransportCollection_get_Count_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportCollection_get_Item_Proxy(
-    IWdsTransportCollection* This,
-    ULONG ulIndex,
-    IDispatch **ppVal);
-void __RPC_STUB IWdsTransportCollection_get_Item_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportCollection_get__NewEnum_Proxy(
-    IWdsTransportCollection* This,
-    IUnknown **ppVal);
-void __RPC_STUB IWdsTransportCollection_get__NewEnum_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportCollection_INTERFACE_DEFINED__ */
 
@@ -969,29 +1067,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportConfigurationManager* This);
+        IWdsTransportConfigurationManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportConfigurationManager* This);
+        IWdsTransportConfigurationManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -999,7 +1097,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1011,39 +1109,40 @@
 
     /*** IWdsTransportConfigurationManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ServicePolicy)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         IWdsTransportServicePolicy **ppWdsTransportServicePolicy);
 
     HRESULT (STDMETHODCALLTYPE *get_DiagnosticsPolicy)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         IWdsTransportDiagnosticsPolicy **ppWdsTransportDiagnosticsPolicy);
 
     HRESULT (STDMETHODCALLTYPE *get_WdsTransportServicesRunning)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         VARIANT_BOOL bRealtimeStatus,
         VARIANT_BOOL *pbServicesRunning);
 
     HRESULT (STDMETHODCALLTYPE *EnableWdsTransportServices)(
-        IWdsTransportConfigurationManager* This);
+        IWdsTransportConfigurationManager *This);
 
     HRESULT (STDMETHODCALLTYPE *DisableWdsTransportServices)(
-        IWdsTransportConfigurationManager* This);
+        IWdsTransportConfigurationManager *This);
 
     HRESULT (STDMETHODCALLTYPE *StartWdsTransportServices)(
-        IWdsTransportConfigurationManager* This);
+        IWdsTransportConfigurationManager *This);
 
     HRESULT (STDMETHODCALLTYPE *StopWdsTransportServices)(
-        IWdsTransportConfigurationManager* This);
+        IWdsTransportConfigurationManager *This);
 
     HRESULT (STDMETHODCALLTYPE *RestartWdsTransportServices)(
-        IWdsTransportConfigurationManager* This);
+        IWdsTransportConfigurationManager *This);
 
     HRESULT (STDMETHODCALLTYPE *NotifyWdsTransportServices)(
-        IWdsTransportConfigurationManager* This,
+        IWdsTransportConfigurationManager *This,
         WDSTRANSPORT_SERVICE_NOTIFICATION ServiceNotification);
 
     END_INTERFACE
 } IWdsTransportConfigurationManagerVtbl;
+
 interface IWdsTransportConfigurationManager {
     CONST_VTBL IWdsTransportConfigurationManagerVtbl* lpVtbl;
 };
@@ -1126,74 +1225,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_get_ServicePolicy_Proxy(
-    IWdsTransportConfigurationManager* This,
-    IWdsTransportServicePolicy **ppWdsTransportServicePolicy);
-void __RPC_STUB IWdsTransportConfigurationManager_get_ServicePolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_get_DiagnosticsPolicy_Proxy(
-    IWdsTransportConfigurationManager* This,
-    IWdsTransportDiagnosticsPolicy **ppWdsTransportDiagnosticsPolicy);
-void __RPC_STUB IWdsTransportConfigurationManager_get_DiagnosticsPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_get_WdsTransportServicesRunning_Proxy(
-    IWdsTransportConfigurationManager* This,
-    VARIANT_BOOL bRealtimeStatus,
-    VARIANT_BOOL *pbServicesRunning);
-void __RPC_STUB IWdsTransportConfigurationManager_get_WdsTransportServicesRunning_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_EnableWdsTransportServices_Proxy(
-    IWdsTransportConfigurationManager* This);
-void __RPC_STUB IWdsTransportConfigurationManager_EnableWdsTransportServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_DisableWdsTransportServices_Proxy(
-    IWdsTransportConfigurationManager* This);
-void __RPC_STUB IWdsTransportConfigurationManager_DisableWdsTransportServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_StartWdsTransportServices_Proxy(
-    IWdsTransportConfigurationManager* This);
-void __RPC_STUB IWdsTransportConfigurationManager_StartWdsTransportServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_StopWdsTransportServices_Proxy(
-    IWdsTransportConfigurationManager* This);
-void __RPC_STUB IWdsTransportConfigurationManager_StopWdsTransportServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_RestartWdsTransportServices_Proxy(
-    IWdsTransportConfigurationManager* This);
-void __RPC_STUB IWdsTransportConfigurationManager_RestartWdsTransportServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager_NotifyWdsTransportServices_Proxy(
-    IWdsTransportConfigurationManager* This,
-    WDSTRANSPORT_SERVICE_NOTIFICATION ServiceNotification);
-void __RPC_STUB IWdsTransportConfigurationManager_NotifyWdsTransportServices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportConfigurationManager_INTERFACE_DEFINED__ */
 
@@ -1231,29 +1262,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportDiagnosticsPolicy* This);
+        IWdsTransportDiagnosticsPolicy *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportDiagnosticsPolicy* This);
+        IWdsTransportDiagnosticsPolicy *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1261,7 +1292,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1273,37 +1304,38 @@
 
     /*** IWdsTransportCacheable methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Dirty)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         VARIANT_BOOL *pbDirty);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        IWdsTransportDiagnosticsPolicy* This);
+        IWdsTransportDiagnosticsPolicy *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportDiagnosticsPolicy* This);
+        IWdsTransportDiagnosticsPolicy *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWdsTransportDiagnosticsPolicy* This);
+        IWdsTransportDiagnosticsPolicy *This);
 
     /*** IWdsTransportDiagnosticsPolicy methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Enabled)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         VARIANT_BOOL *pbEnabled);
 
     HRESULT (STDMETHODCALLTYPE *put_Enabled)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         VARIANT_BOOL bEnabled);
 
     HRESULT (STDMETHODCALLTYPE *get_Components)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         ULONG *pulComponents);
 
     HRESULT (STDMETHODCALLTYPE *put_Components)(
-        IWdsTransportDiagnosticsPolicy* This,
+        IWdsTransportDiagnosticsPolicy *This,
         ULONG ulComponents);
 
     END_INTERFACE
 } IWdsTransportDiagnosticsPolicyVtbl;
+
 interface IWdsTransportDiagnosticsPolicy {
     CONST_VTBL IWdsTransportDiagnosticsPolicyVtbl* lpVtbl;
 };
@@ -1384,38 +1416,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_get_Enabled_Proxy(
-    IWdsTransportDiagnosticsPolicy* This,
-    VARIANT_BOOL *pbEnabled);
-void __RPC_STUB IWdsTransportDiagnosticsPolicy_get_Enabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_put_Enabled_Proxy(
-    IWdsTransportDiagnosticsPolicy* This,
-    VARIANT_BOOL bEnabled);
-void __RPC_STUB IWdsTransportDiagnosticsPolicy_put_Enabled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_get_Components_Proxy(
-    IWdsTransportDiagnosticsPolicy* This,
-    ULONG *pulComponents);
-void __RPC_STUB IWdsTransportDiagnosticsPolicy_get_Components_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportDiagnosticsPolicy_put_Components_Proxy(
-    IWdsTransportDiagnosticsPolicy* This,
-    ULONG ulComponents);
-void __RPC_STUB IWdsTransportDiagnosticsPolicy_put_Components_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportDiagnosticsPolicy_INTERFACE_DEFINED__ */
 
@@ -1444,29 +1444,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportConfigurationManager2* This);
+        IWdsTransportConfigurationManager2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportConfigurationManager2* This);
+        IWdsTransportConfigurationManager2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1474,7 +1474,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1486,44 +1486,45 @@
 
     /*** IWdsTransportConfigurationManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_ServicePolicy)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         IWdsTransportServicePolicy **ppWdsTransportServicePolicy);
 
     HRESULT (STDMETHODCALLTYPE *get_DiagnosticsPolicy)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         IWdsTransportDiagnosticsPolicy **ppWdsTransportDiagnosticsPolicy);
 
     HRESULT (STDMETHODCALLTYPE *get_WdsTransportServicesRunning)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         VARIANT_BOOL bRealtimeStatus,
         VARIANT_BOOL *pbServicesRunning);
 
     HRESULT (STDMETHODCALLTYPE *EnableWdsTransportServices)(
-        IWdsTransportConfigurationManager2* This);
+        IWdsTransportConfigurationManager2 *This);
 
     HRESULT (STDMETHODCALLTYPE *DisableWdsTransportServices)(
-        IWdsTransportConfigurationManager2* This);
+        IWdsTransportConfigurationManager2 *This);
 
     HRESULT (STDMETHODCALLTYPE *StartWdsTransportServices)(
-        IWdsTransportConfigurationManager2* This);
+        IWdsTransportConfigurationManager2 *This);
 
     HRESULT (STDMETHODCALLTYPE *StopWdsTransportServices)(
-        IWdsTransportConfigurationManager2* This);
+        IWdsTransportConfigurationManager2 *This);
 
     HRESULT (STDMETHODCALLTYPE *RestartWdsTransportServices)(
-        IWdsTransportConfigurationManager2* This);
+        IWdsTransportConfigurationManager2 *This);
 
     HRESULT (STDMETHODCALLTYPE *NotifyWdsTransportServices)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         WDSTRANSPORT_SERVICE_NOTIFICATION ServiceNotification);
 
     /*** IWdsTransportConfigurationManager2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_MulticastSessionPolicy)(
-        IWdsTransportConfigurationManager2* This,
+        IWdsTransportConfigurationManager2 *This,
         IWdsTransportMulticastSessionPolicy **ppWdsTransportMulticastSessionPolicy);
 
     END_INTERFACE
 } IWdsTransportConfigurationManager2Vtbl;
+
 interface IWdsTransportConfigurationManager2 {
     CONST_VTBL IWdsTransportConfigurationManager2Vtbl* lpVtbl;
 };
@@ -1612,14 +1613,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportConfigurationManager2_get_MulticastSessionPolicy_Proxy(
-    IWdsTransportConfigurationManager2* This,
-    IWdsTransportMulticastSessionPolicy **ppWdsTransportMulticastSessionPolicy);
-void __RPC_STUB IWdsTransportConfigurationManager2_get_MulticastSessionPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportConfigurationManager2_INTERFACE_DEFINED__ */
 
@@ -1649,29 +1642,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportManager* This,
+        IWdsTransportManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportManager* This);
+        IWdsTransportManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportManager* This);
+        IWdsTransportManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportManager* This,
+        IWdsTransportManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportManager* This,
+        IWdsTransportManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportManager* This,
+        IWdsTransportManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1679,7 +1672,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportManager* This,
+        IWdsTransportManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1691,12 +1684,13 @@
 
     /*** IWdsTransportManager methods ***/
     HRESULT (STDMETHODCALLTYPE *GetWdsTransportServer)(
-        IWdsTransportManager* This,
+        IWdsTransportManager *This,
         BSTR bszServerName,
         IWdsTransportServer **ppWdsTransportServer);
 
     END_INTERFACE
 } IWdsTransportManagerVtbl;
+
 interface IWdsTransportManager {
     CONST_VTBL IWdsTransportManagerVtbl* lpVtbl;
 };
@@ -1747,15 +1741,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportManager_GetWdsTransportServer_Proxy(
-    IWdsTransportManager* This,
-    BSTR bszServerName,
-    IWdsTransportServer **ppWdsTransportServer);
-void __RPC_STUB IWdsTransportManager_GetWdsTransportServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportManager_INTERFACE_DEFINED__ */
 
@@ -1844,29 +1829,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportNamespace* This);
+        IWdsTransportNamespace *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportNamespace* This);
+        IWdsTransportNamespace *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1874,7 +1859,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1886,89 +1871,90 @@
 
     /*** IWdsTransportNamespace methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         WDSTRANSPORT_NAMESPACE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR bszName);
 
     HRESULT (STDMETHODCALLTYPE *get_FriendlyName)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR *pbszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *put_FriendlyName)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR bszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR *pbszDescription);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR bszDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_ContentProvider)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR *pbszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ContentProvider)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR bszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_Configuration)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR *pbszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *put_Configuration)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         BSTR bszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *get_Registered)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         VARIANT_BOOL *pbRegistered);
 
     HRESULT (STDMETHODCALLTYPE *get_Tombstoned)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         VARIANT_BOOL *pbTombstoned);
 
     HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         DATE *pTombstoneTime);
 
     HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         VARIANT_BOOL *pbTransmissionStarted);
 
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IWdsTransportNamespace* This);
+        IWdsTransportNamespace *This);
 
     HRESULT (STDMETHODCALLTYPE *Deregister)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         VARIANT_BOOL bTerminateSessions);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         IWdsTransportNamespace **ppWdsTransportNamespaceClone);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportNamespace* This);
+        IWdsTransportNamespace *This);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveContents)(
-        IWdsTransportNamespace* This,
+        IWdsTransportNamespace *This,
         IWdsTransportCollection **ppWdsTransportContents);
 
     END_INTERFACE
 } IWdsTransportNamespaceVtbl;
+
 interface IWdsTransportNamespace {
     CONST_VTBL IWdsTransportNamespaceVtbl* lpVtbl;
 };
@@ -2099,172 +2085,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Type_Proxy(
-    IWdsTransportNamespace* This,
-    WDSTRANSPORT_NAMESPACE_TYPE *pType);
-void __RPC_STUB IWdsTransportNamespace_get_Type_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Id_Proxy(
-    IWdsTransportNamespace* This,
-    ULONG *pulId);
-void __RPC_STUB IWdsTransportNamespace_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Name_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR *pbszName);
-void __RPC_STUB IWdsTransportNamespace_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_Name_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR bszName);
-void __RPC_STUB IWdsTransportNamespace_put_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_FriendlyName_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR *pbszFriendlyName);
-void __RPC_STUB IWdsTransportNamespace_get_FriendlyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_FriendlyName_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR bszFriendlyName);
-void __RPC_STUB IWdsTransportNamespace_put_FriendlyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Description_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR *pbszDescription);
-void __RPC_STUB IWdsTransportNamespace_get_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_Description_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR bszDescription);
-void __RPC_STUB IWdsTransportNamespace_put_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_ContentProvider_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR *pbszContentProvider);
-void __RPC_STUB IWdsTransportNamespace_get_ContentProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_ContentProvider_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR bszContentProvider);
-void __RPC_STUB IWdsTransportNamespace_put_ContentProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Configuration_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR *pbszConfiguration);
-void __RPC_STUB IWdsTransportNamespace_get_Configuration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_put_Configuration_Proxy(
-    IWdsTransportNamespace* This,
-    BSTR bszConfiguration);
-void __RPC_STUB IWdsTransportNamespace_put_Configuration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Registered_Proxy(
-    IWdsTransportNamespace* This,
-    VARIANT_BOOL *pbRegistered);
-void __RPC_STUB IWdsTransportNamespace_get_Registered_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_Tombstoned_Proxy(
-    IWdsTransportNamespace* This,
-    VARIANT_BOOL *pbTombstoned);
-void __RPC_STUB IWdsTransportNamespace_get_Tombstoned_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_TombstoneTime_Proxy(
-    IWdsTransportNamespace* This,
-    DATE *pTombstoneTime);
-void __RPC_STUB IWdsTransportNamespace_get_TombstoneTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_get_TransmissionStarted_Proxy(
-    IWdsTransportNamespace* This,
-    VARIANT_BOOL *pbTransmissionStarted);
-void __RPC_STUB IWdsTransportNamespace_get_TransmissionStarted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Register_Proxy(
-    IWdsTransportNamespace* This);
-void __RPC_STUB IWdsTransportNamespace_Register_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Deregister_Proxy(
-    IWdsTransportNamespace* This,
-    VARIANT_BOOL bTerminateSessions);
-void __RPC_STUB IWdsTransportNamespace_Deregister_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Clone_Proxy(
-    IWdsTransportNamespace* This,
-    IWdsTransportNamespace **ppWdsTransportNamespaceClone);
-void __RPC_STUB IWdsTransportNamespace_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_Refresh_Proxy(
-    IWdsTransportNamespace* This);
-void __RPC_STUB IWdsTransportNamespace_Refresh_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespace_RetrieveContents_Proxy(
-    IWdsTransportNamespace* This,
-    IWdsTransportCollection **ppWdsTransportContents);
-void __RPC_STUB IWdsTransportNamespace_RetrieveContents_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportNamespace_INTERFACE_DEFINED__ */
 
@@ -2290,29 +2110,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportNamespaceAutoCast* This);
+        IWdsTransportNamespaceAutoCast *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportNamespaceAutoCast* This);
+        IWdsTransportNamespaceAutoCast *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2320,7 +2140,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2332,89 +2152,90 @@
 
     /*** IWdsTransportNamespace methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         WDSTRANSPORT_NAMESPACE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR bszName);
 
     HRESULT (STDMETHODCALLTYPE *get_FriendlyName)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR *pbszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *put_FriendlyName)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR bszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR *pbszDescription);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR bszDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_ContentProvider)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR *pbszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ContentProvider)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR bszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_Configuration)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR *pbszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *put_Configuration)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         BSTR bszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *get_Registered)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         VARIANT_BOOL *pbRegistered);
 
     HRESULT (STDMETHODCALLTYPE *get_Tombstoned)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         VARIANT_BOOL *pbTombstoned);
 
     HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         DATE *pTombstoneTime);
 
     HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         VARIANT_BOOL *pbTransmissionStarted);
 
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IWdsTransportNamespaceAutoCast* This);
+        IWdsTransportNamespaceAutoCast *This);
 
     HRESULT (STDMETHODCALLTYPE *Deregister)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         VARIANT_BOOL bTerminateSessions);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         IWdsTransportNamespace **ppWdsTransportNamespaceClone);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportNamespaceAutoCast* This);
+        IWdsTransportNamespaceAutoCast *This);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveContents)(
-        IWdsTransportNamespaceAutoCast* This,
+        IWdsTransportNamespaceAutoCast *This,
         IWdsTransportCollection **ppWdsTransportContents);
 
     END_INTERFACE
 } IWdsTransportNamespaceAutoCastVtbl;
+
 interface IWdsTransportNamespaceAutoCast {
     CONST_VTBL IWdsTransportNamespaceAutoCastVtbl* lpVtbl;
 };
@@ -2573,29 +2394,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportNamespaceScheduledCast* This);
+        IWdsTransportNamespaceScheduledCast *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportNamespaceScheduledCast* This);
+        IWdsTransportNamespaceScheduledCast *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2603,7 +2424,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2615,93 +2436,94 @@
 
     /*** IWdsTransportNamespace methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         WDSTRANSPORT_NAMESPACE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR bszName);
 
     HRESULT (STDMETHODCALLTYPE *get_FriendlyName)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR *pbszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *put_FriendlyName)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR bszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR *pbszDescription);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR bszDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_ContentProvider)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR *pbszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ContentProvider)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR bszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_Configuration)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR *pbszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *put_Configuration)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         BSTR bszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *get_Registered)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         VARIANT_BOOL *pbRegistered);
 
     HRESULT (STDMETHODCALLTYPE *get_Tombstoned)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         VARIANT_BOOL *pbTombstoned);
 
     HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         DATE *pTombstoneTime);
 
     HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         VARIANT_BOOL *pbTransmissionStarted);
 
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IWdsTransportNamespaceScheduledCast* This);
+        IWdsTransportNamespaceScheduledCast *This);
 
     HRESULT (STDMETHODCALLTYPE *Deregister)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         VARIANT_BOOL bTerminateSessions);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         IWdsTransportNamespace **ppWdsTransportNamespaceClone);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportNamespaceScheduledCast* This);
+        IWdsTransportNamespaceScheduledCast *This);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveContents)(
-        IWdsTransportNamespaceScheduledCast* This,
+        IWdsTransportNamespaceScheduledCast *This,
         IWdsTransportCollection **ppWdsTransportContents);
 
     /*** IWdsTransportNamespaceScheduledCast methods ***/
     HRESULT (STDMETHODCALLTYPE *StartTransmission)(
-        IWdsTransportNamespaceScheduledCast* This);
+        IWdsTransportNamespaceScheduledCast *This);
 
     END_INTERFACE
 } IWdsTransportNamespaceScheduledCastVtbl;
+
 interface IWdsTransportNamespaceScheduledCast {
     CONST_VTBL IWdsTransportNamespaceScheduledCastVtbl* lpVtbl;
 };
@@ -2838,13 +2660,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCast_StartTransmission_Proxy(
-    IWdsTransportNamespaceScheduledCast* This);
-void __RPC_STUB IWdsTransportNamespaceScheduledCast_StartTransmission_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportNamespaceScheduledCast_INTERFACE_DEFINED__ */
 
@@ -2870,29 +2685,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportNamespaceScheduledCastManualStart* This);
+        IWdsTransportNamespaceScheduledCastManualStart *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportNamespaceScheduledCastManualStart* This);
+        IWdsTransportNamespaceScheduledCastManualStart *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2900,7 +2715,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2912,93 +2727,94 @@
 
     /*** IWdsTransportNamespace methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         WDSTRANSPORT_NAMESPACE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR bszName);
 
     HRESULT (STDMETHODCALLTYPE *get_FriendlyName)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR *pbszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *put_FriendlyName)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR bszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR *pbszDescription);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR bszDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_ContentProvider)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR *pbszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ContentProvider)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR bszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_Configuration)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR *pbszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *put_Configuration)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         BSTR bszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *get_Registered)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         VARIANT_BOOL *pbRegistered);
 
     HRESULT (STDMETHODCALLTYPE *get_Tombstoned)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         VARIANT_BOOL *pbTombstoned);
 
     HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         DATE *pTombstoneTime);
 
     HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         VARIANT_BOOL *pbTransmissionStarted);
 
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IWdsTransportNamespaceScheduledCastManualStart* This);
+        IWdsTransportNamespaceScheduledCastManualStart *This);
 
     HRESULT (STDMETHODCALLTYPE *Deregister)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         VARIANT_BOOL bTerminateSessions);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         IWdsTransportNamespace **ppWdsTransportNamespaceClone);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportNamespaceScheduledCastManualStart* This);
+        IWdsTransportNamespaceScheduledCastManualStart *This);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveContents)(
-        IWdsTransportNamespaceScheduledCastManualStart* This,
+        IWdsTransportNamespaceScheduledCastManualStart *This,
         IWdsTransportCollection **ppWdsTransportContents);
 
     /*** IWdsTransportNamespaceScheduledCast methods ***/
     HRESULT (STDMETHODCALLTYPE *StartTransmission)(
-        IWdsTransportNamespaceScheduledCastManualStart* This);
+        IWdsTransportNamespaceScheduledCastManualStart *This);
 
     END_INTERFACE
 } IWdsTransportNamespaceScheduledCastManualStartVtbl;
+
 interface IWdsTransportNamespaceScheduledCastManualStart {
     CONST_VTBL IWdsTransportNamespaceScheduledCastManualStartVtbl* lpVtbl;
 };
@@ -3172,29 +2988,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This);
+        IWdsTransportNamespaceScheduledCastAutoStart *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This);
+        IWdsTransportNamespaceScheduledCastAutoStart *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3202,7 +3018,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3214,110 +3030,111 @@
 
     /*** IWdsTransportNamespace methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Type)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         WDSTRANSPORT_NAMESPACE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *put_Name)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR bszName);
 
     HRESULT (STDMETHODCALLTYPE *get_FriendlyName)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR *pbszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *put_FriendlyName)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR bszFriendlyName);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR *pbszDescription);
 
     HRESULT (STDMETHODCALLTYPE *put_Description)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR bszDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_ContentProvider)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR *pbszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *put_ContentProvider)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR bszContentProvider);
 
     HRESULT (STDMETHODCALLTYPE *get_Configuration)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR *pbszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *put_Configuration)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         BSTR bszConfiguration);
 
     HRESULT (STDMETHODCALLTYPE *get_Registered)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         VARIANT_BOOL *pbRegistered);
 
     HRESULT (STDMETHODCALLTYPE *get_Tombstoned)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         VARIANT_BOOL *pbTombstoned);
 
     HRESULT (STDMETHODCALLTYPE *get_TombstoneTime)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         DATE *pTombstoneTime);
 
     HRESULT (STDMETHODCALLTYPE *get_TransmissionStarted)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         VARIANT_BOOL *pbTransmissionStarted);
 
     HRESULT (STDMETHODCALLTYPE *Register)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This);
+        IWdsTransportNamespaceScheduledCastAutoStart *This);
 
     HRESULT (STDMETHODCALLTYPE *Deregister)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         VARIANT_BOOL bTerminateSessions);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         IWdsTransportNamespace **ppWdsTransportNamespaceClone);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This);
+        IWdsTransportNamespaceScheduledCastAutoStart *This);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveContents)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         IWdsTransportCollection **ppWdsTransportContents);
 
     /*** IWdsTransportNamespaceScheduledCast methods ***/
     HRESULT (STDMETHODCALLTYPE *StartTransmission)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This);
+        IWdsTransportNamespaceScheduledCastAutoStart *This);
 
     /*** IWdsTransportNamespaceScheduledCastAutoStart methods ***/
     HRESULT (STDMETHODCALLTYPE *get_MinimumClients)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         ULONG *pulMinimumClients);
 
     HRESULT (STDMETHODCALLTYPE *put_MinimumClients)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         ULONG ulMinimumClients);
 
     HRESULT (STDMETHODCALLTYPE *get_StartTime)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         DATE *pStartTime);
 
     HRESULT (STDMETHODCALLTYPE *put_StartTime)(
-        IWdsTransportNamespaceScheduledCastAutoStart* This,
+        IWdsTransportNamespaceScheduledCastAutoStart *This,
         DATE StartTime);
 
     END_INTERFACE
 } IWdsTransportNamespaceScheduledCastAutoStartVtbl;
+
 interface IWdsTransportNamespaceScheduledCastAutoStart {
     CONST_VTBL IWdsTransportNamespaceScheduledCastAutoStartVtbl* lpVtbl;
 };
@@ -3472,38 +3289,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_get_MinimumClients_Proxy(
-    IWdsTransportNamespaceScheduledCastAutoStart* This,
-    ULONG *pulMinimumClients);
-void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_get_MinimumClients_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_put_MinimumClients_Proxy(
-    IWdsTransportNamespaceScheduledCastAutoStart* This,
-    ULONG ulMinimumClients);
-void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_put_MinimumClients_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_get_StartTime_Proxy(
-    IWdsTransportNamespaceScheduledCastAutoStart* This,
-    DATE *pStartTime);
-void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_get_StartTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceScheduledCastAutoStart_put_StartTime_Proxy(
-    IWdsTransportNamespaceScheduledCastAutoStart* This,
-    DATE StartTime);
-void __RPC_STUB IWdsTransportNamespaceScheduledCastAutoStart_put_StartTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportNamespaceScheduledCastAutoStart_INTERFACE_DEFINED__ */
 
@@ -3546,29 +3331,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportNamespaceManager* This);
+        IWdsTransportNamespaceManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportNamespaceManager* This);
+        IWdsTransportNamespaceManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3576,7 +3361,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3588,7 +3373,7 @@
 
     /*** IWdsTransportNamespaceManager methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateNamespace)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         WDSTRANSPORT_NAMESPACE_TYPE NamespaceType,
         BSTR bszNamespaceName,
         BSTR bszContentProvider,
@@ -3596,12 +3381,12 @@
         IWdsTransportNamespace **ppWdsTransportNamespace);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveNamespace)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         BSTR bszNamespaceName,
         IWdsTransportNamespace **ppWdsTransportNamespace);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveNamespaces)(
-        IWdsTransportNamespaceManager* This,
+        IWdsTransportNamespaceManager *This,
         BSTR bszContentProvider,
         BSTR bszNamespaceName,
         VARIANT_BOOL bIncludeTombstones,
@@ -3609,6 +3394,7 @@
 
     END_INTERFACE
 } IWdsTransportNamespaceManagerVtbl;
+
 interface IWdsTransportNamespaceManager {
     CONST_VTBL IWdsTransportNamespaceManagerVtbl* lpVtbl;
 };
@@ -3667,38 +3453,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceManager_CreateNamespace_Proxy(
-    IWdsTransportNamespaceManager* This,
-    WDSTRANSPORT_NAMESPACE_TYPE NamespaceType,
-    BSTR bszNamespaceName,
-    BSTR bszContentProvider,
-    BSTR bszConfiguration,
-    IWdsTransportNamespace **ppWdsTransportNamespace);
-void __RPC_STUB IWdsTransportNamespaceManager_CreateNamespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceManager_RetrieveNamespace_Proxy(
-    IWdsTransportNamespaceManager* This,
-    BSTR bszNamespaceName,
-    IWdsTransportNamespace **ppWdsTransportNamespace);
-void __RPC_STUB IWdsTransportNamespaceManager_RetrieveNamespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportNamespaceManager_RetrieveNamespaces_Proxy(
-    IWdsTransportNamespaceManager* This,
-    BSTR bszContentProvider,
-    BSTR bszNamespaceName,
-    VARIANT_BOOL bIncludeTombstones,
-    IWdsTransportCollection **ppWdsTransportNamespaces);
-void __RPC_STUB IWdsTransportNamespaceManager_RetrieveNamespaces_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportNamespaceManager_INTERFACE_DEFINED__ */
 
@@ -3740,29 +3494,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportServer* This);
+        IWdsTransportServer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportServer* This);
+        IWdsTransportServer *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3770,7 +3524,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3782,28 +3536,29 @@
 
     /*** IWdsTransportServer methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *get_SetupManager)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         IWdsTransportSetupManager **ppWdsTransportSetupManager);
 
     HRESULT (STDMETHODCALLTYPE *get_ConfigurationManager)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         IWdsTransportConfigurationManager **ppWdsTransportConfigurationManager);
 
     HRESULT (STDMETHODCALLTYPE *get_NamespaceManager)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         IWdsTransportNamespaceManager **ppWdsTransportNamespaceManager);
 
     HRESULT (STDMETHODCALLTYPE *DisconnectClient)(
-        IWdsTransportServer* This,
+        IWdsTransportServer *This,
         ULONG ulClientId,
         WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType);
 
     END_INTERFACE
 } IWdsTransportServerVtbl;
+
 interface IWdsTransportServer {
     CONST_VTBL IWdsTransportServerVtbl* lpVtbl;
 };
@@ -3870,47 +3625,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_Name_Proxy(
-    IWdsTransportServer* This,
-    BSTR *pbszName);
-void __RPC_STUB IWdsTransportServer_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_SetupManager_Proxy(
-    IWdsTransportServer* This,
-    IWdsTransportSetupManager **ppWdsTransportSetupManager);
-void __RPC_STUB IWdsTransportServer_get_SetupManager_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_ConfigurationManager_Proxy(
-    IWdsTransportServer* This,
-    IWdsTransportConfigurationManager **ppWdsTransportConfigurationManager);
-void __RPC_STUB IWdsTransportServer_get_ConfigurationManager_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServer_get_NamespaceManager_Proxy(
-    IWdsTransportServer* This,
-    IWdsTransportNamespaceManager **ppWdsTransportNamespaceManager);
-void __RPC_STUB IWdsTransportServer_get_NamespaceManager_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServer_DisconnectClient_Proxy(
-    IWdsTransportServer* This,
-    ULONG ulClientId,
-    WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType);
-void __RPC_STUB IWdsTransportServer_DisconnectClient_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportServer_INTERFACE_DEFINED__ */
 
@@ -3939,29 +3653,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportServer2* This);
+        IWdsTransportServer2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportServer2* This);
+        IWdsTransportServer2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3969,7 +3683,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3981,33 +3695,34 @@
 
     /*** IWdsTransportServer methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *get_SetupManager)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         IWdsTransportSetupManager **ppWdsTransportSetupManager);
 
     HRESULT (STDMETHODCALLTYPE *get_ConfigurationManager)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         IWdsTransportConfigurationManager **ppWdsTransportConfigurationManager);
 
     HRESULT (STDMETHODCALLTYPE *get_NamespaceManager)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         IWdsTransportNamespaceManager **ppWdsTransportNamespaceManager);
 
     HRESULT (STDMETHODCALLTYPE *DisconnectClient)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         ULONG ulClientId,
         WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType);
 
     /*** IWdsTransportServer2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_TftpManager)(
-        IWdsTransportServer2* This,
+        IWdsTransportServer2 *This,
         IWdsTransportTftpManager **ppWdsTransportTftpManager);
 
     END_INTERFACE
 } IWdsTransportServer2Vtbl;
+
 interface IWdsTransportServer2 {
     CONST_VTBL IWdsTransportServer2Vtbl* lpVtbl;
 };
@@ -4080,14 +3795,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportServer2_get_TftpManager_Proxy(
-    IWdsTransportServer2* This,
-    IWdsTransportTftpManager **ppWdsTransportTftpManager);
-void __RPC_STUB IWdsTransportServer2_get_TftpManager_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportServer2_INTERFACE_DEFINED__ */
 
@@ -4155,29 +3862,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportServicePolicy* This);
+        IWdsTransportServicePolicy *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportServicePolicy* This);
+        IWdsTransportServicePolicy *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4185,7 +3892,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4197,75 +3904,76 @@
 
     /*** IWdsTransportCacheable methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Dirty)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         VARIANT_BOOL *pbDirty);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        IWdsTransportServicePolicy* This);
+        IWdsTransportServicePolicy *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportServicePolicy* This);
+        IWdsTransportServicePolicy *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWdsTransportServicePolicy* This);
+        IWdsTransportServicePolicy *This);
 
     /*** IWdsTransportServicePolicy methods ***/
     HRESULT (STDMETHODCALLTYPE *get_IpAddressSource)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE *pSourceType);
 
     HRESULT (STDMETHODCALLTYPE *put_IpAddressSource)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE SourceType);
 
     HRESULT (STDMETHODCALLTYPE *get_StartIpAddress)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR *pbszStartIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *put_StartIpAddress)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR bszStartIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_EndIpAddress)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR *pbszEndIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *put_EndIpAddress)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR bszEndIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_StartPort)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         ULONG *pulStartPort);
 
     HRESULT (STDMETHODCALLTYPE *put_StartPort)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         ULONG ulStartPort);
 
     HRESULT (STDMETHODCALLTYPE *get_EndPort)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         ULONG *pulEndPort);
 
     HRESULT (STDMETHODCALLTYPE *put_EndPort)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         ULONG ulEndPort);
 
     HRESULT (STDMETHODCALLTYPE *get_NetworkProfile)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_NETWORK_PROFILE_TYPE *pProfileType);
 
     HRESULT (STDMETHODCALLTYPE *put_NetworkProfile)(
-        IWdsTransportServicePolicy* This,
+        IWdsTransportServicePolicy *This,
         WDSTRANSPORT_NETWORK_PROFILE_TYPE ProfileType);
 
     END_INTERFACE
 } IWdsTransportServicePolicyVtbl;
+
 interface IWdsTransportServicePolicy {
     CONST_VTBL IWdsTransportServicePolicyVtbl* lpVtbl;
 };
@@ -4378,108 +4086,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_IpAddressSource_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
-    WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE *pSourceType);
-void __RPC_STUB IWdsTransportServicePolicy_get_IpAddressSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_IpAddressSource_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
-    WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE SourceType);
-void __RPC_STUB IWdsTransportServicePolicy_put_IpAddressSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_StartIpAddress_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
-    BSTR *pbszStartIpAddress);
-void __RPC_STUB IWdsTransportServicePolicy_get_StartIpAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_StartIpAddress_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
-    BSTR bszStartIpAddress);
-void __RPC_STUB IWdsTransportServicePolicy_put_StartIpAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_EndIpAddress_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
-    BSTR *pbszEndIpAddress);
-void __RPC_STUB IWdsTransportServicePolicy_get_EndIpAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_EndIpAddress_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
-    BSTR bszEndIpAddress);
-void __RPC_STUB IWdsTransportServicePolicy_put_EndIpAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_StartPort_Proxy(
-    IWdsTransportServicePolicy* This,
-    ULONG *pulStartPort);
-void __RPC_STUB IWdsTransportServicePolicy_get_StartPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_StartPort_Proxy(
-    IWdsTransportServicePolicy* This,
-    ULONG ulStartPort);
-void __RPC_STUB IWdsTransportServicePolicy_put_StartPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_EndPort_Proxy(
-    IWdsTransportServicePolicy* This,
-    ULONG *pulEndPort);
-void __RPC_STUB IWdsTransportServicePolicy_get_EndPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_EndPort_Proxy(
-    IWdsTransportServicePolicy* This,
-    ULONG ulEndPort);
-void __RPC_STUB IWdsTransportServicePolicy_put_EndPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_get_NetworkProfile_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_NETWORK_PROFILE_TYPE *pProfileType);
-void __RPC_STUB IWdsTransportServicePolicy_get_NetworkProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy_put_NetworkProfile_Proxy(
-    IWdsTransportServicePolicy* This,
-    WDSTRANSPORT_NETWORK_PROFILE_TYPE ProfileType);
-void __RPC_STUB IWdsTransportServicePolicy_put_NetworkProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportServicePolicy_INTERFACE_DEFINED__ */
 
@@ -4523,29 +4129,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportServicePolicy2* This);
+        IWdsTransportServicePolicy2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportServicePolicy2* This);
+        IWdsTransportServicePolicy2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4553,7 +4159,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4565,100 +4171,101 @@
 
     /*** IWdsTransportCacheable methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Dirty)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         VARIANT_BOOL *pbDirty);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        IWdsTransportServicePolicy2* This);
+        IWdsTransportServicePolicy2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportServicePolicy2* This);
+        IWdsTransportServicePolicy2 *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWdsTransportServicePolicy2* This);
+        IWdsTransportServicePolicy2 *This);
 
     /*** IWdsTransportServicePolicy methods ***/
     HRESULT (STDMETHODCALLTYPE *get_IpAddressSource)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE *pSourceType);
 
     HRESULT (STDMETHODCALLTYPE *put_IpAddressSource)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         WDSTRANSPORT_IP_ADDRESS_SOURCE_TYPE SourceType);
 
     HRESULT (STDMETHODCALLTYPE *get_StartIpAddress)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR *pbszStartIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *put_StartIpAddress)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR bszStartIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_EndIpAddress)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR *pbszEndIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *put_EndIpAddress)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_IP_ADDRESS_TYPE AddressType,
         BSTR bszEndIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_StartPort)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         ULONG *pulStartPort);
 
     HRESULT (STDMETHODCALLTYPE *put_StartPort)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         ULONG ulStartPort);
 
     HRESULT (STDMETHODCALLTYPE *get_EndPort)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         ULONG *pulEndPort);
 
     HRESULT (STDMETHODCALLTYPE *put_EndPort)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         ULONG ulEndPort);
 
     HRESULT (STDMETHODCALLTYPE *get_NetworkProfile)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_NETWORK_PROFILE_TYPE *pProfileType);
 
     HRESULT (STDMETHODCALLTYPE *put_NetworkProfile)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_NETWORK_PROFILE_TYPE ProfileType);
 
     /*** IWdsTransportServicePolicy2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_UdpPortPolicy)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_UDP_PORT_POLICY *pUdpPortPolicy);
 
     HRESULT (STDMETHODCALLTYPE *put_UdpPortPolicy)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         WDSTRANSPORT_UDP_PORT_POLICY UdpPortPolicy);
 
     HRESULT (STDMETHODCALLTYPE *get_TftpMaximumBlockSize)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         ULONG *pulTftpMaximumBlockSize);
 
     HRESULT (STDMETHODCALLTYPE *put_TftpMaximumBlockSize)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         ULONG ulTftpMaximumBlockSize);
 
     HRESULT (STDMETHODCALLTYPE *get_EnableTftpVariableWindowExtension)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         VARIANT_BOOL *pbEnableTftpVariableWindowExtension);
 
     HRESULT (STDMETHODCALLTYPE *put_EnableTftpVariableWindowExtension)(
-        IWdsTransportServicePolicy2* This,
+        IWdsTransportServicePolicy2 *This,
         VARIANT_BOOL bEnableTftpVariableWindowExtension);
 
     END_INTERFACE
 } IWdsTransportServicePolicy2Vtbl;
+
 interface IWdsTransportServicePolicy2 {
     CONST_VTBL IWdsTransportServicePolicy2Vtbl* lpVtbl;
 };
@@ -4797,54 +4404,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_get_UdpPortPolicy_Proxy(
-    IWdsTransportServicePolicy2* This,
-    WDSTRANSPORT_UDP_PORT_POLICY *pUdpPortPolicy);
-void __RPC_STUB IWdsTransportServicePolicy2_get_UdpPortPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_put_UdpPortPolicy_Proxy(
-    IWdsTransportServicePolicy2* This,
-    WDSTRANSPORT_UDP_PORT_POLICY UdpPortPolicy);
-void __RPC_STUB IWdsTransportServicePolicy2_put_UdpPortPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_get_TftpMaximumBlockSize_Proxy(
-    IWdsTransportServicePolicy2* This,
-    ULONG *pulTftpMaximumBlockSize);
-void __RPC_STUB IWdsTransportServicePolicy2_get_TftpMaximumBlockSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_put_TftpMaximumBlockSize_Proxy(
-    IWdsTransportServicePolicy2* This,
-    ULONG ulTftpMaximumBlockSize);
-void __RPC_STUB IWdsTransportServicePolicy2_put_TftpMaximumBlockSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_get_EnableTftpVariableWindowExtension_Proxy(
-    IWdsTransportServicePolicy2* This,
-    VARIANT_BOOL *pbEnableTftpVariableWindowExtension);
-void __RPC_STUB IWdsTransportServicePolicy2_get_EnableTftpVariableWindowExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportServicePolicy2_put_EnableTftpVariableWindowExtension_Proxy(
-    IWdsTransportServicePolicy2* This,
-    VARIANT_BOOL bEnableTftpVariableWindowExtension);
-void __RPC_STUB IWdsTransportServicePolicy2_put_EnableTftpVariableWindowExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportServicePolicy2_INTERFACE_DEFINED__ */
 
@@ -4888,29 +4447,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportSetupManager* This);
+        IWdsTransportSetupManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportSetupManager* This);
+        IWdsTransportSetupManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -4918,7 +4477,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -4930,30 +4489,31 @@
 
     /*** IWdsTransportSetupManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Version)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         ULONGLONG *pullVersion);
 
     HRESULT (STDMETHODCALLTYPE *get_InstalledFeatures)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         ULONG *pulInstalledFeatures);
 
     HRESULT (STDMETHODCALLTYPE *get_Protocols)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         ULONG *pulProtocols);
 
     HRESULT (STDMETHODCALLTYPE *RegisterContentProvider)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         BSTR bszName,
         BSTR bszDescription,
         BSTR bszFilePath,
         BSTR bszInitializationRoutine);
 
     HRESULT (STDMETHODCALLTYPE *DeregisterContentProvider)(
-        IWdsTransportSetupManager* This,
+        IWdsTransportSetupManager *This,
         BSTR bszName);
 
     END_INTERFACE
 } IWdsTransportSetupManagerVtbl;
+
 interface IWdsTransportSetupManager {
     CONST_VTBL IWdsTransportSetupManagerVtbl* lpVtbl;
 };
@@ -5020,49 +4580,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_get_Version_Proxy(
-    IWdsTransportSetupManager* This,
-    ULONGLONG *pullVersion);
-void __RPC_STUB IWdsTransportSetupManager_get_Version_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_get_InstalledFeatures_Proxy(
-    IWdsTransportSetupManager* This,
-    ULONG *pulInstalledFeatures);
-void __RPC_STUB IWdsTransportSetupManager_get_InstalledFeatures_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_get_Protocols_Proxy(
-    IWdsTransportSetupManager* This,
-    ULONG *pulProtocols);
-void __RPC_STUB IWdsTransportSetupManager_get_Protocols_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_RegisterContentProvider_Proxy(
-    IWdsTransportSetupManager* This,
-    BSTR bszName,
-    BSTR bszDescription,
-    BSTR bszFilePath,
-    BSTR bszInitializationRoutine);
-void __RPC_STUB IWdsTransportSetupManager_RegisterContentProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager_DeregisterContentProvider_Proxy(
-    IWdsTransportSetupManager* This,
-    BSTR bszName);
-void __RPC_STUB IWdsTransportSetupManager_DeregisterContentProvider_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportSetupManager_INTERFACE_DEFINED__ */
 
@@ -5094,29 +4611,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportSetupManager2* This);
+        IWdsTransportSetupManager2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportSetupManager2* This);
+        IWdsTransportSetupManager2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5124,7 +4641,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5136,39 +4653,40 @@
 
     /*** IWdsTransportSetupManager methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Version)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         ULONGLONG *pullVersion);
 
     HRESULT (STDMETHODCALLTYPE *get_InstalledFeatures)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         ULONG *pulInstalledFeatures);
 
     HRESULT (STDMETHODCALLTYPE *get_Protocols)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         ULONG *pulProtocols);
 
     HRESULT (STDMETHODCALLTYPE *RegisterContentProvider)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         BSTR bszName,
         BSTR bszDescription,
         BSTR bszFilePath,
         BSTR bszInitializationRoutine);
 
     HRESULT (STDMETHODCALLTYPE *DeregisterContentProvider)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         BSTR bszName);
 
     /*** IWdsTransportSetupManager2 methods ***/
     HRESULT (STDMETHODCALLTYPE *get_TftpCapabilities)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         ULONG *pulTftpCapabilities);
 
     HRESULT (STDMETHODCALLTYPE *get_ContentProviders)(
-        IWdsTransportSetupManager2* This,
+        IWdsTransportSetupManager2 *This,
         IWdsTransportCollection **ppProviderCollection);
 
     END_INTERFACE
 } IWdsTransportSetupManager2Vtbl;
+
 interface IWdsTransportSetupManager2 {
     CONST_VTBL IWdsTransportSetupManager2Vtbl* lpVtbl;
 };
@@ -5245,22 +4763,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager2_get_TftpCapabilities_Proxy(
-    IWdsTransportSetupManager2* This,
-    ULONG *pulTftpCapabilities);
-void __RPC_STUB IWdsTransportSetupManager2_get_TftpCapabilities_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSetupManager2_get_ContentProviders_Proxy(
-    IWdsTransportSetupManager2* This,
-    IWdsTransportCollection **ppProviderCollection);
-void __RPC_STUB IWdsTransportSetupManager2_get_ContentProviders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportSetupManager2_INTERFACE_DEFINED__ */
 
@@ -5289,29 +4791,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportTftpManager* This,
+        IWdsTransportTftpManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportTftpManager* This);
+        IWdsTransportTftpManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportTftpManager* This);
+        IWdsTransportTftpManager *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportTftpManager* This,
+        IWdsTransportTftpManager *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportTftpManager* This,
+        IWdsTransportTftpManager *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportTftpManager* This,
+        IWdsTransportTftpManager *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5319,7 +4821,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportTftpManager* This,
+        IWdsTransportTftpManager *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5331,11 +4833,12 @@
 
     /*** IWdsTransportTftpManager methods ***/
     HRESULT (STDMETHODCALLTYPE *RetrieveTftpClients)(
-        IWdsTransportTftpManager* This,
+        IWdsTransportTftpManager *This,
         IWdsTransportCollection **ppWdsTransportTftpClients);
 
     END_INTERFACE
 } IWdsTransportTftpManagerVtbl;
+
 interface IWdsTransportTftpManager {
     CONST_VTBL IWdsTransportTftpManagerVtbl* lpVtbl;
 };
@@ -5386,14 +4889,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpManager_RetrieveTftpClients_Proxy(
-    IWdsTransportTftpManager* This,
-    IWdsTransportCollection **ppWdsTransportTftpClients);
-void __RPC_STUB IWdsTransportTftpManager_RetrieveTftpClients_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportTftpManager_INTERFACE_DEFINED__ */
 
@@ -5443,29 +4938,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportMulticastSessionPolicy* This);
+        IWdsTransportMulticastSessionPolicy *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportMulticastSessionPolicy* This);
+        IWdsTransportMulticastSessionPolicy *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5473,7 +4968,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5485,53 +4980,54 @@
 
     /*** IWdsTransportCacheable methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Dirty)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         VARIANT_BOOL *pbDirty);
 
     HRESULT (STDMETHODCALLTYPE *Discard)(
-        IWdsTransportMulticastSessionPolicy* This);
+        IWdsTransportMulticastSessionPolicy *This);
 
     HRESULT (STDMETHODCALLTYPE *Refresh)(
-        IWdsTransportMulticastSessionPolicy* This);
+        IWdsTransportMulticastSessionPolicy *This);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWdsTransportMulticastSessionPolicy* This);
+        IWdsTransportMulticastSessionPolicy *This);
 
     /*** IWdsTransportMulticastSessionPolicy methods ***/
     HRESULT (STDMETHODCALLTYPE *get_SlowClientHandling)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE *pSlowClientHandling);
 
     HRESULT (STDMETHODCALLTYPE *put_SlowClientHandling)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE SlowClientHandling);
 
     HRESULT (STDMETHODCALLTYPE *get_AutoDisconnectThreshold)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         ULONG *pulThreshold);
 
     HRESULT (STDMETHODCALLTYPE *put_AutoDisconnectThreshold)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         ULONG ulThreshold);
 
     HRESULT (STDMETHODCALLTYPE *get_MultistreamStreamCount)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         ULONG *pulStreamCount);
 
     HRESULT (STDMETHODCALLTYPE *put_MultistreamStreamCount)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         ULONG ulStreamCount);
 
     HRESULT (STDMETHODCALLTYPE *get_SlowClientFallback)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         VARIANT_BOOL *pbClientFallback);
 
     HRESULT (STDMETHODCALLTYPE *put_SlowClientFallback)(
-        IWdsTransportMulticastSessionPolicy* This,
+        IWdsTransportMulticastSessionPolicy *This,
         VARIANT_BOOL bClientFallback);
 
     END_INTERFACE
 } IWdsTransportMulticastSessionPolicyVtbl;
+
 interface IWdsTransportMulticastSessionPolicy {
     CONST_VTBL IWdsTransportMulticastSessionPolicyVtbl* lpVtbl;
 };
@@ -5628,70 +5124,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_SlowClientHandling_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE *pSlowClientHandling);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_SlowClientHandling_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_SlowClientHandling_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    WDSTRANSPORT_SLOW_CLIENT_HANDLING_TYPE SlowClientHandling);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_SlowClientHandling_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_AutoDisconnectThreshold_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    ULONG *pulThreshold);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_AutoDisconnectThreshold_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_AutoDisconnectThreshold_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    ULONG ulThreshold);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_AutoDisconnectThreshold_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_MultistreamStreamCount_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    ULONG *pulStreamCount);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_MultistreamStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_MultistreamStreamCount_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    ULONG ulStreamCount);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_MultistreamStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_get_SlowClientFallback_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    VARIANT_BOOL *pbClientFallback);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_get_SlowClientFallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportMulticastSessionPolicy_put_SlowClientFallback_Proxy(
-    IWdsTransportMulticastSessionPolicy* This,
-    VARIANT_BOOL bClientFallback);
-void __RPC_STUB IWdsTransportMulticastSessionPolicy_put_SlowClientFallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportMulticastSessionPolicy_INTERFACE_DEFINED__ */
 
@@ -5732,29 +5164,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportContent* This);
+        IWdsTransportContent *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportContent* This);
+        IWdsTransportContent *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5762,7 +5194,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5774,26 +5206,27 @@
 
     /*** IWdsTransportContent methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Namespace)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         IWdsTransportNamespace **ppWdsTransportNamespace);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveSessions)(
-        IWdsTransportContent* This,
+        IWdsTransportContent *This,
         IWdsTransportCollection **ppWdsTransportSessions);
 
     HRESULT (STDMETHODCALLTYPE *Terminate)(
-        IWdsTransportContent* This);
+        IWdsTransportContent *This);
 
     END_INTERFACE
 } IWdsTransportContentVtbl;
+
 interface IWdsTransportContent {
     CONST_VTBL IWdsTransportContentVtbl* lpVtbl;
 };
@@ -5860,45 +5293,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportContent_get_Namespace_Proxy(
-    IWdsTransportContent* This,
-    IWdsTransportNamespace **ppWdsTransportNamespace);
-void __RPC_STUB IWdsTransportContent_get_Namespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportContent_get_Id_Proxy(
-    IWdsTransportContent* This,
-    ULONG *pulId);
-void __RPC_STUB IWdsTransportContent_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportContent_get_Name_Proxy(
-    IWdsTransportContent* This,
-    BSTR *pbszName);
-void __RPC_STUB IWdsTransportContent_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportContent_RetrieveSessions_Proxy(
-    IWdsTransportContent* This,
-    IWdsTransportCollection **ppWdsTransportSessions);
-void __RPC_STUB IWdsTransportContent_RetrieveSessions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportContent_Terminate_Proxy(
-    IWdsTransportContent* This);
-void __RPC_STUB IWdsTransportContent_Terminate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportContent_INTERFACE_DEFINED__ */
 
@@ -5948,29 +5342,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportSession* This);
+        IWdsTransportSession *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportSession* This);
+        IWdsTransportSession *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -5978,7 +5372,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -5990,38 +5384,39 @@
 
     /*** IWdsTransportSession methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Content)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         IWdsTransportContent **ppWdsTransportContent);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_NetworkInterfaceName)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         BSTR *pbszNetworkInterfaceName);
 
     HRESULT (STDMETHODCALLTYPE *get_NetworkInterfaceAddress)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         BSTR *pbszNetworkInterfaceAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_TransferRate)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         ULONG *pulTransferRate);
 
     HRESULT (STDMETHODCALLTYPE *get_MasterClientId)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         ULONG *pulMasterClientId);
 
     HRESULT (STDMETHODCALLTYPE *RetrieveClients)(
-        IWdsTransportSession* This,
+        IWdsTransportSession *This,
         IWdsTransportCollection **ppWdsTransportClients);
 
     HRESULT (STDMETHODCALLTYPE *Terminate)(
-        IWdsTransportSession* This);
+        IWdsTransportSession *This);
 
     END_INTERFACE
 } IWdsTransportSessionVtbl;
+
 interface IWdsTransportSession {
     CONST_VTBL IWdsTransportSessionVtbl* lpVtbl;
 };
@@ -6100,69 +5495,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_Content_Proxy(
-    IWdsTransportSession* This,
-    IWdsTransportContent **ppWdsTransportContent);
-void __RPC_STUB IWdsTransportSession_get_Content_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_Id_Proxy(
-    IWdsTransportSession* This,
-    ULONG *pulId);
-void __RPC_STUB IWdsTransportSession_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_NetworkInterfaceName_Proxy(
-    IWdsTransportSession* This,
-    BSTR *pbszNetworkInterfaceName);
-void __RPC_STUB IWdsTransportSession_get_NetworkInterfaceName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_NetworkInterfaceAddress_Proxy(
-    IWdsTransportSession* This,
-    BSTR *pbszNetworkInterfaceAddress);
-void __RPC_STUB IWdsTransportSession_get_NetworkInterfaceAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_TransferRate_Proxy(
-    IWdsTransportSession* This,
-    ULONG *pulTransferRate);
-void __RPC_STUB IWdsTransportSession_get_TransferRate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_get_MasterClientId_Proxy(
-    IWdsTransportSession* This,
-    ULONG *pulMasterClientId);
-void __RPC_STUB IWdsTransportSession_get_MasterClientId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_RetrieveClients_Proxy(
-    IWdsTransportSession* This,
-    IWdsTransportCollection **ppWdsTransportClients);
-void __RPC_STUB IWdsTransportSession_RetrieveClients_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportSession_Terminate_Proxy(
-    IWdsTransportSession* This);
-void __RPC_STUB IWdsTransportSession_Terminate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportSession_INTERFACE_DEFINED__ */
 
@@ -6224,29 +5556,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportClient* This);
+        IWdsTransportClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportClient* This);
+        IWdsTransportClient *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6254,7 +5586,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6266,55 +5598,56 @@
 
     /*** IWdsTransportClient methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Session)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         IWdsTransportSession **ppWdsTransportSession);
 
     HRESULT (STDMETHODCALLTYPE *get_Id)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         ULONG *pulId);
 
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *get_MacAddress)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         BSTR *pbszMacAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_IpAddress)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         BSTR *pbszIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_PercentCompletion)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         ULONG *pulPercentCompletion);
 
     HRESULT (STDMETHODCALLTYPE *get_JoinDuration)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         ULONG *pulJoinDuration);
 
     HRESULT (STDMETHODCALLTYPE *get_CpuUtilization)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         ULONG *pulCpuUtilization);
 
     HRESULT (STDMETHODCALLTYPE *get_MemoryUtilization)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         ULONG *pulMemoryUtilization);
 
     HRESULT (STDMETHODCALLTYPE *get_NetworkUtilization)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         ULONG *pulNetworkUtilization);
 
     HRESULT (STDMETHODCALLTYPE *get_UserIdentity)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         BSTR *pbszUserIdentity);
 
     HRESULT (STDMETHODCALLTYPE *Disconnect)(
-        IWdsTransportClient* This,
+        IWdsTransportClient *This,
         WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType);
 
     END_INTERFACE
 } IWdsTransportClientVtbl;
+
 interface IWdsTransportClient {
     CONST_VTBL IWdsTransportClientVtbl* lpVtbl;
 };
@@ -6409,102 +5742,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_Session_Proxy(
-    IWdsTransportClient* This,
-    IWdsTransportSession **ppWdsTransportSession);
-void __RPC_STUB IWdsTransportClient_get_Session_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_Id_Proxy(
-    IWdsTransportClient* This,
-    ULONG *pulId);
-void __RPC_STUB IWdsTransportClient_get_Id_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_Name_Proxy(
-    IWdsTransportClient* This,
-    BSTR *pbszName);
-void __RPC_STUB IWdsTransportClient_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_MacAddress_Proxy(
-    IWdsTransportClient* This,
-    BSTR *pbszMacAddress);
-void __RPC_STUB IWdsTransportClient_get_MacAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_IpAddress_Proxy(
-    IWdsTransportClient* This,
-    BSTR *pbszIpAddress);
-void __RPC_STUB IWdsTransportClient_get_IpAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_PercentCompletion_Proxy(
-    IWdsTransportClient* This,
-    ULONG *pulPercentCompletion);
-void __RPC_STUB IWdsTransportClient_get_PercentCompletion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_JoinDuration_Proxy(
-    IWdsTransportClient* This,
-    ULONG *pulJoinDuration);
-void __RPC_STUB IWdsTransportClient_get_JoinDuration_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_CpuUtilization_Proxy(
-    IWdsTransportClient* This,
-    ULONG *pulCpuUtilization);
-void __RPC_STUB IWdsTransportClient_get_CpuUtilization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_MemoryUtilization_Proxy(
-    IWdsTransportClient* This,
-    ULONG *pulMemoryUtilization);
-void __RPC_STUB IWdsTransportClient_get_MemoryUtilization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_NetworkUtilization_Proxy(
-    IWdsTransportClient* This,
-    ULONG *pulNetworkUtilization);
-void __RPC_STUB IWdsTransportClient_get_NetworkUtilization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_get_UserIdentity_Proxy(
-    IWdsTransportClient* This,
-    BSTR *pbszUserIdentity);
-void __RPC_STUB IWdsTransportClient_get_UserIdentity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportClient_Disconnect_Proxy(
-    IWdsTransportClient* This,
-    WDSTRANSPORT_DISCONNECT_TYPE DisconnectionType);
-void __RPC_STUB IWdsTransportClient_Disconnect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportClient_INTERFACE_DEFINED__ */
 
@@ -6551,29 +5788,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportTftpClient* This);
+        IWdsTransportTftpClient *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportTftpClient* This);
+        IWdsTransportTftpClient *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6581,7 +5818,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6593,35 +5830,36 @@
 
     /*** IWdsTransportTftpClient methods ***/
     HRESULT (STDMETHODCALLTYPE *get_FileName)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         BSTR *pbszFileName);
 
     HRESULT (STDMETHODCALLTYPE *get_IpAddress)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         BSTR *pbszIpAddress);
 
     HRESULT (STDMETHODCALLTYPE *get_Timeout)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         ULONG *pulTimeout);
 
     HRESULT (STDMETHODCALLTYPE *get_CurrentFileOffset)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         ULONG64 *pul64CurrentOffset);
 
     HRESULT (STDMETHODCALLTYPE *get_FileSize)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         ULONG64 *pul64FileSize);
 
     HRESULT (STDMETHODCALLTYPE *get_BlockSize)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         ULONG *pulBlockSize);
 
     HRESULT (STDMETHODCALLTYPE *get_WindowSize)(
-        IWdsTransportTftpClient* This,
+        IWdsTransportTftpClient *This,
         ULONG *pulWindowSize);
 
     END_INTERFACE
 } IWdsTransportTftpClientVtbl;
+
 interface IWdsTransportTftpClient {
     CONST_VTBL IWdsTransportTftpClientVtbl* lpVtbl;
 };
@@ -6696,62 +5934,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_FileName_Proxy(
-    IWdsTransportTftpClient* This,
-    BSTR *pbszFileName);
-void __RPC_STUB IWdsTransportTftpClient_get_FileName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_IpAddress_Proxy(
-    IWdsTransportTftpClient* This,
-    BSTR *pbszIpAddress);
-void __RPC_STUB IWdsTransportTftpClient_get_IpAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_Timeout_Proxy(
-    IWdsTransportTftpClient* This,
-    ULONG *pulTimeout);
-void __RPC_STUB IWdsTransportTftpClient_get_Timeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_CurrentFileOffset_Proxy(
-    IWdsTransportTftpClient* This,
-    ULONG64 *pul64CurrentOffset);
-void __RPC_STUB IWdsTransportTftpClient_get_CurrentFileOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_FileSize_Proxy(
-    IWdsTransportTftpClient* This,
-    ULONG64 *pul64FileSize);
-void __RPC_STUB IWdsTransportTftpClient_get_FileSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_BlockSize_Proxy(
-    IWdsTransportTftpClient* This,
-    ULONG *pulBlockSize);
-void __RPC_STUB IWdsTransportTftpClient_get_BlockSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportTftpClient_get_WindowSize_Proxy(
-    IWdsTransportTftpClient* This,
-    ULONG *pulWindowSize);
-void __RPC_STUB IWdsTransportTftpClient_get_WindowSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportTftpClient_INTERFACE_DEFINED__ */
 
@@ -6789,29 +5971,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWdsTransportContentProvider* This);
+        IWdsTransportContentProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWdsTransportContentProvider* This);
+        IWdsTransportContentProvider *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -6819,7 +6001,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -6831,23 +6013,24 @@
 
     /*** IWdsTransportContentProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *get_Name)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         BSTR *pbszName);
 
     HRESULT (STDMETHODCALLTYPE *get_Description)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         BSTR *pbszDescription);
 
     HRESULT (STDMETHODCALLTYPE *get_FilePath)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         BSTR *pbszFilePath);
 
     HRESULT (STDMETHODCALLTYPE *get_InitializationRoutine)(
-        IWdsTransportContentProvider* This,
+        IWdsTransportContentProvider *This,
         BSTR *pbszInitializationRoutine);
 
     END_INTERFACE
 } IWdsTransportContentProviderVtbl;
+
 interface IWdsTransportContentProvider {
     CONST_VTBL IWdsTransportContentProviderVtbl* lpVtbl;
 };
@@ -6910,38 +6093,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_Name_Proxy(
-    IWdsTransportContentProvider* This,
-    BSTR *pbszName);
-void __RPC_STUB IWdsTransportContentProvider_get_Name_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_Description_Proxy(
-    IWdsTransportContentProvider* This,
-    BSTR *pbszDescription);
-void __RPC_STUB IWdsTransportContentProvider_get_Description_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_FilePath_Proxy(
-    IWdsTransportContentProvider* This,
-    BSTR *pbszFilePath);
-void __RPC_STUB IWdsTransportContentProvider_get_FilePath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWdsTransportContentProvider_get_InitializationRoutine_Proxy(
-    IWdsTransportContentProvider* This,
-    BSTR *pbszInitializationRoutine);
-void __RPC_STUB IWdsTransportContentProvider_get_InitializationRoutine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWdsTransportContentProvider_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wincodec.h b/mingw-w64-headers/include/wincodec.h
index 8c750ea..cf5f31b 100644
--- a/mingw-w64-headers/include/wincodec.h
+++ b/mingw-w64-headers/include/wincodec.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wincodec.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wincodec.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,136 +20,217 @@
 #ifndef __IWICColorContext_FWD_DEFINED__
 #define __IWICColorContext_FWD_DEFINED__
 typedef interface IWICColorContext IWICColorContext;
+#ifdef __cplusplus
+interface IWICColorContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapSource_FWD_DEFINED__
 #define __IWICBitmapSource_FWD_DEFINED__
 typedef interface IWICBitmapSource IWICBitmapSource;
+#ifdef __cplusplus
+interface IWICBitmapSource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapLock_FWD_DEFINED__
 #define __IWICBitmapLock_FWD_DEFINED__
 typedef interface IWICBitmapLock IWICBitmapLock;
+#ifdef __cplusplus
+interface IWICBitmapLock;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapFlipRotator_FWD_DEFINED__
 #define __IWICBitmapFlipRotator_FWD_DEFINED__
 typedef interface IWICBitmapFlipRotator IWICBitmapFlipRotator;
+#ifdef __cplusplus
+interface IWICBitmapFlipRotator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmap_FWD_DEFINED__
 #define __IWICBitmap_FWD_DEFINED__
 typedef interface IWICBitmap IWICBitmap;
+#ifdef __cplusplus
+interface IWICBitmap;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICPalette_FWD_DEFINED__
 #define __IWICPalette_FWD_DEFINED__
 typedef interface IWICPalette IWICPalette;
+#ifdef __cplusplus
+interface IWICPalette;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICComponentInfo_FWD_DEFINED__
 #define __IWICComponentInfo_FWD_DEFINED__
 typedef interface IWICComponentInfo IWICComponentInfo;
+#ifdef __cplusplus
+interface IWICComponentInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICMetadataQueryReader_FWD_DEFINED__
 #define __IWICMetadataQueryReader_FWD_DEFINED__
 typedef interface IWICMetadataQueryReader IWICMetadataQueryReader;
+#ifdef __cplusplus
+interface IWICMetadataQueryReader;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICMetadataQueryWriter_FWD_DEFINED__
 #define __IWICMetadataQueryWriter_FWD_DEFINED__
 typedef interface IWICMetadataQueryWriter IWICMetadataQueryWriter;
+#ifdef __cplusplus
+interface IWICMetadataQueryWriter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapFrameDecode_FWD_DEFINED__
 #define __IWICBitmapFrameDecode_FWD_DEFINED__
 typedef interface IWICBitmapFrameDecode IWICBitmapFrameDecode;
+#ifdef __cplusplus
+interface IWICBitmapFrameDecode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICPixelFormatInfo_FWD_DEFINED__
 #define __IWICPixelFormatInfo_FWD_DEFINED__
 typedef interface IWICPixelFormatInfo IWICPixelFormatInfo;
+#ifdef __cplusplus
+interface IWICPixelFormatInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICPixelFormatInfo2_FWD_DEFINED__
 #define __IWICPixelFormatInfo2_FWD_DEFINED__
 typedef interface IWICPixelFormatInfo2 IWICPixelFormatInfo2;
+#ifdef __cplusplus
+interface IWICPixelFormatInfo2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapCodecInfo_FWD_DEFINED__
 #define __IWICBitmapCodecInfo_FWD_DEFINED__
 typedef interface IWICBitmapCodecInfo IWICBitmapCodecInfo;
+#ifdef __cplusplus
+interface IWICBitmapCodecInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapDecoderInfo_FWD_DEFINED__
 #define __IWICBitmapDecoderInfo_FWD_DEFINED__
 typedef interface IWICBitmapDecoderInfo IWICBitmapDecoderInfo;
+#ifdef __cplusplus
+interface IWICBitmapDecoderInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapDecoder_FWD_DEFINED__
 #define __IWICBitmapDecoder_FWD_DEFINED__
 typedef interface IWICBitmapDecoder IWICBitmapDecoder;
+#ifdef __cplusplus
+interface IWICBitmapDecoder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapFrameEncode_FWD_DEFINED__
 #define __IWICBitmapFrameEncode_FWD_DEFINED__
 typedef interface IWICBitmapFrameEncode IWICBitmapFrameEncode;
+#ifdef __cplusplus
+interface IWICBitmapFrameEncode;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapEncoderInfo_FWD_DEFINED__
 #define __IWICBitmapEncoderInfo_FWD_DEFINED__
 typedef interface IWICBitmapEncoderInfo IWICBitmapEncoderInfo;
+#ifdef __cplusplus
+interface IWICBitmapEncoderInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapEncoder_FWD_DEFINED__
 #define __IWICBitmapEncoder_FWD_DEFINED__
 typedef interface IWICBitmapEncoder IWICBitmapEncoder;
+#ifdef __cplusplus
+interface IWICBitmapEncoder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICFormatConverter_FWD_DEFINED__
 #define __IWICFormatConverter_FWD_DEFINED__
 typedef interface IWICFormatConverter IWICFormatConverter;
+#ifdef __cplusplus
+interface IWICFormatConverter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICFormatConverterInfo_FWD_DEFINED__
 #define __IWICFormatConverterInfo_FWD_DEFINED__
 typedef interface IWICFormatConverterInfo IWICFormatConverterInfo;
+#ifdef __cplusplus
+interface IWICFormatConverterInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICStream_FWD_DEFINED__
 #define __IWICStream_FWD_DEFINED__
 typedef interface IWICStream IWICStream;
+#ifdef __cplusplus
+interface IWICStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapScaler_FWD_DEFINED__
 #define __IWICBitmapScaler_FWD_DEFINED__
 typedef interface IWICBitmapScaler IWICBitmapScaler;
+#ifdef __cplusplus
+interface IWICBitmapScaler;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICBitmapClipper_FWD_DEFINED__
 #define __IWICBitmapClipper_FWD_DEFINED__
 typedef interface IWICBitmapClipper IWICBitmapClipper;
+#ifdef __cplusplus
+interface IWICBitmapClipper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICColorTransform_FWD_DEFINED__
 #define __IWICColorTransform_FWD_DEFINED__
 typedef interface IWICColorTransform IWICColorTransform;
+#ifdef __cplusplus
+interface IWICColorTransform;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICFastMetadataEncoder_FWD_DEFINED__
 #define __IWICFastMetadataEncoder_FWD_DEFINED__
 typedef interface IWICFastMetadataEncoder IWICFastMetadataEncoder;
+#ifdef __cplusplus
+interface IWICFastMetadataEncoder;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICImagingFactory_FWD_DEFINED__
 #define __IWICImagingFactory_FWD_DEFINED__
 typedef interface IWICImagingFactory IWICImagingFactory;
+#ifdef __cplusplus
+interface IWICImagingFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWICEnumMetadataItem_FWD_DEFINED__
 #define __IWICEnumMetadataItem_FWD_DEFINED__
 typedef interface IWICEnumMetadataItem IWICEnumMetadataItem;
+#ifdef __cplusplus
+interface IWICEnumMetadataItem;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -359,6 +440,9 @@
 #ifndef __IWICPalette_FWD_DEFINED__
 #define __IWICPalette_FWD_DEFINED__
 typedef interface IWICPalette IWICPalette;
+#ifdef __cplusplus
+interface IWICPalette;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -403,46 +487,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICColorContext* This,
+        IWICColorContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICColorContext* This);
+        IWICColorContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICColorContext* This);
+        IWICColorContext *This);
 
     /*** IWICColorContext methods ***/
     HRESULT (STDMETHODCALLTYPE *InitializeFromFilename)(
-        IWICColorContext* This,
+        IWICColorContext *This,
         LPCWSTR wzFilename);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromMemory)(
-        IWICColorContext* This,
+        IWICColorContext *This,
         const BYTE *pbBuffer,
         UINT cbBufferSize);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromExifColorSpace)(
-        IWICColorContext* This,
+        IWICColorContext *This,
         UINT value);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IWICColorContext* This,
+        IWICColorContext *This,
         WICColorContextType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetProfileBytes)(
-        IWICColorContext* This,
+        IWICColorContext *This,
         UINT cbBuffer,
         BYTE *pbBuffer,
         UINT *pcbActual);
 
     HRESULT (STDMETHODCALLTYPE *GetExifColorSpace)(
-        IWICColorContext* This,
+        IWICColorContext *This,
         UINT *pValue);
 
     END_INTERFACE
 } IWICColorContextVtbl;
+
 interface IWICColorContext {
     CONST_VTBL IWICColorContextVtbl* lpVtbl;
 };
@@ -495,57 +580,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICColorContext_InitializeFromFilename_Proxy(
-    IWICColorContext* This,
-    LPCWSTR wzFilename);
-void __RPC_STUB IWICColorContext_InitializeFromFilename_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICColorContext_InitializeFromMemory_Proxy(
-    IWICColorContext* This,
-    const BYTE *pbBuffer,
-    UINT cbBufferSize);
-void __RPC_STUB IWICColorContext_InitializeFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICColorContext_InitializeFromExifColorSpace_Proxy(
-    IWICColorContext* This,
-    UINT value);
-void __RPC_STUB IWICColorContext_InitializeFromExifColorSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICColorContext_GetType_Proxy(
-    IWICColorContext* This,
-    WICColorContextType *pType);
-void __RPC_STUB IWICColorContext_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICColorContext_GetProfileBytes_Proxy(
-    IWICColorContext* This,
-    UINT cbBuffer,
-    BYTE *pbBuffer,
-    UINT *pcbActual);
-void __RPC_STUB IWICColorContext_GetProfileBytes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICColorContext_GetExifColorSpace_Proxy(
-    IWICColorContext* This,
-    UINT *pValue);
-void __RPC_STUB IWICColorContext_GetExifColorSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICColorContext_INTERFACE_DEFINED__ */
 
@@ -590,37 +624,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapSource* This,
+        IWICBitmapSource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapSource* This);
+        IWICBitmapSource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapSource* This);
+        IWICBitmapSource *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICBitmapSource* This,
+        IWICBitmapSource *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICBitmapSource* This,
+        IWICBitmapSource *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICBitmapSource* This,
+        IWICBitmapSource *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICBitmapSource* This,
+        IWICBitmapSource *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICBitmapSource* This,
+        IWICBitmapSource *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -628,6 +662,7 @@
 
     END_INTERFACE
 } IWICBitmapSourceVtbl;
+
 interface IWICBitmapSource {
     CONST_VTBL IWICBitmapSourceVtbl* lpVtbl;
 };
@@ -676,51 +711,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapSource_GetSize_Proxy(
-    IWICBitmapSource* This,
-    UINT *puiWidth,
-    UINT *puiHeight);
-void __RPC_STUB IWICBitmapSource_GetSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapSource_GetPixelFormat_Proxy(
-    IWICBitmapSource* This,
-    WICPixelFormatGUID *pPixelFormat);
-void __RPC_STUB IWICBitmapSource_GetPixelFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapSource_GetResolution_Proxy(
-    IWICBitmapSource* This,
-    double *pDpiX,
-    double *pDpiY);
-void __RPC_STUB IWICBitmapSource_GetResolution_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapSource_CopyPalette_Proxy(
-    IWICBitmapSource* This,
-    IWICPalette *pIPalette);
-void __RPC_STUB IWICBitmapSource_CopyPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapSource_CopyPixels_Proxy(
-    IWICBitmapSource* This,
-    const WICRect *prc,
-    UINT cbStride,
-    UINT cbBufferSize,
-    BYTE *pbBuffer);
-void __RPC_STUB IWICBitmapSource_CopyPixels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapSource_INTERFACE_DEFINED__ */
 
@@ -759,37 +749,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapLock* This,
+        IWICBitmapLock *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapLock* This);
+        IWICBitmapLock *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapLock* This);
+        IWICBitmapLock *This);
 
     /*** IWICBitmapLock methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICBitmapLock* This,
+        IWICBitmapLock *This,
         UINT *pWidth,
         UINT *pHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetStride)(
-        IWICBitmapLock* This,
+        IWICBitmapLock *This,
         UINT *pcbStride);
 
     HRESULT (STDMETHODCALLTYPE *GetDataPointer)(
-        IWICBitmapLock* This,
+        IWICBitmapLock *This,
         UINT *pcbBufferSize,
         BYTE **ppbData);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICBitmapLock* This,
+        IWICBitmapLock *This,
         WICPixelFormatGUID *pPixelFormat);
 
     END_INTERFACE
 } IWICBitmapLockVtbl;
+
 interface IWICBitmapLock {
     CONST_VTBL IWICBitmapLockVtbl* lpVtbl;
 };
@@ -834,40 +825,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetSize_Proxy(
-    IWICBitmapLock* This,
-    UINT *pWidth,
-    UINT *pHeight);
-void __RPC_STUB IWICBitmapLock_GetSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetStride_Proxy(
-    IWICBitmapLock* This,
-    UINT *pcbStride);
-void __RPC_STUB IWICBitmapLock_GetStride_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetDataPointer_Proxy(
-    IWICBitmapLock* This,
-    UINT *pcbBufferSize,
-    BYTE **ppbData);
-void __RPC_STUB IWICBitmapLock_GetDataPointer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapLock_GetPixelFormat_Proxy(
-    IWICBitmapLock* This,
-    WICPixelFormatGUID *pPixelFormat);
-void __RPC_STUB IWICBitmapLock_GetPixelFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapLock_INTERFACE_DEFINED__ */
 
@@ -896,37 +853,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapFlipRotator* This,
+        IWICBitmapFlipRotator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapFlipRotator* This);
+        IWICBitmapFlipRotator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapFlipRotator* This);
+        IWICBitmapFlipRotator *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICBitmapFlipRotator* This,
+        IWICBitmapFlipRotator *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICBitmapFlipRotator* This,
+        IWICBitmapFlipRotator *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICBitmapFlipRotator* This,
+        IWICBitmapFlipRotator *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICBitmapFlipRotator* This,
+        IWICBitmapFlipRotator *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICBitmapFlipRotator* This,
+        IWICBitmapFlipRotator *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -934,12 +891,13 @@
 
     /*** IWICBitmapFlipRotator methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICBitmapFlipRotator* This,
+        IWICBitmapFlipRotator *This,
         IWICBitmapSource *pISource,
         WICBitmapTransformOptions options);
 
     END_INTERFACE
 } IWICBitmapFlipRotatorVtbl;
+
 interface IWICBitmapFlipRotator {
     CONST_VTBL IWICBitmapFlipRotatorVtbl* lpVtbl;
 };
@@ -994,15 +952,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapFlipRotator_Initialize_Proxy(
-    IWICBitmapFlipRotator* This,
-    IWICBitmapSource *pISource,
-    WICBitmapTransformOptions options);
-void __RPC_STUB IWICBitmapFlipRotator_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapFlipRotator_INTERFACE_DEFINED__ */
 
@@ -1039,37 +988,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmap* This);
+        IWICBitmap *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmap* This);
+        IWICBitmap *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -1077,22 +1026,23 @@
 
     /*** IWICBitmap methods ***/
     HRESULT (STDMETHODCALLTYPE *Lock)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         const WICRect *prcLock,
         DWORD flags,
         IWICBitmapLock **ppILock);
 
     HRESULT (STDMETHODCALLTYPE *SetPalette)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *SetResolution)(
-        IWICBitmap* This,
+        IWICBitmap *This,
         double dpiX,
         double dpiY);
 
     END_INTERFACE
 } IWICBitmapVtbl;
+
 interface IWICBitmap {
     CONST_VTBL IWICBitmapVtbl* lpVtbl;
 };
@@ -1155,33 +1105,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmap_Lock_Proxy(
-    IWICBitmap* This,
-    const WICRect *prcLock,
-    DWORD flags,
-    IWICBitmapLock **ppILock);
-void __RPC_STUB IWICBitmap_Lock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmap_SetPalette_Proxy(
-    IWICBitmap* This,
-    IWICPalette *pIPalette);
-void __RPC_STUB IWICBitmap_SetPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmap_SetResolution_Proxy(
-    IWICBitmap* This,
-    double dpiX,
-    double dpiY);
-void __RPC_STUB IWICBitmap_SetResolution_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmap_INTERFACE_DEFINED__ */
 
@@ -1242,65 +1165,66 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICPalette* This,
+        IWICPalette *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICPalette* This);
+        IWICPalette *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICPalette* This);
+        IWICPalette *This);
 
     /*** IWICPalette methods ***/
     HRESULT (STDMETHODCALLTYPE *InitializePredefined)(
-        IWICPalette* This,
+        IWICPalette *This,
         WICBitmapPaletteType ePaletteType,
         WINBOOL fAddTransparentColor);
 
     HRESULT (STDMETHODCALLTYPE *InitializeCustom)(
-        IWICPalette* This,
+        IWICPalette *This,
         WICColor *pColors,
         UINT colorCount);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromBitmap)(
-        IWICPalette* This,
+        IWICPalette *This,
         IWICBitmapSource *pISurface,
         UINT colorCount,
         WINBOOL fAddTransparentColor);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromPalette)(
-        IWICPalette* This,
+        IWICPalette *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IWICPalette* This,
+        IWICPalette *This,
         WICBitmapPaletteType *pePaletteType);
 
     HRESULT (STDMETHODCALLTYPE *GetColorCount)(
-        IWICPalette* This,
+        IWICPalette *This,
         UINT *pcCount);
 
     HRESULT (STDMETHODCALLTYPE *GetColors)(
-        IWICPalette* This,
+        IWICPalette *This,
         UINT colorCount,
         WICColor *pColors,
         UINT *pcActualColors);
 
     HRESULT (STDMETHODCALLTYPE *IsBlackWhite)(
-        IWICPalette* This,
+        IWICPalette *This,
         WINBOOL *pfIsBlackWhite);
 
     HRESULT (STDMETHODCALLTYPE *IsGrayscale)(
-        IWICPalette* This,
+        IWICPalette *This,
         WINBOOL *pfIsGrayscale);
 
     HRESULT (STDMETHODCALLTYPE *HasAlpha)(
-        IWICPalette* This,
+        IWICPalette *This,
         WINBOOL *pfHasAlpha);
 
     END_INTERFACE
 } IWICPaletteVtbl;
+
 interface IWICPalette {
     CONST_VTBL IWICPaletteVtbl* lpVtbl;
 };
@@ -1369,92 +1293,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICPalette_InitializePredefined_Proxy(
-    IWICPalette* This,
-    WICBitmapPaletteType ePaletteType,
-    WINBOOL fAddTransparentColor);
-void __RPC_STUB IWICPalette_InitializePredefined_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_InitializeCustom_Proxy(
-    IWICPalette* This,
-    WICColor *pColors,
-    UINT colorCount);
-void __RPC_STUB IWICPalette_InitializeCustom_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_InitializeFromBitmap_Proxy(
-    IWICPalette* This,
-    IWICBitmapSource *pISurface,
-    UINT colorCount,
-    WINBOOL fAddTransparentColor);
-void __RPC_STUB IWICPalette_InitializeFromBitmap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_InitializeFromPalette_Proxy(
-    IWICPalette* This,
-    IWICPalette *pIPalette);
-void __RPC_STUB IWICPalette_InitializeFromPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_GetType_Proxy(
-    IWICPalette* This,
-    WICBitmapPaletteType *pePaletteType);
-void __RPC_STUB IWICPalette_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_GetColorCount_Proxy(
-    IWICPalette* This,
-    UINT *pcCount);
-void __RPC_STUB IWICPalette_GetColorCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_GetColors_Proxy(
-    IWICPalette* This,
-    UINT colorCount,
-    WICColor *pColors,
-    UINT *pcActualColors);
-void __RPC_STUB IWICPalette_GetColors_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_IsBlackWhite_Proxy(
-    IWICPalette* This,
-    WINBOOL *pfIsBlackWhite);
-void __RPC_STUB IWICPalette_IsBlackWhite_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_IsGrayscale_Proxy(
-    IWICPalette* This,
-    WINBOOL *pfIsGrayscale);
-void __RPC_STUB IWICPalette_IsGrayscale_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPalette_HasAlpha_Proxy(
-    IWICPalette* This,
-    WINBOOL *pfHasAlpha);
-void __RPC_STUB IWICPalette_HasAlpha_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICPalette_INTERFACE_DEFINED__ */
 
@@ -1511,59 +1349,60 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICComponentInfo* This);
+        IWICComponentInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICComponentInfo* This);
+        IWICComponentInfo *This);
 
     /*** IWICComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetComponentType)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         WICComponentType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningStatus)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         DWORD *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthor)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         UINT cchAuthor,
         WCHAR *wzAuthor,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorGUID)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         GUID *pguidVendor);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         UINT cchVersion,
         WCHAR *wzVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetSpecVersion)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         UINT cchSpecVersion,
         WCHAR *wzSpecVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IWICComponentInfo* This,
+        IWICComponentInfo *This,
         UINT cchFriendlyName,
         WCHAR *wzFriendlyName,
         UINT *pcchActual);
 
     END_INTERFACE
 } IWICComponentInfoVtbl;
+
 interface IWICComponentInfo {
     CONST_VTBL IWICComponentInfoVtbl* lpVtbl;
 };
@@ -1624,78 +1463,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetComponentType_Proxy(
-    IWICComponentInfo* This,
-    WICComponentType *pType);
-void __RPC_STUB IWICComponentInfo_GetComponentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetCLSID_Proxy(
-    IWICComponentInfo* This,
-    CLSID *pclsid);
-void __RPC_STUB IWICComponentInfo_GetCLSID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetSigningStatus_Proxy(
-    IWICComponentInfo* This,
-    DWORD *pStatus);
-void __RPC_STUB IWICComponentInfo_GetSigningStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetAuthor_Proxy(
-    IWICComponentInfo* This,
-    UINT cchAuthor,
-    WCHAR *wzAuthor,
-    UINT *pcchActual);
-void __RPC_STUB IWICComponentInfo_GetAuthor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetVendorGUID_Proxy(
-    IWICComponentInfo* This,
-    GUID *pguidVendor);
-void __RPC_STUB IWICComponentInfo_GetVendorGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetVersion_Proxy(
-    IWICComponentInfo* This,
-    UINT cchVersion,
-    WCHAR *wzVersion,
-    UINT *pcchActual);
-void __RPC_STUB IWICComponentInfo_GetVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetSpecVersion_Proxy(
-    IWICComponentInfo* This,
-    UINT cchSpecVersion,
-    WCHAR *wzSpecVersion,
-    UINT *pcchActual);
-void __RPC_STUB IWICComponentInfo_GetSpecVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICComponentInfo_GetFriendlyName_Proxy(
-    IWICComponentInfo* This,
-    UINT cchFriendlyName,
-    WCHAR *wzFriendlyName,
-    UINT *pcchActual);
-void __RPC_STUB IWICComponentInfo_GetFriendlyName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICComponentInfo_INTERFACE_DEFINED__ */
 
@@ -1735,38 +1502,39 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICMetadataQueryReader* This,
+        IWICMetadataQueryReader *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICMetadataQueryReader* This);
+        IWICMetadataQueryReader *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICMetadataQueryReader* This);
+        IWICMetadataQueryReader *This);
 
     /*** IWICMetadataQueryReader methods ***/
     HRESULT (STDMETHODCALLTYPE *GetContainerFormat)(
-        IWICMetadataQueryReader* This,
+        IWICMetadataQueryReader *This,
         GUID *pguidContainerFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetLocation)(
-        IWICMetadataQueryReader* This,
+        IWICMetadataQueryReader *This,
         UINT cchMaxLength,
         WCHAR *wzNamespace,
         UINT *pcchActualLength);
 
     HRESULT (STDMETHODCALLTYPE *GetMetadataByName)(
-        IWICMetadataQueryReader* This,
+        IWICMetadataQueryReader *This,
         LPCWSTR wzName,
         PROPVARIANT *pvarValue);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IWICMetadataQueryReader* This,
+        IWICMetadataQueryReader *This,
         IEnumString **ppIEnumString);
 
     END_INTERFACE
 } IWICMetadataQueryReaderVtbl;
+
 interface IWICMetadataQueryReader {
     CONST_VTBL IWICMetadataQueryReaderVtbl* lpVtbl;
 };
@@ -1811,41 +1579,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetContainerFormat_Proxy(
-    IWICMetadataQueryReader* This,
-    GUID *pguidContainerFormat);
-void __RPC_STUB IWICMetadataQueryReader_GetContainerFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetLocation_Proxy(
-    IWICMetadataQueryReader* This,
-    UINT cchMaxLength,
-    WCHAR *wzNamespace,
-    UINT *pcchActualLength);
-void __RPC_STUB IWICMetadataQueryReader_GetLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetMetadataByName_Proxy(
-    IWICMetadataQueryReader* This,
-    LPCWSTR wzName,
-    PROPVARIANT *pvarValue);
-void __RPC_STUB IWICMetadataQueryReader_GetMetadataByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICMetadataQueryReader_GetEnumerator_Proxy(
-    IWICMetadataQueryReader* This,
-    IEnumString **ppIEnumString);
-void __RPC_STUB IWICMetadataQueryReader_GetEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICMetadataQueryReader_INTERFACE_DEFINED__ */
 
@@ -1877,48 +1610,49 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICMetadataQueryWriter* This,
+        IWICMetadataQueryWriter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICMetadataQueryWriter* This);
+        IWICMetadataQueryWriter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICMetadataQueryWriter* This);
+        IWICMetadataQueryWriter *This);
 
     /*** IWICMetadataQueryReader methods ***/
     HRESULT (STDMETHODCALLTYPE *GetContainerFormat)(
-        IWICMetadataQueryWriter* This,
+        IWICMetadataQueryWriter *This,
         GUID *pguidContainerFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetLocation)(
-        IWICMetadataQueryWriter* This,
+        IWICMetadataQueryWriter *This,
         UINT cchMaxLength,
         WCHAR *wzNamespace,
         UINT *pcchActualLength);
 
     HRESULT (STDMETHODCALLTYPE *GetMetadataByName)(
-        IWICMetadataQueryWriter* This,
+        IWICMetadataQueryWriter *This,
         LPCWSTR wzName,
         PROPVARIANT *pvarValue);
 
     HRESULT (STDMETHODCALLTYPE *GetEnumerator)(
-        IWICMetadataQueryWriter* This,
+        IWICMetadataQueryWriter *This,
         IEnumString **ppIEnumString);
 
     /*** IWICMetadataQueryWriter methods ***/
     HRESULT (STDMETHODCALLTYPE *SetMetadataByName)(
-        IWICMetadataQueryWriter* This,
+        IWICMetadataQueryWriter *This,
         LPCWSTR wzName,
         const PROPVARIANT *pvarValue);
 
     HRESULT (STDMETHODCALLTYPE *RemoveMetadataByName)(
-        IWICMetadataQueryWriter* This,
+        IWICMetadataQueryWriter *This,
         LPCWSTR wzName);
 
     END_INTERFACE
 } IWICMetadataQueryWriterVtbl;
+
 interface IWICMetadataQueryWriter {
     CONST_VTBL IWICMetadataQueryWriterVtbl* lpVtbl;
 };
@@ -1973,23 +1707,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICMetadataQueryWriter_SetMetadataByName_Proxy(
-    IWICMetadataQueryWriter* This,
-    LPCWSTR wzName,
-    const PROPVARIANT *pvarValue);
-void __RPC_STUB IWICMetadataQueryWriter_SetMetadataByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICMetadataQueryWriter_RemoveMetadataByName_Proxy(
-    IWICMetadataQueryWriter* This,
-    LPCWSTR wzName);
-void __RPC_STUB IWICMetadataQueryWriter_RemoveMetadataByName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICMetadataQueryWriter_INTERFACE_DEFINED__ */
 
@@ -2025,37 +1742,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapFrameDecode* This);
+        IWICBitmapFrameDecode *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapFrameDecode* This);
+        IWICBitmapFrameDecode *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -2063,21 +1780,22 @@
 
     /*** IWICBitmapFrameDecode methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMetadataQueryReader)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         IWICMetadataQueryReader **ppIMetadataQueryReader);
 
     HRESULT (STDMETHODCALLTYPE *GetColorContexts)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         UINT cCount,
         IWICColorContext **ppIColorContexts,
         UINT *pcActualCount);
 
     HRESULT (STDMETHODCALLTYPE *GetThumbnail)(
-        IWICBitmapFrameDecode* This,
+        IWICBitmapFrameDecode *This,
         IWICBitmapSource **ppIThumbnail);
 
     END_INTERFACE
 } IWICBitmapFrameDecodeVtbl;
+
 interface IWICBitmapFrameDecode {
     CONST_VTBL IWICBitmapFrameDecodeVtbl* lpVtbl;
 };
@@ -2140,32 +1858,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameDecode_GetMetadataQueryReader_Proxy(
-    IWICBitmapFrameDecode* This,
-    IWICMetadataQueryReader **ppIMetadataQueryReader);
-void __RPC_STUB IWICBitmapFrameDecode_GetMetadataQueryReader_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameDecode_GetColorContexts_Proxy(
-    IWICBitmapFrameDecode* This,
-    UINT cCount,
-    IWICColorContext **ppIColorContexts,
-    UINT *pcActualCount);
-void __RPC_STUB IWICBitmapFrameDecode_GetColorContexts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameDecode_GetThumbnail_Proxy(
-    IWICBitmapFrameDecode* This,
-    IWICBitmapSource **ppIThumbnail);
-void __RPC_STUB IWICBitmapFrameDecode_GetThumbnail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapFrameDecode_INTERFACE_DEFINED__ */
 
@@ -2208,76 +1900,76 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICPixelFormatInfo* This);
+        IWICPixelFormatInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICPixelFormatInfo* This);
+        IWICPixelFormatInfo *This);
 
     /*** IWICComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetComponentType)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         WICComponentType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningStatus)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         DWORD *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthor)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         UINT cchAuthor,
         WCHAR *wzAuthor,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorGUID)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         GUID *pguidVendor);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         UINT cchVersion,
         WCHAR *wzVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetSpecVersion)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         UINT cchSpecVersion,
         WCHAR *wzSpecVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         UINT cchFriendlyName,
         WCHAR *wzFriendlyName,
         UINT *pcchActual);
 
     /*** IWICPixelFormatInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormatGUID)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         GUID *pFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetColorContext)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         IWICColorContext **ppIColorContext);
 
     HRESULT (STDMETHODCALLTYPE *GetBitsPerPixel)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         UINT *puiBitsPerPixel);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelCount)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         UINT *puiChannelCount);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelMask)(
-        IWICPixelFormatInfo* This,
+        IWICPixelFormatInfo *This,
         UINT uiChannelIndex,
         UINT cbMaskBuffer,
         BYTE *pbMaskBuffer,
@@ -2285,6 +1977,7 @@
 
     END_INTERFACE
 } IWICPixelFormatInfoVtbl;
+
 interface IWICPixelFormatInfo {
     CONST_VTBL IWICPixelFormatInfoVtbl* lpVtbl;
 };
@@ -2367,49 +2060,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetFormatGUID_Proxy(
-    IWICPixelFormatInfo* This,
-    GUID *pFormat);
-void __RPC_STUB IWICPixelFormatInfo_GetFormatGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetColorContext_Proxy(
-    IWICPixelFormatInfo* This,
-    IWICColorContext **ppIColorContext);
-void __RPC_STUB IWICPixelFormatInfo_GetColorContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetBitsPerPixel_Proxy(
-    IWICPixelFormatInfo* This,
-    UINT *puiBitsPerPixel);
-void __RPC_STUB IWICPixelFormatInfo_GetBitsPerPixel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetChannelCount_Proxy(
-    IWICPixelFormatInfo* This,
-    UINT *puiChannelCount);
-void __RPC_STUB IWICPixelFormatInfo_GetChannelCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo_GetChannelMask_Proxy(
-    IWICPixelFormatInfo* This,
-    UINT uiChannelIndex,
-    UINT cbMaskBuffer,
-    BYTE *pbMaskBuffer,
-    UINT *pcbActual);
-void __RPC_STUB IWICPixelFormatInfo_GetChannelMask_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICPixelFormatInfo_INTERFACE_DEFINED__ */
 
@@ -2440,76 +2090,76 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICPixelFormatInfo2* This);
+        IWICPixelFormatInfo2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICPixelFormatInfo2* This);
+        IWICPixelFormatInfo2 *This);
 
     /*** IWICComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetComponentType)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         WICComponentType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningStatus)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         DWORD *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthor)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         UINT cchAuthor,
         WCHAR *wzAuthor,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorGUID)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         GUID *pguidVendor);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         UINT cchVersion,
         WCHAR *wzVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetSpecVersion)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         UINT cchSpecVersion,
         WCHAR *wzSpecVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         UINT cchFriendlyName,
         WCHAR *wzFriendlyName,
         UINT *pcchActual);
 
     /*** IWICPixelFormatInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFormatGUID)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         GUID *pFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetColorContext)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         IWICColorContext **ppIColorContext);
 
     HRESULT (STDMETHODCALLTYPE *GetBitsPerPixel)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         UINT *puiBitsPerPixel);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelCount)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         UINT *puiChannelCount);
 
     HRESULT (STDMETHODCALLTYPE *GetChannelMask)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         UINT uiChannelIndex,
         UINT cbMaskBuffer,
         BYTE *pbMaskBuffer,
@@ -2517,15 +2167,16 @@
 
     /*** IWICPixelFormatInfo2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SupportsTransparency)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         WINBOOL *pfSupportsTransparency);
 
     HRESULT (STDMETHODCALLTYPE *GetNumericRepresentation)(
-        IWICPixelFormatInfo2* This,
+        IWICPixelFormatInfo2 *This,
         WICPixelFormatNumericRepresentation *pNumericRepresentation);
 
     END_INTERFACE
 } IWICPixelFormatInfo2Vtbl;
+
 interface IWICPixelFormatInfo2 {
     CONST_VTBL IWICPixelFormatInfo2Vtbl* lpVtbl;
 };
@@ -2618,22 +2269,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo2_SupportsTransparency_Proxy(
-    IWICPixelFormatInfo2* This,
-    WINBOOL *pfSupportsTransparency);
-void __RPC_STUB IWICPixelFormatInfo2_SupportsTransparency_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICPixelFormatInfo2_GetNumericRepresentation_Proxy(
-    IWICPixelFormatInfo2* This,
-    WICPixelFormatNumericRepresentation *pNumericRepresentation);
-void __RPC_STUB IWICPixelFormatInfo2_GetNumericRepresentation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICPixelFormatInfo2_INTERFACE_DEFINED__ */
 
@@ -2707,121 +2342,122 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapCodecInfo* This);
+        IWICBitmapCodecInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapCodecInfo* This);
+        IWICBitmapCodecInfo *This);
 
     /*** IWICComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetComponentType)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         WICComponentType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningStatus)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         DWORD *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthor)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchAuthor,
         WCHAR *wzAuthor,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorGUID)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         GUID *pguidVendor);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchVersion,
         WCHAR *wzVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetSpecVersion)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchSpecVersion,
         WCHAR *wzSpecVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchFriendlyName,
         WCHAR *wzFriendlyName,
         UINT *pcchActual);
 
     /*** IWICBitmapCodecInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetContainerFormat)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         GUID *pguidContainerFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormats)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cFormats,
         GUID *pguidPixelFormats,
         UINT *pcActual);
 
     HRESULT (STDMETHODCALLTYPE *GetColorManagementVersion)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchColorManagementVersion,
         WCHAR *wzColorManagementVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceManufacturer)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchDeviceManufacturer,
         WCHAR *wzDeviceManufacturer,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceModels)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchDeviceModels,
         WCHAR *wzDeviceModels,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetMimeTypes)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchMimeTypes,
         WCHAR *wzMimeTypes,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFileExtensions)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         UINT cchFileExtensions,
         WCHAR *wzFileExtensions,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         WINBOOL *pfSupportAnimation);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         WINBOOL *pfSupportChromaKey);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         WINBOOL *pfSupportLossless);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         WINBOOL *pfSupportMultiframe);
 
     HRESULT (STDMETHODCALLTYPE *MatchesMimeType)(
-        IWICBitmapCodecInfo* This,
+        IWICBitmapCodecInfo *This,
         LPCWSTR wzMimeType,
         WINBOOL *pfMatches);
 
     END_INTERFACE
 } IWICBitmapCodecInfoVtbl;
+
 interface IWICBitmapCodecInfo {
     CONST_VTBL IWICBitmapCodecInfoVtbl* lpVtbl;
 };
@@ -2932,121 +2568,15 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetContainerFormat_Proxy(
-    IWICBitmapCodecInfo* This,
-    GUID *pguidContainerFormat);
-void __RPC_STUB IWICBitmapCodecInfo_GetContainerFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetPixelFormats_Proxy(
-    IWICBitmapCodecInfo* This,
-    UINT cFormats,
-    GUID *pguidPixelFormats,
-    UINT *pcActual);
-void __RPC_STUB IWICBitmapCodecInfo_GetPixelFormats_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetColorManagementVersion_Proxy(
-    IWICBitmapCodecInfo* This,
-    UINT cchColorManagementVersion,
-    WCHAR *wzColorManagementVersion,
-    UINT *pcchActual);
-void __RPC_STUB IWICBitmapCodecInfo_GetColorManagementVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetDeviceManufacturer_Proxy(
-    IWICBitmapCodecInfo* This,
-    UINT cchDeviceManufacturer,
-    WCHAR *wzDeviceManufacturer,
-    UINT *pcchActual);
-void __RPC_STUB IWICBitmapCodecInfo_GetDeviceManufacturer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetDeviceModels_Proxy(
-    IWICBitmapCodecInfo* This,
-    UINT cchDeviceModels,
-    WCHAR *wzDeviceModels,
-    UINT *pcchActual);
-void __RPC_STUB IWICBitmapCodecInfo_GetDeviceModels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetMimeTypes_Proxy(
-    IWICBitmapCodecInfo* This,
-    UINT cchMimeTypes,
-    WCHAR *wzMimeTypes,
-    UINT *pcchActual);
-void __RPC_STUB IWICBitmapCodecInfo_GetMimeTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_GetFileExtensions_Proxy(
-    IWICBitmapCodecInfo* This,
-    UINT cchFileExtensions,
-    WCHAR *wzFileExtensions,
-    UINT *pcchActual);
-void __RPC_STUB IWICBitmapCodecInfo_GetFileExtensions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportAnimation_Proxy(
-    IWICBitmapCodecInfo* This,
-    WINBOOL *pfSupportAnimation);
-void __RPC_STUB IWICBitmapCodecInfo_DoesSupportAnimation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportChromaKey_Proxy(
-    IWICBitmapCodecInfo* This,
-    WINBOOL *pfSupportChromaKey);
-void __RPC_STUB IWICBitmapCodecInfo_DoesSupportChromaKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportLossless_Proxy(
-    IWICBitmapCodecInfo* This,
-    WINBOOL *pfSupportLossless);
-void __RPC_STUB IWICBitmapCodecInfo_DoesSupportLossless_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_DoesSupportMultiframe_Proxy(
-    IWICBitmapCodecInfo* This,
-    WINBOOL *pfSupportMultiframe);
-void __RPC_STUB IWICBitmapCodecInfo_DoesSupportMultiframe_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapCodecInfo_MatchesMimeType_Proxy(
-    IWICBitmapCodecInfo* This,
-    LPCWSTR wzMimeType,
-    WINBOOL *pfMatches);
-void __RPC_STUB IWICBitmapCodecInfo_MatchesMimeType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapCodecInfo_INTERFACE_DEFINED__ */
 
 #ifndef __IWICBitmapDecoder_FWD_DEFINED__
 #define __IWICBitmapDecoder_FWD_DEFINED__
 typedef interface IWICBitmapDecoder IWICBitmapDecoder;
+#ifdef __cplusplus
+interface IWICBitmapDecoder;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -3083,138 +2613,139 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapDecoderInfo* This);
+        IWICBitmapDecoderInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapDecoderInfo* This);
+        IWICBitmapDecoderInfo *This);
 
     /*** IWICComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetComponentType)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         WICComponentType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningStatus)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         DWORD *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthor)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchAuthor,
         WCHAR *wzAuthor,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorGUID)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         GUID *pguidVendor);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchVersion,
         WCHAR *wzVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetSpecVersion)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchSpecVersion,
         WCHAR *wzSpecVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchFriendlyName,
         WCHAR *wzFriendlyName,
         UINT *pcchActual);
 
     /*** IWICBitmapCodecInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetContainerFormat)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         GUID *pguidContainerFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormats)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cFormats,
         GUID *pguidPixelFormats,
         UINT *pcActual);
 
     HRESULT (STDMETHODCALLTYPE *GetColorManagementVersion)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchColorManagementVersion,
         WCHAR *wzColorManagementVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceManufacturer)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchDeviceManufacturer,
         WCHAR *wzDeviceManufacturer,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceModels)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchDeviceModels,
         WCHAR *wzDeviceModels,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetMimeTypes)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchMimeTypes,
         WCHAR *wzMimeTypes,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFileExtensions)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cchFileExtensions,
         WCHAR *wzFileExtensions,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         WINBOOL *pfSupportAnimation);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         WINBOOL *pfSupportChromaKey);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         WINBOOL *pfSupportLossless);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         WINBOOL *pfSupportMultiframe);
 
     HRESULT (STDMETHODCALLTYPE *MatchesMimeType)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         LPCWSTR wzMimeType,
         WINBOOL *pfMatches);
 
     /*** IWICBitmapDecoderInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPatterns)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         UINT cbSizePatterns,
         WICBitmapPattern *pPatterns,
         UINT *pcPatterns,
         UINT *pcbPatternsActual);
 
     HRESULT (STDMETHODCALLTYPE *MatchesPattern)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         IStream *pIStream,
         WINBOOL *pfMatches);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        IWICBitmapDecoderInfo* This,
+        IWICBitmapDecoderInfo *This,
         IWICBitmapDecoder **ppIBitmapDecoder);
 
     END_INTERFACE
 } IWICBitmapDecoderInfoVtbl;
+
 interface IWICBitmapDecoderInfo {
     CONST_VTBL IWICBitmapDecoderInfoVtbl* lpVtbl;
 };
@@ -3339,23 +2870,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoderInfo_MatchesPattern_Proxy(
-    IWICBitmapDecoderInfo* This,
-    IStream *pIStream,
-    WINBOOL *pfMatches);
-void __RPC_STUB IWICBitmapDecoderInfo_MatchesPattern_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoderInfo_CreateInstance_Proxy(
-    IWICBitmapDecoderInfo* This,
-    IWICBitmapDecoder **ppIBitmapDecoder);
-void __RPC_STUB IWICBitmapDecoderInfo_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapDecoderInfo_INTERFACE_DEFINED__ */
 
@@ -3418,68 +2932,69 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapDecoder* This);
+        IWICBitmapDecoder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapDecoder* This);
+        IWICBitmapDecoder *This);
 
     /*** IWICBitmapDecoder methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryCapability)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         IStream *pIStream,
         DWORD *pdwCapability);
 
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         IStream *pIStream,
         WICDecodeOptions cacheOptions);
 
     HRESULT (STDMETHODCALLTYPE *GetContainerFormat)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         GUID *pguidContainerFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetDecoderInfo)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         IWICBitmapDecoderInfo **ppIDecoderInfo);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *GetMetadataQueryReader)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         IWICMetadataQueryReader **ppIMetadataQueryReader);
 
     HRESULT (STDMETHODCALLTYPE *GetPreview)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         IWICBitmapSource **ppIBitmapSource);
 
     HRESULT (STDMETHODCALLTYPE *GetColorContexts)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         UINT cCount,
         IWICColorContext **ppIColorContexts,
         UINT *pcActualCount);
 
     HRESULT (STDMETHODCALLTYPE *GetThumbnail)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         IWICBitmapSource **ppIThumbnail);
 
     HRESULT (STDMETHODCALLTYPE *GetFrameCount)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         UINT *pCount);
 
     HRESULT (STDMETHODCALLTYPE *GetFrame)(
-        IWICBitmapDecoder* This,
+        IWICBitmapDecoder *This,
         UINT index,
         IWICBitmapFrameDecode **ppIBitmapFrame);
 
     END_INTERFACE
 } IWICBitmapDecoderVtbl;
+
 interface IWICBitmapDecoder {
     CONST_VTBL IWICBitmapDecoderVtbl* lpVtbl;
 };
@@ -3552,99 +3067,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_QueryCapability_Proxy(
-    IWICBitmapDecoder* This,
-    IStream *pIStream,
-    DWORD *pdwCapability);
-void __RPC_STUB IWICBitmapDecoder_QueryCapability_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_Initialize_Proxy(
-    IWICBitmapDecoder* This,
-    IStream *pIStream,
-    WICDecodeOptions cacheOptions);
-void __RPC_STUB IWICBitmapDecoder_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetContainerFormat_Proxy(
-    IWICBitmapDecoder* This,
-    GUID *pguidContainerFormat);
-void __RPC_STUB IWICBitmapDecoder_GetContainerFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetDecoderInfo_Proxy(
-    IWICBitmapDecoder* This,
-    IWICBitmapDecoderInfo **ppIDecoderInfo);
-void __RPC_STUB IWICBitmapDecoder_GetDecoderInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_CopyPalette_Proxy(
-    IWICBitmapDecoder* This,
-    IWICPalette *pIPalette);
-void __RPC_STUB IWICBitmapDecoder_CopyPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetMetadataQueryReader_Proxy(
-    IWICBitmapDecoder* This,
-    IWICMetadataQueryReader **ppIMetadataQueryReader);
-void __RPC_STUB IWICBitmapDecoder_GetMetadataQueryReader_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetPreview_Proxy(
-    IWICBitmapDecoder* This,
-    IWICBitmapSource **ppIBitmapSource);
-void __RPC_STUB IWICBitmapDecoder_GetPreview_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetColorContexts_Proxy(
-    IWICBitmapDecoder* This,
-    UINT cCount,
-    IWICColorContext **ppIColorContexts,
-    UINT *pcActualCount);
-void __RPC_STUB IWICBitmapDecoder_GetColorContexts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetThumbnail_Proxy(
-    IWICBitmapDecoder* This,
-    IWICBitmapSource **ppIThumbnail);
-void __RPC_STUB IWICBitmapDecoder_GetThumbnail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetFrameCount_Proxy(
-    IWICBitmapDecoder* This,
-    UINT *pCount);
-void __RPC_STUB IWICBitmapDecoder_GetFrameCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapDecoder_GetFrame_Proxy(
-    IWICBitmapDecoder* This,
-    UINT index,
-    IWICBitmapFrameDecode **ppIBitmapFrame);
-void __RPC_STUB IWICBitmapDecoder_GetFrame_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapDecoder_INTERFACE_DEFINED__ */
 
@@ -3709,69 +3131,70 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapFrameEncode* This);
+        IWICBitmapFrameEncode *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapFrameEncode* This);
+        IWICBitmapFrameEncode *This);
 
     /*** IWICBitmapFrameEncode methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         IPropertyBag2 *pIEncoderOptions);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         UINT uiWidth,
         UINT uiHeight);
 
     HRESULT (STDMETHODCALLTYPE *SetResolution)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         double dpiX,
         double dpiY);
 
     HRESULT (STDMETHODCALLTYPE *SetPixelFormat)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *SetColorContexts)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         UINT cCount,
         IWICColorContext **ppIColorContext);
 
     HRESULT (STDMETHODCALLTYPE *SetPalette)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnail)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         IWICBitmapSource *pIThumbnail);
 
     HRESULT (STDMETHODCALLTYPE *WritePixels)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         UINT lineCount,
         UINT cbStride,
         UINT cbBufferSize,
         BYTE *pbPixels);
 
     HRESULT (STDMETHODCALLTYPE *WriteSource)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         IWICBitmapSource *pIBitmapSource,
         WICRect *prc);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWICBitmapFrameEncode* This);
+        IWICBitmapFrameEncode *This);
 
     HRESULT (STDMETHODCALLTYPE *GetMetadataQueryWriter)(
-        IWICBitmapFrameEncode* This,
+        IWICBitmapFrameEncode *This,
         IWICMetadataQueryWriter **ppIMetadataQueryWriter);
 
     END_INTERFACE
 } IWICBitmapFrameEncodeVtbl;
+
 interface IWICBitmapFrameEncode {
     CONST_VTBL IWICBitmapFrameEncodeVtbl* lpVtbl;
 };
@@ -3844,106 +3267,15 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_Initialize_Proxy(
-    IWICBitmapFrameEncode* This,
-    IPropertyBag2 *pIEncoderOptions);
-void __RPC_STUB IWICBitmapFrameEncode_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetSize_Proxy(
-    IWICBitmapFrameEncode* This,
-    UINT uiWidth,
-    UINT uiHeight);
-void __RPC_STUB IWICBitmapFrameEncode_SetSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetResolution_Proxy(
-    IWICBitmapFrameEncode* This,
-    double dpiX,
-    double dpiY);
-void __RPC_STUB IWICBitmapFrameEncode_SetResolution_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetPixelFormat_Proxy(
-    IWICBitmapFrameEncode* This,
-    WICPixelFormatGUID *pPixelFormat);
-void __RPC_STUB IWICBitmapFrameEncode_SetPixelFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetColorContexts_Proxy(
-    IWICBitmapFrameEncode* This,
-    UINT cCount,
-    IWICColorContext **ppIColorContext);
-void __RPC_STUB IWICBitmapFrameEncode_SetColorContexts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetPalette_Proxy(
-    IWICBitmapFrameEncode* This,
-    IWICPalette *pIPalette);
-void __RPC_STUB IWICBitmapFrameEncode_SetPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_SetThumbnail_Proxy(
-    IWICBitmapFrameEncode* This,
-    IWICBitmapSource *pIThumbnail);
-void __RPC_STUB IWICBitmapFrameEncode_SetThumbnail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_WritePixels_Proxy(
-    IWICBitmapFrameEncode* This,
-    UINT lineCount,
-    UINT cbStride,
-    UINT cbBufferSize,
-    BYTE *pbPixels);
-void __RPC_STUB IWICBitmapFrameEncode_WritePixels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_WriteSource_Proxy(
-    IWICBitmapFrameEncode* This,
-    IWICBitmapSource *pIBitmapSource,
-    WICRect *prc);
-void __RPC_STUB IWICBitmapFrameEncode_WriteSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_Commit_Proxy(
-    IWICBitmapFrameEncode* This);
-void __RPC_STUB IWICBitmapFrameEncode_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapFrameEncode_GetMetadataQueryWriter_Proxy(
-    IWICBitmapFrameEncode* This,
-    IWICMetadataQueryWriter **ppIMetadataQueryWriter);
-void __RPC_STUB IWICBitmapFrameEncode_GetMetadataQueryWriter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapFrameEncode_INTERFACE_DEFINED__ */
 
 #ifndef __IWICBitmapEncoder_FWD_DEFINED__
 #define __IWICBitmapEncoder_FWD_DEFINED__
 typedef interface IWICBitmapEncoder IWICBitmapEncoder;
+#ifdef __cplusplus
+interface IWICBitmapEncoder;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -3970,126 +3302,127 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapEncoderInfo* This);
+        IWICBitmapEncoderInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapEncoderInfo* This);
+        IWICBitmapEncoderInfo *This);
 
     /*** IWICComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetComponentType)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         WICComponentType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningStatus)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         DWORD *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthor)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchAuthor,
         WCHAR *wzAuthor,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorGUID)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         GUID *pguidVendor);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchVersion,
         WCHAR *wzVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetSpecVersion)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchSpecVersion,
         WCHAR *wzSpecVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchFriendlyName,
         WCHAR *wzFriendlyName,
         UINT *pcchActual);
 
     /*** IWICBitmapCodecInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetContainerFormat)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         GUID *pguidContainerFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormats)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cFormats,
         GUID *pguidPixelFormats,
         UINT *pcActual);
 
     HRESULT (STDMETHODCALLTYPE *GetColorManagementVersion)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchColorManagementVersion,
         WCHAR *wzColorManagementVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceManufacturer)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchDeviceManufacturer,
         WCHAR *wzDeviceManufacturer,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceModels)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchDeviceModels,
         WCHAR *wzDeviceModels,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetMimeTypes)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchMimeTypes,
         WCHAR *wzMimeTypes,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFileExtensions)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         UINT cchFileExtensions,
         WCHAR *wzFileExtensions,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportAnimation)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         WINBOOL *pfSupportAnimation);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportChromaKey)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         WINBOOL *pfSupportChromaKey);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportLossless)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         WINBOOL *pfSupportLossless);
 
     HRESULT (STDMETHODCALLTYPE *DoesSupportMultiframe)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         WINBOOL *pfSupportMultiframe);
 
     HRESULT (STDMETHODCALLTYPE *MatchesMimeType)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         LPCWSTR wzMimeType,
         WINBOOL *pfMatches);
 
     /*** IWICBitmapEncoderInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        IWICBitmapEncoderInfo* This,
+        IWICBitmapEncoderInfo *This,
         IWICBitmapEncoder **ppIBitmapEncoder);
 
     END_INTERFACE
 } IWICBitmapEncoderInfoVtbl;
+
 interface IWICBitmapEncoderInfo {
     CONST_VTBL IWICBitmapEncoderInfoVtbl* lpVtbl;
 };
@@ -4206,14 +3539,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoderInfo_CreateInstance_Proxy(
-    IWICBitmapEncoderInfo* This,
-    IWICBitmapEncoder **ppIBitmapEncoder);
-void __RPC_STUB IWICBitmapEncoderInfo_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapEncoderInfo_INTERFACE_DEFINED__ */
 
@@ -4271,61 +3596,62 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapEncoder* This);
+        IWICBitmapEncoder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapEncoder* This);
+        IWICBitmapEncoder *This);
 
     /*** IWICBitmapEncoder methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         IStream *pIStream,
         WICBitmapEncoderCacheOption cacheOption);
 
     HRESULT (STDMETHODCALLTYPE *GetContainerFormat)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         GUID *pguidContainerFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetEncoderInfo)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         IWICBitmapEncoderInfo **ppIEncoderInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetColorContexts)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         UINT cCount,
         IWICColorContext **ppIColorContext);
 
     HRESULT (STDMETHODCALLTYPE *SetPalette)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnail)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         IWICBitmapSource *pIThumbnail);
 
     HRESULT (STDMETHODCALLTYPE *SetPreview)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         IWICBitmapSource *pIPreview);
 
     HRESULT (STDMETHODCALLTYPE *CreateNewFrame)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         IWICBitmapFrameEncode **ppIFrameEncode,
         IPropertyBag2 **ppIEncoderOptions);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWICBitmapEncoder* This);
+        IWICBitmapEncoder *This);
 
     HRESULT (STDMETHODCALLTYPE *GetMetadataQueryWriter)(
-        IWICBitmapEncoder* This,
+        IWICBitmapEncoder *This,
         IWICMetadataQueryWriter **ppIMetadataQueryWriter);
 
     END_INTERFACE
 } IWICBitmapEncoderVtbl;
+
 interface IWICBitmapEncoder {
     CONST_VTBL IWICBitmapEncoderVtbl* lpVtbl;
 };
@@ -4394,88 +3720,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_Initialize_Proxy(
-    IWICBitmapEncoder* This,
-    IStream *pIStream,
-    WICBitmapEncoderCacheOption cacheOption);
-void __RPC_STUB IWICBitmapEncoder_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_GetContainerFormat_Proxy(
-    IWICBitmapEncoder* This,
-    GUID *pguidContainerFormat);
-void __RPC_STUB IWICBitmapEncoder_GetContainerFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_GetEncoderInfo_Proxy(
-    IWICBitmapEncoder* This,
-    IWICBitmapEncoderInfo **ppIEncoderInfo);
-void __RPC_STUB IWICBitmapEncoder_GetEncoderInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetColorContexts_Proxy(
-    IWICBitmapEncoder* This,
-    UINT cCount,
-    IWICColorContext **ppIColorContext);
-void __RPC_STUB IWICBitmapEncoder_SetColorContexts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetPalette_Proxy(
-    IWICBitmapEncoder* This,
-    IWICPalette *pIPalette);
-void __RPC_STUB IWICBitmapEncoder_SetPalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetThumbnail_Proxy(
-    IWICBitmapEncoder* This,
-    IWICBitmapSource *pIThumbnail);
-void __RPC_STUB IWICBitmapEncoder_SetThumbnail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_SetPreview_Proxy(
-    IWICBitmapEncoder* This,
-    IWICBitmapSource *pIPreview);
-void __RPC_STUB IWICBitmapEncoder_SetPreview_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_CreateNewFrame_Proxy(
-    IWICBitmapEncoder* This,
-    IWICBitmapFrameEncode **ppIFrameEncode,
-    IPropertyBag2 **ppIEncoderOptions);
-void __RPC_STUB IWICBitmapEncoder_CreateNewFrame_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_Commit_Proxy(
-    IWICBitmapEncoder* This);
-void __RPC_STUB IWICBitmapEncoder_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICBitmapEncoder_GetMetadataQueryWriter_Proxy(
-    IWICBitmapEncoder* This,
-    IWICMetadataQueryWriter **ppIMetadataQueryWriter);
-void __RPC_STUB IWICBitmapEncoder_GetMetadataQueryWriter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapEncoder_INTERFACE_DEFINED__ */
 
@@ -4513,37 +3757,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICFormatConverter* This);
+        IWICFormatConverter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICFormatConverter* This);
+        IWICFormatConverter *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -4551,7 +3795,7 @@
 
     /*** IWICFormatConverter methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         IWICBitmapSource *pISource,
         REFWICPixelFormatGUID dstFormat,
         WICBitmapDitherType dither,
@@ -4560,13 +3804,14 @@
         WICBitmapPaletteType paletteTranslate);
 
     HRESULT (STDMETHODCALLTYPE *CanConvert)(
-        IWICFormatConverter* This,
+        IWICFormatConverter *This,
         REFWICPixelFormatGUID srcPixelFormat,
         REFWICPixelFormatGUID dstPixelFormat,
         WINBOOL *pfCanConvert);
 
     END_INTERFACE
 } IWICFormatConverterVtbl;
+
 interface IWICFormatConverter {
     CONST_VTBL IWICFormatConverterVtbl* lpVtbl;
 };
@@ -4625,29 +3870,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICFormatConverter_Initialize_Proxy(
-    IWICFormatConverter* This,
-    IWICBitmapSource *pISource,
-    REFWICPixelFormatGUID dstFormat,
-    WICBitmapDitherType dither,
-    IWICPalette *pIPalette,
-    double alphaThresholdPercent,
-    WICBitmapPaletteType paletteTranslate);
-void __RPC_STUB IWICFormatConverter_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICFormatConverter_CanConvert_Proxy(
-    IWICFormatConverter* This,
-    REFWICPixelFormatGUID srcPixelFormat,
-    REFWICPixelFormatGUID dstPixelFormat,
-    WINBOOL *pfCanConvert);
-void __RPC_STUB IWICFormatConverter_CanConvert_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICFormatConverter_INTERFACE_DEFINED__ */
 
@@ -4680,70 +3902,71 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICFormatConverterInfo* This);
+        IWICFormatConverterInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICFormatConverterInfo* This);
+        IWICFormatConverterInfo *This);
 
     /*** IWICComponentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetComponentType)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         WICComponentType *pType);
 
     HRESULT (STDMETHODCALLTYPE *GetCLSID)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         CLSID *pclsid);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningStatus)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         DWORD *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthor)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         UINT cchAuthor,
         WCHAR *wzAuthor,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetVendorGUID)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         GUID *pguidVendor);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         UINT cchVersion,
         WCHAR *wzVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetSpecVersion)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         UINT cchSpecVersion,
         WCHAR *wzSpecVersion,
         UINT *pcchActual);
 
     HRESULT (STDMETHODCALLTYPE *GetFriendlyName)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         UINT cchFriendlyName,
         WCHAR *wzFriendlyName,
         UINT *pcchActual);
 
     /*** IWICFormatConverterInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPixelFormats)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         UINT cFormats,
         WICPixelFormatGUID *pPixelFormatGUIDs,
         UINT *pcActual);
 
     HRESULT (STDMETHODCALLTYPE *CreateInstance)(
-        IWICFormatConverterInfo* This,
+        IWICFormatConverterInfo *This,
         IWICFormatConverter **ppIConverter);
 
     END_INTERFACE
 } IWICFormatConverterInfoVtbl;
+
 interface IWICFormatConverterInfo {
     CONST_VTBL IWICFormatConverterInfoVtbl* lpVtbl;
 };
@@ -4814,24 +4037,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICFormatConverterInfo_GetPixelFormats_Proxy(
-    IWICFormatConverterInfo* This,
-    UINT cFormats,
-    WICPixelFormatGUID *pPixelFormatGUIDs,
-    UINT *pcActual);
-void __RPC_STUB IWICFormatConverterInfo_GetPixelFormats_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICFormatConverterInfo_CreateInstance_Proxy(
-    IWICFormatConverterInfo* This,
-    IWICFormatConverter **ppIConverter);
-void __RPC_STUB IWICFormatConverterInfo_CreateInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICFormatConverterInfo_INTERFACE_DEFINED__ */
 
@@ -4872,98 +4077,99 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICStream* This,
+        IWICStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICStream* This);
+        IWICStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICStream* This);
+        IWICStream *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IWICStream* This,
+        IWICStream *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IWICStream* This,
+        IWICStream *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Seek)(
-        IWICStream* This,
+        IWICStream *This,
         LARGE_INTEGER dlibMove,
         DWORD dwOrigin,
         ULARGE_INTEGER *plibNewPosition);
 
     HRESULT (STDMETHODCALLTYPE *SetSize)(
-        IWICStream* This,
+        IWICStream *This,
         ULARGE_INTEGER libNewSize);
 
     HRESULT (STDMETHODCALLTYPE *CopyTo)(
-        IWICStream* This,
+        IWICStream *This,
         IStream *pstm,
         ULARGE_INTEGER cb,
         ULARGE_INTEGER *pcbRead,
         ULARGE_INTEGER *pcbWritten);
 
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWICStream* This,
+        IWICStream *This,
         DWORD grfCommitFlags);
 
     HRESULT (STDMETHODCALLTYPE *Revert)(
-        IWICStream* This);
+        IWICStream *This);
 
     HRESULT (STDMETHODCALLTYPE *LockRegion)(
-        IWICStream* This,
+        IWICStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *UnlockRegion)(
-        IWICStream* This,
+        IWICStream *This,
         ULARGE_INTEGER libOffset,
         ULARGE_INTEGER cb,
         DWORD dwLockType);
 
     HRESULT (STDMETHODCALLTYPE *Stat)(
-        IWICStream* This,
+        IWICStream *This,
         STATSTG *pstatstg,
         DWORD grfStatFlag);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWICStream* This,
+        IWICStream *This,
         IStream **ppstm);
 
     /*** IWICStream methods ***/
     HRESULT (STDMETHODCALLTYPE *InitializeFromIStream)(
-        IWICStream* This,
+        IWICStream *This,
         IStream *pIStream);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromFilename)(
-        IWICStream* This,
+        IWICStream *This,
         LPCWSTR wzFileName,
         DWORD dwAccessMode);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromMemory)(
-        IWICStream* This,
+        IWICStream *This,
         BYTE *pbBuffer,
         DWORD cbBufferSize);
 
     HRESULT (STDMETHODCALLTYPE *InitializeFromIStreamRegion)(
-        IWICStream* This,
+        IWICStream *This,
         IStream *pIStream,
         ULARGE_INTEGER ulOffset,
         ULARGE_INTEGER ulMaxSize);
 
     END_INTERFACE
 } IWICStreamVtbl;
+
 interface IWICStream {
     CONST_VTBL IWICStreamVtbl* lpVtbl;
 };
@@ -5056,42 +4262,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromIStream_Proxy(
-    IWICStream* This,
-    IStream *pIStream);
-void __RPC_STUB IWICStream_InitializeFromIStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromFilename_Proxy(
-    IWICStream* This,
-    LPCWSTR wzFileName,
-    DWORD dwAccessMode);
-void __RPC_STUB IWICStream_InitializeFromFilename_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromMemory_Proxy(
-    IWICStream* This,
-    BYTE *pbBuffer,
-    DWORD cbBufferSize);
-void __RPC_STUB IWICStream_InitializeFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICStream_InitializeFromIStreamRegion_Proxy(
-    IWICStream* This,
-    IStream *pIStream,
-    ULARGE_INTEGER ulOffset,
-    ULARGE_INTEGER ulMaxSize);
-void __RPC_STUB IWICStream_InitializeFromIStreamRegion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICStream_INTERFACE_DEFINED__ */
 
@@ -5122,37 +4292,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapScaler* This,
+        IWICBitmapScaler *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapScaler* This);
+        IWICBitmapScaler *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapScaler* This);
+        IWICBitmapScaler *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICBitmapScaler* This,
+        IWICBitmapScaler *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICBitmapScaler* This,
+        IWICBitmapScaler *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICBitmapScaler* This,
+        IWICBitmapScaler *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICBitmapScaler* This,
+        IWICBitmapScaler *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICBitmapScaler* This,
+        IWICBitmapScaler *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -5160,7 +4330,7 @@
 
     /*** IWICBitmapScaler methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICBitmapScaler* This,
+        IWICBitmapScaler *This,
         IWICBitmapSource *pISource,
         UINT uiWidth,
         UINT uiHeight,
@@ -5168,6 +4338,7 @@
 
     END_INTERFACE
 } IWICBitmapScalerVtbl;
+
 interface IWICBitmapScaler {
     CONST_VTBL IWICBitmapScalerVtbl* lpVtbl;
 };
@@ -5222,17 +4393,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapScaler_Initialize_Proxy(
-    IWICBitmapScaler* This,
-    IWICBitmapSource *pISource,
-    UINT uiWidth,
-    UINT uiHeight,
-    WICBitmapInterpolationMode mode);
-void __RPC_STUB IWICBitmapScaler_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapScaler_INTERFACE_DEFINED__ */
 
@@ -5261,37 +4421,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICBitmapClipper* This,
+        IWICBitmapClipper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICBitmapClipper* This);
+        IWICBitmapClipper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICBitmapClipper* This);
+        IWICBitmapClipper *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICBitmapClipper* This,
+        IWICBitmapClipper *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICBitmapClipper* This,
+        IWICBitmapClipper *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICBitmapClipper* This,
+        IWICBitmapClipper *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICBitmapClipper* This,
+        IWICBitmapClipper *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICBitmapClipper* This,
+        IWICBitmapClipper *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -5299,12 +4459,13 @@
 
     /*** IWICBitmapClipper methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICBitmapClipper* This,
+        IWICBitmapClipper *This,
         IWICBitmapSource *pISource,
         const WICRect *prc);
 
     END_INTERFACE
 } IWICBitmapClipperVtbl;
+
 interface IWICBitmapClipper {
     CONST_VTBL IWICBitmapClipperVtbl* lpVtbl;
 };
@@ -5359,15 +4520,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICBitmapClipper_Initialize_Proxy(
-    IWICBitmapClipper* This,
-    IWICBitmapSource *pISource,
-    const WICRect *prc);
-void __RPC_STUB IWICBitmapClipper_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICBitmapClipper_INTERFACE_DEFINED__ */
 
@@ -5398,37 +4550,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICColorTransform* This,
+        IWICColorTransform *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICColorTransform* This);
+        IWICColorTransform *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICColorTransform* This);
+        IWICColorTransform *This);
 
     /*** IWICBitmapSource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSize)(
-        IWICColorTransform* This,
+        IWICColorTransform *This,
         UINT *puiWidth,
         UINT *puiHeight);
 
     HRESULT (STDMETHODCALLTYPE *GetPixelFormat)(
-        IWICColorTransform* This,
+        IWICColorTransform *This,
         WICPixelFormatGUID *pPixelFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetResolution)(
-        IWICColorTransform* This,
+        IWICColorTransform *This,
         double *pDpiX,
         double *pDpiY);
 
     HRESULT (STDMETHODCALLTYPE *CopyPalette)(
-        IWICColorTransform* This,
+        IWICColorTransform *This,
         IWICPalette *pIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CopyPixels)(
-        IWICColorTransform* This,
+        IWICColorTransform *This,
         const WICRect *prc,
         UINT cbStride,
         UINT cbBufferSize,
@@ -5436,7 +4588,7 @@
 
     /*** IWICColorTransform methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IWICColorTransform* This,
+        IWICColorTransform *This,
         IWICBitmapSource *pIBitmapSource,
         IWICColorContext *pIContextSource,
         IWICColorContext *pIContextDest,
@@ -5444,6 +4596,7 @@
 
     END_INTERFACE
 } IWICColorTransformVtbl;
+
 interface IWICColorTransform {
     CONST_VTBL IWICColorTransformVtbl* lpVtbl;
 };
@@ -5498,17 +4651,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICColorTransform_Initialize_Proxy(
-    IWICColorTransform* This,
-    IWICBitmapSource *pIBitmapSource,
-    IWICColorContext *pIContextSource,
-    IWICColorContext *pIContextDest,
-    REFWICPixelFormatGUID pixelFmtDest);
-void __RPC_STUB IWICColorTransform_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICColorTransform_INTERFACE_DEFINED__ */
 
@@ -5539,26 +4681,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICFastMetadataEncoder* This,
+        IWICFastMetadataEncoder *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICFastMetadataEncoder* This);
+        IWICFastMetadataEncoder *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICFastMetadataEncoder* This);
+        IWICFastMetadataEncoder *This);
 
     /*** IWICFastMetadataEncoder methods ***/
     HRESULT (STDMETHODCALLTYPE *Commit)(
-        IWICFastMetadataEncoder* This);
+        IWICFastMetadataEncoder *This);
 
     HRESULT (STDMETHODCALLTYPE *GetMetadataQueryWriter)(
-        IWICFastMetadataEncoder* This,
+        IWICFastMetadataEncoder *This,
         IWICMetadataQueryWriter **ppIMetadataQueryWriter);
 
     END_INTERFACE
 } IWICFastMetadataEncoderVtbl;
+
 interface IWICFastMetadataEncoder {
     CONST_VTBL IWICFastMetadataEncoderVtbl* lpVtbl;
 };
@@ -5595,21 +4738,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICFastMetadataEncoder_Commit_Proxy(
-    IWICFastMetadataEncoder* This);
-void __RPC_STUB IWICFastMetadataEncoder_Commit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICFastMetadataEncoder_GetMetadataQueryWriter_Proxy(
-    IWICFastMetadataEncoder* This,
-    IWICMetadataQueryWriter **ppIMetadataQueryWriter);
-void __RPC_STUB IWICFastMetadataEncoder_GetMetadataQueryWriter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICFastMetadataEncoder_INTERFACE_DEFINED__ */
 
@@ -5754,19 +4882,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICImagingFactory* This);
+        IWICImagingFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICImagingFactory* This);
+        IWICImagingFactory *This);
 
     /*** IWICImagingFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateDecoderFromFilename)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         LPCWSTR wzFilename,
         const GUID *pguidVendor,
         DWORD dwDesiredAccess,
@@ -5774,70 +4902,70 @@
         IWICBitmapDecoder **ppIDecoder);
 
     HRESULT (STDMETHODCALLTYPE *CreateDecoderFromStream)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IStream *pIStream,
         const GUID *pguidVendor,
         WICDecodeOptions metadataOptions,
         IWICBitmapDecoder **ppIDecoder);
 
     HRESULT (STDMETHODCALLTYPE *CreateDecoderFromFileHandle)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         ULONG_PTR hFile,
         const GUID *pguidVendor,
         WICDecodeOptions metadataOptions,
         IWICBitmapDecoder **ppIDecoder);
 
     HRESULT (STDMETHODCALLTYPE *CreateComponentInfo)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         REFCLSID clsidComponent,
         IWICComponentInfo **ppIInfo);
 
     HRESULT (STDMETHODCALLTYPE *CreateDecoder)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         REFGUID guidContainerFormat,
         const GUID *pguidVendor,
         IWICBitmapDecoder **ppIDecoder);
 
     HRESULT (STDMETHODCALLTYPE *CreateEncoder)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         REFGUID guidContainerFormat,
         const GUID *pguidVendor,
         IWICBitmapEncoder **ppIEncoder);
 
     HRESULT (STDMETHODCALLTYPE *CreatePalette)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICPalette **ppIPalette);
 
     HRESULT (STDMETHODCALLTYPE *CreateFormatConverter)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICFormatConverter **ppIFormatConverter);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapScaler)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICBitmapScaler **ppIBitmapScaler);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapClipper)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICBitmapClipper **ppIBitmapClipper);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapFlipRotator)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICBitmapFlipRotator **ppIBitmapFlipRotator);
 
     HRESULT (STDMETHODCALLTYPE *CreateStream)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICStream **ppIWICStream);
 
     HRESULT (STDMETHODCALLTYPE *CreateColorContext)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICColorContext **ppIWICColorContext);
 
     HRESULT (STDMETHODCALLTYPE *CreateColorTransformer)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICColorTransform **ppIWICColorTransform);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmap)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         UINT uiWidth,
         UINT uiHeight,
         REFWICPixelFormatGUID pixelFormat,
@@ -5845,13 +4973,13 @@
         IWICBitmap **ppIBitmap);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapFromSource)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICBitmapSource *piBitmapSource,
         WICBitmapCreateCacheOption option,
         IWICBitmap **ppIBitmap);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapFromSourceRect)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICBitmapSource *piBitmapSource,
         UINT x,
         UINT y,
@@ -5860,7 +4988,7 @@
         IWICBitmap **ppIBitmap);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapFromMemory)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         UINT uiWidth,
         UINT uiHeight,
         REFWICPixelFormatGUID pixelFormat,
@@ -5870,47 +4998,48 @@
         IWICBitmap **ppIBitmap);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapFromHBITMAP)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         HBITMAP hBitmap,
         HPALETTE hPalette,
         WICBitmapAlphaChannelOption options,
         IWICBitmap **ppIBitmap);
 
     HRESULT (STDMETHODCALLTYPE *CreateBitmapFromHICON)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         HICON hIcon,
         IWICBitmap **ppIBitmap);
 
     HRESULT (STDMETHODCALLTYPE *CreateComponentEnumerator)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         DWORD componentTypes,
         DWORD options,
         IEnumUnknown **ppIEnumUnknown);
 
     HRESULT (STDMETHODCALLTYPE *CreateFastMetadataEncoderFromDecoder)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICBitmapDecoder *pIDecoder,
         IWICFastMetadataEncoder **ppIFastEncoder);
 
     HRESULT (STDMETHODCALLTYPE *CreateFastMetadataEncoderFromFrameDecode)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICBitmapFrameDecode *pIFrameDecoder,
         IWICFastMetadataEncoder **ppIFastEncoder);
 
     HRESULT (STDMETHODCALLTYPE *CreateQueryWriter)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         REFGUID guidMetadataFormat,
         const GUID *pguidVendor,
         IWICMetadataQueryWriter **ppIQueryWriter);
 
     HRESULT (STDMETHODCALLTYPE *CreateQueryWriterFromReader)(
-        IWICImagingFactory* This,
+        IWICImagingFactory *This,
         IWICMetadataQueryReader *pIQueryReader,
         const GUID *pguidVendor,
         IWICMetadataQueryWriter **ppIQueryWriter);
 
     END_INTERFACE
 } IWICImagingFactoryVtbl;
+
 interface IWICImagingFactory {
     CONST_VTBL IWICImagingFactoryVtbl* lpVtbl;
 };
@@ -6039,250 +5168,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoderFromFilename_Proxy(
-    IWICImagingFactory* This,
-    LPCWSTR wzFilename,
-    const GUID *pguidVendor,
-    DWORD dwDesiredAccess,
-    WICDecodeOptions metadataOptions,
-    IWICBitmapDecoder **ppIDecoder);
-void __RPC_STUB IWICImagingFactory_CreateDecoderFromFilename_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoderFromStream_Proxy(
-    IWICImagingFactory* This,
-    IStream *pIStream,
-    const GUID *pguidVendor,
-    WICDecodeOptions metadataOptions,
-    IWICBitmapDecoder **ppIDecoder);
-void __RPC_STUB IWICImagingFactory_CreateDecoderFromStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoderFromFileHandle_Proxy(
-    IWICImagingFactory* This,
-    ULONG_PTR hFile,
-    const GUID *pguidVendor,
-    WICDecodeOptions metadataOptions,
-    IWICBitmapDecoder **ppIDecoder);
-void __RPC_STUB IWICImagingFactory_CreateDecoderFromFileHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateComponentInfo_Proxy(
-    IWICImagingFactory* This,
-    REFCLSID clsidComponent,
-    IWICComponentInfo **ppIInfo);
-void __RPC_STUB IWICImagingFactory_CreateComponentInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateDecoder_Proxy(
-    IWICImagingFactory* This,
-    REFGUID guidContainerFormat,
-    const GUID *pguidVendor,
-    IWICBitmapDecoder **ppIDecoder);
-void __RPC_STUB IWICImagingFactory_CreateDecoder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateEncoder_Proxy(
-    IWICImagingFactory* This,
-    REFGUID guidContainerFormat,
-    const GUID *pguidVendor,
-    IWICBitmapEncoder **ppIEncoder);
-void __RPC_STUB IWICImagingFactory_CreateEncoder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreatePalette_Proxy(
-    IWICImagingFactory* This,
-    IWICPalette **ppIPalette);
-void __RPC_STUB IWICImagingFactory_CreatePalette_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateFormatConverter_Proxy(
-    IWICImagingFactory* This,
-    IWICFormatConverter **ppIFormatConverter);
-void __RPC_STUB IWICImagingFactory_CreateFormatConverter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapScaler_Proxy(
-    IWICImagingFactory* This,
-    IWICBitmapScaler **ppIBitmapScaler);
-void __RPC_STUB IWICImagingFactory_CreateBitmapScaler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapClipper_Proxy(
-    IWICImagingFactory* This,
-    IWICBitmapClipper **ppIBitmapClipper);
-void __RPC_STUB IWICImagingFactory_CreateBitmapClipper_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFlipRotator_Proxy(
-    IWICImagingFactory* This,
-    IWICBitmapFlipRotator **ppIBitmapFlipRotator);
-void __RPC_STUB IWICImagingFactory_CreateBitmapFlipRotator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateStream_Proxy(
-    IWICImagingFactory* This,
-    IWICStream **ppIWICStream);
-void __RPC_STUB IWICImagingFactory_CreateStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateColorContext_Proxy(
-    IWICImagingFactory* This,
-    IWICColorContext **ppIWICColorContext);
-void __RPC_STUB IWICImagingFactory_CreateColorContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateColorTransformer_Proxy(
-    IWICImagingFactory* This,
-    IWICColorTransform **ppIWICColorTransform);
-void __RPC_STUB IWICImagingFactory_CreateColorTransformer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmap_Proxy(
-    IWICImagingFactory* This,
-    UINT uiWidth,
-    UINT uiHeight,
-    REFWICPixelFormatGUID pixelFormat,
-    WICBitmapCreateCacheOption option,
-    IWICBitmap **ppIBitmap);
-void __RPC_STUB IWICImagingFactory_CreateBitmap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromSource_Proxy(
-    IWICImagingFactory* This,
-    IWICBitmapSource *piBitmapSource,
-    WICBitmapCreateCacheOption option,
-    IWICBitmap **ppIBitmap);
-void __RPC_STUB IWICImagingFactory_CreateBitmapFromSource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromSourceRect_Proxy(
-    IWICImagingFactory* This,
-    IWICBitmapSource *piBitmapSource,
-    UINT x,
-    UINT y,
-    UINT width,
-    UINT height,
-    IWICBitmap **ppIBitmap);
-void __RPC_STUB IWICImagingFactory_CreateBitmapFromSourceRect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromMemory_Proxy(
-    IWICImagingFactory* This,
-    UINT uiWidth,
-    UINT uiHeight,
-    REFWICPixelFormatGUID pixelFormat,
-    UINT cbStride,
-    UINT cbBufferSize,
-    BYTE *pbBuffer,
-    IWICBitmap **ppIBitmap);
-void __RPC_STUB IWICImagingFactory_CreateBitmapFromMemory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromHBITMAP_Proxy(
-    IWICImagingFactory* This,
-    HBITMAP hBitmap,
-    HPALETTE hPalette,
-    WICBitmapAlphaChannelOption options,
-    IWICBitmap **ppIBitmap);
-void __RPC_STUB IWICImagingFactory_CreateBitmapFromHBITMAP_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateBitmapFromHICON_Proxy(
-    IWICImagingFactory* This,
-    HICON hIcon,
-    IWICBitmap **ppIBitmap);
-void __RPC_STUB IWICImagingFactory_CreateBitmapFromHICON_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateComponentEnumerator_Proxy(
-    IWICImagingFactory* This,
-    DWORD componentTypes,
-    DWORD options,
-    IEnumUnknown **ppIEnumUnknown);
-void __RPC_STUB IWICImagingFactory_CreateComponentEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateFastMetadataEncoderFromDecoder_Proxy(
-    IWICImagingFactory* This,
-    IWICBitmapDecoder *pIDecoder,
-    IWICFastMetadataEncoder **ppIFastEncoder);
-void __RPC_STUB IWICImagingFactory_CreateFastMetadataEncoderFromDecoder_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateFastMetadataEncoderFromFrameDecode_Proxy(
-    IWICImagingFactory* This,
-    IWICBitmapFrameDecode *pIFrameDecoder,
-    IWICFastMetadataEncoder **ppIFastEncoder);
-void __RPC_STUB IWICImagingFactory_CreateFastMetadataEncoderFromFrameDecode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateQueryWriter_Proxy(
-    IWICImagingFactory* This,
-    REFGUID guidMetadataFormat,
-    const GUID *pguidVendor,
-    IWICMetadataQueryWriter **ppIQueryWriter);
-void __RPC_STUB IWICImagingFactory_CreateQueryWriter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICImagingFactory_CreateQueryWriterFromReader_Proxy(
-    IWICImagingFactory* This,
-    IWICMetadataQueryReader *pIQueryReader,
-    const GUID *pguidVendor,
-    IWICMetadataQueryWriter **ppIQueryWriter);
-void __RPC_STUB IWICImagingFactory_CreateQueryWriterFromReader_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICImagingFactory_INTERFACE_DEFINED__ */
 
@@ -6323,19 +5208,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWICEnumMetadataItem* This,
+        IWICEnumMetadataItem *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWICEnumMetadataItem* This);
+        IWICEnumMetadataItem *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWICEnumMetadataItem* This);
+        IWICEnumMetadataItem *This);
 
     /*** IWICEnumMetadataItem methods ***/
     HRESULT (STDMETHODCALLTYPE *Next)(
-        IWICEnumMetadataItem* This,
+        IWICEnumMetadataItem *This,
         ULONG celt,
         PROPVARIANT *rgeltSchema,
         PROPVARIANT *rgeltId,
@@ -6343,18 +5228,19 @@
         ULONG *pceltFetched);
 
     HRESULT (STDMETHODCALLTYPE *Skip)(
-        IWICEnumMetadataItem* This,
+        IWICEnumMetadataItem *This,
         ULONG celt);
 
     HRESULT (STDMETHODCALLTYPE *Reset)(
-        IWICEnumMetadataItem* This);
+        IWICEnumMetadataItem *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IWICEnumMetadataItem* This,
+        IWICEnumMetadataItem *This,
         IWICEnumMetadataItem **ppIEnumMetadataItem);
 
     END_INTERFACE
 } IWICEnumMetadataItemVtbl;
+
 interface IWICEnumMetadataItem {
     CONST_VTBL IWICEnumMetadataItemVtbl* lpVtbl;
 };
@@ -6399,41 +5285,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Next_Proxy(
-    IWICEnumMetadataItem* This,
-    ULONG celt,
-    PROPVARIANT *rgeltSchema,
-    PROPVARIANT *rgeltId,
-    PROPVARIANT *rgeltValue,
-    ULONG *pceltFetched);
-void __RPC_STUB IWICEnumMetadataItem_Next_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Skip_Proxy(
-    IWICEnumMetadataItem* This,
-    ULONG celt);
-void __RPC_STUB IWICEnumMetadataItem_Skip_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Reset_Proxy(
-    IWICEnumMetadataItem* This);
-void __RPC_STUB IWICEnumMetadataItem_Reset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWICEnumMetadataItem_Clone_Proxy(
-    IWICEnumMetadataItem* This,
-    IWICEnumMetadataItem **ppIEnumMetadataItem);
-void __RPC_STUB IWICEnumMetadataItem_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWICEnumMetadataItem_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wmcodecdsp.h b/mingw-w64-headers/include/wmcodecdsp.h
index 2f1afb1..8f669e6 100644
--- a/mingw-w64-headers/include/wmcodecdsp.h
+++ b/mingw-w64-headers/include/wmcodecdsp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wmcodecdsp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wmcodecdsp.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IWMValidate_FWD_DEFINED__
 #define __IWMValidate_FWD_DEFINED__
 typedef interface IWMValidate IWMValidate;
+#ifdef __cplusplus
+interface IWMValidate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __CMpeg4DecMediaObject_FWD_DEFINED__
@@ -748,23 +751,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWMValidate* This,
+        IWMValidate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWMValidate* This);
+        IWMValidate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWMValidate* This);
+        IWMValidate *This);
 
     /*** IWMValidate methods ***/
     HRESULT (STDMETHODCALLTYPE *SetIdentifier)(
-        IWMValidate* This,
+        IWMValidate *This,
         GUID guidValidationID);
 
     END_INTERFACE
 } IWMValidateVtbl;
+
 interface IWMValidate {
     CONST_VTBL IWMValidateVtbl* lpVtbl;
 };
@@ -797,14 +801,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWMValidate_SetIdentifier_Proxy(
-    IWMValidate* This,
-    GUID guidValidationID);
-void __RPC_STUB IWMValidate_SetIdentifier_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWMValidate_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wmcontainer.h b/mingw-w64-headers/include/wmcontainer.h
index aee1dba..11fa88e 100644
--- a/mingw-w64-headers/include/wmcontainer.h
+++ b/mingw-w64-headers/include/wmcontainer.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wmcontainer.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wmcontainer.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IMFASFContentInfo_FWD_DEFINED__
 #define __IMFASFContentInfo_FWD_DEFINED__
 typedef interface IMFASFContentInfo IMFASFContentInfo;
+#ifdef __cplusplus
+interface IMFASFContentInfo;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFMutualExclusion_FWD_DEFINED__
 #define __IMFASFMutualExclusion_FWD_DEFINED__
 typedef interface IMFASFMutualExclusion IMFASFMutualExclusion;
+#ifdef __cplusplus
+interface IMFASFMutualExclusion;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFStreamPrioritization_FWD_DEFINED__
 #define __IMFASFStreamPrioritization_FWD_DEFINED__
 typedef interface IMFASFStreamPrioritization IMFASFStreamPrioritization;
+#ifdef __cplusplus
+interface IMFASFStreamPrioritization;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFSplitter_FWD_DEFINED__
 #define __IMFASFSplitter_FWD_DEFINED__
 typedef interface IMFASFSplitter IMFASFSplitter;
+#ifdef __cplusplus
+interface IMFASFSplitter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFMultiplexer_FWD_DEFINED__
 #define __IMFASFMultiplexer_FWD_DEFINED__
 typedef interface IMFASFMultiplexer IMFASFMultiplexer;
+#ifdef __cplusplus
+interface IMFASFMultiplexer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFIndexer_FWD_DEFINED__
 #define __IMFASFIndexer_FWD_DEFINED__
 typedef interface IMFASFIndexer IMFASFIndexer;
+#ifdef __cplusplus
+interface IMFASFIndexer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFStreamSelector_FWD_DEFINED__
 #define __IMFASFStreamSelector_FWD_DEFINED__
 typedef interface IMFASFStreamSelector IMFASFStreamSelector;
+#ifdef __cplusplus
+interface IMFASFStreamSelector;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFDRMNetHelper_FWD_DEFINED__
 #define __IMFDRMNetHelper_FWD_DEFINED__
 typedef interface IMFDRMNetHelper IMFDRMNetHelper;
+#ifdef __cplusplus
+interface IMFDRMNetHelper;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFProfile_FWD_DEFINED__
 #define __IMFASFProfile_FWD_DEFINED__
 typedef interface IMFASFProfile IMFASFProfile;
+#ifdef __cplusplus
+interface IMFASFProfile;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFStreamConfig_FWD_DEFINED__
 #define __IMFASFStreamConfig_FWD_DEFINED__
 typedef interface IMFASFStreamConfig IMFASFStreamConfig;
+#ifdef __cplusplus
+interface IMFASFStreamConfig;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -140,21 +170,33 @@
 #ifndef __IMFASFProfile_FWD_DEFINED__
 #define __IMFASFProfile_FWD_DEFINED__
 typedef interface IMFASFProfile IMFASFProfile;
+#ifdef __cplusplus
+interface IMFASFProfile;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFStreamConfig_FWD_DEFINED__
 #define __IMFASFStreamConfig_FWD_DEFINED__
 typedef interface IMFASFStreamConfig IMFASFStreamConfig;
+#ifdef __cplusplus
+interface IMFASFStreamConfig;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFMutualExclusion_FWD_DEFINED__
 #define __IMFASFMutualExclusion_FWD_DEFINED__
 typedef interface IMFASFMutualExclusion IMFASFMutualExclusion;
+#ifdef __cplusplus
+interface IMFASFMutualExclusion;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IMFASFStreamPrioritization_FWD_DEFINED__
 #define __IMFASFStreamPrioritization_FWD_DEFINED__
 typedef interface IMFASFStreamPrioritization IMFASFStreamPrioritization;
+#ifdef __cplusplus
+interface IMFASFStreamPrioritization;
+#endif /* __cplusplus */
 #endif
 
 #define MFASFINDEXER_PER_ENTRY_BYTES_DYNAMIC 0xffff
@@ -263,51 +305,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFContentInfo* This);
+        IMFASFContentInfo *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFContentInfo* This);
+        IMFASFContentInfo *This);
 
     /*** IMFASFContentInfo methods ***/
     HRESULT (STDMETHODCALLTYPE *GetHeaderSize)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         IMFMediaBuffer *pIStartOfContent,
         QWORD *cbHeaderSize);
 
     HRESULT (STDMETHODCALLTYPE *ParseHeader)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         IMFMediaBuffer *pIHeaderBuffer,
         QWORD cbOffsetWithinHeader);
 
     HRESULT (STDMETHODCALLTYPE *GenerateHeader)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         IMFMediaBuffer *pIHeader,
         DWORD *pcbHeader);
 
     HRESULT (STDMETHODCALLTYPE *GetProfile)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         IMFASFProfile **ppIProfile);
 
     HRESULT (STDMETHODCALLTYPE *SetProfile)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         IMFASFProfile *pIProfile);
 
     HRESULT (STDMETHODCALLTYPE *GeneratePresentationDescriptor)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         IMFPresentationDescriptor **ppIPresentationDescriptor);
 
     HRESULT (STDMETHODCALLTYPE *GetEncodingConfigurationPropertyStore)(
-        IMFASFContentInfo* This,
+        IMFASFContentInfo *This,
         WORD wStreamNumber,
         IPropertyStore **ppIStore);
 
     END_INTERFACE
 } IMFASFContentInfoVtbl;
+
 interface IMFASFContentInfo {
     CONST_VTBL IMFASFContentInfoVtbl* lpVtbl;
 };
@@ -364,66 +407,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GetHeaderSize_Proxy(
-    IMFASFContentInfo* This,
-    IMFMediaBuffer *pIStartOfContent,
-    QWORD *cbHeaderSize);
-void __RPC_STUB IMFASFContentInfo_GetHeaderSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFContentInfo_ParseHeader_Proxy(
-    IMFASFContentInfo* This,
-    IMFMediaBuffer *pIHeaderBuffer,
-    QWORD cbOffsetWithinHeader);
-void __RPC_STUB IMFASFContentInfo_ParseHeader_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GenerateHeader_Proxy(
-    IMFASFContentInfo* This,
-    IMFMediaBuffer *pIHeader,
-    DWORD *pcbHeader);
-void __RPC_STUB IMFASFContentInfo_GenerateHeader_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GetProfile_Proxy(
-    IMFASFContentInfo* This,
-    IMFASFProfile **ppIProfile);
-void __RPC_STUB IMFASFContentInfo_GetProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFContentInfo_SetProfile_Proxy(
-    IMFASFContentInfo* This,
-    IMFASFProfile *pIProfile);
-void __RPC_STUB IMFASFContentInfo_SetProfile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GeneratePresentationDescriptor_Proxy(
-    IMFASFContentInfo* This,
-    IMFPresentationDescriptor **ppIPresentationDescriptor);
-void __RPC_STUB IMFASFContentInfo_GeneratePresentationDescriptor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFContentInfo_GetEncodingConfigurationPropertyStore_Proxy(
-    IMFASFContentInfo* This,
-    WORD wStreamNumber,
-    IPropertyStore **ppIStore);
-void __RPC_STUB IMFASFContentInfo_GetEncodingConfigurationPropertyStore_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFContentInfo_INTERFACE_DEFINED__ */
 
@@ -479,59 +462,60 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFMutualExclusion* This);
+        IMFASFMutualExclusion *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFMutualExclusion* This);
+        IMFASFMutualExclusion *This);
 
     /*** IMFASFMutualExclusion methods ***/
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         GUID *pguidType);
 
     HRESULT (STDMETHODCALLTYPE *SetType)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         REFGUID guidType);
 
     HRESULT (STDMETHODCALLTYPE *GetRecordCount)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         DWORD *pdwRecordCount);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamsForRecord)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         DWORD dwRecordNumber,
         WORD *pwStreamNumArray,
         DWORD *pcStreams);
 
     HRESULT (STDMETHODCALLTYPE *AddStreamForRecord)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         DWORD dwRecordNumber,
         WORD wStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStreamFromRecord)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         DWORD dwRecordNumber,
         WORD wStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *RemoveRecord)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         DWORD dwRecordNumber);
 
     HRESULT (STDMETHODCALLTYPE *AddRecord)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         DWORD *pdwRecordNumber);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IMFASFMutualExclusion* This,
+        IMFASFMutualExclusion *This,
         IMFASFMutualExclusion **ppIMutex);
 
     END_INTERFACE
 } IMFASFMutualExclusionVtbl;
+
 interface IMFASFMutualExclusion {
     CONST_VTBL IMFASFMutualExclusionVtbl* lpVtbl;
 };
@@ -596,82 +580,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_GetType_Proxy(
-    IMFASFMutualExclusion* This,
-    GUID *pguidType);
-void __RPC_STUB IMFASFMutualExclusion_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_SetType_Proxy(
-    IMFASFMutualExclusion* This,
-    REFGUID guidType);
-void __RPC_STUB IMFASFMutualExclusion_SetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_GetRecordCount_Proxy(
-    IMFASFMutualExclusion* This,
-    DWORD *pdwRecordCount);
-void __RPC_STUB IMFASFMutualExclusion_GetRecordCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_GetStreamsForRecord_Proxy(
-    IMFASFMutualExclusion* This,
-    DWORD dwRecordNumber,
-    WORD *pwStreamNumArray,
-    DWORD *pcStreams);
-void __RPC_STUB IMFASFMutualExclusion_GetStreamsForRecord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_AddStreamForRecord_Proxy(
-    IMFASFMutualExclusion* This,
-    DWORD dwRecordNumber,
-    WORD wStreamNumber);
-void __RPC_STUB IMFASFMutualExclusion_AddStreamForRecord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_RemoveStreamFromRecord_Proxy(
-    IMFASFMutualExclusion* This,
-    DWORD dwRecordNumber,
-    WORD wStreamNumber);
-void __RPC_STUB IMFASFMutualExclusion_RemoveStreamFromRecord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_RemoveRecord_Proxy(
-    IMFASFMutualExclusion* This,
-    DWORD dwRecordNumber);
-void __RPC_STUB IMFASFMutualExclusion_RemoveRecord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_AddRecord_Proxy(
-    IMFASFMutualExclusion* This,
-    DWORD *pdwRecordNumber);
-void __RPC_STUB IMFASFMutualExclusion_AddRecord_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMutualExclusion_Clone_Proxy(
-    IMFASFMutualExclusion* This,
-    IMFASFMutualExclusion **ppIMutex);
-void __RPC_STUB IMFASFMutualExclusion_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFMutualExclusion_INTERFACE_DEFINED__ */
 
@@ -714,42 +622,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFStreamPrioritization* This,
+        IMFASFStreamPrioritization *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFStreamPrioritization* This);
+        IMFASFStreamPrioritization *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFStreamPrioritization* This);
+        IMFASFStreamPrioritization *This);
 
     /*** IMFASFStreamPrioritization methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStreamCount)(
-        IMFASFStreamPrioritization* This,
+        IMFASFStreamPrioritization *This,
         DWORD *pdwStreamCount);
 
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IMFASFStreamPrioritization* This,
+        IMFASFStreamPrioritization *This,
         DWORD dwStreamIndex,
         WORD *pwStreamNumber,
         WORD *pwStreamFlags);
 
     HRESULT (STDMETHODCALLTYPE *AddStream)(
-        IMFASFStreamPrioritization* This,
+        IMFASFStreamPrioritization *This,
         WORD wStreamNumber,
         WORD wStreamFlags);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStream)(
-        IMFASFStreamPrioritization* This,
+        IMFASFStreamPrioritization *This,
         DWORD dwStreamIndex);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IMFASFStreamPrioritization* This,
+        IMFASFStreamPrioritization *This,
         IMFASFStreamPrioritization **ppIStreamPrioritization);
 
     END_INTERFACE
 } IMFASFStreamPrioritizationVtbl;
+
 interface IMFASFStreamPrioritization {
     CONST_VTBL IMFASFStreamPrioritizationVtbl* lpVtbl;
 };
@@ -798,49 +707,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_GetStreamCount_Proxy(
-    IMFASFStreamPrioritization* This,
-    DWORD *pdwStreamCount);
-void __RPC_STUB IMFASFStreamPrioritization_GetStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_GetStream_Proxy(
-    IMFASFStreamPrioritization* This,
-    DWORD dwStreamIndex,
-    WORD *pwStreamNumber,
-    WORD *pwStreamFlags);
-void __RPC_STUB IMFASFStreamPrioritization_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_AddStream_Proxy(
-    IMFASFStreamPrioritization* This,
-    WORD wStreamNumber,
-    WORD wStreamFlags);
-void __RPC_STUB IMFASFStreamPrioritization_AddStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_RemoveStream_Proxy(
-    IMFASFStreamPrioritization* This,
-    DWORD dwStreamIndex);
-void __RPC_STUB IMFASFStreamPrioritization_RemoveStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamPrioritization_Clone_Proxy(
-    IMFASFStreamPrioritization* This,
-    IMFASFStreamPrioritization **ppIStreamPrioritization);
-void __RPC_STUB IMFASFStreamPrioritization_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFStreamPrioritization_INTERFACE_DEFINED__ */
 
@@ -898,60 +764,61 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFSplitter* This);
+        IMFASFSplitter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFSplitter* This);
+        IMFASFSplitter *This);
 
     /*** IMFASFSplitter methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         IMFASFContentInfo *pIContentInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *SelectStreams)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         WORD *pwStreamNumbers,
         WORD wNumStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetSelectedStreams)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         WORD *pwStreamNumbers,
         WORD *pwNumStreams);
 
     HRESULT (STDMETHODCALLTYPE *ParseData)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         IMFMediaBuffer *pIBuffer,
         DWORD cbBufferOffset,
         DWORD cbLength);
 
     HRESULT (STDMETHODCALLTYPE *GetNextSample)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         DWORD *pdwStatusFlags,
         WORD *pwStreamNumber,
         IMFSample **ppISample);
 
     HRESULT (STDMETHODCALLTYPE *Flush)(
-        IMFASFSplitter* This);
+        IMFASFSplitter *This);
 
     HRESULT (STDMETHODCALLTYPE *GetLastSendTime)(
-        IMFASFSplitter* This,
+        IMFASFSplitter *This,
         DWORD *pdwLastSendTime);
 
     END_INTERFACE
 } IMFASFSplitterVtbl;
+
 interface IMFASFSplitter {
     CONST_VTBL IMFASFSplitterVtbl* lpVtbl;
 };
@@ -1016,83 +883,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_Initialize_Proxy(
-    IMFASFSplitter* This,
-    IMFASFContentInfo *pIContentInfo);
-void __RPC_STUB IMFASFSplitter_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_SetFlags_Proxy(
-    IMFASFSplitter* This,
-    DWORD dwFlags);
-void __RPC_STUB IMFASFSplitter_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetFlags_Proxy(
-    IMFASFSplitter* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IMFASFSplitter_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_SelectStreams_Proxy(
-    IMFASFSplitter* This,
-    WORD *pwStreamNumbers,
-    WORD wNumStreams);
-void __RPC_STUB IMFASFSplitter_SelectStreams_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetSelectedStreams_Proxy(
-    IMFASFSplitter* This,
-    WORD *pwStreamNumbers,
-    WORD *pwNumStreams);
-void __RPC_STUB IMFASFSplitter_GetSelectedStreams_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_ParseData_Proxy(
-    IMFASFSplitter* This,
-    IMFMediaBuffer *pIBuffer,
-    DWORD cbBufferOffset,
-    DWORD cbLength);
-void __RPC_STUB IMFASFSplitter_ParseData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetNextSample_Proxy(
-    IMFASFSplitter* This,
-    DWORD *pdwStatusFlags,
-    WORD *pwStreamNumber,
-    IMFSample **ppISample);
-void __RPC_STUB IMFASFSplitter_GetNextSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_Flush_Proxy(
-    IMFASFSplitter* This);
-void __RPC_STUB IMFASFSplitter_Flush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFSplitter_GetLastSendTime_Proxy(
-    IMFASFSplitter* This,
-    DWORD *pdwLastSendTime);
-void __RPC_STUB IMFASFSplitter_GetLastSendTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFSplitter_INTERFACE_DEFINED__ */
 
@@ -1148,58 +938,59 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFMultiplexer* This);
+        IMFASFMultiplexer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFMultiplexer* This);
+        IMFASFMultiplexer *This);
 
     /*** IMFASFMultiplexer methods ***/
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         IMFASFContentInfo *pIContentInfo);
 
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *ProcessSample)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         WORD wStreamNumber,
         IMFSample *pISample,
         LONGLONG hnsTimestampAdjust);
 
     HRESULT (STDMETHODCALLTYPE *GetNextPacket)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         DWORD *pdwStatusFlags,
         IMFSample **ppIPacket);
 
     HRESULT (STDMETHODCALLTYPE *Flush)(
-        IMFASFMultiplexer* This);
+        IMFASFMultiplexer *This);
 
     HRESULT (STDMETHODCALLTYPE *End)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         IMFASFContentInfo *pIContentInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetStatistics)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         WORD wStreamNumber,
         ASF_MUX_STATISTICS *pMuxStats);
 
     HRESULT (STDMETHODCALLTYPE *SetSyncTolerance)(
-        IMFASFMultiplexer* This,
+        IMFASFMultiplexer *This,
         DWORD msSyncTolerance);
 
     END_INTERFACE
 } IMFASFMultiplexerVtbl;
+
 interface IMFASFMultiplexer {
     CONST_VTBL IMFASFMultiplexerVtbl* lpVtbl;
 };
@@ -1264,81 +1055,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_Initialize_Proxy(
-    IMFASFMultiplexer* This,
-    IMFASFContentInfo *pIContentInfo);
-void __RPC_STUB IMFASFMultiplexer_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_SetFlags_Proxy(
-    IMFASFMultiplexer* This,
-    DWORD dwFlags);
-void __RPC_STUB IMFASFMultiplexer_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_GetFlags_Proxy(
-    IMFASFMultiplexer* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IMFASFMultiplexer_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_ProcessSample_Proxy(
-    IMFASFMultiplexer* This,
-    WORD wStreamNumber,
-    IMFSample *pISample,
-    LONGLONG hnsTimestampAdjust);
-void __RPC_STUB IMFASFMultiplexer_ProcessSample_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_GetNextPacket_Proxy(
-    IMFASFMultiplexer* This,
-    DWORD *pdwStatusFlags,
-    IMFSample **ppIPacket);
-void __RPC_STUB IMFASFMultiplexer_GetNextPacket_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_Flush_Proxy(
-    IMFASFMultiplexer* This);
-void __RPC_STUB IMFASFMultiplexer_Flush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_End_Proxy(
-    IMFASFMultiplexer* This,
-    IMFASFContentInfo *pIContentInfo);
-void __RPC_STUB IMFASFMultiplexer_End_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_GetStatistics_Proxy(
-    IMFASFMultiplexer* This,
-    WORD wStreamNumber,
-    ASF_MUX_STATISTICS *pMuxStats);
-void __RPC_STUB IMFASFMultiplexer_GetStatistics_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFMultiplexer_SetSyncTolerance_Proxy(
-    IMFASFMultiplexer* This,
-    DWORD msSyncTolerance);
-void __RPC_STUB IMFASFMultiplexer_SetSyncTolerance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFMultiplexer_INTERFACE_DEFINED__ */
 
@@ -1414,58 +1130,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFIndexer* This);
+        IMFASFIndexer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFIndexer* This);
+        IMFASFIndexer *This);
 
     /*** IMFASFIndexer methods ***/
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         DWORD dwFlags);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         DWORD *pdwFlags);
 
     HRESULT (STDMETHODCALLTYPE *Initialize)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         IMFASFContentInfo *pIContentInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIndexPosition)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         IMFASFContentInfo *pIContentInfo,
         QWORD *pcbIndexOffset);
 
     HRESULT (STDMETHODCALLTYPE *SetIndexByteStreams)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         IMFByteStream **ppIByteStreams,
         DWORD cByteStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetIndexByteStreamCount)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         DWORD *pcByteStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetIndexStatus)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         ASF_INDEX_IDENTIFIER *pIndexIdentifier,
         WINBOOL *pfIsIndexed,
         BYTE *pbIndexDescriptor,
         DWORD *pcbIndexDescriptor);
 
     HRESULT (STDMETHODCALLTYPE *SetIndexStatus)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         BYTE *pbIndexDescriptor,
         DWORD cbIndexDescriptor,
         WINBOOL fGenerateIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetSeekPositionForValue)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         const PROPVARIANT *pvarValue,
         ASF_INDEX_IDENTIFIER *pIndexIdentifier,
         QWORD *pcbOffsetWithinData,
@@ -1473,24 +1189,25 @@
         DWORD *pdwPayloadNumberOfStreamWithinPacket);
 
     HRESULT (STDMETHODCALLTYPE *GenerateIndexEntries)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         IMFSample *pIASFPacketSample);
 
     HRESULT (STDMETHODCALLTYPE *CommitIndex)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         IMFASFContentInfo *pIContentInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIndexWriteSpace)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         QWORD *pcbIndexWriteSpace);
 
     HRESULT (STDMETHODCALLTYPE *GetCompletedIndex)(
-        IMFASFIndexer* This,
+        IMFASFIndexer *This,
         IMFMediaBuffer *pIIndexBuffer,
         QWORD cbOffsetWithinIndex);
 
     END_INTERFACE
 } IMFASFIndexerVtbl;
+
 interface IMFASFIndexer {
     CONST_VTBL IMFASFIndexerVtbl* lpVtbl;
 };
@@ -1571,122 +1288,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_SetFlags_Proxy(
-    IMFASFIndexer* This,
-    DWORD dwFlags);
-void __RPC_STUB IMFASFIndexer_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetFlags_Proxy(
-    IMFASFIndexer* This,
-    DWORD *pdwFlags);
-void __RPC_STUB IMFASFIndexer_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_Initialize_Proxy(
-    IMFASFIndexer* This,
-    IMFASFContentInfo *pIContentInfo);
-void __RPC_STUB IMFASFIndexer_Initialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexPosition_Proxy(
-    IMFASFIndexer* This,
-    IMFASFContentInfo *pIContentInfo,
-    QWORD *pcbIndexOffset);
-void __RPC_STUB IMFASFIndexer_GetIndexPosition_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_SetIndexByteStreams_Proxy(
-    IMFASFIndexer* This,
-    IMFByteStream **ppIByteStreams,
-    DWORD cByteStreams);
-void __RPC_STUB IMFASFIndexer_SetIndexByteStreams_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexByteStreamCount_Proxy(
-    IMFASFIndexer* This,
-    DWORD *pcByteStreams);
-void __RPC_STUB IMFASFIndexer_GetIndexByteStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexStatus_Proxy(
-    IMFASFIndexer* This,
-    ASF_INDEX_IDENTIFIER *pIndexIdentifier,
-    WINBOOL *pfIsIndexed,
-    BYTE *pbIndexDescriptor,
-    DWORD *pcbIndexDescriptor);
-void __RPC_STUB IMFASFIndexer_GetIndexStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_SetIndexStatus_Proxy(
-    IMFASFIndexer* This,
-    BYTE *pbIndexDescriptor,
-    DWORD cbIndexDescriptor,
-    WINBOOL fGenerateIndex);
-void __RPC_STUB IMFASFIndexer_SetIndexStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetSeekPositionForValue_Proxy(
-    IMFASFIndexer* This,
-    const PROPVARIANT *pvarValue,
-    ASF_INDEX_IDENTIFIER *pIndexIdentifier,
-    QWORD *pcbOffsetWithinData,
-    MFTIME *phnsApproxTime,
-    DWORD *pdwPayloadNumberOfStreamWithinPacket);
-void __RPC_STUB IMFASFIndexer_GetSeekPositionForValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GenerateIndexEntries_Proxy(
-    IMFASFIndexer* This,
-    IMFSample *pIASFPacketSample);
-void __RPC_STUB IMFASFIndexer_GenerateIndexEntries_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_CommitIndex_Proxy(
-    IMFASFIndexer* This,
-    IMFASFContentInfo *pIContentInfo);
-void __RPC_STUB IMFASFIndexer_CommitIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetIndexWriteSpace_Proxy(
-    IMFASFIndexer* This,
-    QWORD *pcbIndexWriteSpace);
-void __RPC_STUB IMFASFIndexer_GetIndexWriteSpace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFIndexer_GetCompletedIndex_Proxy(
-    IMFASFIndexer* This,
-    IMFMediaBuffer *pIIndexBuffer,
-    QWORD cbOffsetWithinIndex);
-void __RPC_STUB IMFASFIndexer_GetCompletedIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFIndexer_INTERFACE_DEFINED__ */
 
@@ -1767,89 +1368,90 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFStreamSelector* This);
+        IMFASFStreamSelector *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFStreamSelector* This);
+        IMFASFStreamSelector *This);
 
     /*** IMFASFStreamSelector methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStreamCount)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD *pcStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputCount)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD *pcOutputs);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStreamCount)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwOutputNum,
         DWORD *pcStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputStreamNumbers)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwOutputNum,
         WORD *rgwStreamNumbers);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputFromStream)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         WORD wStreamNum,
         DWORD *pdwOutput);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputOverride)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwOutputNum,
         ASF_SELECTION_STATUS *pSelection);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputOverride)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwOutputNum,
         ASF_SELECTION_STATUS Selection);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputMutexCount)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwOutputNum,
         DWORD *pcMutexes);
 
     HRESULT (STDMETHODCALLTYPE *GetOutputMutex)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwOutputNum,
         DWORD dwMutexNum,
         IUnknown **ppMutex);
 
     HRESULT (STDMETHODCALLTYPE *SetOutputMutexSelection)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwOutputNum,
         DWORD dwMutexNum,
         WORD wSelectedRecord);
 
     HRESULT (STDMETHODCALLTYPE *GetBandwidthStepCount)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD *pcStepCount);
 
     HRESULT (STDMETHODCALLTYPE *GetBandwidthStep)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwStepNum,
         DWORD *pdwBitrate,
         WORD *rgwStreamNumbers,
         ASF_SELECTION_STATUS *rgSelections);
 
     HRESULT (STDMETHODCALLTYPE *BitrateToStepNumber)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwBitrate,
         DWORD *pdwStepNum);
 
     HRESULT (STDMETHODCALLTYPE *SetStreamSelectorFlags)(
-        IMFASFStreamSelector* This,
+        IMFASFStreamSelector *This,
         DWORD dwStreamSelectorFlags);
 
     END_INTERFACE
 } IMFASFStreamSelectorVtbl;
+
 interface IMFASFStreamSelector {
     CONST_VTBL IMFASFStreamSelectorVtbl* lpVtbl;
 };
@@ -1934,132 +1536,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetStreamCount_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD *pcStreams);
-void __RPC_STUB IMFASFStreamSelector_GetStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputCount_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD *pcOutputs);
-void __RPC_STUB IMFASFStreamSelector_GetOutputCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputStreamCount_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwOutputNum,
-    DWORD *pcStreams);
-void __RPC_STUB IMFASFStreamSelector_GetOutputStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputStreamNumbers_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwOutputNum,
-    WORD *rgwStreamNumbers);
-void __RPC_STUB IMFASFStreamSelector_GetOutputStreamNumbers_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputFromStream_Proxy(
-    IMFASFStreamSelector* This,
-    WORD wStreamNum,
-    DWORD *pdwOutput);
-void __RPC_STUB IMFASFStreamSelector_GetOutputFromStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputOverride_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwOutputNum,
-    ASF_SELECTION_STATUS *pSelection);
-void __RPC_STUB IMFASFStreamSelector_GetOutputOverride_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_SetOutputOverride_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwOutputNum,
-    ASF_SELECTION_STATUS Selection);
-void __RPC_STUB IMFASFStreamSelector_SetOutputOverride_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputMutexCount_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwOutputNum,
-    DWORD *pcMutexes);
-void __RPC_STUB IMFASFStreamSelector_GetOutputMutexCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetOutputMutex_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwOutputNum,
-    DWORD dwMutexNum,
-    IUnknown **ppMutex);
-void __RPC_STUB IMFASFStreamSelector_GetOutputMutex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_SetOutputMutexSelection_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwOutputNum,
-    DWORD dwMutexNum,
-    WORD wSelectedRecord);
-void __RPC_STUB IMFASFStreamSelector_SetOutputMutexSelection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetBandwidthStepCount_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD *pcStepCount);
-void __RPC_STUB IMFASFStreamSelector_GetBandwidthStepCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_GetBandwidthStep_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwStepNum,
-    DWORD *pdwBitrate,
-    WORD *rgwStreamNumbers,
-    ASF_SELECTION_STATUS *rgSelections);
-void __RPC_STUB IMFASFStreamSelector_GetBandwidthStep_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_BitrateToStepNumber_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwBitrate,
-    DWORD *pdwStepNum);
-void __RPC_STUB IMFASFStreamSelector_BitrateToStepNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamSelector_SetStreamSelectorFlags_Proxy(
-    IMFASFStreamSelector* This,
-    DWORD dwStreamSelectorFlags);
-void __RPC_STUB IMFASFStreamSelector_SetStreamSelectorFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFStreamSelector_INTERFACE_DEFINED__ */
 
@@ -2096,19 +1572,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFDRMNetHelper* This,
+        IMFDRMNetHelper *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFDRMNetHelper* This);
+        IMFDRMNetHelper *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFDRMNetHelper* This);
+        IMFDRMNetHelper *This);
 
     /*** IMFDRMNetHelper methods ***/
     HRESULT (STDMETHODCALLTYPE *ProcessLicenseRequest)(
-        IMFDRMNetHelper* This,
+        IMFDRMNetHelper *This,
         BYTE *pLicenseRequest,
         DWORD cbLicenseRequest,
         BYTE **ppLicenseResponse,
@@ -2116,12 +1592,13 @@
         BSTR *pbstrKID);
 
     HRESULT (STDMETHODCALLTYPE *GetChainedLicenseResponse)(
-        IMFDRMNetHelper* This,
+        IMFDRMNetHelper *This,
         BYTE **ppLicenseResponse,
         DWORD *pcbLicenseResponse);
 
     END_INTERFACE
 } IMFDRMNetHelperVtbl;
+
 interface IMFDRMNetHelper {
     CONST_VTBL IMFDRMNetHelperVtbl* lpVtbl;
 };
@@ -2158,27 +1635,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFDRMNetHelper_ProcessLicenseRequest_Proxy(
-    IMFDRMNetHelper* This,
-    BYTE *pLicenseRequest,
-    DWORD cbLicenseRequest,
-    BYTE **ppLicenseResponse,
-    DWORD *pcbLicenseResponse,
-    BSTR *pbstrKID);
-void __RPC_STUB IMFDRMNetHelper_ProcessLicenseRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFDRMNetHelper_GetChainedLicenseResponse_Proxy(
-    IMFDRMNetHelper* This,
-    BYTE **ppLicenseResponse,
-    DWORD *pcbLicenseResponse);
-void __RPC_STUB IMFDRMNetHelper_GetChainedLicenseResponse_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFDRMNetHelper_INTERFACE_DEFINED__ */
 
@@ -2257,240 +1713,241 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFProfile* This);
+        IMFASFProfile *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFProfile* This);
+        IMFASFProfile *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFASFProfile* This);
+        IMFASFProfile *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFASFProfile* This);
+        IMFASFProfile *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFASFProfile* This);
+        IMFASFProfile *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFAttributes *pDest);
 
     /*** IMFASFProfile methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStreamCount)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         DWORD *pcStreams);
 
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         DWORD dwStreamIndex,
         WORD *pwStreamNumber,
         IMFASFStreamConfig **ppIStream);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamByNumber)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         WORD wStreamNumber,
         IMFASFStreamConfig **ppIStream);
 
     HRESULT (STDMETHODCALLTYPE *SetStream)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFASFStreamConfig *pIStream);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStream)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         WORD wStreamNumber);
 
     HRESULT (STDMETHODCALLTYPE *CreateStream)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFMediaType *pIMediaType,
         IMFASFStreamConfig **ppIStream);
 
     HRESULT (STDMETHODCALLTYPE *GetMutualExclusionCount)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         DWORD *pcMutexs);
 
     HRESULT (STDMETHODCALLTYPE *GetMutualExclusion)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         DWORD dwMutexIndex,
         IMFASFMutualExclusion **ppIMutex);
 
     HRESULT (STDMETHODCALLTYPE *AddMutualExclusion)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFASFMutualExclusion *pIMutex);
 
     HRESULT (STDMETHODCALLTYPE *RemoveMutualExclusion)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         DWORD dwMutexIndex);
 
     HRESULT (STDMETHODCALLTYPE *CreateMutualExclusion)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFASFMutualExclusion **ppIMutex);
 
     HRESULT (STDMETHODCALLTYPE *GetStreamPrioritization)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFASFStreamPrioritization **ppIStreamPrioritization);
 
     HRESULT (STDMETHODCALLTYPE *AddStreamPrioritization)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFASFStreamPrioritization *pIStreamPrioritization);
 
     HRESULT (STDMETHODCALLTYPE *RemoveStreamPrioritization)(
-        IMFASFProfile* This);
+        IMFASFProfile *This);
 
     HRESULT (STDMETHODCALLTYPE *CreateStreamPrioritization)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFASFStreamPrioritization **ppIStreamPrioritization);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IMFASFProfile* This,
+        IMFASFProfile *This,
         IMFASFProfile **ppIProfile);
 
     END_INTERFACE
 } IMFASFProfileVtbl;
+
 interface IMFASFProfile {
     CONST_VTBL IMFASFProfileVtbl* lpVtbl;
 };
@@ -2705,138 +2162,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStreamCount_Proxy(
-    IMFASFProfile* This,
-    DWORD *pcStreams);
-void __RPC_STUB IMFASFProfile_GetStreamCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStream_Proxy(
-    IMFASFProfile* This,
-    DWORD dwStreamIndex,
-    WORD *pwStreamNumber,
-    IMFASFStreamConfig **ppIStream);
-void __RPC_STUB IMFASFProfile_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStreamByNumber_Proxy(
-    IMFASFProfile* This,
-    WORD wStreamNumber,
-    IMFASFStreamConfig **ppIStream);
-void __RPC_STUB IMFASFProfile_GetStreamByNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_SetStream_Proxy(
-    IMFASFProfile* This,
-    IMFASFStreamConfig *pIStream);
-void __RPC_STUB IMFASFProfile_SetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_RemoveStream_Proxy(
-    IMFASFProfile* This,
-    WORD wStreamNumber);
-void __RPC_STUB IMFASFProfile_RemoveStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_CreateStream_Proxy(
-    IMFASFProfile* This,
-    IMFMediaType *pIMediaType,
-    IMFASFStreamConfig **ppIStream);
-void __RPC_STUB IMFASFProfile_CreateStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_GetMutualExclusionCount_Proxy(
-    IMFASFProfile* This,
-    DWORD *pcMutexs);
-void __RPC_STUB IMFASFProfile_GetMutualExclusionCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_GetMutualExclusion_Proxy(
-    IMFASFProfile* This,
-    DWORD dwMutexIndex,
-    IMFASFMutualExclusion **ppIMutex);
-void __RPC_STUB IMFASFProfile_GetMutualExclusion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_AddMutualExclusion_Proxy(
-    IMFASFProfile* This,
-    IMFASFMutualExclusion *pIMutex);
-void __RPC_STUB IMFASFProfile_AddMutualExclusion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_RemoveMutualExclusion_Proxy(
-    IMFASFProfile* This,
-    DWORD dwMutexIndex);
-void __RPC_STUB IMFASFProfile_RemoveMutualExclusion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_CreateMutualExclusion_Proxy(
-    IMFASFProfile* This,
-    IMFASFMutualExclusion **ppIMutex);
-void __RPC_STUB IMFASFProfile_CreateMutualExclusion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_GetStreamPrioritization_Proxy(
-    IMFASFProfile* This,
-    IMFASFStreamPrioritization **ppIStreamPrioritization);
-void __RPC_STUB IMFASFProfile_GetStreamPrioritization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_AddStreamPrioritization_Proxy(
-    IMFASFProfile* This,
-    IMFASFStreamPrioritization *pIStreamPrioritization);
-void __RPC_STUB IMFASFProfile_AddStreamPrioritization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_RemoveStreamPrioritization_Proxy(
-    IMFASFProfile* This);
-void __RPC_STUB IMFASFProfile_RemoveStreamPrioritization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_CreateStreamPrioritization_Proxy(
-    IMFASFProfile* This,
-    IMFASFStreamPrioritization **ppIStreamPrioritization);
-void __RPC_STUB IMFASFProfile_CreateStreamPrioritization_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFProfile_Clone_Proxy(
-    IMFASFProfile* This,
-    IMFASFProfile **ppIProfile);
-void __RPC_STUB IMFASFProfile_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFProfile_INTERFACE_DEFINED__ */
 
@@ -2898,195 +2223,195 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IMFASFStreamConfig* This);
+        IMFASFStreamConfig *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IMFASFStreamConfig* This);
+        IMFASFStreamConfig *This);
 
     /*** IMFAttributes methods ***/
     HRESULT (STDMETHODCALLTYPE *GetItem)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *GetItemType)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         MF_ATTRIBUTE_TYPE *pType);
 
     HRESULT (STDMETHODCALLTYPE *CompareItem)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         REFPROPVARIANT Value,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *Compare)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         IMFAttributes *pTheirs,
         MF_ATTRIBUTES_MATCH_TYPE MatchType,
         WINBOOL *pbResult);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT32)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT32 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetUINT64)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT64 *punValue);
 
     HRESULT (STDMETHODCALLTYPE *GetDouble)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         double *pfValue);
 
     HRESULT (STDMETHODCALLTYPE *GetGUID)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         GUID *pguidValue);
 
     HRESULT (STDMETHODCALLTYPE *GetStringLength)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetString)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         LPWSTR pwszValue,
         UINT32 cchBufSize,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedString)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         LPWSTR *ppwszValue,
         UINT32 *pcchLength);
 
     HRESULT (STDMETHODCALLTYPE *GetBlobSize)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetBlob)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT8 *pBuf,
         UINT32 cbBufSize,
         UINT32 *pcbBlobSize);
 
     HRESULT (STDMETHODCALLTYPE *GetAllocatedBlob)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT8 **ppBuf,
         UINT32 *pcbSize);
 
     HRESULT (STDMETHODCALLTYPE *GetUnknown)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         REFIID riid,
         LPVOID *ppv);
 
     HRESULT (STDMETHODCALLTYPE *SetItem)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         REFPROPVARIANT Value);
 
     HRESULT (STDMETHODCALLTYPE *DeleteItem)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey);
 
     HRESULT (STDMETHODCALLTYPE *DeleteAllItems)(
-        IMFASFStreamConfig* This);
+        IMFASFStreamConfig *This);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT32)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT32 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetUINT64)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         UINT64 unValue);
 
     HRESULT (STDMETHODCALLTYPE *SetDouble)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         double fValue);
 
     HRESULT (STDMETHODCALLTYPE *SetGUID)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         REFGUID guidValue);
 
     HRESULT (STDMETHODCALLTYPE *SetString)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         LPCWSTR wszValue);
 
     HRESULT (STDMETHODCALLTYPE *SetBlob)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         const UINT8 *pBuf,
         UINT32 cbBufSize);
 
     HRESULT (STDMETHODCALLTYPE *SetUnknown)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         REFGUID guidKey,
         IUnknown *pUnknown);
 
     HRESULT (STDMETHODCALLTYPE *LockStore)(
-        IMFASFStreamConfig* This);
+        IMFASFStreamConfig *This);
 
     HRESULT (STDMETHODCALLTYPE *UnlockStore)(
-        IMFASFStreamConfig* This);
+        IMFASFStreamConfig *This);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         UINT32 *pcItems);
 
     HRESULT (STDMETHODCALLTYPE *GetItemByIndex)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         UINT32 unIndex,
         GUID *pguidKey,
         PROPVARIANT *pValue);
 
     HRESULT (STDMETHODCALLTYPE *CopyAllItems)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         IMFAttributes *pDest);
 
     /*** IMFASFStreamConfig methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStreamType)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         GUID *pguidStreamType);
 
     WORD (STDMETHODCALLTYPE *GetStreamNumber)(
-        IMFASFStreamConfig* This);
+        IMFASFStreamConfig *This);
 
     HRESULT (STDMETHODCALLTYPE *SetStreamNumber)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         WORD wStreamNum);
 
     HRESULT (STDMETHODCALLTYPE *GetMediaType)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         IMFMediaType **ppIMediaType);
 
     HRESULT (STDMETHODCALLTYPE *SetMediaType)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         IMFMediaType *pIMediaType);
 
     HRESULT (STDMETHODCALLTYPE *GetPayloadExtensionCount)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         WORD *pcPayloadExtensions);
 
     HRESULT (STDMETHODCALLTYPE *GetPayloadExtension)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         WORD wPayloadExtensionNumber,
         GUID *pguidExtensionSystemID,
         WORD *pcbExtensionDataSize,
@@ -3094,21 +2419,22 @@
         DWORD *pcbExtensionSystemInfo);
 
     HRESULT (STDMETHODCALLTYPE *AddPayloadExtension)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         GUID guidExtensionSystemID,
         WORD cbExtensionDataSize,
         BYTE *pbExtensionSystemInfo,
         DWORD cbExtensionSystemInfo);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAllPayloadExtensions)(
-        IMFASFStreamConfig* This);
+        IMFASFStreamConfig *This);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IMFASFStreamConfig* This,
+        IMFASFStreamConfig *This,
         IMFASFStreamConfig **ppIStreamConfig);
 
     END_INTERFACE
 } IMFASFStreamConfigVtbl;
+
 interface IMFASFStreamConfig {
     CONST_VTBL IMFASFStreamConfigVtbl* lpVtbl;
 };
@@ -3299,91 +2625,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetStreamType_Proxy(
-    IMFASFStreamConfig* This,
-    GUID *pguidStreamType);
-void __RPC_STUB IMFASFStreamConfig_GetStreamType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-WORD STDMETHODCALLTYPE IMFASFStreamConfig_GetStreamNumber_Proxy(
-    IMFASFStreamConfig* This);
-void __RPC_STUB IMFASFStreamConfig_GetStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_SetStreamNumber_Proxy(
-    IMFASFStreamConfig* This,
-    WORD wStreamNum);
-void __RPC_STUB IMFASFStreamConfig_SetStreamNumber_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetMediaType_Proxy(
-    IMFASFStreamConfig* This,
-    IMFMediaType **ppIMediaType);
-void __RPC_STUB IMFASFStreamConfig_GetMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_SetMediaType_Proxy(
-    IMFASFStreamConfig* This,
-    IMFMediaType *pIMediaType);
-void __RPC_STUB IMFASFStreamConfig_SetMediaType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetPayloadExtensionCount_Proxy(
-    IMFASFStreamConfig* This,
-    WORD *pcPayloadExtensions);
-void __RPC_STUB IMFASFStreamConfig_GetPayloadExtensionCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_GetPayloadExtension_Proxy(
-    IMFASFStreamConfig* This,
-    WORD wPayloadExtensionNumber,
-    GUID *pguidExtensionSystemID,
-    WORD *pcbExtensionDataSize,
-    BYTE *pbExtensionSystemInfo,
-    DWORD *pcbExtensionSystemInfo);
-void __RPC_STUB IMFASFStreamConfig_GetPayloadExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_AddPayloadExtension_Proxy(
-    IMFASFStreamConfig* This,
-    GUID guidExtensionSystemID,
-    WORD cbExtensionDataSize,
-    BYTE *pbExtensionSystemInfo,
-    DWORD cbExtensionSystemInfo);
-void __RPC_STUB IMFASFStreamConfig_AddPayloadExtension_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_RemoveAllPayloadExtensions_Proxy(
-    IMFASFStreamConfig* This);
-void __RPC_STUB IMFASFStreamConfig_RemoveAllPayloadExtensions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IMFASFStreamConfig_Clone_Proxy(
-    IMFASFStreamConfig* This,
-    IMFASFStreamConfig **ppIStreamConfig);
-void __RPC_STUB IMFASFStreamConfig_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IMFASFStreamConfig_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wmdrmsdk.h b/mingw-w64-headers/include/wmdrmsdk.h
index c0c597a..4307d41 100644
--- a/mingw-w64-headers/include/wmdrmsdk.h
+++ b/mingw-w64-headers/include/wmdrmsdk.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/wmdrmsdk.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wmdrmsdk.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/wmsbuffer.h b/mingw-w64-headers/include/wmsbuffer.h
index 077cddb..626032d 100644
--- a/mingw-w64-headers/include/wmsbuffer.h
+++ b/mingw-w64-headers/include/wmsbuffer.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/wmsbuffer.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wmsbuffer.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/wmsdkidl.h b/mingw-w64-headers/include/wmsdkidl.h
index 45d45b7..a757e9d 100644
--- a/mingw-w64-headers/include/wmsdkidl.h
+++ b/mingw-w64-headers/include/wmsdkidl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/wmsdkidl.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wmsdkidl.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/wpcapi.h b/mingw-w64-headers/include/wpcapi.h
index c9eac14..ce68eaf 100644
--- a/mingw-w64-headers/include/wpcapi.h
+++ b/mingw-w64-headers/include/wpcapi.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/wpcapi.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wpcapi.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/wsdattachment.h b/mingw-w64-headers/include/wsdattachment.h
index f5c77b1..91409a4 100644
--- a/mingw-w64-headers/include/wsdattachment.h
+++ b/mingw-w64-headers/include/wsdattachment.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wsdattachment.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wsdattachment.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,16 +20,25 @@
 #ifndef __IWSDAttachment_FWD_DEFINED__
 #define __IWSDAttachment_FWD_DEFINED__
 typedef interface IWSDAttachment IWSDAttachment;
+#ifdef __cplusplus
+interface IWSDAttachment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDInboundAttachment_FWD_DEFINED__
 #define __IWSDInboundAttachment_FWD_DEFINED__
 typedef interface IWSDInboundAttachment IWSDInboundAttachment;
+#ifdef __cplusplus
+interface IWSDInboundAttachment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDOutboundAttachment_FWD_DEFINED__
 #define __IWSDOutboundAttachment_FWD_DEFINED__
 typedef interface IWSDOutboundAttachment IWSDOutboundAttachment;
+#ifdef __cplusplus
+interface IWSDOutboundAttachment;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -51,16 +60,25 @@
 #ifndef __IWSDAttachment_FWD_DEFINED__
 #define __IWSDAttachment_FWD_DEFINED__
 typedef interface IWSDAttachment IWSDAttachment;
+#ifdef __cplusplus
+interface IWSDAttachment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDInboundAttachment_FWD_DEFINED__
 #define __IWSDInboundAttachment_FWD_DEFINED__
 typedef interface IWSDInboundAttachment IWSDInboundAttachment;
+#ifdef __cplusplus
+interface IWSDInboundAttachment;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDOutboundAttachment_FWD_DEFINED__
 #define __IWSDOutboundAttachment_FWD_DEFINED__
 typedef interface IWSDOutboundAttachment IWSDOutboundAttachment;
+#ifdef __cplusplus
+interface IWSDOutboundAttachment;
+#endif /* __cplusplus */
 #endif
 
 
@@ -85,18 +103,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDAttachment* This,
+        IWSDAttachment *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDAttachment* This);
+        IWSDAttachment *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDAttachment* This);
+        IWSDAttachment *This);
 
     END_INTERFACE
 } IWSDAttachmentVtbl;
+
 interface IWSDAttachment {
     CONST_VTBL IWSDAttachmentVtbl* lpVtbl;
 };
@@ -156,28 +175,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDInboundAttachment* This,
+        IWSDInboundAttachment *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDInboundAttachment* This);
+        IWSDInboundAttachment *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDInboundAttachment* This);
+        IWSDInboundAttachment *This);
 
     /*** IWSDInboundAttachment methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IWSDInboundAttachment* This,
+        IWSDInboundAttachment *This,
         BYTE *pBuffer,
         DWORD dwBytesToRead,
         LPDWORD pdwNumberOfBytesRead);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IWSDInboundAttachment* This);
+        IWSDInboundAttachment *This);
 
     END_INTERFACE
 } IWSDInboundAttachmentVtbl;
+
 interface IWSDInboundAttachment {
     CONST_VTBL IWSDInboundAttachmentVtbl* lpVtbl;
 };
@@ -214,23 +234,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDInboundAttachment_Read_Proxy(
-    IWSDInboundAttachment* This,
-    BYTE *pBuffer,
-    DWORD dwBytesToRead,
-    LPDWORD pdwNumberOfBytesRead);
-void __RPC_STUB IWSDInboundAttachment_Read_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDInboundAttachment_Close_Proxy(
-    IWSDInboundAttachment* This);
-void __RPC_STUB IWSDInboundAttachment_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDInboundAttachment_INTERFACE_DEFINED__ */
 
@@ -267,31 +270,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDOutboundAttachment* This,
+        IWSDOutboundAttachment *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDOutboundAttachment* This);
+        IWSDOutboundAttachment *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDOutboundAttachment* This);
+        IWSDOutboundAttachment *This);
 
     /*** IWSDOutboundAttachment methods ***/
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IWSDOutboundAttachment* This,
+        IWSDOutboundAttachment *This,
         const BYTE *pBuffer,
         DWORD dwBytesToWrite,
         LPDWORD pdwNumberOfBytesWritten);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IWSDOutboundAttachment* This);
+        IWSDOutboundAttachment *This);
 
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IWSDOutboundAttachment* This);
+        IWSDOutboundAttachment *This);
 
     END_INTERFACE
 } IWSDOutboundAttachmentVtbl;
+
 interface IWSDOutboundAttachment {
     CONST_VTBL IWSDOutboundAttachmentVtbl* lpVtbl;
 };
@@ -332,30 +336,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDOutboundAttachment_Write_Proxy(
-    IWSDOutboundAttachment* This,
-    const BYTE *pBuffer,
-    DWORD dwBytesToWrite,
-    LPDWORD pdwNumberOfBytesWritten);
-void __RPC_STUB IWSDOutboundAttachment_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDOutboundAttachment_Close_Proxy(
-    IWSDOutboundAttachment* This);
-void __RPC_STUB IWSDOutboundAttachment_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDOutboundAttachment_Abort_Proxy(
-    IWSDOutboundAttachment* This);
-void __RPC_STUB IWSDOutboundAttachment_Abort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDOutboundAttachment_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wsdbase.h b/mingw-w64-headers/include/wsdbase.h
index f671c06..bd2b2cd 100644
--- a/mingw-w64-headers/include/wsdbase.h
+++ b/mingw-w64-headers/include/wsdbase.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wsdbase.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wsdbase.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,51 +20,81 @@
 #ifndef __IWSDAddress_FWD_DEFINED__
 #define __IWSDAddress_FWD_DEFINED__
 typedef interface IWSDAddress IWSDAddress;
+#ifdef __cplusplus
+interface IWSDAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDTransportAddress_FWD_DEFINED__
 #define __IWSDTransportAddress_FWD_DEFINED__
 typedef interface IWSDTransportAddress IWSDTransportAddress;
+#ifdef __cplusplus
+interface IWSDTransportAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDMessageParameters_FWD_DEFINED__
 #define __IWSDMessageParameters_FWD_DEFINED__
 typedef interface IWSDMessageParameters IWSDMessageParameters;
+#ifdef __cplusplus
+interface IWSDMessageParameters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDUdpMessageParameters_FWD_DEFINED__
 #define __IWSDUdpMessageParameters_FWD_DEFINED__
 typedef interface IWSDUdpMessageParameters IWSDUdpMessageParameters;
+#ifdef __cplusplus
+interface IWSDUdpMessageParameters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDUdpAddress_FWD_DEFINED__
 #define __IWSDUdpAddress_FWD_DEFINED__
 typedef interface IWSDUdpAddress IWSDUdpAddress;
+#ifdef __cplusplus
+interface IWSDUdpAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDHttpMessageParameters_FWD_DEFINED__
 #define __IWSDHttpMessageParameters_FWD_DEFINED__
 typedef interface IWSDHttpMessageParameters IWSDHttpMessageParameters;
+#ifdef __cplusplus
+interface IWSDHttpMessageParameters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDHttpAddress_FWD_DEFINED__
 #define __IWSDHttpAddress_FWD_DEFINED__
 typedef interface IWSDHttpAddress IWSDHttpAddress;
+#ifdef __cplusplus
+interface IWSDHttpAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDSSLClientCertificate_FWD_DEFINED__
 #define __IWSDSSLClientCertificate_FWD_DEFINED__
 typedef interface IWSDSSLClientCertificate IWSDSSLClientCertificate;
+#ifdef __cplusplus
+interface IWSDSSLClientCertificate;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDHttpAuthParameters_FWD_DEFINED__
 #define __IWSDHttpAuthParameters_FWD_DEFINED__
 typedef interface IWSDHttpAuthParameters IWSDHttpAuthParameters;
+#ifdef __cplusplus
+interface IWSDHttpAuthParameters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDSignatureProperty_FWD_DEFINED__
 #define __IWSDSignatureProperty_FWD_DEFINED__
 typedef interface IWSDSignatureProperty IWSDSignatureProperty;
+#ifdef __cplusplus
+interface IWSDSignatureProperty;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -83,31 +113,49 @@
 #ifndef __IWSDAddress_FWD_DEFINED__
 #define __IWSDAddress_FWD_DEFINED__
 typedef interface IWSDAddress IWSDAddress;
+#ifdef __cplusplus
+interface IWSDAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDMessageParameters_FWD_DEFINED__
 #define __IWSDMessageParameters_FWD_DEFINED__
 typedef interface IWSDMessageParameters IWSDMessageParameters;
+#ifdef __cplusplus
+interface IWSDMessageParameters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDUdpAddress_FWD_DEFINED__
 #define __IWSDUdpAddress_FWD_DEFINED__
 typedef interface IWSDUdpAddress IWSDUdpAddress;
+#ifdef __cplusplus
+interface IWSDUdpAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDUdpMessageParameters_FWD_DEFINED__
 #define __IWSDUdpMessageParameters_FWD_DEFINED__
 typedef interface IWSDUdpMessageParameters IWSDUdpMessageParameters;
+#ifdef __cplusplus
+interface IWSDUdpMessageParameters;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDHttpAddress_FWD_DEFINED__
 #define __IWSDHttpAddress_FWD_DEFINED__
 typedef interface IWSDHttpAddress IWSDHttpAddress;
+#ifdef __cplusplus
+interface IWSDHttpAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDHttpMessageParameters_FWD_DEFINED__
 #define __IWSDHttpMessageParameters_FWD_DEFINED__
 typedef interface IWSDHttpMessageParameters IWSDHttpMessageParameters;
+#ifdef __cplusplus
+interface IWSDHttpMessageParameters;
+#endif /* __cplusplus */
 #endif
 
 
@@ -215,29 +263,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDAddress* This,
+        IWSDAddress *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDAddress* This);
+        IWSDAddress *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDAddress* This);
+        IWSDAddress *This);
 
     /*** IWSDAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        IWSDAddress* This,
+        IWSDAddress *This,
         LPWSTR pszBuffer,
         DWORD cchLength,
         WINBOOL fSafe);
 
     HRESULT (STDMETHODCALLTYPE *Deserialize)(
-        IWSDAddress* This,
+        IWSDAddress *This,
         LPCWSTR pszBuffer);
 
     END_INTERFACE
 } IWSDAddressVtbl;
+
 interface IWSDAddress {
     CONST_VTBL IWSDAddressVtbl* lpVtbl;
 };
@@ -274,24 +323,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDAddress_Serialize_Proxy(
-    IWSDAddress* This,
-    LPWSTR pszBuffer,
-    DWORD cchLength,
-    WINBOOL fSafe);
-void __RPC_STUB IWSDAddress_Serialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDAddress_Deserialize_Proxy(
-    IWSDAddress* This,
-    LPCWSTR pszBuffer);
-void __RPC_STUB IWSDAddress_Deserialize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDAddress_INTERFACE_DEFINED__ */
 
@@ -332,51 +363,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDTransportAddress* This);
+        IWSDTransportAddress *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDTransportAddress* This);
+        IWSDTransportAddress *This);
 
     /*** IWSDAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         LPWSTR pszBuffer,
         DWORD cchLength,
         WINBOOL fSafe);
 
     HRESULT (STDMETHODCALLTYPE *Deserialize)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         LPCWSTR pszBuffer);
 
     /*** IWSDTransportAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPort)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         WORD *pwPort);
 
     HRESULT (STDMETHODCALLTYPE *SetPort)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         WORD wPort);
 
     HRESULT (STDMETHODCALLTYPE *GetTransportAddress)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         LPCWSTR *ppszAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetTransportAddressEx)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         WINBOOL fSafe,
         LPCWSTR *ppszAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetTransportAddress)(
-        IWSDTransportAddress* This,
+        IWSDTransportAddress *This,
         LPCWSTR pszAddress);
 
     END_INTERFACE
 } IWSDTransportAddressVtbl;
+
 interface IWSDTransportAddress {
     CONST_VTBL IWSDTransportAddressVtbl* lpVtbl;
 };
@@ -435,47 +467,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDTransportAddress_GetPort_Proxy(
-    IWSDTransportAddress* This,
-    WORD *pwPort);
-void __RPC_STUB IWSDTransportAddress_GetPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDTransportAddress_SetPort_Proxy(
-    IWSDTransportAddress* This,
-    WORD wPort);
-void __RPC_STUB IWSDTransportAddress_SetPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDTransportAddress_GetTransportAddress_Proxy(
-    IWSDTransportAddress* This,
-    LPCWSTR *ppszAddress);
-void __RPC_STUB IWSDTransportAddress_GetTransportAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDTransportAddress_GetTransportAddressEx_Proxy(
-    IWSDTransportAddress* This,
-    WINBOOL fSafe,
-    LPCWSTR *ppszAddress);
-void __RPC_STUB IWSDTransportAddress_GetTransportAddressEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDTransportAddress_SetTransportAddress_Proxy(
-    IWSDTransportAddress* This,
-    LPCWSTR pszAddress);
-void __RPC_STUB IWSDTransportAddress_SetTransportAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDTransportAddress_INTERFACE_DEFINED__ */
 
@@ -515,39 +506,40 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDMessageParameters* This,
+        IWSDMessageParameters *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDMessageParameters* This);
+        IWSDMessageParameters *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDMessageParameters* This);
+        IWSDMessageParameters *This);
 
     /*** IWSDMessageParameters methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLocalAddress)(
-        IWSDMessageParameters* This,
+        IWSDMessageParameters *This,
         IWSDAddress **ppAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetLocalAddress)(
-        IWSDMessageParameters* This,
+        IWSDMessageParameters *This,
         IWSDAddress *pAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetRemoteAddress)(
-        IWSDMessageParameters* This,
+        IWSDMessageParameters *This,
         IWSDAddress **ppAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetRemoteAddress)(
-        IWSDMessageParameters* This,
+        IWSDMessageParameters *This,
         IWSDAddress *pAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetLowerParameters)(
-        IWSDMessageParameters* This,
+        IWSDMessageParameters *This,
         IWSDMessageParameters **ppTxParams);
 
     END_INTERFACE
 } IWSDMessageParametersVtbl;
+
 interface IWSDMessageParameters {
     CONST_VTBL IWSDMessageParametersVtbl* lpVtbl;
 };
@@ -596,46 +588,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDMessageParameters_GetLocalAddress_Proxy(
-    IWSDMessageParameters* This,
-    IWSDAddress **ppAddress);
-void __RPC_STUB IWSDMessageParameters_GetLocalAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDMessageParameters_SetLocalAddress_Proxy(
-    IWSDMessageParameters* This,
-    IWSDAddress *pAddress);
-void __RPC_STUB IWSDMessageParameters_SetLocalAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDMessageParameters_GetRemoteAddress_Proxy(
-    IWSDMessageParameters* This,
-    IWSDAddress **ppAddress);
-void __RPC_STUB IWSDMessageParameters_GetRemoteAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDMessageParameters_SetRemoteAddress_Proxy(
-    IWSDMessageParameters* This,
-    IWSDAddress *pAddress);
-void __RPC_STUB IWSDMessageParameters_SetRemoteAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDMessageParameters_GetLowerParameters_Proxy(
-    IWSDMessageParameters* This,
-    IWSDMessageParameters **ppTxParams);
-void __RPC_STUB IWSDMessageParameters_GetLowerParameters_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDMessageParameters_INTERFACE_DEFINED__ */
 
@@ -676,48 +628,49 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDUdpMessageParameters* This);
+        IWSDUdpMessageParameters *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDUdpMessageParameters* This);
+        IWSDUdpMessageParameters *This);
 
     /*** IWSDMessageParameters methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLocalAddress)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         IWSDAddress **ppAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetLocalAddress)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         IWSDAddress *pAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetRemoteAddress)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         IWSDAddress **ppAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetRemoteAddress)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         IWSDAddress *pAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetLowerParameters)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         IWSDMessageParameters **ppTxParams);
 
     /*** IWSDUdpMessageParameters methods ***/
     HRESULT (STDMETHODCALLTYPE *SetRetransmitParams)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         const WSDUdpRetransmitParams *pParams);
 
     HRESULT (STDMETHODCALLTYPE *GetRetransmitParams)(
-        IWSDUdpMessageParameters* This,
+        IWSDUdpMessageParameters *This,
         WSDUdpRetransmitParams *pParams);
 
     END_INTERFACE
 } IWSDUdpMessageParametersVtbl;
+
 interface IWSDUdpMessageParameters {
     CONST_VTBL IWSDUdpMessageParametersVtbl* lpVtbl;
 };
@@ -776,22 +729,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDUdpMessageParameters_SetRetransmitParams_Proxy(
-    IWSDUdpMessageParameters* This,
-    const WSDUdpRetransmitParams *pParams);
-void __RPC_STUB IWSDUdpMessageParameters_SetRetransmitParams_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpMessageParameters_GetRetransmitParams_Proxy(
-    IWSDUdpMessageParameters* This,
-    WSDUdpRetransmitParams *pParams);
-void __RPC_STUB IWSDUdpMessageParameters_GetRetransmitParams_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDUdpMessageParameters_INTERFACE_DEFINED__ */
 
@@ -861,91 +798,92 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDUdpAddress* This);
+        IWSDUdpAddress *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDUdpAddress* This);
+        IWSDUdpAddress *This);
 
     /*** IWSDAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         LPWSTR pszBuffer,
         DWORD cchLength,
         WINBOOL fSafe);
 
     HRESULT (STDMETHODCALLTYPE *Deserialize)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         LPCWSTR pszBuffer);
 
     /*** IWSDTransportAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPort)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         WORD *pwPort);
 
     HRESULT (STDMETHODCALLTYPE *SetPort)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         WORD wPort);
 
     HRESULT (STDMETHODCALLTYPE *GetTransportAddress)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         LPCWSTR *ppszAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetTransportAddressEx)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         WINBOOL fSafe,
         LPCWSTR *ppszAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetTransportAddress)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         LPCWSTR pszAddress);
 
     /*** IWSDUdpAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *SetSockaddr)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         const SOCKADDR_STORAGE *pSockAddr);
 
     HRESULT (STDMETHODCALLTYPE *GetSockaddr)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         SOCKADDR_STORAGE *pSockAddr);
 
     HRESULT (STDMETHODCALLTYPE *SetExclusive)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         WINBOOL fExclusive);
 
     HRESULT (STDMETHODCALLTYPE *GetExclusive)(
-        IWSDUdpAddress* This);
+        IWSDUdpAddress *This);
 
     HRESULT (STDMETHODCALLTYPE *SetMessageType)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         WSDUdpMessageType messageType);
 
     HRESULT (STDMETHODCALLTYPE *GetMessageType)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         WSDUdpMessageType *pMessageType);
 
     HRESULT (STDMETHODCALLTYPE *SetTTL)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         DWORD dwTTL);
 
     HRESULT (STDMETHODCALLTYPE *GetTTL)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         DWORD *pdwTTL);
 
     HRESULT (STDMETHODCALLTYPE *SetAlias)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         const GUID *pAlias);
 
     HRESULT (STDMETHODCALLTYPE *GetAlias)(
-        IWSDUdpAddress* This,
+        IWSDUdpAddress *This,
         GUID *pAlias);
 
     END_INTERFACE
 } IWSDUdpAddressVtbl;
+
 interface IWSDUdpAddress {
     CONST_VTBL IWSDUdpAddressVtbl* lpVtbl;
 };
@@ -1046,85 +984,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetSockaddr_Proxy(
-    IWSDUdpAddress* This,
-    const SOCKADDR_STORAGE *pSockAddr);
-void __RPC_STUB IWSDUdpAddress_SetSockaddr_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetSockaddr_Proxy(
-    IWSDUdpAddress* This,
-    SOCKADDR_STORAGE *pSockAddr);
-void __RPC_STUB IWSDUdpAddress_GetSockaddr_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetExclusive_Proxy(
-    IWSDUdpAddress* This,
-    WINBOOL fExclusive);
-void __RPC_STUB IWSDUdpAddress_SetExclusive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetExclusive_Proxy(
-    IWSDUdpAddress* This);
-void __RPC_STUB IWSDUdpAddress_GetExclusive_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetMessageType_Proxy(
-    IWSDUdpAddress* This,
-    WSDUdpMessageType messageType);
-void __RPC_STUB IWSDUdpAddress_SetMessageType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetMessageType_Proxy(
-    IWSDUdpAddress* This,
-    WSDUdpMessageType *pMessageType);
-void __RPC_STUB IWSDUdpAddress_GetMessageType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetTTL_Proxy(
-    IWSDUdpAddress* This,
-    DWORD dwTTL);
-void __RPC_STUB IWSDUdpAddress_SetTTL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetTTL_Proxy(
-    IWSDUdpAddress* This,
-    DWORD *pdwTTL);
-void __RPC_STUB IWSDUdpAddress_GetTTL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_SetAlias_Proxy(
-    IWSDUdpAddress* This,
-    const GUID *pAlias);
-void __RPC_STUB IWSDUdpAddress_SetAlias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDUdpAddress_GetAlias_Proxy(
-    IWSDUdpAddress* This,
-    GUID *pAlias);
-void __RPC_STUB IWSDUdpAddress_GetAlias_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDUdpAddress_INTERFACE_DEFINED__ */
 
@@ -1176,75 +1035,76 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDHttpMessageParameters* This);
+        IWSDHttpMessageParameters *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDHttpMessageParameters* This);
+        IWSDHttpMessageParameters *This);
 
     /*** IWSDMessageParameters methods ***/
     HRESULT (STDMETHODCALLTYPE *GetLocalAddress)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         IWSDAddress **ppAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetLocalAddress)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         IWSDAddress *pAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetRemoteAddress)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         IWSDAddress **ppAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetRemoteAddress)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         IWSDAddress *pAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetLowerParameters)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         IWSDMessageParameters **ppTxParams);
 
     /*** IWSDHttpMessageParameters methods ***/
     HRESULT (STDMETHODCALLTYPE *SetInboundHttpHeaders)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         LPCWSTR pszHeaders);
 
     HRESULT (STDMETHODCALLTYPE *GetInboundHttpHeaders)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         LPCWSTR *ppszHeaders);
 
     HRESULT (STDMETHODCALLTYPE *SetOutboundHttpHeaders)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         LPCWSTR pszHeaders);
 
     HRESULT (STDMETHODCALLTYPE *GetOutboundHttpHeaders)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         LPCWSTR *ppszHeaders);
 
     HRESULT (STDMETHODCALLTYPE *SetID)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         LPCWSTR pszId);
 
     HRESULT (STDMETHODCALLTYPE *GetID)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         LPCWSTR *ppszId);
 
     HRESULT (STDMETHODCALLTYPE *SetContext)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         IUnknown *pContext);
 
     HRESULT (STDMETHODCALLTYPE *GetContext)(
-        IWSDHttpMessageParameters* This,
+        IWSDHttpMessageParameters *This,
         IUnknown **ppContext);
 
     HRESULT (STDMETHODCALLTYPE *Clear)(
-        IWSDHttpMessageParameters* This);
+        IWSDHttpMessageParameters *This);
 
     END_INTERFACE
 } IWSDHttpMessageParametersVtbl;
+
 interface IWSDHttpMessageParameters {
     CONST_VTBL IWSDHttpMessageParametersVtbl* lpVtbl;
 };
@@ -1331,77 +1191,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetInboundHttpHeaders_Proxy(
-    IWSDHttpMessageParameters* This,
-    LPCWSTR pszHeaders);
-void __RPC_STUB IWSDHttpMessageParameters_SetInboundHttpHeaders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetInboundHttpHeaders_Proxy(
-    IWSDHttpMessageParameters* This,
-    LPCWSTR *ppszHeaders);
-void __RPC_STUB IWSDHttpMessageParameters_GetInboundHttpHeaders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetOutboundHttpHeaders_Proxy(
-    IWSDHttpMessageParameters* This,
-    LPCWSTR pszHeaders);
-void __RPC_STUB IWSDHttpMessageParameters_SetOutboundHttpHeaders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetOutboundHttpHeaders_Proxy(
-    IWSDHttpMessageParameters* This,
-    LPCWSTR *ppszHeaders);
-void __RPC_STUB IWSDHttpMessageParameters_GetOutboundHttpHeaders_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetID_Proxy(
-    IWSDHttpMessageParameters* This,
-    LPCWSTR pszId);
-void __RPC_STUB IWSDHttpMessageParameters_SetID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetID_Proxy(
-    IWSDHttpMessageParameters* This,
-    LPCWSTR *ppszId);
-void __RPC_STUB IWSDHttpMessageParameters_GetID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_SetContext_Proxy(
-    IWSDHttpMessageParameters* This,
-    IUnknown *pContext);
-void __RPC_STUB IWSDHttpMessageParameters_SetContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_GetContext_Proxy(
-    IWSDHttpMessageParameters* This,
-    IUnknown **ppContext);
-void __RPC_STUB IWSDHttpMessageParameters_GetContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpMessageParameters_Clear_Proxy(
-    IWSDHttpMessageParameters* This);
-void __RPC_STUB IWSDHttpMessageParameters_Clear_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDHttpMessageParameters_INTERFACE_DEFINED__ */
 
@@ -1438,67 +1227,68 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDHttpAddress* This);
+        IWSDHttpAddress *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDHttpAddress* This);
+        IWSDHttpAddress *This);
 
     /*** IWSDAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *Serialize)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         LPWSTR pszBuffer,
         DWORD cchLength,
         WINBOOL fSafe);
 
     HRESULT (STDMETHODCALLTYPE *Deserialize)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         LPCWSTR pszBuffer);
 
     /*** IWSDTransportAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPort)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         WORD *pwPort);
 
     HRESULT (STDMETHODCALLTYPE *SetPort)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         WORD wPort);
 
     HRESULT (STDMETHODCALLTYPE *GetTransportAddress)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         LPCWSTR *ppszAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetTransportAddressEx)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         WINBOOL fSafe,
         LPCWSTR *ppszAddress);
 
     HRESULT (STDMETHODCALLTYPE *SetTransportAddress)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         LPCWSTR pszAddress);
 
     /*** IWSDHttpAddress methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSecure)(
-        IWSDHttpAddress* This);
+        IWSDHttpAddress *This);
 
     HRESULT (STDMETHODCALLTYPE *SetSecure)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         WINBOOL fSecure);
 
     HRESULT (STDMETHODCALLTYPE *GetPath)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         LPCWSTR *ppszPath);
 
     HRESULT (STDMETHODCALLTYPE *SetPath)(
-        IWSDHttpAddress* This,
+        IWSDHttpAddress *This,
         LPCWSTR pszPath);
 
     END_INTERFACE
 } IWSDHttpAddressVtbl;
+
 interface IWSDHttpAddress {
     CONST_VTBL IWSDHttpAddressVtbl* lpVtbl;
 };
@@ -1575,37 +1365,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDHttpAddress_GetSecure_Proxy(
-    IWSDHttpAddress* This);
-void __RPC_STUB IWSDHttpAddress_GetSecure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpAddress_SetSecure_Proxy(
-    IWSDHttpAddress* This,
-    WINBOOL fSecure);
-void __RPC_STUB IWSDHttpAddress_SetSecure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpAddress_GetPath_Proxy(
-    IWSDHttpAddress* This,
-    LPCWSTR *ppszPath);
-void __RPC_STUB IWSDHttpAddress_GetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpAddress_SetPath_Proxy(
-    IWSDHttpAddress* This,
-    LPCWSTR pszPath);
-void __RPC_STUB IWSDHttpAddress_SetPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDHttpAddress_INTERFACE_DEFINED__ */
 
@@ -1637,27 +1396,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDSSLClientCertificate* This,
+        IWSDSSLClientCertificate *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDSSLClientCertificate* This);
+        IWSDSSLClientCertificate *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDSSLClientCertificate* This);
+        IWSDSSLClientCertificate *This);
 
     /*** IWSDSSLClientCertificate methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClientCertificate)(
-        IWSDSSLClientCertificate* This,
+        IWSDSSLClientCertificate *This,
         PCCERT_CONTEXT *ppCertContext);
 
     HRESULT (STDMETHODCALLTYPE *GetMappedAccessToken)(
-        IWSDSSLClientCertificate* This,
+        IWSDSSLClientCertificate *This,
         HANDLE *phToken);
 
     END_INTERFACE
 } IWSDSSLClientCertificateVtbl;
+
 interface IWSDSSLClientCertificate {
     CONST_VTBL IWSDSSLClientCertificateVtbl* lpVtbl;
 };
@@ -1694,22 +1454,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDSSLClientCertificate_GetClientCertificate_Proxy(
-    IWSDSSLClientCertificate* This,
-    PCCERT_CONTEXT *ppCertContext);
-void __RPC_STUB IWSDSSLClientCertificate_GetClientCertificate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDSSLClientCertificate_GetMappedAccessToken_Proxy(
-    IWSDSSLClientCertificate* This,
-    HANDLE *phToken);
-void __RPC_STUB IWSDSSLClientCertificate_GetMappedAccessToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDSSLClientCertificate_INTERFACE_DEFINED__ */
 
@@ -1740,27 +1484,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDHttpAuthParameters* This,
+        IWSDHttpAuthParameters *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDHttpAuthParameters* This);
+        IWSDHttpAuthParameters *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDHttpAuthParameters* This);
+        IWSDHttpAuthParameters *This);
 
     /*** IWSDHttpAuthParameters methods ***/
     HRESULT (STDMETHODCALLTYPE *GetClientAccessToken)(
-        IWSDHttpAuthParameters* This,
+        IWSDHttpAuthParameters *This,
         HANDLE *phToken);
 
     HRESULT (STDMETHODCALLTYPE *GetAuthType)(
-        IWSDHttpAuthParameters* This,
+        IWSDHttpAuthParameters *This,
         PWSD_SECURITY_HTTP_AUTH_SCHEMES pAuthType);
 
     END_INTERFACE
 } IWSDHttpAuthParametersVtbl;
+
 interface IWSDHttpAuthParameters {
     CONST_VTBL IWSDHttpAuthParametersVtbl* lpVtbl;
 };
@@ -1797,22 +1542,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDHttpAuthParameters_GetClientAccessToken_Proxy(
-    IWSDHttpAuthParameters* This,
-    HANDLE *phToken);
-void __RPC_STUB IWSDHttpAuthParameters_GetClientAccessToken_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDHttpAuthParameters_GetAuthType_Proxy(
-    IWSDHttpAuthParameters* This,
-    PWSD_SECURITY_HTTP_AUTH_SCHEMES pAuthType);
-void __RPC_STUB IWSDHttpAuthParameters_GetAuthType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDHttpAuthParameters_INTERFACE_DEFINED__ */
 
@@ -1855,42 +1584,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDSignatureProperty* This,
+        IWSDSignatureProperty *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDSignatureProperty* This);
+        IWSDSignatureProperty *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDSignatureProperty* This);
+        IWSDSignatureProperty *This);
 
     /*** IWSDSignatureProperty methods ***/
     HRESULT (STDMETHODCALLTYPE *IsMessageSigned)(
-        IWSDSignatureProperty* This,
+        IWSDSignatureProperty *This,
         WINBOOL *pbSigned);
 
     HRESULT (STDMETHODCALLTYPE *IsMessageSignatureTrusted)(
-        IWSDSignatureProperty* This,
+        IWSDSignatureProperty *This,
         WINBOOL *pbSignatureTrusted);
 
     HRESULT (STDMETHODCALLTYPE *GetKeyInfo)(
-        IWSDSignatureProperty* This,
+        IWSDSignatureProperty *This,
         BYTE *pbKeyInfo,
         DWORD *pdwKeyInfoSize);
 
     HRESULT (STDMETHODCALLTYPE *GetSignature)(
-        IWSDSignatureProperty* This,
+        IWSDSignatureProperty *This,
         BYTE *pbSignature,
         DWORD *pdwSignatureSize);
 
     HRESULT (STDMETHODCALLTYPE *GetSignedInfoHash)(
-        IWSDSignatureProperty* This,
+        IWSDSignatureProperty *This,
         BYTE *pbSignedInfoHash,
         DWORD *pdwHashSize);
 
     END_INTERFACE
 } IWSDSignaturePropertyVtbl;
+
 interface IWSDSignatureProperty {
     CONST_VTBL IWSDSignaturePropertyVtbl* lpVtbl;
 };
@@ -1939,49 +1669,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_IsMessageSigned_Proxy(
-    IWSDSignatureProperty* This,
-    WINBOOL *pbSigned);
-void __RPC_STUB IWSDSignatureProperty_IsMessageSigned_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_IsMessageSignatureTrusted_Proxy(
-    IWSDSignatureProperty* This,
-    WINBOOL *pbSignatureTrusted);
-void __RPC_STUB IWSDSignatureProperty_IsMessageSignatureTrusted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_GetKeyInfo_Proxy(
-    IWSDSignatureProperty* This,
-    BYTE *pbKeyInfo,
-    DWORD *pdwKeyInfoSize);
-void __RPC_STUB IWSDSignatureProperty_GetKeyInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_GetSignature_Proxy(
-    IWSDSignatureProperty* This,
-    BYTE *pbSignature,
-    DWORD *pdwSignatureSize);
-void __RPC_STUB IWSDSignatureProperty_GetSignature_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDSignatureProperty_GetSignedInfoHash_Proxy(
-    IWSDSignatureProperty* This,
-    BYTE *pbSignedInfoHash,
-    DWORD *pdwHashSize);
-void __RPC_STUB IWSDSignatureProperty_GetSignedInfoHash_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDSignatureProperty_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wsdclient.h b/mingw-w64-headers/include/wsdclient.h
index b9c6273..2711ff9 100644
--- a/mingw-w64-headers/include/wsdclient.h
+++ b/mingw-w64-headers/include/wsdclient.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wsdclient.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wsdclient.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,41 +20,65 @@
 #ifndef __IWSDAsyncResult_FWD_DEFINED__
 #define __IWSDAsyncResult_FWD_DEFINED__
 typedef interface IWSDAsyncResult IWSDAsyncResult;
+#ifdef __cplusplus
+interface IWSDAsyncResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDAsyncCallback_FWD_DEFINED__
 #define __IWSDAsyncCallback_FWD_DEFINED__
 typedef interface IWSDAsyncCallback IWSDAsyncCallback;
+#ifdef __cplusplus
+interface IWSDAsyncCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDMetadataExchange_FWD_DEFINED__
 #define __IWSDMetadataExchange_FWD_DEFINED__
 typedef interface IWSDMetadataExchange IWSDMetadataExchange;
+#ifdef __cplusplus
+interface IWSDMetadataExchange;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDEventingStatus_FWD_DEFINED__
 #define __IWSDEventingStatus_FWD_DEFINED__
 typedef interface IWSDEventingStatus IWSDEventingStatus;
+#ifdef __cplusplus
+interface IWSDEventingStatus;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDEndpointProxy_FWD_DEFINED__
 #define __IWSDEndpointProxy_FWD_DEFINED__
 typedef interface IWSDEndpointProxy IWSDEndpointProxy;
+#ifdef __cplusplus
+interface IWSDEndpointProxy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDDeviceProxy_FWD_DEFINED__
 #define __IWSDDeviceProxy_FWD_DEFINED__
 typedef interface IWSDDeviceProxy IWSDDeviceProxy;
+#ifdef __cplusplus
+interface IWSDDeviceProxy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDServiceProxy_FWD_DEFINED__
 #define __IWSDServiceProxy_FWD_DEFINED__
 typedef interface IWSDServiceProxy IWSDServiceProxy;
+#ifdef __cplusplus
+interface IWSDServiceProxy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDServiceProxyEventing_FWD_DEFINED__
 #define __IWSDServiceProxyEventing_FWD_DEFINED__
 typedef interface IWSDServiceProxyEventing IWSDServiceProxyEventing;
+#ifdef __cplusplus
+interface IWSDServiceProxyEventing;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -75,51 +99,81 @@
 #ifndef __IWSDAddress_FWD_DEFINED__
 #define __IWSDAddress_FWD_DEFINED__
 typedef interface IWSDAddress IWSDAddress;
+#ifdef __cplusplus
+interface IWSDAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDXMLContext_FWD_DEFINED__
 #define __IWSDXMLContext_FWD_DEFINED__
 typedef interface IWSDXMLContext IWSDXMLContext;
+#ifdef __cplusplus
+interface IWSDXMLContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveredService_FWD_DEFINED__
 #define __IWSDiscoveredService_FWD_DEFINED__
 typedef interface IWSDiscoveredService IWSDiscoveredService;
+#ifdef __cplusplus
+interface IWSDiscoveredService;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDDeviceProxy_FWD_DEFINED__
 #define __IWSDDeviceProxy_FWD_DEFINED__
 typedef interface IWSDDeviceProxy IWSDDeviceProxy;
+#ifdef __cplusplus
+interface IWSDDeviceProxy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDServiceProxy_FWD_DEFINED__
 #define __IWSDServiceProxy_FWD_DEFINED__
 typedef interface IWSDServiceProxy IWSDServiceProxy;
+#ifdef __cplusplus
+interface IWSDServiceProxy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDEndpointProxy_FWD_DEFINED__
 #define __IWSDEndpointProxy_FWD_DEFINED__
 typedef interface IWSDEndpointProxy IWSDEndpointProxy;
+#ifdef __cplusplus
+interface IWSDEndpointProxy;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDAsyncResult_FWD_DEFINED__
 #define __IWSDAsyncResult_FWD_DEFINED__
 typedef interface IWSDAsyncResult IWSDAsyncResult;
+#ifdef __cplusplus
+interface IWSDAsyncResult;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDAsyncCallback_FWD_DEFINED__
 #define __IWSDAsyncCallback_FWD_DEFINED__
 typedef interface IWSDAsyncCallback IWSDAsyncCallback;
+#ifdef __cplusplus
+interface IWSDAsyncCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDMetadataExchange_FWD_DEFINED__
 #define __IWSDMetadataExchange_FWD_DEFINED__
 typedef interface IWSDMetadataExchange IWSDMetadataExchange;
+#ifdef __cplusplus
+interface IWSDMetadataExchange;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDEventingStatus_FWD_DEFINED__
 #define __IWSDEventingStatus_FWD_DEFINED__
 typedef interface IWSDEventingStatus IWSDEventingStatus;
+#ifdef __cplusplus
+interface IWSDEventingStatus;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -165,46 +219,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDAsyncResult* This,
+        IWSDAsyncResult *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDAsyncResult* This);
+        IWSDAsyncResult *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDAsyncResult* This);
+        IWSDAsyncResult *This);
 
     /*** IWSDAsyncResult methods ***/
     HRESULT (STDMETHODCALLTYPE *SetCallback)(
-        IWSDAsyncResult* This,
+        IWSDAsyncResult *This,
         IWSDAsyncCallback *pCallback,
         IUnknown *pAsyncState);
 
     HRESULT (STDMETHODCALLTYPE *SetWaitHandle)(
-        IWSDAsyncResult* This,
+        IWSDAsyncResult *This,
         HANDLE hWaitHandle);
 
     HRESULT (STDMETHODCALLTYPE *HasCompleted)(
-        IWSDAsyncResult* This);
+        IWSDAsyncResult *This);
 
     HRESULT (STDMETHODCALLTYPE *GetAsyncState)(
-        IWSDAsyncResult* This,
+        IWSDAsyncResult *This,
         IUnknown **ppAsyncState);
 
     HRESULT (STDMETHODCALLTYPE *Abort)(
-        IWSDAsyncResult* This);
+        IWSDAsyncResult *This);
 
     HRESULT (STDMETHODCALLTYPE *GetEvent)(
-        IWSDAsyncResult* This,
+        IWSDAsyncResult *This,
         WSD_EVENT *pEvent);
 
     HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)(
-        IWSDAsyncResult* This,
+        IWSDAsyncResult *This,
         IWSDEndpointProxy **ppEndpoint);
 
     END_INTERFACE
 } IWSDAsyncResultVtbl;
+
 interface IWSDAsyncResult {
     CONST_VTBL IWSDAsyncResultVtbl* lpVtbl;
 };
@@ -261,61 +316,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDAsyncResult_SetCallback_Proxy(
-    IWSDAsyncResult* This,
-    IWSDAsyncCallback *pCallback,
-    IUnknown *pAsyncState);
-void __RPC_STUB IWSDAsyncResult_SetCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDAsyncResult_SetWaitHandle_Proxy(
-    IWSDAsyncResult* This,
-    HANDLE hWaitHandle);
-void __RPC_STUB IWSDAsyncResult_SetWaitHandle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDAsyncResult_HasCompleted_Proxy(
-    IWSDAsyncResult* This);
-void __RPC_STUB IWSDAsyncResult_HasCompleted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDAsyncResult_GetAsyncState_Proxy(
-    IWSDAsyncResult* This,
-    IUnknown **ppAsyncState);
-void __RPC_STUB IWSDAsyncResult_GetAsyncState_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDAsyncResult_Abort_Proxy(
-    IWSDAsyncResult* This);
-void __RPC_STUB IWSDAsyncResult_Abort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDAsyncResult_GetEvent_Proxy(
-    IWSDAsyncResult* This,
-    WSD_EVENT *pEvent);
-void __RPC_STUB IWSDAsyncResult_GetEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDAsyncResult_GetEndpointProxy_Proxy(
-    IWSDAsyncResult* This,
-    IWSDEndpointProxy **ppEndpoint);
-void __RPC_STUB IWSDAsyncResult_GetEndpointProxy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDAsyncResult_INTERFACE_DEFINED__ */
 
@@ -344,24 +344,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDAsyncCallback* This,
+        IWSDAsyncCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDAsyncCallback* This);
+        IWSDAsyncCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDAsyncCallback* This);
+        IWSDAsyncCallback *This);
 
     /*** IWSDAsyncCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *AsyncOperationComplete)(
-        IWSDAsyncCallback* This,
+        IWSDAsyncCallback *This,
         IWSDAsyncResult *pAsyncResult,
         IUnknown *pAsyncState);
 
     END_INTERFACE
 } IWSDAsyncCallbackVtbl;
+
 interface IWSDAsyncCallback {
     CONST_VTBL IWSDAsyncCallbackVtbl* lpVtbl;
 };
@@ -394,15 +395,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDAsyncCallback_AsyncOperationComplete_Proxy(
-    IWSDAsyncCallback* This,
-    IWSDAsyncResult *pAsyncResult,
-    IUnknown *pAsyncState);
-void __RPC_STUB IWSDAsyncCallback_AsyncOperationComplete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDAsyncCallback_INTERFACE_DEFINED__ */
 
@@ -430,23 +422,24 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDMetadataExchange* This,
+        IWSDMetadataExchange *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDMetadataExchange* This);
+        IWSDMetadataExchange *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDMetadataExchange* This);
+        IWSDMetadataExchange *This);
 
     /*** IWSDMetadataExchange methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMetadata)(
-        IWSDMetadataExchange* This,
+        IWSDMetadataExchange *This,
         WSD_METADATA_SECTION_LIST **MetadataOut);
 
     END_INTERFACE
 } IWSDMetadataExchangeVtbl;
+
 interface IWSDMetadataExchange {
     CONST_VTBL IWSDMetadataExchangeVtbl* lpVtbl;
 };
@@ -479,14 +472,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDMetadataExchange_GetMetadata_Proxy(
-    IWSDMetadataExchange* This,
-    WSD_METADATA_SECTION_LIST **MetadataOut);
-void __RPC_STUB IWSDMetadataExchange_GetMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDMetadataExchange_INTERFACE_DEFINED__ */
 
@@ -521,32 +506,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDEventingStatus* This,
+        IWSDEventingStatus *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDEventingStatus* This);
+        IWSDEventingStatus *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDEventingStatus* This);
+        IWSDEventingStatus *This);
 
     /*** IWSDEventingStatus methods ***/
     void (STDMETHODCALLTYPE *SubscriptionRenewed)(
-        IWSDEventingStatus* This,
+        IWSDEventingStatus *This,
         LPCWSTR pszSubscriptionAction);
 
     void (STDMETHODCALLTYPE *SubscriptionRenewalFailed)(
-        IWSDEventingStatus* This,
+        IWSDEventingStatus *This,
         LPCWSTR pszSubscriptionAction,
         HRESULT hr);
 
     void (STDMETHODCALLTYPE *SubscriptionEnded)(
-        IWSDEventingStatus* This,
+        IWSDEventingStatus *This,
         LPCWSTR pszSubscriptionAction);
 
     END_INTERFACE
 } IWSDEventingStatusVtbl;
+
 interface IWSDEventingStatus {
     CONST_VTBL IWSDEventingStatusVtbl* lpVtbl;
 };
@@ -587,31 +573,6 @@
 
 #endif
 
-void STDMETHODCALLTYPE IWSDEventingStatus_SubscriptionRenewed_Proxy(
-    IWSDEventingStatus* This,
-    LPCWSTR pszSubscriptionAction);
-void __RPC_STUB IWSDEventingStatus_SubscriptionRenewed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-void STDMETHODCALLTYPE IWSDEventingStatus_SubscriptionRenewalFailed_Proxy(
-    IWSDEventingStatus* This,
-    LPCWSTR pszSubscriptionAction,
-    HRESULT hr);
-void __RPC_STUB IWSDEventingStatus_SubscriptionRenewalFailed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-void STDMETHODCALLTYPE IWSDEventingStatus_SubscriptionEnded_Proxy(
-    IWSDEventingStatus* This,
-    LPCWSTR pszSubscriptionAction);
-void __RPC_STUB IWSDEventingStatus_SubscriptionEnded_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDEventingStatus_INTERFACE_DEFINED__ */
 
@@ -664,30 +625,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDEndpointProxy* This);
+        IWSDEndpointProxy *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDEndpointProxy* This);
+        IWSDEndpointProxy *This);
 
     /*** IWSDEndpointProxy methods ***/
     HRESULT (STDMETHODCALLTYPE *SendOneWayRequest)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         const void *pBody,
         const WSD_OPERATION *pOperation);
 
     HRESULT (STDMETHODCALLTYPE *SendTwoWayRequest)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         const void *pBody,
         const WSD_OPERATION *pOperation,
         const WSD_SYNCHRONOUS_RESPONSE_CONTEXT *pResponseContext);
 
     HRESULT (STDMETHODCALLTYPE *SendTwoWayRequestAsync)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         const void *pBody,
         const WSD_OPERATION *pOperation,
         IUnknown *pAsyncState,
@@ -695,23 +656,24 @@
         IWSDAsyncResult **pResult);
 
     HRESULT (STDMETHODCALLTYPE *AbortAsyncOperation)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         IWSDAsyncResult *pAsyncResult);
 
     HRESULT (STDMETHODCALLTYPE *ProcessFault)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         const WSD_SOAP_FAULT *pFault);
 
     HRESULT (STDMETHODCALLTYPE *GetErrorInfo)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         LPCWSTR *ppszErrorInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetFaultInfo)(
-        IWSDEndpointProxy* This,
+        IWSDEndpointProxy *This,
         WSD_SOAP_FAULT **ppFault);
 
     END_INTERFACE
 } IWSDEndpointProxyVtbl;
+
 interface IWSDEndpointProxy {
     CONST_VTBL IWSDEndpointProxyVtbl* lpVtbl;
 };
@@ -768,69 +730,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_SendOneWayRequest_Proxy(
-    IWSDEndpointProxy* This,
-    const void *pBody,
-    const WSD_OPERATION *pOperation);
-void __RPC_STUB IWSDEndpointProxy_SendOneWayRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_SendTwoWayRequest_Proxy(
-    IWSDEndpointProxy* This,
-    const void *pBody,
-    const WSD_OPERATION *pOperation,
-    const WSD_SYNCHRONOUS_RESPONSE_CONTEXT *pResponseContext);
-void __RPC_STUB IWSDEndpointProxy_SendTwoWayRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_SendTwoWayRequestAsync_Proxy(
-    IWSDEndpointProxy* This,
-    const void *pBody,
-    const WSD_OPERATION *pOperation,
-    IUnknown *pAsyncState,
-    IWSDAsyncCallback *pCallback,
-    IWSDAsyncResult **pResult);
-void __RPC_STUB IWSDEndpointProxy_SendTwoWayRequestAsync_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_AbortAsyncOperation_Proxy(
-    IWSDEndpointProxy* This,
-    IWSDAsyncResult *pAsyncResult);
-void __RPC_STUB IWSDEndpointProxy_AbortAsyncOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_ProcessFault_Proxy(
-    IWSDEndpointProxy* This,
-    const WSD_SOAP_FAULT *pFault);
-void __RPC_STUB IWSDEndpointProxy_ProcessFault_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_GetErrorInfo_Proxy(
-    IWSDEndpointProxy* This,
-    LPCWSTR *ppszErrorInfo);
-void __RPC_STUB IWSDEndpointProxy_GetErrorInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDEndpointProxy_GetFaultInfo_Proxy(
-    IWSDEndpointProxy* This,
-    WSD_SOAP_FAULT **ppFault);
-void __RPC_STUB IWSDEndpointProxy_GetFaultInfo_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDEndpointProxy_INTERFACE_DEFINED__ */
 
@@ -891,19 +790,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDDeviceProxy* This);
+        IWSDDeviceProxy *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDDeviceProxy* This);
+        IWSDDeviceProxy *This);
 
     /*** IWSDDeviceProxy methods ***/
     HRESULT (STDMETHODCALLTYPE *Init)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         LPCWSTR pszDeviceId,
         IWSDAddress *pDeviceAddress,
         LPCWSTR pszLocalId,
@@ -911,45 +810,46 @@
         IWSDDeviceProxy *pSponsor);
 
     HRESULT (STDMETHODCALLTYPE *BeginGetMetadata)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         IWSDAsyncResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *EndGetMetadata)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         IWSDAsyncResult *pResult);
 
     HRESULT (STDMETHODCALLTYPE *GetHostMetadata)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         WSD_HOST_METADATA **ppHostMetadata);
 
     HRESULT (STDMETHODCALLTYPE *GetThisModelMetadata)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         WSD_THIS_MODEL_METADATA **ppManufacturerMetadata);
 
     HRESULT (STDMETHODCALLTYPE *GetThisDeviceMetadata)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         WSD_THIS_DEVICE_METADATA **ppThisDeviceMetadata);
 
     HRESULT (STDMETHODCALLTYPE *GetAllMetadata)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         WSD_METADATA_SECTION_LIST **ppMetadata);
 
     HRESULT (STDMETHODCALLTYPE *GetServiceProxyById)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         LPCWSTR pszServiceId,
         IWSDServiceProxy **ppServiceProxy);
 
     HRESULT (STDMETHODCALLTYPE *GetServiceProxyByType)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         const WSDXML_NAME *pType,
         IWSDServiceProxy **ppServiceProxy);
 
     HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)(
-        IWSDDeviceProxy* This,
+        IWSDDeviceProxy *This,
         IWSDEndpointProxy **ppProxy);
 
     END_INTERFACE
 } IWSDDeviceProxyVtbl;
+
 interface IWSDDeviceProxy {
     CONST_VTBL IWSDDeviceProxyVtbl* lpVtbl;
 };
@@ -1018,92 +918,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_Init_Proxy(
-    IWSDDeviceProxy* This,
-    LPCWSTR pszDeviceId,
-    IWSDAddress *pDeviceAddress,
-    LPCWSTR pszLocalId,
-    IWSDXMLContext *pContext,
-    IWSDDeviceProxy *pSponsor);
-void __RPC_STUB IWSDDeviceProxy_Init_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_BeginGetMetadata_Proxy(
-    IWSDDeviceProxy* This,
-    IWSDAsyncResult **ppResult);
-void __RPC_STUB IWSDDeviceProxy_BeginGetMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_EndGetMetadata_Proxy(
-    IWSDDeviceProxy* This,
-    IWSDAsyncResult *pResult);
-void __RPC_STUB IWSDDeviceProxy_EndGetMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetHostMetadata_Proxy(
-    IWSDDeviceProxy* This,
-    WSD_HOST_METADATA **ppHostMetadata);
-void __RPC_STUB IWSDDeviceProxy_GetHostMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetThisModelMetadata_Proxy(
-    IWSDDeviceProxy* This,
-    WSD_THIS_MODEL_METADATA **ppManufacturerMetadata);
-void __RPC_STUB IWSDDeviceProxy_GetThisModelMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetThisDeviceMetadata_Proxy(
-    IWSDDeviceProxy* This,
-    WSD_THIS_DEVICE_METADATA **ppThisDeviceMetadata);
-void __RPC_STUB IWSDDeviceProxy_GetThisDeviceMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetAllMetadata_Proxy(
-    IWSDDeviceProxy* This,
-    WSD_METADATA_SECTION_LIST **ppMetadata);
-void __RPC_STUB IWSDDeviceProxy_GetAllMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetServiceProxyById_Proxy(
-    IWSDDeviceProxy* This,
-    LPCWSTR pszServiceId,
-    IWSDServiceProxy **ppServiceProxy);
-void __RPC_STUB IWSDDeviceProxy_GetServiceProxyById_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetServiceProxyByType_Proxy(
-    IWSDDeviceProxy* This,
-    const WSDXML_NAME *pType,
-    IWSDServiceProxy **ppServiceProxy);
-void __RPC_STUB IWSDDeviceProxy_GetServiceProxyByType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceProxy_GetEndpointProxy_Proxy(
-    IWSDDeviceProxy* This,
-    IWSDEndpointProxy **ppProxy);
-void __RPC_STUB IWSDDeviceProxy_GetEndpointProxy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDDeviceProxy_INTERFACE_DEFINED__ */
 
@@ -1153,56 +967,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDServiceProxy* This);
+        IWSDServiceProxy *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDServiceProxy* This);
+        IWSDServiceProxy *This);
 
     /*** IWSDMetadataExchange methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMetadata)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         WSD_METADATA_SECTION_LIST **MetadataOut);
 
     /*** IWSDServiceProxy methods ***/
     HRESULT (STDMETHODCALLTYPE *BeginGetMetadata)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         IWSDAsyncResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *EndGetMetadata)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         IWSDAsyncResult *pResult,
         WSD_METADATA_SECTION_LIST **ppMetadata);
 
     HRESULT (STDMETHODCALLTYPE *GetServiceMetadata)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         WSD_SERVICE_METADATA **ppServiceMetadata);
 
     HRESULT (STDMETHODCALLTYPE *SubscribeToOperation)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         const WSD_OPERATION *pOperation,
         IUnknown *pUnknown,
         const WSDXML_ELEMENT *pAny,
         WSDXML_ELEMENT **ppAny);
 
     HRESULT (STDMETHODCALLTYPE *UnsubscribeToOperation)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         const WSD_OPERATION *pOperation);
 
     HRESULT (STDMETHODCALLTYPE *SetEventingStatusCallback)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         IWSDEventingStatus *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)(
-        IWSDServiceProxy* This,
+        IWSDServiceProxy *This,
         IWSDEndpointProxy **ppProxy);
 
     END_INTERFACE
 } IWSDServiceProxyVtbl;
+
 interface IWSDServiceProxy {
     CONST_VTBL IWSDServiceProxyVtbl* lpVtbl;
 };
@@ -1265,66 +1080,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDServiceProxy_BeginGetMetadata_Proxy(
-    IWSDServiceProxy* This,
-    IWSDAsyncResult **ppResult);
-void __RPC_STUB IWSDServiceProxy_BeginGetMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxy_EndGetMetadata_Proxy(
-    IWSDServiceProxy* This,
-    IWSDAsyncResult *pResult,
-    WSD_METADATA_SECTION_LIST **ppMetadata);
-void __RPC_STUB IWSDServiceProxy_EndGetMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxy_GetServiceMetadata_Proxy(
-    IWSDServiceProxy* This,
-    WSD_SERVICE_METADATA **ppServiceMetadata);
-void __RPC_STUB IWSDServiceProxy_GetServiceMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxy_SubscribeToOperation_Proxy(
-    IWSDServiceProxy* This,
-    const WSD_OPERATION *pOperation,
-    IUnknown *pUnknown,
-    const WSDXML_ELEMENT *pAny,
-    WSDXML_ELEMENT **ppAny);
-void __RPC_STUB IWSDServiceProxy_SubscribeToOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxy_UnsubscribeToOperation_Proxy(
-    IWSDServiceProxy* This,
-    const WSD_OPERATION *pOperation);
-void __RPC_STUB IWSDServiceProxy_UnsubscribeToOperation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxy_SetEventingStatusCallback_Proxy(
-    IWSDServiceProxy* This,
-    IWSDEventingStatus *pStatus);
-void __RPC_STUB IWSDServiceProxy_SetEventingStatusCallback_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxy_GetEndpointProxy_Proxy(
-    IWSDServiceProxy* This,
-    IWSDEndpointProxy **ppProxy);
-void __RPC_STUB IWSDServiceProxy_GetEndpointProxy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDServiceProxy_INTERFACE_DEFINED__ */
 
@@ -1440,57 +1195,57 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDServiceProxyEventing* This);
+        IWSDServiceProxyEventing *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDServiceProxyEventing* This);
+        IWSDServiceProxyEventing *This);
 
     /*** IWSDMetadataExchange methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMetadata)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         WSD_METADATA_SECTION_LIST **MetadataOut);
 
     /*** IWSDServiceProxy methods ***/
     HRESULT (STDMETHODCALLTYPE *BeginGetMetadata)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         IWSDAsyncResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *EndGetMetadata)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         IWSDAsyncResult *pResult,
         WSD_METADATA_SECTION_LIST **ppMetadata);
 
     HRESULT (STDMETHODCALLTYPE *GetServiceMetadata)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         WSD_SERVICE_METADATA **ppServiceMetadata);
 
     HRESULT (STDMETHODCALLTYPE *SubscribeToOperation)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperation,
         IUnknown *pUnknown,
         const WSDXML_ELEMENT *pAny,
         WSDXML_ELEMENT **ppAny);
 
     HRESULT (STDMETHODCALLTYPE *UnsubscribeToOperation)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperation);
 
     HRESULT (STDMETHODCALLTYPE *SetEventingStatusCallback)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         IWSDEventingStatus *pStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetEndpointProxy)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         IWSDEndpointProxy **ppProxy);
 
     /*** IWSDServiceProxyEventing methods ***/
     HRESULT (STDMETHODCALLTYPE *SubscribeToMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         IUnknown *pUnknown,
@@ -1500,7 +1255,7 @@
         WSDXML_ELEMENT **ppAny);
 
     HRESULT (STDMETHODCALLTYPE *BeginSubscribeToMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         IUnknown *pUnknown,
@@ -1511,7 +1266,7 @@
         IWSDAsyncResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *EndSubscribeToMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         IWSDAsyncResult *pResult,
@@ -1519,13 +1274,13 @@
         WSDXML_ELEMENT **ppAny);
 
     HRESULT (STDMETHODCALLTYPE *UnsubscribeToMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         const WSDXML_ELEMENT *pAny);
 
     HRESULT (STDMETHODCALLTYPE *BeginUnsubscribeToMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         const WSDXML_ELEMENT *pAny,
@@ -1534,13 +1289,13 @@
         IWSDAsyncResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *EndUnsubscribeToMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         IWSDAsyncResult *pResult);
 
     HRESULT (STDMETHODCALLTYPE *RenewMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         const WSD_EVENTING_EXPIRES *pExpires,
@@ -1549,7 +1304,7 @@
         WSDXML_ELEMENT **ppAny);
 
     HRESULT (STDMETHODCALLTYPE *BeginRenewMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         const WSD_EVENTING_EXPIRES *pExpires,
@@ -1559,7 +1314,7 @@
         IWSDAsyncResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *EndRenewMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         IWSDAsyncResult *pResult,
@@ -1567,7 +1322,7 @@
         WSDXML_ELEMENT **ppAny);
 
     HRESULT (STDMETHODCALLTYPE *GetStatusForMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         const WSDXML_ELEMENT *pAny,
@@ -1575,7 +1330,7 @@
         WSDXML_ELEMENT **ppAny);
 
     HRESULT (STDMETHODCALLTYPE *BeginGetStatusForMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         const WSDXML_ELEMENT *pAny,
@@ -1584,7 +1339,7 @@
         IWSDAsyncResult **ppResult);
 
     HRESULT (STDMETHODCALLTYPE *EndGetStatusForMultipleOperations)(
-        IWSDServiceProxyEventing* This,
+        IWSDServiceProxyEventing *This,
         const WSD_OPERATION *pOperations,
         DWORD dwOperationCount,
         IWSDAsyncResult *pResult,
@@ -1593,6 +1348,7 @@
 
     END_INTERFACE
 } IWSDServiceProxyEventingVtbl;
+
 interface IWSDServiceProxyEventing {
     CONST_VTBL IWSDServiceProxyEventingVtbl* lpVtbl;
 };
@@ -1705,156 +1461,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_SubscribeToMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    IUnknown *pUnknown,
-    const WSD_EVENTING_EXPIRES *pExpires,
-    const WSDXML_ELEMENT *pAny,
-    WSD_EVENTING_EXPIRES **ppExpires,
-    WSDXML_ELEMENT **ppAny);
-void __RPC_STUB IWSDServiceProxyEventing_SubscribeToMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginSubscribeToMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    IUnknown *pUnknown,
-    const WSD_EVENTING_EXPIRES *pExpires,
-    const WSDXML_ELEMENT *pAny,
-    IUnknown *pAsyncState,
-    IWSDAsyncCallback *pAsyncCallback,
-    IWSDAsyncResult **ppResult);
-void __RPC_STUB IWSDServiceProxyEventing_BeginSubscribeToMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndSubscribeToMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    IWSDAsyncResult *pResult,
-    WSD_EVENTING_EXPIRES **ppExpires,
-    WSDXML_ELEMENT **ppAny);
-void __RPC_STUB IWSDServiceProxyEventing_EndSubscribeToMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_UnsubscribeToMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    const WSDXML_ELEMENT *pAny);
-void __RPC_STUB IWSDServiceProxyEventing_UnsubscribeToMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginUnsubscribeToMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    const WSDXML_ELEMENT *pAny,
-    IUnknown *pAsyncState,
-    IWSDAsyncCallback *pAsyncCallback,
-    IWSDAsyncResult **ppResult);
-void __RPC_STUB IWSDServiceProxyEventing_BeginUnsubscribeToMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndUnsubscribeToMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    IWSDAsyncResult *pResult);
-void __RPC_STUB IWSDServiceProxyEventing_EndUnsubscribeToMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_RenewMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    const WSD_EVENTING_EXPIRES *pExpires,
-    const WSDXML_ELEMENT *pAny,
-    WSD_EVENTING_EXPIRES **ppExpires,
-    WSDXML_ELEMENT **ppAny);
-void __RPC_STUB IWSDServiceProxyEventing_RenewMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginRenewMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    const WSD_EVENTING_EXPIRES *pExpires,
-    const WSDXML_ELEMENT *pAny,
-    IUnknown *pAsyncState,
-    IWSDAsyncCallback *pAsyncCallback,
-    IWSDAsyncResult **ppResult);
-void __RPC_STUB IWSDServiceProxyEventing_BeginRenewMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndRenewMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    IWSDAsyncResult *pResult,
-    WSD_EVENTING_EXPIRES **ppExpires,
-    WSDXML_ELEMENT **ppAny);
-void __RPC_STUB IWSDServiceProxyEventing_EndRenewMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_GetStatusForMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    const WSDXML_ELEMENT *pAny,
-    WSD_EVENTING_EXPIRES **ppExpires,
-    WSDXML_ELEMENT **ppAny);
-void __RPC_STUB IWSDServiceProxyEventing_GetStatusForMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_BeginGetStatusForMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    const WSDXML_ELEMENT *pAny,
-    IUnknown *pAsyncState,
-    IWSDAsyncCallback *pAsyncCallback,
-    IWSDAsyncResult **ppResult);
-void __RPC_STUB IWSDServiceProxyEventing_BeginGetStatusForMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceProxyEventing_EndGetStatusForMultipleOperations_Proxy(
-    IWSDServiceProxyEventing* This,
-    const WSD_OPERATION *pOperations,
-    DWORD dwOperationCount,
-    IWSDAsyncResult *pResult,
-    WSD_EVENTING_EXPIRES **ppExpires,
-    WSDXML_ELEMENT **ppAny);
-void __RPC_STUB IWSDServiceProxyEventing_EndGetStatusForMultipleOperations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDServiceProxyEventing_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wsddisco.h b/mingw-w64-headers/include/wsddisco.h
index 1f2f888..686ea88 100644
--- a/mingw-w64-headers/include/wsddisco.h
+++ b/mingw-w64-headers/include/wsddisco.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wsddisco.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wsddisco.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,31 +20,49 @@
 #ifndef __IWSDScopeMatchingRule_FWD_DEFINED__
 #define __IWSDScopeMatchingRule_FWD_DEFINED__
 typedef interface IWSDScopeMatchingRule IWSDScopeMatchingRule;
+#ifdef __cplusplus
+interface IWSDScopeMatchingRule;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryProviderNotify_FWD_DEFINED__
 #define __IWSDiscoveryProviderNotify_FWD_DEFINED__
 typedef interface IWSDiscoveryProviderNotify IWSDiscoveryProviderNotify;
+#ifdef __cplusplus
+interface IWSDiscoveryProviderNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryProvider_FWD_DEFINED__
 #define __IWSDiscoveryProvider_FWD_DEFINED__
 typedef interface IWSDiscoveryProvider IWSDiscoveryProvider;
+#ifdef __cplusplus
+interface IWSDiscoveryProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveredService_FWD_DEFINED__
 #define __IWSDiscoveredService_FWD_DEFINED__
 typedef interface IWSDiscoveredService IWSDiscoveredService;
+#ifdef __cplusplus
+interface IWSDiscoveredService;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryPublisherNotify_FWD_DEFINED__
 #define __IWSDiscoveryPublisherNotify_FWD_DEFINED__
 typedef interface IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify;
+#ifdef __cplusplus
+interface IWSDiscoveryPublisherNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryPublisher_FWD_DEFINED__
 #define __IWSDiscoveryPublisher_FWD_DEFINED__
 typedef interface IWSDiscoveryPublisher IWSDiscoveryPublisher;
+#ifdef __cplusplus
+interface IWSDiscoveryPublisher;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -64,36 +82,57 @@
 #ifndef __IWSDXMLContext_FWD_DEFINED__
 #define __IWSDXMLContext_FWD_DEFINED__
 typedef interface IWSDXMLContext IWSDXMLContext;
+#ifdef __cplusplus
+interface IWSDXMLContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryProvider_FWD_DEFINED__
 #define __IWSDiscoveryProvider_FWD_DEFINED__
 typedef interface IWSDiscoveryProvider IWSDiscoveryProvider;
+#ifdef __cplusplus
+interface IWSDiscoveryProvider;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryProviderNotify_FWD_DEFINED__
 #define __IWSDiscoveryProviderNotify_FWD_DEFINED__
 typedef interface IWSDiscoveryProviderNotify IWSDiscoveryProviderNotify;
+#ifdef __cplusplus
+interface IWSDiscoveryProviderNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveredService_FWD_DEFINED__
 #define __IWSDiscoveredService_FWD_DEFINED__
 typedef interface IWSDiscoveredService IWSDiscoveredService;
+#ifdef __cplusplus
+interface IWSDiscoveredService;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryPublisher_FWD_DEFINED__
 #define __IWSDiscoveryPublisher_FWD_DEFINED__
 typedef interface IWSDiscoveryPublisher IWSDiscoveryPublisher;
+#ifdef __cplusplus
+interface IWSDiscoveryPublisher;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDiscoveryPublisherNotify_FWD_DEFINED__
 #define __IWSDiscoveryPublisherNotify_FWD_DEFINED__
 typedef interface IWSDiscoveryPublisherNotify IWSDiscoveryPublisherNotify;
+#ifdef __cplusplus
+interface IWSDiscoveryPublisherNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDScopeMatchingRule_FWD_DEFINED__
 #define __IWSDScopeMatchingRule_FWD_DEFINED__
 typedef interface IWSDScopeMatchingRule IWSDScopeMatchingRule;
+#ifdef __cplusplus
+interface IWSDScopeMatchingRule;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -125,29 +164,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDScopeMatchingRule* This,
+        IWSDScopeMatchingRule *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDScopeMatchingRule* This);
+        IWSDScopeMatchingRule *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDScopeMatchingRule* This);
+        IWSDScopeMatchingRule *This);
 
     /*** IWSDScopeMatchingRule methods ***/
     HRESULT (STDMETHODCALLTYPE *GetScopeRule)(
-        IWSDScopeMatchingRule* This,
+        IWSDScopeMatchingRule *This,
         LPCWSTR *ppszScopeMatchingRule);
 
     HRESULT (STDMETHODCALLTYPE *MatchScopes)(
-        IWSDScopeMatchingRule* This,
+        IWSDScopeMatchingRule *This,
         LPCWSTR pszScope1,
         LPCWSTR pszScope2,
         WINBOOL *pfMatch);
 
     END_INTERFACE
 } IWSDScopeMatchingRuleVtbl;
+
 interface IWSDScopeMatchingRule {
     CONST_VTBL IWSDScopeMatchingRuleVtbl* lpVtbl;
 };
@@ -184,24 +224,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDScopeMatchingRule_GetScopeRule_Proxy(
-    IWSDScopeMatchingRule* This,
-    LPCWSTR *ppszScopeMatchingRule);
-void __RPC_STUB IWSDScopeMatchingRule_GetScopeRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDScopeMatchingRule_MatchScopes_Proxy(
-    IWSDScopeMatchingRule* This,
-    LPCWSTR pszScope1,
-    LPCWSTR pszScope2,
-    WINBOOL *pfMatch);
-void __RPC_STUB IWSDScopeMatchingRule_MatchScopes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDScopeMatchingRule_INTERFACE_DEFINED__ */
 
@@ -239,36 +261,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDiscoveryProviderNotify* This,
+        IWSDiscoveryProviderNotify *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDiscoveryProviderNotify* This);
+        IWSDiscoveryProviderNotify *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDiscoveryProviderNotify* This);
+        IWSDiscoveryProviderNotify *This);
 
     /*** IWSDiscoveryProviderNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *Add)(
-        IWSDiscoveryProviderNotify* This,
+        IWSDiscoveryProviderNotify *This,
         IWSDiscoveredService *pService);
 
     HRESULT (STDMETHODCALLTYPE *Remove)(
-        IWSDiscoveryProviderNotify* This,
+        IWSDiscoveryProviderNotify *This,
         IWSDiscoveredService *pService);
 
     HRESULT (STDMETHODCALLTYPE *SearchFailed)(
-        IWSDiscoveryProviderNotify* This,
+        IWSDiscoveryProviderNotify *This,
         HRESULT hr,
         LPCWSTR pszTag);
 
     HRESULT (STDMETHODCALLTYPE *SearchComplete)(
-        IWSDiscoveryProviderNotify* This,
+        IWSDiscoveryProviderNotify *This,
         LPCWSTR pszTag);
 
     END_INTERFACE
 } IWSDiscoveryProviderNotifyVtbl;
+
 interface IWSDiscoveryProviderNotify {
     CONST_VTBL IWSDiscoveryProviderNotifyVtbl* lpVtbl;
 };
@@ -313,39 +336,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_Add_Proxy(
-    IWSDiscoveryProviderNotify* This,
-    IWSDiscoveredService *pService);
-void __RPC_STUB IWSDiscoveryProviderNotify_Add_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_Remove_Proxy(
-    IWSDiscoveryProviderNotify* This,
-    IWSDiscoveredService *pService);
-void __RPC_STUB IWSDiscoveryProviderNotify_Remove_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_SearchFailed_Proxy(
-    IWSDiscoveryProviderNotify* This,
-    HRESULT hr,
-    LPCWSTR pszTag);
-void __RPC_STUB IWSDiscoveryProviderNotify_SearchFailed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProviderNotify_SearchComplete_Proxy(
-    IWSDiscoveryProviderNotify* This,
-    LPCWSTR pszTag);
-void __RPC_STUB IWSDiscoveryProviderNotify_SearchComplete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDiscoveryProviderNotify_INTERFACE_DEFINED__ */
 
@@ -396,51 +386,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDiscoveryProvider* This,
+        IWSDiscoveryProvider *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDiscoveryProvider* This);
+        IWSDiscoveryProvider *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDiscoveryProvider* This);
+        IWSDiscoveryProvider *This);
 
     /*** IWSDiscoveryProvider methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAddressFamily)(
-        IWSDiscoveryProvider* This,
+        IWSDiscoveryProvider *This,
         DWORD dwAddressFamily);
 
     HRESULT (STDMETHODCALLTYPE *Attach)(
-        IWSDiscoveryProvider* This,
+        IWSDiscoveryProvider *This,
         IWSDiscoveryProviderNotify *pSink);
 
     HRESULT (STDMETHODCALLTYPE *Detach)(
-        IWSDiscoveryProvider* This);
+        IWSDiscoveryProvider *This);
 
     HRESULT (STDMETHODCALLTYPE *SearchById)(
-        IWSDiscoveryProvider* This,
+        IWSDiscoveryProvider *This,
         LPCWSTR pszId,
         LPCWSTR pszTag);
 
     HRESULT (STDMETHODCALLTYPE *SearchByAddress)(
-        IWSDiscoveryProvider* This,
+        IWSDiscoveryProvider *This,
         LPCWSTR pszAddress,
         LPCWSTR pszTag);
 
     HRESULT (STDMETHODCALLTYPE *SearchByType)(
-        IWSDiscoveryProvider* This,
+        IWSDiscoveryProvider *This,
         const WSD_NAME_LIST *pTypesList,
         const WSD_URI_LIST *pScopesList,
         LPCWSTR pszMatchBy,
         LPCWSTR pszTag);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLContext)(
-        IWSDiscoveryProvider* This,
+        IWSDiscoveryProvider *This,
         IWSDXMLContext **ppContext);
 
     END_INTERFACE
 } IWSDiscoveryProviderVtbl;
+
 interface IWSDiscoveryProvider {
     CONST_VTBL IWSDiscoveryProviderVtbl* lpVtbl;
 };
@@ -497,66 +488,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SetAddressFamily_Proxy(
-    IWSDiscoveryProvider* This,
-    DWORD dwAddressFamily);
-void __RPC_STUB IWSDiscoveryProvider_SetAddressFamily_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_Attach_Proxy(
-    IWSDiscoveryProvider* This,
-    IWSDiscoveryProviderNotify *pSink);
-void __RPC_STUB IWSDiscoveryProvider_Attach_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_Detach_Proxy(
-    IWSDiscoveryProvider* This);
-void __RPC_STUB IWSDiscoveryProvider_Detach_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SearchById_Proxy(
-    IWSDiscoveryProvider* This,
-    LPCWSTR pszId,
-    LPCWSTR pszTag);
-void __RPC_STUB IWSDiscoveryProvider_SearchById_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SearchByAddress_Proxy(
-    IWSDiscoveryProvider* This,
-    LPCWSTR pszAddress,
-    LPCWSTR pszTag);
-void __RPC_STUB IWSDiscoveryProvider_SearchByAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_SearchByType_Proxy(
-    IWSDiscoveryProvider* This,
-    const WSD_NAME_LIST *pTypesList,
-    const WSD_URI_LIST *pScopesList,
-    LPCWSTR pszMatchBy,
-    LPCWSTR pszTag);
-void __RPC_STUB IWSDiscoveryProvider_SearchByType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryProvider_GetXMLContext_Proxy(
-    IWSDiscoveryProvider* This,
-    IWSDXMLContext **ppContext);
-void __RPC_STUB IWSDiscoveryProvider_GetXMLContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDiscoveryProvider_INTERFACE_DEFINED__ */
 
@@ -615,64 +546,65 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDiscoveredService* This);
+        IWSDiscoveredService *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDiscoveredService* This);
+        IWSDiscoveredService *This);
 
     /*** IWSDiscoveredService methods ***/
     HRESULT (STDMETHODCALLTYPE *GetEndpointReference)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         WSD_ENDPOINT_REFERENCE **ppEndpointReference);
 
     HRESULT (STDMETHODCALLTYPE *GetTypes)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         WSD_NAME_LIST **ppTypesList);
 
     HRESULT (STDMETHODCALLTYPE *GetScopes)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         WSD_URI_LIST **ppScopesList);
 
     HRESULT (STDMETHODCALLTYPE *GetXAddrs)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         WSD_URI_LIST **ppXAddrsList);
 
     HRESULT (STDMETHODCALLTYPE *GetMetadataVersion)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         ULONGLONG *pullMetadataVersion);
 
     HRESULT (STDMETHODCALLTYPE *GetExtendedDiscoXML)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         WSDXML_ELEMENT **ppHeaderAny,
         WSDXML_ELEMENT **ppBodyAny);
 
     HRESULT (STDMETHODCALLTYPE *GetProbeResolveTag)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         LPCWSTR *ppszTag);
 
     HRESULT (STDMETHODCALLTYPE *GetRemoteTransportAddress)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         LPCWSTR *ppszRemoteTransportAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetLocalTransportAddress)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         LPCWSTR *ppszLocalTransportAddress);
 
     HRESULT (STDMETHODCALLTYPE *GetLocalInterfaceGUID)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         GUID *pGuid);
 
     HRESULT (STDMETHODCALLTYPE *GetInstanceId)(
-        IWSDiscoveredService* This,
+        IWSDiscoveredService *This,
         ULONGLONG *pullInstanceId);
 
     END_INTERFACE
 } IWSDiscoveredServiceVtbl;
+
 interface IWSDiscoveredService {
     CONST_VTBL IWSDiscoveredServiceVtbl* lpVtbl;
 };
@@ -745,95 +677,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetEndpointReference_Proxy(
-    IWSDiscoveredService* This,
-    WSD_ENDPOINT_REFERENCE **ppEndpointReference);
-void __RPC_STUB IWSDiscoveredService_GetEndpointReference_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetTypes_Proxy(
-    IWSDiscoveredService* This,
-    WSD_NAME_LIST **ppTypesList);
-void __RPC_STUB IWSDiscoveredService_GetTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetScopes_Proxy(
-    IWSDiscoveredService* This,
-    WSD_URI_LIST **ppScopesList);
-void __RPC_STUB IWSDiscoveredService_GetScopes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetXAddrs_Proxy(
-    IWSDiscoveredService* This,
-    WSD_URI_LIST **ppXAddrsList);
-void __RPC_STUB IWSDiscoveredService_GetXAddrs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetMetadataVersion_Proxy(
-    IWSDiscoveredService* This,
-    ULONGLONG *pullMetadataVersion);
-void __RPC_STUB IWSDiscoveredService_GetMetadataVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetExtendedDiscoXML_Proxy(
-    IWSDiscoveredService* This,
-    WSDXML_ELEMENT **ppHeaderAny,
-    WSDXML_ELEMENT **ppBodyAny);
-void __RPC_STUB IWSDiscoveredService_GetExtendedDiscoXML_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetProbeResolveTag_Proxy(
-    IWSDiscoveredService* This,
-    LPCWSTR *ppszTag);
-void __RPC_STUB IWSDiscoveredService_GetProbeResolveTag_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetRemoteTransportAddress_Proxy(
-    IWSDiscoveredService* This,
-    LPCWSTR *ppszRemoteTransportAddress);
-void __RPC_STUB IWSDiscoveredService_GetRemoteTransportAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetLocalTransportAddress_Proxy(
-    IWSDiscoveredService* This,
-    LPCWSTR *ppszLocalTransportAddress);
-void __RPC_STUB IWSDiscoveredService_GetLocalTransportAddress_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetLocalInterfaceGUID_Proxy(
-    IWSDiscoveredService* This,
-    GUID *pGuid);
-void __RPC_STUB IWSDiscoveredService_GetLocalInterfaceGUID_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveredService_GetInstanceId_Proxy(
-    IWSDiscoveredService* This,
-    ULONGLONG *pullInstanceId);
-void __RPC_STUB IWSDiscoveredService_GetInstanceId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDiscoveredService_INTERFACE_DEFINED__ */
 
@@ -866,29 +709,30 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDiscoveryPublisherNotify* This,
+        IWSDiscoveryPublisherNotify *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDiscoveryPublisherNotify* This);
+        IWSDiscoveryPublisherNotify *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDiscoveryPublisherNotify* This);
+        IWSDiscoveryPublisherNotify *This);
 
     /*** IWSDiscoveryPublisherNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *ProbeHandler)(
-        IWSDiscoveryPublisherNotify* This,
+        IWSDiscoveryPublisherNotify *This,
         const WSD_SOAP_MESSAGE *pSoap,
         IWSDMessageParameters *pMessageParameters);
 
     HRESULT (STDMETHODCALLTYPE *ResolveHandler)(
-        IWSDiscoveryPublisherNotify* This,
+        IWSDiscoveryPublisherNotify *This,
         const WSD_SOAP_MESSAGE *pSoap,
         IWSDMessageParameters *pMessageParameters);
 
     END_INTERFACE
 } IWSDiscoveryPublisherNotifyVtbl;
+
 interface IWSDiscoveryPublisherNotify {
     CONST_VTBL IWSDiscoveryPublisherNotifyVtbl* lpVtbl;
 };
@@ -925,24 +769,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisherNotify_ProbeHandler_Proxy(
-    IWSDiscoveryPublisherNotify* This,
-    const WSD_SOAP_MESSAGE *pSoap,
-    IWSDMessageParameters *pMessageParameters);
-void __RPC_STUB IWSDiscoveryPublisherNotify_ProbeHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisherNotify_ResolveHandler_Proxy(
-    IWSDiscoveryPublisherNotify* This,
-    const WSD_SOAP_MESSAGE *pSoap,
-    IWSDMessageParameters *pMessageParameters);
-void __RPC_STUB IWSDiscoveryPublisherNotify_ResolveHandler_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDiscoveryPublisherNotify_INTERFACE_DEFINED__ */
 
@@ -1075,31 +901,31 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDiscoveryPublisher* This);
+        IWSDiscoveryPublisher *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDiscoveryPublisher* This);
+        IWSDiscoveryPublisher *This);
 
     /*** IWSDiscoveryPublisher methods ***/
     HRESULT (STDMETHODCALLTYPE *SetAddressFamily)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         DWORD dwAddressFamily);
 
     HRESULT (STDMETHODCALLTYPE *RegisterNotificationSink)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         IWSDiscoveryPublisherNotify *pSink);
 
     HRESULT (STDMETHODCALLTYPE *UnRegisterNotificationSink)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         IWSDiscoveryPublisherNotify *pSink);
 
     HRESULT (STDMETHODCALLTYPE *Publish)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         LPCWSTR pszId,
         ULONGLONG ullMetadataVersion,
         ULONGLONG ullInstanceId,
@@ -1110,7 +936,7 @@
         const WSD_URI_LIST *pXAddrsList);
 
     HRESULT (STDMETHODCALLTYPE *UnPublish)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         LPCWSTR pszId,
         ULONGLONG ullInstanceId,
         ULONGLONG ullMessageNumber,
@@ -1118,7 +944,7 @@
         const WSDXML_ELEMENT *pAny);
 
     HRESULT (STDMETHODCALLTYPE *MatchProbe)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         const WSD_SOAP_MESSAGE *pProbeMessage,
         IWSDMessageParameters *pMessageParameters,
         LPCWSTR pszId,
@@ -1131,7 +957,7 @@
         const WSD_URI_LIST *pXAddrsList);
 
     HRESULT (STDMETHODCALLTYPE *MatchResolve)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         const WSD_SOAP_MESSAGE *pResolveMessage,
         IWSDMessageParameters *pMessageParameters,
         LPCWSTR pszId,
@@ -1144,7 +970,7 @@
         const WSD_URI_LIST *pXAddrsList);
 
     HRESULT (STDMETHODCALLTYPE *PublishEx)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         LPCWSTR pszId,
         ULONGLONG ullMetadataVersion,
         ULONGLONG ullInstanceId,
@@ -1160,7 +986,7 @@
         const WSDXML_ELEMENT *pAny);
 
     HRESULT (STDMETHODCALLTYPE *MatchProbeEx)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         const WSD_SOAP_MESSAGE *pProbeMessage,
         IWSDMessageParameters *pMessageParameters,
         LPCWSTR pszId,
@@ -1178,7 +1004,7 @@
         const WSDXML_ELEMENT *pAny);
 
     HRESULT (STDMETHODCALLTYPE *MatchResolveEx)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         const WSD_SOAP_MESSAGE *pResolveMessage,
         IWSDMessageParameters *pMessageParameters,
         LPCWSTR pszId,
@@ -1196,19 +1022,20 @@
         const WSDXML_ELEMENT *pAny);
 
     HRESULT (STDMETHODCALLTYPE *RegisterScopeMatchingRule)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         IWSDScopeMatchingRule *pScopeMatchingRule);
 
     HRESULT (STDMETHODCALLTYPE *UnRegisterScopeMatchingRule)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         IWSDScopeMatchingRule *pScopeMatchingRule);
 
     HRESULT (STDMETHODCALLTYPE *GetXMLContext)(
-        IWSDiscoveryPublisher* This,
+        IWSDiscoveryPublisher *This,
         IWSDXMLContext **ppContext);
 
     END_INTERFACE
 } IWSDiscoveryPublisherVtbl;
+
 interface IWSDiscoveryPublisher {
     CONST_VTBL IWSDiscoveryPublisherVtbl* lpVtbl;
 };
@@ -1289,179 +1116,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_SetAddressFamily_Proxy(
-    IWSDiscoveryPublisher* This,
-    DWORD dwAddressFamily);
-void __RPC_STUB IWSDiscoveryPublisher_SetAddressFamily_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_RegisterNotificationSink_Proxy(
-    IWSDiscoveryPublisher* This,
-    IWSDiscoveryPublisherNotify *pSink);
-void __RPC_STUB IWSDiscoveryPublisher_RegisterNotificationSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_UnRegisterNotificationSink_Proxy(
-    IWSDiscoveryPublisher* This,
-    IWSDiscoveryPublisherNotify *pSink);
-void __RPC_STUB IWSDiscoveryPublisher_UnRegisterNotificationSink_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_Publish_Proxy(
-    IWSDiscoveryPublisher* This,
-    LPCWSTR pszId,
-    ULONGLONG ullMetadataVersion,
-    ULONGLONG ullInstanceId,
-    ULONGLONG ullMessageNumber,
-    LPCWSTR pszSessionId,
-    const WSD_NAME_LIST *pTypesList,
-    const WSD_URI_LIST *pScopesList,
-    const WSD_URI_LIST *pXAddrsList);
-void __RPC_STUB IWSDiscoveryPublisher_Publish_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_UnPublish_Proxy(
-    IWSDiscoveryPublisher* This,
-    LPCWSTR pszId,
-    ULONGLONG ullInstanceId,
-    ULONGLONG ullMessageNumber,
-    LPCWSTR pszSessionId,
-    const WSDXML_ELEMENT *pAny);
-void __RPC_STUB IWSDiscoveryPublisher_UnPublish_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchProbe_Proxy(
-    IWSDiscoveryPublisher* This,
-    const WSD_SOAP_MESSAGE *pProbeMessage,
-    IWSDMessageParameters *pMessageParameters,
-    LPCWSTR pszId,
-    ULONGLONG ullMetadataVersion,
-    ULONGLONG ullInstanceId,
-    ULONGLONG ullMessageNumber,
-    LPCWSTR pszSessionId,
-    const WSD_NAME_LIST *pTypesList,
-    const WSD_URI_LIST *pScopesList,
-    const WSD_URI_LIST *pXAddrsList);
-void __RPC_STUB IWSDiscoveryPublisher_MatchProbe_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchResolve_Proxy(
-    IWSDiscoveryPublisher* This,
-    const WSD_SOAP_MESSAGE *pResolveMessage,
-    IWSDMessageParameters *pMessageParameters,
-    LPCWSTR pszId,
-    ULONGLONG ullMetadataVersion,
-    ULONGLONG ullInstanceId,
-    ULONGLONG ullMessageNumber,
-    LPCWSTR pszSessionId,
-    const WSD_NAME_LIST *pTypesList,
-    const WSD_URI_LIST *pScopesList,
-    const WSD_URI_LIST *pXAddrsList);
-void __RPC_STUB IWSDiscoveryPublisher_MatchResolve_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_PublishEx_Proxy(
-    IWSDiscoveryPublisher* This,
-    LPCWSTR pszId,
-    ULONGLONG ullMetadataVersion,
-    ULONGLONG ullInstanceId,
-    ULONGLONG ullMessageNumber,
-    LPCWSTR pszSessionId,
-    const WSD_NAME_LIST *pTypesList,
-    const WSD_URI_LIST *pScopesList,
-    const WSD_URI_LIST *pXAddrsList,
-    const WSDXML_ELEMENT *pHeaderAny,
-    const WSDXML_ELEMENT *pReferenceParameterAny,
-    const WSDXML_ELEMENT *pPolicyAny,
-    const WSDXML_ELEMENT *pEndpointReferenceAny,
-    const WSDXML_ELEMENT *pAny);
-void __RPC_STUB IWSDiscoveryPublisher_PublishEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchProbeEx_Proxy(
-    IWSDiscoveryPublisher* This,
-    const WSD_SOAP_MESSAGE *pProbeMessage,
-    IWSDMessageParameters *pMessageParameters,
-    LPCWSTR pszId,
-    ULONGLONG ullMetadataVersion,
-    ULONGLONG ullInstanceId,
-    ULONGLONG ullMessageNumber,
-    LPCWSTR pszSessionId,
-    const WSD_NAME_LIST *pTypesList,
-    const WSD_URI_LIST *pScopesList,
-    const WSD_URI_LIST *pXAddrsList,
-    const WSDXML_ELEMENT *pHeaderAny,
-    const WSDXML_ELEMENT *pReferenceParameterAny,
-    const WSDXML_ELEMENT *pPolicyAny,
-    const WSDXML_ELEMENT *pEndpointReferenceAny,
-    const WSDXML_ELEMENT *pAny);
-void __RPC_STUB IWSDiscoveryPublisher_MatchProbeEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_MatchResolveEx_Proxy(
-    IWSDiscoveryPublisher* This,
-    const WSD_SOAP_MESSAGE *pResolveMessage,
-    IWSDMessageParameters *pMessageParameters,
-    LPCWSTR pszId,
-    ULONGLONG ullMetadataVersion,
-    ULONGLONG ullInstanceId,
-    ULONGLONG ullMessageNumber,
-    LPCWSTR pszSessionId,
-    const WSD_NAME_LIST *pTypesList,
-    const WSD_URI_LIST *pScopesList,
-    const WSD_URI_LIST *pXAddrsList,
-    const WSDXML_ELEMENT *pHeaderAny,
-    const WSDXML_ELEMENT *pReferenceParameterAny,
-    const WSDXML_ELEMENT *pPolicyAny,
-    const WSDXML_ELEMENT *pEndpointReferenceAny,
-    const WSDXML_ELEMENT *pAny);
-void __RPC_STUB IWSDiscoveryPublisher_MatchResolveEx_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_RegisterScopeMatchingRule_Proxy(
-    IWSDiscoveryPublisher* This,
-    IWSDScopeMatchingRule *pScopeMatchingRule);
-void __RPC_STUB IWSDiscoveryPublisher_RegisterScopeMatchingRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_UnRegisterScopeMatchingRule_Proxy(
-    IWSDiscoveryPublisher* This,
-    IWSDScopeMatchingRule *pScopeMatchingRule);
-void __RPC_STUB IWSDiscoveryPublisher_UnRegisterScopeMatchingRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDiscoveryPublisher_GetXMLContext_Proxy(
-    IWSDiscoveryPublisher* This,
-    IWSDXMLContext **ppContext);
-void __RPC_STUB IWSDiscoveryPublisher_GetXMLContext_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDiscoveryPublisher_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wsdhost.h b/mingw-w64-headers/include/wsdhost.h
index da01842..e00dcc5 100644
--- a/mingw-w64-headers/include/wsdhost.h
+++ b/mingw-w64-headers/include/wsdhost.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wsdhost.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wsdhost.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,16 +20,25 @@
 #ifndef __IWSDDeviceHostNotify_FWD_DEFINED__
 #define __IWSDDeviceHostNotify_FWD_DEFINED__
 typedef interface IWSDDeviceHostNotify IWSDDeviceHostNotify;
+#ifdef __cplusplus
+interface IWSDDeviceHostNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDServiceMessaging_FWD_DEFINED__
 #define __IWSDServiceMessaging_FWD_DEFINED__
 typedef interface IWSDServiceMessaging IWSDServiceMessaging;
+#ifdef __cplusplus
+interface IWSDServiceMessaging;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDDeviceHost_FWD_DEFINED__
 #define __IWSDDeviceHost_FWD_DEFINED__
 typedef interface IWSDDeviceHost IWSDDeviceHost;
+#ifdef __cplusplus
+interface IWSDDeviceHost;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -50,26 +59,41 @@
 #ifndef __IWSDAddress_FWD_DEFINED__
 #define __IWSDAddress_FWD_DEFINED__
 typedef interface IWSDAddress IWSDAddress;
+#ifdef __cplusplus
+interface IWSDAddress;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDXMLContext_FWD_DEFINED__
 #define __IWSDXMLContext_FWD_DEFINED__
 typedef interface IWSDXMLContext IWSDXMLContext;
+#ifdef __cplusplus
+interface IWSDXMLContext;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDDeviceHost_FWD_DEFINED__
 #define __IWSDDeviceHost_FWD_DEFINED__
 typedef interface IWSDDeviceHost IWSDDeviceHost;
+#ifdef __cplusplus
+interface IWSDDeviceHost;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDDeviceHostNotify_FWD_DEFINED__
 #define __IWSDDeviceHostNotify_FWD_DEFINED__
 typedef interface IWSDDeviceHostNotify IWSDDeviceHostNotify;
+#ifdef __cplusplus
+interface IWSDDeviceHostNotify;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSDServiceMessaging_FWD_DEFINED__
 #define __IWSDServiceMessaging_FWD_DEFINED__
 typedef interface IWSDServiceMessaging IWSDServiceMessaging;
+#ifdef __cplusplus
+interface IWSDServiceMessaging;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -97,24 +121,25 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDDeviceHostNotify* This,
+        IWSDDeviceHostNotify *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDDeviceHostNotify* This);
+        IWSDDeviceHostNotify *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDDeviceHostNotify* This);
+        IWSDDeviceHostNotify *This);
 
     /*** IWSDDeviceHostNotify methods ***/
     HRESULT (STDMETHODCALLTYPE *GetService)(
-        IWSDDeviceHostNotify* This,
+        IWSDDeviceHostNotify *This,
         LPCWSTR pszServiceId,
         IUnknown **ppService);
 
     END_INTERFACE
 } IWSDDeviceHostNotifyVtbl;
+
 interface IWSDDeviceHostNotify {
     CONST_VTBL IWSDDeviceHostNotifyVtbl* lpVtbl;
 };
@@ -147,15 +172,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDDeviceHostNotify_GetService_Proxy(
-    IWSDDeviceHostNotify* This,
-    LPCWSTR pszServiceId,
-    IUnknown **ppService);
-void __RPC_STUB IWSDDeviceHostNotify_GetService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDDeviceHostNotify_INTERFACE_DEFINED__ */
 
@@ -190,31 +206,32 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDServiceMessaging* This,
+        IWSDServiceMessaging *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDServiceMessaging* This);
+        IWSDServiceMessaging *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDServiceMessaging* This);
+        IWSDServiceMessaging *This);
 
     /*** IWSDServiceMessaging methods ***/
     HRESULT (STDMETHODCALLTYPE *SendResponse)(
-        IWSDServiceMessaging* This,
+        IWSDServiceMessaging *This,
         void *pBody,
         WSD_OPERATION *pOperation,
         IWSDMessageParameters *pMessageParameters);
 
     HRESULT (STDMETHODCALLTYPE *FaultRequest)(
-        IWSDServiceMessaging* This,
+        IWSDServiceMessaging *This,
         WSD_SOAP_HEADER *pRequestHeader,
         IWSDMessageParameters *pMessageParameters,
         WSD_SOAP_FAULT *pFault);
 
     END_INTERFACE
 } IWSDServiceMessagingVtbl;
+
 interface IWSDServiceMessaging {
     CONST_VTBL IWSDServiceMessagingVtbl* lpVtbl;
 };
@@ -251,26 +268,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDServiceMessaging_SendResponse_Proxy(
-    IWSDServiceMessaging* This,
-    void *pBody,
-    WSD_OPERATION *pOperation,
-    IWSDMessageParameters *pMessageParameters);
-void __RPC_STUB IWSDServiceMessaging_SendResponse_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDServiceMessaging_FaultRequest_Proxy(
-    IWSDServiceMessaging* This,
-    WSD_SOAP_HEADER *pRequestHeader,
-    IWSDMessageParameters *pMessageParameters,
-    WSD_SOAP_FAULT *pFault);
-void __RPC_STUB IWSDServiceMessaging_FaultRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDServiceMessaging_INTERFACE_DEFINED__ */
 
@@ -348,58 +345,58 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDDeviceHost* This);
+        IWSDDeviceHost *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDDeviceHost* This);
+        IWSDDeviceHost *This);
 
     /*** IWSDDeviceHost methods ***/
     HRESULT (STDMETHODCALLTYPE *Init)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         LPCWSTR pszLocalId,
         IWSDXMLContext *pContext,
         IWSDAddress **ppHostAddresses,
         DWORD dwHostAddressCount);
 
     HRESULT (STDMETHODCALLTYPE *Start)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         ULONGLONG ullInstanceId,
         const WSD_URI_LIST *pScopeList,
         IWSDDeviceHostNotify *pNotificationSink);
 
     HRESULT (STDMETHODCALLTYPE *Stop)(
-        IWSDDeviceHost* This);
+        IWSDDeviceHost *This);
 
     HRESULT (STDMETHODCALLTYPE *Terminate)(
-        IWSDDeviceHost* This);
+        IWSDDeviceHost *This);
 
     HRESULT (STDMETHODCALLTYPE *RegisterPortType)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         const WSD_PORT_TYPE *pPortType);
 
     HRESULT (STDMETHODCALLTYPE *SetMetadata)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         const WSD_THIS_MODEL_METADATA *pThisModelMetadata,
         const WSD_THIS_DEVICE_METADATA *pThisDeviceMetadata,
         const WSD_HOST_METADATA *pHostMetadata,
         const WSD_METADATA_SECTION_LIST *pCustomMetadata);
 
     HRESULT (STDMETHODCALLTYPE *RegisterService)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         LPCWSTR pszServiceId,
         IUnknown *pService);
 
     HRESULT (STDMETHODCALLTYPE *RetireService)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         LPCWSTR pszServiceId);
 
     HRESULT (STDMETHODCALLTYPE *AddDynamicService)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         LPCWSTR pszServiceId,
         LPCWSTR pszEndpointAddress,
         const WSD_PORT_TYPE *pPortType,
@@ -408,22 +405,23 @@
         IUnknown *pService);
 
     HRESULT (STDMETHODCALLTYPE *RemoveDynamicService)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         LPCWSTR pszServiceId);
 
     HRESULT (STDMETHODCALLTYPE *SetServiceDiscoverable)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         LPCWSTR pszServiceId,
         WINBOOL fDiscoverable);
 
     HRESULT (STDMETHODCALLTYPE *SignalEvent)(
-        IWSDDeviceHost* This,
+        IWSDDeviceHost *This,
         LPCWSTR pszServiceId,
         const void *pBody,
         const WSD_OPERATION *pOperation);
 
     END_INTERFACE
 } IWSDDeviceHostVtbl;
+
 interface IWSDDeviceHost {
     CONST_VTBL IWSDDeviceHostVtbl* lpVtbl;
 };
@@ -500,117 +498,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Init_Proxy(
-    IWSDDeviceHost* This,
-    LPCWSTR pszLocalId,
-    IWSDXMLContext *pContext,
-    IWSDAddress **ppHostAddresses,
-    DWORD dwHostAddressCount);
-void __RPC_STUB IWSDDeviceHost_Init_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Start_Proxy(
-    IWSDDeviceHost* This,
-    ULONGLONG ullInstanceId,
-    const WSD_URI_LIST *pScopeList,
-    IWSDDeviceHostNotify *pNotificationSink);
-void __RPC_STUB IWSDDeviceHost_Start_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Stop_Proxy(
-    IWSDDeviceHost* This);
-void __RPC_STUB IWSDDeviceHost_Stop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_Terminate_Proxy(
-    IWSDDeviceHost* This);
-void __RPC_STUB IWSDDeviceHost_Terminate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RegisterPortType_Proxy(
-    IWSDDeviceHost* This,
-    const WSD_PORT_TYPE *pPortType);
-void __RPC_STUB IWSDDeviceHost_RegisterPortType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_SetMetadata_Proxy(
-    IWSDDeviceHost* This,
-    const WSD_THIS_MODEL_METADATA *pThisModelMetadata,
-    const WSD_THIS_DEVICE_METADATA *pThisDeviceMetadata,
-    const WSD_HOST_METADATA *pHostMetadata,
-    const WSD_METADATA_SECTION_LIST *pCustomMetadata);
-void __RPC_STUB IWSDDeviceHost_SetMetadata_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RegisterService_Proxy(
-    IWSDDeviceHost* This,
-    LPCWSTR pszServiceId,
-    IUnknown *pService);
-void __RPC_STUB IWSDDeviceHost_RegisterService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RetireService_Proxy(
-    IWSDDeviceHost* This,
-    LPCWSTR pszServiceId);
-void __RPC_STUB IWSDDeviceHost_RetireService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_AddDynamicService_Proxy(
-    IWSDDeviceHost* This,
-    LPCWSTR pszServiceId,
-    LPCWSTR pszEndpointAddress,
-    const WSD_PORT_TYPE *pPortType,
-    const WSDXML_NAME *pPortName,
-    const WSDXML_ELEMENT *pAny,
-    IUnknown *pService);
-void __RPC_STUB IWSDDeviceHost_AddDynamicService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_RemoveDynamicService_Proxy(
-    IWSDDeviceHost* This,
-    LPCWSTR pszServiceId);
-void __RPC_STUB IWSDDeviceHost_RemoveDynamicService_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_SetServiceDiscoverable_Proxy(
-    IWSDDeviceHost* This,
-    LPCWSTR pszServiceId,
-    WINBOOL fDiscoverable);
-void __RPC_STUB IWSDDeviceHost_SetServiceDiscoverable_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDDeviceHost_SignalEvent_Proxy(
-    IWSDDeviceHost* This,
-    LPCWSTR pszServiceId,
-    const void *pBody,
-    const WSD_OPERATION *pOperation);
-void __RPC_STUB IWSDDeviceHost_SignalEvent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDDeviceHost_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wsdxml.h b/mingw-w64-headers/include/wsdxml.h
index 9be8c93..c4c4bc9 100644
--- a/mingw-w64-headers/include/wsdxml.h
+++ b/mingw-w64-headers/include/wsdxml.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wsdxml.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wsdxml.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,6 +20,9 @@
 #ifndef __IWSDXMLContext_FWD_DEFINED__
 #define __IWSDXMLContext_FWD_DEFINED__
 typedef interface IWSDXMLContext IWSDXMLContext;
+#ifdef __cplusplus
+interface IWSDXMLContext;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -38,6 +41,9 @@
 #ifndef __IWSDXMLContext_FWD_DEFINED__
 #define __IWSDXMLContext_FWD_DEFINED__
 typedef interface IWSDXMLContext IWSDXMLContext;
+#ifdef __cplusplus
+interface IWSDXMLContext;
+#endif /* __cplusplus */
 #endif
 
 enum {
@@ -89,7 +95,6 @@
     OpFormatXMLDeclaration_ = 45,
     OpFormatMax = 46
 };
-
 typedef struct _WSDXML_NAMESPACE WSDXML_NAMESPACE;
 typedef const WSDXML_NAMESPACE *PCWSDXML_NAMESPACE;
 typedef struct _WSDXML_NAME WSDXML_NAME;
@@ -208,43 +213,44 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSDXMLContext* This,
+        IWSDXMLContext *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSDXMLContext* This);
+        IWSDXMLContext *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSDXMLContext* This);
+        IWSDXMLContext *This);
 
     /*** IWSDXMLContext methods ***/
     HRESULT (STDMETHODCALLTYPE *AddNamespace)(
-        IWSDXMLContext* This,
+        IWSDXMLContext *This,
         LPCWSTR pszUri,
         LPCWSTR pszSuggestedPrefix,
         WSDXML_NAMESPACE **ppNamespace);
 
     HRESULT (STDMETHODCALLTYPE *AddNameToNamespace)(
-        IWSDXMLContext* This,
+        IWSDXMLContext *This,
         LPCWSTR pszUri,
         LPCWSTR pszName,
         WSDXML_NAME **ppName);
 
     HRESULT (STDMETHODCALLTYPE *SetNamespaces)(
-        IWSDXMLContext* This,
+        IWSDXMLContext *This,
         const PCWSDXML_NAMESPACE *pNamespaces,
         WORD wNamespacesCount,
         BYTE bLayerNumber);
 
     HRESULT (STDMETHODCALLTYPE *SetTypes)(
-        IWSDXMLContext* This,
+        IWSDXMLContext *This,
         const PCWSDXML_TYPE *pTypes,
         DWORD dwTypesCount,
         BYTE bLayerNumber);
 
     END_INTERFACE
 } IWSDXMLContextVtbl;
+
 interface IWSDXMLContext {
     CONST_VTBL IWSDXMLContextVtbl* lpVtbl;
 };
@@ -289,46 +295,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSDXMLContext_AddNamespace_Proxy(
-    IWSDXMLContext* This,
-    LPCWSTR pszUri,
-    LPCWSTR pszSuggestedPrefix,
-    WSDXML_NAMESPACE **ppNamespace);
-void __RPC_STUB IWSDXMLContext_AddNamespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDXMLContext_AddNameToNamespace_Proxy(
-    IWSDXMLContext* This,
-    LPCWSTR pszUri,
-    LPCWSTR pszName,
-    WSDXML_NAME **ppName);
-void __RPC_STUB IWSDXMLContext_AddNameToNamespace_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDXMLContext_SetNamespaces_Proxy(
-    IWSDXMLContext* This,
-    const PCWSDXML_NAMESPACE *pNamespaces,
-    WORD wNamespacesCount,
-    BYTE bLayerNumber);
-void __RPC_STUB IWSDXMLContext_SetNamespaces_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSDXMLContext_SetTypes_Proxy(
-    IWSDXMLContext* This,
-    const PCWSDXML_TYPE *pTypes,
-    DWORD dwTypesCount,
-    BYTE bLayerNumber);
-void __RPC_STUB IWSDXMLContext_SetTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSDXMLContext_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wsmandisp.h b/mingw-w64-headers/include/wsmandisp.h
index 9c5c0b8..2c2a8e8 100644
--- a/mingw-w64-headers/include/wsmandisp.h
+++ b/mingw-w64-headers/include/wsmandisp.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wsmandisp.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wsmandisp.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -38,61 +38,97 @@
 #ifndef __IWSMan_FWD_DEFINED__
 #define __IWSMan_FWD_DEFINED__
 typedef interface IWSMan IWSMan;
+#ifdef __cplusplus
+interface IWSMan;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEx_FWD_DEFINED__
 #define __IWSManEx_FWD_DEFINED__
 typedef interface IWSManEx IWSManEx;
+#ifdef __cplusplus
+interface IWSManEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEx2_FWD_DEFINED__
 #define __IWSManEx2_FWD_DEFINED__
 typedef interface IWSManEx2 IWSManEx2;
+#ifdef __cplusplus
+interface IWSManEx2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEx3_FWD_DEFINED__
 #define __IWSManEx3_FWD_DEFINED__
 typedef interface IWSManEx3 IWSManEx3;
+#ifdef __cplusplus
+interface IWSManEx3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManConnectionOptions_FWD_DEFINED__
 #define __IWSManConnectionOptions_FWD_DEFINED__
 typedef interface IWSManConnectionOptions IWSManConnectionOptions;
+#ifdef __cplusplus
+interface IWSManConnectionOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManConnectionOptionsEx_FWD_DEFINED__
 #define __IWSManConnectionOptionsEx_FWD_DEFINED__
 typedef interface IWSManConnectionOptionsEx IWSManConnectionOptionsEx;
+#ifdef __cplusplus
+interface IWSManConnectionOptionsEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManConnectionOptionsEx2_FWD_DEFINED__
 #define __IWSManConnectionOptionsEx2_FWD_DEFINED__
 typedef interface IWSManConnectionOptionsEx2 IWSManConnectionOptionsEx2;
+#ifdef __cplusplus
+interface IWSManConnectionOptionsEx2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManSession_FWD_DEFINED__
 #define __IWSManSession_FWD_DEFINED__
 typedef interface IWSManSession IWSManSession;
+#ifdef __cplusplus
+interface IWSManSession;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEnumerator_FWD_DEFINED__
 #define __IWSManEnumerator_FWD_DEFINED__
 typedef interface IWSManEnumerator IWSManEnumerator;
+#ifdef __cplusplus
+interface IWSManEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManResourceLocator_FWD_DEFINED__
 #define __IWSManResourceLocator_FWD_DEFINED__
 typedef interface IWSManResourceLocator IWSManResourceLocator;
+#ifdef __cplusplus
+interface IWSManResourceLocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManResourceLocatorInternal_FWD_DEFINED__
 #define __IWSManResourceLocatorInternal_FWD_DEFINED__
 typedef interface IWSManResourceLocatorInternal IWSManResourceLocatorInternal;
+#ifdef __cplusplus
+interface IWSManResourceLocatorInternal;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManInternal_FWD_DEFINED__
 #define __IWSManInternal_FWD_DEFINED__
 typedef interface IWSManInternal IWSManInternal;
+#ifdef __cplusplus
+interface IWSManInternal;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -153,66 +189,105 @@
 #ifndef __IWSMan_FWD_DEFINED__
 #define __IWSMan_FWD_DEFINED__
 typedef interface IWSMan IWSMan;
+#ifdef __cplusplus
+interface IWSMan;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEx_FWD_DEFINED__
 #define __IWSManEx_FWD_DEFINED__
 typedef interface IWSManEx IWSManEx;
+#ifdef __cplusplus
+interface IWSManEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEx2_FWD_DEFINED__
 #define __IWSManEx2_FWD_DEFINED__
 typedef interface IWSManEx2 IWSManEx2;
+#ifdef __cplusplus
+interface IWSManEx2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEx3_FWD_DEFINED__
 #define __IWSManEx3_FWD_DEFINED__
 typedef interface IWSManEx3 IWSManEx3;
+#ifdef __cplusplus
+interface IWSManEx3;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManConnectionOptions_FWD_DEFINED__
 #define __IWSManConnectionOptions_FWD_DEFINED__
 typedef interface IWSManConnectionOptions IWSManConnectionOptions;
+#ifdef __cplusplus
+interface IWSManConnectionOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManConnectionOptionsEx_FWD_DEFINED__
 #define __IWSManConnectionOptionsEx_FWD_DEFINED__
 typedef interface IWSManConnectionOptionsEx IWSManConnectionOptionsEx;
+#ifdef __cplusplus
+interface IWSManConnectionOptionsEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManConnectionOptionsEx2_FWD_DEFINED__
 #define __IWSManConnectionOptionsEx2_FWD_DEFINED__
 typedef interface IWSManConnectionOptionsEx2 IWSManConnectionOptionsEx2;
+#ifdef __cplusplus
+interface IWSManConnectionOptionsEx2;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManSession_FWD_DEFINED__
 #define __IWSManSession_FWD_DEFINED__
 typedef interface IWSManSession IWSManSession;
+#ifdef __cplusplus
+interface IWSManSession;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManSessionEx_FWD_DEFINED__
 #define __IWSManSessionEx_FWD_DEFINED__
 typedef interface IWSManSessionEx IWSManSessionEx;
+#ifdef __cplusplus
+interface IWSManSessionEx;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManEnumerator_FWD_DEFINED__
 #define __IWSManEnumerator_FWD_DEFINED__
 typedef interface IWSManEnumerator IWSManEnumerator;
+#ifdef __cplusplus
+interface IWSManEnumerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManResourceLocator_FWD_DEFINED__
 #define __IWSManResourceLocator_FWD_DEFINED__
 typedef interface IWSManResourceLocator IWSManResourceLocator;
+#ifdef __cplusplus
+interface IWSManResourceLocator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManResourceLocatorInternal_FWD_DEFINED__
 #define __IWSManResourceLocatorInternal_FWD_DEFINED__
 typedef interface IWSManResourceLocatorInternal IWSManResourceLocatorInternal;
+#ifdef __cplusplus
+interface IWSManResourceLocatorInternal;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IWSManInternal_FWD_DEFINED__
 #define __IWSManInternal_FWD_DEFINED__
 typedef interface IWSManInternal IWSManInternal;
+#ifdef __cplusplus
+interface IWSManInternal;
+#endif /* __cplusplus */
 #endif
 
 /*****************************************************************************
@@ -277,29 +352,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSMan* This,
+        IWSMan *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSMan* This);
+        IWSMan *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSMan* This);
+        IWSMan *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSMan* This,
+        IWSMan *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSMan* This,
+        IWSMan *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSMan* This,
+        IWSMan *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -307,7 +382,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSMan* This,
+        IWSMan *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -319,26 +394,27 @@
 
     /*** IWSMan methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateSession)(
-        IWSMan* This,
+        IWSMan *This,
         BSTR connection,
         LONG flags,
         IDispatch *connectionOptions,
         IDispatch **session);
 
     HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)(
-        IWSMan* This,
+        IWSMan *This,
         IDispatch **connectionOptions);
 
     HRESULT (STDMETHODCALLTYPE *get_CommandLine)(
-        IWSMan* This,
+        IWSMan *This,
         BSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *get_Error)(
-        IWSMan* This,
+        IWSMan *This,
         BSTR *value);
 
     END_INTERFACE
 } IWSManVtbl;
+
 interface IWSMan {
     CONST_VTBL IWSManVtbl* lpVtbl;
 };
@@ -401,41 +477,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSMan_CreateSession_Proxy(
-    IWSMan* This,
-    BSTR connection,
-    LONG flags,
-    IDispatch *connectionOptions,
-    IDispatch **session);
-void __RPC_STUB IWSMan_CreateSession_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSMan_CreateConnectionOptions_Proxy(
-    IWSMan* This,
-    IDispatch **connectionOptions);
-void __RPC_STUB IWSMan_CreateConnectionOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSMan_get_CommandLine_Proxy(
-    IWSMan* This,
-    BSTR *value);
-void __RPC_STUB IWSMan_get_CommandLine_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSMan_get_Error_Proxy(
-    IWSMan* This,
-    BSTR *value);
-void __RPC_STUB IWSMan_get_Error_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSMan_INTERFACE_DEFINED__ */
 
@@ -522,29 +563,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManEx* This,
+        IWSManEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManEx* This);
+        IWSManEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManEx* This);
+        IWSManEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManEx* This,
+        IWSManEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManEx* This,
+        IWSManEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManEx* This,
+        IWSManEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -552,7 +593,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManEx* This,
+        IWSManEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -564,109 +605,110 @@
 
     /*** IWSMan methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateSession)(
-        IWSManEx* This,
+        IWSManEx *This,
         BSTR connection,
         LONG flags,
         IDispatch *connectionOptions,
         IDispatch **session);
 
     HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)(
-        IWSManEx* This,
+        IWSManEx *This,
         IDispatch **connectionOptions);
 
     HRESULT (STDMETHODCALLTYPE *get_CommandLine)(
-        IWSManEx* This,
+        IWSManEx *This,
         BSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *get_Error)(
-        IWSManEx* This,
+        IWSManEx *This,
         BSTR *value);
 
     /*** IWSManEx methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateResourceLocator)(
-        IWSManEx* This,
+        IWSManEx *This,
         BSTR strResourceLocator,
         IDispatch **newResourceLocator);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUTF8)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagCredUsernamePassword)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCACheck)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCNCheck)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseDigest)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseNegotiate)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseBasic)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseKerberos)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagNoEncryption)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagEnableSPNServerPort)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseNoAuthentication)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagNonXmlText)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnEPR)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObjectAndEPR)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *GetErrorMessage)(
-        IWSManEx* This,
+        IWSManEx *This,
         DWORD errorNumber,
         BSTR *errorMessage);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeep)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyShallow)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeepBasePropsOnly)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObject)(
-        IWSManEx* This,
+        IWSManEx *This,
         LONG *flags);
 
     END_INTERFACE
 } IWSManExVtbl;
+
 interface IWSManEx {
     CONST_VTBL IWSManExVtbl* lpVtbl;
 };
@@ -811,168 +853,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManEx_CreateResourceLocator_Proxy(
-    IWSManEx* This,
-    BSTR strResourceLocator,
-    IDispatch **newResourceLocator);
-void __RPC_STUB IWSManEx_CreateResourceLocator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUTF8_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagUTF8_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagCredUsernamePassword_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagCredUsernamePassword_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagSkipCACheck_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagSkipCACheck_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagSkipCNCheck_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagSkipCNCheck_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseDigest_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagUseDigest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseNegotiate_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagUseNegotiate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseBasic_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagUseBasic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseKerberos_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagUseKerberos_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagNoEncryption_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagNoEncryption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagEnableSPNServerPort_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagEnableSPNServerPort_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_SessionFlagUseNoAuthentication_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_SessionFlagUseNoAuthentication_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagNonXmlText_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_EnumerationFlagNonXmlText_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagReturnEPR_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_EnumerationFlagReturnEPR_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagReturnObjectAndEPR_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_EnumerationFlagReturnObjectAndEPR_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_GetErrorMessage_Proxy(
-    IWSManEx* This,
-    DWORD errorNumber,
-    BSTR *errorMessage);
-void __RPC_STUB IWSManEx_GetErrorMessage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagHierarchyDeep_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_EnumerationFlagHierarchyDeep_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagHierarchyShallow_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_EnumerationFlagHierarchyShallow_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagHierarchyDeepBasePropsOnly_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_EnumerationFlagHierarchyDeepBasePropsOnly_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx_EnumerationFlagReturnObject_Proxy(
-    IWSManEx* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx_EnumerationFlagReturnObject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManEx_INTERFACE_DEFINED__ */
 
@@ -1000,29 +880,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManEx2* This);
+        IWSManEx2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManEx2* This);
+        IWSManEx2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1030,7 +910,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1042,114 +922,115 @@
 
     /*** IWSMan methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateSession)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         BSTR connection,
         LONG flags,
         IDispatch *connectionOptions,
         IDispatch **session);
 
     HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         IDispatch **connectionOptions);
 
     HRESULT (STDMETHODCALLTYPE *get_CommandLine)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         BSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *get_Error)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         BSTR *value);
 
     /*** IWSManEx methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateResourceLocator)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         BSTR strResourceLocator,
         IDispatch **newResourceLocator);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUTF8)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagCredUsernamePassword)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCACheck)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCNCheck)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseDigest)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseNegotiate)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseBasic)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseKerberos)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagNoEncryption)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagEnableSPNServerPort)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseNoAuthentication)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagNonXmlText)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnEPR)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObjectAndEPR)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *GetErrorMessage)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         DWORD errorNumber,
         BSTR *errorMessage);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeep)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyShallow)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeepBasePropsOnly)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObject)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     /*** IWSManEx2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseClientCertificate)(
-        IWSManEx2* This,
+        IWSManEx2 *This,
         LONG *flags);
 
     END_INTERFACE
 } IWSManEx2Vtbl;
+
 interface IWSManEx2 {
     CONST_VTBL IWSManEx2Vtbl* lpVtbl;
 };
@@ -1300,14 +1181,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManEx2_SessionFlagUseClientCertificate_Proxy(
-    IWSManEx2* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx2_SessionFlagUseClientCertificate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManEx2_INTERFACE_DEFINED__ */
 
@@ -1353,29 +1226,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManEx3* This);
+        IWSManEx3 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManEx3* This);
+        IWSManEx3 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1383,7 +1256,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1395,143 +1268,144 @@
 
     /*** IWSMan methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateSession)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         BSTR connection,
         LONG flags,
         IDispatch *connectionOptions,
         IDispatch **session);
 
     HRESULT (STDMETHODCALLTYPE *CreateConnectionOptions)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         IDispatch **connectionOptions);
 
     HRESULT (STDMETHODCALLTYPE *get_CommandLine)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         BSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *get_Error)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         BSTR *value);
 
     /*** IWSManEx methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateResourceLocator)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         BSTR strResourceLocator,
         IDispatch **newResourceLocator);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUTF8)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagCredUsernamePassword)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCACheck)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagSkipCNCheck)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseDigest)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseNegotiate)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseBasic)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseKerberos)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagNoEncryption)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagEnableSPNServerPort)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseNoAuthentication)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagNonXmlText)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnEPR)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObjectAndEPR)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *GetErrorMessage)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         DWORD errorNumber,
         BSTR *errorMessage);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeep)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyShallow)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagHierarchyDeepBasePropsOnly)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagReturnObject)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     /*** IWSManEx2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseClientCertificate)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     /*** IWSManEx3 methods ***/
     HRESULT (STDMETHODCALLTYPE *SessionFlagUTF16)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseCredSsp)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagAssociationInstance)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *EnumerationFlagAssociatedInstance)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagSkipRevocationCheck)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagAllowNegotiateImplicitCredentials)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     HRESULT (STDMETHODCALLTYPE *SessionFlagUseSsl)(
-        IWSManEx3* This,
+        IWSManEx3 *This,
         LONG *flags);
 
     END_INTERFACE
 } IWSManEx3Vtbl;
+
 interface IWSManEx3 {
     CONST_VTBL IWSManEx3Vtbl* lpVtbl;
 };
@@ -1712,62 +1586,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagUTF16_Proxy(
-    IWSManEx3* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx3_SessionFlagUTF16_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagUseCredSsp_Proxy(
-    IWSManEx3* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx3_SessionFlagUseCredSsp_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx3_EnumerationFlagAssociationInstance_Proxy(
-    IWSManEx3* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx3_EnumerationFlagAssociationInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx3_EnumerationFlagAssociatedInstance_Proxy(
-    IWSManEx3* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx3_EnumerationFlagAssociatedInstance_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagSkipRevocationCheck_Proxy(
-    IWSManEx3* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx3_SessionFlagSkipRevocationCheck_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagAllowNegotiateImplicitCredentials_Proxy(
-    IWSManEx3* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx3_SessionFlagAllowNegotiateImplicitCredentials_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEx3_SessionFlagUseSsl_Proxy(
-    IWSManEx3* This,
-    LONG *flags);
-void __RPC_STUB IWSManEx3_SessionFlagUseSsl_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManEx3_INTERFACE_DEFINED__ */
 
@@ -1801,29 +1619,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManConnectionOptions* This);
+        IWSManConnectionOptions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManConnectionOptions* This);
+        IWSManConnectionOptions *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1831,7 +1649,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -1843,19 +1661,20 @@
 
     /*** IWSManConnectionOptions methods ***/
     HRESULT (STDMETHODCALLTYPE *get_UserName)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_UserName)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *put_Password)(
-        IWSManConnectionOptions* This,
+        IWSManConnectionOptions *This,
         BSTR password);
 
     END_INTERFACE
 } IWSManConnectionOptionsVtbl;
+
 interface IWSManConnectionOptions {
     CONST_VTBL IWSManConnectionOptionsVtbl* lpVtbl;
 };
@@ -1914,30 +1733,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptions_get_UserName_Proxy(
-    IWSManConnectionOptions* This,
-    BSTR *name);
-void __RPC_STUB IWSManConnectionOptions_get_UserName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptions_put_UserName_Proxy(
-    IWSManConnectionOptions* This,
-    BSTR name);
-void __RPC_STUB IWSManConnectionOptions_put_UserName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptions_put_Password_Proxy(
-    IWSManConnectionOptions* This,
-    BSTR password);
-void __RPC_STUB IWSManConnectionOptions_put_Password_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManConnectionOptions_INTERFACE_DEFINED__ */
 
@@ -1968,29 +1763,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManConnectionOptionsEx* This);
+        IWSManConnectionOptionsEx *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManConnectionOptionsEx* This);
+        IWSManConnectionOptionsEx *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -1998,7 +1793,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2010,28 +1805,29 @@
 
     /*** IWSManConnectionOptions methods ***/
     HRESULT (STDMETHODCALLTYPE *get_UserName)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_UserName)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *put_Password)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         BSTR password);
 
     /*** IWSManConnectionOptionsEx methods ***/
     HRESULT (STDMETHODCALLTYPE *get_CertificateThumbprint)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         BSTR *thumbprint);
 
     HRESULT (STDMETHODCALLTYPE *put_CertificateThumbprint)(
-        IWSManConnectionOptionsEx* This,
+        IWSManConnectionOptionsEx *This,
         BSTR thumbprint);
 
     END_INTERFACE
 } IWSManConnectionOptionsExVtbl;
+
 interface IWSManConnectionOptionsEx {
     CONST_VTBL IWSManConnectionOptionsExVtbl* lpVtbl;
 };
@@ -2100,22 +1896,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx_get_CertificateThumbprint_Proxy(
-    IWSManConnectionOptionsEx* This,
-    BSTR *thumbprint);
-void __RPC_STUB IWSManConnectionOptionsEx_get_CertificateThumbprint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx_put_CertificateThumbprint_Proxy(
-    IWSManConnectionOptionsEx* This,
-    BSTR thumbprint);
-void __RPC_STUB IWSManConnectionOptionsEx_put_CertificateThumbprint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManConnectionOptionsEx_INTERFACE_DEFINED__ */
 
@@ -2167,29 +1947,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManConnectionOptionsEx2* This);
+        IWSManConnectionOptionsEx2 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManConnectionOptionsEx2* This);
+        IWSManConnectionOptionsEx2 *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2197,7 +1977,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2209,64 +1989,65 @@
 
     /*** IWSManConnectionOptions methods ***/
     HRESULT (STDMETHODCALLTYPE *get_UserName)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         BSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *put_UserName)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         BSTR name);
 
     HRESULT (STDMETHODCALLTYPE *put_Password)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         BSTR password);
 
     /*** IWSManConnectionOptionsEx methods ***/
     HRESULT (STDMETHODCALLTYPE *get_CertificateThumbprint)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         BSTR *thumbprint);
 
     HRESULT (STDMETHODCALLTYPE *put_CertificateThumbprint)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         BSTR thumbprint);
 
     /*** IWSManConnectionOptionsEx2 methods ***/
     HRESULT (STDMETHODCALLTYPE *SetProxy)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG accessType,
         LONG authenticationMechanism,
         BSTR userName,
         BSTR password);
 
     HRESULT (STDMETHODCALLTYPE *ProxyIEConfig)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *ProxyWinHttpConfig)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *ProxyAutoDetect)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *ProxyNoProxyServer)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *ProxyAuthenticationUseNegotiate)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *ProxyAuthenticationUseBasic)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *ProxyAuthenticationUseDigest)(
-        IWSManConnectionOptionsEx2* This,
+        IWSManConnectionOptionsEx2 *This,
         LONG *value);
 
     END_INTERFACE
 } IWSManConnectionOptionsEx2Vtbl;
+
 interface IWSManConnectionOptionsEx2 {
     CONST_VTBL IWSManConnectionOptionsEx2Vtbl* lpVtbl;
 };
@@ -2369,73 +2150,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_SetProxy_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG accessType,
-    LONG authenticationMechanism,
-    BSTR userName,
-    BSTR password);
-void __RPC_STUB IWSManConnectionOptionsEx2_SetProxy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyIEConfig_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG *value);
-void __RPC_STUB IWSManConnectionOptionsEx2_ProxyIEConfig_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyWinHttpConfig_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG *value);
-void __RPC_STUB IWSManConnectionOptionsEx2_ProxyWinHttpConfig_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAutoDetect_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG *value);
-void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAutoDetect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyNoProxyServer_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG *value);
-void __RPC_STUB IWSManConnectionOptionsEx2_ProxyNoProxyServer_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAuthenticationUseNegotiate_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG *value);
-void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAuthenticationUseNegotiate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAuthenticationUseBasic_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG *value);
-void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAuthenticationUseBasic_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManConnectionOptionsEx2_ProxyAuthenticationUseDigest_Proxy(
-    IWSManConnectionOptionsEx2* This,
-    LONG *value);
-void __RPC_STUB IWSManConnectionOptionsEx2_ProxyAuthenticationUseDigest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManConnectionOptionsEx2_INTERFACE_DEFINED__ */
 
@@ -2514,29 +2228,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManSession* This,
+        IWSManSession *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManSession* This);
+        IWSManSession *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManSession* This);
+        IWSManSession *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManSession* This,
+        IWSManSession *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManSession* This,
+        IWSManSession *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManSession* This,
+        IWSManSession *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2544,7 +2258,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManSession* This,
+        IWSManSession *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2556,32 +2270,32 @@
 
     /*** IWSManSession methods ***/
     HRESULT (STDMETHODCALLTYPE *Get)(
-        IWSManSession* This,
+        IWSManSession *This,
         VARIANT resourceUri,
         LONG flags,
         BSTR *resource);
 
     HRESULT (STDMETHODCALLTYPE *Put)(
-        IWSManSession* This,
+        IWSManSession *This,
         VARIANT resourceUri,
         BSTR resource,
         LONG flags,
         BSTR *resultResource);
 
     HRESULT (STDMETHODCALLTYPE *Create)(
-        IWSManSession* This,
+        IWSManSession *This,
         VARIANT resourceUri,
         BSTR resource,
         LONG flags,
         BSTR *newUri);
 
     HRESULT (STDMETHODCALLTYPE *Delete)(
-        IWSManSession* This,
+        IWSManSession *This,
         VARIANT resourceUri,
         LONG flags);
 
     HRESULT (STDMETHODCALLTYPE *IWSManSession_Invoke)(
-        IWSManSession* This,
+        IWSManSession *This,
         BSTR actionUri,
         VARIANT resourceUri,
         BSTR parameters,
@@ -2589,7 +2303,7 @@
         BSTR *result);
 
     HRESULT (STDMETHODCALLTYPE *Enumerate)(
-        IWSManSession* This,
+        IWSManSession *This,
         VARIANT resourceUri,
         BSTR filter,
         BSTR dialect,
@@ -2597,32 +2311,33 @@
         IDispatch **resultSet);
 
     HRESULT (STDMETHODCALLTYPE *Identify)(
-        IWSManSession* This,
+        IWSManSession *This,
         LONG flags,
         BSTR *result);
 
     HRESULT (STDMETHODCALLTYPE *get_Error)(
-        IWSManSession* This,
+        IWSManSession *This,
         BSTR *value);
 
     HRESULT (STDMETHODCALLTYPE *get_BatchItems)(
-        IWSManSession* This,
+        IWSManSession *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *put_BatchItems)(
-        IWSManSession* This,
+        IWSManSession *This,
         LONG value);
 
     HRESULT (STDMETHODCALLTYPE *get_Timeout)(
-        IWSManSession* This,
+        IWSManSession *This,
         LONG *value);
 
     HRESULT (STDMETHODCALLTYPE *put_Timeout)(
-        IWSManSession* This,
+        IWSManSession *This,
         LONG value);
 
     END_INTERFACE
 } IWSManSessionVtbl;
+
 interface IWSManSession {
     CONST_VTBL IWSManSessionVtbl* lpVtbl;
 };
@@ -2637,12 +2352,12 @@
 #define IWSManSession_GetTypeInfoCount(This,pctinfo) (This)->lpVtbl->GetTypeInfoCount(This,pctinfo)
 #define IWSManSession_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo)
 #define IWSManSession_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)
-#define IWSManSession_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)
 /*** IWSManSession methods ***/
 #define IWSManSession_Get(This,resourceUri,flags,resource) (This)->lpVtbl->Get(This,resourceUri,flags,resource)
 #define IWSManSession_Put(This,resourceUri,resource,flags,resultResource) (This)->lpVtbl->Put(This,resourceUri,resource,flags,resultResource)
 #define IWSManSession_Create(This,resourceUri,resource,flags,newUri) (This)->lpVtbl->Create(This,resourceUri,resource,flags,newUri)
 #define IWSManSession_Delete(This,resourceUri,flags) (This)->lpVtbl->Delete(This,resourceUri,flags)
+#define IWSManSession_Invoke(This,actionUri,resourceUri,parameters,flags,result) (This)->lpVtbl->IWSManSession_Invoke(This,actionUri,resourceUri,parameters,flags,result)
 #define IWSManSession_Enumerate(This,resourceUri,filter,dialect,flags,resultSet) (This)->lpVtbl->Enumerate(This,resourceUri,filter,dialect,flags,resultSet)
 #define IWSManSession_Identify(This,flags,result) (This)->lpVtbl->Identify(This,flags,result)
 #define IWSManSession_get_Error(This,value) (This)->lpVtbl->get_Error(This,value)
@@ -2671,9 +2386,6 @@
 static FORCEINLINE HRESULT IWSManSession_GetIDsOfNames(IWSManSession* This,REFIID riid,LPOLESTR *rgszNames,UINT cNames,LCID lcid,DISPID *rgDispId) {
     return This->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId);
 }
-static FORCEINLINE HRESULT IWSManSession_Invoke(IWSManSession* This,DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) {
-    return This->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr);
-}
 /*** IWSManSession methods ***/
 static FORCEINLINE HRESULT IWSManSession_Get(IWSManSession* This,VARIANT resourceUri,LONG flags,BSTR *resource) {
     return This->lpVtbl->Get(This,resourceUri,flags,resource);
@@ -2687,6 +2399,9 @@
 static FORCEINLINE HRESULT IWSManSession_Delete(IWSManSession* This,VARIANT resourceUri,LONG flags) {
     return This->lpVtbl->Delete(This,resourceUri,flags);
 }
+static FORCEINLINE HRESULT IWSManSession_Invoke(IWSManSession* This,BSTR actionUri,VARIANT resourceUri,BSTR parameters,LONG flags,BSTR *result) {
+    return This->lpVtbl->IWSManSession_Invoke(This,actionUri,resourceUri,parameters,flags,result);
+}
 static FORCEINLINE HRESULT IWSManSession_Enumerate(IWSManSession* This,VARIANT resourceUri,BSTR filter,BSTR dialect,LONG flags,IDispatch **resultSet) {
     return This->lpVtbl->Enumerate(This,resourceUri,filter,dialect,flags,resultSet);
 }
@@ -2713,120 +2428,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManSession_Get_Proxy(
-    IWSManSession* This,
-    VARIANT resourceUri,
-    LONG flags,
-    BSTR *resource);
-void __RPC_STUB IWSManSession_Get_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_Put_Proxy(
-    IWSManSession* This,
-    VARIANT resourceUri,
-    BSTR resource,
-    LONG flags,
-    BSTR *resultResource);
-void __RPC_STUB IWSManSession_Put_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_Create_Proxy(
-    IWSManSession* This,
-    VARIANT resourceUri,
-    BSTR resource,
-    LONG flags,
-    BSTR *newUri);
-void __RPC_STUB IWSManSession_Create_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_Delete_Proxy(
-    IWSManSession* This,
-    VARIANT resourceUri,
-    LONG flags);
-void __RPC_STUB IWSManSession_Delete_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_Invoke_Proxy(
-    IWSManSession* This,
-    BSTR actionUri,
-    VARIANT resourceUri,
-    BSTR parameters,
-    LONG flags,
-    BSTR *result);
-void __RPC_STUB IWSManSession_Invoke_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_Enumerate_Proxy(
-    IWSManSession* This,
-    VARIANT resourceUri,
-    BSTR filter,
-    BSTR dialect,
-    LONG flags,
-    IDispatch **resultSet);
-void __RPC_STUB IWSManSession_Enumerate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_Identify_Proxy(
-    IWSManSession* This,
-    LONG flags,
-    BSTR *result);
-void __RPC_STUB IWSManSession_Identify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_get_Error_Proxy(
-    IWSManSession* This,
-    BSTR *value);
-void __RPC_STUB IWSManSession_get_Error_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_get_BatchItems_Proxy(
-    IWSManSession* This,
-    LONG *value);
-void __RPC_STUB IWSManSession_get_BatchItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_put_BatchItems_Proxy(
-    IWSManSession* This,
-    LONG value);
-void __RPC_STUB IWSManSession_put_BatchItems_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_get_Timeout_Proxy(
-    IWSManSession* This,
-    LONG *value);
-void __RPC_STUB IWSManSession_get_Timeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManSession_put_Timeout_Proxy(
-    IWSManSession* This,
-    LONG value);
-void __RPC_STUB IWSManSession_put_Timeout_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManSession_INTERFACE_DEFINED__ */
 
@@ -2860,29 +2461,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManEnumerator* This);
+        IWSManEnumerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManEnumerator* This);
+        IWSManEnumerator *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -2890,7 +2491,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -2902,19 +2503,20 @@
 
     /*** IWSManEnumerator methods ***/
     HRESULT (STDMETHODCALLTYPE *ReadItem)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         BSTR *resource);
 
     HRESULT (STDMETHODCALLTYPE *get_AtEndOfStream)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         VARIANT_BOOL *eos);
 
     HRESULT (STDMETHODCALLTYPE *get_Error)(
-        IWSManEnumerator* This,
+        IWSManEnumerator *This,
         BSTR *value);
 
     END_INTERFACE
 } IWSManEnumeratorVtbl;
+
 interface IWSManEnumerator {
     CONST_VTBL IWSManEnumeratorVtbl* lpVtbl;
 };
@@ -2973,30 +2575,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManEnumerator_ReadItem_Proxy(
-    IWSManEnumerator* This,
-    BSTR *resource);
-void __RPC_STUB IWSManEnumerator_ReadItem_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEnumerator_get_AtEndOfStream_Proxy(
-    IWSManEnumerator* This,
-    VARIANT_BOOL *eos);
-void __RPC_STUB IWSManEnumerator_get_AtEndOfStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManEnumerator_get_Error_Proxy(
-    IWSManEnumerator* This,
-    BSTR *value);
-void __RPC_STUB IWSManEnumerator_get_Error_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManEnumerator_INTERFACE_DEFINED__ */
 
@@ -3063,29 +2641,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManResourceLocator* This);
+        IWSManResourceLocator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManResourceLocator* This);
+        IWSManResourceLocator *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3093,7 +2671,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3105,60 +2683,61 @@
 
     /*** IWSManResourceLocator methods ***/
     HRESULT (STDMETHODCALLTYPE *put_ResourceURI)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR uri);
 
     HRESULT (STDMETHODCALLTYPE *get_ResourceURI)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR *uri);
 
     HRESULT (STDMETHODCALLTYPE *AddSelector)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR resourceSelName,
         VARIANT selValue);
 
     HRESULT (STDMETHODCALLTYPE *ClearSelectors)(
-        IWSManResourceLocator* This);
+        IWSManResourceLocator *This);
 
     HRESULT (STDMETHODCALLTYPE *get_FragmentPath)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR *text);
 
     HRESULT (STDMETHODCALLTYPE *put_FragmentPath)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR text);
 
     HRESULT (STDMETHODCALLTYPE *get_FragmentDialect)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR *text);
 
     HRESULT (STDMETHODCALLTYPE *put_FragmentDialect)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR text);
 
     HRESULT (STDMETHODCALLTYPE *AddOption)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR OptionName,
         VARIANT OptionValue,
         WINBOOL mustComply);
 
     HRESULT (STDMETHODCALLTYPE *put_MustUnderstandOptions)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         WINBOOL mustUnderstand);
 
     HRESULT (STDMETHODCALLTYPE *get_MustUnderstandOptions)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         WINBOOL *mustUnderstand);
 
     HRESULT (STDMETHODCALLTYPE *ClearOptions)(
-        IWSManResourceLocator* This);
+        IWSManResourceLocator *This);
 
     HRESULT (STDMETHODCALLTYPE *get_Error)(
-        IWSManResourceLocator* This,
+        IWSManResourceLocator *This,
         BSTR *value);
 
     END_INTERFACE
 } IWSManResourceLocatorVtbl;
+
 interface IWSManResourceLocator {
     CONST_VTBL IWSManResourceLocatorVtbl* lpVtbl;
 };
@@ -3257,111 +2836,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_ResourceURI_Proxy(
-    IWSManResourceLocator* This,
-    BSTR uri);
-void __RPC_STUB IWSManResourceLocator_put_ResourceURI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_ResourceURI_Proxy(
-    IWSManResourceLocator* This,
-    BSTR *uri);
-void __RPC_STUB IWSManResourceLocator_get_ResourceURI_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_AddSelector_Proxy(
-    IWSManResourceLocator* This,
-    BSTR resourceSelName,
-    VARIANT selValue);
-void __RPC_STUB IWSManResourceLocator_AddSelector_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_ClearSelectors_Proxy(
-    IWSManResourceLocator* This);
-void __RPC_STUB IWSManResourceLocator_ClearSelectors_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_FragmentPath_Proxy(
-    IWSManResourceLocator* This,
-    BSTR *text);
-void __RPC_STUB IWSManResourceLocator_get_FragmentPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_FragmentPath_Proxy(
-    IWSManResourceLocator* This,
-    BSTR text);
-void __RPC_STUB IWSManResourceLocator_put_FragmentPath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_FragmentDialect_Proxy(
-    IWSManResourceLocator* This,
-    BSTR *text);
-void __RPC_STUB IWSManResourceLocator_get_FragmentDialect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_FragmentDialect_Proxy(
-    IWSManResourceLocator* This,
-    BSTR text);
-void __RPC_STUB IWSManResourceLocator_put_FragmentDialect_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_AddOption_Proxy(
-    IWSManResourceLocator* This,
-    BSTR OptionName,
-    VARIANT OptionValue,
-    WINBOOL mustComply);
-void __RPC_STUB IWSManResourceLocator_AddOption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_put_MustUnderstandOptions_Proxy(
-    IWSManResourceLocator* This,
-    WINBOOL mustUnderstand);
-void __RPC_STUB IWSManResourceLocator_put_MustUnderstandOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_MustUnderstandOptions_Proxy(
-    IWSManResourceLocator* This,
-    WINBOOL *mustUnderstand);
-void __RPC_STUB IWSManResourceLocator_get_MustUnderstandOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_ClearOptions_Proxy(
-    IWSManResourceLocator* This);
-void __RPC_STUB IWSManResourceLocator_ClearOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IWSManResourceLocator_get_Error_Proxy(
-    IWSManResourceLocator* This,
-    BSTR *value);
-void __RPC_STUB IWSManResourceLocator_get_Error_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManResourceLocator_INTERFACE_DEFINED__ */
 
@@ -3386,18 +2860,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManResourceLocatorInternal* This,
+        IWSManResourceLocatorInternal *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManResourceLocatorInternal* This);
+        IWSManResourceLocatorInternal *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManResourceLocatorInternal* This);
+        IWSManResourceLocatorInternal *This);
 
     END_INTERFACE
 } IWSManResourceLocatorInternalVtbl;
+
 interface IWSManResourceLocatorInternal {
     CONST_VTBL IWSManResourceLocatorInternalVtbl* lpVtbl;
 };
@@ -3454,29 +2929,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IWSManInternal* This,
+        IWSManInternal *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IWSManInternal* This);
+        IWSManInternal *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IWSManInternal* This);
+        IWSManInternal *This);
 
     /*** IDispatch methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTypeInfoCount)(
-        IWSManInternal* This,
+        IWSManInternal *This,
         UINT *pctinfo);
 
     HRESULT (STDMETHODCALLTYPE *GetTypeInfo)(
-        IWSManInternal* This,
+        IWSManInternal *This,
         UINT iTInfo,
         LCID lcid,
         ITypeInfo **ppTInfo);
 
     HRESULT (STDMETHODCALLTYPE *GetIDsOfNames)(
-        IWSManInternal* This,
+        IWSManInternal *This,
         REFIID riid,
         LPOLESTR *rgszNames,
         UINT cNames,
@@ -3484,7 +2959,7 @@
         DISPID *rgDispId);
 
     HRESULT (STDMETHODCALLTYPE *Invoke)(
-        IWSManInternal* This,
+        IWSManInternal *This,
         DISPID dispIdMember,
         REFIID riid,
         LCID lcid,
@@ -3496,7 +2971,7 @@
 
     /*** IWSManInternal methods ***/
     HRESULT (STDMETHODCALLTYPE *ConfigSDDL)(
-        IWSManInternal* This,
+        IWSManInternal *This,
         IDispatch *session,
         VARIANT resourceUri,
         LONG flags,
@@ -3504,6 +2979,7 @@
 
     END_INTERFACE
 } IWSManInternalVtbl;
+
 interface IWSManInternal {
     CONST_VTBL IWSManInternalVtbl* lpVtbl;
 };
@@ -3554,17 +3030,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IWSManInternal_ConfigSDDL_Proxy(
-    IWSManInternal* This,
-    IDispatch *session,
-    VARIANT resourceUri,
-    LONG flags,
-    BSTR *resource);
-void __RPC_STUB IWSManInternal_ConfigSDDL_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IWSManInternal_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/wtypes.h b/mingw-w64-headers/include/wtypes.h
index 48c07eb..b7ada87 100644
--- a/mingw-w64-headers/include/wtypes.h
+++ b/mingw-w64-headers/include/wtypes.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wtypes.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wtypes.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -564,7 +564,6 @@
     VT_TYPEMASK = 0xfff
 };
 
-
 typedef ULONG PROPID;
 
 #ifndef PROPERTYKEY_DEFINED
diff --git a/mingw-w64-headers/include/wtypesbase.h b/mingw-w64-headers/include/wtypesbase.h
index 2616f8a..df7ea3b 100644
--- a/mingw-w64-headers/include/wtypesbase.h
+++ b/mingw-w64-headers/include/wtypesbase.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/wtypesbase.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/wtypesbase.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/xmllite.h b/mingw-w64-headers/include/xmllite.h
index 156e912..fcd4c27 100644
--- a/mingw-w64-headers/include/xmllite.h
+++ b/mingw-w64-headers/include/xmllite.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 3.19 from include/xmllite.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/xmllite.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
diff --git a/mingw-w64-headers/include/xpsdigitalsignature.h b/mingw-w64-headers/include/xpsdigitalsignature.h
index bb0611b..c19f026 100644
--- a/mingw-w64-headers/include/xpsdigitalsignature.h
+++ b/mingw-w64-headers/include/xpsdigitalsignature.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/xpsdigitalsignature.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/xpsdigitalsignature.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,41 +20,65 @@
 #ifndef __IXpsSigningOptions_FWD_DEFINED__
 #define __IXpsSigningOptions_FWD_DEFINED__
 typedef interface IXpsSigningOptions IXpsSigningOptions;
+#ifdef __cplusplus
+interface IXpsSigningOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignature_FWD_DEFINED__
 #define __IXpsSignature_FWD_DEFINED__
 typedef interface IXpsSignature IXpsSignature;
+#ifdef __cplusplus
+interface IXpsSignature;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureBlock_FWD_DEFINED__
 #define __IXpsSignatureBlock_FWD_DEFINED__
 typedef interface IXpsSignatureBlock IXpsSignatureBlock;
+#ifdef __cplusplus
+interface IXpsSignatureBlock;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureBlockCollection_FWD_DEFINED__
 #define __IXpsSignatureBlockCollection_FWD_DEFINED__
 typedef interface IXpsSignatureBlockCollection IXpsSignatureBlockCollection;
+#ifdef __cplusplus
+interface IXpsSignatureBlockCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureCollection_FWD_DEFINED__
 #define __IXpsSignatureCollection_FWD_DEFINED__
 typedef interface IXpsSignatureCollection IXpsSignatureCollection;
+#ifdef __cplusplus
+interface IXpsSignatureCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureManager_FWD_DEFINED__
 #define __IXpsSignatureManager_FWD_DEFINED__
 typedef interface IXpsSignatureManager IXpsSignatureManager;
+#ifdef __cplusplus
+interface IXpsSignatureManager;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureRequest_FWD_DEFINED__
 #define __IXpsSignatureRequest_FWD_DEFINED__
 typedef interface IXpsSignatureRequest IXpsSignatureRequest;
+#ifdef __cplusplus
+interface IXpsSignatureRequest;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureRequestCollection_FWD_DEFINED__
 #define __IXpsSignatureRequestCollection_FWD_DEFINED__
 typedef interface IXpsSignatureRequestCollection IXpsSignatureRequestCollection;
+#ifdef __cplusplus
+interface IXpsSignatureRequestCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __XpsSignatureManager_FWD_DEFINED__
@@ -93,36 +117,57 @@
 #ifndef __IXpsSigningOptions_FWD_DEFINED__
 #define __IXpsSigningOptions_FWD_DEFINED__
 typedef interface IXpsSigningOptions IXpsSigningOptions;
+#ifdef __cplusplus
+interface IXpsSigningOptions;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureCollection_FWD_DEFINED__
 #define __IXpsSignatureCollection_FWD_DEFINED__
 typedef interface IXpsSignatureCollection IXpsSignatureCollection;
+#ifdef __cplusplus
+interface IXpsSignatureCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignature_FWD_DEFINED__
 #define __IXpsSignature_FWD_DEFINED__
 typedef interface IXpsSignature IXpsSignature;
+#ifdef __cplusplus
+interface IXpsSignature;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureBlockCollection_FWD_DEFINED__
 #define __IXpsSignatureBlockCollection_FWD_DEFINED__
 typedef interface IXpsSignatureBlockCollection IXpsSignatureBlockCollection;
+#ifdef __cplusplus
+interface IXpsSignatureBlockCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureBlock_FWD_DEFINED__
 #define __IXpsSignatureBlock_FWD_DEFINED__
 typedef interface IXpsSignatureBlock IXpsSignatureBlock;
+#ifdef __cplusplus
+interface IXpsSignatureBlock;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureRequestCollection_FWD_DEFINED__
 #define __IXpsSignatureRequestCollection_FWD_DEFINED__
 typedef interface IXpsSignatureRequestCollection IXpsSignatureRequestCollection;
+#ifdef __cplusplus
+interface IXpsSignatureRequestCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsSignatureRequest_FWD_DEFINED__
 #define __IXpsSignatureRequest_FWD_DEFINED__
 typedef interface IXpsSignatureRequest IXpsSignatureRequest;
+#ifdef __cplusplus
+interface IXpsSignatureRequest;
+#endif /* __cplusplus */
 #endif
 
 typedef enum __WIDL_xpsdigitalsignature_generated_name_00000020 {
@@ -218,87 +263,88 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSigningOptions* This);
+        IXpsSigningOptions *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSigningOptions* This);
+        IXpsSigningOptions *This);
 
     /*** IXpsSigningOptions methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSignatureId)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         LPWSTR *signatureId);
 
     HRESULT (STDMETHODCALLTYPE *SetSignatureId)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         LPCWSTR signatureId);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureMethod)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         LPWSTR *signatureMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetSignatureMethod)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         LPCWSTR signatureMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetDigestMethod)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         LPWSTR *digestMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetDigestMethod)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         LPCWSTR digestMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         IOpcPartUri **signaturePartName);
 
     HRESULT (STDMETHODCALLTYPE *SetSignaturePartName)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         IOpcPartUri *signaturePartName);
 
     HRESULT (STDMETHODCALLTYPE *GetPolicy)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         XPS_SIGN_POLICY *policy);
 
     HRESULT (STDMETHODCALLTYPE *SetPolicy)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         XPS_SIGN_POLICY policy);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningTimeFormat)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         OPC_SIGNATURE_TIME_FORMAT *timeFormat);
 
     HRESULT (STDMETHODCALLTYPE *SetSigningTimeFormat)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         OPC_SIGNATURE_TIME_FORMAT timeFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomObjects)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         IOpcSignatureCustomObjectSet **customObjectSet);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomReferences)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         IOpcSignatureReferenceSet **customReferenceSet);
 
     HRESULT (STDMETHODCALLTYPE *GetCertificateSet)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         IOpcCertificateSet **certificateSet);
 
     HRESULT (STDMETHODCALLTYPE *GetFlags)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         XPS_SIGN_FLAGS *flags);
 
     HRESULT (STDMETHODCALLTYPE *SetFlags)(
-        IXpsSigningOptions* This,
+        IXpsSigningOptions *This,
         XPS_SIGN_FLAGS flags);
 
     END_INTERFACE
 } IXpsSigningOptionsVtbl;
+
 interface IXpsSigningOptions {
     CONST_VTBL IXpsSigningOptionsVtbl* lpVtbl;
 };
@@ -395,142 +441,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSignatureId_Proxy(
-    IXpsSigningOptions* This,
-    LPWSTR *signatureId);
-void __RPC_STUB IXpsSigningOptions_GetSignatureId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSignatureId_Proxy(
-    IXpsSigningOptions* This,
-    LPCWSTR signatureId);
-void __RPC_STUB IXpsSigningOptions_SetSignatureId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSignatureMethod_Proxy(
-    IXpsSigningOptions* This,
-    LPWSTR *signatureMethod);
-void __RPC_STUB IXpsSigningOptions_GetSignatureMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSignatureMethod_Proxy(
-    IXpsSigningOptions* This,
-    LPCWSTR signatureMethod);
-void __RPC_STUB IXpsSigningOptions_SetSignatureMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetDigestMethod_Proxy(
-    IXpsSigningOptions* This,
-    LPWSTR *digestMethod);
-void __RPC_STUB IXpsSigningOptions_GetDigestMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetDigestMethod_Proxy(
-    IXpsSigningOptions* This,
-    LPCWSTR digestMethod);
-void __RPC_STUB IXpsSigningOptions_SetDigestMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSignaturePartName_Proxy(
-    IXpsSigningOptions* This,
-    IOpcPartUri **signaturePartName);
-void __RPC_STUB IXpsSigningOptions_GetSignaturePartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSignaturePartName_Proxy(
-    IXpsSigningOptions* This,
-    IOpcPartUri *signaturePartName);
-void __RPC_STUB IXpsSigningOptions_SetSignaturePartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetPolicy_Proxy(
-    IXpsSigningOptions* This,
-    XPS_SIGN_POLICY *policy);
-void __RPC_STUB IXpsSigningOptions_GetPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetPolicy_Proxy(
-    IXpsSigningOptions* This,
-    XPS_SIGN_POLICY policy);
-void __RPC_STUB IXpsSigningOptions_SetPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetSigningTimeFormat_Proxy(
-    IXpsSigningOptions* This,
-    OPC_SIGNATURE_TIME_FORMAT *timeFormat);
-void __RPC_STUB IXpsSigningOptions_GetSigningTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetSigningTimeFormat_Proxy(
-    IXpsSigningOptions* This,
-    OPC_SIGNATURE_TIME_FORMAT timeFormat);
-void __RPC_STUB IXpsSigningOptions_SetSigningTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetCustomObjects_Proxy(
-    IXpsSigningOptions* This,
-    IOpcSignatureCustomObjectSet **customObjectSet);
-void __RPC_STUB IXpsSigningOptions_GetCustomObjects_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetCustomReferences_Proxy(
-    IXpsSigningOptions* This,
-    IOpcSignatureReferenceSet **customReferenceSet);
-void __RPC_STUB IXpsSigningOptions_GetCustomReferences_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetCertificateSet_Proxy(
-    IXpsSigningOptions* This,
-    IOpcCertificateSet **certificateSet);
-void __RPC_STUB IXpsSigningOptions_GetCertificateSet_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_GetFlags_Proxy(
-    IXpsSigningOptions* This,
-    XPS_SIGN_FLAGS *flags);
-void __RPC_STUB IXpsSigningOptions_GetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSigningOptions_SetFlags_Proxy(
-    IXpsSigningOptions* This,
-    XPS_SIGN_FLAGS flags);
-void __RPC_STUB IXpsSigningOptions_SetFlags_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSigningOptions_INTERFACE_DEFINED__ */
 
@@ -595,71 +505,72 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSignature* This);
+        IXpsSignature *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSignature* This);
+        IXpsSignature *This);
 
     /*** IXpsSignature methods ***/
     HRESULT (STDMETHODCALLTYPE *GetSignatureId)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         LPWSTR *sigId);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureValue)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         UINT8 **signatureHashValue,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetCertificateEnumerator)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         IOpcCertificateEnumerator **certificateEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningTime)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         LPWSTR *sigDateTimeString);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningTimeFormat)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         OPC_SIGNATURE_TIME_FORMAT *timeFormat);
 
     HRESULT (STDMETHODCALLTYPE *GetSignaturePartName)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         IOpcPartUri **signaturePartName);
 
     HRESULT (STDMETHODCALLTYPE *Verify)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         const CERT_CONTEXT *x509Certificate,
         XPS_SIGNATURE_STATUS *sigStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetPolicy)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         XPS_SIGN_POLICY *policy);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomObjectEnumerator)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         IOpcSignatureCustomObjectEnumerator **customObjectEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetCustomReferenceEnumerator)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         IOpcSignatureReferenceEnumerator **customReferenceEnumerator);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureXml)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         UINT8 **signatureXml,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *SetSignatureXml)(
-        IXpsSignature* This,
+        IXpsSignature *This,
         const UINT8 *signatureXml,
         UINT32 count);
 
     END_INTERFACE
 } IXpsSignatureVtbl;
+
 interface IXpsSignature {
     CONST_VTBL IXpsSignatureVtbl* lpVtbl;
 };
@@ -736,106 +647,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignatureId_Proxy(
-    IXpsSignature* This,
-    LPWSTR *sigId);
-void __RPC_STUB IXpsSignature_GetSignatureId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignatureValue_Proxy(
-    IXpsSignature* This,
-    UINT8 **signatureHashValue,
-    UINT32 *count);
-void __RPC_STUB IXpsSignature_GetSignatureValue_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetCertificateEnumerator_Proxy(
-    IXpsSignature* This,
-    IOpcCertificateEnumerator **certificateEnumerator);
-void __RPC_STUB IXpsSignature_GetCertificateEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetSigningTime_Proxy(
-    IXpsSignature* This,
-    LPWSTR *sigDateTimeString);
-void __RPC_STUB IXpsSignature_GetSigningTime_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetSigningTimeFormat_Proxy(
-    IXpsSignature* This,
-    OPC_SIGNATURE_TIME_FORMAT *timeFormat);
-void __RPC_STUB IXpsSignature_GetSigningTimeFormat_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignaturePartName_Proxy(
-    IXpsSignature* This,
-    IOpcPartUri **signaturePartName);
-void __RPC_STUB IXpsSignature_GetSignaturePartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_Verify_Proxy(
-    IXpsSignature* This,
-    const CERT_CONTEXT *x509Certificate,
-    XPS_SIGNATURE_STATUS *sigStatus);
-void __RPC_STUB IXpsSignature_Verify_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetPolicy_Proxy(
-    IXpsSignature* This,
-    XPS_SIGN_POLICY *policy);
-void __RPC_STUB IXpsSignature_GetPolicy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetCustomObjectEnumerator_Proxy(
-    IXpsSignature* This,
-    IOpcSignatureCustomObjectEnumerator **customObjectEnumerator);
-void __RPC_STUB IXpsSignature_GetCustomObjectEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetCustomReferenceEnumerator_Proxy(
-    IXpsSignature* This,
-    IOpcSignatureReferenceEnumerator **customReferenceEnumerator);
-void __RPC_STUB IXpsSignature_GetCustomReferenceEnumerator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_GetSignatureXml_Proxy(
-    IXpsSignature* This,
-    UINT8 **signatureXml,
-    UINT32 *count);
-void __RPC_STUB IXpsSignature_GetSignatureXml_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignature_SetSignatureXml_Proxy(
-    IXpsSignature* This,
-    const UINT8 *signatureXml,
-    UINT32 count);
-void __RPC_STUB IXpsSignature_SetSignatureXml_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSignature_INTERFACE_DEFINED__ */
 
@@ -876,40 +687,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSignatureBlock* This,
+        IXpsSignatureBlock *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSignatureBlock* This);
+        IXpsSignatureBlock *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSignatureBlock* This);
+        IXpsSignatureBlock *This);
 
     /*** IXpsSignatureBlock methods ***/
     HRESULT (STDMETHODCALLTYPE *GetRequests)(
-        IXpsSignatureBlock* This,
+        IXpsSignatureBlock *This,
         IXpsSignatureRequestCollection **requests);
 
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsSignatureBlock* This,
+        IXpsSignatureBlock *This,
         IOpcPartUri **partName);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentIndex)(
-        IXpsSignatureBlock* This,
+        IXpsSignatureBlock *This,
         UINT32 *fixedDocumentIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentName)(
-        IXpsSignatureBlock* This,
+        IXpsSignatureBlock *This,
         IOpcPartUri **fixedDocumentName);
 
     HRESULT (STDMETHODCALLTYPE *CreateRequest)(
-        IXpsSignatureBlock* This,
+        IXpsSignatureBlock *This,
         LPCWSTR requestId,
         IXpsSignatureRequest **signatureRequest);
 
     END_INTERFACE
 } IXpsSignatureBlockVtbl;
+
 interface IXpsSignatureBlock {
     CONST_VTBL IXpsSignatureBlockVtbl* lpVtbl;
 };
@@ -958,47 +770,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetRequests_Proxy(
-    IXpsSignatureBlock* This,
-    IXpsSignatureRequestCollection **requests);
-void __RPC_STUB IXpsSignatureBlock_GetRequests_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetPartName_Proxy(
-    IXpsSignatureBlock* This,
-    IOpcPartUri **partName);
-void __RPC_STUB IXpsSignatureBlock_GetPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetDocumentIndex_Proxy(
-    IXpsSignatureBlock* This,
-    UINT32 *fixedDocumentIndex);
-void __RPC_STUB IXpsSignatureBlock_GetDocumentIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_GetDocumentName_Proxy(
-    IXpsSignatureBlock* This,
-    IOpcPartUri **fixedDocumentName);
-void __RPC_STUB IXpsSignatureBlock_GetDocumentName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlock_CreateRequest_Proxy(
-    IXpsSignatureBlock* This,
-    LPCWSTR requestId,
-    IXpsSignatureRequest **signatureRequest);
-void __RPC_STUB IXpsSignatureBlock_CreateRequest_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSignatureBlock_INTERFACE_DEFINED__ */
 
@@ -1033,32 +804,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSignatureBlockCollection* This,
+        IXpsSignatureBlockCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSignatureBlockCollection* This);
+        IXpsSignatureBlockCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSignatureBlockCollection* This);
+        IXpsSignatureBlockCollection *This);
 
     /*** IXpsSignatureBlockCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsSignatureBlockCollection* This,
+        IXpsSignatureBlockCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsSignatureBlockCollection* This,
+        IXpsSignatureBlockCollection *This,
         UINT32 index,
         IXpsSignatureBlock **signatureBlock);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsSignatureBlockCollection* This,
+        IXpsSignatureBlockCollection *This,
         UINT32 index);
 
     END_INTERFACE
 } IXpsSignatureBlockCollectionVtbl;
+
 interface IXpsSignatureBlockCollection {
     CONST_VTBL IXpsSignatureBlockCollectionVtbl* lpVtbl;
 };
@@ -1099,31 +871,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlockCollection_GetCount_Proxy(
-    IXpsSignatureBlockCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsSignatureBlockCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlockCollection_GetAt_Proxy(
-    IXpsSignatureBlockCollection* This,
-    UINT32 index,
-    IXpsSignatureBlock **signatureBlock);
-void __RPC_STUB IXpsSignatureBlockCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureBlockCollection_RemoveAt_Proxy(
-    IXpsSignatureBlockCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsSignatureBlockCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSignatureBlockCollection_INTERFACE_DEFINED__ */
 
@@ -1158,32 +905,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSignatureCollection* This,
+        IXpsSignatureCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSignatureCollection* This);
+        IXpsSignatureCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSignatureCollection* This);
+        IXpsSignatureCollection *This);
 
     /*** IXpsSignatureCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsSignatureCollection* This,
+        IXpsSignatureCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsSignatureCollection* This,
+        IXpsSignatureCollection *This,
         UINT32 index,
         IXpsSignature **signature);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsSignatureCollection* This,
+        IXpsSignatureCollection *This,
         UINT32 index);
 
     END_INTERFACE
 } IXpsSignatureCollectionVtbl;
+
 interface IXpsSignatureCollection {
     CONST_VTBL IXpsSignatureCollectionVtbl* lpVtbl;
 };
@@ -1224,31 +972,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSignatureCollection_GetCount_Proxy(
-    IXpsSignatureCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsSignatureCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureCollection_GetAt_Proxy(
-    IXpsSignatureCollection* This,
-    UINT32 index,
-    IXpsSignature **signature);
-void __RPC_STUB IXpsSignatureCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureCollection_RemoveAt_Proxy(
-    IXpsSignatureCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsSignatureCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSignatureCollection_INTERFACE_DEFINED__ */
 
@@ -1312,69 +1035,70 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSignatureManager* This);
+        IXpsSignatureManager *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSignatureManager* This);
+        IXpsSignatureManager *This);
 
     /*** IXpsSignatureManager methods ***/
     HRESULT (STDMETHODCALLTYPE *LoadPackageFile)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         LPCWSTR fileName);
 
     HRESULT (STDMETHODCALLTYPE *LoadPackageStream)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IStream *stream);
 
     HRESULT (STDMETHODCALLTYPE *Sign)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IXpsSigningOptions *signOptions,
         const CERT_CONTEXT *x509Certificate,
         IXpsSignature **signature);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureOriginPartName)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IOpcPartUri **signatureOriginPartName);
 
     HRESULT (STDMETHODCALLTYPE *SetSignatureOriginPartName)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IOpcPartUri *signatureOriginPartName);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatures)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IXpsSignatureCollection **signatures);
 
     HRESULT (STDMETHODCALLTYPE *AddSignatureBlock)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IOpcPartUri *partName,
         UINT32 fixedDocumentIndex,
         IXpsSignatureBlock **signatureBlock);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureBlocks)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IXpsSignatureBlockCollection **signatureBlocks);
 
     HRESULT (STDMETHODCALLTYPE *CreateSigningOptions)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IXpsSigningOptions **signingOptions);
 
     HRESULT (STDMETHODCALLTYPE *SavePackageToFile)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         LPCWSTR fileName,
         LPSECURITY_ATTRIBUTES securityAttributes,
         DWORD flagsAndAttributes);
 
     HRESULT (STDMETHODCALLTYPE *SavePackageToStream)(
-        IXpsSignatureManager* This,
+        IXpsSignatureManager *This,
         IStream *stream);
 
     END_INTERFACE
 } IXpsSignatureManagerVtbl;
+
 interface IXpsSignatureManager {
     CONST_VTBL IXpsSignatureManagerVtbl* lpVtbl;
 };
@@ -1447,100 +1171,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_LoadPackageFile_Proxy(
-    IXpsSignatureManager* This,
-    LPCWSTR fileName);
-void __RPC_STUB IXpsSignatureManager_LoadPackageFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_LoadPackageStream_Proxy(
-    IXpsSignatureManager* This,
-    IStream *stream);
-void __RPC_STUB IXpsSignatureManager_LoadPackageStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_Sign_Proxy(
-    IXpsSignatureManager* This,
-    IXpsSigningOptions *signOptions,
-    const CERT_CONTEXT *x509Certificate,
-    IXpsSignature **signature);
-void __RPC_STUB IXpsSignatureManager_Sign_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_GetSignatureOriginPartName_Proxy(
-    IXpsSignatureManager* This,
-    IOpcPartUri **signatureOriginPartName);
-void __RPC_STUB IXpsSignatureManager_GetSignatureOriginPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_SetSignatureOriginPartName_Proxy(
-    IXpsSignatureManager* This,
-    IOpcPartUri *signatureOriginPartName);
-void __RPC_STUB IXpsSignatureManager_SetSignatureOriginPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_GetSignatures_Proxy(
-    IXpsSignatureManager* This,
-    IXpsSignatureCollection **signatures);
-void __RPC_STUB IXpsSignatureManager_GetSignatures_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_AddSignatureBlock_Proxy(
-    IXpsSignatureManager* This,
-    IOpcPartUri *partName,
-    UINT32 fixedDocumentIndex,
-    IXpsSignatureBlock **signatureBlock);
-void __RPC_STUB IXpsSignatureManager_AddSignatureBlock_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_GetSignatureBlocks_Proxy(
-    IXpsSignatureManager* This,
-    IXpsSignatureBlockCollection **signatureBlocks);
-void __RPC_STUB IXpsSignatureManager_GetSignatureBlocks_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_CreateSigningOptions_Proxy(
-    IXpsSignatureManager* This,
-    IXpsSigningOptions **signingOptions);
-void __RPC_STUB IXpsSignatureManager_CreateSigningOptions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_SavePackageToFile_Proxy(
-    IXpsSignatureManager* This,
-    LPCWSTR fileName,
-    LPSECURITY_ATTRIBUTES securityAttributes,
-    DWORD flagsAndAttributes);
-void __RPC_STUB IXpsSignatureManager_SavePackageToFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureManager_SavePackageToStream_Proxy(
-    IXpsSignatureManager* This,
-    IStream *stream);
-void __RPC_STUB IXpsSignatureManager_SavePackageToStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSignatureManager_INTERFACE_DEFINED__ */
 
@@ -1606,72 +1236,73 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSignatureRequest* This);
+        IXpsSignatureRequest *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSignatureRequest* This);
+        IXpsSignatureRequest *This);
 
     /*** IXpsSignatureRequest methods ***/
     HRESULT (STDMETHODCALLTYPE *GetIntent)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPWSTR *intent);
 
     HRESULT (STDMETHODCALLTYPE *SetIntent)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPCWSTR intent);
 
     HRESULT (STDMETHODCALLTYPE *GetRequestedSigner)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPWSTR *signerName);
 
     HRESULT (STDMETHODCALLTYPE *SetRequestedSigner)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPCWSTR signerName);
 
     HRESULT (STDMETHODCALLTYPE *GetRequestSignByDate)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPWSTR *dateString);
 
     HRESULT (STDMETHODCALLTYPE *SetRequestSignByDate)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPCWSTR dateString);
 
     HRESULT (STDMETHODCALLTYPE *GetSigningLocale)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPWSTR *place);
 
     HRESULT (STDMETHODCALLTYPE *SetSigningLocale)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPCWSTR place);
 
     HRESULT (STDMETHODCALLTYPE *GetSpotLocation)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         INT32 *pageIndex,
         IOpcPartUri **pagePartName,
         float *x,
         float *y);
 
     HRESULT (STDMETHODCALLTYPE *SetSpotLocation)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         INT32 pageIndex,
         float x,
         float y);
 
     HRESULT (STDMETHODCALLTYPE *GetRequestId)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         LPWSTR *requestId);
 
     HRESULT (STDMETHODCALLTYPE *GetSignature)(
-        IXpsSignatureRequest* This,
+        IXpsSignatureRequest *This,
         IXpsSignature **signature);
 
     END_INTERFACE
 } IXpsSignatureRequestVtbl;
+
 interface IXpsSignatureRequest {
     CONST_VTBL IXpsSignatureRequestVtbl* lpVtbl;
 };
@@ -1748,107 +1379,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetIntent_Proxy(
-    IXpsSignatureRequest* This,
-    LPWSTR *intent);
-void __RPC_STUB IXpsSignatureRequest_GetIntent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetIntent_Proxy(
-    IXpsSignatureRequest* This,
-    LPCWSTR intent);
-void __RPC_STUB IXpsSignatureRequest_SetIntent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetRequestedSigner_Proxy(
-    IXpsSignatureRequest* This,
-    LPWSTR *signerName);
-void __RPC_STUB IXpsSignatureRequest_GetRequestedSigner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetRequestedSigner_Proxy(
-    IXpsSignatureRequest* This,
-    LPCWSTR signerName);
-void __RPC_STUB IXpsSignatureRequest_SetRequestedSigner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetRequestSignByDate_Proxy(
-    IXpsSignatureRequest* This,
-    LPWSTR *dateString);
-void __RPC_STUB IXpsSignatureRequest_GetRequestSignByDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetRequestSignByDate_Proxy(
-    IXpsSignatureRequest* This,
-    LPCWSTR dateString);
-void __RPC_STUB IXpsSignatureRequest_SetRequestSignByDate_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetSigningLocale_Proxy(
-    IXpsSignatureRequest* This,
-    LPWSTR *place);
-void __RPC_STUB IXpsSignatureRequest_GetSigningLocale_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetSigningLocale_Proxy(
-    IXpsSignatureRequest* This,
-    LPCWSTR place);
-void __RPC_STUB IXpsSignatureRequest_SetSigningLocale_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetSpotLocation_Proxy(
-    IXpsSignatureRequest* This,
-    INT32 *pageIndex,
-    IOpcPartUri **pagePartName,
-    float *x,
-    float *y);
-void __RPC_STUB IXpsSignatureRequest_GetSpotLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_SetSpotLocation_Proxy(
-    IXpsSignatureRequest* This,
-    INT32 pageIndex,
-    float x,
-    float y);
-void __RPC_STUB IXpsSignatureRequest_SetSpotLocation_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetRequestId_Proxy(
-    IXpsSignatureRequest* This,
-    LPWSTR *requestId);
-void __RPC_STUB IXpsSignatureRequest_GetRequestId_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequest_GetSignature_Proxy(
-    IXpsSignatureRequest* This,
-    IXpsSignature **signature);
-void __RPC_STUB IXpsSignatureRequest_GetSignature_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSignatureRequest_INTERFACE_DEFINED__ */
 
@@ -1883,32 +1413,33 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsSignatureRequestCollection* This,
+        IXpsSignatureRequestCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsSignatureRequestCollection* This);
+        IXpsSignatureRequestCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsSignatureRequestCollection* This);
+        IXpsSignatureRequestCollection *This);
 
     /*** IXpsSignatureRequestCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsSignatureRequestCollection* This,
+        IXpsSignatureRequestCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsSignatureRequestCollection* This,
+        IXpsSignatureRequestCollection *This,
         UINT32 index,
         IXpsSignatureRequest **signatureRequest);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsSignatureRequestCollection* This,
+        IXpsSignatureRequestCollection *This,
         UINT32 index);
 
     END_INTERFACE
 } IXpsSignatureRequestCollectionVtbl;
+
 interface IXpsSignatureRequestCollection {
     CONST_VTBL IXpsSignatureRequestCollectionVtbl* lpVtbl;
 };
@@ -1949,31 +1480,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequestCollection_GetCount_Proxy(
-    IXpsSignatureRequestCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsSignatureRequestCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequestCollection_GetAt_Proxy(
-    IXpsSignatureRequestCollection* This,
-    UINT32 index,
-    IXpsSignatureRequest **signatureRequest);
-void __RPC_STUB IXpsSignatureRequestCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsSignatureRequestCollection_RemoveAt_Proxy(
-    IXpsSignatureRequestCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsSignatureRequestCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsSignatureRequestCollection_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/xpsobjectmodel.h b/mingw-w64-headers/include/xpsobjectmodel.h
index d34706e..12a25ac 100644
--- a/mingw-w64-headers/include/xpsobjectmodel.h
+++ b/mingw-w64-headers/include/xpsobjectmodel.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/xpsobjectmodel.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/xpsobjectmodel.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,266 +20,425 @@
 #ifndef __IXpsOMShareable_FWD_DEFINED__
 #define __IXpsOMShareable_FWD_DEFINED__
 typedef interface IXpsOMShareable IXpsOMShareable;
+#ifdef __cplusplus
+interface IXpsOMShareable;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPart_FWD_DEFINED__
 #define __IXpsOMPart_FWD_DEFINED__
 typedef interface IXpsOMPart IXpsOMPart;
+#ifdef __cplusplus
+interface IXpsOMPart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGlyphsEditor_FWD_DEFINED__
 #define __IXpsOMGlyphsEditor_FWD_DEFINED__
 typedef interface IXpsOMGlyphsEditor IXpsOMGlyphsEditor;
+#ifdef __cplusplus
+interface IXpsOMGlyphsEditor;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDashCollection_FWD_DEFINED__
 #define __IXpsOMDashCollection_FWD_DEFINED__
 typedef interface IXpsOMDashCollection IXpsOMDashCollection;
+#ifdef __cplusplus
+interface IXpsOMDashCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGeometryFigure_FWD_DEFINED__
 #define __IXpsOMGeometryFigure_FWD_DEFINED__
 typedef interface IXpsOMGeometryFigure IXpsOMGeometryFigure;
+#ifdef __cplusplus
+interface IXpsOMGeometryFigure;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGeometryFigureCollection_FWD_DEFINED__
 #define __IXpsOMGeometryFigureCollection_FWD_DEFINED__
 typedef interface IXpsOMGeometryFigureCollection IXpsOMGeometryFigureCollection;
+#ifdef __cplusplus
+interface IXpsOMGeometryFigureCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGradientStopCollection_FWD_DEFINED__
 #define __IXpsOMGradientStopCollection_FWD_DEFINED__
 typedef interface IXpsOMGradientStopCollection IXpsOMGradientStopCollection;
+#ifdef __cplusplus
+interface IXpsOMGradientStopCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGradientStop_FWD_DEFINED__
 #define __IXpsOMGradientStop_FWD_DEFINED__
 typedef interface IXpsOMGradientStop IXpsOMGradientStop;
+#ifdef __cplusplus
+interface IXpsOMGradientStop;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPartResources_FWD_DEFINED__
 #define __IXpsOMPartResources_FWD_DEFINED__
 typedef interface IXpsOMPartResources IXpsOMPartResources;
+#ifdef __cplusplus
+interface IXpsOMPartResources;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMFontResourceCollection_FWD_DEFINED__
 #define __IXpsOMFontResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMFontResourceCollection IXpsOMFontResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMFontResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMImageResourceCollection_FWD_DEFINED__
 #define __IXpsOMImageResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMImageResourceCollection IXpsOMImageResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMImageResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMColorProfileResourceCollection_FWD_DEFINED__
 #define __IXpsOMColorProfileResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMColorProfileResourceCollection IXpsOMColorProfileResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMColorProfileResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__
 #define __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMRemoteDictionaryResourceCollection IXpsOMRemoteDictionaryResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMRemoteDictionaryResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__
 #define __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMSignatureBlockResourceCollection IXpsOMSignatureBlockResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMSignatureBlockResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMVisualCollection_FWD_DEFINED__
 #define __IXpsOMVisualCollection_FWD_DEFINED__
 typedef interface IXpsOMVisualCollection IXpsOMVisualCollection;
+#ifdef __cplusplus
+interface IXpsOMVisualCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDictionary_FWD_DEFINED__
 #define __IXpsOMDictionary_FWD_DEFINED__
 typedef interface IXpsOMDictionary IXpsOMDictionary;
+#ifdef __cplusplus
+interface IXpsOMDictionary;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPageReference_FWD_DEFINED__
 #define __IXpsOMPageReference_FWD_DEFINED__
 typedef interface IXpsOMPageReference IXpsOMPageReference;
+#ifdef __cplusplus
+interface IXpsOMPageReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPageReferenceCollection_FWD_DEFINED__
 #define __IXpsOMPageReferenceCollection_FWD_DEFINED__
 typedef interface IXpsOMPageReferenceCollection IXpsOMPageReferenceCollection;
+#ifdef __cplusplus
+interface IXpsOMPageReferenceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDocumentCollection_FWD_DEFINED__
 #define __IXpsOMDocumentCollection_FWD_DEFINED__
 typedef interface IXpsOMDocumentCollection IXpsOMDocumentCollection;
+#ifdef __cplusplus
+interface IXpsOMDocumentCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackage_FWD_DEFINED__
 #define __IXpsOMPackage_FWD_DEFINED__
 typedef interface IXpsOMPackage IXpsOMPackage;
+#ifdef __cplusplus
+interface IXpsOMPackage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMObjectFactory_FWD_DEFINED__
 #define __IXpsOMObjectFactory_FWD_DEFINED__
 typedef interface IXpsOMObjectFactory IXpsOMObjectFactory;
+#ifdef __cplusplus
+interface IXpsOMObjectFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMNameCollection_FWD_DEFINED__
 #define __IXpsOMNameCollection_FWD_DEFINED__
 typedef interface IXpsOMNameCollection IXpsOMNameCollection;
+#ifdef __cplusplus
+interface IXpsOMNameCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPartUriCollection_FWD_DEFINED__
 #define __IXpsOMPartUriCollection_FWD_DEFINED__
 typedef interface IXpsOMPartUriCollection IXpsOMPartUriCollection;
+#ifdef __cplusplus
+interface IXpsOMPartUriCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackageWriter_FWD_DEFINED__
 #define __IXpsOMPackageWriter_FWD_DEFINED__
 typedef interface IXpsOMPackageWriter IXpsOMPackageWriter;
+#ifdef __cplusplus
+interface IXpsOMPackageWriter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackageTarget_FWD_DEFINED__
 #define __IXpsOMPackageTarget_FWD_DEFINED__
 typedef interface IXpsOMPackageTarget IXpsOMPackageTarget;
+#ifdef __cplusplus
+interface IXpsOMPackageTarget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMVisual_FWD_DEFINED__
 #define __IXpsOMVisual_FWD_DEFINED__
 typedef interface IXpsOMVisual IXpsOMVisual;
+#ifdef __cplusplus
+interface IXpsOMVisual;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMBrush_FWD_DEFINED__
 #define __IXpsOMBrush_FWD_DEFINED__
 typedef interface IXpsOMBrush IXpsOMBrush;
+#ifdef __cplusplus
+interface IXpsOMBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMMatrixTransform_FWD_DEFINED__
 #define __IXpsOMMatrixTransform_FWD_DEFINED__
 typedef interface IXpsOMMatrixTransform IXpsOMMatrixTransform;
+#ifdef __cplusplus
+interface IXpsOMMatrixTransform;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGeometry_FWD_DEFINED__
 #define __IXpsOMGeometry_FWD_DEFINED__
 typedef interface IXpsOMGeometry IXpsOMGeometry;
+#ifdef __cplusplus
+interface IXpsOMGeometry;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGlyphs_FWD_DEFINED__
 #define __IXpsOMGlyphs_FWD_DEFINED__
 typedef interface IXpsOMGlyphs IXpsOMGlyphs;
+#ifdef __cplusplus
+interface IXpsOMGlyphs;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPath_FWD_DEFINED__
 #define __IXpsOMPath_FWD_DEFINED__
 typedef interface IXpsOMPath IXpsOMPath;
+#ifdef __cplusplus
+interface IXpsOMPath;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMSolidColorBrush_FWD_DEFINED__
 #define __IXpsOMSolidColorBrush_FWD_DEFINED__
 typedef interface IXpsOMSolidColorBrush IXpsOMSolidColorBrush;
+#ifdef __cplusplus
+interface IXpsOMSolidColorBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMTileBrush_FWD_DEFINED__
 #define __IXpsOMTileBrush_FWD_DEFINED__
 typedef interface IXpsOMTileBrush IXpsOMTileBrush;
+#ifdef __cplusplus
+interface IXpsOMTileBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGradientBrush_FWD_DEFINED__
 #define __IXpsOMGradientBrush_FWD_DEFINED__
 typedef interface IXpsOMGradientBrush IXpsOMGradientBrush;
+#ifdef __cplusplus
+interface IXpsOMGradientBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMVisualBrush_FWD_DEFINED__
 #define __IXpsOMVisualBrush_FWD_DEFINED__
 typedef interface IXpsOMVisualBrush IXpsOMVisualBrush;
+#ifdef __cplusplus
+interface IXpsOMVisualBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMImageBrush_FWD_DEFINED__
 #define __IXpsOMImageBrush_FWD_DEFINED__
 typedef interface IXpsOMImageBrush IXpsOMImageBrush;
+#ifdef __cplusplus
+interface IXpsOMImageBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMLinearGradientBrush_FWD_DEFINED__
 #define __IXpsOMLinearGradientBrush_FWD_DEFINED__
 typedef interface IXpsOMLinearGradientBrush IXpsOMLinearGradientBrush;
+#ifdef __cplusplus
+interface IXpsOMLinearGradientBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMRadialGradientBrush_FWD_DEFINED__
 #define __IXpsOMRadialGradientBrush_FWD_DEFINED__
 typedef interface IXpsOMRadialGradientBrush IXpsOMRadialGradientBrush;
+#ifdef __cplusplus
+interface IXpsOMRadialGradientBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMResource_FWD_DEFINED__
 #define __IXpsOMResource_FWD_DEFINED__
 typedef interface IXpsOMResource IXpsOMResource;
+#ifdef __cplusplus
+interface IXpsOMResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMFontResource_FWD_DEFINED__
 #define __IXpsOMFontResource_FWD_DEFINED__
 typedef interface IXpsOMFontResource IXpsOMFontResource;
+#ifdef __cplusplus
+interface IXpsOMFontResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMImageResource_FWD_DEFINED__
 #define __IXpsOMImageResource_FWD_DEFINED__
 typedef interface IXpsOMImageResource IXpsOMImageResource;
+#ifdef __cplusplus
+interface IXpsOMImageResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMColorProfileResource_FWD_DEFINED__
 #define __IXpsOMColorProfileResource_FWD_DEFINED__
 typedef interface IXpsOMColorProfileResource IXpsOMColorProfileResource;
+#ifdef __cplusplus
+interface IXpsOMColorProfileResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPrintTicketResource_FWD_DEFINED__
 #define __IXpsOMPrintTicketResource_FWD_DEFINED__
 typedef interface IXpsOMPrintTicketResource IXpsOMPrintTicketResource;
+#ifdef __cplusplus
+interface IXpsOMPrintTicketResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMRemoteDictionaryResource_FWD_DEFINED__
 #define __IXpsOMRemoteDictionaryResource_FWD_DEFINED__
 typedef interface IXpsOMRemoteDictionaryResource IXpsOMRemoteDictionaryResource;
+#ifdef __cplusplus
+interface IXpsOMRemoteDictionaryResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDocumentStructureResource_FWD_DEFINED__
 #define __IXpsOMDocumentStructureResource_FWD_DEFINED__
 typedef interface IXpsOMDocumentStructureResource IXpsOMDocumentStructureResource;
+#ifdef __cplusplus
+interface IXpsOMDocumentStructureResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMStoryFragmentsResource_FWD_DEFINED__
 #define __IXpsOMStoryFragmentsResource_FWD_DEFINED__
 typedef interface IXpsOMStoryFragmentsResource IXpsOMStoryFragmentsResource;
+#ifdef __cplusplus
+interface IXpsOMStoryFragmentsResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMSignatureBlockResource_FWD_DEFINED__
 #define __IXpsOMSignatureBlockResource_FWD_DEFINED__
 typedef interface IXpsOMSignatureBlockResource IXpsOMSignatureBlockResource;
+#ifdef __cplusplus
+interface IXpsOMSignatureBlockResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMCanvas_FWD_DEFINED__
 #define __IXpsOMCanvas_FWD_DEFINED__
 typedef interface IXpsOMCanvas IXpsOMCanvas;
+#ifdef __cplusplus
+interface IXpsOMCanvas;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPage_FWD_DEFINED__
 #define __IXpsOMPage_FWD_DEFINED__
 typedef interface IXpsOMPage IXpsOMPage;
+#ifdef __cplusplus
+interface IXpsOMPage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDocument_FWD_DEFINED__
 #define __IXpsOMDocument_FWD_DEFINED__
 typedef interface IXpsOMDocument IXpsOMDocument;
+#ifdef __cplusplus
+interface IXpsOMDocument;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDocumentSequence_FWD_DEFINED__
 #define __IXpsOMDocumentSequence_FWD_DEFINED__
 typedef interface IXpsOMDocumentSequence IXpsOMDocumentSequence;
+#ifdef __cplusplus
+interface IXpsOMDocumentSequence;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMCoreProperties_FWD_DEFINED__
 #define __IXpsOMCoreProperties_FWD_DEFINED__
 typedef interface IXpsOMCoreProperties IXpsOMCoreProperties;
+#ifdef __cplusplus
+interface IXpsOMCoreProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMThumbnailGenerator_FWD_DEFINED__
 #define __IXpsOMThumbnailGenerator_FWD_DEFINED__
 typedef interface IXpsOMThumbnailGenerator IXpsOMThumbnailGenerator;
+#ifdef __cplusplus
+interface IXpsOMThumbnailGenerator;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __XpsOMObjectFactory_FWD_DEFINED__
@@ -394,251 +553,401 @@
 #ifndef __IXpsOMDocumentStructureResource_FWD_DEFINED__
 #define __IXpsOMDocumentStructureResource_FWD_DEFINED__
 typedef interface IXpsOMDocumentStructureResource IXpsOMDocumentStructureResource;
+#ifdef __cplusplus
+interface IXpsOMDocumentStructureResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMCoreProperties_FWD_DEFINED__
 #define __IXpsOMCoreProperties_FWD_DEFINED__
 typedef interface IXpsOMCoreProperties IXpsOMCoreProperties;
+#ifdef __cplusplus
+interface IXpsOMCoreProperties;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPrintTicketResource_FWD_DEFINED__
 #define __IXpsOMPrintTicketResource_FWD_DEFINED__
 typedef interface IXpsOMPrintTicketResource IXpsOMPrintTicketResource;
+#ifdef __cplusplus
+interface IXpsOMPrintTicketResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMStoryFragmentsResource_FWD_DEFINED__
 #define __IXpsOMStoryFragmentsResource_FWD_DEFINED__
 typedef interface IXpsOMStoryFragmentsResource IXpsOMStoryFragmentsResource;
+#ifdef __cplusplus
+interface IXpsOMStoryFragmentsResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackage_FWD_DEFINED__
 #define __IXpsOMPackage_FWD_DEFINED__
 typedef interface IXpsOMPackage IXpsOMPackage;
+#ifdef __cplusplus
+interface IXpsOMPackage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPart_FWD_DEFINED__
 #define __IXpsOMPart_FWD_DEFINED__
 typedef interface IXpsOMPart IXpsOMPart;
+#ifdef __cplusplus
+interface IXpsOMPart;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMShareable_FWD_DEFINED__
 #define __IXpsOMShareable_FWD_DEFINED__
 typedef interface IXpsOMShareable IXpsOMShareable;
+#ifdef __cplusplus
+interface IXpsOMShareable;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMVisual_FWD_DEFINED__
 #define __IXpsOMVisual_FWD_DEFINED__
 typedef interface IXpsOMVisual IXpsOMVisual;
+#ifdef __cplusplus
+interface IXpsOMVisual;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMBrush_FWD_DEFINED__
 #define __IXpsOMBrush_FWD_DEFINED__
 typedef interface IXpsOMBrush IXpsOMBrush;
+#ifdef __cplusplus
+interface IXpsOMBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMTileBrush_FWD_DEFINED__
 #define __IXpsOMTileBrush_FWD_DEFINED__
 typedef interface IXpsOMTileBrush IXpsOMTileBrush;
+#ifdef __cplusplus
+interface IXpsOMTileBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMResource_FWD_DEFINED__
 #define __IXpsOMResource_FWD_DEFINED__
 typedef interface IXpsOMResource IXpsOMResource;
+#ifdef __cplusplus
+interface IXpsOMResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMCanvas_FWD_DEFINED__
 #define __IXpsOMCanvas_FWD_DEFINED__
 typedef interface IXpsOMCanvas IXpsOMCanvas;
+#ifdef __cplusplus
+interface IXpsOMCanvas;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMColorProfileResource_FWD_DEFINED__
 #define __IXpsOMColorProfileResource_FWD_DEFINED__
 typedef interface IXpsOMColorProfileResource IXpsOMColorProfileResource;
+#ifdef __cplusplus
+interface IXpsOMColorProfileResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMColorProfileResourceCollection_FWD_DEFINED__
 #define __IXpsOMColorProfileResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMColorProfileResourceCollection IXpsOMColorProfileResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMColorProfileResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDashCollection_FWD_DEFINED__
 #define __IXpsOMDashCollection_FWD_DEFINED__
 typedef interface IXpsOMDashCollection IXpsOMDashCollection;
+#ifdef __cplusplus
+interface IXpsOMDashCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMFontResource_FWD_DEFINED__
 #define __IXpsOMFontResource_FWD_DEFINED__
 typedef interface IXpsOMFontResource IXpsOMFontResource;
+#ifdef __cplusplus
+interface IXpsOMFontResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMFontResourceCollection_FWD_DEFINED__
 #define __IXpsOMFontResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMFontResourceCollection IXpsOMFontResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMFontResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGeometry_FWD_DEFINED__
 #define __IXpsOMGeometry_FWD_DEFINED__
 typedef interface IXpsOMGeometry IXpsOMGeometry;
+#ifdef __cplusplus
+interface IXpsOMGeometry;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGeometryFigure_FWD_DEFINED__
 #define __IXpsOMGeometryFigure_FWD_DEFINED__
 typedef interface IXpsOMGeometryFigure IXpsOMGeometryFigure;
+#ifdef __cplusplus
+interface IXpsOMGeometryFigure;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGeometryFigureCollection_FWD_DEFINED__
 #define __IXpsOMGeometryFigureCollection_FWD_DEFINED__
 typedef interface IXpsOMGeometryFigureCollection IXpsOMGeometryFigureCollection;
+#ifdef __cplusplus
+interface IXpsOMGeometryFigureCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGlyphs_FWD_DEFINED__
 #define __IXpsOMGlyphs_FWD_DEFINED__
 typedef interface IXpsOMGlyphs IXpsOMGlyphs;
+#ifdef __cplusplus
+interface IXpsOMGlyphs;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGradientBrush_FWD_DEFINED__
 #define __IXpsOMGradientBrush_FWD_DEFINED__
 typedef interface IXpsOMGradientBrush IXpsOMGradientBrush;
+#ifdef __cplusplus
+interface IXpsOMGradientBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGradientStop_FWD_DEFINED__
 #define __IXpsOMGradientStop_FWD_DEFINED__
 typedef interface IXpsOMGradientStop IXpsOMGradientStop;
+#ifdef __cplusplus
+interface IXpsOMGradientStop;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMGradientStopCollection_FWD_DEFINED__
 #define __IXpsOMGradientStopCollection_FWD_DEFINED__
 typedef interface IXpsOMGradientStopCollection IXpsOMGradientStopCollection;
+#ifdef __cplusplus
+interface IXpsOMGradientStopCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMImageBrush_FWD_DEFINED__
 #define __IXpsOMImageBrush_FWD_DEFINED__
 typedef interface IXpsOMImageBrush IXpsOMImageBrush;
+#ifdef __cplusplus
+interface IXpsOMImageBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMImageResource_FWD_DEFINED__
 #define __IXpsOMImageResource_FWD_DEFINED__
 typedef interface IXpsOMImageResource IXpsOMImageResource;
+#ifdef __cplusplus
+interface IXpsOMImageResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMImageResourceCollection_FWD_DEFINED__
 #define __IXpsOMImageResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMImageResourceCollection IXpsOMImageResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMImageResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMLinearGradientBrush_FWD_DEFINED__
 #define __IXpsOMLinearGradientBrush_FWD_DEFINED__
 typedef interface IXpsOMLinearGradientBrush IXpsOMLinearGradientBrush;
+#ifdef __cplusplus
+interface IXpsOMLinearGradientBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMMatrixTransform_FWD_DEFINED__
 #define __IXpsOMMatrixTransform_FWD_DEFINED__
 typedef interface IXpsOMMatrixTransform IXpsOMMatrixTransform;
+#ifdef __cplusplus
+interface IXpsOMMatrixTransform;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPartResources_FWD_DEFINED__
 #define __IXpsOMPartResources_FWD_DEFINED__
 typedef interface IXpsOMPartResources IXpsOMPartResources;
+#ifdef __cplusplus
+interface IXpsOMPartResources;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPath_FWD_DEFINED__
 #define __IXpsOMPath_FWD_DEFINED__
 typedef interface IXpsOMPath IXpsOMPath;
+#ifdef __cplusplus
+interface IXpsOMPath;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPartUriCollection_FWD_DEFINED__
 #define __IXpsOMPartUriCollection_FWD_DEFINED__
 typedef interface IXpsOMPartUriCollection IXpsOMPartUriCollection;
+#ifdef __cplusplus
+interface IXpsOMPartUriCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMRadialGradientBrush_FWD_DEFINED__
 #define __IXpsOMRadialGradientBrush_FWD_DEFINED__
 typedef interface IXpsOMRadialGradientBrush IXpsOMRadialGradientBrush;
+#ifdef __cplusplus
+interface IXpsOMRadialGradientBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMRemoteDictionaryResource_FWD_DEFINED__
 #define __IXpsOMRemoteDictionaryResource_FWD_DEFINED__
 typedef interface IXpsOMRemoteDictionaryResource IXpsOMRemoteDictionaryResource;
+#ifdef __cplusplus
+interface IXpsOMRemoteDictionaryResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__
 #define __IXpsOMRemoteDictionaryResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMRemoteDictionaryResourceCollection IXpsOMRemoteDictionaryResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMRemoteDictionaryResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDictionary_FWD_DEFINED__
 #define __IXpsOMDictionary_FWD_DEFINED__
 typedef interface IXpsOMDictionary IXpsOMDictionary;
+#ifdef __cplusplus
+interface IXpsOMDictionary;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMShareable_FWD_DEFINED__
 #define __IXpsOMShareable_FWD_DEFINED__
 typedef interface IXpsOMShareable IXpsOMShareable;
+#ifdef __cplusplus
+interface IXpsOMShareable;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMSolidColorBrush_FWD_DEFINED__
 #define __IXpsOMSolidColorBrush_FWD_DEFINED__
 typedef interface IXpsOMSolidColorBrush IXpsOMSolidColorBrush;
+#ifdef __cplusplus
+interface IXpsOMSolidColorBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMTileBrush_FWD_DEFINED__
 #define __IXpsOMTileBrush_FWD_DEFINED__
 typedef interface IXpsOMTileBrush IXpsOMTileBrush;
+#ifdef __cplusplus
+interface IXpsOMTileBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMVisualBrush_FWD_DEFINED__
 #define __IXpsOMVisualBrush_FWD_DEFINED__
 typedef interface IXpsOMVisualBrush IXpsOMVisualBrush;
+#ifdef __cplusplus
+interface IXpsOMVisualBrush;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMVisualCollection_FWD_DEFINED__
 #define __IXpsOMVisualCollection_FWD_DEFINED__
 typedef interface IXpsOMVisualCollection IXpsOMVisualCollection;
+#ifdef __cplusplus
+interface IXpsOMVisualCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPageReference_FWD_DEFINED__
 #define __IXpsOMPageReference_FWD_DEFINED__
 typedef interface IXpsOMPageReference IXpsOMPageReference;
+#ifdef __cplusplus
+interface IXpsOMPageReference;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDocumentSequence_FWD_DEFINED__
 #define __IXpsOMDocumentSequence_FWD_DEFINED__
 typedef interface IXpsOMDocumentSequence IXpsOMDocumentSequence;
+#ifdef __cplusplus
+interface IXpsOMDocumentSequence;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMSignatureBlockResource_FWD_DEFINED__
 #define __IXpsOMSignatureBlockResource_FWD_DEFINED__
 typedef interface IXpsOMSignatureBlockResource IXpsOMSignatureBlockResource;
+#ifdef __cplusplus
+interface IXpsOMSignatureBlockResource;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__
 #define __IXpsOMSignatureBlockResourceCollection_FWD_DEFINED__
 typedef interface IXpsOMSignatureBlockResourceCollection IXpsOMSignatureBlockResourceCollection;
+#ifdef __cplusplus
+interface IXpsOMSignatureBlockResourceCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMNameCollection_FWD_DEFINED__
 #define __IXpsOMNameCollection_FWD_DEFINED__
 typedef interface IXpsOMNameCollection IXpsOMNameCollection;
+#ifdef __cplusplus
+interface IXpsOMNameCollection;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMDocument_FWD_DEFINED__
 #define __IXpsOMDocument_FWD_DEFINED__
 typedef interface IXpsOMDocument IXpsOMDocument;
+#ifdef __cplusplus
+interface IXpsOMDocument;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPage_FWD_DEFINED__
 #define __IXpsOMPage_FWD_DEFINED__
 typedef interface IXpsOMPage IXpsOMPage;
+#ifdef __cplusplus
+interface IXpsOMPage;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackageWriter_FWD_DEFINED__
 #define __IXpsOMPackageWriter_FWD_DEFINED__
 typedef interface IXpsOMPackageWriter IXpsOMPackageWriter;
+#ifdef __cplusplus
+interface IXpsOMPackageWriter;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackageTarget_FWD_DEFINED__
 #define __IXpsOMPackageTarget_FWD_DEFINED__
 typedef interface IXpsOMPackageTarget IXpsOMPackageTarget;
+#ifdef __cplusplus
+interface IXpsOMPackageTarget;
+#endif /* __cplusplus */
 #endif
 
 typedef enum __WIDL_xpsobjectmodel_generated_name_00000020 {
@@ -824,27 +1133,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMShareable* This,
+        IXpsOMShareable *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMShareable* This);
+        IXpsOMShareable *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMShareable* This);
+        IXpsOMShareable *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMShareable* This,
+        IXpsOMShareable *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMShareable* This,
+        IXpsOMShareable *This,
         XPS_OBJECT_TYPE *type);
 
     END_INTERFACE
 } IXpsOMShareableVtbl;
+
 interface IXpsOMShareable {
     CONST_VTBL IXpsOMShareableVtbl* lpVtbl;
 };
@@ -881,22 +1191,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMShareable_GetOwner_Proxy(
-    IXpsOMShareable* This,
-    IUnknown **owner);
-void __RPC_STUB IXpsOMShareable_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMShareable_GetType_Proxy(
-    IXpsOMShareable* This,
-    XPS_OBJECT_TYPE *type);
-void __RPC_STUB IXpsOMShareable_GetType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMShareable_INTERFACE_DEFINED__ */
 
@@ -927,27 +1221,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPart* This,
+        IXpsOMPart *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPart* This);
+        IXpsOMPart *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPart* This);
+        IXpsOMPart *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMPart* This,
+        IXpsOMPart *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMPart* This,
+        IXpsOMPart *This,
         IOpcPartUri *partUri);
 
     END_INTERFACE
 } IXpsOMPartVtbl;
+
 interface IXpsOMPart {
     CONST_VTBL IXpsOMPartVtbl* lpVtbl;
 };
@@ -984,22 +1279,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPart_GetPartName_Proxy(
-    IXpsOMPart* This,
-    IOpcPartUri **partUri);
-void __RPC_STUB IXpsOMPart_GetPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPart_SetPartName_Proxy(
-    IXpsOMPart* This,
-    IOpcPartUri *partUri);
-void __RPC_STUB IXpsOMPart_SetPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPart_INTERFACE_DEFINED__ */
 
@@ -1084,96 +1363,97 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGlyphsEditor* This);
+        IXpsOMGlyphsEditor *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGlyphsEditor* This);
+        IXpsOMGlyphsEditor *This);
 
     /*** IXpsOMGlyphsEditor methods ***/
     HRESULT (STDMETHODCALLTYPE *ApplyEdits)(
-        IXpsOMGlyphsEditor* This);
+        IXpsOMGlyphsEditor *This);
 
     HRESULT (STDMETHODCALLTYPE *GetUnicodeString)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         LPWSTR *unicodeString);
 
     HRESULT (STDMETHODCALLTYPE *SetUnicodeString)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         LPCWSTR unicodeString);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphIndexCount)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 *indexCount);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphIndices)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 *indexCount,
         XPS_GLYPH_INDEX *glyphIndices);
 
     HRESULT (STDMETHODCALLTYPE *SetGlyphIndices)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 indexCount,
         const XPS_GLYPH_INDEX *glyphIndices);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphMappingCount)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 *glyphMappingCount);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphMappings)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 *glyphMappingCount,
         XPS_GLYPH_MAPPING *glyphMappings);
 
     HRESULT (STDMETHODCALLTYPE *SetGlyphMappings)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 glyphMappingCount,
         const XPS_GLYPH_MAPPING *glyphMappings);
 
     HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStopCount)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 *prohibitedCaretStopCount);
 
     HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStops)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 *count,
         UINT32 *prohibitedCaretStops);
 
     HRESULT (STDMETHODCALLTYPE *SetProhibitedCaretStops)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 count,
         const UINT32 *prohibitedCaretStops);
 
     HRESULT (STDMETHODCALLTYPE *GetBidiLevel)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 *bidiLevel);
 
     HRESULT (STDMETHODCALLTYPE *SetBidiLevel)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         UINT32 bidiLevel);
 
     HRESULT (STDMETHODCALLTYPE *GetIsSideways)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         WINBOOL *isSideways);
 
     HRESULT (STDMETHODCALLTYPE *SetIsSideways)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         WINBOOL isSideways);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceFontName)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         LPWSTR *deviceFontName);
 
     HRESULT (STDMETHODCALLTYPE *SetDeviceFontName)(
-        IXpsOMGlyphsEditor* This,
+        IXpsOMGlyphsEditor *This,
         LPCWSTR deviceFontName);
 
     END_INTERFACE
 } IXpsOMGlyphsEditorVtbl;
+
 interface IXpsOMGlyphsEditor {
     CONST_VTBL IXpsOMGlyphsEditorVtbl* lpVtbl;
 };
@@ -1274,155 +1554,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_ApplyEdits_Proxy(
-    IXpsOMGlyphsEditor* This);
-void __RPC_STUB IXpsOMGlyphsEditor_ApplyEdits_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetUnicodeString_Proxy(
-    IXpsOMGlyphsEditor* This,
-    LPWSTR *unicodeString);
-void __RPC_STUB IXpsOMGlyphsEditor_GetUnicodeString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetUnicodeString_Proxy(
-    IXpsOMGlyphsEditor* This,
-    LPCWSTR unicodeString);
-void __RPC_STUB IXpsOMGlyphsEditor_SetUnicodeString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphIndexCount_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 *indexCount);
-void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphIndexCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphIndices_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 *indexCount,
-    XPS_GLYPH_INDEX *glyphIndices);
-void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphIndices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetGlyphIndices_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 indexCount,
-    const XPS_GLYPH_INDEX *glyphIndices);
-void __RPC_STUB IXpsOMGlyphsEditor_SetGlyphIndices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphMappingCount_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 *glyphMappingCount);
-void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphMappingCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetGlyphMappings_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 *glyphMappingCount,
-    XPS_GLYPH_MAPPING *glyphMappings);
-void __RPC_STUB IXpsOMGlyphsEditor_GetGlyphMappings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetGlyphMappings_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 glyphMappingCount,
-    const XPS_GLYPH_MAPPING *glyphMappings);
-void __RPC_STUB IXpsOMGlyphsEditor_SetGlyphMappings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetProhibitedCaretStopCount_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 *prohibitedCaretStopCount);
-void __RPC_STUB IXpsOMGlyphsEditor_GetProhibitedCaretStopCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetProhibitedCaretStops_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 *count,
-    UINT32 *prohibitedCaretStops);
-void __RPC_STUB IXpsOMGlyphsEditor_GetProhibitedCaretStops_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetProhibitedCaretStops_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 count,
-    const UINT32 *prohibitedCaretStops);
-void __RPC_STUB IXpsOMGlyphsEditor_SetProhibitedCaretStops_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetBidiLevel_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 *bidiLevel);
-void __RPC_STUB IXpsOMGlyphsEditor_GetBidiLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetBidiLevel_Proxy(
-    IXpsOMGlyphsEditor* This,
-    UINT32 bidiLevel);
-void __RPC_STUB IXpsOMGlyphsEditor_SetBidiLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetIsSideways_Proxy(
-    IXpsOMGlyphsEditor* This,
-    WINBOOL *isSideways);
-void __RPC_STUB IXpsOMGlyphsEditor_GetIsSideways_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetIsSideways_Proxy(
-    IXpsOMGlyphsEditor* This,
-    WINBOOL isSideways);
-void __RPC_STUB IXpsOMGlyphsEditor_SetIsSideways_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_GetDeviceFontName_Proxy(
-    IXpsOMGlyphsEditor* This,
-    LPWSTR *deviceFontName);
-void __RPC_STUB IXpsOMGlyphsEditor_GetDeviceFontName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphsEditor_SetDeviceFontName_Proxy(
-    IXpsOMGlyphsEditor* This,
-    LPCWSTR deviceFontName);
-void __RPC_STUB IXpsOMGlyphsEditor_SetDeviceFontName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGlyphsEditor_INTERFACE_DEFINED__ */
 
@@ -1468,46 +1599,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMDashCollection* This,
+        IXpsOMDashCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMDashCollection* This);
+        IXpsOMDashCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMDashCollection* This);
+        IXpsOMDashCollection *This);
 
     /*** IXpsOMDashCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMDashCollection* This,
+        IXpsOMDashCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMDashCollection* This,
+        IXpsOMDashCollection *This,
         UINT32 index,
         XPS_DASH *dash);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMDashCollection* This,
+        IXpsOMDashCollection *This,
         UINT32 index,
         const XPS_DASH *dash);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMDashCollection* This,
+        IXpsOMDashCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMDashCollection* This,
+        IXpsOMDashCollection *This,
         UINT32 index,
         const XPS_DASH *dash);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMDashCollection* This,
+        IXpsOMDashCollection *This,
         const XPS_DASH *dash);
 
     END_INTERFACE
 } IXpsOMDashCollectionVtbl;
+
 interface IXpsOMDashCollection {
     CONST_VTBL IXpsOMDashCollectionVtbl* lpVtbl;
 };
@@ -1560,57 +1692,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_GetCount_Proxy(
-    IXpsOMDashCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMDashCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_GetAt_Proxy(
-    IXpsOMDashCollection* This,
-    UINT32 index,
-    XPS_DASH *dash);
-void __RPC_STUB IXpsOMDashCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_InsertAt_Proxy(
-    IXpsOMDashCollection* This,
-    UINT32 index,
-    const XPS_DASH *dash);
-void __RPC_STUB IXpsOMDashCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_RemoveAt_Proxy(
-    IXpsOMDashCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMDashCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_SetAt_Proxy(
-    IXpsOMDashCollection* This,
-    UINT32 index,
-    const XPS_DASH *dash);
-void __RPC_STUB IXpsOMDashCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDashCollection_Append_Proxy(
-    IXpsOMDashCollection* This,
-    const XPS_DASH *dash);
-void __RPC_STUB IXpsOMDashCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMDashCollection_INTERFACE_DEFINED__ */
 
@@ -1687,38 +1768,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGeometryFigure* This);
+        IXpsOMGeometryFigure *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGeometryFigure* This);
+        IXpsOMGeometryFigure *This);
 
     /*** IXpsOMGeometryFigure methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         IXpsOMGeometry **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetSegmentData)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         UINT32 *dataCount,
         FLOAT *segmentData);
 
     HRESULT (STDMETHODCALLTYPE *GetSegmentTypes)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         UINT32 *segmentCount,
         XPS_SEGMENT_TYPE *segmentTypes);
 
     HRESULT (STDMETHODCALLTYPE *GetSegmentStrokes)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         UINT32 *segmentCount,
         WINBOOL *segmentStrokes);
 
     HRESULT (STDMETHODCALLTYPE *SetSegments)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         UINT32 segmentCount,
         UINT32 segmentDataCount,
         const XPS_SEGMENT_TYPE *segmentTypes,
@@ -1726,47 +1807,48 @@
         const WINBOOL *segmentStrokes);
 
     HRESULT (STDMETHODCALLTYPE *GetStartPoint)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         XPS_POINT *startPoint);
 
     HRESULT (STDMETHODCALLTYPE *SetStartPoint)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         const XPS_POINT *startPoint);
 
     HRESULT (STDMETHODCALLTYPE *GetIsClosed)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         WINBOOL *isClosed);
 
     HRESULT (STDMETHODCALLTYPE *SetIsClosed)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         WINBOOL isClosed);
 
     HRESULT (STDMETHODCALLTYPE *GetIsFilled)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         WINBOOL *isFilled);
 
     HRESULT (STDMETHODCALLTYPE *SetIsFilled)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         WINBOOL isFilled);
 
     HRESULT (STDMETHODCALLTYPE *GetSegmentCount)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         UINT32 *segmentCount);
 
     HRESULT (STDMETHODCALLTYPE *GetSegmentDataCount)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         UINT32 *segmentDataCount);
 
     HRESULT (STDMETHODCALLTYPE *GetSegmentStrokePattern)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         XPS_SEGMENT_STROKE_PATTERN *segmentStrokePattern);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMGeometryFigure* This,
+        IXpsOMGeometryFigure *This,
         IXpsOMGeometryFigure **geometryFigure);
 
     END_INTERFACE
 } IXpsOMGeometryFigureVtbl;
+
 interface IXpsOMGeometryFigure {
     CONST_VTBL IXpsOMGeometryFigureVtbl* lpVtbl;
 };
@@ -1855,133 +1937,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetOwner_Proxy(
-    IXpsOMGeometryFigure* This,
-    IXpsOMGeometry **owner);
-void __RPC_STUB IXpsOMGeometryFigure_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentData_Proxy(
-    IXpsOMGeometryFigure* This,
-    UINT32 *dataCount,
-    FLOAT *segmentData);
-void __RPC_STUB IXpsOMGeometryFigure_GetSegmentData_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentTypes_Proxy(
-    IXpsOMGeometryFigure* This,
-    UINT32 *segmentCount,
-    XPS_SEGMENT_TYPE *segmentTypes);
-void __RPC_STUB IXpsOMGeometryFigure_GetSegmentTypes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentStrokes_Proxy(
-    IXpsOMGeometryFigure* This,
-    UINT32 *segmentCount,
-    WINBOOL *segmentStrokes);
-void __RPC_STUB IXpsOMGeometryFigure_GetSegmentStrokes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetSegments_Proxy(
-    IXpsOMGeometryFigure* This,
-    UINT32 segmentCount,
-    UINT32 segmentDataCount,
-    const XPS_SEGMENT_TYPE *segmentTypes,
-    const FLOAT *segmentData,
-    const WINBOOL *segmentStrokes);
-void __RPC_STUB IXpsOMGeometryFigure_SetSegments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetStartPoint_Proxy(
-    IXpsOMGeometryFigure* This,
-    XPS_POINT *startPoint);
-void __RPC_STUB IXpsOMGeometryFigure_GetStartPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetStartPoint_Proxy(
-    IXpsOMGeometryFigure* This,
-    const XPS_POINT *startPoint);
-void __RPC_STUB IXpsOMGeometryFigure_SetStartPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetIsClosed_Proxy(
-    IXpsOMGeometryFigure* This,
-    WINBOOL *isClosed);
-void __RPC_STUB IXpsOMGeometryFigure_GetIsClosed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetIsClosed_Proxy(
-    IXpsOMGeometryFigure* This,
-    WINBOOL isClosed);
-void __RPC_STUB IXpsOMGeometryFigure_SetIsClosed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetIsFilled_Proxy(
-    IXpsOMGeometryFigure* This,
-    WINBOOL *isFilled);
-void __RPC_STUB IXpsOMGeometryFigure_GetIsFilled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_SetIsFilled_Proxy(
-    IXpsOMGeometryFigure* This,
-    WINBOOL isFilled);
-void __RPC_STUB IXpsOMGeometryFigure_SetIsFilled_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentCount_Proxy(
-    IXpsOMGeometryFigure* This,
-    UINT32 *segmentCount);
-void __RPC_STUB IXpsOMGeometryFigure_GetSegmentCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentDataCount_Proxy(
-    IXpsOMGeometryFigure* This,
-    UINT32 *segmentDataCount);
-void __RPC_STUB IXpsOMGeometryFigure_GetSegmentDataCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_GetSegmentStrokePattern_Proxy(
-    IXpsOMGeometryFigure* This,
-    XPS_SEGMENT_STROKE_PATTERN *segmentStrokePattern);
-void __RPC_STUB IXpsOMGeometryFigure_GetSegmentStrokePattern_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigure_Clone_Proxy(
-    IXpsOMGeometryFigure* This,
-    IXpsOMGeometryFigure **geometryFigure);
-void __RPC_STUB IXpsOMGeometryFigure_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGeometryFigure_INTERFACE_DEFINED__ */
 
@@ -2027,46 +1982,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGeometryFigureCollection* This,
+        IXpsOMGeometryFigureCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGeometryFigureCollection* This);
+        IXpsOMGeometryFigureCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGeometryFigureCollection* This);
+        IXpsOMGeometryFigureCollection *This);
 
     /*** IXpsOMGeometryFigureCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMGeometryFigureCollection* This,
+        IXpsOMGeometryFigureCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMGeometryFigureCollection* This,
+        IXpsOMGeometryFigureCollection *This,
         UINT32 index,
         IXpsOMGeometryFigure **geometryFigure);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMGeometryFigureCollection* This,
+        IXpsOMGeometryFigureCollection *This,
         UINT32 index,
         IXpsOMGeometryFigure *geometryFigure);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMGeometryFigureCollection* This,
+        IXpsOMGeometryFigureCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMGeometryFigureCollection* This,
+        IXpsOMGeometryFigureCollection *This,
         UINT32 index,
         IXpsOMGeometryFigure *geometryFigure);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMGeometryFigureCollection* This,
+        IXpsOMGeometryFigureCollection *This,
         IXpsOMGeometryFigure *geometryFigure);
 
     END_INTERFACE
 } IXpsOMGeometryFigureCollectionVtbl;
+
 interface IXpsOMGeometryFigureCollection {
     CONST_VTBL IXpsOMGeometryFigureCollectionVtbl* lpVtbl;
 };
@@ -2119,57 +2075,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_GetCount_Proxy(
-    IXpsOMGeometryFigureCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMGeometryFigureCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_GetAt_Proxy(
-    IXpsOMGeometryFigureCollection* This,
-    UINT32 index,
-    IXpsOMGeometryFigure **geometryFigure);
-void __RPC_STUB IXpsOMGeometryFigureCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_InsertAt_Proxy(
-    IXpsOMGeometryFigureCollection* This,
-    UINT32 index,
-    IXpsOMGeometryFigure *geometryFigure);
-void __RPC_STUB IXpsOMGeometryFigureCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_RemoveAt_Proxy(
-    IXpsOMGeometryFigureCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMGeometryFigureCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_SetAt_Proxy(
-    IXpsOMGeometryFigureCollection* This,
-    UINT32 index,
-    IXpsOMGeometryFigure *geometryFigure);
-void __RPC_STUB IXpsOMGeometryFigureCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometryFigureCollection_Append_Proxy(
-    IXpsOMGeometryFigureCollection* This,
-    IXpsOMGeometryFigure *geometryFigure);
-void __RPC_STUB IXpsOMGeometryFigureCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGeometryFigureCollection_INTERFACE_DEFINED__ */
 
@@ -2215,46 +2120,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGradientStopCollection* This,
+        IXpsOMGradientStopCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGradientStopCollection* This);
+        IXpsOMGradientStopCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGradientStopCollection* This);
+        IXpsOMGradientStopCollection *This);
 
     /*** IXpsOMGradientStopCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMGradientStopCollection* This,
+        IXpsOMGradientStopCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMGradientStopCollection* This,
+        IXpsOMGradientStopCollection *This,
         UINT32 index,
         IXpsOMGradientStop **stop);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMGradientStopCollection* This,
+        IXpsOMGradientStopCollection *This,
         UINT32 index,
         IXpsOMGradientStop *stop);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMGradientStopCollection* This,
+        IXpsOMGradientStopCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMGradientStopCollection* This,
+        IXpsOMGradientStopCollection *This,
         UINT32 index,
         IXpsOMGradientStop *stop);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMGradientStopCollection* This,
+        IXpsOMGradientStopCollection *This,
         IXpsOMGradientStop *stop);
 
     END_INTERFACE
 } IXpsOMGradientStopCollectionVtbl;
+
 interface IXpsOMGradientStopCollection {
     CONST_VTBL IXpsOMGradientStopCollectionVtbl* lpVtbl;
 };
@@ -2307,57 +2213,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_GetCount_Proxy(
-    IXpsOMGradientStopCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMGradientStopCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_GetAt_Proxy(
-    IXpsOMGradientStopCollection* This,
-    UINT32 index,
-    IXpsOMGradientStop **stop);
-void __RPC_STUB IXpsOMGradientStopCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_InsertAt_Proxy(
-    IXpsOMGradientStopCollection* This,
-    UINT32 index,
-    IXpsOMGradientStop *stop);
-void __RPC_STUB IXpsOMGradientStopCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_RemoveAt_Proxy(
-    IXpsOMGradientStopCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMGradientStopCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_SetAt_Proxy(
-    IXpsOMGradientStopCollection* This,
-    UINT32 index,
-    IXpsOMGradientStop *stop);
-void __RPC_STUB IXpsOMGradientStopCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStopCollection_Append_Proxy(
-    IXpsOMGradientStopCollection* This,
-    IXpsOMGradientStop *stop);
-void __RPC_STUB IXpsOMGradientStopCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGradientStopCollection_INTERFACE_DEFINED__ */
 
@@ -2402,45 +2257,46 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGradientStop* This,
+        IXpsOMGradientStop *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGradientStop* This);
+        IXpsOMGradientStop *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGradientStop* This);
+        IXpsOMGradientStop *This);
 
     /*** IXpsOMGradientStop methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMGradientStop* This,
+        IXpsOMGradientStop *This,
         IXpsOMGradientBrush **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetOffset)(
-        IXpsOMGradientStop* This,
+        IXpsOMGradientStop *This,
         FLOAT *offset);
 
     HRESULT (STDMETHODCALLTYPE *SetOffset)(
-        IXpsOMGradientStop* This,
+        IXpsOMGradientStop *This,
         FLOAT offset);
 
     HRESULT (STDMETHODCALLTYPE *GetColor)(
-        IXpsOMGradientStop* This,
+        IXpsOMGradientStop *This,
         XPS_COLOR *color,
         IXpsOMColorProfileResource **colorProfile);
 
     HRESULT (STDMETHODCALLTYPE *SetColor)(
-        IXpsOMGradientStop* This,
+        IXpsOMGradientStop *This,
         const XPS_COLOR *color,
         IXpsOMColorProfileResource *colorProfile);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMGradientStop* This,
+        IXpsOMGradientStop *This,
         IXpsOMGradientStop **gradientStop);
 
     END_INTERFACE
 } IXpsOMGradientStopVtbl;
+
 interface IXpsOMGradientStop {
     CONST_VTBL IXpsOMGradientStopVtbl* lpVtbl;
 };
@@ -2493,56 +2349,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_GetOwner_Proxy(
-    IXpsOMGradientStop* This,
-    IXpsOMGradientBrush **owner);
-void __RPC_STUB IXpsOMGradientStop_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_GetOffset_Proxy(
-    IXpsOMGradientStop* This,
-    FLOAT *offset);
-void __RPC_STUB IXpsOMGradientStop_GetOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_SetOffset_Proxy(
-    IXpsOMGradientStop* This,
-    FLOAT offset);
-void __RPC_STUB IXpsOMGradientStop_SetOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_GetColor_Proxy(
-    IXpsOMGradientStop* This,
-    XPS_COLOR *color,
-    IXpsOMColorProfileResource **colorProfile);
-void __RPC_STUB IXpsOMGradientStop_GetColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_SetColor_Proxy(
-    IXpsOMGradientStop* This,
-    const XPS_COLOR *color,
-    IXpsOMColorProfileResource *colorProfile);
-void __RPC_STUB IXpsOMGradientStop_SetColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientStop_Clone_Proxy(
-    IXpsOMGradientStop* This,
-    IXpsOMGradientStop **gradientStop);
-void __RPC_STUB IXpsOMGradientStop_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGradientStop_INTERFACE_DEFINED__ */
 
@@ -2579,35 +2385,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPartResources* This,
+        IXpsOMPartResources *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPartResources* This);
+        IXpsOMPartResources *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPartResources* This);
+        IXpsOMPartResources *This);
 
     /*** IXpsOMPartResources methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFontResources)(
-        IXpsOMPartResources* This,
+        IXpsOMPartResources *This,
         IXpsOMFontResourceCollection **fontResources);
 
     HRESULT (STDMETHODCALLTYPE *GetImageResources)(
-        IXpsOMPartResources* This,
+        IXpsOMPartResources *This,
         IXpsOMImageResourceCollection **imageResources);
 
     HRESULT (STDMETHODCALLTYPE *GetColorProfileResources)(
-        IXpsOMPartResources* This,
+        IXpsOMPartResources *This,
         IXpsOMColorProfileResourceCollection **colorProfileResources);
 
     HRESULT (STDMETHODCALLTYPE *GetRemoteDictionaryResources)(
-        IXpsOMPartResources* This,
+        IXpsOMPartResources *This,
         IXpsOMRemoteDictionaryResourceCollection **dictionaryResources);
 
     END_INTERFACE
 } IXpsOMPartResourcesVtbl;
+
 interface IXpsOMPartResources {
     CONST_VTBL IXpsOMPartResourcesVtbl* lpVtbl;
 };
@@ -2652,38 +2459,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetFontResources_Proxy(
-    IXpsOMPartResources* This,
-    IXpsOMFontResourceCollection **fontResources);
-void __RPC_STUB IXpsOMPartResources_GetFontResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetImageResources_Proxy(
-    IXpsOMPartResources* This,
-    IXpsOMImageResourceCollection **imageResources);
-void __RPC_STUB IXpsOMPartResources_GetImageResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetColorProfileResources_Proxy(
-    IXpsOMPartResources* This,
-    IXpsOMColorProfileResourceCollection **colorProfileResources);
-void __RPC_STUB IXpsOMPartResources_GetColorProfileResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartResources_GetRemoteDictionaryResources_Proxy(
-    IXpsOMPartResources* This,
-    IXpsOMRemoteDictionaryResourceCollection **dictionaryResources);
-void __RPC_STUB IXpsOMPartResources_GetRemoteDictionaryResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPartResources_INTERFACE_DEFINED__ */
 
@@ -2733,51 +2508,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMFontResourceCollection* This);
+        IXpsOMFontResourceCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMFontResourceCollection* This);
+        IXpsOMFontResourceCollection *This);
 
     /*** IXpsOMFontResourceCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         UINT32 index,
         IXpsOMFontResource **value);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         UINT32 index,
         IXpsOMFontResource *value);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         UINT32 index,
         IXpsOMFontResource *value);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         IXpsOMFontResource *value);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *GetByPartName)(
-        IXpsOMFontResourceCollection* This,
+        IXpsOMFontResourceCollection *This,
         IOpcPartUri *partName,
         IXpsOMFontResource **part);
 
     END_INTERFACE
 } IXpsOMFontResourceCollectionVtbl;
+
 interface IXpsOMFontResourceCollection {
     CONST_VTBL IXpsOMFontResourceCollectionVtbl* lpVtbl;
 };
@@ -2834,66 +2610,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_GetCount_Proxy(
-    IXpsOMFontResourceCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMFontResourceCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_GetAt_Proxy(
-    IXpsOMFontResourceCollection* This,
-    UINT32 index,
-    IXpsOMFontResource **value);
-void __RPC_STUB IXpsOMFontResourceCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_SetAt_Proxy(
-    IXpsOMFontResourceCollection* This,
-    UINT32 index,
-    IXpsOMFontResource *value);
-void __RPC_STUB IXpsOMFontResourceCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_InsertAt_Proxy(
-    IXpsOMFontResourceCollection* This,
-    UINT32 index,
-    IXpsOMFontResource *value);
-void __RPC_STUB IXpsOMFontResourceCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_Append_Proxy(
-    IXpsOMFontResourceCollection* This,
-    IXpsOMFontResource *value);
-void __RPC_STUB IXpsOMFontResourceCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_RemoveAt_Proxy(
-    IXpsOMFontResourceCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMFontResourceCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResourceCollection_GetByPartName_Proxy(
-    IXpsOMFontResourceCollection* This,
-    IOpcPartUri *partName,
-    IXpsOMFontResource **part);
-void __RPC_STUB IXpsOMFontResourceCollection_GetByPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMFontResourceCollection_INTERFACE_DEFINED__ */
 
@@ -2943,51 +2659,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMImageResourceCollection* This);
+        IXpsOMImageResourceCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMImageResourceCollection* This);
+        IXpsOMImageResourceCollection *This);
 
     /*** IXpsOMImageResourceCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         UINT32 index,
         IXpsOMImageResource **object);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         UINT32 index,
         IXpsOMImageResource *object);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         UINT32 index,
         IXpsOMImageResource *object);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         IXpsOMImageResource *object);
 
     HRESULT (STDMETHODCALLTYPE *GetByPartName)(
-        IXpsOMImageResourceCollection* This,
+        IXpsOMImageResourceCollection *This,
         IOpcPartUri *partName,
         IXpsOMImageResource **part);
 
     END_INTERFACE
 } IXpsOMImageResourceCollectionVtbl;
+
 interface IXpsOMImageResourceCollection {
     CONST_VTBL IXpsOMImageResourceCollectionVtbl* lpVtbl;
 };
@@ -3044,66 +2761,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_GetCount_Proxy(
-    IXpsOMImageResourceCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMImageResourceCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_GetAt_Proxy(
-    IXpsOMImageResourceCollection* This,
-    UINT32 index,
-    IXpsOMImageResource **object);
-void __RPC_STUB IXpsOMImageResourceCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_InsertAt_Proxy(
-    IXpsOMImageResourceCollection* This,
-    UINT32 index,
-    IXpsOMImageResource *object);
-void __RPC_STUB IXpsOMImageResourceCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_RemoveAt_Proxy(
-    IXpsOMImageResourceCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMImageResourceCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_SetAt_Proxy(
-    IXpsOMImageResourceCollection* This,
-    UINT32 index,
-    IXpsOMImageResource *object);
-void __RPC_STUB IXpsOMImageResourceCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_Append_Proxy(
-    IXpsOMImageResourceCollection* This,
-    IXpsOMImageResource *object);
-void __RPC_STUB IXpsOMImageResourceCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResourceCollection_GetByPartName_Proxy(
-    IXpsOMImageResourceCollection* This,
-    IOpcPartUri *partName,
-    IXpsOMImageResource **part);
-void __RPC_STUB IXpsOMImageResourceCollection_GetByPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMImageResourceCollection_INTERFACE_DEFINED__ */
 
@@ -3153,51 +2810,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMColorProfileResourceCollection* This);
+        IXpsOMColorProfileResourceCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMColorProfileResourceCollection* This);
+        IXpsOMColorProfileResourceCollection *This);
 
     /*** IXpsOMColorProfileResourceCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         UINT32 index,
         IXpsOMColorProfileResource **object);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         UINT32 index,
         IXpsOMColorProfileResource *object);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         UINT32 index,
         IXpsOMColorProfileResource *object);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         IXpsOMColorProfileResource *object);
 
     HRESULT (STDMETHODCALLTYPE *GetByPartName)(
-        IXpsOMColorProfileResourceCollection* This,
+        IXpsOMColorProfileResourceCollection *This,
         IOpcPartUri *partName,
         IXpsOMColorProfileResource **part);
 
     END_INTERFACE
 } IXpsOMColorProfileResourceCollectionVtbl;
+
 interface IXpsOMColorProfileResourceCollection {
     CONST_VTBL IXpsOMColorProfileResourceCollectionVtbl* lpVtbl;
 };
@@ -3254,66 +2912,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_GetCount_Proxy(
-    IXpsOMColorProfileResourceCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMColorProfileResourceCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_GetAt_Proxy(
-    IXpsOMColorProfileResourceCollection* This,
-    UINT32 index,
-    IXpsOMColorProfileResource **object);
-void __RPC_STUB IXpsOMColorProfileResourceCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_InsertAt_Proxy(
-    IXpsOMColorProfileResourceCollection* This,
-    UINT32 index,
-    IXpsOMColorProfileResource *object);
-void __RPC_STUB IXpsOMColorProfileResourceCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_RemoveAt_Proxy(
-    IXpsOMColorProfileResourceCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMColorProfileResourceCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_SetAt_Proxy(
-    IXpsOMColorProfileResourceCollection* This,
-    UINT32 index,
-    IXpsOMColorProfileResource *object);
-void __RPC_STUB IXpsOMColorProfileResourceCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_Append_Proxy(
-    IXpsOMColorProfileResourceCollection* This,
-    IXpsOMColorProfileResource *object);
-void __RPC_STUB IXpsOMColorProfileResourceCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResourceCollection_GetByPartName_Proxy(
-    IXpsOMColorProfileResourceCollection* This,
-    IOpcPartUri *partName,
-    IXpsOMColorProfileResource **part);
-void __RPC_STUB IXpsOMColorProfileResourceCollection_GetByPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMColorProfileResourceCollection_INTERFACE_DEFINED__ */
 
@@ -3363,51 +2961,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMRemoteDictionaryResourceCollection* This);
+        IXpsOMRemoteDictionaryResourceCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMRemoteDictionaryResourceCollection* This);
+        IXpsOMRemoteDictionaryResourceCollection *This);
 
     /*** IXpsOMRemoteDictionaryResourceCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         UINT32 index,
         IXpsOMRemoteDictionaryResource **object);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         UINT32 index,
         IXpsOMRemoteDictionaryResource *object);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         UINT32 index,
         IXpsOMRemoteDictionaryResource *object);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         IXpsOMRemoteDictionaryResource *object);
 
     HRESULT (STDMETHODCALLTYPE *GetByPartName)(
-        IXpsOMRemoteDictionaryResourceCollection* This,
+        IXpsOMRemoteDictionaryResourceCollection *This,
         IOpcPartUri *partName,
         IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
 
     END_INTERFACE
 } IXpsOMRemoteDictionaryResourceCollectionVtbl;
+
 interface IXpsOMRemoteDictionaryResourceCollection {
     CONST_VTBL IXpsOMRemoteDictionaryResourceCollectionVtbl* lpVtbl;
 };
@@ -3464,66 +3063,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_GetCount_Proxy(
-    IXpsOMRemoteDictionaryResourceCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_GetAt_Proxy(
-    IXpsOMRemoteDictionaryResourceCollection* This,
-    UINT32 index,
-    IXpsOMRemoteDictionaryResource **object);
-void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_InsertAt_Proxy(
-    IXpsOMRemoteDictionaryResourceCollection* This,
-    UINT32 index,
-    IXpsOMRemoteDictionaryResource *object);
-void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_RemoveAt_Proxy(
-    IXpsOMRemoteDictionaryResourceCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_SetAt_Proxy(
-    IXpsOMRemoteDictionaryResourceCollection* This,
-    UINT32 index,
-    IXpsOMRemoteDictionaryResource *object);
-void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_Append_Proxy(
-    IXpsOMRemoteDictionaryResourceCollection* This,
-    IXpsOMRemoteDictionaryResource *object);
-void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResourceCollection_GetByPartName_Proxy(
-    IXpsOMRemoteDictionaryResourceCollection* This,
-    IOpcPartUri *partName,
-    IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
-void __RPC_STUB IXpsOMRemoteDictionaryResourceCollection_GetByPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMRemoteDictionaryResourceCollection_INTERFACE_DEFINED__ */
 
@@ -3573,51 +3112,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMSignatureBlockResourceCollection* This);
+        IXpsOMSignatureBlockResourceCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMSignatureBlockResourceCollection* This);
+        IXpsOMSignatureBlockResourceCollection *This);
 
     /*** IXpsOMSignatureBlockResourceCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         UINT32 index,
         IXpsOMSignatureBlockResource **signatureBlockResource);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         UINT32 index,
         IXpsOMSignatureBlockResource *signatureBlockResource);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         UINT32 index,
         IXpsOMSignatureBlockResource *signatureBlockResource);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         IXpsOMSignatureBlockResource *signatureBlockResource);
 
     HRESULT (STDMETHODCALLTYPE *GetByPartName)(
-        IXpsOMSignatureBlockResourceCollection* This,
+        IXpsOMSignatureBlockResourceCollection *This,
         IOpcPartUri *partName,
         IXpsOMSignatureBlockResource **signatureBlockResource);
 
     END_INTERFACE
 } IXpsOMSignatureBlockResourceCollectionVtbl;
+
 interface IXpsOMSignatureBlockResourceCollection {
     CONST_VTBL IXpsOMSignatureBlockResourceCollectionVtbl* lpVtbl;
 };
@@ -3674,66 +3214,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_GetCount_Proxy(
-    IXpsOMSignatureBlockResourceCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMSignatureBlockResourceCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_GetAt_Proxy(
-    IXpsOMSignatureBlockResourceCollection* This,
-    UINT32 index,
-    IXpsOMSignatureBlockResource **signatureBlockResource);
-void __RPC_STUB IXpsOMSignatureBlockResourceCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_InsertAt_Proxy(
-    IXpsOMSignatureBlockResourceCollection* This,
-    UINT32 index,
-    IXpsOMSignatureBlockResource *signatureBlockResource);
-void __RPC_STUB IXpsOMSignatureBlockResourceCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_RemoveAt_Proxy(
-    IXpsOMSignatureBlockResourceCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMSignatureBlockResourceCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_SetAt_Proxy(
-    IXpsOMSignatureBlockResourceCollection* This,
-    UINT32 index,
-    IXpsOMSignatureBlockResource *signatureBlockResource);
-void __RPC_STUB IXpsOMSignatureBlockResourceCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_Append_Proxy(
-    IXpsOMSignatureBlockResourceCollection* This,
-    IXpsOMSignatureBlockResource *signatureBlockResource);
-void __RPC_STUB IXpsOMSignatureBlockResourceCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResourceCollection_GetByPartName_Proxy(
-    IXpsOMSignatureBlockResourceCollection* This,
-    IOpcPartUri *partName,
-    IXpsOMSignatureBlockResource **signatureBlockResource);
-void __RPC_STUB IXpsOMSignatureBlockResourceCollection_GetByPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMSignatureBlockResourceCollection_INTERFACE_DEFINED__ */
 
@@ -3779,46 +3259,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMVisualCollection* This,
+        IXpsOMVisualCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMVisualCollection* This);
+        IXpsOMVisualCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMVisualCollection* This);
+        IXpsOMVisualCollection *This);
 
     /*** IXpsOMVisualCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMVisualCollection* This,
+        IXpsOMVisualCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMVisualCollection* This,
+        IXpsOMVisualCollection *This,
         UINT32 index,
         IXpsOMVisual **object);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMVisualCollection* This,
+        IXpsOMVisualCollection *This,
         UINT32 index,
         IXpsOMVisual *object);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMVisualCollection* This,
+        IXpsOMVisualCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMVisualCollection* This,
+        IXpsOMVisualCollection *This,
         UINT32 index,
         IXpsOMVisual *object);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMVisualCollection* This,
+        IXpsOMVisualCollection *This,
         IXpsOMVisual *object);
 
     END_INTERFACE
 } IXpsOMVisualCollectionVtbl;
+
 interface IXpsOMVisualCollection {
     CONST_VTBL IXpsOMVisualCollectionVtbl* lpVtbl;
 };
@@ -3871,57 +3352,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_GetCount_Proxy(
-    IXpsOMVisualCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMVisualCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_GetAt_Proxy(
-    IXpsOMVisualCollection* This,
-    UINT32 index,
-    IXpsOMVisual **object);
-void __RPC_STUB IXpsOMVisualCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_InsertAt_Proxy(
-    IXpsOMVisualCollection* This,
-    UINT32 index,
-    IXpsOMVisual *object);
-void __RPC_STUB IXpsOMVisualCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_RemoveAt_Proxy(
-    IXpsOMVisualCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMVisualCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_SetAt_Proxy(
-    IXpsOMVisualCollection* This,
-    UINT32 index,
-    IXpsOMVisual *object);
-void __RPC_STUB IXpsOMVisualCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualCollection_Append_Proxy(
-    IXpsOMVisualCollection* This,
-    IXpsOMVisual *object);
-void __RPC_STUB IXpsOMVisualCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMVisualCollection_INTERFACE_DEFINED__ */
 
@@ -3986,69 +3416,70 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMDictionary* This);
+        IXpsOMDictionary *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMDictionary* This);
+        IXpsOMDictionary *This);
 
     /*** IXpsOMDictionary methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         UINT32 index,
         LPWSTR *key,
         IXpsOMShareable **entry);
 
     HRESULT (STDMETHODCALLTYPE *GetByKey)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         LPCWSTR key,
         IXpsOMShareable *beforeEntry,
         IXpsOMShareable **entry);
 
     HRESULT (STDMETHODCALLTYPE *GetIndex)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         IXpsOMShareable *entry,
         UINT32 *index);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         LPCWSTR key,
         IXpsOMShareable *entry);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         UINT32 index,
         LPCWSTR key,
         IXpsOMShareable *entry);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         UINT32 index,
         LPCWSTR key,
         IXpsOMShareable *entry);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMDictionary* This,
+        IXpsOMDictionary *This,
         IXpsOMDictionary **dictionary);
 
     END_INTERFACE
 } IXpsOMDictionaryVtbl;
+
 interface IXpsOMDictionary {
     CONST_VTBL IXpsOMDictionaryVtbl* lpVtbl;
 };
@@ -4117,96 +3548,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetOwner_Proxy(
-    IXpsOMDictionary* This,
-    IUnknown **owner);
-void __RPC_STUB IXpsOMDictionary_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetCount_Proxy(
-    IXpsOMDictionary* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMDictionary_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetAt_Proxy(
-    IXpsOMDictionary* This,
-    UINT32 index,
-    LPWSTR *key,
-    IXpsOMShareable **entry);
-void __RPC_STUB IXpsOMDictionary_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetByKey_Proxy(
-    IXpsOMDictionary* This,
-    LPCWSTR key,
-    IXpsOMShareable *beforeEntry,
-    IXpsOMShareable **entry);
-void __RPC_STUB IXpsOMDictionary_GetByKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_GetIndex_Proxy(
-    IXpsOMDictionary* This,
-    IXpsOMShareable *entry,
-    UINT32 *index);
-void __RPC_STUB IXpsOMDictionary_GetIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_Append_Proxy(
-    IXpsOMDictionary* This,
-    LPCWSTR key,
-    IXpsOMShareable *entry);
-void __RPC_STUB IXpsOMDictionary_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_InsertAt_Proxy(
-    IXpsOMDictionary* This,
-    UINT32 index,
-    LPCWSTR key,
-    IXpsOMShareable *entry);
-void __RPC_STUB IXpsOMDictionary_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_RemoveAt_Proxy(
-    IXpsOMDictionary* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMDictionary_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_SetAt_Proxy(
-    IXpsOMDictionary* This,
-    UINT32 index,
-    LPCWSTR key,
-    IXpsOMShareable *entry);
-void __RPC_STUB IXpsOMDictionary_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDictionary_Clone_Proxy(
-    IXpsOMDictionary* This,
-    IXpsOMDictionary **dictionary);
-void __RPC_STUB IXpsOMDictionary_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMDictionary_INTERFACE_DEFINED__ */
 
@@ -4282,86 +3623,87 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPageReference* This);
+        IXpsOMPageReference *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPageReference* This);
+        IXpsOMPageReference *This);
 
     /*** IXpsOMPageReference methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMDocument **document);
 
     HRESULT (STDMETHODCALLTYPE *GetPage)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMPage **page);
 
     HRESULT (STDMETHODCALLTYPE *SetPage)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMPage *page);
 
     HRESULT (STDMETHODCALLTYPE *DiscardPage)(
-        IXpsOMPageReference* This);
+        IXpsOMPageReference *This);
 
     HRESULT (STDMETHODCALLTYPE *IsPageLoaded)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         WINBOOL *isPageLoaded);
 
     HRESULT (STDMETHODCALLTYPE *GetAdvisoryPageDimensions)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         XPS_SIZE *pageDimensions);
 
     HRESULT (STDMETHODCALLTYPE *SetAdvisoryPageDimensions)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         const XPS_SIZE *pageDimensions);
 
     HRESULT (STDMETHODCALLTYPE *GetStoryFragmentsResource)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMStoryFragmentsResource **storyFragmentsResource);
 
     HRESULT (STDMETHODCALLTYPE *SetStoryFragmentsResource)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMStoryFragmentsResource *storyFragmentsResource);
 
     HRESULT (STDMETHODCALLTYPE *GetPrintTicketResource)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMPrintTicketResource **printTicketResource);
 
     HRESULT (STDMETHODCALLTYPE *SetPrintTicketResource)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMPrintTicketResource *printTicketResource);
 
     HRESULT (STDMETHODCALLTYPE *GetThumbnailResource)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMImageResource **imageResource);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnailResource)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMImageResource *imageResource);
 
     HRESULT (STDMETHODCALLTYPE *CollectLinkTargets)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMNameCollection **linkTargets);
 
     HRESULT (STDMETHODCALLTYPE *CollectPartResources)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMPartResources **partResources);
 
     HRESULT (STDMETHODCALLTYPE *HasRestrictedFonts)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         WINBOOL *restrictedFonts);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMPageReference* This,
+        IXpsOMPageReference *This,
         IXpsOMPageReference **pageReference);
 
     END_INTERFACE
 } IXpsOMPageReferenceVtbl;
+
 interface IXpsOMPageReference {
     CONST_VTBL IXpsOMPageReferenceVtbl* lpVtbl;
 };
@@ -4458,141 +3800,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetOwner_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMDocument **document);
-void __RPC_STUB IXpsOMPageReference_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetPage_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMPage **page);
-void __RPC_STUB IXpsOMPageReference_GetPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetPage_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMPage *page);
-void __RPC_STUB IXpsOMPageReference_SetPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_DiscardPage_Proxy(
-    IXpsOMPageReference* This);
-void __RPC_STUB IXpsOMPageReference_DiscardPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_IsPageLoaded_Proxy(
-    IXpsOMPageReference* This,
-    WINBOOL *isPageLoaded);
-void __RPC_STUB IXpsOMPageReference_IsPageLoaded_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetAdvisoryPageDimensions_Proxy(
-    IXpsOMPageReference* This,
-    XPS_SIZE *pageDimensions);
-void __RPC_STUB IXpsOMPageReference_GetAdvisoryPageDimensions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetAdvisoryPageDimensions_Proxy(
-    IXpsOMPageReference* This,
-    const XPS_SIZE *pageDimensions);
-void __RPC_STUB IXpsOMPageReference_SetAdvisoryPageDimensions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetStoryFragmentsResource_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMStoryFragmentsResource **storyFragmentsResource);
-void __RPC_STUB IXpsOMPageReference_GetStoryFragmentsResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetStoryFragmentsResource_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMStoryFragmentsResource *storyFragmentsResource);
-void __RPC_STUB IXpsOMPageReference_SetStoryFragmentsResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetPrintTicketResource_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMPrintTicketResource **printTicketResource);
-void __RPC_STUB IXpsOMPageReference_GetPrintTicketResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetPrintTicketResource_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMPrintTicketResource *printTicketResource);
-void __RPC_STUB IXpsOMPageReference_SetPrintTicketResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_GetThumbnailResource_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMImageResource **imageResource);
-void __RPC_STUB IXpsOMPageReference_GetThumbnailResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_SetThumbnailResource_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMImageResource *imageResource);
-void __RPC_STUB IXpsOMPageReference_SetThumbnailResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_CollectLinkTargets_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMNameCollection **linkTargets);
-void __RPC_STUB IXpsOMPageReference_CollectLinkTargets_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_CollectPartResources_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMPartResources **partResources);
-void __RPC_STUB IXpsOMPageReference_CollectPartResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_HasRestrictedFonts_Proxy(
-    IXpsOMPageReference* This,
-    WINBOOL *restrictedFonts);
-void __RPC_STUB IXpsOMPageReference_HasRestrictedFonts_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReference_Clone_Proxy(
-    IXpsOMPageReference* This,
-    IXpsOMPageReference **pageReference);
-void __RPC_STUB IXpsOMPageReference_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPageReference_INTERFACE_DEFINED__ */
 
@@ -4638,46 +3845,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPageReferenceCollection* This,
+        IXpsOMPageReferenceCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPageReferenceCollection* This);
+        IXpsOMPageReferenceCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPageReferenceCollection* This);
+        IXpsOMPageReferenceCollection *This);
 
     /*** IXpsOMPageReferenceCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMPageReferenceCollection* This,
+        IXpsOMPageReferenceCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMPageReferenceCollection* This,
+        IXpsOMPageReferenceCollection *This,
         UINT32 index,
         IXpsOMPageReference **pageReference);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMPageReferenceCollection* This,
+        IXpsOMPageReferenceCollection *This,
         UINT32 index,
         IXpsOMPageReference *pageReference);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMPageReferenceCollection* This,
+        IXpsOMPageReferenceCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMPageReferenceCollection* This,
+        IXpsOMPageReferenceCollection *This,
         UINT32 index,
         IXpsOMPageReference *pageReference);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMPageReferenceCollection* This,
+        IXpsOMPageReferenceCollection *This,
         IXpsOMPageReference *pageReference);
 
     END_INTERFACE
 } IXpsOMPageReferenceCollectionVtbl;
+
 interface IXpsOMPageReferenceCollection {
     CONST_VTBL IXpsOMPageReferenceCollectionVtbl* lpVtbl;
 };
@@ -4730,57 +3938,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_GetCount_Proxy(
-    IXpsOMPageReferenceCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMPageReferenceCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_GetAt_Proxy(
-    IXpsOMPageReferenceCollection* This,
-    UINT32 index,
-    IXpsOMPageReference **pageReference);
-void __RPC_STUB IXpsOMPageReferenceCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_InsertAt_Proxy(
-    IXpsOMPageReferenceCollection* This,
-    UINT32 index,
-    IXpsOMPageReference *pageReference);
-void __RPC_STUB IXpsOMPageReferenceCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_RemoveAt_Proxy(
-    IXpsOMPageReferenceCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMPageReferenceCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_SetAt_Proxy(
-    IXpsOMPageReferenceCollection* This,
-    UINT32 index,
-    IXpsOMPageReference *pageReference);
-void __RPC_STUB IXpsOMPageReferenceCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPageReferenceCollection_Append_Proxy(
-    IXpsOMPageReferenceCollection* This,
-    IXpsOMPageReference *pageReference);
-void __RPC_STUB IXpsOMPageReferenceCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPageReferenceCollection_INTERFACE_DEFINED__ */
 
@@ -4826,46 +3983,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMDocumentCollection* This,
+        IXpsOMDocumentCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMDocumentCollection* This);
+        IXpsOMDocumentCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMDocumentCollection* This);
+        IXpsOMDocumentCollection *This);
 
     /*** IXpsOMDocumentCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMDocumentCollection* This,
+        IXpsOMDocumentCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMDocumentCollection* This,
+        IXpsOMDocumentCollection *This,
         UINT32 index,
         IXpsOMDocument **document);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMDocumentCollection* This,
+        IXpsOMDocumentCollection *This,
         UINT32 index,
         IXpsOMDocument *document);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMDocumentCollection* This,
+        IXpsOMDocumentCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMDocumentCollection* This,
+        IXpsOMDocumentCollection *This,
         UINT32 index,
         IXpsOMDocument *document);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMDocumentCollection* This,
+        IXpsOMDocumentCollection *This,
         IXpsOMDocument *document);
 
     END_INTERFACE
 } IXpsOMDocumentCollectionVtbl;
+
 interface IXpsOMDocumentCollection {
     CONST_VTBL IXpsOMDocumentCollectionVtbl* lpVtbl;
 };
@@ -4918,57 +4076,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_GetCount_Proxy(
-    IXpsOMDocumentCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMDocumentCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_GetAt_Proxy(
-    IXpsOMDocumentCollection* This,
-    UINT32 index,
-    IXpsOMDocument **document);
-void __RPC_STUB IXpsOMDocumentCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_InsertAt_Proxy(
-    IXpsOMDocumentCollection* This,
-    UINT32 index,
-    IXpsOMDocument *document);
-void __RPC_STUB IXpsOMDocumentCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_RemoveAt_Proxy(
-    IXpsOMDocumentCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMDocumentCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_SetAt_Proxy(
-    IXpsOMDocumentCollection* This,
-    UINT32 index,
-    IXpsOMDocument *document);
-void __RPC_STUB IXpsOMDocumentCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentCollection_Append_Proxy(
-    IXpsOMDocumentCollection* This,
-    IXpsOMDocument *document);
-void __RPC_STUB IXpsOMDocumentCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMDocumentCollection_INTERFACE_DEFINED__ */
 
@@ -5027,63 +4134,64 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPackage* This);
+        IXpsOMPackage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPackage* This);
+        IXpsOMPackage *This);
 
     /*** IXpsOMPackage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDocumentSequence)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IXpsOMDocumentSequence **documentSequence);
 
     HRESULT (STDMETHODCALLTYPE *SetDocumentSequence)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IXpsOMDocumentSequence *documentSequence);
 
     HRESULT (STDMETHODCALLTYPE *GetCoreProperties)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IXpsOMCoreProperties **coreProperties);
 
     HRESULT (STDMETHODCALLTYPE *SetCoreProperties)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IXpsOMCoreProperties *coreProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetDiscardControlPartName)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IOpcPartUri **discardControlPartUri);
 
     HRESULT (STDMETHODCALLTYPE *SetDiscardControlPartName)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IOpcPartUri *discardControlPartUri);
 
     HRESULT (STDMETHODCALLTYPE *GetThumbnailResource)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IXpsOMImageResource **imageResource);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnailResource)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         IXpsOMImageResource *imageResource);
 
     HRESULT (STDMETHODCALLTYPE *WriteToFile)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         LPCWSTR fileName,
         LPSECURITY_ATTRIBUTES securityAttributes,
         DWORD flagsAndAttributes,
         WINBOOL optimizeMarkupSize);
 
     HRESULT (STDMETHODCALLTYPE *WriteToStream)(
-        IXpsOMPackage* This,
+        IXpsOMPackage *This,
         ISequentialStream *stream,
         WINBOOL optimizeMarkupSize);
 
     END_INTERFACE
 } IXpsOMPackageVtbl;
+
 interface IXpsOMPackage {
     CONST_VTBL IXpsOMPackageVtbl* lpVtbl;
 };
@@ -5152,90 +4260,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetDocumentSequence_Proxy(
-    IXpsOMPackage* This,
-    IXpsOMDocumentSequence **documentSequence);
-void __RPC_STUB IXpsOMPackage_GetDocumentSequence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetDocumentSequence_Proxy(
-    IXpsOMPackage* This,
-    IXpsOMDocumentSequence *documentSequence);
-void __RPC_STUB IXpsOMPackage_SetDocumentSequence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetCoreProperties_Proxy(
-    IXpsOMPackage* This,
-    IXpsOMCoreProperties **coreProperties);
-void __RPC_STUB IXpsOMPackage_GetCoreProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetCoreProperties_Proxy(
-    IXpsOMPackage* This,
-    IXpsOMCoreProperties *coreProperties);
-void __RPC_STUB IXpsOMPackage_SetCoreProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetDiscardControlPartName_Proxy(
-    IXpsOMPackage* This,
-    IOpcPartUri **discardControlPartUri);
-void __RPC_STUB IXpsOMPackage_GetDiscardControlPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetDiscardControlPartName_Proxy(
-    IXpsOMPackage* This,
-    IOpcPartUri *discardControlPartUri);
-void __RPC_STUB IXpsOMPackage_SetDiscardControlPartName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_GetThumbnailResource_Proxy(
-    IXpsOMPackage* This,
-    IXpsOMImageResource **imageResource);
-void __RPC_STUB IXpsOMPackage_GetThumbnailResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_SetThumbnailResource_Proxy(
-    IXpsOMPackage* This,
-    IXpsOMImageResource *imageResource);
-void __RPC_STUB IXpsOMPackage_SetThumbnailResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_WriteToFile_Proxy(
-    IXpsOMPackage* This,
-    LPCWSTR fileName,
-    LPSECURITY_ATTRIBUTES securityAttributes,
-    DWORD flagsAndAttributes,
-    WINBOOL optimizeMarkupSize);
-void __RPC_STUB IXpsOMPackage_WriteToFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage_WriteToStream_Proxy(
-    IXpsOMPackage* This,
-    ISequentialStream *stream,
-    WINBOOL optimizeMarkupSize);
-void __RPC_STUB IXpsOMPackage_WriteToStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPackage_INTERFACE_DEFINED__ */
 
@@ -5450,92 +4474,92 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMObjectFactory* This);
+        IXpsOMObjectFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMObjectFactory* This);
+        IXpsOMObjectFactory *This);
 
     /*** IXpsOMObjectFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreatePackage)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageFromFile)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         LPCWSTR filename,
         WINBOOL reuseObjects,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageFromStream)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *stream,
         WINBOOL reuseObjects,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *CreateStoryFragmentsResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMStoryFragmentsResource **storyFragmentsResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateDocumentStructureResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMDocumentStructureResource **documentStructureResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateSignatureBlockResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMSignatureBlockResource **signatureBlockResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMDictionary *dictionary,
         IOpcPartUri *partUri,
         IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResourceFromStream)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *dictionaryMarkupStream,
         IOpcPartUri *dictionaryPartUri,
         IXpsOMPartResources *resources,
         IXpsOMRemoteDictionaryResource **dictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *CreatePartResources)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMPartResources **partResources);
 
     HRESULT (STDMETHODCALLTYPE *CreateDocumentSequence)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IOpcPartUri *partUri,
         IXpsOMDocumentSequence **documentSequence);
 
     HRESULT (STDMETHODCALLTYPE *CreateDocument)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IOpcPartUri *partUri,
         IXpsOMDocument **document);
 
     HRESULT (STDMETHODCALLTYPE *CreatePageReference)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         const XPS_SIZE *advisoryPageDimensions,
         IXpsOMPageReference **pageReference);
 
     HRESULT (STDMETHODCALLTYPE *CreatePage)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         const XPS_SIZE *pageDimensions,
         LPCWSTR language,
         IOpcPartUri *partUri,
         IXpsOMPage **page);
 
     HRESULT (STDMETHODCALLTYPE *CreatePageFromStream)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *pageMarkupStream,
         IOpcPartUri *partUri,
         IXpsOMPartResources *resources,
@@ -5543,72 +4567,72 @@
         IXpsOMPage **page);
 
     HRESULT (STDMETHODCALLTYPE *CreateCanvas)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMCanvas **canvas);
 
     HRESULT (STDMETHODCALLTYPE *CreateGlyphs)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMFontResource *fontResource,
         IXpsOMGlyphs **glyphs);
 
     HRESULT (STDMETHODCALLTYPE *CreatePath)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMPath **path);
 
     HRESULT (STDMETHODCALLTYPE *CreateGeometry)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMGeometry **geometry);
 
     HRESULT (STDMETHODCALLTYPE *CreateGeometryFigure)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         const XPS_POINT *startPoint,
         IXpsOMGeometryFigure **figure);
 
     HRESULT (STDMETHODCALLTYPE *CreateMatrixTransform)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         const XPS_MATRIX *matrix,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *CreateSolidColorBrush)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         const XPS_COLOR *color,
         IXpsOMColorProfileResource *colorProfile,
         IXpsOMSolidColorBrush **solidColorBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateColorProfileResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMColorProfileResource **colorProfileResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateImageBrush)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMImageResource *image,
         const XPS_RECT *viewBox,
         const XPS_RECT *viewPort,
         IXpsOMImageBrush **imageBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateVisualBrush)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         const XPS_RECT *viewBox,
         const XPS_RECT *viewPort,
         IXpsOMVisualBrush **visualBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateImageResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *acquiredStream,
         XPS_IMAGE_TYPE contentType,
         IOpcPartUri *partUri,
         IXpsOMImageResource **imageResource);
 
     HRESULT (STDMETHODCALLTYPE *CreatePrintTicketResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMPrintTicketResource **printTicketResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateFontResource)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IStream *acquiredStream,
         XPS_FONT_EMBEDDING fontEmbedding,
         IOpcPartUri *partUri,
@@ -5616,14 +4640,14 @@
         IXpsOMFontResource **fontResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateGradientStop)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         const XPS_COLOR *color,
         IXpsOMColorProfileResource *colorProfile,
         FLOAT offset,
         IXpsOMGradientStop **gradientStop);
 
     HRESULT (STDMETHODCALLTYPE *CreateLinearGradientBrush)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMGradientStop *gradStop1,
         IXpsOMGradientStop *gradStop2,
         const XPS_POINT *startPoint,
@@ -5631,7 +4655,7 @@
         IXpsOMLinearGradientBrush **linearGradientBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateRadialGradientBrush)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMGradientStop *gradStop1,
         IXpsOMGradientStop *gradStop2,
         const XPS_POINT *centerPoint,
@@ -5640,20 +4664,20 @@
         IXpsOMRadialGradientBrush **radialGradientBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateCoreProperties)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IOpcPartUri *partUri,
         IXpsOMCoreProperties **coreProperties);
 
     HRESULT (STDMETHODCALLTYPE *CreateDictionary)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMDictionary **dictionary);
 
     HRESULT (STDMETHODCALLTYPE *CreatePartUriCollection)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         IXpsOMPartUriCollection **partUriCollection);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnFile)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         LPCWSTR fileName,
         LPSECURITY_ATTRIBUTES securityAttributes,
         DWORD flagsAndAttributes,
@@ -5667,7 +4691,7 @@
         IXpsOMPackageWriter **packageWriter);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnStream)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         ISequentialStream *outputStream,
         WINBOOL optimizeMarkupSize,
         XPS_INTERLEAVING interleaving,
@@ -5679,17 +4703,18 @@
         IXpsOMPackageWriter **packageWriter);
 
     HRESULT (STDMETHODCALLTYPE *CreatePartUri)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         LPCWSTR uri,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *CreateReadOnlyStreamOnFile)(
-        IXpsOMObjectFactory* This,
+        IXpsOMObjectFactory *This,
         LPCWSTR filename,
         IStream **stream);
 
     END_INTERFACE
 } IXpsOMObjectFactoryVtbl;
+
 interface IXpsOMObjectFactory {
     CONST_VTBL IXpsOMObjectFactoryVtbl* lpVtbl;
 };
@@ -5866,381 +4891,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackage_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMPackage **package);
-void __RPC_STUB IXpsOMObjectFactory_CreatePackage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageFromFile_Proxy(
-    IXpsOMObjectFactory* This,
-    LPCWSTR filename,
-    WINBOOL reuseObjects,
-    IXpsOMPackage **package);
-void __RPC_STUB IXpsOMObjectFactory_CreatePackageFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageFromStream_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *stream,
-    WINBOOL reuseObjects,
-    IXpsOMPackage **package);
-void __RPC_STUB IXpsOMObjectFactory_CreatePackageFromStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateStoryFragmentsResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *acquiredStream,
-    IOpcPartUri *partUri,
-    IXpsOMStoryFragmentsResource **storyFragmentsResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateStoryFragmentsResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDocumentStructureResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *acquiredStream,
-    IOpcPartUri *partUri,
-    IXpsOMDocumentStructureResource **documentStructureResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateDocumentStructureResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateSignatureBlockResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *acquiredStream,
-    IOpcPartUri *partUri,
-    IXpsOMSignatureBlockResource **signatureBlockResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateSignatureBlockResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateRemoteDictionaryResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMDictionary *dictionary,
-    IOpcPartUri *partUri,
-    IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateRemoteDictionaryResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateRemoteDictionaryResourceFromStream_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *dictionaryMarkupStream,
-    IOpcPartUri *dictionaryPartUri,
-    IXpsOMPartResources *resources,
-    IXpsOMRemoteDictionaryResource **dictionaryResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateRemoteDictionaryResourceFromStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePartResources_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMPartResources **partResources);
-void __RPC_STUB IXpsOMObjectFactory_CreatePartResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDocumentSequence_Proxy(
-    IXpsOMObjectFactory* This,
-    IOpcPartUri *partUri,
-    IXpsOMDocumentSequence **documentSequence);
-void __RPC_STUB IXpsOMObjectFactory_CreateDocumentSequence_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDocument_Proxy(
-    IXpsOMObjectFactory* This,
-    IOpcPartUri *partUri,
-    IXpsOMDocument **document);
-void __RPC_STUB IXpsOMObjectFactory_CreateDocument_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePageReference_Proxy(
-    IXpsOMObjectFactory* This,
-    const XPS_SIZE *advisoryPageDimensions,
-    IXpsOMPageReference **pageReference);
-void __RPC_STUB IXpsOMObjectFactory_CreatePageReference_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePage_Proxy(
-    IXpsOMObjectFactory* This,
-    const XPS_SIZE *pageDimensions,
-    LPCWSTR language,
-    IOpcPartUri *partUri,
-    IXpsOMPage **page);
-void __RPC_STUB IXpsOMObjectFactory_CreatePage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePageFromStream_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *pageMarkupStream,
-    IOpcPartUri *partUri,
-    IXpsOMPartResources *resources,
-    WINBOOL reuseObjects,
-    IXpsOMPage **page);
-void __RPC_STUB IXpsOMObjectFactory_CreatePageFromStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateCanvas_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMCanvas **canvas);
-void __RPC_STUB IXpsOMObjectFactory_CreateCanvas_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGlyphs_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMFontResource *fontResource,
-    IXpsOMGlyphs **glyphs);
-void __RPC_STUB IXpsOMObjectFactory_CreateGlyphs_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePath_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMPath **path);
-void __RPC_STUB IXpsOMObjectFactory_CreatePath_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGeometry_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMGeometry **geometry);
-void __RPC_STUB IXpsOMObjectFactory_CreateGeometry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGeometryFigure_Proxy(
-    IXpsOMObjectFactory* This,
-    const XPS_POINT *startPoint,
-    IXpsOMGeometryFigure **figure);
-void __RPC_STUB IXpsOMObjectFactory_CreateGeometryFigure_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateMatrixTransform_Proxy(
-    IXpsOMObjectFactory* This,
-    const XPS_MATRIX *matrix,
-    IXpsOMMatrixTransform **transform);
-void __RPC_STUB IXpsOMObjectFactory_CreateMatrixTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateSolidColorBrush_Proxy(
-    IXpsOMObjectFactory* This,
-    const XPS_COLOR *color,
-    IXpsOMColorProfileResource *colorProfile,
-    IXpsOMSolidColorBrush **solidColorBrush);
-void __RPC_STUB IXpsOMObjectFactory_CreateSolidColorBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateColorProfileResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *acquiredStream,
-    IOpcPartUri *partUri,
-    IXpsOMColorProfileResource **colorProfileResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateColorProfileResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateImageBrush_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMImageResource *image,
-    const XPS_RECT *viewBox,
-    const XPS_RECT *viewPort,
-    IXpsOMImageBrush **imageBrush);
-void __RPC_STUB IXpsOMObjectFactory_CreateImageBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateVisualBrush_Proxy(
-    IXpsOMObjectFactory* This,
-    const XPS_RECT *viewBox,
-    const XPS_RECT *viewPort,
-    IXpsOMVisualBrush **visualBrush);
-void __RPC_STUB IXpsOMObjectFactory_CreateVisualBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateImageResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *acquiredStream,
-    XPS_IMAGE_TYPE contentType,
-    IOpcPartUri *partUri,
-    IXpsOMImageResource **imageResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateImageResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePrintTicketResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *acquiredStream,
-    IOpcPartUri *partUri,
-    IXpsOMPrintTicketResource **printTicketResource);
-void __RPC_STUB IXpsOMObjectFactory_CreatePrintTicketResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateFontResource_Proxy(
-    IXpsOMObjectFactory* This,
-    IStream *acquiredStream,
-    XPS_FONT_EMBEDDING fontEmbedding,
-    IOpcPartUri *partUri,
-    WINBOOL isObfSourceStream,
-    IXpsOMFontResource **fontResource);
-void __RPC_STUB IXpsOMObjectFactory_CreateFontResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateGradientStop_Proxy(
-    IXpsOMObjectFactory* This,
-    const XPS_COLOR *color,
-    IXpsOMColorProfileResource *colorProfile,
-    FLOAT offset,
-    IXpsOMGradientStop **gradientStop);
-void __RPC_STUB IXpsOMObjectFactory_CreateGradientStop_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateLinearGradientBrush_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMGradientStop *gradStop1,
-    IXpsOMGradientStop *gradStop2,
-    const XPS_POINT *startPoint,
-    const XPS_POINT *endPoint,
-    IXpsOMLinearGradientBrush **linearGradientBrush);
-void __RPC_STUB IXpsOMObjectFactory_CreateLinearGradientBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateRadialGradientBrush_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMGradientStop *gradStop1,
-    IXpsOMGradientStop *gradStop2,
-    const XPS_POINT *centerPoint,
-    const XPS_POINT *gradientOrigin,
-    const XPS_SIZE *radiiSizes,
-    IXpsOMRadialGradientBrush **radialGradientBrush);
-void __RPC_STUB IXpsOMObjectFactory_CreateRadialGradientBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateCoreProperties_Proxy(
-    IXpsOMObjectFactory* This,
-    IOpcPartUri *partUri,
-    IXpsOMCoreProperties **coreProperties);
-void __RPC_STUB IXpsOMObjectFactory_CreateCoreProperties_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateDictionary_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMDictionary **dictionary);
-void __RPC_STUB IXpsOMObjectFactory_CreateDictionary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePartUriCollection_Proxy(
-    IXpsOMObjectFactory* This,
-    IXpsOMPartUriCollection **partUriCollection);
-void __RPC_STUB IXpsOMObjectFactory_CreatePartUriCollection_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageWriterOnFile_Proxy(
-    IXpsOMObjectFactory* This,
-    LPCWSTR fileName,
-    LPSECURITY_ATTRIBUTES securityAttributes,
-    DWORD flagsAndAttributes,
-    WINBOOL optimizeMarkupSize,
-    XPS_INTERLEAVING interleaving,
-    IOpcPartUri *documentSequencePartName,
-    IXpsOMCoreProperties *coreProperties,
-    IXpsOMImageResource *packageThumbnail,
-    IXpsOMPrintTicketResource *documentSequencePrintTicket,
-    IOpcPartUri *discardControlPartName,
-    IXpsOMPackageWriter **packageWriter);
-void __RPC_STUB IXpsOMObjectFactory_CreatePackageWriterOnFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePackageWriterOnStream_Proxy(
-    IXpsOMObjectFactory* This,
-    ISequentialStream *outputStream,
-    WINBOOL optimizeMarkupSize,
-    XPS_INTERLEAVING interleaving,
-    IOpcPartUri *documentSequencePartName,
-    IXpsOMCoreProperties *coreProperties,
-    IXpsOMImageResource *packageThumbnail,
-    IXpsOMPrintTicketResource *documentSequencePrintTicket,
-    IOpcPartUri *discardControlPartName,
-    IXpsOMPackageWriter **packageWriter);
-void __RPC_STUB IXpsOMObjectFactory_CreatePackageWriterOnStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreatePartUri_Proxy(
-    IXpsOMObjectFactory* This,
-    LPCWSTR uri,
-    IOpcPartUri **partUri);
-void __RPC_STUB IXpsOMObjectFactory_CreatePartUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory_CreateReadOnlyStreamOnFile_Proxy(
-    IXpsOMObjectFactory* This,
-    LPCWSTR filename,
-    IStream **stream);
-void __RPC_STUB IXpsOMObjectFactory_CreateReadOnlyStreamOnFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMObjectFactory_INTERFACE_DEFINED__ */
 
@@ -6272,28 +4922,29 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMNameCollection* This,
+        IXpsOMNameCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMNameCollection* This);
+        IXpsOMNameCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMNameCollection* This);
+        IXpsOMNameCollection *This);
 
     /*** IXpsOMNameCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMNameCollection* This,
+        IXpsOMNameCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMNameCollection* This,
+        IXpsOMNameCollection *This,
         UINT32 index,
         LPWSTR *name);
 
     END_INTERFACE
 } IXpsOMNameCollectionVtbl;
+
 interface IXpsOMNameCollection {
     CONST_VTBL IXpsOMNameCollectionVtbl* lpVtbl;
 };
@@ -6330,23 +4981,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMNameCollection_GetCount_Proxy(
-    IXpsOMNameCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMNameCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMNameCollection_GetAt_Proxy(
-    IXpsOMNameCollection* This,
-    UINT32 index,
-    LPWSTR *name);
-void __RPC_STUB IXpsOMNameCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMNameCollection_INTERFACE_DEFINED__ */
 
@@ -6392,46 +5026,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPartUriCollection* This,
+        IXpsOMPartUriCollection *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPartUriCollection* This);
+        IXpsOMPartUriCollection *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPartUriCollection* This);
+        IXpsOMPartUriCollection *This);
 
     /*** IXpsOMPartUriCollection methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCount)(
-        IXpsOMPartUriCollection* This,
+        IXpsOMPartUriCollection *This,
         UINT32 *count);
 
     HRESULT (STDMETHODCALLTYPE *GetAt)(
-        IXpsOMPartUriCollection* This,
+        IXpsOMPartUriCollection *This,
         UINT32 index,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *InsertAt)(
-        IXpsOMPartUriCollection* This,
+        IXpsOMPartUriCollection *This,
         UINT32 index,
         IOpcPartUri *partUri);
 
     HRESULT (STDMETHODCALLTYPE *RemoveAt)(
-        IXpsOMPartUriCollection* This,
+        IXpsOMPartUriCollection *This,
         UINT32 index);
 
     HRESULT (STDMETHODCALLTYPE *SetAt)(
-        IXpsOMPartUriCollection* This,
+        IXpsOMPartUriCollection *This,
         UINT32 index,
         IOpcPartUri *partUri);
 
     HRESULT (STDMETHODCALLTYPE *Append)(
-        IXpsOMPartUriCollection* This,
+        IXpsOMPartUriCollection *This,
         IOpcPartUri *partUri);
 
     END_INTERFACE
 } IXpsOMPartUriCollectionVtbl;
+
 interface IXpsOMPartUriCollection {
     CONST_VTBL IXpsOMPartUriCollectionVtbl* lpVtbl;
 };
@@ -6484,57 +5119,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_GetCount_Proxy(
-    IXpsOMPartUriCollection* This,
-    UINT32 *count);
-void __RPC_STUB IXpsOMPartUriCollection_GetCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_GetAt_Proxy(
-    IXpsOMPartUriCollection* This,
-    UINT32 index,
-    IOpcPartUri **partUri);
-void __RPC_STUB IXpsOMPartUriCollection_GetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_InsertAt_Proxy(
-    IXpsOMPartUriCollection* This,
-    UINT32 index,
-    IOpcPartUri *partUri);
-void __RPC_STUB IXpsOMPartUriCollection_InsertAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_RemoveAt_Proxy(
-    IXpsOMPartUriCollection* This,
-    UINT32 index);
-void __RPC_STUB IXpsOMPartUriCollection_RemoveAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_SetAt_Proxy(
-    IXpsOMPartUriCollection* This,
-    UINT32 index,
-    IOpcPartUri *partUri);
-void __RPC_STUB IXpsOMPartUriCollection_SetAt_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPartUriCollection_Append_Proxy(
-    IXpsOMPartUriCollection* This,
-    IOpcPartUri *partUri);
-void __RPC_STUB IXpsOMPartUriCollection_Append_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPartUriCollection_INTERFACE_DEFINED__ */
 
@@ -6583,19 +5167,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPackageWriter* This,
+        IXpsOMPackageWriter *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPackageWriter* This);
+        IXpsOMPackageWriter *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPackageWriter* This);
+        IXpsOMPackageWriter *This);
 
     /*** IXpsOMPackageWriter methods ***/
     HRESULT (STDMETHODCALLTYPE *StartNewDocument)(
-        IXpsOMPackageWriter* This,
+        IXpsOMPackageWriter *This,
         IOpcPartUri *documentPartName,
         IXpsOMPrintTicketResource *documentPrintTicket,
         IXpsOMDocumentStructureResource *documentStructure,
@@ -6603,7 +5187,7 @@
         IXpsOMPartUriCollection *restrictedFonts);
 
     HRESULT (STDMETHODCALLTYPE *AddPage)(
-        IXpsOMPackageWriter* This,
+        IXpsOMPackageWriter *This,
         IXpsOMPage *page,
         const XPS_SIZE *advisoryPageDimensions,
         IXpsOMPartUriCollection *discardableResourceParts,
@@ -6612,18 +5196,19 @@
         IXpsOMImageResource *pageThumbnail);
 
     HRESULT (STDMETHODCALLTYPE *AddResource)(
-        IXpsOMPackageWriter* This,
+        IXpsOMPackageWriter *This,
         IXpsOMResource *resource);
 
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IXpsOMPackageWriter* This);
+        IXpsOMPackageWriter *This);
 
     HRESULT (STDMETHODCALLTYPE *IsClosed)(
-        IXpsOMPackageWriter* This,
+        IXpsOMPackageWriter *This,
         WINBOOL *isClosed);
 
     END_INTERFACE
 } IXpsOMPackageWriterVtbl;
+
 interface IXpsOMPackageWriter {
     CONST_VTBL IXpsOMPackageWriterVtbl* lpVtbl;
 };
@@ -6672,54 +5257,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_StartNewDocument_Proxy(
-    IXpsOMPackageWriter* This,
-    IOpcPartUri *documentPartName,
-    IXpsOMPrintTicketResource *documentPrintTicket,
-    IXpsOMDocumentStructureResource *documentStructure,
-    IXpsOMSignatureBlockResourceCollection *signatureBlockResources,
-    IXpsOMPartUriCollection *restrictedFonts);
-void __RPC_STUB IXpsOMPackageWriter_StartNewDocument_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_AddPage_Proxy(
-    IXpsOMPackageWriter* This,
-    IXpsOMPage *page,
-    const XPS_SIZE *advisoryPageDimensions,
-    IXpsOMPartUriCollection *discardableResourceParts,
-    IXpsOMStoryFragmentsResource *storyFragments,
-    IXpsOMPrintTicketResource *pagePrintTicket,
-    IXpsOMImageResource *pageThumbnail);
-void __RPC_STUB IXpsOMPackageWriter_AddPage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_AddResource_Proxy(
-    IXpsOMPackageWriter* This,
-    IXpsOMResource *resource);
-void __RPC_STUB IXpsOMPackageWriter_AddResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_Close_Proxy(
-    IXpsOMPackageWriter* This);
-void __RPC_STUB IXpsOMPackageWriter_Close_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackageWriter_IsClosed_Proxy(
-    IXpsOMPackageWriter* This,
-    WINBOOL *isClosed);
-void __RPC_STUB IXpsOMPackageWriter_IsClosed_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPackageWriter_INTERFACE_DEFINED__ */
 
@@ -6750,19 +5287,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPackageTarget* This,
+        IXpsOMPackageTarget *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPackageTarget* This);
+        IXpsOMPackageTarget *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPackageTarget* This);
+        IXpsOMPackageTarget *This);
 
     /*** IXpsOMPackageTarget methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateXpsOMPackageWriter)(
-        IXpsOMPackageTarget* This,
+        IXpsOMPackageTarget *This,
         IOpcPartUri *documentSequencePartName,
         IXpsOMPrintTicketResource *documentSequencePrintTicket,
         IOpcPartUri *discardControlPartName,
@@ -6770,6 +5307,7 @@
 
     END_INTERFACE
 } IXpsOMPackageTargetVtbl;
+
 interface IXpsOMPackageTarget {
     CONST_VTBL IXpsOMPackageTargetVtbl* lpVtbl;
 };
@@ -6802,17 +5340,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPackageTarget_CreateXpsOMPackageWriter_Proxy(
-    IXpsOMPackageTarget* This,
-    IOpcPartUri *documentSequencePartName,
-    IXpsOMPrintTicketResource *documentSequencePrintTicket,
-    IOpcPartUri *discardControlPartName,
-    IXpsOMPackageWriter **packageWriter);
-void __RPC_STUB IXpsOMPackageTarget_CreateXpsOMPackageWriter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPackageTarget_INTERFACE_DEFINED__ */
 
@@ -6912,128 +5439,129 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMVisual* This);
+        IXpsOMVisual *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMVisual* This);
+        IXpsOMVisual *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMVisual methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMMatrixTransform *matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometry)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMGeometry *clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         FLOAT opacity);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IXpsOMBrush *opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPWSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPCWSTR name);
 
     HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         WINBOOL *isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         WINBOOL isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IUri **hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         IUri *hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPWSTR *language);
 
     HRESULT (STDMETHODCALLTYPE *SetLanguage)(
-        IXpsOMVisual* This,
+        IXpsOMVisual *This,
         LPCWSTR language);
 
     END_INTERFACE
 } IXpsOMVisualVtbl;
+
 interface IXpsOMVisual {
     CONST_VTBL IXpsOMVisualVtbl* lpVtbl;
 };
@@ -7172,206 +5700,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetTransform_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMMatrixTransform **matrixTransform);
-void __RPC_STUB IXpsOMVisual_GetTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetTransformLocal_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMMatrixTransform **matrixTransform);
-void __RPC_STUB IXpsOMVisual_GetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetTransformLocal_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMMatrixTransform *matrixTransform);
-void __RPC_STUB IXpsOMVisual_SetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetTransformLookup_Proxy(
-    IXpsOMVisual* This,
-    LPWSTR *key);
-void __RPC_STUB IXpsOMVisual_GetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetTransformLookup_Proxy(
-    IXpsOMVisual* This,
-    LPCWSTR key);
-void __RPC_STUB IXpsOMVisual_SetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetClipGeometry_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMGeometry **clipGeometry);
-void __RPC_STUB IXpsOMVisual_GetClipGeometry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetClipGeometryLocal_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMGeometry **clipGeometry);
-void __RPC_STUB IXpsOMVisual_GetClipGeometryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetClipGeometryLocal_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMGeometry *clipGeometry);
-void __RPC_STUB IXpsOMVisual_SetClipGeometryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetClipGeometryLookup_Proxy(
-    IXpsOMVisual* This,
-    LPWSTR *key);
-void __RPC_STUB IXpsOMVisual_GetClipGeometryLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetClipGeometryLookup_Proxy(
-    IXpsOMVisual* This,
-    LPCWSTR key);
-void __RPC_STUB IXpsOMVisual_SetClipGeometryLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacity_Proxy(
-    IXpsOMVisual* This,
-    FLOAT *opacity);
-void __RPC_STUB IXpsOMVisual_GetOpacity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetOpacity_Proxy(
-    IXpsOMVisual* This,
-    FLOAT opacity);
-void __RPC_STUB IXpsOMVisual_SetOpacity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacityMaskBrush_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMBrush **opacityMaskBrush);
-void __RPC_STUB IXpsOMVisual_GetOpacityMaskBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacityMaskBrushLocal_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMBrush **opacityMaskBrush);
-void __RPC_STUB IXpsOMVisual_GetOpacityMaskBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetOpacityMaskBrushLocal_Proxy(
-    IXpsOMVisual* This,
-    IXpsOMBrush *opacityMaskBrush);
-void __RPC_STUB IXpsOMVisual_SetOpacityMaskBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetOpacityMaskBrushLookup_Proxy(
-    IXpsOMVisual* This,
-    LPWSTR *key);
-void __RPC_STUB IXpsOMVisual_GetOpacityMaskBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetOpacityMaskBrushLookup_Proxy(
-    IXpsOMVisual* This,
-    LPCWSTR key);
-void __RPC_STUB IXpsOMVisual_SetOpacityMaskBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetName_Proxy(
-    IXpsOMVisual* This,
-    LPWSTR *name);
-void __RPC_STUB IXpsOMVisual_GetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetName_Proxy(
-    IXpsOMVisual* This,
-    LPCWSTR name);
-void __RPC_STUB IXpsOMVisual_SetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetIsHyperlinkTarget_Proxy(
-    IXpsOMVisual* This,
-    WINBOOL *isHyperlink);
-void __RPC_STUB IXpsOMVisual_GetIsHyperlinkTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetIsHyperlinkTarget_Proxy(
-    IXpsOMVisual* This,
-    WINBOOL isHyperlink);
-void __RPC_STUB IXpsOMVisual_SetIsHyperlinkTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetHyperlinkNavigateUri_Proxy(
-    IXpsOMVisual* This,
-    IUri **hyperlinkUri);
-void __RPC_STUB IXpsOMVisual_GetHyperlinkNavigateUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetHyperlinkNavigateUri_Proxy(
-    IXpsOMVisual* This,
-    IUri *hyperlinkUri);
-void __RPC_STUB IXpsOMVisual_SetHyperlinkNavigateUri_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_GetLanguage_Proxy(
-    IXpsOMVisual* This,
-    LPWSTR *language);
-void __RPC_STUB IXpsOMVisual_GetLanguage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisual_SetLanguage_Proxy(
-    IXpsOMVisual* This,
-    LPCWSTR language);
-void __RPC_STUB IXpsOMVisual_SetLanguage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMVisual_INTERFACE_DEFINED__ */
 
@@ -7402,36 +5730,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMBrush* This,
+        IXpsOMBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMBrush* This);
+        IXpsOMBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMBrush* This);
+        IXpsOMBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMBrush* This,
+        IXpsOMBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMBrush* This,
+        IXpsOMBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMBrush* This,
+        IXpsOMBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMBrush* This,
+        IXpsOMBrush *This,
         FLOAT opacity);
 
     END_INTERFACE
 } IXpsOMBrushVtbl;
+
 interface IXpsOMBrush {
     CONST_VTBL IXpsOMBrushVtbl* lpVtbl;
 };
@@ -7478,22 +5807,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMBrush_GetOpacity_Proxy(
-    IXpsOMBrush* This,
-    FLOAT *opacity);
-void __RPC_STUB IXpsOMBrush_GetOpacity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMBrush_SetOpacity_Proxy(
-    IXpsOMBrush* This,
-    FLOAT opacity);
-void __RPC_STUB IXpsOMBrush_SetOpacity_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMBrush_INTERFACE_DEFINED__ */
 
@@ -7527,40 +5840,41 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMMatrixTransform* This,
+        IXpsOMMatrixTransform *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMMatrixTransform* This);
+        IXpsOMMatrixTransform *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMMatrixTransform* This);
+        IXpsOMMatrixTransform *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMMatrixTransform* This,
+        IXpsOMMatrixTransform *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMMatrixTransform* This,
+        IXpsOMMatrixTransform *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMMatrixTransform methods ***/
     HRESULT (STDMETHODCALLTYPE *GetMatrix)(
-        IXpsOMMatrixTransform* This,
+        IXpsOMMatrixTransform *This,
         XPS_MATRIX *matrix);
 
     HRESULT (STDMETHODCALLTYPE *SetMatrix)(
-        IXpsOMMatrixTransform* This,
+        IXpsOMMatrixTransform *This,
         const XPS_MATRIX *matrix);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMMatrixTransform* This,
+        IXpsOMMatrixTransform *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     END_INTERFACE
 } IXpsOMMatrixTransformVtbl;
+
 interface IXpsOMMatrixTransform {
     CONST_VTBL IXpsOMMatrixTransformVtbl* lpVtbl;
 };
@@ -7611,30 +5925,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMMatrixTransform_GetMatrix_Proxy(
-    IXpsOMMatrixTransform* This,
-    XPS_MATRIX *matrix);
-void __RPC_STUB IXpsOMMatrixTransform_GetMatrix_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMMatrixTransform_SetMatrix_Proxy(
-    IXpsOMMatrixTransform* This,
-    const XPS_MATRIX *matrix);
-void __RPC_STUB IXpsOMMatrixTransform_SetMatrix_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMMatrixTransform_Clone_Proxy(
-    IXpsOMMatrixTransform* This,
-    IXpsOMMatrixTransform **matrixTransform);
-void __RPC_STUB IXpsOMMatrixTransform_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMMatrixTransform_INTERFACE_DEFINED__ */
 
@@ -7686,64 +5976,65 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGeometry* This);
+        IXpsOMGeometry *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGeometry* This);
+        IXpsOMGeometry *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMGeometry methods ***/
     HRESULT (STDMETHODCALLTYPE *GetFigures)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         IXpsOMGeometryFigureCollection **figures);
 
     HRESULT (STDMETHODCALLTYPE *GetFillRule)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         XPS_FILL_RULE *fillRule);
 
     HRESULT (STDMETHODCALLTYPE *SetFillRule)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         XPS_FILL_RULE fillRule);
 
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         IXpsOMMatrixTransform *transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         LPWSTR *lookup);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         LPCWSTR lookup);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMGeometry* This,
+        IXpsOMGeometry *This,
         IXpsOMGeometry **geometry);
 
     END_INTERFACE
 } IXpsOMGeometryVtbl;
+
 interface IXpsOMGeometry {
     CONST_VTBL IXpsOMGeometryVtbl* lpVtbl;
 };
@@ -7818,78 +6109,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetFigures_Proxy(
-    IXpsOMGeometry* This,
-    IXpsOMGeometryFigureCollection **figures);
-void __RPC_STUB IXpsOMGeometry_GetFigures_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetFillRule_Proxy(
-    IXpsOMGeometry* This,
-    XPS_FILL_RULE *fillRule);
-void __RPC_STUB IXpsOMGeometry_GetFillRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_SetFillRule_Proxy(
-    IXpsOMGeometry* This,
-    XPS_FILL_RULE fillRule);
-void __RPC_STUB IXpsOMGeometry_SetFillRule_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetTransform_Proxy(
-    IXpsOMGeometry* This,
-    IXpsOMMatrixTransform **transform);
-void __RPC_STUB IXpsOMGeometry_GetTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetTransformLocal_Proxy(
-    IXpsOMGeometry* This,
-    IXpsOMMatrixTransform **transform);
-void __RPC_STUB IXpsOMGeometry_GetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_SetTransformLocal_Proxy(
-    IXpsOMGeometry* This,
-    IXpsOMMatrixTransform *transform);
-void __RPC_STUB IXpsOMGeometry_SetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_GetTransformLookup_Proxy(
-    IXpsOMGeometry* This,
-    LPWSTR *lookup);
-void __RPC_STUB IXpsOMGeometry_GetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_SetTransformLookup_Proxy(
-    IXpsOMGeometry* This,
-    LPCWSTR lookup);
-void __RPC_STUB IXpsOMGeometry_SetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGeometry_Clone_Proxy(
-    IXpsOMGeometry* This,
-    IXpsOMGeometry **geometry);
-void __RPC_STUB IXpsOMGeometry_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGeometry_INTERFACE_DEFINED__ */
 
@@ -7998,240 +6217,241 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGlyphs* This);
+        IXpsOMGlyphs *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGlyphs* This);
+        IXpsOMGlyphs *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMVisual methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMMatrixTransform *matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometry)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMGeometry *clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         FLOAT opacity);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMBrush *opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPCWSTR name);
 
     HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         WINBOOL *isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         WINBOOL isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IUri **hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IUri *hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *language);
 
     HRESULT (STDMETHODCALLTYPE *SetLanguage)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPCWSTR language);
 
     /*** IXpsOMGlyphs methods ***/
     HRESULT (STDMETHODCALLTYPE *GetUnicodeString)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *unicodeString);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphIndexCount)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         UINT32 *indexCount);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphIndices)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         UINT32 *indexCount,
         XPS_GLYPH_INDEX *glyphIndices);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphMappingCount)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         UINT32 *glyphMappingCount);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphMappings)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         UINT32 *glyphMappingCount,
         XPS_GLYPH_MAPPING *glyphMappings);
 
     HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStopCount)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         UINT32 *prohibitedCaretStopCount);
 
     HRESULT (STDMETHODCALLTYPE *GetProhibitedCaretStops)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         UINT32 *prohibitedCaretStopCount,
         UINT32 *prohibitedCaretStops);
 
     HRESULT (STDMETHODCALLTYPE *GetBidiLevel)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         UINT32 *bidiLevel);
 
     HRESULT (STDMETHODCALLTYPE *GetIsSideways)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         WINBOOL *isSideways);
 
     HRESULT (STDMETHODCALLTYPE *GetDeviceFontName)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *deviceFontName);
 
     HRESULT (STDMETHODCALLTYPE *GetStyleSimulations)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         XPS_STYLE_SIMULATION *styleSimulations);
 
     HRESULT (STDMETHODCALLTYPE *SetStyleSimulations)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         XPS_STYLE_SIMULATION styleSimulations);
 
     HRESULT (STDMETHODCALLTYPE *GetOrigin)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         XPS_POINT *origin);
 
     HRESULT (STDMETHODCALLTYPE *SetOrigin)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         const XPS_POINT *origin);
 
     HRESULT (STDMETHODCALLTYPE *GetFontRenderingEmSize)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         FLOAT *fontRenderingEmSize);
 
     HRESULT (STDMETHODCALLTYPE *SetFontRenderingEmSize)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         FLOAT fontRenderingEmSize);
 
     HRESULT (STDMETHODCALLTYPE *GetFontResource)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMFontResource **fontResource);
 
     HRESULT (STDMETHODCALLTYPE *SetFontResource)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMFontResource *fontResource);
 
     HRESULT (STDMETHODCALLTYPE *GetFontFaceIndex)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         SHORT *fontFaceIndex);
 
     HRESULT (STDMETHODCALLTYPE *SetFontFaceIndex)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         SHORT fontFaceIndex);
 
     HRESULT (STDMETHODCALLTYPE *GetFillBrush)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMBrush **fillBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetFillBrushLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMBrush **fillBrush);
 
     HRESULT (STDMETHODCALLTYPE *SetFillBrushLocal)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMBrush *fillBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetFillBrushLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetFillBrushLookup)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetGlyphsEditor)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMGlyphsEditor **editor);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMGlyphs* This,
+        IXpsOMGlyphs *This,
         IXpsOMGlyphs **glyphs);
 
     END_INTERFACE
 } IXpsOMGlyphsVtbl;
+
 interface IXpsOMGlyphs {
     CONST_VTBL IXpsOMGlyphsVtbl* lpVtbl;
 };
@@ -8480,225 +6700,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetUnicodeString_Proxy(
-    IXpsOMGlyphs* This,
-    LPWSTR *unicodeString);
-void __RPC_STUB IXpsOMGlyphs_GetUnicodeString_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphIndexCount_Proxy(
-    IXpsOMGlyphs* This,
-    UINT32 *indexCount);
-void __RPC_STUB IXpsOMGlyphs_GetGlyphIndexCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphIndices_Proxy(
-    IXpsOMGlyphs* This,
-    UINT32 *indexCount,
-    XPS_GLYPH_INDEX *glyphIndices);
-void __RPC_STUB IXpsOMGlyphs_GetGlyphIndices_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphMappingCount_Proxy(
-    IXpsOMGlyphs* This,
-    UINT32 *glyphMappingCount);
-void __RPC_STUB IXpsOMGlyphs_GetGlyphMappingCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphMappings_Proxy(
-    IXpsOMGlyphs* This,
-    UINT32 *glyphMappingCount,
-    XPS_GLYPH_MAPPING *glyphMappings);
-void __RPC_STUB IXpsOMGlyphs_GetGlyphMappings_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetProhibitedCaretStopCount_Proxy(
-    IXpsOMGlyphs* This,
-    UINT32 *prohibitedCaretStopCount);
-void __RPC_STUB IXpsOMGlyphs_GetProhibitedCaretStopCount_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetProhibitedCaretStops_Proxy(
-    IXpsOMGlyphs* This,
-    UINT32 *prohibitedCaretStopCount,
-    UINT32 *prohibitedCaretStops);
-void __RPC_STUB IXpsOMGlyphs_GetProhibitedCaretStops_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetBidiLevel_Proxy(
-    IXpsOMGlyphs* This,
-    UINT32 *bidiLevel);
-void __RPC_STUB IXpsOMGlyphs_GetBidiLevel_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetIsSideways_Proxy(
-    IXpsOMGlyphs* This,
-    WINBOOL *isSideways);
-void __RPC_STUB IXpsOMGlyphs_GetIsSideways_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetDeviceFontName_Proxy(
-    IXpsOMGlyphs* This,
-    LPWSTR *deviceFontName);
-void __RPC_STUB IXpsOMGlyphs_GetDeviceFontName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetStyleSimulations_Proxy(
-    IXpsOMGlyphs* This,
-    XPS_STYLE_SIMULATION *styleSimulations);
-void __RPC_STUB IXpsOMGlyphs_GetStyleSimulations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetStyleSimulations_Proxy(
-    IXpsOMGlyphs* This,
-    XPS_STYLE_SIMULATION styleSimulations);
-void __RPC_STUB IXpsOMGlyphs_SetStyleSimulations_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetOrigin_Proxy(
-    IXpsOMGlyphs* This,
-    XPS_POINT *origin);
-void __RPC_STUB IXpsOMGlyphs_GetOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetOrigin_Proxy(
-    IXpsOMGlyphs* This,
-    const XPS_POINT *origin);
-void __RPC_STUB IXpsOMGlyphs_SetOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFontRenderingEmSize_Proxy(
-    IXpsOMGlyphs* This,
-    FLOAT *fontRenderingEmSize);
-void __RPC_STUB IXpsOMGlyphs_GetFontRenderingEmSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFontRenderingEmSize_Proxy(
-    IXpsOMGlyphs* This,
-    FLOAT fontRenderingEmSize);
-void __RPC_STUB IXpsOMGlyphs_SetFontRenderingEmSize_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFontResource_Proxy(
-    IXpsOMGlyphs* This,
-    IXpsOMFontResource **fontResource);
-void __RPC_STUB IXpsOMGlyphs_GetFontResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFontResource_Proxy(
-    IXpsOMGlyphs* This,
-    IXpsOMFontResource *fontResource);
-void __RPC_STUB IXpsOMGlyphs_SetFontResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFontFaceIndex_Proxy(
-    IXpsOMGlyphs* This,
-    SHORT *fontFaceIndex);
-void __RPC_STUB IXpsOMGlyphs_GetFontFaceIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFontFaceIndex_Proxy(
-    IXpsOMGlyphs* This,
-    SHORT fontFaceIndex);
-void __RPC_STUB IXpsOMGlyphs_SetFontFaceIndex_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFillBrush_Proxy(
-    IXpsOMGlyphs* This,
-    IXpsOMBrush **fillBrush);
-void __RPC_STUB IXpsOMGlyphs_GetFillBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFillBrushLocal_Proxy(
-    IXpsOMGlyphs* This,
-    IXpsOMBrush **fillBrush);
-void __RPC_STUB IXpsOMGlyphs_GetFillBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFillBrushLocal_Proxy(
-    IXpsOMGlyphs* This,
-    IXpsOMBrush *fillBrush);
-void __RPC_STUB IXpsOMGlyphs_SetFillBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetFillBrushLookup_Proxy(
-    IXpsOMGlyphs* This,
-    LPWSTR *key);
-void __RPC_STUB IXpsOMGlyphs_GetFillBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_SetFillBrushLookup_Proxy(
-    IXpsOMGlyphs* This,
-    LPCWSTR key);
-void __RPC_STUB IXpsOMGlyphs_SetFillBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_GetGlyphsEditor_Proxy(
-    IXpsOMGlyphs* This,
-    IXpsOMGlyphsEditor **editor);
-void __RPC_STUB IXpsOMGlyphs_GetGlyphsEditor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGlyphs_Clone_Proxy(
-    IXpsOMGlyphs* This,
-    IXpsOMGlyphs **glyphs);
-void __RPC_STUB IXpsOMGlyphs_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGlyphs_INTERFACE_DEFINED__ */
 
@@ -8834,277 +6835,278 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPath* This);
+        IXpsOMPath *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPath* This);
+        IXpsOMPath *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMVisual methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMMatrixTransform *matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometry)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMGeometry *clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT opacity);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush *opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR name);
 
     HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         WINBOOL *isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         WINBOOL isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IUri **hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IUri *hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *language);
 
     HRESULT (STDMETHODCALLTYPE *SetLanguage)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR language);
 
     /*** IXpsOMPath methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGeometry)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMGeometry **geometry);
 
     HRESULT (STDMETHODCALLTYPE *GetGeometryLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMGeometry **geometry);
 
     HRESULT (STDMETHODCALLTYPE *SetGeometryLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMGeometry *geometry);
 
     HRESULT (STDMETHODCALLTYPE *GetGeometryLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *lookup);
 
     HRESULT (STDMETHODCALLTYPE *SetGeometryLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR lookup);
 
     HRESULT (STDMETHODCALLTYPE *GetAccessibilityShortDescription)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *shortDescription);
 
     HRESULT (STDMETHODCALLTYPE *SetAccessibilityShortDescription)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR shortDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetAccessibilityLongDescription)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *longDescription);
 
     HRESULT (STDMETHODCALLTYPE *SetAccessibilityLongDescription)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR longDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetSnapsToPixels)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         WINBOOL *snapsToPixels);
 
     HRESULT (STDMETHODCALLTYPE *SetSnapsToPixels)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         WINBOOL snapsToPixels);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeBrush)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush **brush);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeBrushLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush **brush);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeBrushLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush *brush);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeBrushLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *lookup);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeBrushLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR lookup);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeDashes)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMDashCollection **strokeDashes);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeDashCap)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_DASH_CAP *strokeDashCap);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeDashCap)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_DASH_CAP strokeDashCap);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeDashOffset)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT *strokeDashOffset);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeDashOffset)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT strokeDashOffset);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeStartLineCap)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_LINE_CAP *strokeStartLineCap);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeStartLineCap)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_LINE_CAP strokeStartLineCap);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeEndLineCap)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_LINE_CAP *strokeEndLineCap);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeEndLineCap)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_LINE_CAP strokeEndLineCap);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeLineJoin)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_LINE_JOIN *strokeLineJoin);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeLineJoin)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         XPS_LINE_JOIN strokeLineJoin);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeMiterLimit)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT *strokeMiterLimit);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeMiterLimit)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT strokeMiterLimit);
 
     HRESULT (STDMETHODCALLTYPE *GetStrokeThickness)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT *strokeThickness);
 
     HRESULT (STDMETHODCALLTYPE *SetStrokeThickness)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         FLOAT strokeThickness);
 
     HRESULT (STDMETHODCALLTYPE *GetFillBrush)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush **brush);
 
     HRESULT (STDMETHODCALLTYPE *GetFillBrushLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush **brush);
 
     HRESULT (STDMETHODCALLTYPE *SetFillBrushLocal)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMBrush *brush);
 
     HRESULT (STDMETHODCALLTYPE *GetFillBrushLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPWSTR *lookup);
 
     HRESULT (STDMETHODCALLTYPE *SetFillBrushLookup)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         LPCWSTR lookup);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMPath* This,
+        IXpsOMPath *This,
         IXpsOMPath **path);
 
     END_INTERFACE
 } IXpsOMPathVtbl;
+
 interface IXpsOMPath {
     CONST_VTBL IXpsOMPathVtbl* lpVtbl;
 };
@@ -9393,302 +7395,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetGeometry_Proxy(
-    IXpsOMPath* This,
-    IXpsOMGeometry **geometry);
-void __RPC_STUB IXpsOMPath_GetGeometry_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetGeometryLocal_Proxy(
-    IXpsOMPath* This,
-    IXpsOMGeometry **geometry);
-void __RPC_STUB IXpsOMPath_GetGeometryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetGeometryLocal_Proxy(
-    IXpsOMPath* This,
-    IXpsOMGeometry *geometry);
-void __RPC_STUB IXpsOMPath_SetGeometryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetGeometryLookup_Proxy(
-    IXpsOMPath* This,
-    LPWSTR *lookup);
-void __RPC_STUB IXpsOMPath_GetGeometryLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetGeometryLookup_Proxy(
-    IXpsOMPath* This,
-    LPCWSTR lookup);
-void __RPC_STUB IXpsOMPath_SetGeometryLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetAccessibilityShortDescription_Proxy(
-    IXpsOMPath* This,
-    LPWSTR *shortDescription);
-void __RPC_STUB IXpsOMPath_GetAccessibilityShortDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetAccessibilityShortDescription_Proxy(
-    IXpsOMPath* This,
-    LPCWSTR shortDescription);
-void __RPC_STUB IXpsOMPath_SetAccessibilityShortDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetAccessibilityLongDescription_Proxy(
-    IXpsOMPath* This,
-    LPWSTR *longDescription);
-void __RPC_STUB IXpsOMPath_GetAccessibilityLongDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetAccessibilityLongDescription_Proxy(
-    IXpsOMPath* This,
-    LPCWSTR longDescription);
-void __RPC_STUB IXpsOMPath_SetAccessibilityLongDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetSnapsToPixels_Proxy(
-    IXpsOMPath* This,
-    WINBOOL *snapsToPixels);
-void __RPC_STUB IXpsOMPath_GetSnapsToPixels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetSnapsToPixels_Proxy(
-    IXpsOMPath* This,
-    WINBOOL snapsToPixels);
-void __RPC_STUB IXpsOMPath_SetSnapsToPixels_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeBrush_Proxy(
-    IXpsOMPath* This,
-    IXpsOMBrush **brush);
-void __RPC_STUB IXpsOMPath_GetStrokeBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeBrushLocal_Proxy(
-    IXpsOMPath* This,
-    IXpsOMBrush **brush);
-void __RPC_STUB IXpsOMPath_GetStrokeBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeBrushLocal_Proxy(
-    IXpsOMPath* This,
-    IXpsOMBrush *brush);
-void __RPC_STUB IXpsOMPath_SetStrokeBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeBrushLookup_Proxy(
-    IXpsOMPath* This,
-    LPWSTR *lookup);
-void __RPC_STUB IXpsOMPath_GetStrokeBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeBrushLookup_Proxy(
-    IXpsOMPath* This,
-    LPCWSTR lookup);
-void __RPC_STUB IXpsOMPath_SetStrokeBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeDashes_Proxy(
-    IXpsOMPath* This,
-    IXpsOMDashCollection **strokeDashes);
-void __RPC_STUB IXpsOMPath_GetStrokeDashes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeDashCap_Proxy(
-    IXpsOMPath* This,
-    XPS_DASH_CAP *strokeDashCap);
-void __RPC_STUB IXpsOMPath_GetStrokeDashCap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeDashCap_Proxy(
-    IXpsOMPath* This,
-    XPS_DASH_CAP strokeDashCap);
-void __RPC_STUB IXpsOMPath_SetStrokeDashCap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeDashOffset_Proxy(
-    IXpsOMPath* This,
-    FLOAT *strokeDashOffset);
-void __RPC_STUB IXpsOMPath_GetStrokeDashOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeDashOffset_Proxy(
-    IXpsOMPath* This,
-    FLOAT strokeDashOffset);
-void __RPC_STUB IXpsOMPath_SetStrokeDashOffset_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeStartLineCap_Proxy(
-    IXpsOMPath* This,
-    XPS_LINE_CAP *strokeStartLineCap);
-void __RPC_STUB IXpsOMPath_GetStrokeStartLineCap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeStartLineCap_Proxy(
-    IXpsOMPath* This,
-    XPS_LINE_CAP strokeStartLineCap);
-void __RPC_STUB IXpsOMPath_SetStrokeStartLineCap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeEndLineCap_Proxy(
-    IXpsOMPath* This,
-    XPS_LINE_CAP *strokeEndLineCap);
-void __RPC_STUB IXpsOMPath_GetStrokeEndLineCap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeEndLineCap_Proxy(
-    IXpsOMPath* This,
-    XPS_LINE_CAP strokeEndLineCap);
-void __RPC_STUB IXpsOMPath_SetStrokeEndLineCap_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeLineJoin_Proxy(
-    IXpsOMPath* This,
-    XPS_LINE_JOIN *strokeLineJoin);
-void __RPC_STUB IXpsOMPath_GetStrokeLineJoin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeLineJoin_Proxy(
-    IXpsOMPath* This,
-    XPS_LINE_JOIN strokeLineJoin);
-void __RPC_STUB IXpsOMPath_SetStrokeLineJoin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeMiterLimit_Proxy(
-    IXpsOMPath* This,
-    FLOAT *strokeMiterLimit);
-void __RPC_STUB IXpsOMPath_GetStrokeMiterLimit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeMiterLimit_Proxy(
-    IXpsOMPath* This,
-    FLOAT strokeMiterLimit);
-void __RPC_STUB IXpsOMPath_SetStrokeMiterLimit_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetStrokeThickness_Proxy(
-    IXpsOMPath* This,
-    FLOAT *strokeThickness);
-void __RPC_STUB IXpsOMPath_GetStrokeThickness_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetStrokeThickness_Proxy(
-    IXpsOMPath* This,
-    FLOAT strokeThickness);
-void __RPC_STUB IXpsOMPath_SetStrokeThickness_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetFillBrush_Proxy(
-    IXpsOMPath* This,
-    IXpsOMBrush **brush);
-void __RPC_STUB IXpsOMPath_GetFillBrush_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetFillBrushLocal_Proxy(
-    IXpsOMPath* This,
-    IXpsOMBrush **brush);
-void __RPC_STUB IXpsOMPath_GetFillBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetFillBrushLocal_Proxy(
-    IXpsOMPath* This,
-    IXpsOMBrush *brush);
-void __RPC_STUB IXpsOMPath_SetFillBrushLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_GetFillBrushLookup_Proxy(
-    IXpsOMPath* This,
-    LPWSTR *lookup);
-void __RPC_STUB IXpsOMPath_GetFillBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_SetFillBrushLookup_Proxy(
-    IXpsOMPath* This,
-    LPCWSTR lookup);
-void __RPC_STUB IXpsOMPath_SetFillBrushLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPath_Clone_Proxy(
-    IXpsOMPath* This,
-    IXpsOMPath **path);
-void __RPC_STUB IXpsOMPath_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPath_INTERFACE_DEFINED__ */
 
@@ -9724,51 +7430,52 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMSolidColorBrush* This);
+        IXpsOMSolidColorBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMSolidColorBrush* This);
+        IXpsOMSolidColorBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         FLOAT opacity);
 
     /*** IXpsOMSolidColorBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetColor)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         XPS_COLOR *color,
         IXpsOMColorProfileResource **colorProfile);
 
     HRESULT (STDMETHODCALLTYPE *SetColor)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         const XPS_COLOR *color,
         IXpsOMColorProfileResource *colorProfile);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMSolidColorBrush* This,
+        IXpsOMSolidColorBrush *This,
         IXpsOMSolidColorBrush **solidColorBrush);
 
     END_INTERFACE
 } IXpsOMSolidColorBrushVtbl;
+
 interface IXpsOMSolidColorBrush {
     CONST_VTBL IXpsOMSolidColorBrushVtbl* lpVtbl;
 };
@@ -9829,32 +7536,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMSolidColorBrush_GetColor_Proxy(
-    IXpsOMSolidColorBrush* This,
-    XPS_COLOR *color,
-    IXpsOMColorProfileResource **colorProfile);
-void __RPC_STUB IXpsOMSolidColorBrush_GetColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSolidColorBrush_SetColor_Proxy(
-    IXpsOMSolidColorBrush* This,
-    const XPS_COLOR *color,
-    IXpsOMColorProfileResource *colorProfile);
-void __RPC_STUB IXpsOMSolidColorBrush_SetColor_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSolidColorBrush_Clone_Proxy(
-    IXpsOMSolidColorBrush* This,
-    IXpsOMSolidColorBrush **solidColorBrush);
-void __RPC_STUB IXpsOMSolidColorBrush_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMSolidColorBrush_INTERFACE_DEFINED__ */
 
@@ -9912,81 +7593,82 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMTileBrush* This);
+        IXpsOMTileBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMTileBrush* This);
+        IXpsOMTileBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         FLOAT opacity);
 
     /*** IXpsOMTileBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         IXpsOMMatrixTransform *transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetViewbox)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         XPS_RECT *viewbox);
 
     HRESULT (STDMETHODCALLTYPE *SetViewbox)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         const XPS_RECT *viewbox);
 
     HRESULT (STDMETHODCALLTYPE *GetViewport)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         XPS_RECT *viewport);
 
     HRESULT (STDMETHODCALLTYPE *SetViewport)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         const XPS_RECT *viewport);
 
     HRESULT (STDMETHODCALLTYPE *GetTileMode)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         XPS_TILE_MODE *tileMode);
 
     HRESULT (STDMETHODCALLTYPE *SetTileMode)(
-        IXpsOMTileBrush* This,
+        IXpsOMTileBrush *This,
         XPS_TILE_MODE tileMode);
 
     END_INTERFACE
 } IXpsOMTileBrushVtbl;
+
 interface IXpsOMTileBrush {
     CONST_VTBL IXpsOMTileBrushVtbl* lpVtbl;
 };
@@ -10079,94 +7761,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTransform_Proxy(
-    IXpsOMTileBrush* This,
-    IXpsOMMatrixTransform **transform);
-void __RPC_STUB IXpsOMTileBrush_GetTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTransformLocal_Proxy(
-    IXpsOMTileBrush* This,
-    IXpsOMMatrixTransform **transform);
-void __RPC_STUB IXpsOMTileBrush_GetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetTransformLocal_Proxy(
-    IXpsOMTileBrush* This,
-    IXpsOMMatrixTransform *transform);
-void __RPC_STUB IXpsOMTileBrush_SetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTransformLookup_Proxy(
-    IXpsOMTileBrush* This,
-    LPWSTR *key);
-void __RPC_STUB IXpsOMTileBrush_GetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetTransformLookup_Proxy(
-    IXpsOMTileBrush* This,
-    LPCWSTR key);
-void __RPC_STUB IXpsOMTileBrush_SetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetViewbox_Proxy(
-    IXpsOMTileBrush* This,
-    XPS_RECT *viewbox);
-void __RPC_STUB IXpsOMTileBrush_GetViewbox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetViewbox_Proxy(
-    IXpsOMTileBrush* This,
-    const XPS_RECT *viewbox);
-void __RPC_STUB IXpsOMTileBrush_SetViewbox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetViewport_Proxy(
-    IXpsOMTileBrush* This,
-    XPS_RECT *viewport);
-void __RPC_STUB IXpsOMTileBrush_GetViewport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetViewport_Proxy(
-    IXpsOMTileBrush* This,
-    const XPS_RECT *viewport);
-void __RPC_STUB IXpsOMTileBrush_SetViewport_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_GetTileMode_Proxy(
-    IXpsOMTileBrush* This,
-    XPS_TILE_MODE *tileMode);
-void __RPC_STUB IXpsOMTileBrush_GetTileMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMTileBrush_SetTileMode_Proxy(
-    IXpsOMTileBrush* This,
-    XPS_TILE_MODE tileMode);
-void __RPC_STUB IXpsOMTileBrush_SetTileMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMTileBrush_INTERFACE_DEFINED__ */
 
@@ -10221,77 +7815,78 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMGradientBrush* This);
+        IXpsOMGradientBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMGradientBrush* This);
+        IXpsOMGradientBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         FLOAT opacity);
 
     /*** IXpsOMGradientBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGradientStops)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         IXpsOMGradientStopCollection **gradientStops);
 
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         IXpsOMMatrixTransform *transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetSpreadMethod)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         XPS_SPREAD_METHOD *spreadMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetSpreadMethod)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         XPS_SPREAD_METHOD spreadMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetColorInterpolationMode)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         XPS_COLOR_INTERPOLATION *colorInterpolationMode);
 
     HRESULT (STDMETHODCALLTYPE *SetColorInterpolationMode)(
-        IXpsOMGradientBrush* This,
+        IXpsOMGradientBrush *This,
         XPS_COLOR_INTERPOLATION colorInterpolationMode);
 
     END_INTERFACE
 } IXpsOMGradientBrushVtbl;
+
 interface IXpsOMGradientBrush {
     CONST_VTBL IXpsOMGradientBrushVtbl* lpVtbl;
 };
@@ -10380,86 +7975,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetGradientStops_Proxy(
-    IXpsOMGradientBrush* This,
-    IXpsOMGradientStopCollection **gradientStops);
-void __RPC_STUB IXpsOMGradientBrush_GetGradientStops_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetTransform_Proxy(
-    IXpsOMGradientBrush* This,
-    IXpsOMMatrixTransform **transform);
-void __RPC_STUB IXpsOMGradientBrush_GetTransform_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetTransformLocal_Proxy(
-    IXpsOMGradientBrush* This,
-    IXpsOMMatrixTransform **transform);
-void __RPC_STUB IXpsOMGradientBrush_GetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetTransformLocal_Proxy(
-    IXpsOMGradientBrush* This,
-    IXpsOMMatrixTransform *transform);
-void __RPC_STUB IXpsOMGradientBrush_SetTransformLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetTransformLookup_Proxy(
-    IXpsOMGradientBrush* This,
-    LPWSTR *key);
-void __RPC_STUB IXpsOMGradientBrush_GetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetTransformLookup_Proxy(
-    IXpsOMGradientBrush* This,
-    LPCWSTR key);
-void __RPC_STUB IXpsOMGradientBrush_SetTransformLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetSpreadMethod_Proxy(
-    IXpsOMGradientBrush* This,
-    XPS_SPREAD_METHOD *spreadMethod);
-void __RPC_STUB IXpsOMGradientBrush_GetSpreadMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetSpreadMethod_Proxy(
-    IXpsOMGradientBrush* This,
-    XPS_SPREAD_METHOD spreadMethod);
-void __RPC_STUB IXpsOMGradientBrush_SetSpreadMethod_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_GetColorInterpolationMode_Proxy(
-    IXpsOMGradientBrush* This,
-    XPS_COLOR_INTERPOLATION *colorInterpolationMode);
-void __RPC_STUB IXpsOMGradientBrush_GetColorInterpolationMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMGradientBrush_SetColorInterpolationMode_Proxy(
-    IXpsOMGradientBrush* This,
-    XPS_COLOR_INTERPOLATION colorInterpolationMode);
-void __RPC_STUB IXpsOMGradientBrush_SetColorInterpolationMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMGradientBrush_INTERFACE_DEFINED__ */
 
@@ -10502,106 +8017,107 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMVisualBrush* This);
+        IXpsOMVisualBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMVisualBrush* This);
+        IXpsOMVisualBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         FLOAT opacity);
 
     /*** IXpsOMTileBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IXpsOMMatrixTransform *transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetViewbox)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         XPS_RECT *viewbox);
 
     HRESULT (STDMETHODCALLTYPE *SetViewbox)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         const XPS_RECT *viewbox);
 
     HRESULT (STDMETHODCALLTYPE *GetViewport)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         XPS_RECT *viewport);
 
     HRESULT (STDMETHODCALLTYPE *SetViewport)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         const XPS_RECT *viewport);
 
     HRESULT (STDMETHODCALLTYPE *GetTileMode)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         XPS_TILE_MODE *tileMode);
 
     HRESULT (STDMETHODCALLTYPE *SetTileMode)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         XPS_TILE_MODE tileMode);
 
     /*** IXpsOMVisualBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetVisual)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IXpsOMVisual **visual);
 
     HRESULT (STDMETHODCALLTYPE *GetVisualLocal)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IXpsOMVisual **visual);
 
     HRESULT (STDMETHODCALLTYPE *SetVisualLocal)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IXpsOMVisual *visual);
 
     HRESULT (STDMETHODCALLTYPE *GetVisualLookup)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         LPWSTR *lookup);
 
     HRESULT (STDMETHODCALLTYPE *SetVisualLookup)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         LPCWSTR lookup);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMVisualBrush* This,
+        IXpsOMVisualBrush *This,
         IXpsOMVisualBrush **visualBrush);
 
     END_INTERFACE
 } IXpsOMVisualBrushVtbl;
+
 interface IXpsOMVisualBrush {
     CONST_VTBL IXpsOMVisualBrushVtbl* lpVtbl;
 };
@@ -10720,54 +8236,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_GetVisual_Proxy(
-    IXpsOMVisualBrush* This,
-    IXpsOMVisual **visual);
-void __RPC_STUB IXpsOMVisualBrush_GetVisual_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_GetVisualLocal_Proxy(
-    IXpsOMVisualBrush* This,
-    IXpsOMVisual **visual);
-void __RPC_STUB IXpsOMVisualBrush_GetVisualLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_SetVisualLocal_Proxy(
-    IXpsOMVisualBrush* This,
-    IXpsOMVisual *visual);
-void __RPC_STUB IXpsOMVisualBrush_SetVisualLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_GetVisualLookup_Proxy(
-    IXpsOMVisualBrush* This,
-    LPWSTR *lookup);
-void __RPC_STUB IXpsOMVisualBrush_GetVisualLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_SetVisualLookup_Proxy(
-    IXpsOMVisualBrush* This,
-    LPCWSTR lookup);
-void __RPC_STUB IXpsOMVisualBrush_SetVisualLookup_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMVisualBrush_Clone_Proxy(
-    IXpsOMVisualBrush* This,
-    IXpsOMVisualBrush **visualBrush);
-void __RPC_STUB IXpsOMVisualBrush_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMVisualBrush_INTERFACE_DEFINED__ */
 
@@ -10807,102 +8275,103 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMImageBrush* This);
+        IXpsOMImageBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMImageBrush* This);
+        IXpsOMImageBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         FLOAT opacity);
 
     /*** IXpsOMTileBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMMatrixTransform *transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetViewbox)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         XPS_RECT *viewbox);
 
     HRESULT (STDMETHODCALLTYPE *SetViewbox)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         const XPS_RECT *viewbox);
 
     HRESULT (STDMETHODCALLTYPE *GetViewport)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         XPS_RECT *viewport);
 
     HRESULT (STDMETHODCALLTYPE *SetViewport)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         const XPS_RECT *viewport);
 
     HRESULT (STDMETHODCALLTYPE *GetTileMode)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         XPS_TILE_MODE *tileMode);
 
     HRESULT (STDMETHODCALLTYPE *SetTileMode)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         XPS_TILE_MODE tileMode);
 
     /*** IXpsOMImageBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetImageResource)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMImageResource **imageResource);
 
     HRESULT (STDMETHODCALLTYPE *SetImageResource)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMImageResource *imageResource);
 
     HRESULT (STDMETHODCALLTYPE *GetColorProfileResource)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMColorProfileResource **colorProfileResource);
 
     HRESULT (STDMETHODCALLTYPE *SetColorProfileResource)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMColorProfileResource *colorProfileResource);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMImageBrush* This,
+        IXpsOMImageBrush *This,
         IXpsOMImageBrush **imageBrush);
 
     END_INTERFACE
 } IXpsOMImageBrushVtbl;
+
 interface IXpsOMImageBrush {
     CONST_VTBL IXpsOMImageBrushVtbl* lpVtbl;
 };
@@ -11017,46 +8486,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_GetImageResource_Proxy(
-    IXpsOMImageBrush* This,
-    IXpsOMImageResource **imageResource);
-void __RPC_STUB IXpsOMImageBrush_GetImageResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_SetImageResource_Proxy(
-    IXpsOMImageBrush* This,
-    IXpsOMImageResource *imageResource);
-void __RPC_STUB IXpsOMImageBrush_SetImageResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_GetColorProfileResource_Proxy(
-    IXpsOMImageBrush* This,
-    IXpsOMColorProfileResource **colorProfileResource);
-void __RPC_STUB IXpsOMImageBrush_GetColorProfileResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_SetColorProfileResource_Proxy(
-    IXpsOMImageBrush* This,
-    IXpsOMColorProfileResource *colorProfileResource);
-void __RPC_STUB IXpsOMImageBrush_SetColorProfileResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageBrush_Clone_Proxy(
-    IXpsOMImageBrush* This,
-    IXpsOMImageBrush **imageBrush);
-void __RPC_STUB IXpsOMImageBrush_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMImageBrush_INTERFACE_DEFINED__ */
 
@@ -11096,98 +8525,99 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMLinearGradientBrush* This);
+        IXpsOMLinearGradientBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMLinearGradientBrush* This);
+        IXpsOMLinearGradientBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         FLOAT opacity);
 
     /*** IXpsOMGradientBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGradientStops)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         IXpsOMGradientStopCollection **gradientStops);
 
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         IXpsOMMatrixTransform *transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetSpreadMethod)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         XPS_SPREAD_METHOD *spreadMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetSpreadMethod)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         XPS_SPREAD_METHOD spreadMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetColorInterpolationMode)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         XPS_COLOR_INTERPOLATION *colorInterpolationMode);
 
     HRESULT (STDMETHODCALLTYPE *SetColorInterpolationMode)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         XPS_COLOR_INTERPOLATION colorInterpolationMode);
 
     /*** IXpsOMLinearGradientBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStartPoint)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         XPS_POINT *startPoint);
 
     HRESULT (STDMETHODCALLTYPE *SetStartPoint)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         const XPS_POINT *startPoint);
 
     HRESULT (STDMETHODCALLTYPE *GetEndPoint)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         XPS_POINT *endPoint);
 
     HRESULT (STDMETHODCALLTYPE *SetEndPoint)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         const XPS_POINT *endPoint);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMLinearGradientBrush* This,
+        IXpsOMLinearGradientBrush *This,
         IXpsOMLinearGradientBrush **linearGradientBrush);
 
     END_INTERFACE
 } IXpsOMLinearGradientBrushVtbl;
+
 interface IXpsOMLinearGradientBrush {
     CONST_VTBL IXpsOMLinearGradientBrushVtbl* lpVtbl;
 };
@@ -11298,46 +8728,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_GetStartPoint_Proxy(
-    IXpsOMLinearGradientBrush* This,
-    XPS_POINT *startPoint);
-void __RPC_STUB IXpsOMLinearGradientBrush_GetStartPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_SetStartPoint_Proxy(
-    IXpsOMLinearGradientBrush* This,
-    const XPS_POINT *startPoint);
-void __RPC_STUB IXpsOMLinearGradientBrush_SetStartPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_GetEndPoint_Proxy(
-    IXpsOMLinearGradientBrush* This,
-    XPS_POINT *endPoint);
-void __RPC_STUB IXpsOMLinearGradientBrush_GetEndPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_SetEndPoint_Proxy(
-    IXpsOMLinearGradientBrush* This,
-    const XPS_POINT *endPoint);
-void __RPC_STUB IXpsOMLinearGradientBrush_SetEndPoint_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMLinearGradientBrush_Clone_Proxy(
-    IXpsOMLinearGradientBrush* This,
-    IXpsOMLinearGradientBrush **linearGradientBrush);
-void __RPC_STUB IXpsOMLinearGradientBrush_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMLinearGradientBrush_INTERFACE_DEFINED__ */
 
@@ -11383,106 +8773,107 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMRadialGradientBrush* This);
+        IXpsOMRadialGradientBrush *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMRadialGradientBrush* This);
+        IXpsOMRadialGradientBrush *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         FLOAT opacity);
 
     /*** IXpsOMGradientBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetGradientStops)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         IXpsOMGradientStopCollection **gradientStops);
 
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         IXpsOMMatrixTransform *transform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetSpreadMethod)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_SPREAD_METHOD *spreadMethod);
 
     HRESULT (STDMETHODCALLTYPE *SetSpreadMethod)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_SPREAD_METHOD spreadMethod);
 
     HRESULT (STDMETHODCALLTYPE *GetColorInterpolationMode)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_COLOR_INTERPOLATION *colorInterpolationMode);
 
     HRESULT (STDMETHODCALLTYPE *SetColorInterpolationMode)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_COLOR_INTERPOLATION colorInterpolationMode);
 
     /*** IXpsOMRadialGradientBrush methods ***/
     HRESULT (STDMETHODCALLTYPE *GetCenter)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_POINT *center);
 
     HRESULT (STDMETHODCALLTYPE *SetCenter)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         const XPS_POINT *center);
 
     HRESULT (STDMETHODCALLTYPE *GetRadiiSizes)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_SIZE *radiiSizes);
 
     HRESULT (STDMETHODCALLTYPE *SetRadiiSizes)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         const XPS_SIZE *radiiSizes);
 
     HRESULT (STDMETHODCALLTYPE *GetGradientOrigin)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         XPS_POINT *origin);
 
     HRESULT (STDMETHODCALLTYPE *SetGradientOrigin)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         const XPS_POINT *origin);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMRadialGradientBrush* This,
+        IXpsOMRadialGradientBrush *This,
         IXpsOMRadialGradientBrush **radialGradientBrush);
 
     END_INTERFACE
 } IXpsOMRadialGradientBrushVtbl;
+
 interface IXpsOMRadialGradientBrush {
     CONST_VTBL IXpsOMRadialGradientBrushVtbl* lpVtbl;
 };
@@ -11601,62 +8992,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_GetCenter_Proxy(
-    IXpsOMRadialGradientBrush* This,
-    XPS_POINT *center);
-void __RPC_STUB IXpsOMRadialGradientBrush_GetCenter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_SetCenter_Proxy(
-    IXpsOMRadialGradientBrush* This,
-    const XPS_POINT *center);
-void __RPC_STUB IXpsOMRadialGradientBrush_SetCenter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_GetRadiiSizes_Proxy(
-    IXpsOMRadialGradientBrush* This,
-    XPS_SIZE *radiiSizes);
-void __RPC_STUB IXpsOMRadialGradientBrush_GetRadiiSizes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_SetRadiiSizes_Proxy(
-    IXpsOMRadialGradientBrush* This,
-    const XPS_SIZE *radiiSizes);
-void __RPC_STUB IXpsOMRadialGradientBrush_SetRadiiSizes_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_GetGradientOrigin_Proxy(
-    IXpsOMRadialGradientBrush* This,
-    XPS_POINT *origin);
-void __RPC_STUB IXpsOMRadialGradientBrush_GetGradientOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_SetGradientOrigin_Proxy(
-    IXpsOMRadialGradientBrush* This,
-    const XPS_POINT *origin);
-void __RPC_STUB IXpsOMRadialGradientBrush_SetGradientOrigin_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRadialGradientBrush_Clone_Proxy(
-    IXpsOMRadialGradientBrush* This,
-    IXpsOMRadialGradientBrush **radialGradientBrush);
-void __RPC_STUB IXpsOMRadialGradientBrush_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMRadialGradientBrush_INTERFACE_DEFINED__ */
 
@@ -11681,27 +9016,28 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMResource* This,
+        IXpsOMResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMResource* This);
+        IXpsOMResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMResource* This);
+        IXpsOMResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMResource* This,
+        IXpsOMResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMResource* This,
+        IXpsOMResource *This,
         IOpcPartUri *partUri);
 
     END_INTERFACE
 } IXpsOMResourceVtbl;
+
 interface IXpsOMResource {
     CONST_VTBL IXpsOMResourceVtbl* lpVtbl;
 };
@@ -11773,42 +9109,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMFontResource* This,
+        IXpsOMFontResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMFontResource* This);
+        IXpsOMFontResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMFontResource* This);
+        IXpsOMFontResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMFontResource* This,
+        IXpsOMFontResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMFontResource* This,
+        IXpsOMFontResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMFontResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IXpsOMFontResource* This,
+        IXpsOMFontResource *This,
         IStream **readerStream);
 
     HRESULT (STDMETHODCALLTYPE *SetContent)(
-        IXpsOMFontResource* This,
+        IXpsOMFontResource *This,
         IStream *sourceStream,
         XPS_FONT_EMBEDDING embeddingOption,
         IOpcPartUri *partName);
 
     HRESULT (STDMETHODCALLTYPE *GetEmbeddingOption)(
-        IXpsOMFontResource* This,
+        IXpsOMFontResource *This,
         XPS_FONT_EMBEDDING *embeddingOption);
 
     END_INTERFACE
 } IXpsOMFontResourceVtbl;
+
 interface IXpsOMFontResource {
     CONST_VTBL IXpsOMFontResourceVtbl* lpVtbl;
 };
@@ -11859,32 +9196,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMFontResource_GetStream_Proxy(
-    IXpsOMFontResource* This,
-    IStream **readerStream);
-void __RPC_STUB IXpsOMFontResource_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResource_SetContent_Proxy(
-    IXpsOMFontResource* This,
-    IStream *sourceStream,
-    XPS_FONT_EMBEDDING embeddingOption,
-    IOpcPartUri *partName);
-void __RPC_STUB IXpsOMFontResource_SetContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMFontResource_GetEmbeddingOption_Proxy(
-    IXpsOMFontResource* This,
-    XPS_FONT_EMBEDDING *embeddingOption);
-void __RPC_STUB IXpsOMFontResource_GetEmbeddingOption_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMFontResource_INTERFACE_DEFINED__ */
 
@@ -11920,42 +9231,43 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMImageResource* This,
+        IXpsOMImageResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMImageResource* This);
+        IXpsOMImageResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMImageResource* This);
+        IXpsOMImageResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMImageResource* This,
+        IXpsOMImageResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMImageResource* This,
+        IXpsOMImageResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMImageResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IXpsOMImageResource* This,
+        IXpsOMImageResource *This,
         IStream **readerStream);
 
     HRESULT (STDMETHODCALLTYPE *SetContent)(
-        IXpsOMImageResource* This,
+        IXpsOMImageResource *This,
         IStream *sourceStream,
         XPS_IMAGE_TYPE imageType,
         IOpcPartUri *partName);
 
     HRESULT (STDMETHODCALLTYPE *GetImageType)(
-        IXpsOMImageResource* This,
+        IXpsOMImageResource *This,
         XPS_IMAGE_TYPE *imageType);
 
     END_INTERFACE
 } IXpsOMImageResourceVtbl;
+
 interface IXpsOMImageResource {
     CONST_VTBL IXpsOMImageResourceVtbl* lpVtbl;
 };
@@ -12006,32 +9318,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMImageResource_GetStream_Proxy(
-    IXpsOMImageResource* This,
-    IStream **readerStream);
-void __RPC_STUB IXpsOMImageResource_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResource_SetContent_Proxy(
-    IXpsOMImageResource* This,
-    IStream *sourceStream,
-    XPS_IMAGE_TYPE imageType,
-    IOpcPartUri *partName);
-void __RPC_STUB IXpsOMImageResource_SetContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMImageResource_GetImageType_Proxy(
-    IXpsOMImageResource* This,
-    XPS_IMAGE_TYPE *imageType);
-void __RPC_STUB IXpsOMImageResource_GetImageType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMImageResource_INTERFACE_DEFINED__ */
 
@@ -12063,37 +9349,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMColorProfileResource* This,
+        IXpsOMColorProfileResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMColorProfileResource* This);
+        IXpsOMColorProfileResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMColorProfileResource* This);
+        IXpsOMColorProfileResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMColorProfileResource* This,
+        IXpsOMColorProfileResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMColorProfileResource* This,
+        IXpsOMColorProfileResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMColorProfileResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IXpsOMColorProfileResource* This,
+        IXpsOMColorProfileResource *This,
         IStream **stream);
 
     HRESULT (STDMETHODCALLTYPE *SetContent)(
-        IXpsOMColorProfileResource* This,
+        IXpsOMColorProfileResource *This,
         IStream *sourceStream,
         IOpcPartUri *partName);
 
     END_INTERFACE
 } IXpsOMColorProfileResourceVtbl;
+
 interface IXpsOMColorProfileResource {
     CONST_VTBL IXpsOMColorProfileResourceVtbl* lpVtbl;
 };
@@ -12140,23 +9427,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResource_GetStream_Proxy(
-    IXpsOMColorProfileResource* This,
-    IStream **stream);
-void __RPC_STUB IXpsOMColorProfileResource_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMColorProfileResource_SetContent_Proxy(
-    IXpsOMColorProfileResource* This,
-    IStream *sourceStream,
-    IOpcPartUri *partName);
-void __RPC_STUB IXpsOMColorProfileResource_SetContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMColorProfileResource_INTERFACE_DEFINED__ */
 
@@ -12188,37 +9458,38 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPrintTicketResource* This,
+        IXpsOMPrintTicketResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPrintTicketResource* This);
+        IXpsOMPrintTicketResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPrintTicketResource* This);
+        IXpsOMPrintTicketResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMPrintTicketResource* This,
+        IXpsOMPrintTicketResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMPrintTicketResource* This,
+        IXpsOMPrintTicketResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMPrintTicketResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IXpsOMPrintTicketResource* This,
+        IXpsOMPrintTicketResource *This,
         IStream **stream);
 
     HRESULT (STDMETHODCALLTYPE *SetContent)(
-        IXpsOMPrintTicketResource* This,
+        IXpsOMPrintTicketResource *This,
         IStream *sourceStream,
         IOpcPartUri *partName);
 
     END_INTERFACE
 } IXpsOMPrintTicketResourceVtbl;
+
 interface IXpsOMPrintTicketResource {
     CONST_VTBL IXpsOMPrintTicketResourceVtbl* lpVtbl;
 };
@@ -12265,23 +9536,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPrintTicketResource_GetStream_Proxy(
-    IXpsOMPrintTicketResource* This,
-    IStream **stream);
-void __RPC_STUB IXpsOMPrintTicketResource_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPrintTicketResource_SetContent_Proxy(
-    IXpsOMPrintTicketResource* This,
-    IStream *sourceStream,
-    IOpcPartUri *partName);
-void __RPC_STUB IXpsOMPrintTicketResource_SetContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPrintTicketResource_INTERFACE_DEFINED__ */
 
@@ -12312,36 +9566,37 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMRemoteDictionaryResource* This,
+        IXpsOMRemoteDictionaryResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMRemoteDictionaryResource* This);
+        IXpsOMRemoteDictionaryResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMRemoteDictionaryResource* This);
+        IXpsOMRemoteDictionaryResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMRemoteDictionaryResource* This,
+        IXpsOMRemoteDictionaryResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMRemoteDictionaryResource* This,
+        IXpsOMRemoteDictionaryResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMRemoteDictionaryResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDictionary)(
-        IXpsOMRemoteDictionaryResource* This,
+        IXpsOMRemoteDictionaryResource *This,
         IXpsOMDictionary **dictionary);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionary)(
-        IXpsOMRemoteDictionaryResource* This,
+        IXpsOMRemoteDictionaryResource *This,
         IXpsOMDictionary *dictionary);
 
     END_INTERFACE
 } IXpsOMRemoteDictionaryResourceVtbl;
+
 interface IXpsOMRemoteDictionaryResource {
     CONST_VTBL IXpsOMRemoteDictionaryResourceVtbl* lpVtbl;
 };
@@ -12388,22 +9643,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource_GetDictionary_Proxy(
-    IXpsOMRemoteDictionaryResource* This,
-    IXpsOMDictionary **dictionary);
-void __RPC_STUB IXpsOMRemoteDictionaryResource_GetDictionary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource_SetDictionary_Proxy(
-    IXpsOMRemoteDictionaryResource* This,
-    IXpsOMDictionary *dictionary);
-void __RPC_STUB IXpsOMRemoteDictionaryResource_SetDictionary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMRemoteDictionaryResource_INTERFACE_DEFINED__ */
 
@@ -12438,41 +9677,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMDocumentStructureResource* This,
+        IXpsOMDocumentStructureResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMDocumentStructureResource* This);
+        IXpsOMDocumentStructureResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMDocumentStructureResource* This);
+        IXpsOMDocumentStructureResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMDocumentStructureResource* This,
+        IXpsOMDocumentStructureResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMDocumentStructureResource* This,
+        IXpsOMDocumentStructureResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMDocumentStructureResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMDocumentStructureResource* This,
+        IXpsOMDocumentStructureResource *This,
         IXpsOMDocument **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IXpsOMDocumentStructureResource* This,
+        IXpsOMDocumentStructureResource *This,
         IStream **stream);
 
     HRESULT (STDMETHODCALLTYPE *SetContent)(
-        IXpsOMDocumentStructureResource* This,
+        IXpsOMDocumentStructureResource *This,
         IStream *sourceStream,
         IOpcPartUri *partName);
 
     END_INTERFACE
 } IXpsOMDocumentStructureResourceVtbl;
+
 interface IXpsOMDocumentStructureResource {
     CONST_VTBL IXpsOMDocumentStructureResourceVtbl* lpVtbl;
 };
@@ -12523,31 +9763,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentStructureResource_GetOwner_Proxy(
-    IXpsOMDocumentStructureResource* This,
-    IXpsOMDocument **owner);
-void __RPC_STUB IXpsOMDocumentStructureResource_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentStructureResource_GetStream_Proxy(
-    IXpsOMDocumentStructureResource* This,
-    IStream **stream);
-void __RPC_STUB IXpsOMDocumentStructureResource_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentStructureResource_SetContent_Proxy(
-    IXpsOMDocumentStructureResource* This,
-    IStream *sourceStream,
-    IOpcPartUri *partName);
-void __RPC_STUB IXpsOMDocumentStructureResource_SetContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMDocumentStructureResource_INTERFACE_DEFINED__ */
 
@@ -12582,41 +9797,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMStoryFragmentsResource* This,
+        IXpsOMStoryFragmentsResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMStoryFragmentsResource* This);
+        IXpsOMStoryFragmentsResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMStoryFragmentsResource* This);
+        IXpsOMStoryFragmentsResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMStoryFragmentsResource* This,
+        IXpsOMStoryFragmentsResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMStoryFragmentsResource* This,
+        IXpsOMStoryFragmentsResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMStoryFragmentsResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMStoryFragmentsResource* This,
+        IXpsOMStoryFragmentsResource *This,
         IXpsOMPageReference **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IXpsOMStoryFragmentsResource* This,
+        IXpsOMStoryFragmentsResource *This,
         IStream **stream);
 
     HRESULT (STDMETHODCALLTYPE *SetContent)(
-        IXpsOMStoryFragmentsResource* This,
+        IXpsOMStoryFragmentsResource *This,
         IStream *sourceStream,
         IOpcPartUri *partName);
 
     END_INTERFACE
 } IXpsOMStoryFragmentsResourceVtbl;
+
 interface IXpsOMStoryFragmentsResource {
     CONST_VTBL IXpsOMStoryFragmentsResourceVtbl* lpVtbl;
 };
@@ -12667,31 +9883,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMStoryFragmentsResource_GetOwner_Proxy(
-    IXpsOMStoryFragmentsResource* This,
-    IXpsOMPageReference **owner);
-void __RPC_STUB IXpsOMStoryFragmentsResource_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMStoryFragmentsResource_GetStream_Proxy(
-    IXpsOMStoryFragmentsResource* This,
-    IStream **stream);
-void __RPC_STUB IXpsOMStoryFragmentsResource_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMStoryFragmentsResource_SetContent_Proxy(
-    IXpsOMStoryFragmentsResource* This,
-    IStream *sourceStream,
-    IOpcPartUri *partName);
-void __RPC_STUB IXpsOMStoryFragmentsResource_SetContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMStoryFragmentsResource_INTERFACE_DEFINED__ */
 
@@ -12726,41 +9917,42 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMSignatureBlockResource* This,
+        IXpsOMSignatureBlockResource *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMSignatureBlockResource* This);
+        IXpsOMSignatureBlockResource *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMSignatureBlockResource* This);
+        IXpsOMSignatureBlockResource *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMSignatureBlockResource* This,
+        IXpsOMSignatureBlockResource *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMSignatureBlockResource* This,
+        IXpsOMSignatureBlockResource *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMSignatureBlockResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMSignatureBlockResource* This,
+        IXpsOMSignatureBlockResource *This,
         IXpsOMDocument **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetStream)(
-        IXpsOMSignatureBlockResource* This,
+        IXpsOMSignatureBlockResource *This,
         IStream **stream);
 
     HRESULT (STDMETHODCALLTYPE *SetContent)(
-        IXpsOMSignatureBlockResource* This,
+        IXpsOMSignatureBlockResource *This,
         IStream *sourceStream,
         IOpcPartUri *partName);
 
     END_INTERFACE
 } IXpsOMSignatureBlockResourceVtbl;
+
 interface IXpsOMSignatureBlockResource {
     CONST_VTBL IXpsOMSignatureBlockResourceVtbl* lpVtbl;
 };
@@ -12811,31 +10003,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResource_GetOwner_Proxy(
-    IXpsOMSignatureBlockResource* This,
-    IXpsOMDocument **owner);
-void __RPC_STUB IXpsOMSignatureBlockResource_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResource_GetStream_Proxy(
-    IXpsOMSignatureBlockResource* This,
-    IStream **stream);
-void __RPC_STUB IXpsOMSignatureBlockResource_GetStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMSignatureBlockResource_SetContent_Proxy(
-    IXpsOMSignatureBlockResource* This,
-    IStream *sourceStream,
-    IOpcPartUri *partName);
-void __RPC_STUB IXpsOMSignatureBlockResource_SetContent_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMSignatureBlockResource_INTERFACE_DEFINED__ */
 
@@ -12899,181 +10066,182 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMCanvas* This);
+        IXpsOMCanvas *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMCanvas* This);
+        IXpsOMCanvas *This);
 
     /*** IXpsOMShareable methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IUnknown **owner);
 
     HRESULT (STDMETHODCALLTYPE *GetType)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         XPS_OBJECT_TYPE *type);
 
     /*** IXpsOMVisual methods ***/
     HRESULT (STDMETHODCALLTYPE *GetTransform)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMMatrixTransform **matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMMatrixTransform *matrixTransform);
 
     HRESULT (STDMETHODCALLTYPE *GetTransformLookup)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetTransformLookup)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometry)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMGeometry **clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMGeometry *clipGeometry);
 
     HRESULT (STDMETHODCALLTYPE *GetClipGeometryLookup)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetClipGeometryLookup)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacity)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         FLOAT *opacity);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacity)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         FLOAT opacity);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrush)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMBrush **opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMBrush *opacityMaskBrush);
 
     HRESULT (STDMETHODCALLTYPE *GetOpacityMaskBrushLookup)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *SetOpacityMaskBrushLookup)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPCWSTR key);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPWSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPCWSTR name);
 
     HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         WINBOOL *isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         WINBOOL isHyperlink);
 
     HRESULT (STDMETHODCALLTYPE *GetHyperlinkNavigateUri)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IUri **hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *SetHyperlinkNavigateUri)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IUri *hyperlinkUri);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPWSTR *language);
 
     HRESULT (STDMETHODCALLTYPE *SetLanguage)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPCWSTR language);
 
     /*** IXpsOMCanvas methods ***/
     HRESULT (STDMETHODCALLTYPE *GetVisuals)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMVisualCollection **visuals);
 
     HRESULT (STDMETHODCALLTYPE *GetUseAliasedEdgeMode)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         WINBOOL *useAliasedEdgeMode);
 
     HRESULT (STDMETHODCALLTYPE *SetUseAliasedEdgeMode)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         WINBOOL useAliasedEdgeMode);
 
     HRESULT (STDMETHODCALLTYPE *GetAccessibilityShortDescription)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPWSTR *shortDescription);
 
     HRESULT (STDMETHODCALLTYPE *SetAccessibilityShortDescription)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPCWSTR shortDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetAccessibilityLongDescription)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPWSTR *longDescription);
 
     HRESULT (STDMETHODCALLTYPE *SetAccessibilityLongDescription)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         LPCWSTR longDescription);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionary)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMDictionary **resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionaryLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMDictionary **resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionaryLocal)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMDictionary *resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionaryResource)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionaryResource)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMRemoteDictionaryResource *remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMCanvas* This,
+        IXpsOMCanvas *This,
         IXpsOMCanvas **canvas);
 
     END_INTERFACE
 } IXpsOMCanvasVtbl;
+
 interface IXpsOMCanvas {
     CONST_VTBL IXpsOMCanvasVtbl* lpVtbl;
 };
@@ -13266,110 +10434,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetVisuals_Proxy(
-    IXpsOMCanvas* This,
-    IXpsOMVisualCollection **visuals);
-void __RPC_STUB IXpsOMCanvas_GetVisuals_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetUseAliasedEdgeMode_Proxy(
-    IXpsOMCanvas* This,
-    WINBOOL *useAliasedEdgeMode);
-void __RPC_STUB IXpsOMCanvas_GetUseAliasedEdgeMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetUseAliasedEdgeMode_Proxy(
-    IXpsOMCanvas* This,
-    WINBOOL useAliasedEdgeMode);
-void __RPC_STUB IXpsOMCanvas_SetUseAliasedEdgeMode_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetAccessibilityShortDescription_Proxy(
-    IXpsOMCanvas* This,
-    LPWSTR *shortDescription);
-void __RPC_STUB IXpsOMCanvas_GetAccessibilityShortDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetAccessibilityShortDescription_Proxy(
-    IXpsOMCanvas* This,
-    LPCWSTR shortDescription);
-void __RPC_STUB IXpsOMCanvas_SetAccessibilityShortDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetAccessibilityLongDescription_Proxy(
-    IXpsOMCanvas* This,
-    LPWSTR *longDescription);
-void __RPC_STUB IXpsOMCanvas_GetAccessibilityLongDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetAccessibilityLongDescription_Proxy(
-    IXpsOMCanvas* This,
-    LPCWSTR longDescription);
-void __RPC_STUB IXpsOMCanvas_SetAccessibilityLongDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetDictionary_Proxy(
-    IXpsOMCanvas* This,
-    IXpsOMDictionary **resourceDictionary);
-void __RPC_STUB IXpsOMCanvas_GetDictionary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetDictionaryLocal_Proxy(
-    IXpsOMCanvas* This,
-    IXpsOMDictionary **resourceDictionary);
-void __RPC_STUB IXpsOMCanvas_GetDictionaryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetDictionaryLocal_Proxy(
-    IXpsOMCanvas* This,
-    IXpsOMDictionary *resourceDictionary);
-void __RPC_STUB IXpsOMCanvas_SetDictionaryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_GetDictionaryResource_Proxy(
-    IXpsOMCanvas* This,
-    IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
-void __RPC_STUB IXpsOMCanvas_GetDictionaryResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_SetDictionaryResource_Proxy(
-    IXpsOMCanvas* This,
-    IXpsOMRemoteDictionaryResource *remoteDictionaryResource);
-void __RPC_STUB IXpsOMCanvas_SetDictionaryResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCanvas_Clone_Proxy(
-    IXpsOMCanvas* This,
-    IXpsOMCanvas **canvas);
-void __RPC_STUB IXpsOMCanvas_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMCanvas_INTERFACE_DEFINED__ */
 
@@ -13462,118 +10526,119 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPage* This);
+        IXpsOMPage *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPage* This);
+        IXpsOMPage *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMPage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMPageReference **pageReference);
 
     HRESULT (STDMETHODCALLTYPE *GetVisuals)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMVisualCollection **visuals);
 
     HRESULT (STDMETHODCALLTYPE *GetPageDimensions)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         XPS_SIZE *pageDimensions);
 
     HRESULT (STDMETHODCALLTYPE *SetPageDimensions)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         const XPS_SIZE *pageDimensions);
 
     HRESULT (STDMETHODCALLTYPE *GetContentBox)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         XPS_RECT *contentBox);
 
     HRESULT (STDMETHODCALLTYPE *SetContentBox)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         const XPS_RECT *contentBox);
 
     HRESULT (STDMETHODCALLTYPE *GetBleedBox)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         XPS_RECT *bleedBox);
 
     HRESULT (STDMETHODCALLTYPE *SetBleedBox)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         const XPS_RECT *bleedBox);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         LPWSTR *language);
 
     HRESULT (STDMETHODCALLTYPE *SetLanguage)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         LPCWSTR language);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         LPWSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         LPCWSTR name);
 
     HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         WINBOOL *isHyperlinkTarget);
 
     HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         WINBOOL isHyperlinkTarget);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionary)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMDictionary **resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionaryLocal)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMDictionary **resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionaryLocal)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMDictionary *resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionaryResource)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionaryResource)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMRemoteDictionaryResource *remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         ISequentialStream *stream,
         WINBOOL optimizeMarkupSize);
 
     HRESULT (STDMETHODCALLTYPE *GenerateUnusedLookupKey)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         XPS_OBJECT_TYPE type,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMPage* This,
+        IXpsOMPage *This,
         IXpsOMPage **page);
 
     END_INTERFACE
 } IXpsOMPageVtbl;
+
 interface IXpsOMPage {
     CONST_VTBL IXpsOMPageVtbl* lpVtbl;
 };
@@ -13700,184 +10765,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetOwner_Proxy(
-    IXpsOMPage* This,
-    IXpsOMPageReference **pageReference);
-void __RPC_STUB IXpsOMPage_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetVisuals_Proxy(
-    IXpsOMPage* This,
-    IXpsOMVisualCollection **visuals);
-void __RPC_STUB IXpsOMPage_GetVisuals_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetPageDimensions_Proxy(
-    IXpsOMPage* This,
-    XPS_SIZE *pageDimensions);
-void __RPC_STUB IXpsOMPage_GetPageDimensions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetPageDimensions_Proxy(
-    IXpsOMPage* This,
-    const XPS_SIZE *pageDimensions);
-void __RPC_STUB IXpsOMPage_SetPageDimensions_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetContentBox_Proxy(
-    IXpsOMPage* This,
-    XPS_RECT *contentBox);
-void __RPC_STUB IXpsOMPage_GetContentBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetContentBox_Proxy(
-    IXpsOMPage* This,
-    const XPS_RECT *contentBox);
-void __RPC_STUB IXpsOMPage_SetContentBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetBleedBox_Proxy(
-    IXpsOMPage* This,
-    XPS_RECT *bleedBox);
-void __RPC_STUB IXpsOMPage_GetBleedBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetBleedBox_Proxy(
-    IXpsOMPage* This,
-    const XPS_RECT *bleedBox);
-void __RPC_STUB IXpsOMPage_SetBleedBox_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetLanguage_Proxy(
-    IXpsOMPage* This,
-    LPWSTR *language);
-void __RPC_STUB IXpsOMPage_GetLanguage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetLanguage_Proxy(
-    IXpsOMPage* This,
-    LPCWSTR language);
-void __RPC_STUB IXpsOMPage_SetLanguage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetName_Proxy(
-    IXpsOMPage* This,
-    LPWSTR *name);
-void __RPC_STUB IXpsOMPage_GetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetName_Proxy(
-    IXpsOMPage* This,
-    LPCWSTR name);
-void __RPC_STUB IXpsOMPage_SetName_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetIsHyperlinkTarget_Proxy(
-    IXpsOMPage* This,
-    WINBOOL *isHyperlinkTarget);
-void __RPC_STUB IXpsOMPage_GetIsHyperlinkTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetIsHyperlinkTarget_Proxy(
-    IXpsOMPage* This,
-    WINBOOL isHyperlinkTarget);
-void __RPC_STUB IXpsOMPage_SetIsHyperlinkTarget_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetDictionary_Proxy(
-    IXpsOMPage* This,
-    IXpsOMDictionary **resourceDictionary);
-void __RPC_STUB IXpsOMPage_GetDictionary_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetDictionaryLocal_Proxy(
-    IXpsOMPage* This,
-    IXpsOMDictionary **resourceDictionary);
-void __RPC_STUB IXpsOMPage_GetDictionaryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetDictionaryLocal_Proxy(
-    IXpsOMPage* This,
-    IXpsOMDictionary *resourceDictionary);
-void __RPC_STUB IXpsOMPage_SetDictionaryLocal_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GetDictionaryResource_Proxy(
-    IXpsOMPage* This,
-    IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
-void __RPC_STUB IXpsOMPage_GetDictionaryResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_SetDictionaryResource_Proxy(
-    IXpsOMPage* This,
-    IXpsOMRemoteDictionaryResource *remoteDictionaryResource);
-void __RPC_STUB IXpsOMPage_SetDictionaryResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_Write_Proxy(
-    IXpsOMPage* This,
-    ISequentialStream *stream,
-    WINBOOL optimizeMarkupSize);
-void __RPC_STUB IXpsOMPage_Write_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_GenerateUnusedLookupKey_Proxy(
-    IXpsOMPage* This,
-    XPS_OBJECT_TYPE type,
-    LPWSTR *key);
-void __RPC_STUB IXpsOMPage_GenerateUnusedLookupKey_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage_Clone_Proxy(
-    IXpsOMPage* This,
-    IXpsOMPage **page);
-void __RPC_STUB IXpsOMPage_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPage_INTERFACE_DEFINED__ */
 
@@ -13926,60 +10813,61 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMDocument* This);
+        IXpsOMDocument *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMDocument* This);
+        IXpsOMDocument *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMDocument methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMDocumentSequence **documentSequence);
 
     HRESULT (STDMETHODCALLTYPE *GetPageReferences)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMPageReferenceCollection **pageReferences);
 
     HRESULT (STDMETHODCALLTYPE *GetPrintTicketResource)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMPrintTicketResource **printTicketResource);
 
     HRESULT (STDMETHODCALLTYPE *SetPrintTicketResource)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMPrintTicketResource *printTicketResource);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentStructureResource)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMDocumentStructureResource **documentStructureResource);
 
     HRESULT (STDMETHODCALLTYPE *SetDocumentStructureResource)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMDocumentStructureResource *documentStructureResource);
 
     HRESULT (STDMETHODCALLTYPE *GetSignatureBlockResources)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMSignatureBlockResourceCollection **signatureBlockResources);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMDocument* This,
+        IXpsOMDocument *This,
         IXpsOMDocument **document);
 
     END_INTERFACE
 } IXpsOMDocumentVtbl;
+
 interface IXpsOMDocument {
     CONST_VTBL IXpsOMDocumentVtbl* lpVtbl;
 };
@@ -14050,70 +10938,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetOwner_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMDocumentSequence **documentSequence);
-void __RPC_STUB IXpsOMDocument_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetPageReferences_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMPageReferenceCollection **pageReferences);
-void __RPC_STUB IXpsOMDocument_GetPageReferences_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetPrintTicketResource_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMPrintTicketResource **printTicketResource);
-void __RPC_STUB IXpsOMDocument_GetPrintTicketResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_SetPrintTicketResource_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMPrintTicketResource *printTicketResource);
-void __RPC_STUB IXpsOMDocument_SetPrintTicketResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetDocumentStructureResource_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMDocumentStructureResource **documentStructureResource);
-void __RPC_STUB IXpsOMDocument_GetDocumentStructureResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_SetDocumentStructureResource_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMDocumentStructureResource *documentStructureResource);
-void __RPC_STUB IXpsOMDocument_SetDocumentStructureResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_GetSignatureBlockResources_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMSignatureBlockResourceCollection **signatureBlockResources);
-void __RPC_STUB IXpsOMDocument_GetSignatureBlockResources_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocument_Clone_Proxy(
-    IXpsOMDocument* This,
-    IXpsOMDocument **document);
-void __RPC_STUB IXpsOMDocument_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMDocument_INTERFACE_DEFINED__ */
 
@@ -14150,44 +10974,45 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMDocumentSequence* This,
+        IXpsOMDocumentSequence *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMDocumentSequence* This);
+        IXpsOMDocumentSequence *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMDocumentSequence* This);
+        IXpsOMDocumentSequence *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMDocumentSequence* This,
+        IXpsOMDocumentSequence *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMDocumentSequence* This,
+        IXpsOMDocumentSequence *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMDocumentSequence methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMDocumentSequence* This,
+        IXpsOMDocumentSequence *This,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *GetDocuments)(
-        IXpsOMDocumentSequence* This,
+        IXpsOMDocumentSequence *This,
         IXpsOMDocumentCollection **documents);
 
     HRESULT (STDMETHODCALLTYPE *GetPrintTicketResource)(
-        IXpsOMDocumentSequence* This,
+        IXpsOMDocumentSequence *This,
         IXpsOMPrintTicketResource **printTicketResource);
 
     HRESULT (STDMETHODCALLTYPE *SetPrintTicketResource)(
-        IXpsOMDocumentSequence* This,
+        IXpsOMDocumentSequence *This,
         IXpsOMPrintTicketResource *printTicketResource);
 
     END_INTERFACE
 } IXpsOMDocumentSequenceVtbl;
+
 interface IXpsOMDocumentSequence {
     CONST_VTBL IXpsOMDocumentSequenceVtbl* lpVtbl;
 };
@@ -14242,38 +11067,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_GetOwner_Proxy(
-    IXpsOMDocumentSequence* This,
-    IXpsOMPackage **package);
-void __RPC_STUB IXpsOMDocumentSequence_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_GetDocuments_Proxy(
-    IXpsOMDocumentSequence* This,
-    IXpsOMDocumentCollection **documents);
-void __RPC_STUB IXpsOMDocumentSequence_GetDocuments_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_GetPrintTicketResource_Proxy(
-    IXpsOMDocumentSequence* This,
-    IXpsOMPrintTicketResource **printTicketResource);
-void __RPC_STUB IXpsOMDocumentSequence_GetPrintTicketResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMDocumentSequence_SetPrintTicketResource_Proxy(
-    IXpsOMDocumentSequence* This,
-    IXpsOMPrintTicketResource *printTicketResource);
-void __RPC_STUB IXpsOMDocumentSequence_SetPrintTicketResource_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMDocumentSequence_INTERFACE_DEFINED__ */
 
@@ -14400,164 +11193,165 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMCoreProperties* This);
+        IXpsOMCoreProperties *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMCoreProperties* This);
+        IXpsOMCoreProperties *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMCoreProperties methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *GetCategory)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *category);
 
     HRESULT (STDMETHODCALLTYPE *SetCategory)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR category);
 
     HRESULT (STDMETHODCALLTYPE *GetContentStatus)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *contentStatus);
 
     HRESULT (STDMETHODCALLTYPE *SetContentStatus)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR contentStatus);
 
     HRESULT (STDMETHODCALLTYPE *GetContentType)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *contentType);
 
     HRESULT (STDMETHODCALLTYPE *SetContentType)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR contentType);
 
     HRESULT (STDMETHODCALLTYPE *GetCreated)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         SYSTEMTIME *created);
 
     HRESULT (STDMETHODCALLTYPE *SetCreated)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         const SYSTEMTIME *created);
 
     HRESULT (STDMETHODCALLTYPE *GetCreator)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *creator);
 
     HRESULT (STDMETHODCALLTYPE *SetCreator)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR creator);
 
     HRESULT (STDMETHODCALLTYPE *GetDescription)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *description);
 
     HRESULT (STDMETHODCALLTYPE *SetDescription)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR description);
 
     HRESULT (STDMETHODCALLTYPE *GetIdentifier)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *identifier);
 
     HRESULT (STDMETHODCALLTYPE *SetIdentifier)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR identifier);
 
     HRESULT (STDMETHODCALLTYPE *GetKeywords)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *keywords);
 
     HRESULT (STDMETHODCALLTYPE *SetKeywords)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR keywords);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *language);
 
     HRESULT (STDMETHODCALLTYPE *SetLanguage)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR language);
 
     HRESULT (STDMETHODCALLTYPE *GetLastModifiedBy)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *lastModifiedBy);
 
     HRESULT (STDMETHODCALLTYPE *SetLastModifiedBy)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR lastModifiedBy);
 
     HRESULT (STDMETHODCALLTYPE *GetLastPrinted)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         SYSTEMTIME *lastPrinted);
 
     HRESULT (STDMETHODCALLTYPE *SetLastPrinted)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         const SYSTEMTIME *lastPrinted);
 
     HRESULT (STDMETHODCALLTYPE *GetModified)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         SYSTEMTIME *modified);
 
     HRESULT (STDMETHODCALLTYPE *SetModified)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         const SYSTEMTIME *modified);
 
     HRESULT (STDMETHODCALLTYPE *GetRevision)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *revision);
 
     HRESULT (STDMETHODCALLTYPE *SetRevision)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR revision);
 
     HRESULT (STDMETHODCALLTYPE *GetSubject)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *subject);
 
     HRESULT (STDMETHODCALLTYPE *SetSubject)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR subject);
 
     HRESULT (STDMETHODCALLTYPE *GetTitle)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *title);
 
     HRESULT (STDMETHODCALLTYPE *SetTitle)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR title);
 
     HRESULT (STDMETHODCALLTYPE *GetVersion)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPWSTR *version);
 
     HRESULT (STDMETHODCALLTYPE *SetVersion)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         LPCWSTR version);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMCoreProperties* This,
+        IXpsOMCoreProperties *This,
         IXpsOMCoreProperties **coreProperties);
 
     END_INTERFACE
 } IXpsOMCorePropertiesVtbl;
+
 interface IXpsOMCoreProperties {
     CONST_VTBL IXpsOMCorePropertiesVtbl* lpVtbl;
 };
@@ -14732,278 +11526,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetOwner_Proxy(
-    IXpsOMCoreProperties* This,
-    IXpsOMPackage **package);
-void __RPC_STUB IXpsOMCoreProperties_GetOwner_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetCategory_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *category);
-void __RPC_STUB IXpsOMCoreProperties_GetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetCategory_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR category);
-void __RPC_STUB IXpsOMCoreProperties_SetCategory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetContentStatus_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *contentStatus);
-void __RPC_STUB IXpsOMCoreProperties_GetContentStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetContentStatus_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR contentStatus);
-void __RPC_STUB IXpsOMCoreProperties_SetContentStatus_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetContentType_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *contentType);
-void __RPC_STUB IXpsOMCoreProperties_GetContentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetContentType_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR contentType);
-void __RPC_STUB IXpsOMCoreProperties_SetContentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetCreated_Proxy(
-    IXpsOMCoreProperties* This,
-    SYSTEMTIME *created);
-void __RPC_STUB IXpsOMCoreProperties_GetCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetCreated_Proxy(
-    IXpsOMCoreProperties* This,
-    const SYSTEMTIME *created);
-void __RPC_STUB IXpsOMCoreProperties_SetCreated_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetCreator_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *creator);
-void __RPC_STUB IXpsOMCoreProperties_GetCreator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetCreator_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR creator);
-void __RPC_STUB IXpsOMCoreProperties_SetCreator_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetDescription_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *description);
-void __RPC_STUB IXpsOMCoreProperties_GetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetDescription_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR description);
-void __RPC_STUB IXpsOMCoreProperties_SetDescription_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetIdentifier_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *identifier);
-void __RPC_STUB IXpsOMCoreProperties_GetIdentifier_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetIdentifier_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR identifier);
-void __RPC_STUB IXpsOMCoreProperties_SetIdentifier_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetKeywords_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *keywords);
-void __RPC_STUB IXpsOMCoreProperties_GetKeywords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetKeywords_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR keywords);
-void __RPC_STUB IXpsOMCoreProperties_SetKeywords_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetLanguage_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *language);
-void __RPC_STUB IXpsOMCoreProperties_GetLanguage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetLanguage_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR language);
-void __RPC_STUB IXpsOMCoreProperties_SetLanguage_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetLastModifiedBy_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *lastModifiedBy);
-void __RPC_STUB IXpsOMCoreProperties_GetLastModifiedBy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetLastModifiedBy_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR lastModifiedBy);
-void __RPC_STUB IXpsOMCoreProperties_SetLastModifiedBy_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetLastPrinted_Proxy(
-    IXpsOMCoreProperties* This,
-    SYSTEMTIME *lastPrinted);
-void __RPC_STUB IXpsOMCoreProperties_GetLastPrinted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetLastPrinted_Proxy(
-    IXpsOMCoreProperties* This,
-    const SYSTEMTIME *lastPrinted);
-void __RPC_STUB IXpsOMCoreProperties_SetLastPrinted_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetModified_Proxy(
-    IXpsOMCoreProperties* This,
-    SYSTEMTIME *modified);
-void __RPC_STUB IXpsOMCoreProperties_GetModified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetModified_Proxy(
-    IXpsOMCoreProperties* This,
-    const SYSTEMTIME *modified);
-void __RPC_STUB IXpsOMCoreProperties_SetModified_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetRevision_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *revision);
-void __RPC_STUB IXpsOMCoreProperties_GetRevision_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetRevision_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR revision);
-void __RPC_STUB IXpsOMCoreProperties_SetRevision_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetSubject_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *subject);
-void __RPC_STUB IXpsOMCoreProperties_GetSubject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetSubject_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR subject);
-void __RPC_STUB IXpsOMCoreProperties_SetSubject_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetTitle_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *title);
-void __RPC_STUB IXpsOMCoreProperties_GetTitle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetTitle_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR title);
-void __RPC_STUB IXpsOMCoreProperties_SetTitle_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_GetVersion_Proxy(
-    IXpsOMCoreProperties* This,
-    LPWSTR *version);
-void __RPC_STUB IXpsOMCoreProperties_GetVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_SetVersion_Proxy(
-    IXpsOMCoreProperties* This,
-    LPCWSTR version);
-void __RPC_STUB IXpsOMCoreProperties_SetVersion_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMCoreProperties_Clone_Proxy(
-    IXpsOMCoreProperties* This,
-    IXpsOMCoreProperties **coreProperties);
-void __RPC_STUB IXpsOMCoreProperties_Clone_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMCoreProperties_INTERFACE_DEFINED__ */
 
@@ -15037,19 +11559,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMThumbnailGenerator* This,
+        IXpsOMThumbnailGenerator *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMThumbnailGenerator* This);
+        IXpsOMThumbnailGenerator *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMThumbnailGenerator* This);
+        IXpsOMThumbnailGenerator *This);
 
     /*** IXpsOMThumbnailGenerator methods ***/
     HRESULT (STDMETHODCALLTYPE *GenerateThumbnail)(
-        IXpsOMThumbnailGenerator* This,
+        IXpsOMThumbnailGenerator *This,
         IXpsOMPage *page,
         XPS_IMAGE_TYPE thumbnailType,
         XPS_THUMBNAIL_SIZE thumbnailSize,
@@ -15058,6 +11580,7 @@
 
     END_INTERFACE
 } IXpsOMThumbnailGeneratorVtbl;
+
 interface IXpsOMThumbnailGenerator {
     CONST_VTBL IXpsOMThumbnailGeneratorVtbl* lpVtbl;
 };
@@ -15090,18 +11613,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMThumbnailGenerator_GenerateThumbnail_Proxy(
-    IXpsOMThumbnailGenerator* This,
-    IXpsOMPage *page,
-    XPS_IMAGE_TYPE thumbnailType,
-    XPS_THUMBNAIL_SIZE thumbnailSize,
-    IOpcPartUri *imageResourcePartName,
-    IXpsOMImageResource **imageResource);
-void __RPC_STUB IXpsOMThumbnailGenerator_GenerateThumbnail_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMThumbnailGenerator_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/xpsobjectmodel_1.h b/mingw-w64-headers/include/xpsobjectmodel_1.h
index f28b6b8..0a91816 100644
--- a/mingw-w64-headers/include/xpsobjectmodel_1.h
+++ b/mingw-w64-headers/include/xpsobjectmodel_1.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/xpsobjectmodel_1.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/xpsobjectmodel_1.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,26 +20,41 @@
 #ifndef __IXpsOMObjectFactory1_FWD_DEFINED__
 #define __IXpsOMObjectFactory1_FWD_DEFINED__
 typedef interface IXpsOMObjectFactory1 IXpsOMObjectFactory1;
+#ifdef __cplusplus
+interface IXpsOMObjectFactory1;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackage1_FWD_DEFINED__
 #define __IXpsOMPackage1_FWD_DEFINED__
 typedef interface IXpsOMPackage1 IXpsOMPackage1;
+#ifdef __cplusplus
+interface IXpsOMPackage1;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPage1_FWD_DEFINED__
 #define __IXpsOMPage1_FWD_DEFINED__
 typedef interface IXpsOMPage1 IXpsOMPage1;
+#ifdef __cplusplus
+interface IXpsOMPage1;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsDocumentPackageTarget_FWD_DEFINED__
 #define __IXpsDocumentPackageTarget_FWD_DEFINED__
 typedef interface IXpsDocumentPackageTarget IXpsDocumentPackageTarget;
+#ifdef __cplusplus
+interface IXpsDocumentPackageTarget;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMRemoteDictionaryResource1_FWD_DEFINED__
 #define __IXpsOMRemoteDictionaryResource1_FWD_DEFINED__
 typedef interface IXpsOMRemoteDictionaryResource1 IXpsOMRemoteDictionaryResource1;
+#ifdef __cplusplus
+interface IXpsOMRemoteDictionaryResource1;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -63,16 +78,25 @@
 #ifndef __IXpsOMObjectFactory1_FWD_DEFINED__
 #define __IXpsOMObjectFactory1_FWD_DEFINED__
 typedef interface IXpsOMObjectFactory1 IXpsOMObjectFactory1;
+#ifdef __cplusplus
+interface IXpsOMObjectFactory1;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPackage1_FWD_DEFINED__
 #define __IXpsOMPackage1_FWD_DEFINED__
 typedef interface IXpsOMPackage1 IXpsOMPackage1;
+#ifdef __cplusplus
+interface IXpsOMPackage1;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsOMPage1_FWD_DEFINED__
 #define __IXpsOMPage1_FWD_DEFINED__
 typedef interface IXpsOMPage1 IXpsOMPage1;
+#ifdef __cplusplus
+interface IXpsOMPage1;
+#endif /* __cplusplus */
 #endif
 
 typedef enum __WIDL_xpsobjectmodel_1_generated_name_00000038 {
@@ -173,92 +197,92 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMObjectFactory1* This);
+        IXpsOMObjectFactory1 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMObjectFactory1* This);
+        IXpsOMObjectFactory1 *This);
 
     /*** IXpsOMObjectFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreatePackage)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageFromFile)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         LPCWSTR filename,
         WINBOOL reuseObjects,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageFromStream)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *stream,
         WINBOOL reuseObjects,
         IXpsOMPackage **package);
 
     HRESULT (STDMETHODCALLTYPE *CreateStoryFragmentsResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMStoryFragmentsResource **storyFragmentsResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateDocumentStructureResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMDocumentStructureResource **documentStructureResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateSignatureBlockResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMSignatureBlockResource **signatureBlockResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMDictionary *dictionary,
         IOpcPartUri *partUri,
         IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResourceFromStream)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *dictionaryMarkupStream,
         IOpcPartUri *dictionaryPartUri,
         IXpsOMPartResources *resources,
         IXpsOMRemoteDictionaryResource **dictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *CreatePartResources)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMPartResources **partResources);
 
     HRESULT (STDMETHODCALLTYPE *CreateDocumentSequence)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IOpcPartUri *partUri,
         IXpsOMDocumentSequence **documentSequence);
 
     HRESULT (STDMETHODCALLTYPE *CreateDocument)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IOpcPartUri *partUri,
         IXpsOMDocument **document);
 
     HRESULT (STDMETHODCALLTYPE *CreatePageReference)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_SIZE *advisoryPageDimensions,
         IXpsOMPageReference **pageReference);
 
     HRESULT (STDMETHODCALLTYPE *CreatePage)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_SIZE *pageDimensions,
         LPCWSTR language,
         IOpcPartUri *partUri,
         IXpsOMPage **page);
 
     HRESULT (STDMETHODCALLTYPE *CreatePageFromStream)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *pageMarkupStream,
         IOpcPartUri *partUri,
         IXpsOMPartResources *resources,
@@ -266,72 +290,72 @@
         IXpsOMPage **page);
 
     HRESULT (STDMETHODCALLTYPE *CreateCanvas)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMCanvas **canvas);
 
     HRESULT (STDMETHODCALLTYPE *CreateGlyphs)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMFontResource *fontResource,
         IXpsOMGlyphs **glyphs);
 
     HRESULT (STDMETHODCALLTYPE *CreatePath)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMPath **path);
 
     HRESULT (STDMETHODCALLTYPE *CreateGeometry)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMGeometry **geometry);
 
     HRESULT (STDMETHODCALLTYPE *CreateGeometryFigure)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_POINT *startPoint,
         IXpsOMGeometryFigure **figure);
 
     HRESULT (STDMETHODCALLTYPE *CreateMatrixTransform)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_MATRIX *matrix,
         IXpsOMMatrixTransform **transform);
 
     HRESULT (STDMETHODCALLTYPE *CreateSolidColorBrush)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_COLOR *color,
         IXpsOMColorProfileResource *colorProfile,
         IXpsOMSolidColorBrush **solidColorBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateColorProfileResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMColorProfileResource **colorProfileResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateImageBrush)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMImageResource *image,
         const XPS_RECT *viewBox,
         const XPS_RECT *viewPort,
         IXpsOMImageBrush **imageBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateVisualBrush)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_RECT *viewBox,
         const XPS_RECT *viewPort,
         IXpsOMVisualBrush **visualBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateImageResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *acquiredStream,
         XPS_IMAGE_TYPE contentType,
         IOpcPartUri *partUri,
         IXpsOMImageResource **imageResource);
 
     HRESULT (STDMETHODCALLTYPE *CreatePrintTicketResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *acquiredStream,
         IOpcPartUri *partUri,
         IXpsOMPrintTicketResource **printTicketResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateFontResource)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *acquiredStream,
         XPS_FONT_EMBEDDING fontEmbedding,
         IOpcPartUri *partUri,
@@ -339,14 +363,14 @@
         IXpsOMFontResource **fontResource);
 
     HRESULT (STDMETHODCALLTYPE *CreateGradientStop)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_COLOR *color,
         IXpsOMColorProfileResource *colorProfile,
         FLOAT offset,
         IXpsOMGradientStop **gradientStop);
 
     HRESULT (STDMETHODCALLTYPE *CreateLinearGradientBrush)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMGradientStop *gradStop1,
         IXpsOMGradientStop *gradStop2,
         const XPS_POINT *startPoint,
@@ -354,7 +378,7 @@
         IXpsOMLinearGradientBrush **linearGradientBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateRadialGradientBrush)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMGradientStop *gradStop1,
         IXpsOMGradientStop *gradStop2,
         const XPS_POINT *centerPoint,
@@ -363,20 +387,20 @@
         IXpsOMRadialGradientBrush **radialGradientBrush);
 
     HRESULT (STDMETHODCALLTYPE *CreateCoreProperties)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IOpcPartUri *partUri,
         IXpsOMCoreProperties **coreProperties);
 
     HRESULT (STDMETHODCALLTYPE *CreateDictionary)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMDictionary **dictionary);
 
     HRESULT (STDMETHODCALLTYPE *CreatePartUriCollection)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMPartUriCollection **partUriCollection);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnFile)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         LPCWSTR fileName,
         LPSECURITY_ATTRIBUTES securityAttributes,
         DWORD flagsAndAttributes,
@@ -390,7 +414,7 @@
         IXpsOMPackageWriter **packageWriter);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnStream)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         ISequentialStream *outputStream,
         WINBOOL optimizeMarkupSize,
         XPS_INTERLEAVING interleaving,
@@ -402,36 +426,36 @@
         IXpsOMPackageWriter **packageWriter);
 
     HRESULT (STDMETHODCALLTYPE *CreatePartUri)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         LPCWSTR uri,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *CreateReadOnlyStreamOnFile)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         LPCWSTR filename,
         IStream **stream);
 
     /*** IXpsOMObjectFactory1 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDocumentTypeFromFile)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         LPCWSTR filename,
         XPS_DOCUMENT_TYPE *documentType);
 
     HRESULT (STDMETHODCALLTYPE *GetDocumentTypeFromStream)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *xpsDocumentStream,
         XPS_DOCUMENT_TYPE *documentType);
 
     HRESULT (STDMETHODCALLTYPE *ConvertHDPhotoToJpegXR)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMImageResource *imageResource);
 
     HRESULT (STDMETHODCALLTYPE *ConvertJpegXRToHDPhoto)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMImageResource *imageResource);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnFile1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         LPCWSTR fileName,
         LPSECURITY_ATTRIBUTES securityAttributes,
         DWORD flagsAndAttributes,
@@ -446,7 +470,7 @@
         IXpsOMPackageWriter **packageWriter);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageWriterOnStream1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         ISequentialStream *outputStream,
         WINBOOL optimizeMarkupSize,
         XPS_INTERLEAVING interleaving,
@@ -459,30 +483,30 @@
         IXpsOMPackageWriter **packageWriter);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackage1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IXpsOMPackage1 **package);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageFromStream1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *stream,
         WINBOOL reuseObjects,
         IXpsOMPackage1 **package);
 
     HRESULT (STDMETHODCALLTYPE *CreatePackageFromFile1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         LPCWSTR filename,
         WINBOOL reuseObjects,
         IXpsOMPackage1 **package);
 
     HRESULT (STDMETHODCALLTYPE *CreatePage1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         const XPS_SIZE *pageDimensions,
         LPCWSTR language,
         IOpcPartUri *partUri,
         IXpsOMPage1 **page);
 
     HRESULT (STDMETHODCALLTYPE *CreatePageFromStream1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *pageMarkupStream,
         IOpcPartUri *partUri,
         IXpsOMPartResources *resources,
@@ -490,7 +514,7 @@
         IXpsOMPage1 **page);
 
     HRESULT (STDMETHODCALLTYPE *CreateRemoteDictionaryResourceFromStream1)(
-        IXpsOMObjectFactory1* This,
+        IXpsOMObjectFactory1 *This,
         IStream *dictionaryMarkupStream,
         IOpcPartUri *partUri,
         IXpsOMPartResources *resources,
@@ -498,6 +522,7 @@
 
     END_INTERFACE
 } IXpsOMObjectFactory1Vtbl;
+
 interface IXpsOMObjectFactory1 {
     CONST_VTBL IXpsOMObjectFactory1Vtbl* lpVtbl;
 };
@@ -724,138 +749,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_GetDocumentTypeFromFile_Proxy(
-    IXpsOMObjectFactory1* This,
-    LPCWSTR filename,
-    XPS_DOCUMENT_TYPE *documentType);
-void __RPC_STUB IXpsOMObjectFactory1_GetDocumentTypeFromFile_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_GetDocumentTypeFromStream_Proxy(
-    IXpsOMObjectFactory1* This,
-    IStream *xpsDocumentStream,
-    XPS_DOCUMENT_TYPE *documentType);
-void __RPC_STUB IXpsOMObjectFactory1_GetDocumentTypeFromStream_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_ConvertHDPhotoToJpegXR_Proxy(
-    IXpsOMObjectFactory1* This,
-    IXpsOMImageResource *imageResource);
-void __RPC_STUB IXpsOMObjectFactory1_ConvertHDPhotoToJpegXR_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_ConvertJpegXRToHDPhoto_Proxy(
-    IXpsOMObjectFactory1* This,
-    IXpsOMImageResource *imageResource);
-void __RPC_STUB IXpsOMObjectFactory1_ConvertJpegXRToHDPhoto_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageWriterOnFile1_Proxy(
-    IXpsOMObjectFactory1* This,
-    LPCWSTR fileName,
-    LPSECURITY_ATTRIBUTES securityAttributes,
-    DWORD flagsAndAttributes,
-    WINBOOL optimizeMarkupSize,
-    XPS_INTERLEAVING interleaving,
-    IOpcPartUri *documentSequencePartName,
-    IXpsOMCoreProperties *coreProperties,
-    IXpsOMImageResource *packageThumbnail,
-    IXpsOMPrintTicketResource *documentSequencePrintTicket,
-    IOpcPartUri *discardControlPartName,
-    XPS_DOCUMENT_TYPE documentType,
-    IXpsOMPackageWriter **packageWriter);
-void __RPC_STUB IXpsOMObjectFactory1_CreatePackageWriterOnFile1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageWriterOnStream1_Proxy(
-    IXpsOMObjectFactory1* This,
-    ISequentialStream *outputStream,
-    WINBOOL optimizeMarkupSize,
-    XPS_INTERLEAVING interleaving,
-    IOpcPartUri *documentSequencePartName,
-    IXpsOMCoreProperties *coreProperties,
-    IXpsOMImageResource *packageThumbnail,
-    IXpsOMPrintTicketResource *documentSequencePrintTicket,
-    IOpcPartUri *discardControlPartName,
-    XPS_DOCUMENT_TYPE documentType,
-    IXpsOMPackageWriter **packageWriter);
-void __RPC_STUB IXpsOMObjectFactory1_CreatePackageWriterOnStream1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackage1_Proxy(
-    IXpsOMObjectFactory1* This,
-    IXpsOMPackage1 **package);
-void __RPC_STUB IXpsOMObjectFactory1_CreatePackage1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageFromStream1_Proxy(
-    IXpsOMObjectFactory1* This,
-    IStream *stream,
-    WINBOOL reuseObjects,
-    IXpsOMPackage1 **package);
-void __RPC_STUB IXpsOMObjectFactory1_CreatePackageFromStream1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePackageFromFile1_Proxy(
-    IXpsOMObjectFactory1* This,
-    LPCWSTR filename,
-    WINBOOL reuseObjects,
-    IXpsOMPackage1 **package);
-void __RPC_STUB IXpsOMObjectFactory1_CreatePackageFromFile1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePage1_Proxy(
-    IXpsOMObjectFactory1* This,
-    const XPS_SIZE *pageDimensions,
-    LPCWSTR language,
-    IOpcPartUri *partUri,
-    IXpsOMPage1 **page);
-void __RPC_STUB IXpsOMObjectFactory1_CreatePage1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreatePageFromStream1_Proxy(
-    IXpsOMObjectFactory1* This,
-    IStream *pageMarkupStream,
-    IOpcPartUri *partUri,
-    IXpsOMPartResources *resources,
-    WINBOOL reuseObjects,
-    IXpsOMPage1 **page);
-void __RPC_STUB IXpsOMObjectFactory1_CreatePageFromStream1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMObjectFactory1_CreateRemoteDictionaryResourceFromStream1_Proxy(
-    IXpsOMObjectFactory1* This,
-    IStream *dictionaryMarkupStream,
-    IOpcPartUri *partUri,
-    IXpsOMPartResources *resources,
-    IXpsOMRemoteDictionaryResource **dictionaryResource);
-void __RPC_STUB IXpsOMObjectFactory1_CreateRemoteDictionaryResourceFromStream1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMObjectFactory1_INTERFACE_DEFINED__ */
 
@@ -895,68 +788,68 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPackage1* This);
+        IXpsOMPackage1 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPackage1* This);
+        IXpsOMPackage1 *This);
 
     /*** IXpsOMPackage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDocumentSequence)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IXpsOMDocumentSequence **documentSequence);
 
     HRESULT (STDMETHODCALLTYPE *SetDocumentSequence)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IXpsOMDocumentSequence *documentSequence);
 
     HRESULT (STDMETHODCALLTYPE *GetCoreProperties)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IXpsOMCoreProperties **coreProperties);
 
     HRESULT (STDMETHODCALLTYPE *SetCoreProperties)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IXpsOMCoreProperties *coreProperties);
 
     HRESULT (STDMETHODCALLTYPE *GetDiscardControlPartName)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IOpcPartUri **discardControlPartUri);
 
     HRESULT (STDMETHODCALLTYPE *SetDiscardControlPartName)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IOpcPartUri *discardControlPartUri);
 
     HRESULT (STDMETHODCALLTYPE *GetThumbnailResource)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IXpsOMImageResource **imageResource);
 
     HRESULT (STDMETHODCALLTYPE *SetThumbnailResource)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         IXpsOMImageResource *imageResource);
 
     HRESULT (STDMETHODCALLTYPE *WriteToFile)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         LPCWSTR fileName,
         LPSECURITY_ATTRIBUTES securityAttributes,
         DWORD flagsAndAttributes,
         WINBOOL optimizeMarkupSize);
 
     HRESULT (STDMETHODCALLTYPE *WriteToStream)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         ISequentialStream *stream,
         WINBOOL optimizeMarkupSize);
 
     /*** IXpsOMPackage1 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDocumentType)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         XPS_DOCUMENT_TYPE *documentType);
 
     HRESULT (STDMETHODCALLTYPE *WriteToFile1)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         LPCWSTR fileName,
         LPSECURITY_ATTRIBUTES securityAttributes,
         DWORD flagsAndAttributes,
@@ -964,13 +857,14 @@
         XPS_DOCUMENT_TYPE documentType);
 
     HRESULT (STDMETHODCALLTYPE *WriteToStream1)(
-        IXpsOMPackage1* This,
+        IXpsOMPackage1 *This,
         ISequentialStream *outputStream,
         WINBOOL optimizeMarkupSize,
         XPS_DOCUMENT_TYPE documentType);
 
     END_INTERFACE
 } IXpsOMPackage1Vtbl;
+
 interface IXpsOMPackage1 {
     CONST_VTBL IXpsOMPackage1Vtbl* lpVtbl;
 };
@@ -1053,36 +947,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPackage1_GetDocumentType_Proxy(
-    IXpsOMPackage1* This,
-    XPS_DOCUMENT_TYPE *documentType);
-void __RPC_STUB IXpsOMPackage1_GetDocumentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage1_WriteToFile1_Proxy(
-    IXpsOMPackage1* This,
-    LPCWSTR fileName,
-    LPSECURITY_ATTRIBUTES securityAttributes,
-    DWORD flagsAndAttributes,
-    WINBOOL optimizeMarkupSize,
-    XPS_DOCUMENT_TYPE documentType);
-void __RPC_STUB IXpsOMPackage1_WriteToFile1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPackage1_WriteToStream1_Proxy(
-    IXpsOMPackage1* This,
-    ISequentialStream *outputStream,
-    WINBOOL optimizeMarkupSize,
-    XPS_DOCUMENT_TYPE documentType);
-void __RPC_STUB IXpsOMPackage1_WriteToStream1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPackage1_INTERFACE_DEFINED__ */
 
@@ -1115,129 +979,130 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMPage1* This);
+        IXpsOMPage1 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMPage1* This);
+        IXpsOMPage1 *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMPage methods ***/
     HRESULT (STDMETHODCALLTYPE *GetOwner)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMPageReference **pageReference);
 
     HRESULT (STDMETHODCALLTYPE *GetVisuals)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMVisualCollection **visuals);
 
     HRESULT (STDMETHODCALLTYPE *GetPageDimensions)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         XPS_SIZE *pageDimensions);
 
     HRESULT (STDMETHODCALLTYPE *SetPageDimensions)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         const XPS_SIZE *pageDimensions);
 
     HRESULT (STDMETHODCALLTYPE *GetContentBox)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         XPS_RECT *contentBox);
 
     HRESULT (STDMETHODCALLTYPE *SetContentBox)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         const XPS_RECT *contentBox);
 
     HRESULT (STDMETHODCALLTYPE *GetBleedBox)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         XPS_RECT *bleedBox);
 
     HRESULT (STDMETHODCALLTYPE *SetBleedBox)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         const XPS_RECT *bleedBox);
 
     HRESULT (STDMETHODCALLTYPE *GetLanguage)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         LPWSTR *language);
 
     HRESULT (STDMETHODCALLTYPE *SetLanguage)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         LPCWSTR language);
 
     HRESULT (STDMETHODCALLTYPE *GetName)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         LPWSTR *name);
 
     HRESULT (STDMETHODCALLTYPE *SetName)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         LPCWSTR name);
 
     HRESULT (STDMETHODCALLTYPE *GetIsHyperlinkTarget)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         WINBOOL *isHyperlinkTarget);
 
     HRESULT (STDMETHODCALLTYPE *SetIsHyperlinkTarget)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         WINBOOL isHyperlinkTarget);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionary)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMDictionary **resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionaryLocal)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMDictionary **resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionaryLocal)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMDictionary *resourceDictionary);
 
     HRESULT (STDMETHODCALLTYPE *GetDictionaryResource)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMRemoteDictionaryResource **remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionaryResource)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMRemoteDictionaryResource *remoteDictionaryResource);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         ISequentialStream *stream,
         WINBOOL optimizeMarkupSize);
 
     HRESULT (STDMETHODCALLTYPE *GenerateUnusedLookupKey)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         XPS_OBJECT_TYPE type,
         LPWSTR *key);
 
     HRESULT (STDMETHODCALLTYPE *Clone)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         IXpsOMPage **page);
 
     /*** IXpsOMPage1 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDocumentType)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         XPS_DOCUMENT_TYPE *documentType);
 
     HRESULT (STDMETHODCALLTYPE *Write1)(
-        IXpsOMPage1* This,
+        IXpsOMPage1 *This,
         ISequentialStream *stream,
         WINBOOL optimizeMarkupSize,
         XPS_DOCUMENT_TYPE documentType);
 
     END_INTERFACE
 } IXpsOMPage1Vtbl;
+
 interface IXpsOMPage1 {
     CONST_VTBL IXpsOMPage1Vtbl* lpVtbl;
 };
@@ -1374,24 +1239,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMPage1_GetDocumentType_Proxy(
-    IXpsOMPage1* This,
-    XPS_DOCUMENT_TYPE *documentType);
-void __RPC_STUB IXpsOMPage1_GetDocumentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMPage1_Write1_Proxy(
-    IXpsOMPage1* This,
-    ISequentialStream *stream,
-    WINBOOL optimizeMarkupSize,
-    XPS_DOCUMENT_TYPE documentType);
-void __RPC_STUB IXpsOMPage1_Write1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMPage1_INTERFACE_DEFINED__ */
 
@@ -1427,33 +1274,34 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsDocumentPackageTarget* This,
+        IXpsDocumentPackageTarget *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsDocumentPackageTarget* This);
+        IXpsDocumentPackageTarget *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsDocumentPackageTarget* This);
+        IXpsDocumentPackageTarget *This);
 
     /*** IXpsDocumentPackageTarget methods ***/
     HRESULT (STDMETHODCALLTYPE *GetXpsOMPackageWriter)(
-        IXpsDocumentPackageTarget* This,
+        IXpsDocumentPackageTarget *This,
         IOpcPartUri *documentSequencePartName,
         IOpcPartUri *discardControlPartName,
         IXpsOMPackageWriter **packageWriter);
 
     HRESULT (STDMETHODCALLTYPE *GetXpsOMFactory)(
-        IXpsDocumentPackageTarget* This,
+        IXpsDocumentPackageTarget *This,
         IXpsOMObjectFactory **xpsFactory);
 
     HRESULT (STDMETHODCALLTYPE *GetXpsType)(
-        IXpsDocumentPackageTarget* This,
+        IXpsDocumentPackageTarget *This,
         XPS_DOCUMENT_TYPE *documentType);
 
     END_INTERFACE
 } IXpsDocumentPackageTargetVtbl;
+
 interface IXpsDocumentPackageTarget {
     CONST_VTBL IXpsDocumentPackageTargetVtbl* lpVtbl;
 };
@@ -1494,32 +1342,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsDocumentPackageTarget_GetXpsOMPackageWriter_Proxy(
-    IXpsDocumentPackageTarget* This,
-    IOpcPartUri *documentSequencePartName,
-    IOpcPartUri *discardControlPartName,
-    IXpsOMPackageWriter **packageWriter);
-void __RPC_STUB IXpsDocumentPackageTarget_GetXpsOMPackageWriter_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsDocumentPackageTarget_GetXpsOMFactory_Proxy(
-    IXpsDocumentPackageTarget* This,
-    IXpsOMObjectFactory **xpsFactory);
-void __RPC_STUB IXpsDocumentPackageTarget_GetXpsOMFactory_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsDocumentPackageTarget_GetXpsType_Proxy(
-    IXpsDocumentPackageTarget* This,
-    XPS_DOCUMENT_TYPE *documentType);
-void __RPC_STUB IXpsDocumentPackageTarget_GetXpsType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsDocumentPackageTarget_INTERFACE_DEFINED__ */
 
@@ -1551,46 +1373,47 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsOMRemoteDictionaryResource1* This,
+        IXpsOMRemoteDictionaryResource1 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsOMRemoteDictionaryResource1* This);
+        IXpsOMRemoteDictionaryResource1 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsOMRemoteDictionaryResource1* This);
+        IXpsOMRemoteDictionaryResource1 *This);
 
     /*** IXpsOMPart methods ***/
     HRESULT (STDMETHODCALLTYPE *GetPartName)(
-        IXpsOMRemoteDictionaryResource1* This,
+        IXpsOMRemoteDictionaryResource1 *This,
         IOpcPartUri **partUri);
 
     HRESULT (STDMETHODCALLTYPE *SetPartName)(
-        IXpsOMRemoteDictionaryResource1* This,
+        IXpsOMRemoteDictionaryResource1 *This,
         IOpcPartUri *partUri);
 
     /*** IXpsOMRemoteDictionaryResource methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDictionary)(
-        IXpsOMRemoteDictionaryResource1* This,
+        IXpsOMRemoteDictionaryResource1 *This,
         IXpsOMDictionary **dictionary);
 
     HRESULT (STDMETHODCALLTYPE *SetDictionary)(
-        IXpsOMRemoteDictionaryResource1* This,
+        IXpsOMRemoteDictionaryResource1 *This,
         IXpsOMDictionary *dictionary);
 
     /*** IXpsOMRemoteDictionaryResource1 methods ***/
     HRESULT (STDMETHODCALLTYPE *GetDocumentType)(
-        IXpsOMRemoteDictionaryResource1* This,
+        IXpsOMRemoteDictionaryResource1 *This,
         XPS_DOCUMENT_TYPE *documentType);
 
     HRESULT (STDMETHODCALLTYPE *Write1)(
-        IXpsOMRemoteDictionaryResource1* This,
+        IXpsOMRemoteDictionaryResource1 *This,
         ISequentialStream *stream,
         XPS_DOCUMENT_TYPE documentType);
 
     END_INTERFACE
 } IXpsOMRemoteDictionaryResource1Vtbl;
+
 interface IXpsOMRemoteDictionaryResource1 {
     CONST_VTBL IXpsOMRemoteDictionaryResource1Vtbl* lpVtbl;
 };
@@ -1647,23 +1470,6 @@
 
 #endif
 
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource1_GetDocumentType_Proxy(
-    IXpsOMRemoteDictionaryResource1* This,
-    XPS_DOCUMENT_TYPE *documentType);
-void __RPC_STUB IXpsOMRemoteDictionaryResource1_GetDocumentType_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
-HRESULT STDMETHODCALLTYPE IXpsOMRemoteDictionaryResource1_Write1_Proxy(
-    IXpsOMRemoteDictionaryResource1* This,
-    ISequentialStream *stream,
-    XPS_DOCUMENT_TYPE documentType);
-void __RPC_STUB IXpsOMRemoteDictionaryResource1_Write1_Stub(
-    IRpcStubBuffer* This,
-    IRpcChannelBuffer* pRpcChannelBuffer,
-    PRPC_MESSAGE pRpcMessage,
-    DWORD* pdwStubPhase);
 
 #endif  /* __IXpsOMRemoteDictionaryResource1_INTERFACE_DEFINED__ */
 
diff --git a/mingw-w64-headers/include/xpsprint.h b/mingw-w64-headers/include/xpsprint.h
index 82eb7ee..d328782 100644
--- a/mingw-w64-headers/include/xpsprint.h
+++ b/mingw-w64-headers/include/xpsprint.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/xpsprint.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/xpsprint.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,11 +20,17 @@
 #ifndef __IXpsPrintJobStream_FWD_DEFINED__
 #define __IXpsPrintJobStream_FWD_DEFINED__
 typedef interface IXpsPrintJobStream IXpsPrintJobStream;
+#ifdef __cplusplus
+interface IXpsPrintJobStream;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsPrintJob_FWD_DEFINED__
 #define __IXpsPrintJob_FWD_DEFINED__
 typedef interface IXpsPrintJob IXpsPrintJob;
+#ifdef __cplusplus
+interface IXpsPrintJob;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -80,35 +86,36 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsPrintJobStream* This,
+        IXpsPrintJobStream *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsPrintJobStream* This);
+        IXpsPrintJobStream *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsPrintJobStream* This);
+        IXpsPrintJobStream *This);
 
     /*** ISequentialStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Read)(
-        IXpsPrintJobStream* This,
+        IXpsPrintJobStream *This,
         void *pv,
         ULONG cb,
         ULONG *pcbRead);
 
     HRESULT (STDMETHODCALLTYPE *Write)(
-        IXpsPrintJobStream* This,
+        IXpsPrintJobStream *This,
         const void *pv,
         ULONG cb,
         ULONG *pcbWritten);
 
     /*** IXpsPrintJobStream methods ***/
     HRESULT (STDMETHODCALLTYPE *Close)(
-        IXpsPrintJobStream* This);
+        IXpsPrintJobStream *This);
 
     END_INTERFACE
 } IXpsPrintJobStreamVtbl;
+
 interface IXpsPrintJobStream {
     CONST_VTBL IXpsPrintJobStreamVtbl* lpVtbl;
 };
@@ -181,26 +188,27 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsPrintJob* This,
+        IXpsPrintJob *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsPrintJob* This);
+        IXpsPrintJob *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsPrintJob* This);
+        IXpsPrintJob *This);
 
     /*** IXpsPrintJob methods ***/
     HRESULT (STDMETHODCALLTYPE *Cancel)(
-        IXpsPrintJob* This);
+        IXpsPrintJob *This);
 
     HRESULT (STDMETHODCALLTYPE *GetJobStatus)(
-        IXpsPrintJob* This,
+        IXpsPrintJob *This,
         XPS_JOB_STATUS *jobStatus);
 
     END_INTERFACE
 } IXpsPrintJobVtbl;
+
 interface IXpsPrintJob {
     CONST_VTBL IXpsPrintJobVtbl* lpVtbl;
 };
diff --git a/mingw-w64-headers/include/xpsrassvc.h b/mingw-w64-headers/include/xpsrassvc.h
index 93f8e9a..48f9d45 100644
--- a/mingw-w64-headers/include/xpsrassvc.h
+++ b/mingw-w64-headers/include/xpsrassvc.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.6 from include/xpsrassvc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 3.20 from include/xpsrassvc.idl - Do not edit ***/
 
 #ifndef __REQUIRED_RPCNDR_H_VERSION__
 #define __REQUIRED_RPCNDR_H_VERSION__ 475
@@ -20,21 +20,33 @@
 #ifndef __IXpsRasterizerNotificationCallback_FWD_DEFINED__
 #define __IXpsRasterizerNotificationCallback_FWD_DEFINED__
 typedef interface IXpsRasterizerNotificationCallback IXpsRasterizerNotificationCallback;
+#ifdef __cplusplus
+interface IXpsRasterizerNotificationCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsRasterizer_FWD_DEFINED__
 #define __IXpsRasterizer_FWD_DEFINED__
 typedef interface IXpsRasterizer IXpsRasterizer;
+#ifdef __cplusplus
+interface IXpsRasterizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsRasterizationFactory_FWD_DEFINED__
 #define __IXpsRasterizationFactory_FWD_DEFINED__
 typedef interface IXpsRasterizationFactory IXpsRasterizationFactory;
+#ifdef __cplusplus
+interface IXpsRasterizationFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsRasterizationFactory1_FWD_DEFINED__
 #define __IXpsRasterizationFactory1_FWD_DEFINED__
 typedef interface IXpsRasterizationFactory1 IXpsRasterizationFactory1;
+#ifdef __cplusplus
+interface IXpsRasterizationFactory1;
+#endif /* __cplusplus */
 #endif
 
 /* Headers for imported files */
@@ -50,21 +62,33 @@
 #ifndef __IXpsRasterizerNotificationCallback_FWD_DEFINED__
 #define __IXpsRasterizerNotificationCallback_FWD_DEFINED__
 typedef interface IXpsRasterizerNotificationCallback IXpsRasterizerNotificationCallback;
+#ifdef __cplusplus
+interface IXpsRasterizerNotificationCallback;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsRasterizer_FWD_DEFINED__
 #define __IXpsRasterizer_FWD_DEFINED__
 typedef interface IXpsRasterizer IXpsRasterizer;
+#ifdef __cplusplus
+interface IXpsRasterizer;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsRasterizationFactory_FWD_DEFINED__
 #define __IXpsRasterizationFactory_FWD_DEFINED__
 typedef interface IXpsRasterizationFactory IXpsRasterizationFactory;
+#ifdef __cplusplus
+interface IXpsRasterizationFactory;
+#endif /* __cplusplus */
 #endif
 
 #ifndef __IXpsRasterizationFactory1_FWD_DEFINED__
 #define __IXpsRasterizationFactory1_FWD_DEFINED__
 typedef interface IXpsRasterizationFactory1 IXpsRasterizationFactory1;
+#ifdef __cplusplus
+interface IXpsRasterizationFactory1;
+#endif /* __cplusplus */
 #endif
 
 #include <winapifamily.h>
@@ -105,22 +129,23 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsRasterizerNotificationCallback* This,
+        IXpsRasterizerNotificationCallback *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsRasterizerNotificationCallback* This);
+        IXpsRasterizerNotificationCallback *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsRasterizerNotificationCallback* This);
+        IXpsRasterizerNotificationCallback *This);
 
     /*** IXpsRasterizerNotificationCallback methods ***/
     HRESULT (STDMETHODCALLTYPE *Continue)(
-        IXpsRasterizerNotificationCallback* This);
+        IXpsRasterizerNotificationCallback *This);
 
     END_INTERFACE
 } IXpsRasterizerNotificationCallbackVtbl;
+
 interface IXpsRasterizerNotificationCallback {
     CONST_VTBL IXpsRasterizerNotificationCallbackVtbl* lpVtbl;
 };
@@ -188,19 +213,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsRasterizer* This,
+        IXpsRasterizer *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsRasterizer* This);
+        IXpsRasterizer *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsRasterizer* This);
+        IXpsRasterizer *This);
 
     /*** IXpsRasterizer methods ***/
     HRESULT (STDMETHODCALLTYPE *RasterizeRect)(
-        IXpsRasterizer* This,
+        IXpsRasterizer *This,
         INT x,
         INT y,
         INT width,
@@ -209,11 +234,12 @@
         IWICBitmap **bitmap);
 
     HRESULT (STDMETHODCALLTYPE *SetMinimalLineWidth)(
-        IXpsRasterizer* This,
+        IXpsRasterizer *This,
         INT width);
 
     END_INTERFACE
 } IXpsRasterizerVtbl;
+
 interface IXpsRasterizer {
     CONST_VTBL IXpsRasterizerVtbl* lpVtbl;
 };
@@ -281,19 +307,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsRasterizationFactory* This,
+        IXpsRasterizationFactory *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsRasterizationFactory* This);
+        IXpsRasterizationFactory *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsRasterizationFactory* This);
+        IXpsRasterizationFactory *This);
 
     /*** IXpsRasterizationFactory methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateRasterizer)(
-        IXpsRasterizationFactory* This,
+        IXpsRasterizationFactory *This,
         IXpsOMPage *xpsPage,
         FLOAT DPI,
         XPSRAS_RENDERING_MODE nonTextRenderingMode,
@@ -302,6 +328,7 @@
 
     END_INTERFACE
 } IXpsRasterizationFactoryVtbl;
+
 interface IXpsRasterizationFactory {
     CONST_VTBL IXpsRasterizationFactoryVtbl* lpVtbl;
 };
@@ -367,19 +394,19 @@
 
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
-        IXpsRasterizationFactory1* This,
+        IXpsRasterizationFactory1 *This,
         REFIID riid,
         void **ppvObject);
 
     ULONG (STDMETHODCALLTYPE *AddRef)(
-        IXpsRasterizationFactory1* This);
+        IXpsRasterizationFactory1 *This);
 
     ULONG (STDMETHODCALLTYPE *Release)(
-        IXpsRasterizationFactory1* This);
+        IXpsRasterizationFactory1 *This);
 
     /*** IXpsRasterizationFactory1 methods ***/
     HRESULT (STDMETHODCALLTYPE *CreateRasterizer)(
-        IXpsRasterizationFactory1* This,
+        IXpsRasterizationFactory1 *This,
         IXpsOMPage *xpsPage,
         FLOAT DPI,
         XPSRAS_RENDERING_MODE nonTextRenderingMode,
@@ -389,6 +416,7 @@
 
     END_INTERFACE
 } IXpsRasterizationFactory1Vtbl;
+
 interface IXpsRasterizationFactory1 {
     CONST_VTBL IXpsRasterizationFactory1Vtbl* lpVtbl;
 };