[PATCH 0/2] MR4783: dmime, dmloader: Avoid leaking track and segment references.

[Rémi Bernon]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56117

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

[PATCH 1/2] dmime: Avoid leaking track references in segment Clone and Load.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56117
---
 dlls/dmime/segment.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c
index 4708b4c5a6f..75e8d706ed4 100644
--- a/dlls/dmime/segment.c
+++ b/dlls/dmime/segment.c
@@ -442,7 +442,9 @@ static HRESULT WINAPI segment_Clone(IDirectMusicSegment8 *iface, MUSIC_TIME star
     LIST_FOR_EACH_ENTRY(entry, &This->tracks, struct track_entry, entry)
     {
         if (FAILED(hr = IDirectMusicTrack_Clone(entry->pTrack, start, end, &track))) break;
-        if (FAILED(hr = segment_append_track(clone, track, entry->dwGroupBits, entry->flags))) break;
+        hr = segment_append_track(clone, track, entry->dwGroupBits, entry->flags);
+        IDirectMusicTrack_Release(track);
+        if (FAILED(hr)) break;
     }
 
     *segment = (IDirectMusicSegment *)&clone->IDirectMusicSegment8_iface;
@@ -822,6 +824,7 @@ static HRESULT WINAPI segment_persist_stream_Load(IPersistStream *iface, IStream
             This->header.mtLength = 1;
             if (FAILED(hr = wave_track_create_from_chunk(stream, &chunk, &track))) break;
             hr = segment_append_track(This, (IDirectMusicTrack *)track, 1, 0);
+            IDirectMusicTrack8_Release(track);
             break;
         }
 
-- 
GitLab


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

[PATCH 2/2] dmloader: Avoid caching DMUS_OBJ_STREAM objects we can't load from cache.

[Rémi Bernon]

From: Rémi Bernon <rbernon(a)codeweavers.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56117
---
 dlls/dmloader/loader.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 78b9790dff3..2ebbbe7ffca 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -271,6 +271,7 @@ static struct cache_entry *find_cache_object(struct loader *This, DMUS_OBJECTDES
 
 static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDESC *pDesc, REFIID riid, void **ppv)
 {
+    static const DWORD source_flags = DMUS_OBJ_STREAM | DMUS_OBJ_FILENAME | DMUS_OBJ_URL | DMUS_OBJ_STREAM;
 	struct loader *This = impl_from_IDirectMusicLoader8(iface);
 	HRESULT result = S_OK;
 	HRESULT ret = S_OK; /* used at the end of function, to determine whether everything went OK */
@@ -426,6 +427,11 @@ static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDE
     /* add object to cache/overwrite existing info (if cache is enabled) */
     bCache = is_cache_enabled(This, &pDesc->guidClass);
     if (!bCache) TRACE(": caching disabled\n");
+    else if ((pDesc->dwValidData & source_flags) == DMUS_OBJ_STREAM)
+    {
+        FIXME("Skipping cache for DMUS_OBJ_STREAM object\n");
+        bCache = FALSE;
+    }
     else
     {
         if (!pObjectEntry)
-- 
GitLab

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

[Michael Stefaniuc (＠mstefani)]

Unrelated test failure in device8.c

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4783#note_56688

[PATCH 0/2] MR4783: dmime, dmloader: Avoid leaking track and segment references. - approved

[Michael Stefaniuc (＠mstefani)]

This merge request was approved by Michael Stefaniuc.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4783