Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/evr/evr.c | 4 ++-- dlls/qcap/audiorecord.c | 4 ++-- dlls/qcap/avico.c | 4 ++-- dlls/qcap/avimux.c | 4 ++-- dlls/qcap/smartteefilter.c | 4 ++-- dlls/qcap/vfwcapture.c | 4 ++-- dlls/qedit/samplegrabber.c | 4 ++-- dlls/quartz/filesource.c | 4 ++-- dlls/quartz/parser.c | 4 ++-- dlls/strmbase/enumpins.c | 6 +++--- dlls/strmbase/filter.c | 2 +- dlls/strmbase/renderer.c | 4 ++-- dlls/strmbase/transform.c | 4 ++-- dlls/winegstreamer/gstdemux.c | 4 ++-- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- include/wine/strmbase.h | 8 +++----- 16 files changed, 33 insertions(+), 35 deletions(-)
diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 493696f465..612106848b 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -191,7 +191,7 @@ static const IBaseFilterVtbl basefilter_vtbl = BaseFilterImpl_QueryVendorInfo };
-static IPin * WINAPI filter_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI evr_get_pin(BaseFilter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; @@ -199,7 +199,7 @@ static IPin * WINAPI filter_GetPin(BaseFilter *iface, unsigned int index)
static const BaseFilterFuncTable basefilter_functable = { - filter_GetPin, + .filter_get_pin = evr_get_pin, };
HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 1e5aa43cfb..d6b99ee6c3 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -171,14 +171,14 @@ static const IBaseFilterVtbl AudioRecordVtbl = { BaseFilterImpl_QueryVendorInfo };
-static IPin * WINAPI AudioRecord_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI audio_record_get_pin(BaseFilter *iface, unsigned int index) { FIXME("iface %p, index %u, stub!\n", iface, index); return NULL; }
static const BaseFilterFuncTable AudioRecordFuncs = { - AudioRecord_GetPin, + .filter_get_pin = audio_record_get_pin, };
static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, LPVOID *ppv) diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index 770790da1c..2e147a5dc2 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -244,7 +244,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { AVICompressor_QueryVendorInfo };
-static IPin * WINAPI AVICompressor_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI avi_compressor_get_pin(BaseFilter *iface, unsigned int index) { AVICompressor *This = impl_from_BaseFilter(iface); IPin *ret; @@ -261,7 +261,7 @@ static IPin * WINAPI AVICompressor_GetPin(BaseFilter *iface, unsigned int index) }
static const BaseFilterFuncTable filter_func_table = { - AVICompressor_GetPin, + .filter_get_pin = avi_compressor_get_pin, };
static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index ccec60c0b5..927296042b 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -116,7 +116,7 @@ static inline AviMux* impl_from_BaseFilter(BaseFilter *filter) return CONTAINING_RECORD(filter, AviMux, filter); }
-static IPin * WINAPI AviMux_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI avi_mux_get_pin(BaseFilter *iface, unsigned int index) { AviMux *This = impl_from_BaseFilter(iface);
@@ -135,7 +135,7 @@ static IPin * WINAPI AviMux_GetPin(BaseFilter *iface, unsigned int index) }
static const BaseFilterFuncTable filter_func_table = { - AviMux_GetPin, + .filter_get_pin = avi_mux_get_pin, };
static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index e16d08a759..b3a874850b 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -199,7 +199,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { BaseFilterImpl_QueryVendorInfo };
-static IPin * WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI smart_tee_get_pin(BaseFilter *iface, unsigned int index) { SmartTeeFilter *This = impl_from_BaseFilter(iface); IPin *ret; @@ -218,7 +218,7 @@ static IPin * WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, unsigned int index }
static const BaseFilterFuncTable SmartTeeFilterFuncs = { - SmartTeeFilter_GetPin, + .filter_get_pin = smart_tee_get_pin, };
static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 54d9e59786..e5dfead325 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -192,7 +192,7 @@ static const IUnknownVtbl unknown_inner_vtbl = unknown_inner_Release, };
-static IPin * WINAPI VfwCapture_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI vfw_capture_get_pin(BaseFilter *iface, unsigned int index) { VfwCapture *This = impl_from_BaseFilter(iface);
@@ -204,7 +204,7 @@ static IPin * WINAPI VfwCapture_GetPin(BaseFilter *iface, unsigned int index) }
static const BaseFilterFuncTable BaseFuncTable = { - VfwCapture_GetPin, + .filter_get_pin = vfw_capture_get_pin, };
IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index cbaca69962..98775231a6 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -339,7 +339,7 @@ static const IUnknownVtbl samplegrabber_vtbl = SampleGrabber_Release, };
-static IPin * WINAPI SampleGrabber_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI sample_grabber_get_pin(BaseFilter *iface, unsigned int index) { SG_Impl *This = impl_from_BaseFilter(iface); IPin *pin; @@ -356,7 +356,7 @@ static IPin * WINAPI SampleGrabber_GetPin(BaseFilter *iface, unsigned int index) }
static const BaseFilterFuncTable basefunc_vtbl = { - SampleGrabber_GetPin, + .filter_get_pin = sample_grabber_get_pin, };
/* Helper that buffers data and/or calls installed sample callbacks */ diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index f3a2c43c63..b10a7ffa75 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -392,7 +392,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * return hr; }
-static IPin * WINAPI AsyncReader_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI async_reader_get_pin(BaseFilter *iface, unsigned int index) { AsyncReader *This = impl_from_BaseFilter(iface);
@@ -404,7 +404,7 @@ static IPin * WINAPI AsyncReader_GetPin(BaseFilter *iface, unsigned int index) }
static const BaseFilterFuncTable BaseFuncTable = { - AsyncReader_GetPin, + .filter_get_pin = async_reader_get_pin, };
HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c index e21908504a..686394772a 100644 --- a/dlls/quartz/parser.c +++ b/dlls/quartz/parser.c @@ -62,7 +62,7 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) return CONTAINING_RECORD(iface, ParserImpl, filter); }
-static IPin * WINAPI Parser_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI parser_get_pin(BaseFilter *iface, unsigned int index) { ParserImpl *filter = impl_from_BaseFilter(iface);
@@ -74,7 +74,7 @@ static IPin * WINAPI Parser_GetPin(BaseFilter *iface, unsigned int index) }
static const BaseFilterFuncTable BaseFuncTable = { - Parser_GetPin, + .filter_get_pin = parser_get_pin, };
HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 4503a4705e..198c8397a3 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -59,7 +59,7 @@ HRESULT enum_pins_create(BaseFilter *base, IEnumPins **out) IBaseFilter_AddRef(&base->IBaseFilter_iface); object->Version = base->pin_version;
- while ((pin = base->pFuncsTable->pfnGetPin(base, object->count))) + while ((pin = base->pFuncsTable->filter_get_pin(base, object->count))) { IPin_Release(pin); ++object->count; @@ -141,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** while (i < cPins) { IPin *pin; - pin = This->base->pFuncsTable->pfnGetPin(This->base, This->uIndex + i); + pin = This->base->pFuncsTable->filter_get_pin(This->base, This->uIndex + i);
if (!pin) break; @@ -185,7 +185,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) if (enum_pins->Version != enum_pins->base->pin_version) { enum_pins->count = 0; - while ((pin = enum_pins->base->pFuncsTable->pfnGetPin(enum_pins->base, enum_pins->count))) + while ((pin = enum_pins->base->pFuncsTable->filter_get_pin(enum_pins->base, enum_pins->count))) { IPin_Release(pin); ++enum_pins->count; diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index c554097814..f9dd72c73c 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -144,7 +144,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin
TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret);
- for (i = 0; (pin = This->pFuncsTable->pfnGetPin(This, i)); ++i) + for (i = 0; (pin = This->pFuncsTable->filter_get_pin(This, i)); ++i) { hr = IPin_QueryPinInfo(pin, &info); if (FAILED(hr)) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index cf6643befe..278bf0a346 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -183,7 +183,7 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BaseInputPinImpl_NewSegment };
-static IPin * WINAPI BaseRenderer_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI renderer_get_pin(BaseFilter *iface, unsigned int index) { BaseRenderer *This = impl_from_BaseFilter(iface);
@@ -207,7 +207,7 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa }
static const BaseFilterFuncTable RendererBaseFilterFuncTable = { - BaseRenderer_GetPin, + .filter_get_pin = renderer_get_pin, };
static const BaseInputPinFuncTable input_BaseInputFuncTable = { diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 8f156ae3de..e19f3ef336 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -128,7 +128,7 @@ static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPo return S_OK; }
-static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, unsigned int index) +static IPin * WINAPI transform_get_pin(BaseFilter *iface, unsigned int index) { TransformFilter *filter = impl_from_BaseFilter(iface);
@@ -140,7 +140,7 @@ static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, unsigned int index }
static const BaseFilterFuncTable tfBaseFuncTable = { - TransformFilter_GetPin, + .filter_get_pin = transform_get_pin, };
static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3e660216e8..a4f1a8333d 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1192,7 +1192,7 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); }
-static IPin* WINAPI GST_GetPin(BaseFilter *base, unsigned int index) +static IPin * WINAPI gstdemux_get_pin(BaseFilter *base, unsigned int index) { GSTImpl *This = impl_from_IBaseFilter(&base->IBaseFilter_iface); IPin *pin; @@ -1210,7 +1210,7 @@ static IPin* WINAPI GST_GetPin(BaseFilter *base, unsigned int index) }
static const BaseFilterFuncTable BaseFuncTable = { - GST_GetPin, + .filter_get_pin = gstdemux_get_pin, };
IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 6fd4554056..3b00a015fe 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -202,7 +202,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) * Base Filter */
-static IPin * WINAPI QT_GetPin(BaseFilter *base, unsigned int index) +static IPin * WINAPI qt_splitter_get_pin(BaseFilter *base, unsigned int index) { QTSplitter *filter = impl_from_BaseFilter(base);
@@ -234,7 +234,7 @@ static IPin * WINAPI QT_GetPin(BaseFilter *base, unsigned int index) }
static const BaseFilterFuncTable BaseFuncTable = { - QT_GetPin, + .filter_get_pin = qt_splitter_get_pin, };
IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index c10e6e2123..17a58a1a62 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -168,11 +168,9 @@ typedef struct BaseFilter const struct BaseFilterFuncTable* pFuncsTable; } BaseFilter;
-typedef IPin * (WINAPI *BaseFilter_GetPin)(BaseFilter *iface, unsigned int index); - -typedef struct BaseFilterFuncTable { - /* Required */ - BaseFilter_GetPin pfnGetPin; +typedef struct BaseFilterFuncTable +{ + IPin *(WINAPI *filter_get_pin)(BaseFilter *iface, unsigned int index); } BaseFilterFuncTable;
HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);