From: "Rémi Bernon" <wine@gitlab.winehq.org>
Subject: [PATCH v7 5/5] mf: Uninitialize renderer before creating mixer and presenter.
Message-Id: <wine-wine-mr310-v7-patch5@gitlab-mail-bridge>
Date: Wed, 29 Jun 2022 08:00:50 +0000
In-Reply-To: <wine-wine-mr310-v7@gitlab-mail-bridge>
References: <merge_request_384@gitlab.winehq.org> <wine-wine-mr310-v7@gitlab-mail-bridge>

From: Rémi Bernon <rbernon@codeweavers.com>

Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
---
 dlls/mf/evr.c | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c
index 90702ff3d95..c9506af9143 100644
--- a/dlls/mf/evr.c
+++ b/dlls/mf/evr.c
@@ -1702,11 +1702,8 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere
     return hr;
 }
 
-static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer,
-        IMFVideoPresenter *presenter)
+static void video_renderer_uninitialize(struct video_renderer *renderer)
 {
-    HRESULT hr;
-
     video_renderer_release_services(renderer);
 
     if (renderer->mixer)
@@ -1726,6 +1723,12 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra
         IUnknown_Release(renderer->device_manager);
         renderer->device_manager = NULL;
     }
+}
+
+static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer,
+        IMFVideoPresenter *presenter)
+{
+    HRESULT hr;
 
     renderer->mixer = mixer;
     IMFTransform_AddRef(renderer->mixer);
@@ -1747,11 +1750,22 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface,
 
     TRACE("%p, %p, %p.\n", iface, mixer, presenter);
 
+    EnterCriticalSection(&renderer->cs);
+
+    if (renderer->flags & EVR_SHUT_DOWN)
+    {
+        LeaveCriticalSection(&renderer->cs);
+        return MF_E_SHUTDOWN;
+    }
+
+    video_renderer_uninitialize(renderer);
+
     if (mixer)
         IMFTransform_AddRef(mixer);
     else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer)))
     {
         WARN("Failed to create default mixer object, hr %#lx.\n", hr);
+        LeaveCriticalSection(&renderer->cs);
         return hr;
     }
 
@@ -1760,21 +1774,15 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface,
     else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter)))
     {
         WARN("Failed to create default presenter, hr %#lx.\n", hr);
+        LeaveCriticalSection(&renderer->cs);
         IMFTransform_Release(mixer);
         return hr;
     }
 
-    EnterCriticalSection(&renderer->cs);
-
-    if (renderer->flags & EVR_SHUT_DOWN)
-        hr = MF_E_SHUTDOWN;
-    else
-    {
-        /* FIXME: check clock state */
-        /* FIXME: check that streams are not initialized */
+    /* FIXME: check clock state */
+    /* FIXME: check that streams are not initialized */
 
-        hr = video_renderer_initialize(renderer, mixer, presenter);
-    }
+    hr = video_renderer_initialize(renderer, mixer, presenter);
 
     LeaveCriticalSection(&renderer->cs);
 

-- 
GitLab

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