[PATCH 2/5] quartz/dsoundrender: Don't drop stream_cs in DSoundRender_HandleEndOfStream().

Zebediah Figura z.figura12 at gmail.com
Mon Nov 30 23:51:33 CST 2020


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 Receive(), 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>
---
 dlls/quartz/dsoundrender.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index c07dec56c09..d00c9e92570 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -237,9 +237,7 @@ static HRESULT DSoundRender_HandleEndOfStream(struct dsound_render *This)
         if (pos1 == pos2)
             break;
 
-        LeaveCriticalSection(&This->stream_cs);
         WaitForSingleObject(This->flush_event, 10);
-        EnterCriticalSection(&This->stream_cs);
     }
 
     return S_OK;
-- 
2.29.2




More information about the wine-devel mailing list