From: Yuxuan Shui yshui@codeweavers.com
--- dlls/dmloader/loader.c | 22 +++++++++++++--------- dlls/dmusic/band.c | 11 ++++++----- dlls/dmusic/dmobject.c | 2 ++ 3 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 2ebbbe7ffca..2d073aeaba1 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -19,11 +19,12 @@ #include "dmloader_private.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmloader); +WINE_DECLARE_DEBUG_CHANNEL(dmloaderx);
static const WCHAR *system_default_gm_paths[] = { L"/usr/share/sounds/sf2/default-GM.sf2", - L"/usr/share/soundfonts/default.sf2", + L"/nix/store/g3p4s16lr3ag129db1i930wvqx3nrqlz-Fluid-3/share/soundfonts/FluidR3_GM2-2.sf2", };
static HRESULT get_system_default_gm_path(WCHAR *path, UINT max_len) @@ -285,9 +286,9 @@ static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDE IStream *loader_stream; HRESULT hr;
- TRACE("(%p)->(%p, %s, %p)\n", This, pDesc, debugstr_dmguid(riid), ppv); + TRACE_(dmloaderx)("(%p)->(%p, %s, %p)\n", This, pDesc, debugstr_dmguid(riid), ppv);
- if (TRACE_ON(dmloader)) + if (TRACE_ON(dmloaderx)) dump_DMUS_OBJECTDESC(pDesc); /* sometimes it happens that guidClass is missing... which is a BadThingTM */ @@ -299,15 +300,15 @@ static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDE
/* Iterate through the list of objects we know about; these are either loaded * (GetObject, LoadObjectFromFile) or set via SetObject; */ - TRACE(": looking if we have object in the cache or if it can be found via alias\n"); + TRACE_(dmloaderx)(": looking if we have object in the cache or if it can be found via alias\n"); pExistingEntry = find_cache_object(This, pDesc); if (pExistingEntry) { if (pExistingEntry->Desc.dwValidData & DMUS_OBJ_LOADED) { - TRACE(": already loaded\n"); + TRACE_(dmloaderx)(": already loaded\n"); return IDirectMusicObject_QueryInterface(pExistingEntry->pObject, riid, ppv); }
- TRACE(": not loaded yet\n"); + TRACE_(dmloaderx)(": not loaded yet\n"); pObjectEntry = pExistingEntry; }
@@ -327,7 +328,7 @@ static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDE if (pDesc->dwValidData & DMUS_OBJ_URL) { - TRACE(": loading from URLs not supported yet\n"); + TRACE_(dmloaderx)(": loading from URLs not supported yet\n"); return DMUS_E_LOADER_FORMATNOTSUPPORTED; } else if (pDesc->dwValidData & DMUS_OBJ_FILENAME) @@ -372,12 +373,15 @@ static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDE } else { - FIXME(": unknown/unsupported way of loading\n"); + FIXME_(dmloaderx)(": unknown/unsupported way of loading\n"); return DMUS_E_LOADER_NOFILENAME; }
if (FAILED(hr = loader_stream_create((IDirectMusicLoader *)iface, pStream, &loader_stream))) + { + WARN(": failed to create loader stream\n"); return hr; + } IStream_Release(pStream); pStream = loader_stream;
@@ -447,7 +451,7 @@ static HRESULT WINAPI loader_GetObject(IDirectMusicLoader8 *iface, DMUS_OBJECTDE DMUSIC_CopyDescriptor (&pObjectEntry->Desc, &GotDesc); pObjectEntry->pObject = pObject; } - TRACE(": filled in cache entry\n"); + TRACE_(dmloaderx)(": filled in cache entry\n"); }
result = IDirectMusicObject_QueryInterface (pObject, riid, ppv); diff --git a/dlls/dmusic/band.c b/dlls/dmusic/band.c index 08a9c5bd6b3..3bd62f11e76 100644 --- a/dlls/dmusic/band.c +++ b/dlls/dmusic/band.c @@ -185,7 +185,7 @@ static HRESULT WINAPI band_Download(IDirectMusicBand *iface, struct instrument_entry *entry; HRESULT hr = S_OK;
- TRACE("(%p, %p)\n", This, performance); + WARN("(%p, %p)\n", This, performance);
LIST_FOR_EACH_ENTRY(entry, &This->instruments, struct instrument_entry, entry) { @@ -197,6 +197,7 @@ static HRESULT WINAPI band_Download(IDirectMusicBand *iface,
if (SUCCEEDED(hr = IDirectMusicCollection_GetInstrument(collection, entry->instrument.dwPatch, &instrument))) { + WARN("Downloading instrument %lu\n", entry->instrument.dwPatch); hr = IDirectMusicPerformance_DownloadInstrument(performance, instrument, entry->instrument.dwPChannel, &entry->download, NULL, 0, &entry->download_port, NULL, NULL); IDirectMusicInstrument_Release(instrument); @@ -433,18 +434,18 @@ static HRESULT WINAPI band_persist_stream_Load(IPersistStream *iface, IStream *s stream_skip_chunk(stream, &chunk); if (FAILED(hr)) return hr;
- if (TRACE_ON(dmband)) + if (WARN_ON(dmband)) { struct instrument_entry *entry;
- TRACE("Loaded IDirectMusicBand %p\n", This); + WARN("Loaded IDirectMusicBand %p\n", This); dump_DMUS_OBJECTDESC(&This->dmobj.desc);
- TRACE(" - Instruments:\n"); + WARN(" - Instruments:\n"); LIST_FOR_EACH_ENTRY(entry, &This->instruments, struct instrument_entry, entry) { dump_DMUS_IO_INSTRUMENT(&entry->instrument); - TRACE(" - collection: %p\n", entry->collection); + WARN(" - collection: %p\n", entry->collection); } }
diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c index 9ba1f239167..8012e47dbfd 100644 --- a/dlls/dmusic/dmobject.c +++ b/dlls/dmusic/dmobject.c @@ -468,6 +468,8 @@ HRESULT stream_get_object(IStream *stream, DMUS_OBJECTDESC *desc, REFIID iid, vo { hr = IDirectMusicLoader_GetObject(loader, desc, iid, ret_iface); IDirectMusicLoader_Release(loader); + } else { + WARN("Failed to get loader: %08x\n", hr); }
if (FAILED(hr)) *ret_iface = NULL;