From: Stuart C. <stu...@us...> - 2009-07-28 05:49:18
|
Update of /cvsroot/aaf/AAF/ref-impl/include/com-api In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv11855/ref-impl/include/com-api Modified Files: AAF.h AAF.idl AAFPrivate.idl AAF_i.c Log Message: Remove SubDescriptor class, types and property and associated API from toolkit. Involved removing the SubDescriptors property from EssenceDescriptor, the SubDescriptor class and the SubDescriptor StrongReference and StrongReferenceVector types. The AAFEssenceDescriptor2 API was also removed since it's purpose was to provide an API for manipulating SubDescriptors. Index: AAFPrivate.idl =================================================================== RCS file: /cvsroot/aaf/AAF/ref-impl/include/com-api/AAFPrivate.idl,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AAFPrivate.idl 1 Jun 2009 11:46:59 -0000 1.19 --- AAFPrivate.idl 28 Jul 2009 05:49:08 -0000 1.20 *************** *** 355,359 **** /// - IAAFFileDescriptor2 /// - IAAFEssenceDescriptor - /// - IAAFEssenceDescriptor2 /// - IAAFObject [ --- 355,358 ---- Index: AAF_i.c =================================================================== RCS file: /cvsroot/aaf/AAF/ref-impl/include/com-api/AAF_i.c,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** AAF_i.c 17 Apr 2007 17:33:13 -0000 1.31 --- AAF_i.c 28 Jul 2009 05:49:08 -0000 1.32 *************** *** 294,300 **** - const IID IID_IAAFSubDescriptor = {0x3e44c183,0x02de,0x4a0c,{0xa7,0x49,0x5c,0x3a,0x76,0x9d,0xc8,0xf2}}; - - const IID IID_IAAFTIFFDescriptor = {0xe684d76c,0xb935,0x11d2,{0xbf,0x9d,0x00,0x10,0x4b,0xc9,0x15,0x6d}}; --- 294,297 ---- *************** *** 468,474 **** - const IID IID_IEnumAAFSubDescriptors = {0x5b2f57e7,0x7170,0x445d,{0xb3,0x8b,0x6f,0x02,0xdb,0x84,0xf4,0xd3}}; - - const IID IID_IEnumAAFTaggedValueDefs = {0x9d1bd790,0x16a8,0x488c,{0x87,0x43,0xf9,0xa6,0x0a,0x1c,0xba,0x95}}; --- 465,468 ---- Index: AAF.idl =================================================================== RCS file: /cvsroot/aaf/AAF/ref-impl/include/com-api/AAF.idl,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** AAF.idl 15 Jun 2009 10:08:11 -0000 1.61 --- AAF.idl 28 Jul 2009 05:49:07 -0000 1.62 *************** *** 137,141 **** interface IAAFSourceReference; interface IAAFStaticMobSlot; - interface IAAFSubDescriptor; interface IAAFTIFFDescriptor; interface IAAFTaggedValue; --- 137,140 ---- *************** *** 195,199 **** interface IEnumAAFRIFFChunks; interface IEnumAAFSegments; [...971 lines suppressed...] - // // Interface IAAFEssenceMultiAccess // --- 45005,45008 ---- *************** *** 46023,46027 **** /// Objects that implement IAAFFileDescriptor2 also implement the following interfaces: /// - IAAFEssenceDescriptor - /// - IAAFEssenceDescriptor2 /// - IAAFObject [ --- 45281,45284 ---- *************** *** 49832,49836 **** /// - IAAFFileDescriptor2 /// - IAAFEssenceDescriptor - /// - IAAFEssenceDescriptor2 /// - IAAFObject [ --- 49089,49092 ---- Index: AAF.h =================================================================== RCS file: /cvsroot/aaf/AAF/ref-impl/include/com-api/AAF.h,v retrieving revision 1.46 retrieving revision 1.47 diff -C2 -d -r1.46 -r1.47 *** AAF.h 1 Jun 2009 11:46:59 -0000 1.46 --- AAF.h 28 Jul 2009 05:49:05 -0000 1.47 *************** *** 554,563 **** - #ifndef __IAAFSubDescriptor_FWD_DEFINED__ - #define __IAAFSubDescriptor_FWD_DEFINED__ - typedef interface IAAFSubDescriptor IAAFSubDescriptor; - #endif /* __IAAFSubDescriptor_FWD_DEFINED__ */ - - #ifndef __IAAFTIFFDescriptor_FWD_DEFINED__ #define __IAAFTIFFDescriptor_FWD_DEFINED__ --- 554,557 ---- *************** *** 902,911 **** - #ifndef __IEnumAAFSubDescriptors_FWD_DEFINED__ - #define __IEnumAAFSubDescriptors_FWD_DEFINED__ - typedef interface IEnumAAFSubDescriptors IEnumAAFSubDescriptors; - #endif /* __IEnumAAFSubDescriptors_FWD_DEFINED__ */ - - #ifndef __IEnumAAFTaggedValueDefs_FWD_DEFINED__ #define __IEnumAAFTaggedValueDefs_FWD_DEFINED__ --- 896,899 ---- *************** *** 25004,25075 **** - #ifndef __IAAFSubDescriptor_INTERFACE_DEFINED__ - #define __IAAFSubDescriptor_INTERFACE_DEFINED__ - - /* interface IAAFSubDescriptor */ - /* [unique][helpstring][uuid][object] */ - - - EXTERN_C const IID IID_IAAFSubDescriptor; - - #if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("3e44c183-02de-4a0c-a749-5c3a769dc8f2") - IAAFSubDescriptor : public IUnknown - { - public: - }; - - #else /* C style interface */ - - typedef struct IAAFSubDescriptorVtbl - { - BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( - IAAFSubDescriptor __RPC_FAR * This, - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( - IAAFSubDescriptor __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( - IAAFSubDescriptor __RPC_FAR * This); - - END_INTERFACE - } IAAFSubDescriptorVtbl; - - interface IAAFSubDescriptor - { - CONST_VTBL struct IAAFSubDescriptorVtbl __RPC_FAR *lpVtbl; - }; - - - - #ifdef COBJMACROS - - - #define IAAFSubDescriptor_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - - #define IAAFSubDescriptor_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) - - #define IAAFSubDescriptor_Release(This) \ - (This)->lpVtbl -> Release(This) - - - #endif /* COBJMACROS */ - - - #endif /* C style interface */ - - - - - #endif /* __IAAFSubDescriptor_INTERFACE_DEFINED__ */ - - #ifndef __IAAFTIFFDescriptor_INTERFACE_DEFINED__ #define __IAAFTIFFDescriptor_INTERFACE_DEFINED__ --- 24992,24995 ---- *************** *** 37297,37481 **** - #ifndef __IEnumAAFSubDescriptors_INTERFACE_DEFINED__ - #define __IEnumAAFSubDescriptors_INTERFACE_DEFINED__ - - /* interface IEnumAAFSubDescriptors */ - /* [unique][helpstring][uuid][object] */ - - - EXTERN_C const IID IID_IEnumAAFSubDescriptors; - - #if defined(__cplusplus) && !defined(CINTERFACE) - - MIDL_INTERFACE("5b2f57e7-7170-445d-b38b-6f02db84f4d3") - IEnumAAFSubDescriptors : public IUnknown - { - public: - virtual HRESULT STDMETHODCALLTYPE NextOne( - /* [retval][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptors) = 0; - - virtual HRESULT STDMETHODCALLTYPE Next( - /* [in] */ aafUInt32 count, - /* [length_is][size_is][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptors, - /* [ref][out] */ aafUInt32 __RPC_FAR *pNumFetched) = 0; - - virtual HRESULT STDMETHODCALLTYPE Skip( - /* [in] */ aafUInt32 count) = 0; - - virtual HRESULT STDMETHODCALLTYPE Reset( void) = 0; - - virtual HRESULT STDMETHODCALLTYPE Clone( - /* [retval][out] */ IEnumAAFSubDescriptors __RPC_FAR *__RPC_FAR *ppEnum) = 0; - - }; - - #else /* C style interface */ - - typedef struct IEnumAAFSubDescriptorsVtbl - { - BEGIN_INTERFACE - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *QueryInterface )( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [in] */ REFIID riid, - /* [iid_is][out] */ void __RPC_FAR *__RPC_FAR *ppvObject); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *AddRef )( - IEnumAAFSubDescriptors __RPC_FAR * This); - - ULONG ( STDMETHODCALLTYPE __RPC_FAR *Release )( - IEnumAAFSubDescriptors __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *NextOne )( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [retval][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptors); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Next )( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [in] */ aafUInt32 count, - /* [length_is][size_is][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptors, - /* [ref][out] */ aafUInt32 __RPC_FAR *pNumFetched); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Skip )( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [in] */ aafUInt32 count); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Reset )( - IEnumAAFSubDescriptors __RPC_FAR * This); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *Clone )( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [retval][out] */ IEnumAAFSubDescriptors __RPC_FAR *__RPC_FAR *ppEnum); - - END_INTERFACE - } IEnumAAFSubDescriptorsVtbl; - - interface IEnumAAFSubDescriptors - { - CONST_VTBL struct IEnumAAFSubDescriptorsVtbl __RPC_FAR *lpVtbl; - }; - - - - #ifdef COBJMACROS - - - #define IEnumAAFSubDescriptors_QueryInterface(This,riid,ppvObject) \ - (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) - - #define IEnumAAFSubDescriptors_AddRef(This) \ - (This)->lpVtbl -> AddRef(This) - - #define IEnumAAFSubDescriptors_Release(This) \ - (This)->lpVtbl -> Release(This) - - - #define IEnumAAFSubDescriptors_NextOne(This,ppSubDescriptors) \ - (This)->lpVtbl -> NextOne(This,ppSubDescriptors) - - #define IEnumAAFSubDescriptors_Next(This,count,ppSubDescriptors,pNumFetched) \ - (This)->lpVtbl -> Next(This,count,ppSubDescriptors,pNumFetched) - - #define IEnumAAFSubDescriptors_Skip(This,count) \ - (This)->lpVtbl -> Skip(This,count) - - #define IEnumAAFSubDescriptors_Reset(This) \ - (This)->lpVtbl -> Reset(This) - - #define IEnumAAFSubDescriptors_Clone(This,ppEnum) \ - (This)->lpVtbl -> Clone(This,ppEnum) - - #endif /* COBJMACROS */ - - - #endif /* C style interface */ - - - - HRESULT STDMETHODCALLTYPE IEnumAAFSubDescriptors_NextOne_Proxy( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [retval][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptors); - - - void __RPC_STUB IEnumAAFSubDescriptors_NextOne_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IEnumAAFSubDescriptors_Next_Proxy( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [in] */ aafUInt32 count, - /* [length_is][size_is][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptors, - /* [ref][out] */ aafUInt32 __RPC_FAR *pNumFetched); - - - void __RPC_STUB IEnumAAFSubDescriptors_Next_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IEnumAAFSubDescriptors_Skip_Proxy( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [in] */ aafUInt32 count); - - - void __RPC_STUB IEnumAAFSubDescriptors_Skip_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IEnumAAFSubDescriptors_Reset_Proxy( - IEnumAAFSubDescriptors __RPC_FAR * This); - - - void __RPC_STUB IEnumAAFSubDescriptors_Reset_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IEnumAAFSubDescriptors_Clone_Proxy( - IEnumAAFSubDescriptors __RPC_FAR * This, - /* [retval][out] */ IEnumAAFSubDescriptors __RPC_FAR *__RPC_FAR *ppEnum); - - - void __RPC_STUB IEnumAAFSubDescriptors_Clone_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - - #endif /* __IEnumAAFSubDescriptors_INTERFACE_DEFINED__ */ - - #ifndef __IEnumAAFTaggedValueDefs_INTERFACE_DEFINED__ #define __IEnumAAFTaggedValueDefs_INTERFACE_DEFINED__ --- 37217,37220 ---- *************** *** 43808,43834 **** /* [out] */ IEnumAAFLocators __RPC_FAR *__RPC_FAR *ppEnum) = 0; - virtual HRESULT STDMETHODCALLTYPE CountSubDescriptors( - /* [out] */ aafUInt32 __RPC_FAR *pResult) = 0; - - virtual HRESULT STDMETHODCALLTYPE AppendSubDescriptor( - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptors) = 0; - - virtual HRESULT STDMETHODCALLTYPE PrependSubDescriptor( - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptor) = 0; - - virtual HRESULT STDMETHODCALLTYPE InsertSubDescriptorAt( - /* [in] */ aafUInt32 index, - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptor) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSubDescriptorAt( - /* [in] */ aafUInt32 index, - /* [retval][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptor) = 0; - - virtual HRESULT STDMETHODCALLTYPE RemoveSubDescriptorAt( - /* [in] */ aafUInt32 index) = 0; - - virtual HRESULT STDMETHODCALLTYPE GetSubDescriptors( - /* [out] */ IEnumAAFSubDescriptors __RPC_FAR *__RPC_FAR *ppEnum) = 0; - }; --- 43547,43550 ---- *************** *** 43880,43913 **** /* [out] */ IEnumAAFLocators __RPC_FAR *__RPC_FAR *ppEnum); - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *CountSubDescriptors )( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [out] */ aafUInt32 __RPC_FAR *pResult); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *AppendSubDescriptor )( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptors); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *PrependSubDescriptor )( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptor); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *InsertSubDescriptorAt )( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ aafUInt32 index, - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptor); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetSubDescriptorAt )( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ aafUInt32 index, - /* [retval][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptor); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *RemoveSubDescriptorAt )( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ aafUInt32 index); - - HRESULT ( STDMETHODCALLTYPE __RPC_FAR *GetSubDescriptors )( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [out] */ IEnumAAFSubDescriptors __RPC_FAR *__RPC_FAR *ppEnum); - END_INTERFACE } IAAFEssenceDescriptor2Vtbl; --- 43596,43599 ---- *************** *** 43954,43978 **** (This)->lpVtbl -> GetLocators(This,ppEnum) - #define IAAFEssenceDescriptor2_CountSubDescriptors(This,pResult) \ - (This)->lpVtbl -> CountSubDescriptors(This,pResult) - - #define IAAFEssenceDescriptor2_AppendSubDescriptor(This,pSubDescriptors) \ - (This)->lpVtbl -> AppendSubDescriptor(This,pSubDescriptors) - - #define IAAFEssenceDescriptor2_PrependSubDescriptor(This,pSubDescriptor) \ - (This)->lpVtbl -> PrependSubDescriptor(This,pSubDescriptor) - - #define IAAFEssenceDescriptor2_InsertSubDescriptorAt(This,index,pSubDescriptor) \ - (This)->lpVtbl -> InsertSubDescriptorAt(This,index,pSubDescriptor) - - #define IAAFEssenceDescriptor2_GetSubDescriptorAt(This,index,ppSubDescriptor) \ - (This)->lpVtbl -> GetSubDescriptorAt(This,index,ppSubDescriptor) - - #define IAAFEssenceDescriptor2_RemoveSubDescriptorAt(This,index) \ - (This)->lpVtbl -> RemoveSubDescriptorAt(This,index) - - #define IAAFEssenceDescriptor2_GetSubDescriptors(This,ppEnum) \ - (This)->lpVtbl -> GetSubDescriptors(This,ppEnum) - #endif /* COBJMACROS */ --- 43640,43643 ---- *************** *** 44068,44158 **** - HRESULT STDMETHODCALLTYPE IAAFEssenceDescriptor2_CountSubDescriptors_Proxy( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [out] */ aafUInt32 __RPC_FAR *pResult); - - - void __RPC_STUB IAAFEssenceDescriptor2_CountSubDescriptors_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IAAFEssenceDescriptor2_AppendSubDescriptor_Proxy( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptors); - - - void __RPC_STUB IAAFEssenceDescriptor2_AppendSubDescriptor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IAAFEssenceDescriptor2_PrependSubDescriptor_Proxy( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptor); - - - void __RPC_STUB IAAFEssenceDescriptor2_PrependSubDescriptor_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IAAFEssenceDescriptor2_InsertSubDescriptorAt_Proxy( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ aafUInt32 index, - /* [in] */ IAAFSubDescriptor __RPC_FAR *pSubDescriptor); - - - void __RPC_STUB IAAFEssenceDescriptor2_InsertSubDescriptorAt_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IAAFEssenceDescriptor2_GetSubDescriptorAt_Proxy( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ aafUInt32 index, - /* [retval][out] */ IAAFSubDescriptor __RPC_FAR *__RPC_FAR *ppSubDescriptor); - - - void __RPC_STUB IAAFEssenceDescriptor2_GetSubDescriptorAt_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IAAFEssenceDescriptor2_RemoveSubDescriptorAt_Proxy( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [in] */ aafUInt32 index); - - - void __RPC_STUB IAAFEssenceDescriptor2_RemoveSubDescriptorAt_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - HRESULT STDMETHODCALLTYPE IAAFEssenceDescriptor2_GetSubDescriptors_Proxy( - IAAFEssenceDescriptor2 __RPC_FAR * This, - /* [out] */ IEnumAAFSubDescriptors __RPC_FAR *__RPC_FAR *ppEnum); - - - void __RPC_STUB IAAFEssenceDescriptor2_GetSubDescriptors_Stub( - IRpcStubBuffer *This, - IRpcChannelBuffer *_pRpcChannelBuffer, - PRPC_MESSAGE _pRpcMessage, - DWORD *_pdwStubPhase); - - - #endif /* __IAAFEssenceDescriptor2_INTERFACE_DEFINED__ */ --- 43733,43736 ---- |