July 2019 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Unhook swapchains in swapchain_cleanup().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 1ba7247a4feeab519fb9f0c53b8d3572c47c7660 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba7247a4feeab519fb9f0c5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Jul 2 02:28:35 2019 +0430 wined3d: Unhook swapchains in swapchain_cleanup(). So that the hook is properly removed on failure in wined3d_swapchain_create(). This is a somewhat theoretical though, since in practice WINED3D_SWAPCHAIN_HOOK and WINED3D_SWAPCHAIN_IMPLICIT are never used together. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index b75aead..9be6658 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -39,6 +39,7 @@ static void swapchain_cleanup(struct wined3d_swapchain *swapchain) TRACE("Destroying swapchain %p.\n", swapchain); + wined3d_unhook_swapchain(swapchain); wined3d_swapchain_set_gamma_ramp(swapchain, 0, &swapchain->orig_gamma); /* Release the swapchain's draw buffers. Make sure swapchain->back_buffers[0] @@ -121,7 +122,6 @@ ULONG CDECL wined3d_swapchain_decref(struct wined3d_swapchain *swapchain) device = swapchain->device; if (device->swapchain_count && device->swapchains[0] == swapchain) wined3d_device_uninit_3d(device); - wined3d_unhook_swapchain(swapchain); wined3d_cs_finish(device->cs, WINED3D_CS_QUEUE_DEFAULT); swapchain_cleanup(swapchain);

1 0

Zebediah Figura : ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: bf891f34af32839bf949e7ca4a1921754aa5e0d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf891f34af32839bf949e7ca… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 19:03:14 2019 -0500 ntdll: Correctly fill DataTransferLength in SCSI_PASS_THROUGH and SCSI_PASS_THROUGH_DIRECT. DataTransferLength specifies the number of bytes transferred, but sg_io_hdr_t.resid gives the number of bytes *not* transferred: https://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/x356.html Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47424 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/cdrom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 4a3b84d..f6e3a86 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -1658,7 +1658,7 @@ static NTSTATUS CDROM_ScsiPassThroughDirect(int fd, PSCSI_PASS_THROUGH_DIRECT pP io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io); @@ -1842,7 +1842,7 @@ static NTSTATUS CDROM_ScsiPassThrough(int fd, PSCSI_PASS_THROUGH pPacket) io = ioctl(fd, SG_IO, &cmd); pPacket->ScsiStatus = cmd.status; - pPacket->DataTransferLength = cmd.resid; + pPacket->DataTransferLength -= cmd.resid; pPacket->SenseInfoLength = cmd.sb_len_wr; ret = CDROM_GetStatusCode(io);

1 0

Zebediah Figura : strmbase: Remove unused "ThreadSignal" event.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: ac10f3de1f8fc94055f032b9261209891d48d86c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac10f3de1f8fc94055f032b9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:44 2019 -0500 strmbase: Remove unused "ThreadSignal" event. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 1 - dlls/strmbase/renderer.c | 7 ------- include/wine/strmbase.h | 1 - 3 files changed, 9 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 78af826..7ea6655 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -738,7 +738,6 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) ResetEvent(This->blocked); ResetEvent(This->renderer.RenderEvent); } - ResetEvent(This->renderer.ThreadSignal); LeaveCriticalSection(&This->renderer.csRenderLock); return hr; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index f7aaaef..a96783a 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -267,7 +267,6 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb InitializeCriticalSection(&filter->csRenderLock); filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); filter->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->ThreadSignal = CreateEventW(NULL, TRUE, TRUE, NULL); filter->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); filter->pMediaSample = NULL; @@ -292,7 +291,6 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseRendererImpl_ClearPendingSample(filter); CloseHandle(filter->evComplete); - CloseHandle(filter->ThreadSignal); CloseHandle(filter->RenderEvent); QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); @@ -404,7 +402,6 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->evComplete); - SetEvent(This->ThreadSignal); SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -424,7 +421,6 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) goto out; SetEvent(This->evComplete); - ResetEvent(This->ThreadSignal); if (This->sink.pin.pConnectedTo) { @@ -482,7 +478,6 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) This->filter.state = State_Paused; } } - ResetEvent(This->ThreadSignal); LeaveCriticalSection(&This->csRenderLock); return S_OK; @@ -545,7 +540,6 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->ThreadSignal); SetEvent(iface->RenderEvent); return S_OK; } @@ -555,7 +549,6 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) TRACE("(%p)\n", iface); QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->ThreadSignal); ResetEvent(iface->RenderEvent); return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6abd8c7..9680ab4 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -541,7 +541,6 @@ typedef struct BaseRendererTag IUnknown *pPosition; CRITICAL_SECTION csRenderLock; HANDLE evComplete; - HANDLE ThreadSignal; HANDLE RenderEvent; IMediaSample *pMediaSample;

1 0

Zebediah Figura : strmbase: Rename "evComplete" to "state_event" for clarity.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 659b93c7da3d3d49b8b4528b1f8d204fbf2eaf20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=659b93c7da3d3d49b8b4528b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:45 2019 -0500 strmbase: Rename "evComplete" to "state_event" for clarity. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/videorenderer.c | 1 - dlls/strmbase/renderer.c | 16 ++++++++-------- include/wine/strmbase.h | 4 +++- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 7ea6655..0a69a5c 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -727,7 +727,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) if (This->renderer.filter.state == State_Stopped) { if (This->renderer.sink.pin.pConnectedTo) - ResetEvent(This->renderer.evComplete); + ResetEvent(This->renderer.state_event); This->renderer.sink.end_of_stream = 0; } diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index a64fffe..ba512a2 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -51,7 +51,6 @@ typedef struct VideoRendererImpl DWORD ThreadID; HANDLE hEvent; -/* hEvent == evComplete? */ BOOL ThreadResult; RECT SourceRect; RECT DestRect; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index a96783a..1af601a 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -266,7 +266,7 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb InitializeCriticalSection(&filter->csRenderLock); filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); - filter->evComplete = CreateEventW(NULL, TRUE, TRUE, NULL); + filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); filter->pMediaSample = NULL; @@ -290,7 +290,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) DeleteCriticalSection(&filter->csRenderLock); BaseRendererImpl_ClearPendingSample(filter); - CloseHandle(filter->evComplete); + CloseHandle(filter->state_event); CloseHandle(filter->RenderEvent); QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); @@ -341,7 +341,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (This->pFuncsTable->pfnOnReceiveFirstSample) This->pFuncsTable->pfnOnReceiveFirstSample(This, pSample); - SetEvent(This->evComplete); + SetEvent(This->state_event); } /* Wait for render Time */ @@ -401,7 +401,7 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) if (This->pFuncsTable->pfnOnStopStreaming) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; - SetEvent(This->evComplete); + SetEvent(This->state_event); SetEvent(This->RenderEvent); } LeaveCriticalSection(&This->csRenderLock); @@ -420,7 +420,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) if (This->filter.state == State_Running) goto out; - SetEvent(This->evComplete); + SetEvent(This->state_event); if (This->sink.pin.pConnectedTo) { @@ -466,7 +466,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) { if (This->sink.pin.pConnectedTo) - ResetEvent(This->evComplete); + ResetEvent(This->state_event); This->sink.end_of_stream = FALSE; } else if (This->pFuncsTable->pfnOnStopStreaming) @@ -503,7 +503,7 @@ HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsT TRACE("(%p)->(%d, %p)\n", This, dwMilliSecsTimeout, pState); - if (WaitForSingleObject(This->evComplete, dwMilliSecsTimeout) == WAIT_TIMEOUT) + if (WaitForSingleObject(This->state_event, dwMilliSecsTimeout) == WAIT_TIMEOUT) hr = VFW_S_STATE_INTERMEDIATE; else hr = S_OK; @@ -531,7 +531,7 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface) } } RendererPosPassThru_EOS(iface->pPosition); - SetEvent(iface->evComplete); + SetEvent(iface->state_event); return hr; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 9680ab4..4ea45cf 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -540,7 +540,9 @@ typedef struct BaseRendererTag BaseInputPin sink; IUnknown *pPosition; CRITICAL_SECTION csRenderLock; - HANDLE evComplete; + /* Signaled when the filter has completed a state change. The filter waits + * for this event in IBaseFilter::GetState(). */ + HANDLE state_event; HANDLE RenderEvent; IMediaSample *pMediaSample;

1 0

Zebediah Figura : strmbase: Wait for the presentation time in BaseRendererImpl_Receive().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: c0712a97a684ef23bbdfb6c1353c4220094e78a8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c0712a97a684ef23bbdfb6c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:46 2019 -0500 strmbase: Wait for the presentation time in BaseRendererImpl_Receive(). Try to make the quality control object more clearly responsible for calculating quality after the fact, and only that. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/qualitycontrol.c | 65 ++++++++++++++-------------------------- dlls/strmbase/renderer.c | 26 ++++++++++++---- dlls/strmbase/strmbase_private.h | 3 +- 3 files changed, 44 insertions(+), 50 deletions(-) diff --git a/dlls/strmbase/qualitycontrol.c b/dlls/strmbase/qualitycontrol.c index d6a91a7..139c4df 100644 --- a/dlls/strmbase/qualitycontrol.c +++ b/dlls/strmbase/qualitycontrol.c @@ -171,46 +171,6 @@ static BOOL QualityControlRender_IsLate(QualityControlImpl *This, REFERENCE_TIME return FALSE; } -HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev) -{ - REFERENCE_TIME start = -1, stop = -1, jitter = 0; - - TRACE("%p %p %p\n", This, sample, ev); - - This->current_rstart = This->current_rstop = -1; - This->current_jitter = 0; - if (!This->clock || FAILED(IMediaSample_GetTime(sample, &start, &stop))) - return S_OK; - - if (start >= 0) { - REFERENCE_TIME now; - IReferenceClock_GetTime(This->clock, &now); - now -= This->clockstart; - - jitter = now - start; - if (jitter <= -10000) { - DWORD_PTR cookie; - IReferenceClock_AdviseTime(This->clock, This->clockstart, start, (HEVENT)ev, &cookie); - WaitForSingleObject(ev, INFINITE); - IReferenceClock_Unadvise(This->clock, cookie); - } - } - else - start = stop = -1; - This->current_rstart = start; - This->current_rstop = stop > start ? stop : start; - This->current_jitter = jitter; - This->is_dropped = QualityControlRender_IsLate(This, jitter, start, stop); - TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), (int)(stop/10000), (int)(jitter / 10000)); - if (This->is_dropped) { - This->dropped++; - if (!This->qos_handled) - return S_FALSE; - } else - This->rendered++; - return S_OK; -} - void QualityControlRender_DoQOS(QualityControlImpl *priv) { REFERENCE_TIME start, stop, jitter, pt, entered, left, duration; @@ -324,12 +284,31 @@ void QualityControlRender_DoQOS(QualityControlImpl *priv) } -void QualityControlRender_BeginRender(QualityControlImpl *This) +void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop) { - TRACE("%p\n", This); - This->start = -1; + This->current_rstart = start; + This->current_rstop = max(stop, start); + + if (start >= 0) + { + REFERENCE_TIME now; + IReferenceClock_GetTime(This->clock, &now); + This->current_jitter = (now - This->clockstart) - start; + } + else + This->current_jitter = 0; + + /* FIXME: This isn't correct; we don't drop samples, nor should. */ + This->is_dropped = QualityControlRender_IsLate(This, This->current_jitter, start, stop); + TRACE("Dropped: %i %i %i %i\n", This->is_dropped, (int)(start/10000), + (int)(stop/10000), (int)(This->current_jitter / 10000)); + if (This->is_dropped) + This->dropped++; + else + This->rendered++; + if (!This->clock) return; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1af601a..2c71024 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -345,7 +345,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp } /* Wait for render Time */ - if (SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) + if (This->filter.pClock && SUCCEEDED(IMediaSample_GetTime(pSample, &start, &stop))) { hr = S_FALSE; RendererPosPassThru_RegisterMediaTime(This->pPosition, start); @@ -356,12 +356,26 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp ;/* Do not wait: drop through */ else if (hr == S_FALSE) { + REFERENCE_TIME now; + DWORD_PTR cookie; + if (This->pFuncsTable->pfnOnWaitStart) This->pFuncsTable->pfnOnWaitStart(This); - LeaveCriticalSection(&This->csRenderLock); - hr = QualityControlRender_WaitFor(This->qcimpl, pSample, This->RenderEvent); - EnterCriticalSection(&This->csRenderLock); + IReferenceClock_GetTime(This->filter.pClock, &now); + + if (now - This->filter.rtStreamStart - start <= -10000) + { + IReferenceClock_AdviseTime(This->filter.pClock, This->filter.rtStreamStart, + start, (HEVENT)This->RenderEvent, &cookie); + + LeaveCriticalSection(&This->csRenderLock); + + WaitForSingleObject(This->RenderEvent, INFINITE); + IReferenceClock_Unadvise(This->filter.pClock, cookie); + + EnterCriticalSection(&This->csRenderLock); + } if (This->pFuncsTable->pfnOnWaitEnd) This->pFuncsTable->pfnOnWaitEnd(This); @@ -373,10 +387,12 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp return S_OK; } } + else + start = stop = -1; if (SUCCEEDED(hr)) { - QualityControlRender_BeginRender(This->qcimpl); + QualityControlRender_BeginRender(This->qcimpl, start, stop); hr = This->pFuncsTable->pfnDoRenderSample(This, pSample); QualityControlRender_EndRender(This->qcimpl); } diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h index 769c8f2..439ab9a 100644 --- a/dlls/strmbase/strmbase_private.h +++ b/dlls/strmbase/strmbase_private.h @@ -59,9 +59,8 @@ HRESULT WINAPI QualityControlImpl_SetSink(IQualityControl *iface, IQualityContro void QualityControlRender_Start(QualityControlImpl *This, REFERENCE_TIME tStart); void QualityControlRender_SetClock(QualityControlImpl *This, IReferenceClock *clock); -HRESULT QualityControlRender_WaitFor(QualityControlImpl *This, IMediaSample *sample, HANDLE ev); void QualityControlRender_DoQOS(QualityControlImpl *priv); -void QualityControlRender_BeginRender(QualityControlImpl *This); +void QualityControlRender_BeginRender(QualityControlImpl *This, REFERENCE_TIME start, REFERENCE_TIME stop); void QualityControlRender_EndRender(QualityControlImpl *This); HRESULT enum_pins_create(BaseFilter *base, IEnumPins **enum_pins);

1 0

Zebediah Figura : strmbase: Do not set RenderEvent in IBaseFilter::Run().
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: f834e4a459d79a438c472aa0eff4637ddf787087 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f834e4a459d79a438c472aa0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:47 2019 -0500 strmbase: Do not set RenderEvent in IBaseFilter::Run(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 2c71024..1ba975d 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -460,7 +460,6 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart) This->pFuncsTable->pfnOnStartStreaming(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); - SetEvent(This->RenderEvent); This->filter.state = State_Running; } out:

1 0

Zebediah Figura : strmbase: Split RenderEvent into separate events for advising and flushing.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 881f9380676887668d9be8018d7b5e0df8d15f42 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881f9380676887668d9be801… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jul 1 22:49:48 2019 -0500 strmbase: Split RenderEvent into separate events for advising and flushing. While it's certainly possible to use one event for both purposes, it's a little less clear, and it makes it a little more difficult to do other waits that need to be interrupted by flushing. For example, the video renderer should block in Receive() after rendering the sample until the filter is run. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 2 +- dlls/quartz/videorenderer.c | 2 +- dlls/strmbase/renderer.c | 20 ++++++++++++-------- include/wine/strmbase.h | 27 ++++++++++++++++----------- 4 files changed, 30 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0a69a5c..f74b673 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -736,7 +736,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface) This->renderer.filter.state = State_Paused; ResetEvent(This->blocked); - ResetEvent(This->renderer.RenderEvent); + ResetEvent(This->renderer.flush_event); } LeaveCriticalSection(&This->renderer.csRenderLock); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index ba512a2..2a18015 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -679,7 +679,7 @@ static HRESULT WINAPI VideoRenderer_Pause(IBaseFilter * iface) VideoRenderer_AutoShowWindow(This); } - ResetEvent(This->renderer.RenderEvent); + ResetEvent(This->renderer.flush_event); This->renderer.filter.state = State_Paused; } LeaveCriticalSection(&This->renderer.csRenderLock); diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 1ba975d..06adbe7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -267,7 +267,8 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb InitializeCriticalSection(&filter->csRenderLock); filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->RenderEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); filter->pMediaSample = NULL; QualityControlImpl_Create(&filter->sink.pin.IPin_iface, &filter->filter.IBaseFilter_iface, &filter->qcimpl); @@ -291,7 +292,8 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseRendererImpl_ClearPendingSample(filter); CloseHandle(filter->state_event); - CloseHandle(filter->RenderEvent); + CloseHandle(filter->advise_event); + CloseHandle(filter->flush_event); QualityControlImpl_Destroy(filter->qcimpl); strmbase_filter_cleanup(&filter->filter); } @@ -366,12 +368,14 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp if (now - This->filter.rtStreamStart - start <= -10000) { + HANDLE handles[2] = {This->advise_event, This->flush_event}; + IReferenceClock_AdviseTime(This->filter.pClock, This->filter.rtStreamStart, - start, (HEVENT)This->RenderEvent, &cookie); + start, (HEVENT)This->advise_event, &cookie); LeaveCriticalSection(&This->csRenderLock); - WaitForSingleObject(This->RenderEvent, INFINITE); + WaitForMultipleObjects(2, handles, FALSE, INFINITE); IReferenceClock_Unadvise(This->filter.pClock, cookie); EnterCriticalSection(&This->csRenderLock); @@ -418,7 +422,7 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) This->pFuncsTable->pfnOnStopStreaming(This); This->filter.state = State_Stopped; SetEvent(This->state_event); - SetEvent(This->RenderEvent); + SetEvent(This->flush_event); } LeaveCriticalSection(&This->csRenderLock); @@ -489,7 +493,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); - ResetEvent(This->RenderEvent); + ResetEvent(This->flush_event); This->filter.state = State_Paused; } } @@ -555,7 +559,7 @@ HRESULT WINAPI BaseRendererImpl_BeginFlush(BaseRenderer* iface) { TRACE("(%p)\n", iface); BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->RenderEvent); + SetEvent(iface->flush_event); return S_OK; } @@ -564,7 +568,7 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(BaseRenderer* iface) TRACE("(%p)\n", iface); QualityControlRender_Start(iface->qcimpl, iface->filter.rtStreamStart); RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->RenderEvent); + ResetEvent(iface->flush_event); return S_OK; } diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 4ea45cf..22d65f8 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -535,21 +535,26 @@ HRESULT WINAPI BaseControlVideo_Destroy(BaseControlVideo *pControlVideo); /* BaseRenderer Filter */ typedef struct BaseRendererTag { - BaseFilter filter; + BaseFilter filter; - BaseInputPin sink; - IUnknown *pPosition; - CRITICAL_SECTION csRenderLock; + BaseInputPin sink; + IUnknown *pPosition; + CRITICAL_SECTION csRenderLock; /* Signaled when the filter has completed a state change. The filter waits * for this event in IBaseFilter::GetState(). */ - HANDLE state_event; - HANDLE RenderEvent; - IMediaSample *pMediaSample; - - IQualityControl *pQSink; - struct QualityControlImpl *qcimpl; + HANDLE state_event; + /* Signaled when the sample presentation time occurs. The streaming thread + * waits for this event in Receive() if applicable. */ + HANDLE advise_event; + /* Signaled when a flush or state change occurs, i.e. anything that needs + * to immediately unblock the streaming thread. */ + HANDLE flush_event; + IMediaSample *pMediaSample; + + IQualityControl *pQSink; + struct QualityControlImpl *qcimpl; - const struct BaseRendererFuncTable * pFuncsTable; + const struct BaseRendererFuncTable *pFuncsTable; } BaseRenderer; typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(BaseRenderer *This, const AM_MEDIA_TYPE *pmt);

1 0

Nikolay Sivov : strmbase: Remove unused function.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 86c7f17f96089776f874ee9ec3f7876e0ed5a2e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86c7f17f96089776f874ee9e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 2 09:00:11 2019 +0300 strmbase: Remove unused function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index ebc7a1c..4478855 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -347,11 +347,6 @@ static inline BaseOutputPin *impl_BaseOutputPin_from_IPin( IPin *iface ) return CONTAINING_RECORD(iface, BaseOutputPin, pin.IPin_iface); } -static inline BaseOutputPin *impl_BaseOutputPin_from_BasePin( BasePin *iface ) -{ - return CONTAINING_RECORD(iface, BaseOutputPin, pin); -} - HRESULT WINAPI BaseOutputPinImpl_QueryInterface(IPin * iface, REFIID riid, LPVOID * ppv) { BaseOutputPin *This = impl_BaseOutputPin_from_IPin(iface);

1 0

Nikolay Sivov : dwrite: Remove unused functions.
by Alexandre Julliard 02 Jul '19

02 Jul '19

Module: wine Branch: master Commit: 5a33f86ec97d504bc3fd294b8bd858470d9cece2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5a33f86ec97d504bc3fd294b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jul 2 09:00:28 2019 +0300 dwrite: Remove unused functions. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 8 -------- dlls/dwrite/font.c | 5 ----- 2 files changed, 13 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 679e1ed..8e58e61 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -1394,14 +1394,6 @@ static HRESULT WINAPI dwritetextanalyzer_GetGdiCompatibleGlyphPlacements(IDWrite return hr; } -static inline FLOAT get_cluster_advance(const FLOAT *advances, UINT32 start, UINT32 end) -{ - FLOAT advance = 0.0f; - for (; start < end; start++) - advance += advances[start]; - return advance; -} - static HRESULT apply_cluster_spacing(float leading_spacing, float trailing_spacing, float min_advance_width, unsigned int start, unsigned int end, float const *advances, DWRITE_GLYPH_OFFSET const *offsets, DWRITE_SHAPING_GLYPH_PROPERTIES const *glyph_props, float *modified_advances, diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index 5f4abc7..3f11b1d 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -5123,11 +5123,6 @@ static HRESULT WINAPI glyphrunanalysis_GetAlphaTextureBounds(IDWriteGlyphRunAnal return S_OK; } -static inline int get_dib_stride( int width, int bpp ) -{ - return ((width * bpp + 31) >> 3) & ~3; -} - static inline BYTE *get_pixel_ptr(BYTE *ptr, DWRITE_TEXTURE_TYPE type, const RECT *runbounds, const RECT *bounds) { if (type == DWRITE_TEXTURE_CLEARTYPE_3x1)

1 0

Nikolay Sivov : mshtml: Add IHTMLDOMRange stub.
by Alexandre Julliard 01 Jul '19

01 Jul '19

Module: wine Branch: master Commit: c5d3ff58c637783e3e0ca1c0313de543bc1dce3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c5d3ff58c637783e3e0ca1c0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 1 15:30:17 2019 +0200 mshtml: Add IHTMLDOMRange stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 2 +- dlls/mshtml/htmldoc.c | 18 +- dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/{txtrange.c => range.c} | 349 ++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 27 ++- include/mshtml.idl | 88 +++++++++ 6 files changed, 483 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=c5d3ff58c637783e3e0c…

1 0