[PATCH 0/1] MR9559: winegstreamer: Add missing read thread wait in SetOutputProps failure path.

[Yuxuan Shui (＠yshui)]

Fixes: 075033d61ffac2a8d42e06e91a12c88f2fa17401

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9559

[PATCH 1/1] winegstreamer: Add missing read thread wait in SetOutputProps failure path.

[Yuxuan Shui]

From: Yuxuan Shui <yshui(a)codeweavers.com>

Fixes: 075033d61ffac2a8d42e06e91a12c88f2fa17401
---
 dlls/winegstreamer/wm_reader.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c
index fe033285a2c..b5065c57c05 100644
--- a/dlls/winegstreamer/wm_reader.c
+++ b/dlls/winegstreamer/wm_reader.c
@@ -2417,8 +2417,8 @@ static HRESULT WINAPI reader_SetOutputProps(IWMSyncReader2 *iface, DWORD output,
 
     if (!(stream = get_stream_by_output_number(reader, output)))
     {
-        LeaveCriticalSection(&reader->cs);
-        return E_INVALIDARG;
+        hr = E_INVALIDARG;
+        goto out;
     }
 
     wg_parser_stream_get_current_format(stream->wg_stream, &pref_format);
@@ -2456,8 +2456,7 @@ static HRESULT WINAPI reader_SetOutputProps(IWMSyncReader2 *iface, DWORD output,
     if (FAILED(hr))
     {
         WARN("Unsupported media type, returning %#lx.\n", hr);
-        LeaveCriticalSection(&reader->cs);
-        return hr;
+        goto out;
     }
 
     stream->format = format;
@@ -2479,10 +2478,11 @@ static HRESULT WINAPI reader_SetOutputProps(IWMSyncReader2 *iface, DWORD output,
     wg_parser_stream_seek(reader->streams[0].wg_stream, 1.0, reader->start_time, 0,
             AM_SEEKING_AbsolutePositioning, AM_SEEKING_NoPositioning);
 
+out:
     LeaveCriticalSection(&reader->cs);
     if (WaitForSingleObject(reader->read_sem, INFINITE) != WAIT_OBJECT_0)
         ERR("Failed to wait for read thread to pause.\n");
-    return S_OK;
+    return hr;
 }
 
 static HRESULT WINAPI reader_SetOutputSetting(IWMSyncReader2 *iface, DWORD output,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9559

[PATCH 0/1] MR9559: winegstreamer: Add missing read thread wait in SetOutputProps failure path. - approved

[Rémi Bernon]

This merge request was approved by Rémi Bernon.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9559

[PATCH 0/1] MR9559: winegstreamer: Add missing read thread wait in SetOutputProps failure path. - approved

[Elizabeth Figura (＠zfigura)]

This merge request was approved by Elizabeth Figura.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9559