Zebediah Figura : qedit/nullrenderer: Don't drop csRenderLock in NullRenderer_DoRenderSample().
Alexandre Julliard
julliard at winehq.org
Tue Dec 1 15:40:33 CST 2020
Module: wine
Branch: master
Commit: 8a75411ec5349be62ff8c7abd8d7841a533e01ba
URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a75411ec5349be62ff8c7abd8d7841a533e01ba
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Mon Nov 30 23:51:36 2020 -0600
qedit/nullrenderer: Don't drop csRenderLock in NullRenderer_DoRenderSample().
We don't grab stream_cs to change any variables checked here, except to reset
flush_event, and that cannot result in a deadlock.
The only possible deadlocks here are:
(1) between this function and EndOfStream(), which is correct, as the two
should presumably be serialized;
(2) between this function and EndFlush(); however, in that case we expect
BeginFlush() first, which will unblock the streaming thread.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/qedit/nullrenderer.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c
index a8594eade8b..97e3cdbb202 100644
--- a/dlls/qedit/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -46,9 +46,7 @@ static HRESULT WINAPI NullRenderer_DoRenderSample(struct strmbase_renderer *ifac
const HANDLE events[2] = {filter->run_event, filter->renderer.flush_event};
SetEvent(filter->renderer.state_event);
- LeaveCriticalSection(&filter->renderer.csRenderLock);
WaitForMultipleObjects(2, events, FALSE, INFINITE);
- EnterCriticalSection(&filter->renderer.csRenderLock);
}
return S_OK;
More information about the wine-cvs
mailing list