From: Rémi Bernon rbernon@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 */