Rémi Bernon : dmloader: Initialize ref to 1, and release after QueryInterface.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7d33a77b567614ed53b4f028b79a0ea5a656e5a3
URL:    https://gitlab.winehq.org/wine/wine/-/commit/7d33a77b567614ed53b4f028b79a0ea...

Author: Rémi Bernon <rbernon(a)codeweavers.com>
Date:   Thu Sep 21 08:07:56 2023 +0200

dmloader: Initialize ref to 1, and release after QueryInterface.

---

 dlls/dmloader/loader.c | 70 ++++++++++++++++++++++++++------------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c
index 9c3a73e9612..3d51b65c335 100644
--- a/dlls/dmloader/loader.c
+++ b/dlls/dmloader/loader.c
@@ -898,37 +898,41 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) {
 /* for ClassFactory */
 HRESULT create_dmloader(REFIID lpcGUID, void **ppobj)
 {
-	struct loader *obj;
-	DMUS_OBJECTDESC Desc;
-        struct cache_entry *dls;
-	struct list *pEntry;
-
-        TRACE("(%s, %p)\n", debugstr_dmguid(lpcGUID), ppobj);
-	*ppobj = NULL;
-	if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;
-	obj->IDirectMusicLoader8_iface.lpVtbl = &loader_vtbl;
-	obj->ref = 0; /* Will be inited with QueryInterface */
-        list_init(&obj->cache);
-        /* Caching is enabled by default for all classes */
-        obj->cache_class = ~0;
-
-	/* set default DLS collection (via SetObject... so that loading via DMUS_OBJ_OBJECT is possible) */
-	DM_STRUCT_INIT(&Desc);
-	Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_OBJECT;
-	Desc.guidClass = CLSID_DirectMusicCollection;
-	Desc.guidObject = GUID_DefaultGMCollection;
-	DMUSIC_GetDefaultGMPath (Desc.wszFileName);
-	IDirectMusicLoader_SetObject(&obj->IDirectMusicLoader8_iface, &Desc);
-	/* and now the workaroundTM for "invalid" default DLS; basically, 
-	   my tests showed that if GUID chunk is present in default DLS 
-	   collection, loader treats it as "invalid" and returns 
-	   DMUS_E_LOADER_NOFILENAME for all requests for it; basically, we check 
-	   if out input guidObject was overwritten */
-        pEntry = list_head(&obj->cache);
-        dls = LIST_ENTRY(pEntry, struct cache_entry, entry);
-	if (!IsEqualGUID(&Desc.guidObject, &GUID_DefaultGMCollection)) {
-                dls->bInvalidDefaultDLS = TRUE;
-	}
-
-	return IDirectMusicLoader_QueryInterface(&obj->IDirectMusicLoader8_iface, lpcGUID, ppobj);
+    struct loader *obj;
+    DMUS_OBJECTDESC Desc;
+    struct cache_entry *dls;
+    struct list *pEntry;
+    HRESULT hr;
+
+    TRACE("(%s, %p)\n", debugstr_dmguid(lpcGUID), ppobj);
+
+    *ppobj = NULL;
+    if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;
+    obj->IDirectMusicLoader8_iface.lpVtbl = &loader_vtbl;
+    obj->ref = 1;
+    list_init(&obj->cache);
+    /* Caching is enabled by default for all classes */
+    obj->cache_class = ~0;
+
+    /* set default DLS collection (via SetObject... so that loading via DMUS_OBJ_OBJECT is possible) */
+    DM_STRUCT_INIT(&Desc);
+    Desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_FILENAME | DMUS_OBJ_FULLPATH | DMUS_OBJ_OBJECT;
+    Desc.guidClass = CLSID_DirectMusicCollection;
+    Desc.guidObject = GUID_DefaultGMCollection;
+    DMUSIC_GetDefaultGMPath(Desc.wszFileName);
+    IDirectMusicLoader_SetObject(&obj->IDirectMusicLoader8_iface, &Desc);
+
+    /* and now the workaroundTM for "invalid" default DLS; basically,
+       my tests showed that if GUID chunk is present in default DLS
+       collection, loader treats it as "invalid" and returns
+       DMUS_E_LOADER_NOFILENAME for all requests for it; basically, we check
+       if out input guidObject was overwritten */
+    pEntry = list_head(&obj->cache);
+    dls = LIST_ENTRY(pEntry, struct cache_entry, entry);
+    if (!IsEqualGUID(&Desc.guidObject, &GUID_DefaultGMCollection))
+        dls->bInvalidDefaultDLS = TRUE;
+
+    hr = IDirectMusicLoader_QueryInterface(&obj->IDirectMusicLoader8_iface, lpcGUID, ppobj);
+    IDirectMusicLoader_Release(&obj->IDirectMusicLoader8_iface);
+    return hr;
 }