On 8/26/15, Kai Tietz <ktiet...@googlemail.com> wrote: > Hello Roger, > > please Post patch to this ML, as this header isn't autogenerated by > widl for us. Of course making out of it an .idl file and autogenerate > it would be even more welcome.
Sorry it's a bit late and I see some work has been done. Here is a patch off the "old way" anyway...
diff --git a/mingw-w64-headers/include/tuner.h b/mingw-w64-headers/include/tuner.h index c6efe1d..fff0b53 100644 --- a/mingw-w64-headers/include/tuner.h +++ b/mingw-w64-headers/include/tuner.h @@ -122,9 +122,9 @@ DECLARE_INTERFACE_(IBDACreateTuneRequestEx,IUnknown) #undef INTERFACE #define INTERFACE ITuneRequest #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(ITuneRequest,IDispatch) { @@ -142,10 +142,10 @@ DECLARE_INTERFACE_(ITuneRequest,IDispatch) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* ITuneRequest methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ ITuneRequest **ppNewTuneRequest) PURE; + STDMETHOD_(HRESULT,get_TuningSpace)(THIS_ ITuningSpace **ppTuningSpace) PURE; STDMETHOD_(HRESULT,get_Components)(THIS_ IComponents **ppComponents) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ ITuneRequest **ppNewTuneRequest) PURE; STDMETHOD_(HRESULT,get_Locator)(THIS_ ILocator **ppLocator) PURE; - STDMETHOD_(HRESULT,get_TuningSpace)(THIS_ ITuningSpace **ppTuningSpace) PURE; STDMETHOD_(HRESULT,put_Locator)(THIS_ ILocator *pLocator) PURE; END_INTERFACE @@ -158,10 +158,10 @@ DECLARE_INTERFACE_(ITuneRequest,IDispatch) #define ITuneRequest_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) #define ITuneRequest_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) #define ITuneRequest_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) -#define ITuneRequest_Clone(This,ppNewTuneRequest) (This)->lpVtbl->Clone(This,ppNewTuneRequest) +#define ITuneRequest_get_TuningSpace(This,ppTuningSpace) (This)->lpVtbl->get_TuningSpace(This,ppTuningSpace) #define ITuneRequest_get_Components(This,ppComponents) (This)->lpVtbl->get_Components(This,ppComponents) +#define ITuneRequest_Clone(This,ppNewTuneRequest) (This)->lpVtbl->Clone(This,ppNewTuneRequest) #define ITuneRequest_get_Locator(This,ppLocator) (This)->lpVtbl->get_Locator(This,ppLocator) -#define ITuneRequest_get_TuningSpace(This,ppTuningSpace) (This)->lpVtbl->get_TuningSpace(This,ppTuningSpace) #define ITuneRequest_put_Locator(This,pLocator) (This)->lpVtbl->put_Locator(This,pLocator) #endif /*COBJMACROS*/ @@ -182,8 +182,8 @@ DECLARE_INTERFACE_(IChannelIDTuneRequest,ITuneRequest) STDMETHOD_(ULONG, Release)(THIS) PURE; /* IChannelIDTuneRequest methods */ - STDMETHOD_(HRESULT,put_ChannelID)(THIS_ BSTR ChannelID) PURE; STDMETHOD_(HRESULT,get_ChannelID)(THIS_ BSTR *ChannelID) PURE; + STDMETHOD_(HRESULT,put_ChannelID)(THIS_ BSTR ChannelID) PURE; END_INTERFACE }; @@ -198,9 +198,9 @@ DECLARE_INTERFACE_(IChannelIDTuneRequest,ITuneRequest) #undef INTERFACE #define INTERFACE ILocator #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(ILocator,IDispatch) { @@ -218,21 +218,21 @@ DECLARE_INTERFACE_(ILocator,IDispatch) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* ILocator methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; STDMETHOD_(HRESULT,get_CarrierFrequency)(THIS_ __LONG32 *pFrequency) PURE; - STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; - STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_CarrierFrequency)(THIS_ __LONG32 Frequency) PURE; + STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; - STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; + STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; + STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_SymbolRate)(THIS_ __LONG32 Rate) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; END_INTERFACE }; @@ -264,9 +264,9 @@ DECLARE_INTERFACE_(ILocator,IDispatch) #undef INTERFACE #define INTERFACE IDigitalLocator #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IDigitalLocator,ILocator) { @@ -284,21 +284,21 @@ DECLARE_INTERFACE_(IDigitalLocator,ILocator) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* ILocator methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; STDMETHOD_(HRESULT,get_CarrierFrequency)(THIS_ __LONG32 *pFrequency) PURE; - STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; - STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_CarrierFrequency)(THIS_ __LONG32 Frequency) PURE; + STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; - STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; + STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; + STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_SymbolRate)(THIS_ __LONG32 Rate) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; /* IDigitalLocator methods */ @@ -332,9 +332,9 @@ DECLARE_INTERFACE_(IDigitalLocator,ILocator) #undef INTERFACE #define INTERFACE IDVBSLocator #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +//#warning COM interfaces layout in this header has not been verified. +//#warning COM interfaces with incorrect layout may not work at all. +//__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IDVBSLocator,IDigitalLocator) { @@ -352,35 +352,35 @@ DECLARE_INTERFACE_(IDVBSLocator,IDigitalLocator) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* ILocator methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; STDMETHOD_(HRESULT,get_CarrierFrequency)(THIS_ __LONG32 *pFrequency) PURE; - STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; - STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_CarrierFrequency)(THIS_ __LONG32 Frequency) PURE; + STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; - STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; + STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; + STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_SymbolRate)(THIS_ __LONG32 Rate) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; /* IDigitalLocator methods */ /* IDVBSLocator methods */ - STDMETHOD_(HRESULT,get_Azimuth)(THIS_ __LONG32 *pAzimuth) PURE; - STDMETHOD_(HRESULT,get_Elevation)(THIS_ __LONG32 *pElevation) PURE; - STDMETHOD_(HRESULT,get_OrbitalPosition)(THIS_ __LONG32 *plongitude) PURE; STDMETHOD_(HRESULT,get_SignalPolarisation)(THIS_ Polarisation *pPolarisationVal) PURE; + STDMETHOD_(HRESULT,put_SignalPolarisation)(THIS_ Polarisation PolarisationVal) PURE; STDMETHOD_(HRESULT,get_WestPosition)(THIS_ VARIANT_BOOL *pWestLongitude) PURE; + STDMETHOD_(HRESULT,put_WestPosition)(THIS_ VARIANT_BOOL WestLongitude) PURE; + STDMETHOD_(HRESULT,get_OrbitalPosition)(THIS_ __LONG32 *plongitude) PURE; + STDMETHOD_(HRESULT,put_OrbitalPosition)(THIS_ __LONG32 longitude) PURE; + STDMETHOD_(HRESULT,get_Azimuth)(THIS_ __LONG32 *pAzimuth) PURE; STDMETHOD_(HRESULT,put_Azimuth)(THIS_ __LONG32 Azimuth) PURE; + STDMETHOD_(HRESULT,get_Elevation)(THIS_ __LONG32 *pElevation) PURE; STDMETHOD_(HRESULT,put_Elevation)(THIS_ __LONG32 Elevation) PURE; - STDMETHOD_(HRESULT,put_OrbitalPosition)(THIS_ __LONG32 longitude) PURE; - STDMETHOD_(HRESULT,put_SignalPolarisation)(THIS_ Polarisation PolarisationVal) PURE; - STDMETHOD_(HRESULT,put_WestPosition)(THIS_ VARIANT_BOOL WestLongitude) PURE; END_INTERFACE }; @@ -444,35 +444,35 @@ DECLARE_INTERFACE_(IDVBSLocator2,IDVBSLocator) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* ILocator methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; STDMETHOD_(HRESULT,get_CarrierFrequency)(THIS_ __LONG32 *pFrequency) PURE; - STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; - STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_CarrierFrequency)(THIS_ __LONG32 Frequency) PURE; + STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; - STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; + STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; + STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_SymbolRate)(THIS_ __LONG32 Rate) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; /* IDigitalLocator methods */ /* IDVBSLocator methods */ - STDMETHOD_(HRESULT,get_Azimuth)(THIS_ __LONG32 *pAzimuth) PURE; - STDMETHOD_(HRESULT,get_Elevation)(THIS_ __LONG32 *pElevation) PURE; - STDMETHOD_(HRESULT,get_OrbitalPosition)(THIS_ __LONG32 *plongitude) PURE; STDMETHOD_(HRESULT,get_SignalPolarisation)(THIS_ Polarisation *pPolarisationVal) PURE; + STDMETHOD_(HRESULT,put_SignalPolarisation)(THIS_ Polarisation PolarisationVal) PURE; STDMETHOD_(HRESULT,get_WestPosition)(THIS_ VARIANT_BOOL *pWestLongitude) PURE; + STDMETHOD_(HRESULT,put_WestPosition)(THIS_ VARIANT_BOOL WestLongitude) PURE; + STDMETHOD_(HRESULT,get_OrbitalPosition)(THIS_ __LONG32 *plongitude) PURE; + STDMETHOD_(HRESULT,put_OrbitalPosition)(THIS_ __LONG32 longitude) PURE; + STDMETHOD_(HRESULT,get_Azimuth)(THIS_ __LONG32 *pAzimuth) PURE; STDMETHOD_(HRESULT,put_Azimuth)(THIS_ __LONG32 Azimuth) PURE; + STDMETHOD_(HRESULT,get_Elevation)(THIS_ __LONG32 *pElevation) PURE; STDMETHOD_(HRESULT,put_Elevation)(THIS_ __LONG32 Elevation) PURE; - STDMETHOD_(HRESULT,put_OrbitalPosition)(THIS_ __LONG32 longitude) PURE; - STDMETHOD_(HRESULT,put_SignalPolarisation)(THIS_ Polarisation PolarisationVal) PURE; - STDMETHOD_(HRESULT,put_WestPosition)(THIS_ VARIANT_BOOL WestLongitude) PURE; /* IDVBSLocator2 methods */ STDMETHOD_(HRESULT,put_DiseqLNBSource)(THIS_ LNB_Source DiseqLNBSourceVal) PURE; @@ -546,9 +546,9 @@ DECLARE_INTERFACE_(IDVBSLocator2,IDVBSLocator) #undef INTERFACE #define INTERFACE IDVBTLocator #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +//#warning COM interfaces layout in this header has not been verified. +//#warning COM interfaces with incorrect layout may not work at all. +//__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IDVBTLocator,IDigitalLocator) { @@ -566,38 +566,38 @@ DECLARE_INTERFACE_(IDVBTLocator,IDigitalLocator) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* ILocator methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; STDMETHOD_(HRESULT,get_CarrierFrequency)(THIS_ __LONG32 *pFrequency) PURE; - STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; - STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; - STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; - STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_CarrierFrequency)(THIS_ __LONG32 Frequency) PURE; + STDMETHOD_(HRESULT,get_InnerFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_InnerFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_InnerFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; - STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_OuterFEC)(THIS_ FECMethod *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_OuterFECRate)(THIS_ BinaryConvolutionCodeRate *FEC) PURE; STDMETHOD_(HRESULT,put_OuterFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; + STDMETHOD_(HRESULT,get_Modulation)(THIS_ ModulationType *pModulation) PURE; + STDMETHOD_(HRESULT,put_Modulation)(THIS_ ModulationType Modulation) PURE; + STDMETHOD_(HRESULT,get_SymbolRate)(THIS_ __LONG32 *Rate) PURE; STDMETHOD_(HRESULT,put_SymbolRate)(THIS_ __LONG32 Rate) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ ILocator **ppNewLocator) PURE; /* IDigitalLocator methods */ /* IDVBTLocator methods */ STDMETHOD_(HRESULT,get_Bandwidth)(THIS_ __LONG32 *pBandWidthVal) PURE; - STDMETHOD_(HRESULT,get_Guard)(THIS_ GuardInterval *pGI) PURE; - STDMETHOD_(HRESULT,get_HAlpha)(THIS_ HierarchyAlpha *pAlpha) PURE; - STDMETHOD_(HRESULT,get_LPInnerFEC)(THIS_ FECMethod *pFEC) PURE; - STDMETHOD_(HRESULT,get_LPInnerFECRate)(THIS_ BinaryConvolutionCodeRate *pFEC) PURE; - STDMETHOD_(HRESULT,get_Mode)(THIS_ TransmissionMode *pmode) PURE; - STDMETHOD_(HRESULT,get_OtherFrequencyInUse)(THIS_ VARIANT_BOOL *pOtherFrequencyInUseVal) PURE; STDMETHOD_(HRESULT,put_Bandwidth)(THIS_ __LONG32 BandwidthVal) PURE; - STDMETHOD_(HRESULT,put_Guard)(THIS_ GuardInterval GI) PURE; - STDMETHOD_(HRESULT,put_HAlpha)(THIS_ HierarchyAlpha Alpha) PURE; + STDMETHOD_(HRESULT,get_LPInnerFEC)(THIS_ FECMethod *pFEC) PURE; STDMETHOD_(HRESULT,put_LPInnerFEC)(THIS_ FECMethod FEC) PURE; + STDMETHOD_(HRESULT,get_LPInnerFECRate)(THIS_ BinaryConvolutionCodeRate *pFEC) PURE; STDMETHOD_(HRESULT,put_LPInnerFECRate)(THIS_ BinaryConvolutionCodeRate FEC) PURE; + STDMETHOD_(HRESULT,get_HAlpha)(THIS_ HierarchyAlpha *pAlpha) PURE; + STDMETHOD_(HRESULT,put_HAlpha)(THIS_ HierarchyAlpha Alpha) PURE; + STDMETHOD_(HRESULT,get_Guard)(THIS_ GuardInterval *pGI) PURE; + STDMETHOD_(HRESULT,put_Guard)(THIS_ GuardInterval GI) PURE; + STDMETHOD_(HRESULT,get_Mode)(THIS_ TransmissionMode *pmode) PURE; STDMETHOD_(HRESULT,put_Mode)(THIS_ TransmissionMode mode) PURE; + STDMETHOD_(HRESULT,get_OtherFrequencyInUse)(THIS_ VARIANT_BOOL *pOtherFrequencyInUseVal) PURE; STDMETHOD_(HRESULT,put_OtherFrequencyInUse)(THIS_ VARIANT_BOOL OtherFrequencyInUseVal) PURE; END_INTERFACE @@ -748,9 +748,9 @@ DECLARE_INTERFACE_(IDVBTLocator2,IDVBTLocator) #undef INTERFACE #define INTERFACE IComponents #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IComponents,IDispatch) { @@ -768,14 +768,13 @@ DECLARE_INTERFACE_(IComponents,IDispatch) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* IComponents methods */ - STDMETHOD_(HRESULT,Add)(THIS_ IComponent *pComponent,VARIANT *pNewIndex) PURE; - STDMETHOD_(HRESULT,Clone)(THIS_ IComponents **ppNewList) PURE; - STDMETHOD_(HRESULT,EnumComponents)(THIS_ IEnumComponents **ppNewEnum) PURE; - STDMETHOD_(HRESULT,get__NewEnum)(THIS_ IEnumVARIANT **ppNewEnum) PURE; STDMETHOD_(HRESULT,get_Count)(THIS_ __LONG32 *pCount) PURE; + STDMETHOD_(HRESULT,get__NewEnum)(THIS_ IEnumVARIANT **ppNewEnum) PURE; + STDMETHOD_(HRESULT,EnumComponents)(THIS_ IEnumComponents **ppNewEnum) PURE; STDMETHOD_(HRESULT,get_Item)(THIS_ VARIANT Index,IComponent **ppComponent) PURE; - STDMETHOD_(HRESULT,put_Item)(THIS_ VARIANT Index,IComponentType *pComponentType) PURE; + STDMETHOD_(HRESULT,Add)(THIS_ IComponent *pComponent,VARIANT *pNewIndex) PURE; STDMETHOD_(HRESULT,Remove)(THIS_ VARIANT Index) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ IComponents **ppNewList) PURE; END_INTERFACE }; @@ -792,16 +791,15 @@ DECLARE_INTERFACE_(IComponents,IDispatch) #define IComponents_get__NewEnum(This,ppNewEnum) (This)->lpVtbl->get__NewEnum(This,ppNewEnum) #define IComponents_get_Count(This,pCount) (This)->lpVtbl->get_Count(This,pCount) #define IComponents_get_Item(This,Index,ppComponent) (This)->lpVtbl->get_Item(This,Index,ppComponent) -#define IComponents_put_Item(This,Index,pComponentType) (This)->lpVtbl->put_Item(This,Index,pComponentType) #define IComponents_Remove(This,Index) (This)->lpVtbl->Remove(This,Index) #endif /*COBJMACROS*/ #undef INTERFACE #define INTERFACE IEnumComponents #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IEnumComponents,IUnknown) { @@ -813,10 +811,10 @@ DECLARE_INTERFACE_(IEnumComponents,IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; /* IEnumComponents methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ IEnumComponents **ppEnum) PURE; STDMETHOD_(HRESULT,Next)(THIS_ ULONG celt,IComponent **pprgelt,ULONG *pceltFetched) PURE; - STDMETHOD_(HRESULT,Reset)(THIS) PURE; STDMETHOD_(HRESULT,Skip)(THIS_ ULONG celt) PURE; + STDMETHOD_(HRESULT,Reset)(THIS) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ IEnumComponents **ppEnum) PURE; END_INTERFACE }; @@ -833,9 +831,9 @@ DECLARE_INTERFACE_(IEnumComponents,IUnknown) #undef INTERFACE #define INTERFACE IComponent #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IComponent,IDispatch) { @@ -853,15 +851,15 @@ DECLARE_INTERFACE_(IComponent,IDispatch) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* IComponent methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ IComponent **ppNewComponent) PURE; - STDMETHOD_(HRESULT,get_DescLangID)(THIS_ __LONG32 *pLangID) PURE; - STDMETHOD_(HRESULT,get_Description)(THIS_ BSTR *pDescription) PURE; - STDMETHOD_(HRESULT,get_Status)(THIS_ ComponentStatus *pStatus) PURE; STDMETHOD_(HRESULT,get_Type)(THIS_ IComponentType **ppCT) PURE; + STDMETHOD_(HRESULT,put_Type)(THIS_ IComponentType *pCT) PURE; + STDMETHOD_(HRESULT,get_DescLangID)(THIS_ __LONG32 *pLangID) PURE; STDMETHOD_(HRESULT,put_DescLangID)(THIS_ __LONG32 LangID) PURE; - STDMETHOD_(HRESULT,put_Description)(THIS_ BSTR Description) PURE; + STDMETHOD_(HRESULT,get_Status)(THIS_ ComponentStatus *pStatus) PURE; STDMETHOD_(HRESULT,put_Status)(THIS_ ComponentStatus Status) PURE; - STDMETHOD_(HRESULT,put_Type)(THIS_ IComponentType *pCT) PURE; + STDMETHOD_(HRESULT,get_Description)(THIS_ BSTR *pDescription) PURE; + STDMETHOD_(HRESULT,put_Description)(THIS_ BSTR Description) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ IComponent **ppNewComponent) PURE; END_INTERFACE }; @@ -955,9 +953,9 @@ DECLARE_INTERFACE_(IMPEG2Component,IComponent) #undef INTERFACE #define INTERFACE ITuningSpace #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(ITuningSpace,IDispatch) { @@ -975,25 +973,25 @@ DECLARE_INTERFACE_(ITuningSpace,IDispatch) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* ITuningSpace methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ ITuningSpace **ppNewTS) PURE; + STDMETHOD_(HRESULT,get_UniqueName)(THIS_ BSTR *pName) PURE; + STDMETHOD_(HRESULT,put_UniqueName)(THIS_ BSTR Name) PURE; + STDMETHOD_(HRESULT,get_FriendlyName)(THIS_ BSTR *pName) PURE; + STDMETHOD_(HRESULT,put_FriendlyName)(THIS_ BSTR Name) PURE; + STDMETHOD_(HRESULT,get_CLSID)(THIS_ BSTR *pSpaceCLSID) PURE; + STDMETHOD_(HRESULT,get_NetworkType)(THIS_ BSTR *pNetworkTypeGuid) PURE; + STDMETHOD_(HRESULT,put_NetworkType)(THIS_ BSTR NetworkTypeGuid) PURE; + STDMETHOD_(HRESULT,get__NetworkType)(THIS_ GUID *pNetworkTypeGuid) PURE; + STDMETHOD_(HRESULT,put__NetworkType)(THIS_ REFCLSID NetworkTypeGuid) PURE; STDMETHOD_(HRESULT,CreateTuneRequest)(THIS_ ITuneRequest **ppTuneRequest) PURE; STDMETHOD_(HRESULT,EnumCategoryGUIDs)(THIS_ IEnumGUID **ppEnum) PURE; STDMETHOD_(HRESULT,EnumDeviceMonikers)(THIS_ IEnumMoniker **ppEnum) PURE; - STDMETHOD_(HRESULT,get__NetworkType)(THIS_ GUID *pNetworkTypeGuid) PURE; - STDMETHOD_(HRESULT,get_CLSID)(THIS_ BSTR *pSpaceCLSID) PURE; - STDMETHOD_(HRESULT,get_DefaultLocator)(THIS_ ILocator **ppLocatorVal) PURE; STDMETHOD_(HRESULT,get_DefaultPreferredComponentTypes)(THIS_ IComponentTypes **ppComponentTypes) PURE; - STDMETHOD_(HRESULT,get_FrequencyMapping)(THIS_ BSTR *pMapping) PURE; - STDMETHOD_(HRESULT,get_FriendlyName)(THIS_ BSTR *pName) PURE; - STDMETHOD_(HRESULT,get_NetworkType)(THIS_ BSTR *pNetworkTypeGuid) PURE; - STDMETHOD_(HRESULT,get_UniqueName)(THIS_ BSTR *pName) PURE; - STDMETHOD_(HRESULT,put__NetworkType)(THIS_ REFCLSID NetworkTypeGuid) PURE; - STDMETHOD_(HRESULT,put_DefaultLocator)(THIS_ ILocator *pLocatorVal) PURE; STDMETHOD_(HRESULT,put_DefaultPreferredComponentTypes)(THIS_ IComponentTypes *pNewComponentTypes) PURE; + STDMETHOD_(HRESULT,get_FrequencyMapping)(THIS_ BSTR *pMapping) PURE; STDMETHOD_(HRESULT,put_FrequencyMapping)(THIS_ BSTR Mapping) PURE; - STDMETHOD_(HRESULT,put_FriendlyName)(THIS_ BSTR Name) PURE; - STDMETHOD_(HRESULT,put_NetworkType)(THIS_ BSTR NetworkTypeGuid) PURE; - STDMETHOD_(HRESULT,put_UniqueName)(THIS_ BSTR Name) PURE; + STDMETHOD_(HRESULT,get_DefaultLocator)(THIS_ ILocator **ppLocatorVal) PURE; + STDMETHOD_(HRESULT,put_DefaultLocator)(THIS_ ILocator *pLocatorVal) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ ITuningSpace **ppNewTS) PURE; END_INTERFACE }; @@ -1005,33 +1003,33 @@ DECLARE_INTERFACE_(ITuningSpace,IDispatch) #define ITuningSpace_GetTypeInfo(This,iTInfo,lcid,ppTInfo) (This)->lpVtbl->GetTypeInfo(This,iTInfo,lcid,ppTInfo) #define ITuningSpace_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) (This)->lpVtbl->GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) #define ITuningSpace_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) (This)->lpVtbl->Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) -#define ITuningSpace_Clone(This,ppNewTS) (This)->lpVtbl->Clone(This,ppNewTS) +#define ITuningSpace_get_UniqueName(This,pName) (This)->lpVtbl->get_UniqueName(This,pName) +#define ITuningSpace_put_UniqueName(This,Name) (This)->lpVtbl->put_UniqueName(This,Name) +#define ITuningSpace_get_FriendlyName(This,pName) (This)->lpVtbl->get_FriendlyName(This,pName) +#define ITuningSpace_put_FriendlyName(This,Name) (This)->lpVtbl->put_FriendlyName(This,Name) +#define ITuningSpace_get_CLSID(This,pSpaceCLSID) (This)->lpVtbl->get_CLSID(This,pSpaceCLSID) +#define ITuningSpace_get_NetworkType(This,pNetworkTypeGuid) (This)->lpVtbl->get_NetworkType(This,pNetworkTypeGuid) +#define ITuningSpace_put_NetworkType(This,NetworkTypeGuid) (This)->lpVtbl->put_NetworkType(This,NetworkTypeGuid) +#define ITuningSpace_get__NetworkType(This,pNetworkTypeGuid) (This)->lpVtbl->get__NetworkType(This,pNetworkTypeGuid) +#define ITuningSpace_put__NetworkType(This,NetworkTypeGuid) (This)->lpVtbl->put__NetworkType(This,NetworkTypeGuid) #define ITuningSpace_CreateTuneRequest(This,ppTuneRequest) (This)->lpVtbl->CreateTuneRequest(This,ppTuneRequest) #define ITuningSpace_EnumCategoryGUIDs(This,ppEnum) (This)->lpVtbl->EnumCategoryGUIDs(This,ppEnum) #define ITuningSpace_EnumDeviceMonikers(This,ppEnum) (This)->lpVtbl->EnumDeviceMonikers(This,ppEnum) -#define ITuningSpace_get__NetworkType(This,pNetworkTypeGuid) (This)->lpVtbl->get__NetworkType(This,pNetworkTypeGuid) -#define ITuningSpace_get_CLSID(This,pSpaceCLSID) (This)->lpVtbl->get_CLSID(This,pSpaceCLSID) -#define ITuningSpace_get_DefaultLocator(This,ppLocatorVal) (This)->lpVtbl->get_DefaultLocator(This,ppLocatorVal) #define ITuningSpace_get_DefaultPreferredComponentTypes(This,ppComponentTypes) (This)->lpVtbl->get_DefaultPreferredComponentTypes(This,ppComponentTypes) -#define ITuningSpace_get_FrequencyMapping(This,pMapping) (This)->lpVtbl->get_FrequencyMapping(This,pMapping) -#define ITuningSpace_get_FriendlyName(This,pName) (This)->lpVtbl->get_FriendlyName(This,pName) -#define ITuningSpace_get_NetworkType(This,pNetworkTypeGuid) (This)->lpVtbl->get_NetworkType(This,pNetworkTypeGuid) -#define ITuningSpace_get_UniqueName(This,pName) (This)->lpVtbl->get_UniqueName(This,pName) -#define ITuningSpace_put__NetworkType(This,NetworkTypeGuid) (This)->lpVtbl->put__NetworkType(This,NetworkTypeGuid) -#define ITuningSpace_put_DefaultLocator(This,pLocatorVal) (This)->lpVtbl->put_DefaultLocator(This,pLocatorVal) #define ITuningSpace_put_DefaultPreferredComponentTypes(This,pNewComponentTypes) (This)->lpVtbl->put_DefaultPreferredComponentTypes(This,pNewComponentTypes) +#define ITuningSpace_get_FrequencyMapping(This,pMapping) (This)->lpVtbl->get_FrequencyMapping(This,pMapping) #define ITuningSpace_put_FrequencyMapping(This,Mapping) (This)->lpVtbl->put_FrequencyMapping(This,Mapping) -#define ITuningSpace_put_FriendlyName(This,Name) (This)->lpVtbl->put_FriendlyName(This,Name) -#define ITuningSpace_put_NetworkType(This,NetworkTypeGuid) (This)->lpVtbl->put_NetworkType(This,NetworkTypeGuid) -#define ITuningSpace_put_UniqueName(This,Name) (This)->lpVtbl->put_UniqueName(This,Name) +#define ITuningSpace_get_DefaultLocator(This,ppLocatorVal) (This)->lpVtbl->get_DefaultLocator(This,ppLocatorVal) +#define ITuningSpace_put_DefaultLocator(This,pLocatorVal) (This)->lpVtbl->put_DefaultLocator(This,pLocatorVal) +#define ITuningSpace_Clone(This,ppNewTS) (This)->lpVtbl->Clone(This,ppNewTS) #endif /*COBJMACROS*/ #undef INTERFACE #define INTERFACE IComponentTypes #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IComponentTypes,IDispatch) { @@ -1049,13 +1047,14 @@ DECLARE_INTERFACE_(IComponentTypes,IDispatch) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* IComponentTypes methods */ - STDMETHOD_(HRESULT,Add)(THIS_ IComponentType *pComponentType,VARIANT *pNewIndex) PURE; - STDMETHOD_(HRESULT,Clone)(THIS_ IComponentTypes **ppNewList) PURE; - STDMETHOD_(HRESULT,EnumComponentTypes)(THIS_ IEnumComponentTypes **ppNewEnum) PURE; - STDMETHOD_(HRESULT,get__NewEnum)(THIS_ IEnumVARIANT **ppNewEnum) PURE; STDMETHOD_(HRESULT,get_Count)(THIS_ __LONG32 *pCount) PURE; + STDMETHOD_(HRESULT,get__NewEnum)(THIS_ IEnumVARIANT **ppNewEnum) PURE; + STDMETHOD_(HRESULT,EnumComponentTypes)(THIS_ IEnumComponentTypes **ppNewEnum) PURE; STDMETHOD_(HRESULT,get_Item)(THIS_ VARIANT Index,IComponentType **ppComponentType) PURE; + STDMETHOD_(HRESULT,put_Item)(THIS_ VARIANT Index,IComponentType *ppComponentType) PURE; + STDMETHOD_(HRESULT,Add)(THIS_ IComponentType *pComponentType,VARIANT *pNewIndex) PURE; STDMETHOD_(HRESULT,Remove)(THIS_ VARIANT Index) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ IComponentTypes **ppNewList) PURE; END_INTERFACE }; @@ -1073,6 +1072,7 @@ DECLARE_INTERFACE_(IComponentTypes,IDispatch) #define IComponentTypes_get__NewEnum(This,ppNewEnum) (This)->lpVtbl->get__NewEnum(This,ppNewEnum) #define IComponentTypes_get_Count(This,pCount) (This)->lpVtbl->get_Count(This,pCount) #define IComponentTypes_get_Item(This,Index,ppComponentType) (This)->lpVtbl->get_Item(This,Index,ppComponentType) +#define IComponentTypes_put_Item(This,Index,ppComponentType) (This)->lpVtbl->put_Item(This,Index,ppComponentType) #define IComponentTypes_Remove(This,Index) (This)->lpVtbl->Remove(This,Index) #endif /*COBJMACROS*/ @@ -1080,9 +1080,9 @@ DECLARE_INTERFACE_(IComponentTypes,IDispatch) #undef INTERFACE #define INTERFACE IComponentType #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IComponentType,IDispatch) { @@ -1100,23 +1100,23 @@ DECLARE_INTERFACE_(IComponentType,IDispatch) STDMETHOD_(HRESULT,Invoke)(THIS_ DISPID dispIdMember,REFIID riid,LCID lcid,WORD wFlags,DISPPARAMS *pDispParams,VARIANT *pVarResult,EXCEPINFO *pExcepInfo,UINT *puArgErr) PURE; /* IComponentType methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ IComponentType **ppNewCT) PURE; - STDMETHOD_(HRESULT,get__MediaFormatType)(THIS_ GUID *pMediaFormatType) PURE; - STDMETHOD_(HRESULT,get__MediaMajorType)(THIS_ GUID *MediaMajorType) PURE; - STDMETHOD_(HRESULT,get__MediaSubType)(THIS_ GUID *pMediaSubType) PURE; STDMETHOD_(HRESULT,get_Category)(THIS_ ComponentCategory *pCategory) PURE; - STDMETHOD_(HRESULT,get_MediaFormatType)(THIS_ BSTR *pMediaFormatType) PURE; + STDMETHOD_(HRESULT,put_Category)(THIS_ ComponentCategory Category) PURE; STDMETHOD_(HRESULT,get_MediaMajorType)(THIS_ BSTR *pMediaMajorType) PURE; - STDMETHOD_(HRESULT,get_MediaSubType)(THIS_ BSTR *pMediaSubType) PURE; - STDMETHOD_(HRESULT,get_MediaType)(THIS_ AM_MEDIA_TYPE *pMediaType) PURE; - STDMETHOD_(HRESULT,put__MediaFormatType)(THIS_ REFCLSID MediaFormatType) PURE; + STDMETHOD_(HRESULT,put_MediaMajorType)(THIS_ BSTR MediaMajorType) PURE; + STDMETHOD_(HRESULT,get__MediaMajorType)(THIS_ GUID *MediaMajorType) PURE; STDMETHOD_(HRESULT,put__MediaMajorType)(THIS_ REFCLSID MediaMajorType) PURE; + STDMETHOD_(HRESULT,get_MediaSubType)(THIS_ BSTR *pMediaSubType) PURE; + STDMETHOD_(HRESULT,put_MediaSubType)(THIS_ BSTR MediaSubType) PURE; + STDMETHOD_(HRESULT,get__MediaSubType)(THIS_ GUID *pMediaSubType) PURE; STDMETHOD_(HRESULT,put__MediaSubType)(THIS_ REFCLSID MediaSubType) PURE; - STDMETHOD_(HRESULT,put_Category)(THIS_ ComponentCategory Category) PURE; + STDMETHOD_(HRESULT,get_MediaFormatType)(THIS_ BSTR *pMediaFormatType) PURE; STDMETHOD_(HRESULT,put_MediaFormatType)(THIS_ BSTR MediaFormatType) PURE; - STDMETHOD_(HRESULT,put_MediaMajorType)(THIS_ BSTR MediaMajorType) PURE; - STDMETHOD_(HRESULT,put_MediaSubType)(THIS_ BSTR MediaSubType) PURE; + STDMETHOD_(HRESULT,get__MediaFormatType)(THIS_ GUID *pMediaFormatType) PURE; + STDMETHOD_(HRESULT,put__MediaFormatType)(THIS_ REFCLSID MediaFormatType) PURE; + STDMETHOD_(HRESULT,get_MediaType)(THIS_ AM_MEDIA_TYPE *pMediaType) PURE; STDMETHOD_(HRESULT,put_MediaType)(THIS_ AM_MEDIA_TYPE MediaType) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ IComponentType **ppNewCT) PURE; END_INTERFACE }; @@ -1150,9 +1150,9 @@ DECLARE_INTERFACE_(IComponentType,IDispatch) #undef INTERFACE #define INTERFACE IEnumComponentTypes #ifdef __GNUC__ -#warning COM interfaces layout in this header has not been verified. -#warning COM interfaces with incorrect layout may not work at all. -__MINGW_BROKEN_INTERFACE(INTERFACE) +///#warning COM interfaces layout in this header has not been verified. +///#warning COM interfaces with incorrect layout may not work at all. +///__MINGW_BROKEN_INTERFACE(INTERFACE) #endif DECLARE_INTERFACE_(IEnumComponentTypes,IUnknown) { @@ -1164,10 +1164,10 @@ DECLARE_INTERFACE_(IEnumComponentTypes,IUnknown) STDMETHOD_(ULONG, Release)(THIS) PURE; /* IEnumComponentTypes methods */ - STDMETHOD_(HRESULT,Clone)(THIS_ IEnumComponentTypes **ppEnum) PURE; STDMETHOD_(HRESULT,Next)(THIS_ ULONG celt,IComponentType **pprgelt,ULONG *pceltFetched) PURE; - STDMETHOD_(HRESULT,Reset)(THIS) PURE; STDMETHOD_(HRESULT,Skip)(THIS_ ULONG celt) PURE; + STDMETHOD_(HRESULT,Reset)(THIS) PURE; + STDMETHOD_(HRESULT,Clone)(THIS_ IEnumComponentTypes **ppEnum) PURE; END_INTERFACE };
------------------------------------------------------------------------------
_______________________________________________ Mingw-w64-public mailing list Mingw-w64-public@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/mingw-w64-public