Rémi Bernon : winegstreamer: Check for already opened stream in wm_reader_open*.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ed0d100ec9e090641dcd61b79872a4b59e5b52f4
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ed0d100ec9e090641dcd61b79872a4b...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Mon Aug 22 14:26:39 2022 +0200

winegstreamer: Check for already opened stream in wm_reader_open*.

---

 dlls/winegstreamer/wm_asyncreader.c | 20 --------------------
 dlls/winegstreamer/wm_reader.c      | 15 +++++++++++++++
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/dlls/winegstreamer/wm_asyncreader.c b/dlls/winegstreamer/wm_asyncreader.c
index 54c601d109a..5b09bc616a6 100644
--- a/dlls/winegstreamer/wm_asyncreader.c
+++ b/dlls/winegstreamer/wm_asyncreader.c
@@ -393,21 +393,11 @@ static HRESULT WINAPI WMReader_Open(IWMReader *iface, const WCHAR *url,
             reader, debugstr_w(url), callback, context);
 
     EnterCriticalSection(&reader->cs);
-    EnterCriticalSection(&reader->reader.cs);
-
-    if (reader->reader.wg_parser)
-    {
-        LeaveCriticalSection(&reader->reader.cs);
-        LeaveCriticalSection(&reader->cs);
-        WARN("Stream is already open; returning E_UNEXPECTED.\n");
-        return E_UNEXPECTED;
-    }
 
     if (SUCCEEDED(hr = wm_reader_open_file(&reader->reader, url))
             && FAILED(hr = async_reader_open(reader, callback, context)))
         wm_reader_close(&reader->reader);
 
-    LeaveCriticalSection(&reader->reader.cs);
     LeaveCriticalSection(&reader->cs);
     return hr;
 }
@@ -873,21 +863,11 @@ static HRESULT WINAPI WMReaderAdvanced2_OpenStream(IWMReaderAdvanced6 *iface,
     TRACE("reader %p, stream %p, callback %p, context %p.\n", reader, stream, callback, context);
 
     EnterCriticalSection(&reader->cs);
-    EnterCriticalSection(&reader->reader.cs);
-
-    if (reader->reader.wg_parser)
-    {
-        LeaveCriticalSection(&reader->reader.cs);
-        LeaveCriticalSection(&reader->cs);
-        WARN("Stream is already open; returning E_UNEXPECTED.\n");
-        return E_UNEXPECTED;
-    }
 
     if (SUCCEEDED(hr = wm_reader_open_stream(&reader->reader, stream))
             && FAILED(hr = async_reader_open(reader, callback, context)))
         wm_reader_close(&reader->reader);
 
-    LeaveCriticalSection(&reader->reader.cs);
     LeaveCriticalSection(&reader->cs);
     return hr;
 }
diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index 156f9d79446..243ebb20335 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -1558,6 +1558,13 @@ HRESULT wm_reader_open_stream(struct wm_reader *reader, IStream *stream)
 
     EnterCriticalSection(&reader->cs);
 
+    if (reader->wg_parser)
+    {
+        LeaveCriticalSection(&reader->cs);
+        WARN("Stream is already open; returning E_UNEXPECTED.\n");
+        return E_UNEXPECTED;
+    }
+
     IStream_AddRef(reader->source_stream = stream);
     if (FAILED(hr = init_stream(reader, stat.cbSize.QuadPart)))
     {
@@ -1591,6 +1598,14 @@ HRESULT wm_reader_open_file(struct wm_reader *reader, const WCHAR *filename)
 
     EnterCriticalSection(&reader->cs);
 
+    if (reader->wg_parser)
+    {
+        LeaveCriticalSection(&reader->cs);
+        WARN("Stream is already open; returning E_UNEXPECTED.\n");
+        CloseHandle(file);
+        return E_UNEXPECTED;
+    }
+
     reader->file = file;
 
     if (FAILED(hr = init_stream(reader, size.QuadPart)))