wine-commits December 2019

wine-commits@winehq.org

1 participants
635 discussions

Francois Gouget : winevulkan: Fix the spelling of an ERR() message.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 0d6f7d44a2f5390f74501376b9d9017855ac9c5e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d6f7d44a2f5390f74501376… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:24 2019 +0100 winevulkan: Fix the spelling of an ERR() message. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/vulkan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/vulkan.c b/dlls/winevulkan/vulkan.c index 725bdf019e..59472bcef8 100644 --- a/dlls/winevulkan/vulkan.c +++ b/dlls/winevulkan/vulkan.c @@ -1050,7 +1050,7 @@ VkResult WINAPI wine_vkQueueSubmit(VkQueue queue, uint32_t count, command_buffers = heap_calloc(num_command_buffers, sizeof(*submits_host)); if (!command_buffers) { - ERR("Unable to allocate memory for comman buffers!\n"); + ERR("Unable to allocate memory for command buffers!\n"); res = VK_ERROR_OUT_OF_HOST_MEMORY; goto done; }

1 0

Francois Gouget : winevulkan: Fix the spelling of a make_vulkan comment.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 8b86f185115e1b1b7c9f898a191ef52099618364 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b86f185115e1b1b7c9f898a… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:16 2019 +0100 winevulkan: Fix the spelling of a make_vulkan comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index b8335ca3ad..f9b1e1cf96 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -235,7 +235,7 @@ class VkBaseType(object): Args: name (:obj:'str'): Name of the base type. - _type (:obj:'str'): Underlaying type + _type (:obj:'str'): Underlying type alias (bool): type is an alias or not. requires (:obj:'str', optional): Other types required. Often bitmask values pull in a *FlagBits type.

1 0

Francois Gouget : shlwapi: Fix the spelling of a couple of comments.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 1f552719bd47f0a59826d9269e44fb1d48176dbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f552719bd47f0a59826d926… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 13 00:13:02 2019 +0100 shlwapi: Fix the spelling of a couple of comments. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shlwapi/ordinal.c | 2 +- dlls/shlwapi/tests/ordinal.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index fbdd83a425..c5c4fa14ad 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -4635,7 +4635,7 @@ static const struct objcompat_entry objcompat_table[] = { * in registry for CLSID under ShellCompatibility subkey. * * PARAMS - * pUnk: pointer to object IUnknown interface, idetifies CLSID + * pUnk: pointer to object IUnknown interface, identifies CLSID * clsid: pointer to CLSID to retrieve data for * * RETURNS diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 6781b09432..135d82ead1 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -1485,7 +1485,7 @@ static void test_IConnectionPoint(void) rc = pConnectToConnectionPoint(NULL, &IID_NULL, FALSE, (IUnknown*)container, &cookie, NULL); ok(rc == S_OK, "pConnectToConnectionPoint failed with %x\n",rc); -/* MSDN says this should be required but it crashs on XP +/* MSDN says this should be required but it crashes on XP IUnknown_Release(point); */ ref = IUnknown_Release((IUnknown*)container);

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: b958cfd39ff9d894fa118534b9853d71db039e41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b958cfd39ff9d894fa118534… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Dec 13 10:37:27 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/po/lt.po b/po/lt.po index 76eae14623..68ab5b3d03 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-12-01 13:42+0200\n" +"PO-Revision-Date: 2019-12-13 10:36+0200\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -8297,26 +8297,20 @@ msgid "Off" msgstr "Išjungta" #: version.rc:42 -#, fuzzy -#| msgid "video" msgid "Provider" -msgstr "vaizdas" +msgstr "Tiekėjas" #: version.rc:45 -#, fuzzy -#| msgid "Select the format you want to use:" msgid "Select the data you want to connect to:" -msgstr "Išrinkite formatą, kurį norite naudoti:" +msgstr "Išrinkite duomenis, prie kurių norite jungtis:" #: version.rc:36 -#, fuzzy -#| msgid "Properties" msgid "Data Link Properties" -msgstr "Savybės" +msgstr "Duomenų saito savybės" #: version.rc:37 msgid "OLE DB Provider(s)" -msgstr "" +msgstr "OLE DB tiekėjai" #: oledlg.rc:55 msgid "Insert Object"

1 0

Louis Lenders : wine.inf: Add powershell location to the path.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 36938b8a9e775f31db29ce9bd287ce46bf2f9a13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36938b8a9e775f31db29ce9b… Author: Louis Lenders <xerox.xerox2000x(a)gmail.com> Date: Fri Dec 13 09:21:16 2019 +0100 wine.inf: Add powershell location to the path. Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index d324461c6e..d62fd5065b 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -624,7 +624,7 @@ HKLM,%Control%\Session Manager,HeapDeCommitTotalFreeThreshold,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentCommit,0x00040002,0 HKLM,%Control%\Session Manager,HeapSegmentReserve,0x00040002,0 HKLM,%Control%\Session Manager\Environment,"ComSpec",0x00020000,"%11%\cmd.exe" -HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem" +HKLM,%Control%\Session Manager\Environment,"PATH",0x00020002,"%11%;%10%;%11%\wbem;%11%\WindowsPowershell\v1.0" HKLM,%Control%\Session Manager\Environment,"PATHEXT",,".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH" HKLM,%Control%\Session Manager\Environment,"SystemDrive",2,"c:" HKLM,%Control%\Session Manager\Environment,"SYSTEMROOT",,"%10%"

1 0

Zebediah Figura : strmbase: Get rid of the "vtbl" parameter to strmbase_sink_init().
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: a6aea1cecd5b59e191be23e163319f13b7370450 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6aea1cecd5b59e191be23e1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 12 21:24:39 2019 -0600 strmbase: Get rid of the "vtbl" parameter to strmbase_sink_init(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avico.c | 24 +--------- dlls/qcap/avimux.c | 23 +-------- dlls/qcap/smartteefilter.c | 23 +-------- dlls/qedit/samplegrabber.c | 24 +--------- dlls/strmbase/pin.c | 101 ++++++++++++++++++++++++---------------- dlls/strmbase/renderer.c | 25 +--------- dlls/strmbase/transform.c | 27 +---------- dlls/winegstreamer/gstdemux.c | 34 ++------------ dlls/wineqtdecoder/qtsplitter.c | 25 +--------- include/wine/strmbase.h | 25 +--------- 10 files changed, 73 insertions(+), 258 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a6aea1cecd5b59e191be…

1 0

Zebediah Figura : wineqtdecoder: Use base sink streaming methods.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: ddd77e7460a952dd73a8a666f678d5a59e02ee9e URL: https://source.winehq.org/git/wine.git/?a=commit;h=ddd77e7460a952dd73a8a666… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 12 21:24:38 2019 -0600 wineqtdecoder: Use base sink streaming methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 33 ++++----------------------------- 1 file changed, 4 insertions(+), 29 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 01ec4c2ced..df6e8ea5d2 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -1030,31 +1030,6 @@ static HRESULT QT_Process_Movie(QTSplitter* filter) return hr; } -static HRESULT WINAPI QTInPin_EndOfStream(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI QTInPin_BeginFlush(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI QTInPin_EndFlush(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI QTInPin_NewSegment(IPin *iface, REFERENCE_TIME tStart, REFERENCE_TIME tStop, double dRate) -{ - BasePinImpl_NewSegment(iface, tStart, tStop, dRate); - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - static const IPinVtbl QT_InputPin_Vtbl = { BasePinImpl_QueryInterface, BasePinImpl_AddRef, @@ -1070,10 +1045,10 @@ static const IPinVtbl QT_InputPin_Vtbl = { BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, - QTInPin_EndOfStream, - QTInPin_BeginFlush, - QTInPin_EndFlush, - QTInPin_NewSegment + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BaseInputPinImpl_NewSegment }; static inline QTOutPin *impl_source_from_strmbase_pin(struct strmbase_pin *iface)

1 0

Zebediah Figura : winegstreamer: Use base sink streaming methods.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 5d2c3de55d85bcef6114f0311421654872d5bcb3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2c3de55d85bcef6114f031… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 12 21:24:37 2019 -0600 winegstreamer: Use base sink streaming methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 36 ++++-------------------------------- 1 file changed, 4 insertions(+), 32 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index fb60d69e2a..1eae0dae9a 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1967,34 +1967,6 @@ static HRESULT GST_RemoveOutputPins(struct gstdemux *This) return S_OK; } -static HRESULT WINAPI GSTInPin_EndOfStream(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI GSTInPin_BeginFlush(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI GSTInPin_EndFlush(IPin *iface) -{ - FIXME("iface %p, stub!\n", iface); - return S_OK; -} - -static HRESULT WINAPI GSTInPin_NewSegment(IPin *iface, REFERENCE_TIME start, - REFERENCE_TIME stop, double rate) -{ - FIXME("iface %p, start %s, stop %s, rate %.16e, stub!\n", - iface, wine_dbgstr_longlong(start), wine_dbgstr_longlong(stop), rate); - - BasePinImpl_NewSegment(iface, start, stop, rate); - return S_OK; -} - static const IPinVtbl GST_InputPin_Vtbl = { BasePinImpl_QueryInterface, BasePinImpl_AddRef, @@ -2010,10 +1982,10 @@ static const IPinVtbl GST_InputPin_Vtbl = { BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, - GSTInPin_EndOfStream, - GSTInPin_BeginFlush, - GSTInPin_EndFlush, - GSTInPin_NewSegment + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, + BaseInputPinImpl_NewSegment }; pthread_mutex_t cb_list_lock = PTHREAD_MUTEX_INITIALIZER;

1 0

Zebediah Figura : strmbase/renderer: Use base sink streaming methods.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: a43d81733cc512e105f5fafd8993ba9dfd27cd65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a43d81733cc512e105f5fafd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 12 21:24:36 2019 -0600 strmbase/renderer: Use base sink streaming methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 137 ++++++++++++++++++++++------------------------- 1 file changed, 63 insertions(+), 74 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 7b9736ccfb..aa2366d3aa 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -40,77 +40,6 @@ static inline struct strmbase_renderer *impl_from_IPin(IPin *iface) return CONTAINING_RECORD(iface, struct strmbase_renderer, sink.pin.IPin_iface); } -static HRESULT WINAPI BaseRenderer_InputPin_EndOfStream(IPin * iface) -{ - struct strmbase_renderer *filter = impl_from_IPin(iface); - IFilterGraph *graph = filter->filter.filterInfo.pGraph; - IMediaEventSink *event_sink; - HRESULT hr = S_OK; - - TRACE("iface %p.\n", iface); - - EnterCriticalSection(&filter->csRenderLock); - filter->eos = TRUE; - - if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, - &IID_IMediaEventSink, (void **)&event_sink))) - { - IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, - (LONG_PTR)&filter->filter.IBaseFilter_iface); - IMediaEventSink_Release(event_sink); - } - RendererPosPassThru_EOS(filter->pPosition); - SetEvent(filter->state_event); - - if (filter->pFuncsTable->pfnEndOfStream) - hr = filter->pFuncsTable->pfnEndOfStream(filter); - LeaveCriticalSection(&filter->csRenderLock); - return hr; -} - -static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) -{ - struct strmbase_renderer *pFilter = impl_from_IPin(iface); - HRESULT hr; - - TRACE("iface %p.\n", iface); - - EnterCriticalSection(&pFilter->filter.csFilter); - hr = BaseInputPinImpl_BeginFlush(iface); - if (SUCCEEDED(hr)) - { - BaseRendererImpl_ClearPendingSample(pFilter); - SetEvent(pFilter->flush_event); - } - LeaveCriticalSection(&pFilter->filter.csFilter); - return hr; -} - -static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) -{ - struct strmbase_renderer *pFilter = impl_from_IPin(iface); - HRESULT hr; - - TRACE("iface %p.\n", iface); - - EnterCriticalSection(&pFilter->filter.csFilter); - EnterCriticalSection(&pFilter->csRenderLock); - pFilter->eos = FALSE; - hr = BaseInputPinImpl_EndFlush(iface); - if (SUCCEEDED(hr)) - { - QualityControlRender_Start(pFilter->qcimpl, pFilter->stream_start); - RendererPosPassThru_ResetMediaTime(pFilter->pPosition); - ResetEvent(pFilter->flush_event); - - if (pFilter->pFuncsTable->pfnEndFlush) - hr = pFilter->pFuncsTable->pfnEndFlush(pFilter); - } - LeaveCriticalSection(&pFilter->csRenderLock); - LeaveCriticalSection(&pFilter->filter.csFilter); - return hr; -} - static const IPinVtbl BaseRenderer_InputPin_Vtbl = { BasePinImpl_QueryInterface, @@ -127,9 +56,9 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = BasePinImpl_QueryAccept, BasePinImpl_EnumMediaTypes, BasePinImpl_QueryInternalConnections, - BaseRenderer_InputPin_EndOfStream, - BaseRenderer_InputPin_BeginFlush, - BaseRenderer_InputPin_EndFlush, + BaseInputPinImpl_EndOfStream, + BaseInputPinImpl_BeginFlush, + BaseInputPinImpl_EndFlush, BaseInputPinImpl_NewSegment }; @@ -289,6 +218,63 @@ static void sink_disconnect(struct strmbase_sink *iface) filter->pFuncsTable->pfnBreakConnect(filter); } +static HRESULT sink_eos(struct strmbase_sink *iface) +{ + struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); + IFilterGraph *graph = filter->filter.filterInfo.pGraph; + IMediaEventSink *event_sink; + HRESULT hr = S_OK; + + EnterCriticalSection(&filter->csRenderLock); + + filter->eos = TRUE; + + if (graph && SUCCEEDED(IFilterGraph_QueryInterface(graph, + &IID_IMediaEventSink, (void **)&event_sink))) + { + IMediaEventSink_Notify(event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter->filter.IBaseFilter_iface); + IMediaEventSink_Release(event_sink); + } + RendererPosPassThru_EOS(filter->pPosition); + SetEvent(filter->state_event); + + if (filter->pFuncsTable->pfnEndOfStream) + hr = filter->pFuncsTable->pfnEndOfStream(filter); + + LeaveCriticalSection(&filter->csRenderLock); + return hr; +} + +static HRESULT sink_begin_flush(struct strmbase_sink *iface) +{ + struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); + + BaseRendererImpl_ClearPendingSample(filter); + SetEvent(filter->flush_event); + + return S_OK; +} + +static HRESULT sink_end_flush(struct strmbase_sink *iface) +{ + struct strmbase_renderer *filter = impl_from_IPin(&iface->pin.IPin_iface); + HRESULT hr = S_OK; + + EnterCriticalSection(&filter->csRenderLock); + + filter->eos = FALSE; + QualityControlRender_Start(filter->qcimpl, filter->stream_start); + RendererPosPassThru_ResetMediaTime(filter->pPosition); + ResetEvent(filter->flush_event); + + if (filter->pFuncsTable->pfnEndFlush) + hr = filter->pFuncsTable->pfnEndFlush(filter); + + LeaveCriticalSection(&filter->csRenderLock); + return hr; +} + static const struct strmbase_sink_ops sink_ops = { .base.pin_query_accept = sink_query_accept, @@ -297,6 +283,9 @@ static const struct strmbase_sink_ops sink_ops = .pfnReceive = BaseRenderer_Receive, .sink_connect = sink_connect, .sink_disconnect = sink_disconnect, + .sink_eos = sink_eos, + .sink_begin_flush = sink_begin_flush, + .sink_end_flush = sink_end_flush, }; void strmbase_renderer_cleanup(struct strmbase_renderer *filter)

1 0

Zebediah Figura : strmbase: Introduce callbacks for streaming events.
by Alexandre Julliard 13 Dec '19

13 Dec '19

Module: wine Branch: master Commit: 57a7d6d4c7d7854bafd464d5fd2a480a7951663f URL: https://source.winehq.org/git/wine.git/?a=commit;h=57a7d6d4c7d7854bafd464d5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Dec 12 21:24:34 2019 -0600 strmbase: Introduce callbacks for streaming events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 42 ++++++++++++++++++++++++++++++------------ include/wine/strmbase.h | 4 ++++ 2 files changed, 34 insertions(+), 12 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index 3dd00b27cc..177d52740d 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -718,6 +718,9 @@ HRESULT WINAPI BaseInputPinImpl_EndOfStream(IPin * iface) TRACE("(%p)->()\n", This); + if (This->pFuncsTable->sink_eos) + return This->pFuncsTable->sink_eos(This); + EnterCriticalSection(&This->pin.filter->csFilter); if (This->flushing) hr = S_FALSE; @@ -735,15 +738,21 @@ static HRESULT deliver_beginflush(IPin* pin, LPVOID unused) HRESULT WINAPI BaseInputPinImpl_BeginFlush(IPin * iface) { - struct strmbase_sink *This = impl_sink_from_IPin(iface); + struct strmbase_sink *pin = impl_sink_from_IPin(iface); HRESULT hr; - TRACE("(%p) semi-stub\n", This); - EnterCriticalSection(&This->pin.filter->csFilter); - This->flushing = TRUE; + TRACE("pin %p.\n", pin); - hr = SendFurther(This, deliver_beginflush, NULL); - LeaveCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->csFilter); + + pin->flushing = TRUE; + + if (pin->pFuncsTable->sink_begin_flush) + hr = pin->pFuncsTable->sink_begin_flush(pin); + else + hr = SendFurther(pin, deliver_beginflush, NULL); + + LeaveCriticalSection(&pin->pin.filter->csFilter); return hr; } @@ -755,15 +764,21 @@ static HRESULT deliver_endflush(IPin* pin, LPVOID unused) HRESULT WINAPI BaseInputPinImpl_EndFlush(IPin * iface) { - struct strmbase_sink *This = impl_sink_from_IPin(iface); + struct strmbase_sink *pin = impl_sink_from_IPin(iface); HRESULT hr; - TRACE("(%p)->()\n", This); - EnterCriticalSection(&This->pin.filter->csFilter); - This->flushing = FALSE; + TRACE("pin %p.\n", pin); - hr = SendFurther(This, deliver_endflush, NULL); - LeaveCriticalSection(&This->pin.filter->csFilter); + EnterCriticalSection(&pin->pin.filter->csFilter); + + pin->flushing = FALSE; + + if (pin->pFuncsTable->sink_end_flush) + hr = pin->pFuncsTable->sink_end_flush(pin); + else + hr = SendFurther(pin, deliver_endflush, NULL); + + LeaveCriticalSection(&pin->pin.filter->csFilter); return hr; } @@ -788,6 +803,9 @@ HRESULT WINAPI BaseInputPinImpl_NewSegment(IPin * iface, REFERENCE_TIME start, R TRACE("iface %p, start %s, stop %s, rate %.16e.\n", iface, debugstr_time(start), debugstr_time(stop), rate); + if (pin->pFuncsTable->sink_new_segment) + return pin->pFuncsTable->sink_new_segment(pin, start, stop, rate); + args.tStart = start; args.tStop = stop; args.rate = rate; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 83ad2e0bd6..c01ef6133f 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -95,6 +95,10 @@ struct strmbase_sink_ops BaseInputPin_Receive pfnReceive; HRESULT (*sink_connect)(struct strmbase_sink *pin, IPin *peer, const AM_MEDIA_TYPE *mt); void (*sink_disconnect)(struct strmbase_sink *pin); + HRESULT (*sink_eos)(struct strmbase_sink *pin); + HRESULT (*sink_begin_flush)(struct strmbase_sink *pin); + HRESULT (*sink_end_flush)(struct strmbase_sink *pin); + HRESULT (*sink_new_segment)(struct strmbase_sink *pin, REFERENCE_TIME start, REFERENCE_TIME stop, double rate); }; /* Base Pin */

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2019