December 2019 - Wine-commits

Alexandre Julliard : kernel32: Remove initialization of the global argv.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: a2c107fca35c14455493f895a8b1ff486e68c8f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2c107fca35c14455493f895… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:45:50 2019 +0100 kernel32: Remove initialization of the global argv. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 1d61853d86..9247e3c117 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -77,36 +77,6 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) } -/*********************************************************************** - * set_library_argv - * - * Set the Wine library argv global variable. - */ -static void set_library_argv( WCHAR **wargv ) -{ - int argc; - char *p, **argv; - DWORD total = 0; - - /* convert argv back from Unicode since it has to be in the Ansi codepage not the Unix one */ - - for (argc = 0; wargv[argc]; argc++) - total += WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, NULL, 0, NULL, NULL ); - - argv = RtlAllocateHeap( GetProcessHeap(), 0, total + (argc + 1) * sizeof(*argv) ); - p = (char *)(argv + argc + 1); - for (argc = 0; wargv[argc]; argc++) - { - DWORD reslen = WideCharToMultiByte( CP_ACP, 0, wargv[argc], -1, p, total, NULL, NULL ); - argv[argc] = p; - p += reslen; - total -= reslen; - } - argv[argc] = NULL; - __wine_main_argv = argv; -} - - /*********************************************************************** * KERNEL process initialisation routine */ @@ -114,7 +84,6 @@ static BOOL process_attach( HMODULE module ) { RTL_USER_PROCESS_PARAMETERS *params = NtCurrentTeb()->Peb->ProcessParameters; - set_library_argv( __wine_main_wargv ); NtQuerySystemInformation( SystemBasicInformation, &system_info, sizeof(system_info), NULL ); /* Setup registry timezone information */

1 0

Alexandre Julliard : kernel32: Use MultiByteToWideChar() and WideCharToMultiByte() from kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 830de63139725a0e4574d8674c1b09b5b908db4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=830de63139725a0e4574d867… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:47:34 2019 +0100 kernel32: Use MultiByteToWideChar() and WideCharToMultiByte() from kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/kernel_private.h | 3 - dlls/kernel32/locale.c | 589 ----------------------------------------- dlls/kernel32/process.c | 2 - dlls/kernelbase/locale.c | 5 +- 5 files changed, 6 insertions(+), 597 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=830de63139725a0e4574…

1 0

Alexandre Julliard : kernel32: Move Get/SetLocaleInfoW() to kernelbase.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 6bcda47419b527046711140d16a5be65af056bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=6bcda47419b527046711140d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat Dec 7 14:47:43 2019 +0100 kernel32: Move Get/SetLocaleInfoW() to kernelbase. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel32.spec | 4 +- dlls/kernel32/locale.c | 501 ---------------------------------------- dlls/kernelbase/kernelbase.spec | 4 +- dlls/kernelbase/locale.c | 289 +++++++++++++++++++++++ 4 files changed, 293 insertions(+), 505 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6bcda47419b527046711…

1 0

Alistair Leslie-Hughes : wineqtdecoder: Fix some copy-paste errors.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 9582f6a41d70b2291e4676bd1cb87fb553c4f694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9582f6a41d70b2291e4676bd… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Dec 7 22:20:31 2019 -0600 wineqtdecoder: Fix some copy-paste errors. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 5b1e82ebc9..0dbc3d8bf1 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -285,7 +285,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE QTSplitter *filter = impl_from_strmbase_filter(iface); HRESULT hr = VFW_E_NOT_CONNECTED, pin_hr; - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); if (filter->pVideo_Pin) pin_hr = BaseOutputPinImpl_Active(&filter->pVideo_Pin->pin); @@ -297,7 +297,7 @@ static HRESULT qt_splitter_start_stream(struct strmbase_filter *iface, REFERENCE hr = pin_hr; SetEvent(filter->runEvent); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return hr; } @@ -306,10 +306,10 @@ static HRESULT qt_splitter_cleanup_stream(struct strmbase_filter *iface) { QTSplitter *filter = impl_from_strmbase_filter(iface); - EnterCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); IAsyncReader_BeginFlush(filter->pInputPin.pReader); IAsyncReader_EndFlush(filter->pInputPin.pReader); - LeaveCriticalSection(&This->csReceive); + LeaveCriticalSection(&filter->csReceive); return S_OK; }

1 0

Zebediah Figura : wineqtdecoder: Move the SourceSeeking structure to the source pin.
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 54ccf805e7933ec8e7cad57daa5ac4037ac94ed0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54ccf805e7933ec8e7cad57d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:32 2019 -0600 wineqtdecoder: Move the SourceSeeking structure to the source pin. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 53 ++++++++++++++++++++--------------------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 0dbc3d8bf1..1db6dfd6ad 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -131,6 +131,7 @@ extern CLSID CLSID_QTSplitter; typedef struct QTOutPin { struct strmbase_source pin; IQualityControl IQualityControl_iface; + SourceSeeking seeking; AM_MEDIA_TYPE * pmt; OutputQueue * queue; @@ -162,7 +163,6 @@ typedef struct QTSplitter { DWORD outputSize; CRITICAL_SECTION csReceive; - SourceSeeking sourceSeeking; TimeValue movie_time; TimeValue movie_start; TimeScale movie_scale; @@ -183,9 +183,9 @@ static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface); static HRESULT WINAPI QTSplitter_ChangeStop(IMediaSeeking *iface); static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface); -static inline QTSplitter *impl_from_IMediaSeeking( IMediaSeeking *iface ) +static inline QTOutPin *impl_from_IMediaSeeking(IMediaSeeking *iface) { - return CONTAINING_RECORD(iface, QTSplitter, sourceSeeking.IMediaSeeking_iface); + return CONTAINING_RECORD(iface, QTOutPin, seeking.IMediaSeeking_iface); } static inline QTSplitter *impl_from_strmbase_filter(struct strmbase_filter *iface) @@ -374,9 +374,6 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *outer, HRESULT *phr) This->pInputPin.pin.peer = NULL; This->pInputPin.pin.pFuncsTable = &sink_ops; - strmbase_seeking_init(&This->sourceSeeking, &QT_Seeking_Vtbl, - QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate); - *phr = S_OK; return &This->filter.IUnknown_inner; } @@ -731,6 +728,7 @@ static void free_source_pin(QTOutPin *pin) } DeleteMediaType(pin->pmt); + strmbase_seeking_cleanup(&pin->seeking); strmbase_source_cleanup(&pin->pin); heap_free(pin); } @@ -914,7 +912,7 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) Track trk; short id = 0; DWORD tid; - LONGLONG time; + LONGLONG time, duration; TRACE("Trying movie connect\n"); @@ -955,10 +953,12 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) time = GetMovieDuration(filter->pQTMovie); filter->movie_scale = GetMovieTimeScale(filter->pQTMovie); - filter->sourceSeeking.llDuration = ((double)time / filter->movie_scale) * 10000000; - filter->sourceSeeking.llStop = filter->sourceSeeking.llDuration; - - TRACE("Movie duration is %s\n",wine_dbgstr_longlong(filter->sourceSeeking.llDuration)); + duration = ((double)time / filter->movie_scale) * 10000000; + TRACE("Movie duration is %s.\n", wine_dbgstr_longlong(duration)); + if (filter->pVideo_Pin) + filter->pVideo_Pin->seeking.llStop = filter->pVideo_Pin->seeking.llDuration = duration; + if (filter->pAudio_Pin) + filter->pAudio_Pin->seeking.llStop = filter->pAudio_Pin->seeking.llDuration = duration; filter->loaderThread = CreateThread(NULL, 0, QTSplitter_loading_thread, filter, 0, &tid); if (filter->loaderThread) @@ -1171,7 +1171,7 @@ static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **p else if (IsEqualIID(riid, &IID_IPin)) *ppv = iface; else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->sourceSeeking.IMediaSeeking_iface; + *ppv = &This->seeking.IMediaSeeking_iface; else if (IsEqualIID(riid, &IID_IQualityControl)) *ppv = &This->IQualityControl_iface; @@ -1328,6 +1328,8 @@ static HRESULT QT_AddPin(QTSplitter *filter, const WCHAR *name, pin->pmt = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)); CopyMediaType(pin->pmt, mt); pin->IQualityControl_iface.lpVtbl = &QTOutPin_QualityControl_Vtbl; + strmbase_seeking_init(&pin->seeking, &QT_Seeking_Vtbl, + QTSplitter_ChangeStop, QTSplitter_ChangeStart, QTSplitter_ChangeRate); BaseFilterImpl_IncrementPinVersion(&filter->filter); return OutputQueue_Construct(&pin->pin, TRUE, TRUE, 5, FALSE, @@ -1336,12 +1338,12 @@ static HRESULT QT_AddPin(QTSplitter *filter, const WCHAR *name, static HRESULT WINAPI QTSplitter_ChangeStart(IMediaSeeking *iface) { - QTSplitter *This = impl_from_IMediaSeeking(iface); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + QTSplitter *filter = impl_from_strmbase_filter(pin->pin.pin.filter); TRACE("(%p)\n", iface); - EnterCriticalSection(&This->csReceive); - This->movie_time = (This->sourceSeeking.llCurrent * This->movie_scale)/10000000; - This->movie_start = This->movie_time; - LeaveCriticalSection(&This->csReceive); + EnterCriticalSection(&filter->csReceive); + filter->movie_start = filter->movie_time = (pin->seeking.llCurrent * filter->movie_scale)/10000000; + LeaveCriticalSection(&filter->csReceive); return S_OK; } @@ -1357,25 +1359,22 @@ static HRESULT WINAPI QTSplitter_ChangeRate(IMediaSeeking *iface) return S_OK; } -static HRESULT WINAPI QT_Seeking_QueryInterface(IMediaSeeking * iface, REFIID riid, LPVOID * ppv) +static HRESULT WINAPI QT_Seeking_QueryInterface(IMediaSeeking *iface, REFIID iid, void **out) { - QTSplitter *This = impl_from_IMediaSeeking(iface); - - return IBaseFilter_QueryInterface(&This->filter.IBaseFilter_iface, riid, ppv); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + return IPin_QueryInterface(&pin->pin.pin.IPin_iface, iid, out); } static ULONG WINAPI QT_Seeking_AddRef(IMediaSeeking * iface) { - QTSplitter *This = impl_from_IMediaSeeking(iface); - - return IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + return IPin_AddRef(&pin->pin.pin.IPin_iface); } static ULONG WINAPI QT_Seeking_Release(IMediaSeeking * iface) { - QTSplitter *This = impl_from_IMediaSeeking(iface); - - return IBaseFilter_Release(&This->filter.IBaseFilter_iface); + QTOutPin *pin = impl_from_IMediaSeeking(iface); + return IPin_Release(&pin->pin.pin.IPin_iface); } static const IMediaSeekingVtbl QT_Seeking_Vtbl =

1 0

Zebediah Figura : winegstreamer: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 5c83561b3324e82c0e67a2cd8c463c3d8ad16f31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5c83561b3324e82c0e67a2cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:33 2019 -0600 winegstreamer: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 63 +++++++++---------------------------------- 1 file changed, 13 insertions(+), 50 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 78c8e38701..04fb54915c 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1735,29 +1735,19 @@ static inline struct gstdemux_source *impl_source_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct gstdemux_source, pin.pin.IPin_iface); } -static HRESULT WINAPI GSTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - struct gstdemux_source *This = impl_source_from_IPin(iface); + struct gstdemux_source *pin = impl_source_from_IPin(&iface->IPin_iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->seek; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->seek.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; - if (*ppv) { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - FIXME("No interface for %s!\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) @@ -1847,7 +1837,7 @@ static void free_source_pin(struct gstdemux_source *pin) } static const IPinVtbl GST_OutputPin_Vtbl = { - GSTOutPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect, @@ -1869,6 +1859,7 @@ static const IPinVtbl GST_OutputPin_Vtbl = { static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = source_query_interface, .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, @@ -2071,36 +2062,8 @@ static HRESULT WINAPI GSTInPin_NewSegment(IPin *iface, REFERENCE_TIME start, return S_OK; } -static HRESULT WINAPI GSTInPin_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) -{ - struct gstdemux *filter = impl_from_sink_IPin(iface); - - TRACE("filter %p, riid %s, ppv %p.\n", filter, debugstr_guid(riid), ppv); - - *ppv = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - { - return IBaseFilter_QueryInterface(&filter->filter.IBaseFilter_iface, &IID_IMediaSeeking, ppv); - } - - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - - FIXME("No interface for %s!\n", debugstr_guid(riid)); - - return E_NOINTERFACE; -} - static const IPinVtbl GST_InputPin_Vtbl = { - GSTInPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect,

1 0

Zebediah Figura : wineqtdecoder: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 724b7f085375a85291703fe6de86b0de9c5f85ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=724b7f085375a85291703fe6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:34 2019 -0600 wineqtdecoder: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 45 ++++++++++++----------------------------- 1 file changed, 13 insertions(+), 32 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 1db6dfd6ad..2ce06a7f59 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1140,15 +1140,7 @@ static const IPinVtbl QT_InputPin_Vtbl = { QTInPin_NewSegment }; -/* - * Output Pin - */ -static inline QTOutPin *impl_QTOutPin_from_IPin( IPin *iface ) -{ - return CONTAINING_RECORD(iface, QTOutPin, pin.pin.IPin_iface); -} - -static inline QTOutPin *impl_sink_from_strmbase_pin(struct strmbase_pin *iface) +static inline QTOutPin *impl_source_from_strmbase_pin(struct strmbase_pin *iface) { return CONTAINING_RECORD(iface, QTOutPin, pin.pin); } @@ -1158,30 +1150,19 @@ static inline QTOutPin *impl_QTOutPin_from_BaseOutputPin(struct strmbase_source return CONTAINING_RECORD(iface, QTOutPin, pin); } -static HRESULT WINAPI QTOutPin_QueryInterface(IPin *iface, REFIID riid, void **ppv) +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) { - QTOutPin *This = impl_QTOutPin_from_IPin(iface); - - TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); - - *ppv = NULL; + QTOutPin *pin = impl_source_from_strmbase_pin(&iface->IPin_iface); - if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if (IsEqualIID(riid, &IID_IMediaSeeking)) - *ppv = &This->seeking.IMediaSeeking_iface; - else if (IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; + if (IsEqualGUID(iid, &IID_IMediaSeeking)) + *out = &pin->seeking.IMediaSeeking_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; - if (*ppv) - { - IUnknown_AddRef((IUnknown *)(*ppv)); - return S_OK; - } - FIXME("No interface for %s!\n", debugstr_guid(riid)); - return E_NOINTERFACE; + IUnknown_AddRef((IUnknown *)*out); + return S_OK; } static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) @@ -1192,7 +1173,7 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP static HRESULT source_get_media_type(struct strmbase_pin *iface, unsigned int iPosition, AM_MEDIA_TYPE *pmt) { - QTOutPin *This = impl_sink_from_strmbase_pin(iface); + QTOutPin *This = impl_source_from_strmbase_pin(iface); if (iPosition > 0) return VFW_S_NO_MORE_ITEMS; @@ -1231,7 +1212,7 @@ static HRESULT WINAPI QTOutPin_DecideAllocator(struct strmbase_source *iface, } static const IPinVtbl QT_OutputPin_Vtbl = { - QTOutPin_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseOutputPinImpl_Connect,

1 0

Zebediah Figura : qcap/avimux: Use BasePinImpl_QueryInterface().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 9b51be54b0ad9ec6cd9594b6ee52cb790014f878 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b51be54b0ad9ec6cd9594b6… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:35 2019 -0600 qcap/avimux: Use BasePinImpl_QueryInterface(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 94 ++++++++++++++++++++++++++---------------------------- 1 file changed, 46 insertions(+), 48 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index dc28104c80..645f0b7d5e 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1108,6 +1108,24 @@ static const ISpecifyPropertyPagesVtbl SpecifyPropertyPagesVtbl = { SpecifyPropertyPages_GetPages }; +static inline AviMux *impl_from_source_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, AviMux, source.pin); +} + +static HRESULT source_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + AviMux *filter = impl_from_source_pin(iface); + + if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &filter->IQualityControl_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *amt) { FIXME("(%p) stub\n", base); @@ -1176,6 +1194,7 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(struct strmbase_source *base, static const struct strmbase_source_ops source_ops = { + .base.pin_query_interface = source_query_interface, .base.pin_query_accept = source_query_accept, .base.pin_get_media_type = source_get_media_type, .pfnAttemptConnection = AviMuxOut_AttemptConnection, @@ -1187,26 +1206,6 @@ static inline AviMux *impl_from_out_IPin(IPin *iface) return CONTAINING_RECORD(iface, AviMux, source.pin.IPin_iface); } -static HRESULT WINAPI AviMuxOut_QueryInterface(IPin *iface, REFIID riid, void **ppv) -{ - AviMux *This = impl_from_out_IPin(iface); - - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), ppv); - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &This->IQualityControl_iface; - else { - FIXME("no interface for %s\n", debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { @@ -1250,7 +1249,7 @@ static HRESULT WINAPI AviMuxOut_Disconnect(IPin *iface) } static const IPinVtbl AviMuxOut_PinVtbl = { - AviMuxOut_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, AviMuxOut_Connect, @@ -1321,6 +1320,30 @@ static const IQualityControlVtbl AviMuxOut_QualityControlVtbl = { AviMuxOut_QualityControl_SetSink }; +static inline AviMuxIn *impl_sink_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, AviMuxIn, pin.pin.IPin_iface); +} + +static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + AviMuxIn *pin = impl_sink_from_strmbase_pin(iface); + + if (IsEqualGUID(iid, &IID_IAMStreamControl)) + *out = &pin->IAMStreamControl_iface; + else if (IsEqualGUID(iid, &IID_IMemInputPin)) + *out = &pin->pin.IMemInputPin_iface; + else if (IsEqualGUID(iid, &IID_IPropertyBag)) + *out = &pin->IPropertyBag_iface; + else if (IsEqualGUID(iid, &IID_IQualityControl)) + *out = &pin->IQualityControl_iface; + else + return E_NOINTERFACE; + + IUnknown_AddRef((IUnknown *)*out); + return S_OK; +} + static HRESULT sink_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYPE *pmt) { if(IsEqualIID(&pmt->majortype, &MEDIATYPE_Audio) && @@ -1441,6 +1464,7 @@ static HRESULT WINAPI AviMuxIn_Receive(struct strmbase_sink *base, IMediaSample static const struct strmbase_sink_ops sink_ops = { + .base.pin_query_interface = sink_query_interface, .base.pin_query_accept = sink_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, .pfnReceive = AviMuxIn_Receive, @@ -1457,32 +1481,6 @@ static inline AviMuxIn* AviMuxIn_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, AviMuxIn, pin.pin.IPin_iface); } -static HRESULT WINAPI AviMuxIn_QueryInterface(IPin *iface, REFIID riid, void **ppv) -{ - AviMuxIn *avimuxin = AviMuxIn_from_IPin(iface); - - TRACE("pin %p, riid %s, ppv %p.\n", avimuxin, debugstr_guid(riid), ppv); - - if(IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IPin)) - *ppv = &avimuxin->pin.pin.IPin_iface; - else if(IsEqualIID(riid, &IID_IAMStreamControl)) - *ppv = &avimuxin->IAMStreamControl_iface; - else if(IsEqualIID(riid, &IID_IMemInputPin)) - *ppv = &avimuxin->pin.IMemInputPin_iface; - else if(IsEqualIID(riid, &IID_IPropertyBag)) - *ppv = &avimuxin->IPropertyBag_iface; - else if(IsEqualIID(riid, &IID_IQualityControl)) - *ppv = &avimuxin->IQualityControl_iface; - else { - FIXME("no interface for %s\n", debugstr_guid(riid)); - *ppv = NULL; - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; -} - static HRESULT WINAPI AviMuxIn_ReceiveConnection(IPin *iface, IPin *pConnector, const AM_MEDIA_TYPE *pmt) { @@ -1576,7 +1574,7 @@ static HRESULT WINAPI AviMuxIn_Disconnect(IPin *iface) } static const IPinVtbl AviMuxIn_PinVtbl = { - AviMuxIn_QueryInterface, + BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, BaseInputPinImpl_Connect,

1 0

Zebediah Figura : qcap/avimux: Use BaseOutputPinImpl_Disconnect().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 47e64825fe7c4fa786de9369b9b245c1098c053f URL: https://source.winehq.org/git/wine.git/?a=commit;h=47e64825fe7c4fa786de9369… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:36 2019 -0600 qcap/avimux: Use BaseOutputPinImpl_Disconnect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 645f0b7d5e..d2f29dbbeb 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1230,21 +1230,6 @@ static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, } } - if(hr == S_OK) - IBaseFilter_AddRef(&This->filter.IBaseFilter_iface); - return hr; -} - -static HRESULT WINAPI AviMuxOut_Disconnect(IPin *iface) -{ - AviMux *This = impl_from_out_IPin(iface); - HRESULT hr; - - TRACE("(%p)\n", This); - - hr = BaseOutputPinImpl_Disconnect(iface); - if(hr == S_OK) - IBaseFilter_Release(&This->filter.IBaseFilter_iface); return hr; } @@ -1254,7 +1239,7 @@ static const IPinVtbl AviMuxOut_PinVtbl = { BasePinImpl_Release, AviMuxOut_Connect, BaseOutputPinImpl_ReceiveConnection, - AviMuxOut_Disconnect, + BaseOutputPinImpl_Disconnect, BasePinImpl_ConnectedTo, BasePinImpl_ConnectionMediaType, BasePinImpl_QueryPinInfo,

1 0

Zebediah Figura : qcap/avimux: Use BaseOutputPinImpl_Connect().
by Alexandre Julliard 09 Dec '19

09 Dec '19

Module: wine Branch: master Commit: 5ea2267f28f1b2043458722690a945904af79c80 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ea2267f28f1b20434587226… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Dec 7 22:20:37 2019 -0600 qcap/avimux: Use BaseOutputPinImpl_Connect(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 58 ++++++++++++++++++++---------------------------------- 1 file changed, 21 insertions(+), 37 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index d2f29dbbeb..677e79ef68 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -1132,19 +1132,35 @@ static HRESULT source_query_accept(struct strmbase_pin *base, const AM_MEDIA_TYP return S_OK; } -static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *base, +static HRESULT WINAPI AviMuxOut_AttemptConnection(struct strmbase_source *iface, IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) { + AviMux *filter = impl_from_source_pin(&iface->pin); PIN_DIRECTION dir; + unsigned int i; HRESULT hr; - TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", base, pReceivePin, pmt); - hr = IPin_QueryDirection(pReceivePin, &dir); if(hr==S_OK && dir!=PINDIR_INPUT) return VFW_E_INVALID_DIRECTION; - return BaseOutputPinImpl_AttemptConnection(base, pReceivePin, pmt); + if (FAILED(hr = BaseOutputPinImpl_AttemptConnection(iface, pReceivePin, pmt))) + return hr; + + for (i = 0; i < filter->input_pin_no; ++i) + { + if (!filter->in[i]->pin.pin.peer) + continue; + + hr = IFilterGraph_Reconnect(filter->filter.filterInfo.pGraph, &filter->in[i]->pin.pin.IPin_iface); + if (FAILED(hr)) + { + IPin_Disconnect(&iface->pin.IPin_iface); + break; + } + } + + return hr; } static HRESULT source_get_media_type(struct strmbase_pin *base, unsigned int iPosition, AM_MEDIA_TYPE *amt) @@ -1201,43 +1217,11 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = AviMuxOut_DecideAllocator, }; -static inline AviMux *impl_from_out_IPin(IPin *iface) -{ - return CONTAINING_RECORD(iface, AviMux, source.pin.IPin_iface); -} - -static HRESULT WINAPI AviMuxOut_Connect(IPin *iface, - IPin *pReceivePin, const AM_MEDIA_TYPE *pmt) -{ - AviMux *This = impl_from_out_IPin(iface); - HRESULT hr; - int i; - - TRACE("(%p)->(%p AM_MEDIA_TYPE(%p))\n", This, pReceivePin, pmt); - - hr = BaseOutputPinImpl_Connect(iface, pReceivePin, pmt); - if(FAILED(hr)) - return hr; - - for(i=0; i<This->input_pin_no; i++) { - if(!This->in[i]->pin.pin.peer) - continue; - - hr = IFilterGraph_Reconnect(This->filter.filterInfo.pGraph, &This->in[i]->pin.pin.IPin_iface); - if(FAILED(hr)) { - BaseOutputPinImpl_Disconnect(iface); - break; - } - } - - return hr; -} - static const IPinVtbl AviMuxOut_PinVtbl = { BasePinImpl_QueryInterface, BasePinImpl_AddRef, BasePinImpl_Release, - AviMuxOut_Connect, + BaseOutputPinImpl_Connect, BaseOutputPinImpl_ReceiveConnection, BaseOutputPinImpl_Disconnect, BasePinImpl_ConnectedTo,

1 0