Rémi Bernon : dmusic: Simplify and cleanup IDirectMusicDownload constructor.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ac25d09955a711aac61bbe30656eef2089e73bc3
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ac25d09955a711aac61bbe30656eef2...

Author: Rémi Bernon 
Date:   Mon Sep  4 11:16:59 2023 +0200

dmusic: Simplify and cleanup IDirectMusicDownload constructor.

---

dlls/dmusic/dmusic_private.h |  3 ++-
 dlls/dmusic/download.c       | 15 +++++----------
 dlls/dmusic/port.c           |  2 +-
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h
index b13780e1886..40cb0970173 100644
--- a/dlls/dmusic/dmusic_private.h
+++ b/dlls/dmusic/dmusic_private.h
@@ -97,10 +97,11 @@ extern HRESULT DMUSIC_CreateDirectMusicCollectionImpl(REFIID riid, void **ppobj,

/* Internal */
 extern HRESULT DMUSIC_CreateDirectMusicBufferImpl(LPDMUS_BUFFERDESC desc, LPVOID* ret_iface);
-extern HRESULT DMUSIC_CreateDirectMusicDownloadImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);
 extern HRESULT DMUSIC_CreateReferenceClockImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);
 extern HRESULT DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter);

+extern HRESULT download_create(IDirectMusicDownload **ret_iface);
+
 /*****************************************************************************
  * IDirectMusic8Impl implementation structure
  */
diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c
index 095ea23235b..f7ac8d92ee6 100644
--- a/dlls/dmusic/download.c
+++ b/dlls/dmusic/download.c
@@ -85,21 +85,16 @@ static const IDirectMusicDownloadVtbl DirectMusicDownload_Vtbl = {
     IDirectMusicDownloadImpl_GetBuffer
 };

-/* for ClassFactory */
-HRESULT DMUSIC_CreateDirectMusicDownloadImpl(const GUID *guid, void **ret_iface, IUnknown *unk_outer)
+HRESULT download_create(IDirectMusicDownload **ret_iface)
 {
     IDirectMusicDownloadImpl *download;

-    download = malloc(sizeof(*download));
-    if (!download)
-    {
-        *ret_iface = NULL;
-        return E_OUTOFMEMORY;
-    }
-
+    *ret_iface = NULL;
+    if (!(download = calloc(1, sizeof(*download)))) return E_OUTOFMEMORY;
     download->IDirectMusicDownload_iface.lpVtbl = &DirectMusicDownload_Vtbl;
     download->ref = 1;
-    *ret_iface = download;

+    TRACE("Created DirectMusicDownload %p\n", download);
+    *ret_iface = &download->IDirectMusicDownload_iface;
     return S_OK;
 }
diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c
index 47137c7878c..7f61e2d1ef7 100644
--- a/dlls/dmusic/port.c
+++ b/dlls/dmusic/port.c
@@ -582,7 +582,7 @@ static HRESULT WINAPI synth_port_download_GetBuffer(IDirectMusicPortDownload *if
     if (!IDMDownload)
         return E_POINTER;

-    return DMUSIC_CreateDirectMusicDownloadImpl(&IID_IDirectMusicDownload, (LPVOID*)IDMDownload, NULL);
+    return download_create(IDMDownload);
 }

static HRESULT WINAPI synth_port_download_AllocateBuffer(IDirectMusicPortDownload *iface, DWORD size,