[PATCH 0/9] MR3787: dmusic: Share dmobject with dmband / dswave / dmstyle using PARENTSRC.

[Rémi Bernon (＠rbernon)]

(The rest of dmusic modules will be in a separate MR)

[PATCH 1/9] dmband: Always return S_FALSE from DllCanUnloadNow.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dmband/band.c           |  2 --
 dlls/dmband/bandtrack.c      |  2 --
 dlls/dmband/dmband_main.c    | 22 ----------------------
 dlls/dmband/dmband_private.h |  8 --------
 4 files changed, 34 deletions(-)

diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index d71863a1f9d..907377ebed5 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -83,7 +83,6 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DMBAND_UnlockModule();
     }

return ref;
@@ -527,7 +526,6 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj)
   obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
   list_init (&obj->Instruments);

-  DMBAND_LockModule();
   hr = IDirectMusicBand_QueryInterface(&obj->IDirectMusicBand_iface, lpcGUID, ppobj);
   IDirectMusicBand_Release(&obj->IDirectMusicBand_iface);

diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index 0142b5b5188..25aca207612 100644
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -82,7 +82,6 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DMBAND_UnlockModule();
     }

return ref;
@@ -650,7 +649,6 @@ HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj)
     track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
     list_init (&track->Bands);

-    DMBAND_LockModule();
     hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
     IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c
index c08f8b0a087..c032a931f31 100644
--- a/dlls/dmband/dmband_main.c
+++ b/dlls/dmband/dmband_main.c
@@ -23,8 +23,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(dmband);

-LONG DMBAND_refCount = 0;
-
 typedef struct {
         IClassFactory IClassFactory_iface;
         HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface);
@@ -60,15 +58,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r

static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
 {
-        DMBAND_LockModule();
-
         return 2; /* non-heap based object */
 }

static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
 {
-        DMBAND_UnlockModule();
-
         return 1; /* non-heap based object */
 }

@@ -90,12 +84,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown
 static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock)
 {
         TRACE("(%d)\n", dolock);
-
-        if (dolock)
-                DMBAND_LockModule();
-        else
-                DMBAND_UnlockModule();
-
         return S_OK;
 }

@@ -110,16 +98,6 @@ static const IClassFactoryVtbl classfactory_vtbl = {
 static IClassFactoryImpl Band_CF = {{&classfactory_vtbl}, create_dmband};
 static IClassFactoryImpl BandTrack_CF = {{&classfactory_vtbl}, create_dmbandtrack};

-/******************************************************************
- *		DllCanUnloadNow (DMBAND.@)
- *
- *
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-	return DMBAND_refCount != 0 ? S_FALSE : S_OK;
-}
-

/******************************************************************
  *		DllGetClassObject (DMBAND.@)
diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h
index b89dd08dd83..0b1807eaf93 100644
--- a/dlls/dmband/dmband_private.h
+++ b/dlls/dmband/dmband_private.h
@@ -73,14 +73,6 @@ typedef struct _DMUS_PRIVATE_BAND {
    IDirectMusicBand *band;
 } DMUS_PRIVATE_BAND, *LPDMUS_PRIVATE_BAND;

-
-/**********************************************************************
- * Dll lifetime tracking declaration for dmband.dll
- */
-extern LONG DMBAND_refCount;
-static inline void DMBAND_LockModule(void) { InterlockedIncrement( &DMBAND_refCount ); }
-static inline void DMBAND_UnlockModule(void) { InterlockedDecrement( &DMBAND_refCount ); }
-
 /*****************************************************************************
  * Misc.
  */

[PATCH 2/9] dmband: Use CRT allocation functions.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dmband/band.c      | 20 +++++---------------
 dlls/dmband/bandtrack.c | 18 +++++-------------
 dlls/dmband/dmobject.c  |  7 +++----
 3 files changed, 13 insertions(+), 32 deletions(-)

diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c
index 907377ebed5..02e3573bab9 100644
--- a/dlls/dmband/band.c
+++ b/dlls/dmband/band.c
@@ -81,9 +81,7 @@ static ULONG WINAPI IDirectMusicBandImpl_Release(IDirectMusicBand *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -277,11 +275,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *
   /*
    * @TODO insert pNewInstrument into This
    */
-  pNewInstrument = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_INSTRUMENT));
-  if (NULL == pNewInstrument) {
-    ERR(": no more memory\n");
-    return  E_OUTOFMEMORY;
-  }
+  if (!(pNewInstrument = calloc(1, sizeof(*pNewInstrument)))) return E_OUTOFMEMORY;
   memcpy(&pNewInstrument->pInstrument, &inst, sizeof(DMUS_IO_INSTRUMENT));
   pNewInstrument->ppReferenceCollection = NULL;
   if (NULL != pObject) {
@@ -289,8 +283,7 @@ static HRESULT parse_instrument(IDirectMusicBandImpl *This, DMUS_PRIVATE_CHUNK *
     hr = IDirectMusicObject_QueryInterface (pObject, &IID_IDirectMusicCollection, (void**) &pCol);
     if (FAILED(hr)) {
       ERR(": failed to get IDirectMusicCollection Interface from DMObject\n");
-      HeapFree(GetProcessHeap(), 0, pNewInstrument);
-
+      free(pNewInstrument);
       return hr;
     }
     pNewInstrument->ppReferenceCollection = pCol;
@@ -514,11 +507,8 @@ HRESULT create_dmband(REFIID lpcGUID, void **ppobj)
   IDirectMusicBandImpl* obj;
   HRESULT hr;

-  obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandImpl));
-  if (NULL == obj) {
-    *ppobj = NULL;
-    return E_OUTOFMEMORY;
-  }
+  *ppobj = NULL;
+  if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;
   obj->IDirectMusicBand_iface.lpVtbl = &dmband_vtbl;
   obj->ref = 1;
   dmobject_init(&obj->dmobj, &CLSID_DirectMusicBand, (IUnknown *)&obj->IDirectMusicBand_iface);
diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c
index 25aca207612..bdb9344b064 100644
--- a/dlls/dmband/bandtrack.c
+++ b/dlls/dmband/bandtrack.c
@@ -80,9 +80,7 @@ static ULONG WINAPI band_track_Release(IDirectMusicTrack8 *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -344,11 +342,8 @@ static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream,
    * @TODO insert pBand into This
    */
   if (SUCCEEDED(hr)) {
-    LPDMUS_PRIVATE_BAND pNewBand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_BAND));
-    if (NULL == pNewBand) {
-      ERR(": no more memory\n");
-      return  E_OUTOFMEMORY;
-    }
+    LPDMUS_PRIVATE_BAND pNewBand;
+    if (!(pNewBand = calloc(1, sizeof(*pNewBand)))) return E_OUTOFMEMORY;
     pNewBand->BandHeader = *pHeader;
     pNewBand->band = *ppBand;
     IDirectMusicBand_AddRef(*ppBand);
@@ -637,11 +632,8 @@ HRESULT create_dmbandtrack(REFIID lpcGUID, void **ppobj)
     IDirectMusicBandTrack *track;
     HRESULT hr;

-    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
-    if (!track) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
     track->ref = 1;
     dmobject_init(&track->dmobj, &CLSID_DirectMusicBandTrack,
diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c
index b526b23d031..07d887a376c 100644
--- a/dlls/dmband/dmobject.c
+++ b/dlls/dmband/dmobject.c
@@ -28,7 +28,6 @@
 #include "dmusics.h"
 #include "dmobject.h"
 #include "wine/debug.h"
-#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@@ -375,7 +374,7 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk)
 /* Reads chunk data of the form:
    DWORD     - size of array element
    element[] - Array of elements
-   The caller needs to heap_free() the array.
+   The caller needs to free() the array.
 */
 HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
         unsigned int *count, DWORD elem_size)
@@ -400,10 +399,10 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,

*count = (chunk->size - sizeof(DWORD)) / elem_size;
     size = *count * elem_size;
-    if (!(*array = heap_alloc(size)))
+    if (!(*array = malloc(size)))
         return E_OUTOFMEMORY;
     if (FAILED(hr = stream_read(stream, *array, size))) {
-        heap_free(*array);
+        free(*array);
         *array = NULL;
         return hr;
     }

[PATCH 3/9] dmband: Use PARENTSRC with dmusic.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dmband/Makefile.in |   1 +
 dlls/dmband/dmobject.c  | 732 ----------------------------------------
 dlls/dmband/dmobject.h  | 124 -------
 3 files changed, 1 insertion(+), 856 deletions(-)
 delete mode 100644 dlls/dmband/dmobject.c
 delete mode 100644 dlls/dmband/dmobject.h

diff --git a/dlls/dmband/Makefile.in b/dlls/dmband/Makefile.in
index 6fa1502f6b0..ef6b6a44c60 100644
--- a/dlls/dmband/Makefile.in
+++ b/dlls/dmband/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = dmband.dll
 IMPORTS   = dxguid uuid ole32 advapi32
+PARENTSRC = ../dmusic

C_SRCS = \
    band.c \
diff --git a/dlls/dmband/dmobject.c b/dlls/dmband/dmobject.c
deleted file mode 100644
index 07d887a376c..00000000000
--- a/dlls/dmband/dmobject.c
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Base IDirectMusicObject Implementation
- * Keep in sync with the master in dlls/dmusic/dmobject.c
- *
- * Copyright (C) 2003-2004 Rok Mandeljc
- * Copyright (C) 2014 Michael Stefaniuc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define COBJMACROS
-#include <assert.h>
-#include "objbase.h"
-#include "dmusici.h"
-#include "dmusicf.h"
-#include "dmusics.h"
-#include "dmobject.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
-WINE_DECLARE_DEBUG_CHANNEL(dmfile);
-
-/* Debugging helpers */
-const char *debugstr_dmguid(const GUID *id) {
-    unsigned int i;
-#define X(guid) { &guid, #guid }
-    static const struct {
-        const GUID *guid;
-        const char *name;
-    } guids[] = {
-        /* CLSIDs */
-        X(CLSID_AudioVBScript),
-        X(CLSID_DirectMusic),
-        X(CLSID_DirectMusicAudioPathConfig),
-        X(CLSID_DirectMusicAuditionTrack),
-        X(CLSID_DirectMusicBand),
-        X(CLSID_DirectMusicBandTrack),
-        X(CLSID_DirectMusicChordMapTrack),
-        X(CLSID_DirectMusicChordMap),
-        X(CLSID_DirectMusicChordTrack),
-        X(CLSID_DirectMusicCollection),
-        X(CLSID_DirectMusicCommandTrack),
-        X(CLSID_DirectMusicComposer),
-        X(CLSID_DirectMusicContainer),
-        X(CLSID_DirectMusicGraph),
-        X(CLSID_DirectMusicLoader),
-        X(CLSID_DirectMusicLyricsTrack),
-        X(CLSID_DirectMusicMarkerTrack),
-        X(CLSID_DirectMusicMelodyFormulationTrack),
-        X(CLSID_DirectMusicMotifTrack),
-        X(CLSID_DirectMusicMuteTrack),
-        X(CLSID_DirectMusicParamControlTrack),
-        X(CLSID_DirectMusicPatternTrack),
-        X(CLSID_DirectMusicPerformance),
-        X(CLSID_DirectMusicScript),
-        X(CLSID_DirectMusicScriptAutoImpSegment),
-        X(CLSID_DirectMusicScriptAutoImpPerformance),
-        X(CLSID_DirectMusicScriptAutoImpSegmentState),
-        X(CLSID_DirectMusicScriptAutoImpAudioPathConfig),
-        X(CLSID_DirectMusicScriptAutoImpAudioPath),
-        X(CLSID_DirectMusicScriptAutoImpSong),
-        X(CLSID_DirectMusicScriptSourceCodeLoader),
-        X(CLSID_DirectMusicScriptTrack),
-        X(CLSID_DirectMusicSection),
-        X(CLSID_DirectMusicSegment),
-        X(CLSID_DirectMusicSegmentState),
-        X(CLSID_DirectMusicSegmentTriggerTrack),
-        X(CLSID_DirectMusicSegTriggerTrack),
-        X(CLSID_DirectMusicSeqTrack),
-        X(CLSID_DirectMusicSignPostTrack),
-        X(CLSID_DirectMusicSong),
-        X(CLSID_DirectMusicStyle),
-        X(CLSID_DirectMusicStyleTrack),
-        X(CLSID_DirectMusicSynth),
-        X(CLSID_DirectMusicSynthSink),
-        X(CLSID_DirectMusicSysExTrack),
-        X(CLSID_DirectMusicTemplate),
-        X(CLSID_DirectMusicTempoTrack),
-        X(CLSID_DirectMusicTimeSigTrack),
-        X(CLSID_DirectMusicWaveTrack),
-        X(CLSID_DirectSoundWave),
-        /* IIDs */
-        X(IID_IDirectMusic),
-        X(IID_IDirectMusic2),
-        X(IID_IDirectMusic8),
-        X(IID_IDirectMusicAudioPath),
-        X(IID_IDirectMusicBand),
-        X(IID_IDirectMusicBuffer),
-        X(IID_IDirectMusicChordMap),
-        X(IID_IDirectMusicCollection),
-        X(IID_IDirectMusicComposer),
-        X(IID_IDirectMusicContainer),
-        X(IID_IDirectMusicDownload),
-        X(IID_IDirectMusicDownloadedInstrument),
-        X(IID_IDirectMusicGetLoader),
-        X(IID_IDirectMusicGraph),
-        X(IID_IDirectMusicInstrument),
-        X(IID_IDirectMusicLoader),
-        X(IID_IDirectMusicLoader8),
-        X(IID_IDirectMusicObject),
-        X(IID_IDirectMusicPatternTrack),
-        X(IID_IDirectMusicPerformance),
-        X(IID_IDirectMusicPerformance2),
-        X(IID_IDirectMusicPerformance8),
-        X(IID_IDirectMusicPort),
-        X(IID_IDirectMusicPortDownload),
-        X(IID_IDirectMusicScript),
-        X(IID_IDirectMusicSegment),
-        X(IID_IDirectMusicSegment2),
-        X(IID_IDirectMusicSegment8),
-        X(IID_IDirectMusicSegmentState),
-        X(IID_IDirectMusicSegmentState8),
-        X(IID_IDirectMusicStyle),
-        X(IID_IDirectMusicStyle8),
-        X(IID_IDirectMusicSynth),
-        X(IID_IDirectMusicSynth8),
-        X(IID_IDirectMusicSynthSink),
-        X(IID_IDirectMusicThru),
-        X(IID_IDirectMusicTool),
-        X(IID_IDirectMusicTool8),
-        X(IID_IDirectMusicTrack),
-        X(IID_IDirectMusicTrack8),
-        X(IID_IUnknown),
-        X(IID_IPersistStream),
-        X(IID_IStream),
-        X(IID_IClassFactory),
-        /* GUIDs */
-        X(GUID_DirectMusicAllTypes),
-        X(GUID_NOTIFICATION_CHORD),
-        X(GUID_NOTIFICATION_COMMAND),
-        X(GUID_NOTIFICATION_MEASUREANDBEAT),
-        X(GUID_NOTIFICATION_PERFORMANCE),
-        X(GUID_NOTIFICATION_RECOMPOSE),
-        X(GUID_NOTIFICATION_SEGMENT),
-        X(GUID_BandParam),
-        X(GUID_ChordParam),
-        X(GUID_CommandParam),
-        X(GUID_CommandParam2),
-        X(GUID_CommandParamNext),
-        X(GUID_IDirectMusicBand),
-        X(GUID_IDirectMusicChordMap),
-        X(GUID_IDirectMusicStyle),
-        X(GUID_MuteParam),
-        X(GUID_Play_Marker),
-        X(GUID_RhythmParam),
-        X(GUID_TempoParam),
-        X(GUID_TimeSignature),
-        X(GUID_Valid_Start_Time),
-        X(GUID_Clear_All_Bands),
-        X(GUID_ConnectToDLSCollection),
-        X(GUID_Disable_Auto_Download),
-        X(GUID_DisableTempo),
-        X(GUID_DisableTimeSig),
-        X(GUID_Download),
-        X(GUID_DownloadToAudioPath),
-        X(GUID_Enable_Auto_Download),
-        X(GUID_EnableTempo),
-        X(GUID_EnableTimeSig),
-        X(GUID_IgnoreBankSelectForGM),
-        X(GUID_SeedVariations),
-        X(GUID_StandardMIDIFile),
-        X(GUID_Unload),
-        X(GUID_UnloadFromAudioPath),
-        X(GUID_Variations),
-        X(GUID_PerfMasterTempo),
-        X(GUID_PerfMasterVolume),
-        X(GUID_PerfMasterGrooveLevel),
-        X(GUID_PerfAutoDownload),
-        X(GUID_DefaultGMCollection),
-        X(GUID_Synth_Default),
-        X(GUID_Buffer_Reverb),
-        X(GUID_Buffer_EnvReverb),
-        X(GUID_Buffer_Stereo),
-        X(GUID_Buffer_3D_Dry),
-        X(GUID_Buffer_Mono),
-        X(GUID_DMUS_PROP_GM_Hardware),
-        X(GUID_DMUS_PROP_GS_Capable),
-        X(GUID_DMUS_PROP_GS_Hardware),
-        X(GUID_DMUS_PROP_DLS1),
-        X(GUID_DMUS_PROP_DLS2),
-        X(GUID_DMUS_PROP_Effects),
-        X(GUID_DMUS_PROP_INSTRUMENT2),
-        X(GUID_DMUS_PROP_LegacyCaps),
-        X(GUID_DMUS_PROP_MemorySize),
-        X(GUID_DMUS_PROP_SampleMemorySize),
-        X(GUID_DMUS_PROP_SamplePlaybackRate),
-        X(GUID_DMUS_PROP_SetSynthSink),
-        X(GUID_DMUS_PROP_SinkUsesDSound),
-        X(GUID_DMUS_PROP_SynthSink_DSOUND),
-        X(GUID_DMUS_PROP_SynthSink_WAVE),
-        X(GUID_DMUS_PROP_Volume),
-        X(GUID_DMUS_PROP_WavesReverb),
-        X(GUID_DMUS_PROP_WriteLatency),
-        X(GUID_DMUS_PROP_WritePeriod),
-        X(GUID_DMUS_PROP_XG_Capable),
-        X(GUID_DMUS_PROP_XG_Hardware)
-    };
-#undef X
-
-    if (!id)
-        return "(null)";
-
-    for (i = 0; i < ARRAY_SIZE(guids); i++)
-        if (IsEqualGUID(id, guids[i].guid))
-            return guids[i].name;
-
-    return debugstr_guid(id);
-}
-
-void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
-{
-    if (!desc || !TRACE_ON(dmfile))
-        return;
-
-    TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
-    TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
-
-#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
-    TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
-    X(DMUS_OBJ_OBJECT);
-    X(DMUS_OBJ_CLASS);
-    X(DMUS_OBJ_NAME);
-    X(DMUS_OBJ_CATEGORY);
-    X(DMUS_OBJ_FILENAME);
-    X(DMUS_OBJ_FULLPATH);
-    X(DMUS_OBJ_URL);
-    X(DMUS_OBJ_VERSION);
-    X(DMUS_OBJ_DATE);
-    X(DMUS_OBJ_LOADED);
-    X(DMUS_OBJ_MEMORY);
-    X(DMUS_OBJ_STREAM);
-    TRACE_(dmfile)(")\n");
-#undef X
-
-    if (desc->dwValidData & DMUS_OBJ_CLASS)
-        TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass));
-    if (desc->dwValidData & DMUS_OBJ_OBJECT)
-        TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject));
-
-    if (desc->dwValidData & DMUS_OBJ_DATE) {
-        SYSTEMTIME time;
-        FileTimeToSystemTime(&desc->ftDate, &time);
-        TRACE_(dmfile)(" - ftDate = '%04u-%02u-%02u %02u:%02u:%02u'\n",
-                time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
-    }
-    if (desc->dwValidData & DMUS_OBJ_VERSION)
-        TRACE_(dmfile)(" - vVersion = '%u,%u,%u,%u'\n",
-                HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS),
-                HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS));
-    if (desc->dwValidData & DMUS_OBJ_NAME)
-        TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName));
-    if (desc->dwValidData & DMUS_OBJ_CATEGORY)
-        TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory));
-    if (desc->dwValidData & DMUS_OBJ_FILENAME)
-        TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName));
-    if (desc->dwValidData & DMUS_OBJ_MEMORY)
-        TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n",
-                wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData);
-    if (desc->dwValidData & DMUS_OBJ_STREAM)
-        TRACE_(dmfile)(" - pStream = %p\n", desc->pStream);
-}
-
-
-/* RIFF format parsing */
-#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD))
-
-const char *debugstr_chunk(const struct chunk_entry *chunk)
-{
-    const char *type = "";
-
-    if (!chunk)
-        return "(null)";
-    if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
-        type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
-    return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
-}
-
-static HRESULT stream_read(IStream *stream, void *data, ULONG size)
-{
-    ULONG read;
-    HRESULT hr;
-
-    hr = IStream_Read(stream, data, size, &read);
-    if (FAILED(hr))
-        TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr);
-    else if (!read && read < size) {
-        /* All or nothing: Handle a partial read due to end of stream as an error */
-        TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
-        return E_FAIL;
-    }
-
-    return hr;
-}
-
-HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk)
-{
-    static const LARGE_INTEGER zero;
-    ULONGLONG ck_end = 0, p_end = 0;
-    HRESULT hr;
-
-    hr = IStream_Seek(stream, zero, STREAM_SEEK_CUR, &chunk->offset);
-    if (FAILED(hr))
-        return hr;
-    assert(!(chunk->offset.QuadPart & 1));
-    if (chunk->parent) {
-        p_end = chunk->parent->offset.QuadPart + CHUNK_HDR_SIZE + ((chunk->parent->size + 1) & ~1);
-        if (chunk->offset.QuadPart == p_end)
-            return S_FALSE;
-        ck_end = chunk->offset.QuadPart + CHUNK_HDR_SIZE;
-        if (ck_end > p_end) {
-            WARN_(dmfile)("No space for sub-chunk header in parent chunk: ends at offset %s > %s\n",
-                    wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end));
-            return E_FAIL;
-        }
-    }
-
-    hr = stream_read(stream, chunk, CHUNK_HDR_SIZE);
-    if (hr != S_OK)
-        return hr;
-    if (chunk->parent) {
-        ck_end += (chunk->size + 1) & ~1;
-        if (ck_end > p_end) {
-            WARN_(dmfile)("No space for sub-chunk data in parent chunk: ends at offset %s > %s\n",
-                    wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end));
-            return E_FAIL;
-        }
-    }
-
-    if (chunk->id == FOURCC_LIST || chunk->id == FOURCC_RIFF) {
-        hr = stream_read(stream, &chunk->type, sizeof(FOURCC));
-        if (hr != S_OK)
-            return hr != S_FALSE ? hr : E_FAIL;
-    }
-
-    TRACE_(dmfile)("Returning %s\n", debugstr_chunk(chunk));
-
-    return S_OK;
-}
-
-HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER end;
-
-    end.QuadPart = (chunk->offset.QuadPart + CHUNK_HDR_SIZE + chunk->size + 1) & ~(ULONGLONG)1;
-
-    return IStream_Seek(stream, end, STREAM_SEEK_SET, NULL);
-}
-
-HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk)
-{
-    HRESULT hr;
-
-    if (chunk->id) {
-        hr = stream_skip_chunk(stream, chunk);
-        if (FAILED(hr))
-            return hr;
-    }
-
-    return stream_get_chunk(stream, chunk);
-}
-
-/* Reads chunk data of the form:
-   DWORD     - size of array element
-   element[] - Array of elements
-   The caller needs to free() the array.
-*/
-HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
-        unsigned int *count, DWORD elem_size)
-{
-    DWORD size;
-    HRESULT hr;
-
-    *array = NULL;
-    *count = 0;
-
-    if (chunk->size < sizeof(DWORD)) {
-        WARN_(dmfile)("%s: Too short to read element size\n", debugstr_chunk(chunk));
-        return E_FAIL;
-    }
-    if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
-        return hr;
-    if (size != elem_size) {
-        WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
-                debugstr_chunk(chunk), size, elem_size);
-        return DMUS_E_UNSUPPORTED_STREAM;
-    }
-
-    *count = (chunk->size - sizeof(DWORD)) / elem_size;
-    size = *count * elem_size;
-    if (!(*array = malloc(size)))
-        return E_OUTOFMEMORY;
-    if (FAILED(hr = stream_read(stream, *array, size))) {
-        free(*array);
-        *array = NULL;
-        return hr;
-    }
-
-    if (chunk->size > size + sizeof(DWORD)) {
-        WARN_(dmfile)("%s: Extraneous data at end of array\n", debugstr_chunk(chunk));
-        stream_skip_chunk(stream, chunk);
-        return S_FALSE;
-    }
-    return S_OK;
-}
-
-HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data,
-        ULONG size)
-{
-    if (chunk->size != size) {
-        WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
-                debugstr_fourcc(chunk->id), chunk->size,
-                wine_dbgstr_longlong(chunk->offset.QuadPart), size);
-        return E_FAIL;
-    }
-    return stream_read(stream, data, size);
-}
-
-HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str,
-        ULONG size)
-{
-    ULONG len;
-    HRESULT hr;
-
-    hr = IStream_Read(stream, str, min(chunk->size, size), &len);
-    if (FAILED(hr))
-        return hr;
-
-    /* Don't assume the string is properly zero terminated */
-    str[min(len, size - 1)] = 0;
-
-    if (len < chunk->size)
-        return S_FALSE;
-    return S_OK;
-}
-
-
-
-/* Generic IDirectMusicObject methods */
-static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface)
-{
-    return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface);
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
-        void **ret_iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
-}
-
-ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_AddRef(This->outer_unk);
-}
-
-ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_Release(This->outer_unk);
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-
-    TRACE("(%p/%p)->(%p)\n", iface, This, desc);
-
-    if (!desc)
-        return E_POINTER;
-
-    memcpy(desc, &This->desc, This->desc.dwSize);
-
-    return S_OK;
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    HRESULT ret = S_OK;
-
-    TRACE("(%p, %p)\n", iface, desc);
-
-    if (!desc)
-        return E_POINTER;
-
-    /* Immutable property */
-    if (desc->dwValidData & DMUS_OBJ_CLASS)
-    {
-        desc->dwValidData &= ~DMUS_OBJ_CLASS;
-        ret = S_FALSE;
-    }
-    /* Set only valid fields */
-    if (desc->dwValidData & DMUS_OBJ_OBJECT)
-        This->desc.guidObject = desc->guidObject;
-    if (desc->dwValidData & DMUS_OBJ_NAME)
-        lstrcpynW(This->desc.wszName, desc->wszName, DMUS_MAX_NAME);
-    if (desc->dwValidData & DMUS_OBJ_CATEGORY)
-        lstrcpynW(This->desc.wszCategory, desc->wszCategory, DMUS_MAX_CATEGORY);
-    if (desc->dwValidData & DMUS_OBJ_FILENAME)
-        lstrcpynW(This->desc.wszFileName, desc->wszFileName, DMUS_MAX_FILENAME);
-    if (desc->dwValidData & DMUS_OBJ_VERSION)
-        This->desc.vVersion = desc->vVersion;
-    if (desc->dwValidData & DMUS_OBJ_DATE)
-        This->desc.ftDate = desc->ftDate;
-    if (desc->dwValidData & DMUS_OBJ_MEMORY) {
-        This->desc.llMemLength = desc->llMemLength;
-        memcpy(This->desc.pbMemData, desc->pbMemData, desc->llMemLength);
-    }
-    if (desc->dwValidData & DMUS_OBJ_STREAM)
-        IStream_Clone(desc->pStream, &This->desc.pStream);
-
-    This->desc.dwValidData |= desc->dwValidData;
-
-    return ret;
-}
-
-/* Helper for IDirectMusicObject::ParseDescriptor */
-static inline void info_get_name(IStream *stream, const struct chunk_entry *info,
-        DMUS_OBJECTDESC *desc)
-{
-    struct chunk_entry chunk = {.parent = info};
-    char name[DMUS_MAX_NAME];
-    ULONG len;
-    HRESULT hr = E_FAIL;
-
-    while (stream_next_chunk(stream, &chunk) == S_OK)
-        if (chunk.id == mmioFOURCC('I','N','A','M'))
-            hr = IStream_Read(stream, name, min(chunk.size, sizeof(name)), &len);
-
-    if (SUCCEEDED(hr)) {
-        len = MultiByteToWideChar(CP_ACP, 0, name, len, desc->wszName, sizeof(desc->wszName));
-        desc->wszName[min(len, sizeof(desc->wszName) - 1)] = 0;
-        desc->dwValidData |= DMUS_OBJ_NAME;
-    }
-}
-
-static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo,
-        DMUS_OBJECTDESC *desc, BOOL inam)
-{
-    struct chunk_entry chunk = {.parent = unfo};
-
-    while (stream_next_chunk(stream, &chunk) == S_OK)
-        if (chunk.id == DMUS_FOURCC_UNAM_CHUNK || (inam && chunk.id == mmioFOURCC('I','N','A','M')))
-            if (stream_chunk_get_wstr(stream, &chunk, desc->wszName, sizeof(desc->wszName)) == S_OK)
-                desc->dwValidData |= DMUS_OBJ_NAME;
-}
-
-HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
-        DMUS_OBJECTDESC *desc, DWORD supported)
-{
-    struct chunk_entry chunk = {.parent = riff};
-    HRESULT hr;
-
-    TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
-
-    desc->dwValidData = 0;
-    desc->dwSize = sizeof(*desc);
-
-    while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) {
-        switch (chunk.id) {
-            case DMUS_FOURCC_CATEGORY_CHUNK:
-                if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszCategory, sizeof(desc->wszCategory)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_CATEGORY;
-                break;
-            case DMUS_FOURCC_DATE_CHUNK:
-                if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk,
-                            &desc->ftDate, sizeof(desc->ftDate)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_DATE;
-                break;
-            case DMUS_FOURCC_FILE_CHUNK:
-                if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszFileName, sizeof(desc->wszFileName)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_FILENAME;
-                break;
-            case DMUS_FOURCC_GUID_CHUNK:
-                if ((supported & DMUS_OBJ_OBJECT) && stream_chunk_get_data(stream, &chunk,
-                            &desc->guidObject, sizeof(desc->guidObject)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_OBJECT;
-                break;
-            case DMUS_FOURCC_NAME_CHUNK:
-                if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszName, sizeof(desc->wszName)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_NAME;
-                break;
-            case DMUS_FOURCC_VERSION_CHUNK:
-                if ((supported & DMUS_OBJ_VERSION) && stream_chunk_get_data(stream, &chunk,
-                            &desc->vVersion, sizeof(desc->vVersion)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_VERSION;
-                break;
-            case FOURCC_LIST:
-                if (chunk.type == DMUS_FOURCC_UNFO_LIST && (supported & DMUS_OBJ_NAME))
-                    unfo_get_name(stream, &chunk, desc, supported & DMUS_OBJ_NAME_INAM);
-                else if (chunk.type == DMUS_FOURCC_INFO_LIST && (supported & DMUS_OBJ_NAME_INFO))
-                    info_get_name(stream, &chunk, desc);
-                break;
-        }
-    }
-    TRACE("Found %#lx\n", desc->dwValidData);
-
-    return hr;
-}
-
-HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
-        IDirectMusicObject **dmobj)
-{
-    struct chunk_entry chunk = {.parent = list};
-    IDirectMusicGetLoader *getloader;
-    IDirectMusicLoader *loader;
-    DMUS_OBJECTDESC desc;
-    DMUS_IO_REFERENCE reference;
-    HRESULT hr;
-
-    if (FAILED(hr = stream_next_chunk(stream, &chunk)))
-        return hr;
-    if (chunk.id != DMUS_FOURCC_REF_CHUNK)
-        return DMUS_E_UNSUPPORTED_STREAM;
-
-    if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &reference, sizeof(reference)))) {
-        WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
-        return hr;
-    }
-    TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
-            reference.dwValidData);
-
-    if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
-        return hr;
-    desc.guidClass = reference.guidClassID;
-    desc.dwValidData |= DMUS_OBJ_CLASS;
-    dump_DMUS_OBJECTDESC(&desc);
-
-    if (FAILED(hr = IStream_QueryInterface(stream, &IID_IDirectMusicGetLoader, (void**)&getloader)))
-        return hr;
-    hr = IDirectMusicGetLoader_GetLoader(getloader, &loader);
-    IDirectMusicGetLoader_Release(getloader);
-    if (FAILED(hr))
-        return hr;
-
-    hr = IDirectMusicLoader_GetObject(loader, &desc, &IID_IDirectMusicObject, (void**)dmobj);
-    IDirectMusicLoader_Release(loader);
-
-    return hr;
-}
-
-/* Generic IPersistStream methods */
-static inline struct dmobject *impl_from_IPersistStream(IPersistStream *iface)
-{
-    return CONTAINING_RECORD(iface, struct dmobject, IPersistStream_iface);
-}
-
-HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
-        void **ret_iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
-}
-
-ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_AddRef(This->outer_unk);
-}
-
-ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_Release(This->outer_unk);
-}
-
-HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-
-    TRACE("(%p, %p)\n", This, class);
-
-    if (!class)
-        return E_POINTER;
-
-    *class = This->desc.guidClass;
-
-    return S_OK;
-}
-
-/* IPersistStream methods not implemented in native */
-HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
-{
-    TRACE("(%p, %p): method not implemented\n", iface, class);
-    return E_NOTIMPL;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface)
-{
-    TRACE("(%p): method not implemented, always returning S_FALSE\n", iface);
-    return S_FALSE;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
-        BOOL clear_dirty)
-{
-    TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty);
-    return E_NOTIMPL;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size)
-{
-    TRACE("(%p, %p): method not implemented\n", iface, size);
-    return E_NOTIMPL;
-}
-
-
-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk)
-{
-    dmobj->outer_unk = outer_unk;
-    dmobj->desc.dwSize = sizeof(dmobj->desc);
-    dmobj->desc.dwValidData = DMUS_OBJ_CLASS;
-    dmobj->desc.guidClass = *class;
-}
diff --git a/dlls/dmband/dmobject.h b/dlls/dmband/dmobject.h
deleted file mode 100644
index 772be015c80..00000000000
--- a/dlls/dmband/dmobject.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Base IDirectMusicObject Implementation
- * Keep in sync with the master in dlls/dmusic/dmobject.h
- *
- * Copyright (C) 2014 Michael Stefaniuc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "wine/debug.h"
-
-/* RIFF stream parsing */
-struct chunk_entry;
-struct chunk_entry {
-    FOURCC id;
-    DWORD size;
-    FOURCC type;                        /* valid only for LIST and RIFF chunks */
-    ULARGE_INTEGER offset;              /* chunk offset from start of stream */
-    const struct chunk_entry *parent;   /* enclosing RIFF or LIST chunk */
-};
-
-HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk);
-HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk);
-HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk);
-
-HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
-        unsigned int *count, DWORD elem_size);
-HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data,
-        ULONG size);
-HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str,
-        ULONG size);
-
-static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER offset;
-
-    offset.QuadPart = chunk->offset.QuadPart + sizeof(FOURCC) + sizeof(DWORD);
-    if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
-        offset.QuadPart += sizeof(FOURCC);
-
-    return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL);
-}
-
-static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER offset;
-
-    offset.QuadPart = chunk->offset.QuadPart;
-
-    return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL);
-}
-
-
-/* IDirectMusicObject base object */
-struct dmobject {
-    IDirectMusicObject IDirectMusicObject_iface;
-    IPersistStream IPersistStream_iface;
-    IUnknown *outer_unk;
-    DMUS_OBJECTDESC desc;
-};
-
-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);
-
-/* Generic IDirectMusicObject methods */
-HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
-        void **ret_iface);
-ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface);
-ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface);
-HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc);
-HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc);
-
-/* Helper for IDirectMusicObject::ParseDescriptor */
-HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
-        DMUS_OBJECTDESC *desc, DWORD supported);
-/* Additional supported flags for dmobj_parsedescriptor.
-   DMUS_OBJ_NAME is 'UNAM' chunk in UNFO list */
-#define DMUS_OBJ_NAME_INAM   0x1000     /* 'INAM' chunk in UNFO list */
-#define DMUS_OBJ_NAME_INFO   0x2000     /* 'INAM' chunk in INFO list */
-
-/* 'DMRF' (reference list) helper */
-HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
-        IDirectMusicObject **dmobj);
-
-/* Generic IPersistStream methods */
-HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
-        void **ret_iface);
-ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface);
-ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface);
-HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class);
-
-/* IPersistStream methods not implemented in native */
-HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface,
-        CLSID *class);
-HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface);
-HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
-        BOOL clear_dirty);
-HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface,
-        ULARGE_INTEGER *size);
-
-/* Debugging helpers */
-const char *debugstr_chunk(const struct chunk_entry *chunk);
-const char *debugstr_dmguid(const GUID *id);
-void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc);
-
-static inline const char *debugstr_fourcc(DWORD fourcc)
-{
-    if (!fourcc) return "''";
-    return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8),
-            (char)(fourcc >> 16), (char)(fourcc >> 24));
-}

[PATCH 4/9] dswave: Always return S_FALSE from DllCanUnloadNow.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dswave/dswave.c         |  2 --
 dlls/dswave/dswave_main.c    | 23 -----------------------
 dlls/dswave/dswave_private.h |  7 -------
 3 files changed, 32 deletions(-)

diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c
index e6d85d738fe..8e06fc8d13d 100644
--- a/dlls/dswave/dswave.c
+++ b/dlls/dswave/dswave.c
@@ -86,7 +86,6 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DSWAVE_UnlockModule();
     }

return ref;
@@ -191,7 +190,6 @@ HRESULT create_dswave(REFIID lpcGUID, void **ppobj)
     obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl;
     obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;

-    DSWAVE_LockModule();
     hr = IUnknown_QueryInterface(&obj->IUnknown_iface, lpcGUID, ppobj);
     IUnknown_Release(&obj->IUnknown_iface);
     return hr;
diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c
index 81dcc73de85..f2ce7bb950f 100644
--- a/dlls/dswave/dswave_main.c
+++ b/dlls/dswave/dswave_main.c
@@ -39,8 +39,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(dswave);

-LONG DSWAVE_refCount = 0;
-
 typedef struct {
         IClassFactory IClassFactory_iface;
 } IClassFactoryImpl;
@@ -70,15 +68,11 @@ static HRESULT WINAPI WaveCF_QueryInterface(IClassFactory * iface, REFIID riid,

static ULONG WINAPI WaveCF_AddRef(IClassFactory * iface)
 {
-	DSWAVE_LockModule();
-
    return 2; /* non-heap based object */
 }

static ULONG WINAPI WaveCF_Release(IClassFactory * iface)
 {
-	DSWAVE_UnlockModule();
-
    return 1; /* non-heap based object */
 }

@@ -98,12 +92,6 @@ static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *out
 static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock)
 {
    TRACE("(%d)\n", dolock);
-
-	if (dolock)
-		DSWAVE_LockModule();
-	else
-		DSWAVE_UnlockModule();
-	
    return S_OK;
 }

@@ -117,17 +105,6 @@ static const IClassFactoryVtbl WaveCF_Vtbl = {

static IClassFactoryImpl Wave_CF = {{&WaveCF_Vtbl}};

-/******************************************************************
- *		DllCanUnloadNow (DSWAVE.@)
- *
- *
- */
-HRESULT WINAPI DllCanUnloadNow(void)
-{
-	return DSWAVE_refCount != 0 ? S_FALSE : S_OK;
-}
-
-
 /******************************************************************
  *		DllGetClassObject (DSWAVE.@)
  *
diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h
index a7758a970bc..50406c676c1 100644
--- a/dlls/dswave/dswave_private.h
+++ b/dlls/dswave/dswave_private.h
@@ -44,11 +44,4 @@
  */
 extern HRESULT create_dswave(REFIID lpcGUID, void **ret_iface);

-/**********************************************************************
- * Dll lifetime tracking declaration for dswave.dll
- */
-extern LONG DSWAVE_refCount;
-static inline void DSWAVE_LockModule(void) { InterlockedIncrement( &DSWAVE_refCount ); }
-static inline void DSWAVE_UnlockModule(void) { InterlockedDecrement( &DSWAVE_refCount ); }
-
 #endif	/* __WINE_DSWAVE_PRIVATE_H */

[PATCH 5/9] dswave: Use CRT allocation functions.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dswave/dswave.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c
index 8e06fc8d13d..5bdd83dfa2c 100644
--- a/dlls/dswave/dswave.c
+++ b/dlls/dswave/dswave.c
@@ -84,9 +84,7 @@ static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -179,11 +177,8 @@ HRESULT create_dswave(REFIID lpcGUID, void **ppobj)
     IDirectMusicWaveImpl *obj;
     HRESULT hr;

-    obj = HeapAlloc(GetProcessHeap(), 0, sizeof(IDirectMusicWaveImpl));
-    if (!obj) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;
     obj->IUnknown_iface.lpVtbl = &unknown_vtbl;
     obj->ref = 1;
     dmobject_init(&obj->dmobj, &CLSID_DirectSoundWave, &obj->IUnknown_iface);

[PATCH 6/9] dswave: Use PARENTSRC with dmusic.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dswave/Makefile.in |   1 +
 dlls/dswave/dmobject.c  | 733 ----------------------------------------
 dlls/dswave/dmobject.h  | 124 -------
 3 files changed, 1 insertion(+), 857 deletions(-)
 delete mode 100644 dlls/dswave/dmobject.c
 delete mode 100644 dlls/dswave/dmobject.h

diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in
index 9a08518397b..99b1e3ff9dc 100644
--- a/dlls/dswave/Makefile.in
+++ b/dlls/dswave/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = dswave.dll
 IMPORTS   = dxguid uuid ole32 advapi32
+PARENTSRC = ../dmusic

C_SRCS = \
    dmobject.c \
diff --git a/dlls/dswave/dmobject.c b/dlls/dswave/dmobject.c
deleted file mode 100644
index b526b23d031..00000000000
--- a/dlls/dswave/dmobject.c
+++ /dev/null
@@ -1,733 +0,0 @@
-/*
- * Base IDirectMusicObject Implementation
- * Keep in sync with the master in dlls/dmusic/dmobject.c
- *
- * Copyright (C) 2003-2004 Rok Mandeljc
- * Copyright (C) 2014 Michael Stefaniuc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define COBJMACROS
-#include <assert.h>
-#include "objbase.h"
-#include "dmusici.h"
-#include "dmusicf.h"
-#include "dmusics.h"
-#include "dmobject.h"
-#include "wine/debug.h"
-#include "wine/heap.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
-WINE_DECLARE_DEBUG_CHANNEL(dmfile);
-
-/* Debugging helpers */
-const char *debugstr_dmguid(const GUID *id) {
-    unsigned int i;
-#define X(guid) { &guid, #guid }
-    static const struct {
-        const GUID *guid;
-        const char *name;
-    } guids[] = {
-        /* CLSIDs */
-        X(CLSID_AudioVBScript),
-        X(CLSID_DirectMusic),
-        X(CLSID_DirectMusicAudioPathConfig),
-        X(CLSID_DirectMusicAuditionTrack),
-        X(CLSID_DirectMusicBand),
-        X(CLSID_DirectMusicBandTrack),
-        X(CLSID_DirectMusicChordMapTrack),
-        X(CLSID_DirectMusicChordMap),
-        X(CLSID_DirectMusicChordTrack),
-        X(CLSID_DirectMusicCollection),
-        X(CLSID_DirectMusicCommandTrack),
-        X(CLSID_DirectMusicComposer),
-        X(CLSID_DirectMusicContainer),
-        X(CLSID_DirectMusicGraph),
-        X(CLSID_DirectMusicLoader),
-        X(CLSID_DirectMusicLyricsTrack),
-        X(CLSID_DirectMusicMarkerTrack),
-        X(CLSID_DirectMusicMelodyFormulationTrack),
-        X(CLSID_DirectMusicMotifTrack),
-        X(CLSID_DirectMusicMuteTrack),
-        X(CLSID_DirectMusicParamControlTrack),
-        X(CLSID_DirectMusicPatternTrack),
-        X(CLSID_DirectMusicPerformance),
-        X(CLSID_DirectMusicScript),
-        X(CLSID_DirectMusicScriptAutoImpSegment),
-        X(CLSID_DirectMusicScriptAutoImpPerformance),
-        X(CLSID_DirectMusicScriptAutoImpSegmentState),
-        X(CLSID_DirectMusicScriptAutoImpAudioPathConfig),
-        X(CLSID_DirectMusicScriptAutoImpAudioPath),
-        X(CLSID_DirectMusicScriptAutoImpSong),
-        X(CLSID_DirectMusicScriptSourceCodeLoader),
-        X(CLSID_DirectMusicScriptTrack),
-        X(CLSID_DirectMusicSection),
-        X(CLSID_DirectMusicSegment),
-        X(CLSID_DirectMusicSegmentState),
-        X(CLSID_DirectMusicSegmentTriggerTrack),
-        X(CLSID_DirectMusicSegTriggerTrack),
-        X(CLSID_DirectMusicSeqTrack),
-        X(CLSID_DirectMusicSignPostTrack),
-        X(CLSID_DirectMusicSong),
-        X(CLSID_DirectMusicStyle),
-        X(CLSID_DirectMusicStyleTrack),
-        X(CLSID_DirectMusicSynth),
-        X(CLSID_DirectMusicSynthSink),
-        X(CLSID_DirectMusicSysExTrack),
-        X(CLSID_DirectMusicTemplate),
-        X(CLSID_DirectMusicTempoTrack),
-        X(CLSID_DirectMusicTimeSigTrack),
-        X(CLSID_DirectMusicWaveTrack),
-        X(CLSID_DirectSoundWave),
-        /* IIDs */
-        X(IID_IDirectMusic),
-        X(IID_IDirectMusic2),
-        X(IID_IDirectMusic8),
-        X(IID_IDirectMusicAudioPath),
-        X(IID_IDirectMusicBand),
-        X(IID_IDirectMusicBuffer),
-        X(IID_IDirectMusicChordMap),
-        X(IID_IDirectMusicCollection),
-        X(IID_IDirectMusicComposer),
-        X(IID_IDirectMusicContainer),
-        X(IID_IDirectMusicDownload),
-        X(IID_IDirectMusicDownloadedInstrument),
-        X(IID_IDirectMusicGetLoader),
-        X(IID_IDirectMusicGraph),
-        X(IID_IDirectMusicInstrument),
-        X(IID_IDirectMusicLoader),
-        X(IID_IDirectMusicLoader8),
-        X(IID_IDirectMusicObject),
-        X(IID_IDirectMusicPatternTrack),
-        X(IID_IDirectMusicPerformance),
-        X(IID_IDirectMusicPerformance2),
-        X(IID_IDirectMusicPerformance8),
-        X(IID_IDirectMusicPort),
-        X(IID_IDirectMusicPortDownload),
-        X(IID_IDirectMusicScript),
-        X(IID_IDirectMusicSegment),
-        X(IID_IDirectMusicSegment2),
-        X(IID_IDirectMusicSegment8),
-        X(IID_IDirectMusicSegmentState),
-        X(IID_IDirectMusicSegmentState8),
-        X(IID_IDirectMusicStyle),
-        X(IID_IDirectMusicStyle8),
-        X(IID_IDirectMusicSynth),
-        X(IID_IDirectMusicSynth8),
-        X(IID_IDirectMusicSynthSink),
-        X(IID_IDirectMusicThru),
-        X(IID_IDirectMusicTool),
-        X(IID_IDirectMusicTool8),
-        X(IID_IDirectMusicTrack),
-        X(IID_IDirectMusicTrack8),
-        X(IID_IUnknown),
-        X(IID_IPersistStream),
-        X(IID_IStream),
-        X(IID_IClassFactory),
-        /* GUIDs */
-        X(GUID_DirectMusicAllTypes),
-        X(GUID_NOTIFICATION_CHORD),
-        X(GUID_NOTIFICATION_COMMAND),
-        X(GUID_NOTIFICATION_MEASUREANDBEAT),
-        X(GUID_NOTIFICATION_PERFORMANCE),
-        X(GUID_NOTIFICATION_RECOMPOSE),
-        X(GUID_NOTIFICATION_SEGMENT),
-        X(GUID_BandParam),
-        X(GUID_ChordParam),
-        X(GUID_CommandParam),
-        X(GUID_CommandParam2),
-        X(GUID_CommandParamNext),
-        X(GUID_IDirectMusicBand),
-        X(GUID_IDirectMusicChordMap),
-        X(GUID_IDirectMusicStyle),
-        X(GUID_MuteParam),
-        X(GUID_Play_Marker),
-        X(GUID_RhythmParam),
-        X(GUID_TempoParam),
-        X(GUID_TimeSignature),
-        X(GUID_Valid_Start_Time),
-        X(GUID_Clear_All_Bands),
-        X(GUID_ConnectToDLSCollection),
-        X(GUID_Disable_Auto_Download),
-        X(GUID_DisableTempo),
-        X(GUID_DisableTimeSig),
-        X(GUID_Download),
-        X(GUID_DownloadToAudioPath),
-        X(GUID_Enable_Auto_Download),
-        X(GUID_EnableTempo),
-        X(GUID_EnableTimeSig),
-        X(GUID_IgnoreBankSelectForGM),
-        X(GUID_SeedVariations),
-        X(GUID_StandardMIDIFile),
-        X(GUID_Unload),
-        X(GUID_UnloadFromAudioPath),
-        X(GUID_Variations),
-        X(GUID_PerfMasterTempo),
-        X(GUID_PerfMasterVolume),
-        X(GUID_PerfMasterGrooveLevel),
-        X(GUID_PerfAutoDownload),
-        X(GUID_DefaultGMCollection),
-        X(GUID_Synth_Default),
-        X(GUID_Buffer_Reverb),
-        X(GUID_Buffer_EnvReverb),
-        X(GUID_Buffer_Stereo),
-        X(GUID_Buffer_3D_Dry),
-        X(GUID_Buffer_Mono),
-        X(GUID_DMUS_PROP_GM_Hardware),
-        X(GUID_DMUS_PROP_GS_Capable),
-        X(GUID_DMUS_PROP_GS_Hardware),
-        X(GUID_DMUS_PROP_DLS1),
-        X(GUID_DMUS_PROP_DLS2),
-        X(GUID_DMUS_PROP_Effects),
-        X(GUID_DMUS_PROP_INSTRUMENT2),
-        X(GUID_DMUS_PROP_LegacyCaps),
-        X(GUID_DMUS_PROP_MemorySize),
-        X(GUID_DMUS_PROP_SampleMemorySize),
-        X(GUID_DMUS_PROP_SamplePlaybackRate),
-        X(GUID_DMUS_PROP_SetSynthSink),
-        X(GUID_DMUS_PROP_SinkUsesDSound),
-        X(GUID_DMUS_PROP_SynthSink_DSOUND),
-        X(GUID_DMUS_PROP_SynthSink_WAVE),
-        X(GUID_DMUS_PROP_Volume),
-        X(GUID_DMUS_PROP_WavesReverb),
-        X(GUID_DMUS_PROP_WriteLatency),
-        X(GUID_DMUS_PROP_WritePeriod),
-        X(GUID_DMUS_PROP_XG_Capable),
-        X(GUID_DMUS_PROP_XG_Hardware)
-    };
-#undef X
-
-    if (!id)
-        return "(null)";
-
-    for (i = 0; i < ARRAY_SIZE(guids); i++)
-        if (IsEqualGUID(id, guids[i].guid))
-            return guids[i].name;
-
-    return debugstr_guid(id);
-}
-
-void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
-{
-    if (!desc || !TRACE_ON(dmfile))
-        return;
-
-    TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
-    TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
-
-#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
-    TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
-    X(DMUS_OBJ_OBJECT);
-    X(DMUS_OBJ_CLASS);
-    X(DMUS_OBJ_NAME);
-    X(DMUS_OBJ_CATEGORY);
-    X(DMUS_OBJ_FILENAME);
-    X(DMUS_OBJ_FULLPATH);
-    X(DMUS_OBJ_URL);
-    X(DMUS_OBJ_VERSION);
-    X(DMUS_OBJ_DATE);
-    X(DMUS_OBJ_LOADED);
-    X(DMUS_OBJ_MEMORY);
-    X(DMUS_OBJ_STREAM);
-    TRACE_(dmfile)(")\n");
-#undef X
-
-    if (desc->dwValidData & DMUS_OBJ_CLASS)
-        TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass));
-    if (desc->dwValidData & DMUS_OBJ_OBJECT)
-        TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject));
-
-    if (desc->dwValidData & DMUS_OBJ_DATE) {
-        SYSTEMTIME time;
-        FileTimeToSystemTime(&desc->ftDate, &time);
-        TRACE_(dmfile)(" - ftDate = '%04u-%02u-%02u %02u:%02u:%02u'\n",
-                time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
-    }
-    if (desc->dwValidData & DMUS_OBJ_VERSION)
-        TRACE_(dmfile)(" - vVersion = '%u,%u,%u,%u'\n",
-                HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS),
-                HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS));
-    if (desc->dwValidData & DMUS_OBJ_NAME)
-        TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName));
-    if (desc->dwValidData & DMUS_OBJ_CATEGORY)
-        TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory));
-    if (desc->dwValidData & DMUS_OBJ_FILENAME)
-        TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName));
-    if (desc->dwValidData & DMUS_OBJ_MEMORY)
-        TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n",
-                wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData);
-    if (desc->dwValidData & DMUS_OBJ_STREAM)
-        TRACE_(dmfile)(" - pStream = %p\n", desc->pStream);
-}
-
-
-/* RIFF format parsing */
-#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD))
-
-const char *debugstr_chunk(const struct chunk_entry *chunk)
-{
-    const char *type = "";
-
-    if (!chunk)
-        return "(null)";
-    if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
-        type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
-    return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
-}
-
-static HRESULT stream_read(IStream *stream, void *data, ULONG size)
-{
-    ULONG read;
-    HRESULT hr;
-
-    hr = IStream_Read(stream, data, size, &read);
-    if (FAILED(hr))
-        TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr);
-    else if (!read && read < size) {
-        /* All or nothing: Handle a partial read due to end of stream as an error */
-        TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
-        return E_FAIL;
-    }
-
-    return hr;
-}
-
-HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk)
-{
-    static const LARGE_INTEGER zero;
-    ULONGLONG ck_end = 0, p_end = 0;
-    HRESULT hr;
-
-    hr = IStream_Seek(stream, zero, STREAM_SEEK_CUR, &chunk->offset);
-    if (FAILED(hr))
-        return hr;
-    assert(!(chunk->offset.QuadPart & 1));
-    if (chunk->parent) {
-        p_end = chunk->parent->offset.QuadPart + CHUNK_HDR_SIZE + ((chunk->parent->size + 1) & ~1);
-        if (chunk->offset.QuadPart == p_end)
-            return S_FALSE;
-        ck_end = chunk->offset.QuadPart + CHUNK_HDR_SIZE;
-        if (ck_end > p_end) {
-            WARN_(dmfile)("No space for sub-chunk header in parent chunk: ends at offset %s > %s\n",
-                    wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end));
-            return E_FAIL;
-        }
-    }
-
-    hr = stream_read(stream, chunk, CHUNK_HDR_SIZE);
-    if (hr != S_OK)
-        return hr;
-    if (chunk->parent) {
-        ck_end += (chunk->size + 1) & ~1;
-        if (ck_end > p_end) {
-            WARN_(dmfile)("No space for sub-chunk data in parent chunk: ends at offset %s > %s\n",
-                    wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end));
-            return E_FAIL;
-        }
-    }
-
-    if (chunk->id == FOURCC_LIST || chunk->id == FOURCC_RIFF) {
-        hr = stream_read(stream, &chunk->type, sizeof(FOURCC));
-        if (hr != S_OK)
-            return hr != S_FALSE ? hr : E_FAIL;
-    }
-
-    TRACE_(dmfile)("Returning %s\n", debugstr_chunk(chunk));
-
-    return S_OK;
-}
-
-HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER end;
-
-    end.QuadPart = (chunk->offset.QuadPart + CHUNK_HDR_SIZE + chunk->size + 1) & ~(ULONGLONG)1;
-
-    return IStream_Seek(stream, end, STREAM_SEEK_SET, NULL);
-}
-
-HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk)
-{
-    HRESULT hr;
-
-    if (chunk->id) {
-        hr = stream_skip_chunk(stream, chunk);
-        if (FAILED(hr))
-            return hr;
-    }
-
-    return stream_get_chunk(stream, chunk);
-}
-
-/* Reads chunk data of the form:
-   DWORD     - size of array element
-   element[] - Array of elements
-   The caller needs to heap_free() the array.
-*/
-HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
-        unsigned int *count, DWORD elem_size)
-{
-    DWORD size;
-    HRESULT hr;
-
-    *array = NULL;
-    *count = 0;
-
-    if (chunk->size < sizeof(DWORD)) {
-        WARN_(dmfile)("%s: Too short to read element size\n", debugstr_chunk(chunk));
-        return E_FAIL;
-    }
-    if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
-        return hr;
-    if (size != elem_size) {
-        WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
-                debugstr_chunk(chunk), size, elem_size);
-        return DMUS_E_UNSUPPORTED_STREAM;
-    }
-
-    *count = (chunk->size - sizeof(DWORD)) / elem_size;
-    size = *count * elem_size;
-    if (!(*array = heap_alloc(size)))
-        return E_OUTOFMEMORY;
-    if (FAILED(hr = stream_read(stream, *array, size))) {
-        heap_free(*array);
-        *array = NULL;
-        return hr;
-    }
-
-    if (chunk->size > size + sizeof(DWORD)) {
-        WARN_(dmfile)("%s: Extraneous data at end of array\n", debugstr_chunk(chunk));
-        stream_skip_chunk(stream, chunk);
-        return S_FALSE;
-    }
-    return S_OK;
-}
-
-HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data,
-        ULONG size)
-{
-    if (chunk->size != size) {
-        WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
-                debugstr_fourcc(chunk->id), chunk->size,
-                wine_dbgstr_longlong(chunk->offset.QuadPart), size);
-        return E_FAIL;
-    }
-    return stream_read(stream, data, size);
-}
-
-HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str,
-        ULONG size)
-{
-    ULONG len;
-    HRESULT hr;
-
-    hr = IStream_Read(stream, str, min(chunk->size, size), &len);
-    if (FAILED(hr))
-        return hr;
-
-    /* Don't assume the string is properly zero terminated */
-    str[min(len, size - 1)] = 0;
-
-    if (len < chunk->size)
-        return S_FALSE;
-    return S_OK;
-}
-
-
-
-/* Generic IDirectMusicObject methods */
-static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface)
-{
-    return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface);
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
-        void **ret_iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
-}
-
-ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_AddRef(This->outer_unk);
-}
-
-ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_Release(This->outer_unk);
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-
-    TRACE("(%p/%p)->(%p)\n", iface, This, desc);
-
-    if (!desc)
-        return E_POINTER;
-
-    memcpy(desc, &This->desc, This->desc.dwSize);
-
-    return S_OK;
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    HRESULT ret = S_OK;
-
-    TRACE("(%p, %p)\n", iface, desc);
-
-    if (!desc)
-        return E_POINTER;
-
-    /* Immutable property */
-    if (desc->dwValidData & DMUS_OBJ_CLASS)
-    {
-        desc->dwValidData &= ~DMUS_OBJ_CLASS;
-        ret = S_FALSE;
-    }
-    /* Set only valid fields */
-    if (desc->dwValidData & DMUS_OBJ_OBJECT)
-        This->desc.guidObject = desc->guidObject;
-    if (desc->dwValidData & DMUS_OBJ_NAME)
-        lstrcpynW(This->desc.wszName, desc->wszName, DMUS_MAX_NAME);
-    if (desc->dwValidData & DMUS_OBJ_CATEGORY)
-        lstrcpynW(This->desc.wszCategory, desc->wszCategory, DMUS_MAX_CATEGORY);
-    if (desc->dwValidData & DMUS_OBJ_FILENAME)
-        lstrcpynW(This->desc.wszFileName, desc->wszFileName, DMUS_MAX_FILENAME);
-    if (desc->dwValidData & DMUS_OBJ_VERSION)
-        This->desc.vVersion = desc->vVersion;
-    if (desc->dwValidData & DMUS_OBJ_DATE)
-        This->desc.ftDate = desc->ftDate;
-    if (desc->dwValidData & DMUS_OBJ_MEMORY) {
-        This->desc.llMemLength = desc->llMemLength;
-        memcpy(This->desc.pbMemData, desc->pbMemData, desc->llMemLength);
-    }
-    if (desc->dwValidData & DMUS_OBJ_STREAM)
-        IStream_Clone(desc->pStream, &This->desc.pStream);
-
-    This->desc.dwValidData |= desc->dwValidData;
-
-    return ret;
-}
-
-/* Helper for IDirectMusicObject::ParseDescriptor */
-static inline void info_get_name(IStream *stream, const struct chunk_entry *info,
-        DMUS_OBJECTDESC *desc)
-{
-    struct chunk_entry chunk = {.parent = info};
-    char name[DMUS_MAX_NAME];
-    ULONG len;
-    HRESULT hr = E_FAIL;
-
-    while (stream_next_chunk(stream, &chunk) == S_OK)
-        if (chunk.id == mmioFOURCC('I','N','A','M'))
-            hr = IStream_Read(stream, name, min(chunk.size, sizeof(name)), &len);
-
-    if (SUCCEEDED(hr)) {
-        len = MultiByteToWideChar(CP_ACP, 0, name, len, desc->wszName, sizeof(desc->wszName));
-        desc->wszName[min(len, sizeof(desc->wszName) - 1)] = 0;
-        desc->dwValidData |= DMUS_OBJ_NAME;
-    }
-}
-
-static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo,
-        DMUS_OBJECTDESC *desc, BOOL inam)
-{
-    struct chunk_entry chunk = {.parent = unfo};
-
-    while (stream_next_chunk(stream, &chunk) == S_OK)
-        if (chunk.id == DMUS_FOURCC_UNAM_CHUNK || (inam && chunk.id == mmioFOURCC('I','N','A','M')))
-            if (stream_chunk_get_wstr(stream, &chunk, desc->wszName, sizeof(desc->wszName)) == S_OK)
-                desc->dwValidData |= DMUS_OBJ_NAME;
-}
-
-HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
-        DMUS_OBJECTDESC *desc, DWORD supported)
-{
-    struct chunk_entry chunk = {.parent = riff};
-    HRESULT hr;
-
-    TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
-
-    desc->dwValidData = 0;
-    desc->dwSize = sizeof(*desc);
-
-    while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) {
-        switch (chunk.id) {
-            case DMUS_FOURCC_CATEGORY_CHUNK:
-                if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszCategory, sizeof(desc->wszCategory)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_CATEGORY;
-                break;
-            case DMUS_FOURCC_DATE_CHUNK:
-                if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk,
-                            &desc->ftDate, sizeof(desc->ftDate)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_DATE;
-                break;
-            case DMUS_FOURCC_FILE_CHUNK:
-                if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszFileName, sizeof(desc->wszFileName)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_FILENAME;
-                break;
-            case DMUS_FOURCC_GUID_CHUNK:
-                if ((supported & DMUS_OBJ_OBJECT) && stream_chunk_get_data(stream, &chunk,
-                            &desc->guidObject, sizeof(desc->guidObject)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_OBJECT;
-                break;
-            case DMUS_FOURCC_NAME_CHUNK:
-                if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszName, sizeof(desc->wszName)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_NAME;
-                break;
-            case DMUS_FOURCC_VERSION_CHUNK:
-                if ((supported & DMUS_OBJ_VERSION) && stream_chunk_get_data(stream, &chunk,
-                            &desc->vVersion, sizeof(desc->vVersion)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_VERSION;
-                break;
-            case FOURCC_LIST:
-                if (chunk.type == DMUS_FOURCC_UNFO_LIST && (supported & DMUS_OBJ_NAME))
-                    unfo_get_name(stream, &chunk, desc, supported & DMUS_OBJ_NAME_INAM);
-                else if (chunk.type == DMUS_FOURCC_INFO_LIST && (supported & DMUS_OBJ_NAME_INFO))
-                    info_get_name(stream, &chunk, desc);
-                break;
-        }
-    }
-    TRACE("Found %#lx\n", desc->dwValidData);
-
-    return hr;
-}
-
-HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
-        IDirectMusicObject **dmobj)
-{
-    struct chunk_entry chunk = {.parent = list};
-    IDirectMusicGetLoader *getloader;
-    IDirectMusicLoader *loader;
-    DMUS_OBJECTDESC desc;
-    DMUS_IO_REFERENCE reference;
-    HRESULT hr;
-
-    if (FAILED(hr = stream_next_chunk(stream, &chunk)))
-        return hr;
-    if (chunk.id != DMUS_FOURCC_REF_CHUNK)
-        return DMUS_E_UNSUPPORTED_STREAM;
-
-    if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &reference, sizeof(reference)))) {
-        WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
-        return hr;
-    }
-    TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
-            reference.dwValidData);
-
-    if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
-        return hr;
-    desc.guidClass = reference.guidClassID;
-    desc.dwValidData |= DMUS_OBJ_CLASS;
-    dump_DMUS_OBJECTDESC(&desc);
-
-    if (FAILED(hr = IStream_QueryInterface(stream, &IID_IDirectMusicGetLoader, (void**)&getloader)))
-        return hr;
-    hr = IDirectMusicGetLoader_GetLoader(getloader, &loader);
-    IDirectMusicGetLoader_Release(getloader);
-    if (FAILED(hr))
-        return hr;
-
-    hr = IDirectMusicLoader_GetObject(loader, &desc, &IID_IDirectMusicObject, (void**)dmobj);
-    IDirectMusicLoader_Release(loader);
-
-    return hr;
-}
-
-/* Generic IPersistStream methods */
-static inline struct dmobject *impl_from_IPersistStream(IPersistStream *iface)
-{
-    return CONTAINING_RECORD(iface, struct dmobject, IPersistStream_iface);
-}
-
-HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
-        void **ret_iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
-}
-
-ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_AddRef(This->outer_unk);
-}
-
-ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_Release(This->outer_unk);
-}
-
-HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-
-    TRACE("(%p, %p)\n", This, class);
-
-    if (!class)
-        return E_POINTER;
-
-    *class = This->desc.guidClass;
-
-    return S_OK;
-}
-
-/* IPersistStream methods not implemented in native */
-HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
-{
-    TRACE("(%p, %p): method not implemented\n", iface, class);
-    return E_NOTIMPL;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface)
-{
-    TRACE("(%p): method not implemented, always returning S_FALSE\n", iface);
-    return S_FALSE;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
-        BOOL clear_dirty)
-{
-    TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty);
-    return E_NOTIMPL;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size)
-{
-    TRACE("(%p, %p): method not implemented\n", iface, size);
-    return E_NOTIMPL;
-}
-
-
-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk)
-{
-    dmobj->outer_unk = outer_unk;
-    dmobj->desc.dwSize = sizeof(dmobj->desc);
-    dmobj->desc.dwValidData = DMUS_OBJ_CLASS;
-    dmobj->desc.guidClass = *class;
-}
diff --git a/dlls/dswave/dmobject.h b/dlls/dswave/dmobject.h
deleted file mode 100644
index 772be015c80..00000000000
--- a/dlls/dswave/dmobject.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Base IDirectMusicObject Implementation
- * Keep in sync with the master in dlls/dmusic/dmobject.h
- *
- * Copyright (C) 2014 Michael Stefaniuc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "wine/debug.h"
-
-/* RIFF stream parsing */
-struct chunk_entry;
-struct chunk_entry {
-    FOURCC id;
-    DWORD size;
-    FOURCC type;                        /* valid only for LIST and RIFF chunks */
-    ULARGE_INTEGER offset;              /* chunk offset from start of stream */
-    const struct chunk_entry *parent;   /* enclosing RIFF or LIST chunk */
-};
-
-HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk);
-HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk);
-HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk);
-
-HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
-        unsigned int *count, DWORD elem_size);
-HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data,
-        ULONG size);
-HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str,
-        ULONG size);
-
-static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER offset;
-
-    offset.QuadPart = chunk->offset.QuadPart + sizeof(FOURCC) + sizeof(DWORD);
-    if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
-        offset.QuadPart += sizeof(FOURCC);
-
-    return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL);
-}
-
-static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER offset;
-
-    offset.QuadPart = chunk->offset.QuadPart;
-
-    return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL);
-}
-
-
-/* IDirectMusicObject base object */
-struct dmobject {
-    IDirectMusicObject IDirectMusicObject_iface;
-    IPersistStream IPersistStream_iface;
-    IUnknown *outer_unk;
-    DMUS_OBJECTDESC desc;
-};
-
-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);
-
-/* Generic IDirectMusicObject methods */
-HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
-        void **ret_iface);
-ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface);
-ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface);
-HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc);
-HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc);
-
-/* Helper for IDirectMusicObject::ParseDescriptor */
-HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
-        DMUS_OBJECTDESC *desc, DWORD supported);
-/* Additional supported flags for dmobj_parsedescriptor.
-   DMUS_OBJ_NAME is 'UNAM' chunk in UNFO list */
-#define DMUS_OBJ_NAME_INAM   0x1000     /* 'INAM' chunk in UNFO list */
-#define DMUS_OBJ_NAME_INFO   0x2000     /* 'INAM' chunk in INFO list */
-
-/* 'DMRF' (reference list) helper */
-HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
-        IDirectMusicObject **dmobj);
-
-/* Generic IPersistStream methods */
-HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
-        void **ret_iface);
-ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface);
-ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface);
-HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class);
-
-/* IPersistStream methods not implemented in native */
-HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface,
-        CLSID *class);
-HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface);
-HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
-        BOOL clear_dirty);
-HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface,
-        ULARGE_INTEGER *size);
-
-/* Debugging helpers */
-const char *debugstr_chunk(const struct chunk_entry *chunk);
-const char *debugstr_dmguid(const GUID *id);
-void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc);
-
-static inline const char *debugstr_fourcc(DWORD fourcc)
-{
-    if (!fourcc) return "''";
-    return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8),
-            (char)(fourcc >> 16), (char)(fourcc >> 24));
-}

[PATCH 7/9] dmstyle: Awlays return S_FALSE from DllCanUnloadNow.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dmstyle/auditiontrack.c   |  2 --
 dlls/dmstyle/chordtrack.c      |  2 --
 dlls/dmstyle/commandtrack.c    |  2 --
 dlls/dmstyle/dmstyle_main.c    | 21 ---------------------
 dlls/dmstyle/dmstyle_private.h |  7 -------
 dlls/dmstyle/motiftrack.c      |  2 --
 dlls/dmstyle/mutetrack.c       |  2 --
 dlls/dmstyle/style.c           |  2 --
 dlls/dmstyle/styletrack.c      |  2 --
 9 files changed, 42 deletions(-)

diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c
index 0bf1c818f6c..f324d18cecc 100644
--- a/dlls/dmstyle/auditiontrack.c
+++ b/dlls/dmstyle/auditiontrack.c
@@ -79,7 +79,6 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DMSTYLE_UnlockModule();
     }

return ref;
@@ -332,7 +331,6 @@ HRESULT create_dmauditiontrack(REFIID lpcGUID, void **ppobj)
                   (IUnknown *)&track->IDirectMusicTrack8_iface);
     track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;

-    DMSTYLE_LockModule();
     hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
     IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c
index fdaecac1240..01511963a40 100644
--- a/dlls/dmstyle/chordtrack.c
+++ b/dlls/dmstyle/chordtrack.c
@@ -82,7 +82,6 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DMSTYLE_UnlockModule();
     }

return ref;
@@ -431,7 +430,6 @@ HRESULT create_dmchordtrack(REFIID lpcGUID, void **ppobj)
                   (IUnknown *)&track->IDirectMusicTrack8_iface);
     track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;

-    DMSTYLE_LockModule();
     hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
     IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c
index 32e0bbe8c0d..02b32bc41e6 100644
--- a/dlls/dmstyle/commandtrack.c
+++ b/dlls/dmstyle/commandtrack.c
@@ -81,7 +81,6 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DMSTYLE_UnlockModule();
     }

return ref;
@@ -385,7 +384,6 @@ HRESULT create_dmcommandtrack(REFIID lpcGUID, void **ppobj)
     track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
     list_init (&track->Commands);

-    DMSTYLE_LockModule();
     hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface,
                                            lpcGUID, ppobj);
     IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);
diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c
index 8f951ece5ae..9d96ab3930e 100644
--- a/dlls/dmstyle/dmstyle_main.c
+++ b/dlls/dmstyle/dmstyle_main.c
@@ -37,8 +37,6 @@

WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);

-LONG DMSTYLE_refCount = 0;
-
 typedef struct {
         IClassFactory IClassFactory_iface;
         HRESULT (*fnCreateInstance)(REFIID riid, void **ret_iface);
@@ -81,15 +79,11 @@ static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID r

static ULONG WINAPI ClassFactory_AddRef(IClassFactory *iface)
 {
-        DMSTYLE_LockModule();
-
         return 2; /* non-heap based object */
 }

static ULONG WINAPI ClassFactory_Release(IClassFactory *iface)
 {
-        DMSTYLE_UnlockModule();
-
         return 1; /* non-heap based object */
 }

@@ -111,12 +105,6 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown
 static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock)
 {
         TRACE("(%d)\n", dolock);
-
-        if (dolock)
-                DMSTYLE_LockModule();
-        else
-                DMSTYLE_UnlockModule();
-
         return S_OK;
 }

@@ -137,15 +125,6 @@ static IClassFactoryImpl MotifTrack_CF = {{&classfactory_vtbl}, create_dmmotiftr
 static IClassFactoryImpl AuditionTrack_CF = {{&classfactory_vtbl}, create_dmauditiontrack};
 static IClassFactoryImpl MuteTrack_CF = {{&classfactory_vtbl}, create_dmmutetrack};

-/******************************************************************
- *		DllCanUnloadNow (DMSTYLE.1)
- *
- *
- */
-HRESULT WINAPI DllCanUnloadNow(void) {
-	return DMSTYLE_refCount != 0 ? S_FALSE : S_OK;
-}
-

/******************************************************************
  *		DllGetClassObject (DMSTYLE.@)
diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h
index 2807e98fe61..5237368b44e 100644
--- a/dlls/dmstyle/dmstyle_private.h
+++ b/dlls/dmstyle/dmstyle_private.h
@@ -61,13 +61,6 @@ typedef struct _DMUS_PRIVATE_COMMAND {
    IDirectMusicCollection* ppReferenceCollection;
 } DMUS_PRIVATE_COMMAND, *LPDMUS_PRIVATE_COMMAND;

-/**********************************************************************
- * Dll lifetime tracking declaration for dmstyle.dll
- */
-extern LONG DMSTYLE_refCount;
-static inline void DMSTYLE_LockModule(void) { InterlockedIncrement( &DMSTYLE_refCount ); }
-static inline void DMSTYLE_UnlockModule(void) { InterlockedDecrement( &DMSTYLE_refCount ); }
-
 /*****************************************************************************
  * Misc.
  */
diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c
index 5efe90706e0..93bfd821e56 100644
--- a/dlls/dmstyle/motiftrack.c
+++ b/dlls/dmstyle/motiftrack.c
@@ -79,7 +79,6 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DMSTYLE_UnlockModule();
     }

return ref;
@@ -304,7 +303,6 @@ HRESULT create_dmmotiftrack(REFIID lpcGUID, void **ppobj)
                   (IUnknown *)&track->IDirectMusicTrack8_iface);
     track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;

-    DMSTYLE_LockModule();
     hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
     IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c
index 2248d7151dd..3f632709397 100644
--- a/dlls/dmstyle/mutetrack.c
+++ b/dlls/dmstyle/mutetrack.c
@@ -79,7 +79,6 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface)

if (!ref) {
         HeapFree(GetProcessHeap(), 0, This);
-        DMSTYLE_UnlockModule();
     }

return ref;
@@ -313,7 +312,6 @@ HRESULT create_dmmutetrack(REFIID lpcGUID, void **ppobj)
                   (IUnknown *)&track->IDirectMusicTrack8_iface);
     track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;

-    DMSTYLE_LockModule();
     hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
     IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index 23e32a75fd0..57350470e81 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -127,7 +127,6 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface)
             heap_free(motif);
         }
         heap_free(This);
-        DMSTYLE_UnlockModule();
     }

return ref;
@@ -991,7 +990,6 @@ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj)
   list_init(&obj->bands);
   list_init(&obj->motifs);

-  DMSTYLE_LockModule();
   hr = IDirectMusicStyle8_QueryInterface(&obj->IDirectMusicStyle8_iface, lpcGUID, ppobj);
   IDirectMusicStyle8_Release(&obj->IDirectMusicStyle8_iface);

diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index 83b03807ddf..3618483749c 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -96,7 +96,6 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface)
         }

heap_free(This);
-        DMSTYLE_UnlockModule();
     }

return ref;
@@ -403,7 +402,6 @@ HRESULT create_dmstyletrack(REFIID lpcGUID, void **ppobj)
     track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
     list_init (&track->Items);

-    DMSTYLE_LockModule();
     hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
     IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface);

[PATCH 8/9] dmstyle: Use CRT allocation functions.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dmstyle/auditiontrack.c | 11 +++--------
 dlls/dmstyle/chordtrack.c    | 11 +++--------
 dlls/dmstyle/commandtrack.c  | 13 ++++---------
 dlls/dmstyle/dmobject.c      |  7 +++----
 dlls/dmstyle/motiftrack.c    | 11 +++--------
 dlls/dmstyle/mutetrack.c     | 11 +++--------
 dlls/dmstyle/style.c         | 34 +++++++++-------------------------
 dlls/dmstyle/styletrack.c    | 11 +++--------
 8 files changed, 31 insertions(+), 78 deletions(-)

diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c
index f324d18cecc..e7615f53278 100644
--- a/dlls/dmstyle/auditiontrack.c
+++ b/dlls/dmstyle/auditiontrack.c
@@ -77,9 +77,7 @@ static ULONG WINAPI audition_track_Release(IDirectMusicTrack8 *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -320,11 +318,8 @@ HRESULT create_dmauditiontrack(REFIID lpcGUID, void **ppobj)
     IDirectMusicAuditionTrack *track;
     HRESULT hr;

-    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
-    if (!track) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
     track->ref = 1;
     dmobject_init(&track->dmobj, &CLSID_DirectMusicAuditionTrack,
diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c
index 01511963a40..50eb4e7a5ca 100644
--- a/dlls/dmstyle/chordtrack.c
+++ b/dlls/dmstyle/chordtrack.c
@@ -80,9 +80,7 @@ static ULONG WINAPI chord_track_Release(IDirectMusicTrack8 *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -419,11 +417,8 @@ HRESULT create_dmchordtrack(REFIID lpcGUID, void **ppobj)
     IDirectMusicChordTrack *track;
     HRESULT hr;

-    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
-    if (!track) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
     track->ref = 1;
     dmobject_init(&track->dmobj, &CLSID_DirectMusicChordTrack,
diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c
index 02b32bc41e6..17bb1e442bc 100644
--- a/dlls/dmstyle/commandtrack.c
+++ b/dlls/dmstyle/commandtrack.c
@@ -79,9 +79,7 @@ static ULONG WINAPI command_track_Release(IDirectMusicTrack8 *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -302,7 +300,7 @@ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pS
    		nrCommands = chunkSize/dwSizeOfStruct; /* and this is the number of commands */
    		/* load each command separately in new entry */
    		for (count = 0; count < nrCommands; count++) {
-				LPDMUS_PRIVATE_COMMAND pNewCommand = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_COMMAND));
+				LPDMUS_PRIVATE_COMMAND pNewCommand = calloc(1, sizeof(*pNewCommand));
    			IStream_Read (pStm, &pNewCommand->pCommand, dwSizeOfStruct, NULL);
    			list_add_tail (&This->Commands, &pNewCommand->entry);
    		}
@@ -372,11 +370,8 @@ HRESULT create_dmcommandtrack(REFIID lpcGUID, void **ppobj)
     IDirectMusicCommandTrack *track;
     HRESULT hr;

-    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
-    if (!track) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
     track->ref = 1;
     dmobject_init(&track->dmobj, &CLSID_DirectMusicCommandTrack,
diff --git a/dlls/dmstyle/dmobject.c b/dlls/dmstyle/dmobject.c
index b526b23d031..07d887a376c 100644
--- a/dlls/dmstyle/dmobject.c
+++ b/dlls/dmstyle/dmobject.c
@@ -28,7 +28,6 @@
 #include "dmusics.h"
 #include "dmobject.h"
 #include "wine/debug.h"
-#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@@ -375,7 +374,7 @@ HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk)
 /* Reads chunk data of the form:
    DWORD     - size of array element
    element[] - Array of elements
-   The caller needs to heap_free() the array.
+   The caller needs to free() the array.
 */
 HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
         unsigned int *count, DWORD elem_size)
@@ -400,10 +399,10 @@ HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk,

*count = (chunk->size - sizeof(DWORD)) / elem_size;
     size = *count * elem_size;
-    if (!(*array = heap_alloc(size)))
+    if (!(*array = malloc(size)))
         return E_OUTOFMEMORY;
     if (FAILED(hr = stream_read(stream, *array, size))) {
-        heap_free(*array);
+        free(*array);
         *array = NULL;
         return hr;
     }
diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c
index 93bfd821e56..9788a92e0e1 100644
--- a/dlls/dmstyle/motiftrack.c
+++ b/dlls/dmstyle/motiftrack.c
@@ -77,9 +77,7 @@ static ULONG WINAPI motif_track_Release(IDirectMusicTrack8 *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -292,11 +290,8 @@ HRESULT create_dmmotiftrack(REFIID lpcGUID, void **ppobj)
     IDirectMusicMotifTrack *track;
     HRESULT hr;

-    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
-    if (!track) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
     track->ref = 1;
     dmobject_init(&track->dmobj, &CLSID_DirectMusicMotifTrack,
diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c
index 3f632709397..d6b28a16c72 100644
--- a/dlls/dmstyle/mutetrack.c
+++ b/dlls/dmstyle/mutetrack.c
@@ -77,9 +77,7 @@ static ULONG WINAPI mute_track_Release(IDirectMusicTrack8 *iface)

TRACE("(%p) ref=%ld\n", This, ref);

-    if (!ref) {
-        HeapFree(GetProcessHeap(), 0, This);
-    }
+    if (!ref) free(This);

return ref;
 }
@@ -301,11 +299,8 @@ HRESULT create_dmmutetrack(REFIID lpcGUID, void **ppobj)
     IDirectMusicMuteTrack *track;
     HRESULT hr;

-    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
-    if (!track) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
     track->ref = 1;
     dmobject_init(&track->dmobj, &CLSID_DirectMusicMuteTrack,
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index 57350470e81..6d4cf2e3b07 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -20,7 +20,6 @@

#include "dmstyle_private.h"
 #include "dmobject.h"
-#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
 WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@@ -116,17 +115,17 @@ static ULONG WINAPI IDirectMusicStyle8Impl_Release(IDirectMusicStyle8 *iface)
             list_remove(&band->entry);
             if (band->pBand)
                 IDirectMusicBand_Release(band->pBand);
-            heap_free(band);
+            free(band);
         }
         LIST_FOR_EACH_ENTRY_SAFE(motif, motif2, &This->motifs, struct style_motif, entry) {
             list_remove(&motif->entry);
             LIST_FOR_EACH_ENTRY_SAFE(item, item2, &motif->Items, struct style_partref_item, entry) {
                 list_remove(&item->entry);
-                heap_free(item);
+                free(item);
             }
-            heap_free(motif);
+            free(motif);
         }
-        heap_free(This);
+        free(This);
     }

return ref;
@@ -405,11 +404,7 @@ static HRESULT parse_part_ref_list(DMUS_PRIVATE_CHUNK *pChunk, IStream *pStm,
     switch (Chunk.fccID) {
     case DMUS_FOURCC_PARTREF_CHUNK: {
       TRACE_(dmfile)(": PartRef chunk\n");
-      pNewItem = heap_alloc_zero(sizeof(*pNewItem));
-      if (!pNewItem) {
-	ERR(": no more memory\n");
-	return E_OUTOFMEMORY;
-      }
+      if (!(pNewItem = calloc(1, sizeof(*pNewItem)))) return E_OUTOFMEMORY;
       hr = IStream_Read (pStm, &pNewItem->part_ref, sizeof(DMUS_IO_PARTREF), NULL);
       /*TRACE_(dmfile)(" - sizeof %lu\n",  sizeof(DMUS_IO_PARTREF));*/
       list_add_tail (&pNewMotif->Items, &pNewItem->entry);      
@@ -630,11 +625,7 @@ static HRESULT parse_pattern_list(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHU
     case DMUS_FOURCC_PATTERN_CHUNK: {
       TRACE_(dmfile)(": Pattern chunk\n");
       /** alloc new motif entry */
-      pNewMotif = heap_alloc_zero(sizeof(*pNewMotif));
-      if (NULL == pNewMotif) {
-	ERR(": no more memory\n");
-	return  E_OUTOFMEMORY;
-      }
+      if (!(pNewMotif = calloc(1, sizeof(*pNewMotif)))) return E_OUTOFMEMORY;
       list_add_tail(&This->motifs, &pNewMotif->entry);

IStream_Read (pStm, &pNewMotif->pattern, Chunk.dwSize, NULL);
@@ -826,11 +817,7 @@ static HRESULT parse_style_form(IDirectMusicStyle8Impl *This, DMUS_PRIVATE_CHUNK
        return hr;
      }

-          pNewBand = heap_alloc_zero(sizeof(*pNewBand));
-	  if (NULL == pNewBand) {
-	    ERR(": no more memory\n");
-	    return  E_OUTOFMEMORY;
-	  }
+	  if (!(pNewBand = calloc(1, sizeof(*pNewBand)))) return E_OUTOFMEMORY;
      pNewBand->pBand = pBand;
      IDirectMusicBand_AddRef(pBand);
      list_add_tail(&This->bands, &pNewBand->entry);
@@ -977,11 +964,8 @@ HRESULT create_dmstyle(REFIID lpcGUID, void **ppobj)
   IDirectMusicStyle8Impl* obj;
   HRESULT hr;

-  obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicStyle8Impl));
-  if (NULL == obj) {
-    *ppobj = NULL;
-    return E_OUTOFMEMORY;
-  }
+  *ppobj = NULL;
+  if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY;
   obj->IDirectMusicStyle8_iface.lpVtbl = &dmstyle8_vtbl;
   obj->ref = 1;
   dmobject_init(&obj->dmobj, &CLSID_DirectMusicStyle, (IUnknown *)&obj->IDirectMusicStyle8_iface);
diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c
index 3618483749c..700b8a1ea1a 100644
--- a/dlls/dmstyle/styletrack.c
+++ b/dlls/dmstyle/styletrack.c
@@ -20,8 +20,6 @@
 #include "dmstyle_private.h"
 #include "dmobject.h"

-#include "wine/heap.h"
-
 WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);

/*****************************************************************************
@@ -95,7 +93,7 @@ static ULONG WINAPI style_track_Release(IDirectMusicTrack8 *iface)
             free(item);
         }

-        heap_free(This);
+        free(This);
     }

return ref;
@@ -390,11 +388,8 @@ HRESULT create_dmstyletrack(REFIID lpcGUID, void **ppobj)
     IDirectMusicStyleTrack *track;
     HRESULT hr;

-    track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track));
-    if (!track) {
-        *ppobj = NULL;
-        return E_OUTOFMEMORY;
-    }
+    *ppobj = NULL;
+    if (!(track = calloc(1, sizeof(*track)))) return E_OUTOFMEMORY;
     track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
     track->ref = 1;
     dmobject_init(&track->dmobj, &CLSID_DirectMusicStyleTrack,

[PATCH 9/9] dmstyle: Use PARENTSRC with dmusic.

[Rémi Bernon]

From: Rémi Bernon

---
 dlls/dmstyle/Makefile.in |   1 +
 dlls/dmstyle/dmobject.c  | 732 ---------------------------------------
 dlls/dmstyle/dmobject.h  | 124 -------
 3 files changed, 1 insertion(+), 856 deletions(-)
 delete mode 100644 dlls/dmstyle/dmobject.c
 delete mode 100644 dlls/dmstyle/dmobject.h

diff --git a/dlls/dmstyle/Makefile.in b/dlls/dmstyle/Makefile.in
index a95a524d473..8a6897ca4ca 100644
--- a/dlls/dmstyle/Makefile.in
+++ b/dlls/dmstyle/Makefile.in
@@ -1,5 +1,6 @@
 MODULE    = dmstyle.dll
 IMPORTS   = dxguid uuid ole32 advapi32
+PARENTSRC = ../dmusic

C_SRCS = \
    auditiontrack.c \
diff --git a/dlls/dmstyle/dmobject.c b/dlls/dmstyle/dmobject.c
deleted file mode 100644
index 07d887a376c..00000000000
--- a/dlls/dmstyle/dmobject.c
+++ /dev/null
@@ -1,732 +0,0 @@
-/*
- * Base IDirectMusicObject Implementation
- * Keep in sync with the master in dlls/dmusic/dmobject.c
- *
- * Copyright (C) 2003-2004 Rok Mandeljc
- * Copyright (C) 2014 Michael Stefaniuc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#define COBJMACROS
-#include <assert.h>
-#include "objbase.h"
-#include "dmusici.h"
-#include "dmusicf.h"
-#include "dmusics.h"
-#include "dmobject.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
-WINE_DECLARE_DEBUG_CHANNEL(dmfile);
-
-/* Debugging helpers */
-const char *debugstr_dmguid(const GUID *id) {
-    unsigned int i;
-#define X(guid) { &guid, #guid }
-    static const struct {
-        const GUID *guid;
-        const char *name;
-    } guids[] = {
-        /* CLSIDs */
-        X(CLSID_AudioVBScript),
-        X(CLSID_DirectMusic),
-        X(CLSID_DirectMusicAudioPathConfig),
-        X(CLSID_DirectMusicAuditionTrack),
-        X(CLSID_DirectMusicBand),
-        X(CLSID_DirectMusicBandTrack),
-        X(CLSID_DirectMusicChordMapTrack),
-        X(CLSID_DirectMusicChordMap),
-        X(CLSID_DirectMusicChordTrack),
-        X(CLSID_DirectMusicCollection),
-        X(CLSID_DirectMusicCommandTrack),
-        X(CLSID_DirectMusicComposer),
-        X(CLSID_DirectMusicContainer),
-        X(CLSID_DirectMusicGraph),
-        X(CLSID_DirectMusicLoader),
-        X(CLSID_DirectMusicLyricsTrack),
-        X(CLSID_DirectMusicMarkerTrack),
-        X(CLSID_DirectMusicMelodyFormulationTrack),
-        X(CLSID_DirectMusicMotifTrack),
-        X(CLSID_DirectMusicMuteTrack),
-        X(CLSID_DirectMusicParamControlTrack),
-        X(CLSID_DirectMusicPatternTrack),
-        X(CLSID_DirectMusicPerformance),
-        X(CLSID_DirectMusicScript),
-        X(CLSID_DirectMusicScriptAutoImpSegment),
-        X(CLSID_DirectMusicScriptAutoImpPerformance),
-        X(CLSID_DirectMusicScriptAutoImpSegmentState),
-        X(CLSID_DirectMusicScriptAutoImpAudioPathConfig),
-        X(CLSID_DirectMusicScriptAutoImpAudioPath),
-        X(CLSID_DirectMusicScriptAutoImpSong),
-        X(CLSID_DirectMusicScriptSourceCodeLoader),
-        X(CLSID_DirectMusicScriptTrack),
-        X(CLSID_DirectMusicSection),
-        X(CLSID_DirectMusicSegment),
-        X(CLSID_DirectMusicSegmentState),
-        X(CLSID_DirectMusicSegmentTriggerTrack),
-        X(CLSID_DirectMusicSegTriggerTrack),
-        X(CLSID_DirectMusicSeqTrack),
-        X(CLSID_DirectMusicSignPostTrack),
-        X(CLSID_DirectMusicSong),
-        X(CLSID_DirectMusicStyle),
-        X(CLSID_DirectMusicStyleTrack),
-        X(CLSID_DirectMusicSynth),
-        X(CLSID_DirectMusicSynthSink),
-        X(CLSID_DirectMusicSysExTrack),
-        X(CLSID_DirectMusicTemplate),
-        X(CLSID_DirectMusicTempoTrack),
-        X(CLSID_DirectMusicTimeSigTrack),
-        X(CLSID_DirectMusicWaveTrack),
-        X(CLSID_DirectSoundWave),
-        /* IIDs */
-        X(IID_IDirectMusic),
-        X(IID_IDirectMusic2),
-        X(IID_IDirectMusic8),
-        X(IID_IDirectMusicAudioPath),
-        X(IID_IDirectMusicBand),
-        X(IID_IDirectMusicBuffer),
-        X(IID_IDirectMusicChordMap),
-        X(IID_IDirectMusicCollection),
-        X(IID_IDirectMusicComposer),
-        X(IID_IDirectMusicContainer),
-        X(IID_IDirectMusicDownload),
-        X(IID_IDirectMusicDownloadedInstrument),
-        X(IID_IDirectMusicGetLoader),
-        X(IID_IDirectMusicGraph),
-        X(IID_IDirectMusicInstrument),
-        X(IID_IDirectMusicLoader),
-        X(IID_IDirectMusicLoader8),
-        X(IID_IDirectMusicObject),
-        X(IID_IDirectMusicPatternTrack),
-        X(IID_IDirectMusicPerformance),
-        X(IID_IDirectMusicPerformance2),
-        X(IID_IDirectMusicPerformance8),
-        X(IID_IDirectMusicPort),
-        X(IID_IDirectMusicPortDownload),
-        X(IID_IDirectMusicScript),
-        X(IID_IDirectMusicSegment),
-        X(IID_IDirectMusicSegment2),
-        X(IID_IDirectMusicSegment8),
-        X(IID_IDirectMusicSegmentState),
-        X(IID_IDirectMusicSegmentState8),
-        X(IID_IDirectMusicStyle),
-        X(IID_IDirectMusicStyle8),
-        X(IID_IDirectMusicSynth),
-        X(IID_IDirectMusicSynth8),
-        X(IID_IDirectMusicSynthSink),
-        X(IID_IDirectMusicThru),
-        X(IID_IDirectMusicTool),
-        X(IID_IDirectMusicTool8),
-        X(IID_IDirectMusicTrack),
-        X(IID_IDirectMusicTrack8),
-        X(IID_IUnknown),
-        X(IID_IPersistStream),
-        X(IID_IStream),
-        X(IID_IClassFactory),
-        /* GUIDs */
-        X(GUID_DirectMusicAllTypes),
-        X(GUID_NOTIFICATION_CHORD),
-        X(GUID_NOTIFICATION_COMMAND),
-        X(GUID_NOTIFICATION_MEASUREANDBEAT),
-        X(GUID_NOTIFICATION_PERFORMANCE),
-        X(GUID_NOTIFICATION_RECOMPOSE),
-        X(GUID_NOTIFICATION_SEGMENT),
-        X(GUID_BandParam),
-        X(GUID_ChordParam),
-        X(GUID_CommandParam),
-        X(GUID_CommandParam2),
-        X(GUID_CommandParamNext),
-        X(GUID_IDirectMusicBand),
-        X(GUID_IDirectMusicChordMap),
-        X(GUID_IDirectMusicStyle),
-        X(GUID_MuteParam),
-        X(GUID_Play_Marker),
-        X(GUID_RhythmParam),
-        X(GUID_TempoParam),
-        X(GUID_TimeSignature),
-        X(GUID_Valid_Start_Time),
-        X(GUID_Clear_All_Bands),
-        X(GUID_ConnectToDLSCollection),
-        X(GUID_Disable_Auto_Download),
-        X(GUID_DisableTempo),
-        X(GUID_DisableTimeSig),
-        X(GUID_Download),
-        X(GUID_DownloadToAudioPath),
-        X(GUID_Enable_Auto_Download),
-        X(GUID_EnableTempo),
-        X(GUID_EnableTimeSig),
-        X(GUID_IgnoreBankSelectForGM),
-        X(GUID_SeedVariations),
-        X(GUID_StandardMIDIFile),
-        X(GUID_Unload),
-        X(GUID_UnloadFromAudioPath),
-        X(GUID_Variations),
-        X(GUID_PerfMasterTempo),
-        X(GUID_PerfMasterVolume),
-        X(GUID_PerfMasterGrooveLevel),
-        X(GUID_PerfAutoDownload),
-        X(GUID_DefaultGMCollection),
-        X(GUID_Synth_Default),
-        X(GUID_Buffer_Reverb),
-        X(GUID_Buffer_EnvReverb),
-        X(GUID_Buffer_Stereo),
-        X(GUID_Buffer_3D_Dry),
-        X(GUID_Buffer_Mono),
-        X(GUID_DMUS_PROP_GM_Hardware),
-        X(GUID_DMUS_PROP_GS_Capable),
-        X(GUID_DMUS_PROP_GS_Hardware),
-        X(GUID_DMUS_PROP_DLS1),
-        X(GUID_DMUS_PROP_DLS2),
-        X(GUID_DMUS_PROP_Effects),
-        X(GUID_DMUS_PROP_INSTRUMENT2),
-        X(GUID_DMUS_PROP_LegacyCaps),
-        X(GUID_DMUS_PROP_MemorySize),
-        X(GUID_DMUS_PROP_SampleMemorySize),
-        X(GUID_DMUS_PROP_SamplePlaybackRate),
-        X(GUID_DMUS_PROP_SetSynthSink),
-        X(GUID_DMUS_PROP_SinkUsesDSound),
-        X(GUID_DMUS_PROP_SynthSink_DSOUND),
-        X(GUID_DMUS_PROP_SynthSink_WAVE),
-        X(GUID_DMUS_PROP_Volume),
-        X(GUID_DMUS_PROP_WavesReverb),
-        X(GUID_DMUS_PROP_WriteLatency),
-        X(GUID_DMUS_PROP_WritePeriod),
-        X(GUID_DMUS_PROP_XG_Capable),
-        X(GUID_DMUS_PROP_XG_Hardware)
-    };
-#undef X
-
-    if (!id)
-        return "(null)";
-
-    for (i = 0; i < ARRAY_SIZE(guids); i++)
-        if (IsEqualGUID(id, guids[i].guid))
-            return guids[i].name;
-
-    return debugstr_guid(id);
-}
-
-void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc)
-{
-    if (!desc || !TRACE_ON(dmfile))
-        return;
-
-    TRACE_(dmfile)("DMUS_OBJECTDESC (%p):", desc);
-    TRACE_(dmfile)(" - dwSize = %lu\n", desc->dwSize);
-
-#define X(flag) if (desc->dwValidData & flag) TRACE_(dmfile)(#flag " ")
-    TRACE_(dmfile)(" - dwValidData = %#08lx ( ", desc->dwValidData);
-    X(DMUS_OBJ_OBJECT);
-    X(DMUS_OBJ_CLASS);
-    X(DMUS_OBJ_NAME);
-    X(DMUS_OBJ_CATEGORY);
-    X(DMUS_OBJ_FILENAME);
-    X(DMUS_OBJ_FULLPATH);
-    X(DMUS_OBJ_URL);
-    X(DMUS_OBJ_VERSION);
-    X(DMUS_OBJ_DATE);
-    X(DMUS_OBJ_LOADED);
-    X(DMUS_OBJ_MEMORY);
-    X(DMUS_OBJ_STREAM);
-    TRACE_(dmfile)(")\n");
-#undef X
-
-    if (desc->dwValidData & DMUS_OBJ_CLASS)
-        TRACE_(dmfile)(" - guidClass = %s\n", debugstr_dmguid(&desc->guidClass));
-    if (desc->dwValidData & DMUS_OBJ_OBJECT)
-        TRACE_(dmfile)(" - guidObject = %s\n", debugstr_guid(&desc->guidObject));
-
-    if (desc->dwValidData & DMUS_OBJ_DATE) {
-        SYSTEMTIME time;
-        FileTimeToSystemTime(&desc->ftDate, &time);
-        TRACE_(dmfile)(" - ftDate = '%04u-%02u-%02u %02u:%02u:%02u'\n",
-                time.wYear, time.wMonth, time.wDay, time.wHour, time.wMinute, time.wSecond);
-    }
-    if (desc->dwValidData & DMUS_OBJ_VERSION)
-        TRACE_(dmfile)(" - vVersion = '%u,%u,%u,%u'\n",
-                HIWORD(desc->vVersion.dwVersionMS), LOWORD(desc->vVersion.dwVersionMS),
-                HIWORD(desc->vVersion.dwVersionLS), LOWORD(desc->vVersion.dwVersionLS));
-    if (desc->dwValidData & DMUS_OBJ_NAME)
-        TRACE_(dmfile)(" - wszName = %s\n", debugstr_w(desc->wszName));
-    if (desc->dwValidData & DMUS_OBJ_CATEGORY)
-        TRACE_(dmfile)(" - wszCategory = %s\n", debugstr_w(desc->wszCategory));
-    if (desc->dwValidData & DMUS_OBJ_FILENAME)
-        TRACE_(dmfile)(" - wszFileName = %s\n", debugstr_w(desc->wszFileName));
-    if (desc->dwValidData & DMUS_OBJ_MEMORY)
-        TRACE_(dmfile)(" - llMemLength = 0x%s - pbMemData = %p\n",
-                wine_dbgstr_longlong(desc->llMemLength), desc->pbMemData);
-    if (desc->dwValidData & DMUS_OBJ_STREAM)
-        TRACE_(dmfile)(" - pStream = %p\n", desc->pStream);
-}
-
-
-/* RIFF format parsing */
-#define CHUNK_HDR_SIZE (sizeof(FOURCC) + sizeof(DWORD))
-
-const char *debugstr_chunk(const struct chunk_entry *chunk)
-{
-    const char *type = "";
-
-    if (!chunk)
-        return "(null)";
-    if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
-        type = wine_dbg_sprintf("type %s, ", debugstr_fourcc(chunk->type));
-    return wine_dbg_sprintf("%s chunk, %ssize %lu", debugstr_fourcc(chunk->id), type, chunk->size);
-}
-
-static HRESULT stream_read(IStream *stream, void *data, ULONG size)
-{
-    ULONG read;
-    HRESULT hr;
-
-    hr = IStream_Read(stream, data, size, &read);
-    if (FAILED(hr))
-        TRACE_(dmfile)("IStream_Read failed: %#lx\n", hr);
-    else if (!read && read < size) {
-        /* All or nothing: Handle a partial read due to end of stream as an error */
-        TRACE_(dmfile)("Short read: %lu < %lu\n", read, size);
-        return E_FAIL;
-    }
-
-    return hr;
-}
-
-HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk)
-{
-    static const LARGE_INTEGER zero;
-    ULONGLONG ck_end = 0, p_end = 0;
-    HRESULT hr;
-
-    hr = IStream_Seek(stream, zero, STREAM_SEEK_CUR, &chunk->offset);
-    if (FAILED(hr))
-        return hr;
-    assert(!(chunk->offset.QuadPart & 1));
-    if (chunk->parent) {
-        p_end = chunk->parent->offset.QuadPart + CHUNK_HDR_SIZE + ((chunk->parent->size + 1) & ~1);
-        if (chunk->offset.QuadPart == p_end)
-            return S_FALSE;
-        ck_end = chunk->offset.QuadPart + CHUNK_HDR_SIZE;
-        if (ck_end > p_end) {
-            WARN_(dmfile)("No space for sub-chunk header in parent chunk: ends at offset %s > %s\n",
-                    wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end));
-            return E_FAIL;
-        }
-    }
-
-    hr = stream_read(stream, chunk, CHUNK_HDR_SIZE);
-    if (hr != S_OK)
-        return hr;
-    if (chunk->parent) {
-        ck_end += (chunk->size + 1) & ~1;
-        if (ck_end > p_end) {
-            WARN_(dmfile)("No space for sub-chunk data in parent chunk: ends at offset %s > %s\n",
-                    wine_dbgstr_longlong(ck_end), wine_dbgstr_longlong(p_end));
-            return E_FAIL;
-        }
-    }
-
-    if (chunk->id == FOURCC_LIST || chunk->id == FOURCC_RIFF) {
-        hr = stream_read(stream, &chunk->type, sizeof(FOURCC));
-        if (hr != S_OK)
-            return hr != S_FALSE ? hr : E_FAIL;
-    }
-
-    TRACE_(dmfile)("Returning %s\n", debugstr_chunk(chunk));
-
-    return S_OK;
-}
-
-HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER end;
-
-    end.QuadPart = (chunk->offset.QuadPart + CHUNK_HDR_SIZE + chunk->size + 1) & ~(ULONGLONG)1;
-
-    return IStream_Seek(stream, end, STREAM_SEEK_SET, NULL);
-}
-
-HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk)
-{
-    HRESULT hr;
-
-    if (chunk->id) {
-        hr = stream_skip_chunk(stream, chunk);
-        if (FAILED(hr))
-            return hr;
-    }
-
-    return stream_get_chunk(stream, chunk);
-}
-
-/* Reads chunk data of the form:
-   DWORD     - size of array element
-   element[] - Array of elements
-   The caller needs to free() the array.
-*/
-HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
-        unsigned int *count, DWORD elem_size)
-{
-    DWORD size;
-    HRESULT hr;
-
-    *array = NULL;
-    *count = 0;
-
-    if (chunk->size < sizeof(DWORD)) {
-        WARN_(dmfile)("%s: Too short to read element size\n", debugstr_chunk(chunk));
-        return E_FAIL;
-    }
-    if (FAILED(hr = stream_read(stream, &size, sizeof(DWORD))))
-        return hr;
-    if (size != elem_size) {
-        WARN_(dmfile)("%s: Array element size mismatch: got %lu, expected %lu\n",
-                debugstr_chunk(chunk), size, elem_size);
-        return DMUS_E_UNSUPPORTED_STREAM;
-    }
-
-    *count = (chunk->size - sizeof(DWORD)) / elem_size;
-    size = *count * elem_size;
-    if (!(*array = malloc(size)))
-        return E_OUTOFMEMORY;
-    if (FAILED(hr = stream_read(stream, *array, size))) {
-        free(*array);
-        *array = NULL;
-        return hr;
-    }
-
-    if (chunk->size > size + sizeof(DWORD)) {
-        WARN_(dmfile)("%s: Extraneous data at end of array\n", debugstr_chunk(chunk));
-        stream_skip_chunk(stream, chunk);
-        return S_FALSE;
-    }
-    return S_OK;
-}
-
-HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data,
-        ULONG size)
-{
-    if (chunk->size != size) {
-        WARN_(dmfile)("Chunk %s (size %lu, offset %s) doesn't contains the expected data size %lu\n",
-                debugstr_fourcc(chunk->id), chunk->size,
-                wine_dbgstr_longlong(chunk->offset.QuadPart), size);
-        return E_FAIL;
-    }
-    return stream_read(stream, data, size);
-}
-
-HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str,
-        ULONG size)
-{
-    ULONG len;
-    HRESULT hr;
-
-    hr = IStream_Read(stream, str, min(chunk->size, size), &len);
-    if (FAILED(hr))
-        return hr;
-
-    /* Don't assume the string is properly zero terminated */
-    str[min(len, size - 1)] = 0;
-
-    if (len < chunk->size)
-        return S_FALSE;
-    return S_OK;
-}
-
-
-
-/* Generic IDirectMusicObject methods */
-static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface)
-{
-    return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface);
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
-        void **ret_iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
-}
-
-ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_AddRef(This->outer_unk);
-}
-
-ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    return IUnknown_Release(This->outer_unk);
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-
-    TRACE("(%p/%p)->(%p)\n", iface, This, desc);
-
-    if (!desc)
-        return E_POINTER;
-
-    memcpy(desc, &This->desc, This->desc.dwSize);
-
-    return S_OK;
-}
-
-HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc)
-{
-    struct dmobject *This = impl_from_IDirectMusicObject(iface);
-    HRESULT ret = S_OK;
-
-    TRACE("(%p, %p)\n", iface, desc);
-
-    if (!desc)
-        return E_POINTER;
-
-    /* Immutable property */
-    if (desc->dwValidData & DMUS_OBJ_CLASS)
-    {
-        desc->dwValidData &= ~DMUS_OBJ_CLASS;
-        ret = S_FALSE;
-    }
-    /* Set only valid fields */
-    if (desc->dwValidData & DMUS_OBJ_OBJECT)
-        This->desc.guidObject = desc->guidObject;
-    if (desc->dwValidData & DMUS_OBJ_NAME)
-        lstrcpynW(This->desc.wszName, desc->wszName, DMUS_MAX_NAME);
-    if (desc->dwValidData & DMUS_OBJ_CATEGORY)
-        lstrcpynW(This->desc.wszCategory, desc->wszCategory, DMUS_MAX_CATEGORY);
-    if (desc->dwValidData & DMUS_OBJ_FILENAME)
-        lstrcpynW(This->desc.wszFileName, desc->wszFileName, DMUS_MAX_FILENAME);
-    if (desc->dwValidData & DMUS_OBJ_VERSION)
-        This->desc.vVersion = desc->vVersion;
-    if (desc->dwValidData & DMUS_OBJ_DATE)
-        This->desc.ftDate = desc->ftDate;
-    if (desc->dwValidData & DMUS_OBJ_MEMORY) {
-        This->desc.llMemLength = desc->llMemLength;
-        memcpy(This->desc.pbMemData, desc->pbMemData, desc->llMemLength);
-    }
-    if (desc->dwValidData & DMUS_OBJ_STREAM)
-        IStream_Clone(desc->pStream, &This->desc.pStream);
-
-    This->desc.dwValidData |= desc->dwValidData;
-
-    return ret;
-}
-
-/* Helper for IDirectMusicObject::ParseDescriptor */
-static inline void info_get_name(IStream *stream, const struct chunk_entry *info,
-        DMUS_OBJECTDESC *desc)
-{
-    struct chunk_entry chunk = {.parent = info};
-    char name[DMUS_MAX_NAME];
-    ULONG len;
-    HRESULT hr = E_FAIL;
-
-    while (stream_next_chunk(stream, &chunk) == S_OK)
-        if (chunk.id == mmioFOURCC('I','N','A','M'))
-            hr = IStream_Read(stream, name, min(chunk.size, sizeof(name)), &len);
-
-    if (SUCCEEDED(hr)) {
-        len = MultiByteToWideChar(CP_ACP, 0, name, len, desc->wszName, sizeof(desc->wszName));
-        desc->wszName[min(len, sizeof(desc->wszName) - 1)] = 0;
-        desc->dwValidData |= DMUS_OBJ_NAME;
-    }
-}
-
-static inline void unfo_get_name(IStream *stream, const struct chunk_entry *unfo,
-        DMUS_OBJECTDESC *desc, BOOL inam)
-{
-    struct chunk_entry chunk = {.parent = unfo};
-
-    while (stream_next_chunk(stream, &chunk) == S_OK)
-        if (chunk.id == DMUS_FOURCC_UNAM_CHUNK || (inam && chunk.id == mmioFOURCC('I','N','A','M')))
-            if (stream_chunk_get_wstr(stream, &chunk, desc->wszName, sizeof(desc->wszName)) == S_OK)
-                desc->dwValidData |= DMUS_OBJ_NAME;
-}
-
-HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
-        DMUS_OBJECTDESC *desc, DWORD supported)
-{
-    struct chunk_entry chunk = {.parent = riff};
-    HRESULT hr;
-
-    TRACE("Looking for %#lx in %p: %s\n", supported, stream, debugstr_chunk(riff));
-
-    desc->dwValidData = 0;
-    desc->dwSize = sizeof(*desc);
-
-    while ((hr = stream_next_chunk(stream, &chunk)) == S_OK) {
-        switch (chunk.id) {
-            case DMUS_FOURCC_CATEGORY_CHUNK:
-                if ((supported & DMUS_OBJ_CATEGORY) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszCategory, sizeof(desc->wszCategory)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_CATEGORY;
-                break;
-            case DMUS_FOURCC_DATE_CHUNK:
-                if ((supported & DMUS_OBJ_DATE) && stream_chunk_get_data(stream, &chunk,
-                            &desc->ftDate, sizeof(desc->ftDate)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_DATE;
-                break;
-            case DMUS_FOURCC_FILE_CHUNK:
-                if ((supported & DMUS_OBJ_FILENAME) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszFileName, sizeof(desc->wszFileName)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_FILENAME;
-                break;
-            case DMUS_FOURCC_GUID_CHUNK:
-                if ((supported & DMUS_OBJ_OBJECT) && stream_chunk_get_data(stream, &chunk,
-                            &desc->guidObject, sizeof(desc->guidObject)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_OBJECT;
-                break;
-            case DMUS_FOURCC_NAME_CHUNK:
-                if ((supported & DMUS_OBJ_NAME) && stream_chunk_get_wstr(stream, &chunk,
-                            desc->wszName, sizeof(desc->wszName)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_NAME;
-                break;
-            case DMUS_FOURCC_VERSION_CHUNK:
-                if ((supported & DMUS_OBJ_VERSION) && stream_chunk_get_data(stream, &chunk,
-                            &desc->vVersion, sizeof(desc->vVersion)) == S_OK)
-                    desc->dwValidData |= DMUS_OBJ_VERSION;
-                break;
-            case FOURCC_LIST:
-                if (chunk.type == DMUS_FOURCC_UNFO_LIST && (supported & DMUS_OBJ_NAME))
-                    unfo_get_name(stream, &chunk, desc, supported & DMUS_OBJ_NAME_INAM);
-                else if (chunk.type == DMUS_FOURCC_INFO_LIST && (supported & DMUS_OBJ_NAME_INFO))
-                    info_get_name(stream, &chunk, desc);
-                break;
-        }
-    }
-    TRACE("Found %#lx\n", desc->dwValidData);
-
-    return hr;
-}
-
-HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
-        IDirectMusicObject **dmobj)
-{
-    struct chunk_entry chunk = {.parent = list};
-    IDirectMusicGetLoader *getloader;
-    IDirectMusicLoader *loader;
-    DMUS_OBJECTDESC desc;
-    DMUS_IO_REFERENCE reference;
-    HRESULT hr;
-
-    if (FAILED(hr = stream_next_chunk(stream, &chunk)))
-        return hr;
-    if (chunk.id != DMUS_FOURCC_REF_CHUNK)
-        return DMUS_E_UNSUPPORTED_STREAM;
-
-    if (FAILED(hr = stream_chunk_get_data(stream, &chunk, &reference, sizeof(reference)))) {
-        WARN("Failed to read data of %s\n", debugstr_chunk(&chunk));
-        return hr;
-    }
-    TRACE("REFERENCE guidClassID %s, dwValidData %#lx\n", debugstr_dmguid(&reference.guidClassID),
-            reference.dwValidData);
-
-    if (FAILED(hr = dmobj_parsedescriptor(stream, list, &desc, reference.dwValidData)))
-        return hr;
-    desc.guidClass = reference.guidClassID;
-    desc.dwValidData |= DMUS_OBJ_CLASS;
-    dump_DMUS_OBJECTDESC(&desc);
-
-    if (FAILED(hr = IStream_QueryInterface(stream, &IID_IDirectMusicGetLoader, (void**)&getloader)))
-        return hr;
-    hr = IDirectMusicGetLoader_GetLoader(getloader, &loader);
-    IDirectMusicGetLoader_Release(getloader);
-    if (FAILED(hr))
-        return hr;
-
-    hr = IDirectMusicLoader_GetObject(loader, &desc, &IID_IDirectMusicObject, (void**)dmobj);
-    IDirectMusicLoader_Release(loader);
-
-    return hr;
-}
-
-/* Generic IPersistStream methods */
-static inline struct dmobject *impl_from_IPersistStream(IPersistStream *iface)
-{
-    return CONTAINING_RECORD(iface, struct dmobject, IPersistStream_iface);
-}
-
-HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
-        void **ret_iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
-}
-
-ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_AddRef(This->outer_unk);
-}
-
-ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-    return IUnknown_Release(This->outer_unk);
-}
-
-HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
-{
-    struct dmobject *This = impl_from_IPersistStream(iface);
-
-    TRACE("(%p, %p)\n", This, class);
-
-    if (!class)
-        return E_POINTER;
-
-    *class = This->desc.guidClass;
-
-    return S_OK;
-}
-
-/* IPersistStream methods not implemented in native */
-HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
-{
-    TRACE("(%p, %p): method not implemented\n", iface, class);
-    return E_NOTIMPL;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface)
-{
-    TRACE("(%p): method not implemented, always returning S_FALSE\n", iface);
-    return S_FALSE;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
-        BOOL clear_dirty)
-{
-    TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty);
-    return E_NOTIMPL;
-}
-
-HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size)
-{
-    TRACE("(%p, %p): method not implemented\n", iface, size);
-    return E_NOTIMPL;
-}
-
-
-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk)
-{
-    dmobj->outer_unk = outer_unk;
-    dmobj->desc.dwSize = sizeof(dmobj->desc);
-    dmobj->desc.dwValidData = DMUS_OBJ_CLASS;
-    dmobj->desc.guidClass = *class;
-}
diff --git a/dlls/dmstyle/dmobject.h b/dlls/dmstyle/dmobject.h
deleted file mode 100644
index 772be015c80..00000000000
--- a/dlls/dmstyle/dmobject.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Base IDirectMusicObject Implementation
- * Keep in sync with the master in dlls/dmusic/dmobject.h
- *
- * Copyright (C) 2014 Michael Stefaniuc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include "wine/debug.h"
-
-/* RIFF stream parsing */
-struct chunk_entry;
-struct chunk_entry {
-    FOURCC id;
-    DWORD size;
-    FOURCC type;                        /* valid only for LIST and RIFF chunks */
-    ULARGE_INTEGER offset;              /* chunk offset from start of stream */
-    const struct chunk_entry *parent;   /* enclosing RIFF or LIST chunk */
-};
-
-HRESULT stream_get_chunk(IStream *stream, struct chunk_entry *chunk);
-HRESULT stream_next_chunk(IStream *stream, struct chunk_entry *chunk);
-HRESULT stream_skip_chunk(IStream *stream, const struct chunk_entry *chunk);
-
-HRESULT stream_chunk_get_array(IStream *stream, const struct chunk_entry *chunk, void **array,
-        unsigned int *count, DWORD elem_size);
-HRESULT stream_chunk_get_data(IStream *stream, const struct chunk_entry *chunk, void *data,
-        ULONG size);
-HRESULT stream_chunk_get_wstr(IStream *stream, const struct chunk_entry *chunk, WCHAR *str,
-        ULONG size);
-
-static inline HRESULT stream_reset_chunk_data(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER offset;
-
-    offset.QuadPart = chunk->offset.QuadPart + sizeof(FOURCC) + sizeof(DWORD);
-    if (chunk->id == FOURCC_RIFF || chunk->id == FOURCC_LIST)
-        offset.QuadPart += sizeof(FOURCC);
-
-    return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL);
-}
-
-static inline HRESULT stream_reset_chunk_start(IStream *stream, const struct chunk_entry *chunk)
-{
-    LARGE_INTEGER offset;
-
-    offset.QuadPart = chunk->offset.QuadPart;
-
-    return IStream_Seek(stream, offset, STREAM_SEEK_SET, NULL);
-}
-
-
-/* IDirectMusicObject base object */
-struct dmobject {
-    IDirectMusicObject IDirectMusicObject_iface;
-    IPersistStream IPersistStream_iface;
-    IUnknown *outer_unk;
-    DMUS_OBJECTDESC desc;
-};
-
-void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk);
-
-/* Generic IDirectMusicObject methods */
-HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
-        void **ret_iface);
-ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface);
-ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface);
-HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc);
-HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
-        DMUS_OBJECTDESC *desc);
-
-/* Helper for IDirectMusicObject::ParseDescriptor */
-HRESULT dmobj_parsedescriptor(IStream *stream, const struct chunk_entry *riff,
-        DMUS_OBJECTDESC *desc, DWORD supported);
-/* Additional supported flags for dmobj_parsedescriptor.
-   DMUS_OBJ_NAME is 'UNAM' chunk in UNFO list */
-#define DMUS_OBJ_NAME_INAM   0x1000     /* 'INAM' chunk in UNFO list */
-#define DMUS_OBJ_NAME_INFO   0x2000     /* 'INAM' chunk in INFO list */
-
-/* 'DMRF' (reference list) helper */
-HRESULT dmobj_parsereference(IStream *stream, const struct chunk_entry *list,
-        IDirectMusicObject **dmobj);
-
-/* Generic IPersistStream methods */
-HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
-        void **ret_iface);
-ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface);
-ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface);
-HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class);
-
-/* IPersistStream methods not implemented in native */
-HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface,
-        CLSID *class);
-HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface);
-HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
-        BOOL clear_dirty);
-HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface,
-        ULARGE_INTEGER *size);
-
-/* Debugging helpers */
-const char *debugstr_chunk(const struct chunk_entry *chunk);
-const char *debugstr_dmguid(const GUID *id);
-void dump_DMUS_OBJECTDESC(DMUS_OBJECTDESC *desc);
-
-static inline const char *debugstr_fourcc(DWORD fourcc)
-{
-    if (!fourcc) return "''";
-    return wine_dbg_sprintf("'%c%c%c%c'", (char)(fourcc), (char)(fourcc >> 8),
-            (char)(fourcc >> 16), (char)(fourcc >> 24));
-}

[PATCH 0/9] MR3787: dmusic: Share dmobject with dmband / dswave / dmstyle using PARENTSRC. - approved

[Michael Stefaniuc (＠mstefani)]

This merge request was approved by Michael Stefaniuc.