[PATCH 0/3] MR2958: mf: Various refcount leak fixes for session.

[Bernhard Kölbl]

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

[PATCH 1/3] mf: Clear queued topologies on session shutdown.

[Bernhard Kölbl]

From: Bernhard Kölbl <besentv(a)gmail.com>

This prevents media engine from leaking one reference to itself,
due to sharing its refcount with the sample grabber sink calback,
which was in turned gets refrenced through nodes in the queued topoligies.

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
---
 dlls/mf/session.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 8b29c8487fb..3641cc74b83 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -2225,6 +2225,7 @@ static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface)
         IMFPresentationClock_Release(session->clock);
         session->clock = NULL;
         session_clear_presentation(session);
+        session_clear_queued_topologies(session);
         session_submit_simple_command(session, SESSION_CMD_SHUTDOWN);
     }
     LeaveCriticalSection(&session->cs);
-- 
GitLab


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

[PATCH 2/3] mf: Don't leak sink in session_get_renderer_node_service().

[Bernhard Kölbl]

From: Bernhard Kölbl <besentv(a)gmail.com>

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
---
 dlls/mf/session.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 3641cc74b83..555a71dcdf7 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -2397,6 +2397,7 @@ static HRESULT session_get_renderer_node_service(struct media_session *session,
                             if (FAILED(hr = MFGetService((IUnknown *)sink, service, riid, obj)))
                                 WARN("Failed to get service from renderer node, %#lx.\n", hr);
                         }
+                        IMFMediaSink_Release(sink);
                     }
                     IMFStreamSink_Release(stream_sink);
                 }
-- 
GitLab


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

[PATCH 3/3] mf: Don't make stream sink shutdown dependent on IMFActivate presence in node.

[Bernhard Kölbl]

From: Bernhard Kölbl <besentv(a)gmail.com>

Nodes only hold a ref to an activate object when they are a sink anyway
(see session_bind_output_nodes() for reference).
This prevents media engine from getting references to its samplegrabber sink callback leaked.

Signed-off-by: Bernhard Kölbl <besentv(a)gmail.com>
---
 dlls/mf/session.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/mf/session.c b/dlls/mf/session.c
index 555a71dcdf7..efe568f987f 100644
--- a/dlls/mf/session.c
+++ b/dlls/mf/session.c
@@ -762,7 +762,7 @@ static void session_shutdown_current_topology(struct media_session *session)
                         WARN("Failed to shut down activation object for the sink, hr %#lx.\n", hr);
                     IMFActivate_Release(activate);
                 }
-                else if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink)))
+                if (SUCCEEDED(topology_node_get_object(node, &IID_IMFStreamSink, (void **)&stream_sink)))
                 {
                     if (SUCCEEDED(IMFStreamSink_GetMediaSink(stream_sink, &sink)))
                     {
-- 
GitLab

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

[Bernhard Kölbl]

If needed, I can modify the existing MediaEngine tests to check for 0 refcounts on final release.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2958#note_34490

[Nikolay Sivov (＠nsivov)]

On Sat Jun  3 08:21:37 2023 +0000, Bernhard Kölbl wrote:
> If needed, I can modify the existing MediaEngine tests to check for 0
> refcounts on final release.
> Sure, if it's reliable. I'd expect after shutdown it should be releasing everything.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2958#note_34549