[PATCH v2 0/7] MR4139: dmime, dmusic: Miscellaneous fixes.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55790 -- v2: dmime: Avoid releasing the newly created graph twice. dswave: Use the dmusic wave object implementation. dmusic: Use the IDirectMusicObject interface for waves. dmusic: Implement IDirectMusicObject interface on wave objects. dmime: Return hr from wave track SetParam GUID_DownloadToAudioPath. dmime: Return S_OK from wave track SetParam GUID_UnloadFromAudioPath. dmime: Avoid crashing when purging notification messages. https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/performance.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index a8fcd869331..a2e611523a6 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -1783,6 +1783,7 @@ static HRESULT WINAPI performance_tool_ProcessPMsg(IDirectMusicTool *iface, do { previous = LIST_ENTRY(list_head(&This->notifications), struct message, entry); + if (This->notification_timeout <= 0) break; /* negative values may be used to keep everything */ if (message->msg.rtTime - previous->msg.rtTime <= This->notification_timeout) break; list_remove(&previous->entry); list_init(&previous->entry); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index def1e59fb23..79169a2a6fa 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -296,6 +296,8 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ item->buffer = NULL; } } + + return S_OK; } return DMUS_E_TYPE_UNSUPPORTED; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 79169a2a6fa..fcf57c1148d 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -273,6 +273,8 @@ static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID typ } } } + + return hr; } if (IsEqualGUID(type, &GUID_Enable_Auto_Download)) { FIXME("GUID_Enable_Auto_Download not handled yet\n"); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmusic/wave.c | 131 ++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 119 insertions(+), 12 deletions(-) diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index ef1cd2990ff..e5e7c4dc2a0 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -32,6 +32,7 @@ C_ASSERT(sizeof(struct sample) == offsetof(struct sample, loops[0])); struct wave { IUnknown IUnknown_iface; + struct dmobject dmobj; LONG ref; struct sample *sample; @@ -58,6 +59,20 @@ static HRESULT WINAPI wave_QueryInterface(IUnknown *iface, REFIID riid, void **r return S_OK; } + if (IsEqualIID(riid, &IID_IDirectMusicObject)) + { + *ret_iface = &This->dmobj.IDirectMusicObject_iface; + IDirectMusicObject_AddRef(&This->dmobj.IDirectMusicObject_iface); + return S_OK; + } + + if (IsEqualIID(riid, &IID_IPersistStream)) + { + *ret_iface = &This->dmobj.IPersistStream_iface; + IDirectMusicObject_AddRef(&This->dmobj.IPersistStream_iface); + return S_OK; + } + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); *ret_iface = NULL; return E_NOINTERFACE; @@ -96,18 +111,6 @@ static const IUnknownVtbl unknown_vtbl = wave_Release, }; -static HRESULT wave_create(IUnknown **ret_iface) -{ - struct wave *obj; - - if (!(obj = calloc(1, sizeof(*obj)))) return E_OUTOFMEMORY; - obj->IUnknown_iface.lpVtbl = &unknown_vtbl; - obj->ref = 1; - - *ret_iface = &obj->IUnknown_iface; - return S_OK; -} - static HRESULT parse_wsmp_chunk(struct wave *This, IStream *stream, struct chunk_entry *chunk) { struct sample *sample; @@ -167,6 +170,110 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk return hr; } +static HRESULT WINAPI wave_object_ParseDescriptor(IDirectMusicObject *iface, + IStream *stream, DMUS_OBJECTDESC *desc) +{ + struct chunk_entry chunk = {0}; + HRESULT hr; + + TRACE("(%p, %p, %p)\n", iface, stream, desc); + + if (!stream || !desc) return E_POINTER; + + if ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + { + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case MAKE_IDTYPE(FOURCC_RIFF, mmioFOURCC('W','A','V','E')): + hr = dmobj_parsedescriptor(stream, &chunk, desc, + DMUS_OBJ_NAME_INFO | DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION); + break; + + default: + WARN("Invalid wave chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + hr = DMUS_E_CHUNKNOTFOUND; + break; + } + } + + if (FAILED(hr)) return hr; + + TRACE("returning descriptor:\n"); + dump_DMUS_OBJECTDESC(desc); + return S_OK; +} + +static const IDirectMusicObjectVtbl wave_object_vtbl = +{ + dmobj_IDirectMusicObject_QueryInterface, + dmobj_IDirectMusicObject_AddRef, + dmobj_IDirectMusicObject_Release, + dmobj_IDirectMusicObject_GetDescriptor, + dmobj_IDirectMusicObject_SetDescriptor, + wave_object_ParseDescriptor, +}; + +static inline struct wave *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, struct wave, dmobj.IPersistStream_iface); +} + +static HRESULT WINAPI wave_persist_stream_Load(IPersistStream *iface, IStream *stream) +{ + struct wave *This = impl_from_IPersistStream(iface); + struct chunk_entry chunk = {0}; + HRESULT hr; + + TRACE("(%p, %p)\n", This, stream); + + if (!stream) return E_POINTER; + + if ((hr = stream_next_chunk(stream, &chunk)) == S_OK) + { + switch (MAKE_IDTYPE(chunk.id, chunk.type)) + { + case MAKE_IDTYPE(FOURCC_RIFF, mmioFOURCC('W','A','V','E')): + hr = parse_wave_chunk(This, stream, &chunk); + break; + + default: + WARN("Invalid wave chunk %s %s\n", debugstr_fourcc(chunk.id), debugstr_fourcc(chunk.type)); + hr = DMUS_E_UNSUPPORTED_STREAM; + break; + } + } + + stream_skip_chunk(stream, &chunk); + return hr; +} + +static const IPersistStreamVtbl wave_persist_stream_vtbl = +{ + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + wave_persist_stream_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax, +}; + +static HRESULT wave_create(IUnknown **ret_iface) +{ + struct wave *obj; + + 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); + obj->dmobj.IDirectMusicObject_iface.lpVtbl = &wave_object_vtbl; + obj->dmobj.IPersistStream_iface.lpVtbl = &wave_persist_stream_vtbl; + + *ret_iface = &obj->IUnknown_iface; + return S_OK; +} + HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnknown **ret_iface) { struct wave *This; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmime/wavetrack.c | 6 +++--- dlls/dmusic/collection.c | 8 ++++---- dlls/dmusic/dmusic_private.h | 2 +- dlls/dmusic/dmusic_wave.h | 11 ++++++----- dlls/dmusic/instrument.c | 4 ++-- dlls/dmusic/wave.c | 35 ++++++++++++++++++++--------------- 6 files changed, 36 insertions(+), 30 deletions(-) diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index fcf57c1148d..5ba9fb675f5 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -24,7 +24,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); struct wave_item { struct list entry; DMUS_IO_WAVE_ITEM_HEADER header; - IUnknown *object; + IDirectMusicObject *object; IDirectSoundBuffer *buffer; }; @@ -106,7 +106,7 @@ static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface) { list_remove(&item->entry); if (item->buffer) IDirectSoundBuffer_Release(item->buffer); - if (item->object) IUnknown_Release(item->object); + if (item->object) IDirectMusicObject_Release(item->object); free(item); } @@ -469,7 +469,7 @@ static HRESULT parse_wave_item(struct wave_part *part, IStream *stream, struct c hr = DMUS_E_UNSUPPORTED_STREAM; goto error; } - if (FAILED(hr = dmobj_parsereference(stream, &chunk, (IDirectMusicObject **)&item->object))) + if (FAILED(hr = dmobj_parsereference(stream, &chunk, &item->object))) goto error; list_add_tail(&part->items, &item->entry); diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index bf21d3148e3..5cf129cfdd1 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -42,7 +42,7 @@ C_ASSERT(sizeof(struct pool) == offsetof(struct pool, cues[0])); struct wave_entry { struct list entry; - IUnknown *wave; + IDirectMusicObject *wave; DWORD offset; }; @@ -59,13 +59,13 @@ struct collection struct list waves; }; -extern void collection_internal_addref(struct collection *collection) +void collection_internal_addref(struct collection *collection) { ULONG ref = InterlockedIncrement( &collection->internal_ref ); TRACE( "collection %p, internal ref %lu.\n", collection, ref ); } -extern void collection_internal_release(struct collection *collection) +void collection_internal_release(struct collection *collection) { ULONG ref = InterlockedDecrement( &collection->internal_ref ); TRACE( "collection %p, internal ref %lu.\n", collection, ref ); @@ -74,7 +74,7 @@ extern void collection_internal_release(struct collection *collection) free(collection); } -extern HRESULT collection_get_wave(struct collection *collection, DWORD index, IUnknown **out) +HRESULT collection_get_wave(struct collection *collection, DWORD index, IDirectMusicObject **out) { struct wave_entry *wave_entry; DWORD offset; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 0bb3d5aaf83..c3e627481a7 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -80,7 +80,7 @@ typedef struct port_info { struct collection; extern void collection_internal_addref(struct collection *collection); extern void collection_internal_release(struct collection *collection); -extern HRESULT collection_get_wave(struct collection *collection, DWORD index, IUnknown **out); +extern HRESULT collection_get_wave(struct collection *collection, DWORD index, IDirectMusicObject **out); /* CLSID */ extern HRESULT music_create(IUnknown **ret_iface); diff --git a/dlls/dmusic/dmusic_wave.h b/dlls/dmusic/dmusic_wave.h index 43396250261..f5ebaed2892 100644 --- a/dlls/dmusic/dmusic_wave.h +++ b/dlls/dmusic/dmusic_wave.h @@ -29,8 +29,9 @@ struct soundfont; struct chunk_entry; -extern HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IUnknown **out); -extern HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnknown **out); -extern HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, DWORD *id); -extern HRESULT wave_download_to_dsound(IUnknown *iface, IDirectSound *dsound, IDirectSoundBuffer **ret_iface); -extern HRESULT wave_get_duration(IUnknown *iface, REFERENCE_TIME *duration); +extern HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDirectMusicObject **out); +extern HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IDirectMusicObject **out); +extern HRESULT wave_download_to_port(IDirectMusicObject *iface, IDirectMusicPortDownload *port, DWORD *id); +extern HRESULT wave_download_to_dsound(IDirectMusicObject *iface, IDirectSound *dsound, + IDirectSoundBuffer **ret_iface); +extern HRESULT wave_get_duration(IDirectMusicObject *iface, REFERENCE_TIME *duration); diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index 7a0f8a2f1eb..8311c690877 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -747,7 +747,7 @@ HRESULT instrument_download_to_port(IDirectMusicInstrument *iface, IDirectMusicP IDirectMusicDownload *download; DWORD size, offset_count; struct region *region; - IUnknown *wave; + IDirectMusicObject *wave; HRESULT hr; if (This->download) goto done; @@ -827,7 +827,7 @@ HRESULT instrument_download_to_port(IDirectMusicInstrument *iface, IDirectMusicP if (SUCCEEDED(hr = collection_get_wave(This->collection, region->wave_link.ulTableIndex, &wave))) { hr = wave_download_to_port(wave, port, &dmus_region->WaveLink.ulTableIndex); - IUnknown_Release(wave); + IDirectMusicObject_Release(wave); } if (FAILED(hr)) goto failed; diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index e5e7c4dc2a0..0db895f2038 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -170,6 +170,11 @@ static HRESULT parse_wave_chunk(struct wave *This, IStream *stream, struct chunk return hr; } +static inline struct wave *impl_from_IDirectMusicObject(IDirectMusicObject *iface) +{ + return CONTAINING_RECORD(iface, struct wave, dmobj.IDirectMusicObject_iface); +} + static HRESULT WINAPI wave_object_ParseDescriptor(IDirectMusicObject *iface, IStream *stream, DMUS_OBJECTDESC *desc) { @@ -259,7 +264,7 @@ static const IPersistStreamVtbl wave_persist_stream_vtbl = unimpl_IPersistStream_GetSizeMax, }; -static HRESULT wave_create(IUnknown **ret_iface) +static HRESULT wave_create(IDirectMusicObject **ret_iface) { struct wave *obj; @@ -270,24 +275,24 @@ static HRESULT wave_create(IUnknown **ret_iface) obj->dmobj.IDirectMusicObject_iface.lpVtbl = &wave_object_vtbl; obj->dmobj.IPersistStream_iface.lpVtbl = &wave_persist_stream_vtbl; - *ret_iface = &obj->IUnknown_iface; + *ret_iface = &obj->dmobj.IDirectMusicObject_iface; return S_OK; } -HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnknown **ret_iface) +HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IDirectMusicObject **ret_iface) { struct wave *This; - IUnknown *iface; + IDirectMusicObject *iface; HRESULT hr; TRACE("(%p, %p, %p)\n", stream, parent, ret_iface); if (FAILED(hr = wave_create(&iface))) return hr; - This = impl_from_IUnknown(iface); + This = impl_from_IDirectMusicObject(iface); if (FAILED(hr = parse_wave_chunk(This, stream, parent))) { - IUnknown_Release(iface); + IDirectMusicObject_Release(iface); return DMUS_E_UNSUPPORTED_STREAM; } @@ -324,7 +329,7 @@ HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IUnk return S_OK; } -HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IUnknown **ret_iface) +HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDirectMusicObject **ret_iface) { struct sf_sample *sf_sample = soundfont->shdr + index; struct sample *sample = NULL; @@ -333,7 +338,7 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IUnk UINT data_size, offset; struct wave *This; void *data = NULL; - IUnknown *iface; + IDirectMusicObject *iface; TRACE("(%p, %u, %p)\n", soundfont, index, ret_iface); @@ -360,7 +365,7 @@ HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IUnk if (FAILED(hr = wave_create(&iface))) goto failed; - This = impl_from_IUnknown(iface); + This = impl_from_IDirectMusicObject(iface); This->format = format; This->sample = sample; This->data_size = data_size; @@ -403,7 +408,7 @@ failed: return hr; } -HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, DWORD *id) +HRESULT wave_download_to_port(IDirectMusicObject *iface, IDirectMusicPortDownload *port, DWORD *id) { struct download_buffer { @@ -413,7 +418,7 @@ HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, D DMUS_WAVEDATA data; } *buffer; - struct wave *This = impl_from_IUnknown(iface); + struct wave *This = impl_from_IDirectMusicObject(iface); DWORD size = offsetof(struct download_buffer, data.byData[This->data_size]); IDirectMusicDownload *download; HRESULT hr; @@ -446,9 +451,9 @@ HRESULT wave_download_to_port(IUnknown *iface, IDirectMusicPortDownload *port, D return hr; } -HRESULT wave_download_to_dsound(IUnknown *iface, IDirectSound *dsound, IDirectSoundBuffer **ret_iface) +HRESULT wave_download_to_dsound(IDirectMusicObject *iface, IDirectSound *dsound, IDirectSoundBuffer **ret_iface) { - struct wave *This = impl_from_IUnknown(iface); + struct wave *This = impl_from_IDirectMusicObject(iface); DSBUFFERDESC desc = { .dwSize = sizeof(desc), @@ -485,9 +490,9 @@ HRESULT wave_download_to_dsound(IUnknown *iface, IDirectSound *dsound, IDirectSo return S_OK; } -HRESULT wave_get_duration(IUnknown *iface, REFERENCE_TIME *duration) +HRESULT wave_get_duration(IDirectMusicObject *iface, REFERENCE_TIME *duration) { - struct wave *This = impl_from_IUnknown(iface); + struct wave *This = impl_from_IDirectMusicObject(iface); *duration = (REFERENCE_TIME)This->data_size * 10000000 / This->format->nAvgBytesPerSec; return S_OK; } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55792 --- dlls/dmusic/dmusic_wave.h | 1 + dlls/dmusic/wave.c | 2 +- dlls/dswave/Makefile.in | 4 +- dlls/dswave/dswave.c | 191 ----------------------------------- dlls/dswave/dswave_main.c | 16 +-- dlls/dswave/dswave_private.h | 5 - 6 files changed, 14 insertions(+), 205 deletions(-) delete mode 100644 dlls/dswave/dswave.c diff --git a/dlls/dmusic/dmusic_wave.h b/dlls/dmusic/dmusic_wave.h index f5ebaed2892..bdad8ca9605 100644 --- a/dlls/dmusic/dmusic_wave.h +++ b/dlls/dmusic/dmusic_wave.h @@ -29,6 +29,7 @@ struct soundfont; struct chunk_entry; +extern HRESULT wave_create(IDirectMusicObject **ret_iface); extern HRESULT wave_create_from_soundfont(struct soundfont *soundfont, UINT index, IDirectMusicObject **out); extern HRESULT wave_create_from_chunk(IStream *stream, struct chunk_entry *parent, IDirectMusicObject **out); extern HRESULT wave_download_to_port(IDirectMusicObject *iface, IDirectMusicPortDownload *port, DWORD *id); diff --git a/dlls/dmusic/wave.c b/dlls/dmusic/wave.c index 0db895f2038..dd0b8a44779 100644 --- a/dlls/dmusic/wave.c +++ b/dlls/dmusic/wave.c @@ -264,7 +264,7 @@ static const IPersistStreamVtbl wave_persist_stream_vtbl = unimpl_IPersistStream_GetSizeMax, }; -static HRESULT wave_create(IDirectMusicObject **ret_iface) +HRESULT wave_create(IDirectMusicObject **ret_iface) { struct wave *obj; diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index 99b1e3ff9dc..8535e8fc27b 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -4,8 +4,8 @@ PARENTSRC = ../dmusic C_SRCS = \ dmobject.c \ - dswave.c \ - dswave_main.c + dswave_main.c \ + wave.c IDL_SRCS = dswave.idl diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c deleted file mode 100644 index 5bdd83dfa2c..00000000000 --- a/dlls/dswave/dswave.c +++ /dev/null @@ -1,191 +0,0 @@ -/* IDirectMusicWave Implementation - * - * Copyright (C) 2003-2004 Rok Mandeljc - * - * 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 "dswave_private.h" -#include "dmobject.h" - -WINE_DEFAULT_DEBUG_CHANNEL(dswave); - -/* an interface that is, according to my tests, obtained by loader after loading object; is it acting - as some sort of bridge between object and loader? */ -static const GUID IID_IDirectMusicWavePRIVATE = {0x69e934e4,0x97f1,0x4f1d,{0x88,0xe8,0xf2,0xac,0x88,0x67,0x13,0x27}}; - -/***************************************************************************** - * IDirectMusicWaveImpl implementation - */ -typedef struct IDirectMusicWaveImpl { - IUnknown IUnknown_iface; - struct dmobject dmobj; - LONG ref; -} IDirectMusicWaveImpl; - -/* IDirectMusicWaveImpl IUnknown part: */ -static inline IDirectMusicWaveImpl *impl_from_IUnknown(IUnknown *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicWaveImpl, IUnknown_iface); -} - -static HRESULT WINAPI IUnknownImpl_QueryInterface(IUnknown *iface, REFIID riid, void **ret_iface) -{ - IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); - - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ret_iface); - - *ret_iface = NULL; - - if (IsEqualIID(riid, &IID_IUnknown)) - *ret_iface = iface; - else if (IsEqualIID(riid, &IID_IDirectMusicObject)) - *ret_iface = &This->dmobj.IDirectMusicObject_iface; - else if (IsEqualIID(riid, &IID_IPersistStream)) - *ret_iface = &This->dmobj.IPersistStream_iface; - else if (IsEqualIID(riid, &IID_IDirectMusicWavePRIVATE)) { - FIXME("(%p, %s, %p): Unsupported private interface\n", This, debugstr_guid(riid), ret_iface); - return E_NOINTERFACE; - } else { - WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); - return E_NOINTERFACE; - } - - IUnknown_AddRef((IUnknown*)*ret_iface); - return S_OK; -} - -static ULONG WINAPI IUnknownImpl_AddRef(IUnknown *iface) -{ - IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); - LONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) ref=%ld\n", This, ref); - - return ref; -} - -static ULONG WINAPI IUnknownImpl_Release(IUnknown *iface) -{ - IDirectMusicWaveImpl *This = impl_from_IUnknown(iface); - LONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) ref=%ld\n", This, ref); - - if (!ref) free(This); - - return ref; -} - -static const IUnknownVtbl unknown_vtbl = { - IUnknownImpl_QueryInterface, - IUnknownImpl_AddRef, - IUnknownImpl_Release -}; - -/* IDirectMusicWaveImpl IDirectMusicObject part: */ -static HRESULT WINAPI wave_IDirectMusicObject_ParseDescriptor(IDirectMusicObject *iface, - IStream *stream, DMUS_OBJECTDESC *desc) -{ - struct chunk_entry riff = {0}; - HRESULT hr; - - TRACE("(%p, %p, %p)\n", iface, stream, desc); - - if (!stream || !desc) - return E_POINTER; - - if ((hr = stream_get_chunk(stream, &riff)) != S_OK) - return hr; - if (riff.id != FOURCC_RIFF || riff.type != mmioFOURCC('W','A','V','E')) { - TRACE("loading failed: unexpected %s\n", debugstr_chunk(&riff)); - stream_skip_chunk(stream, &riff); - return DMUS_E_CHUNKNOTFOUND; - } - - hr = dmobj_parsedescriptor(stream, &riff, desc, - DMUS_OBJ_NAME_INFO | DMUS_OBJ_OBJECT | DMUS_OBJ_VERSION); - if (FAILED(hr)) - return hr; - - TRACE("returning descriptor:\n"); - dump_DMUS_OBJECTDESC(desc); - return S_OK; -} - -static const IDirectMusicObjectVtbl dmobject_vtbl = { - dmobj_IDirectMusicObject_QueryInterface, - dmobj_IDirectMusicObject_AddRef, - dmobj_IDirectMusicObject_Release, - dmobj_IDirectMusicObject_GetDescriptor, - dmobj_IDirectMusicObject_SetDescriptor, - wave_IDirectMusicObject_ParseDescriptor -}; - -/* IDirectMusicWaveImpl IPersistStream part: */ -static inline IDirectMusicWaveImpl *impl_from_IPersistStream(IPersistStream *iface) -{ - return CONTAINING_RECORD(iface, IDirectMusicWaveImpl, dmobj.IPersistStream_iface); -} - -static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) -{ - IDirectMusicWaveImpl *This = impl_from_IPersistStream(iface); - struct chunk_entry riff = {0}; - - /* Without the private interface the implementation should go to dmime/segment.c */ - FIXME("(%p, %p): loading not implemented (only descriptor is loaded)\n", This, stream); - - if (!stream) - return E_POINTER; - - if (stream_get_chunk(stream, &riff) != S_OK || riff.id != FOURCC_RIFF || - riff.type != mmioFOURCC('W','A','V','E')) - return DMUS_E_UNSUPPORTED_STREAM; - stream_reset_chunk_start(stream, &riff); - - return IDirectMusicObject_ParseDescriptor(&This->dmobj.IDirectMusicObject_iface, stream, - &This->dmobj.desc); -} - -static const IPersistStreamVtbl persiststream_vtbl = { - dmobj_IPersistStream_QueryInterface, - dmobj_IPersistStream_AddRef, - dmobj_IPersistStream_Release, - dmobj_IPersistStream_GetClassID, - unimpl_IPersistStream_IsDirty, - wave_IPersistStream_Load, - unimpl_IPersistStream_Save, - unimpl_IPersistStream_GetSizeMax -}; - -/* for ClassFactory */ -HRESULT create_dswave(REFIID lpcGUID, void **ppobj) -{ - IDirectMusicWaveImpl *obj; - HRESULT hr; - - *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); - obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl; - obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; - - 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 f2ce7bb950f..100d5cf8fc9 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -35,6 +35,7 @@ #include "dmusici.h" #include "dswave_private.h" +#include "dmusic_wave.h" #include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dswave); @@ -79,14 +80,17 @@ static ULONG WINAPI WaveCF_Release(IClassFactory * iface) static HRESULT WINAPI WaveCF_CreateInstance(IClassFactory * iface, IUnknown *outer_unk, REFIID riid, void **ret_iface) { - TRACE ("(%p, %s, %p)\n", outer_unk, debugstr_dmguid(riid), ret_iface); + IDirectMusicObject *object; + HRESULT hr; - if (outer_unk) { - *ret_iface = NULL; - return CLASS_E_NOAGGREGATION; - } + TRACE("(%p, %s, %p)\n", outer_unk, debugstr_dmguid(riid), ret_iface); - return create_dswave(riid, ret_iface); + *ret_iface = NULL; + if (outer_unk) return CLASS_E_NOAGGREGATION; + if (FAILED(hr = wave_create(&object))) return hr; + hr = IDirectMusicObject_QueryInterface(object, riid, ret_iface); + IDirectMusicObject_Release(object); + return hr; } static HRESULT WINAPI WaveCF_LockServer(IClassFactory * iface, BOOL dolock) diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 50406c676c1..080bb961e94 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -39,9 +39,4 @@ #include "dmusicf.h" #include "dmusics.h" -/***************************************************************************** - * ClassFactory - */ -extern HRESULT create_dswave(REFIID lpcGUID, void **ret_iface); - #endif /* __WINE_DSWAVE_PRIVATE_H */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
From: Rémi Bernon <rbernon(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55790 --- dlls/dmime/audiopath.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 3310624eb00..65691f4705f 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -195,8 +195,6 @@ static HRESULT WINAPI IDirectMusicAudioPathImpl_GetObjectInPath (IDirectMusicAud if (FAILED(hr)) return hr; IDirectMusicPerformance8_SetGraph(This->pPerf, pGraph); - /* we need release as SetGraph do an AddRef */ - IDirectMusicGraph_Release(pGraph); pPerfoGraph = pGraph; } *ppObject = pPerfoGraph; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
Looks good. Only the unrelated, but usual, domdoc and filtergraph test failures. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4139#note_49427
This merge request was approved by Michael Stefaniuc. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/4139
participants (2)
-
Michael Stefaniuc (＠mstefani) -
Rémi Bernon