Module: wine Branch: master Commit: aad75398dd5d1355cb4e7aeaff733530823e32ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=aad75398dd5d1355cb4e7aeaff...
Author: Michael Stefaniuc mstefani@redhat.de Date: Fri Jul 3 10:16:04 2015 +0200
dmime: Use the generic IPersistStream for DMLyricsTrack.
---
dlls/dmime/lyricstrack.c | 67 ++++++++++++------------------------------------ dlls/dmime/tests/dmime.c | 2 +- 2 files changed, 18 insertions(+), 51 deletions(-)
diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 3bdbea4..7038273 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -18,6 +18,7 @@ */
#include "dmime_private.h" +#include "dmobject.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmime);
@@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime); */ typedef struct IDirectMusicLyricsTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; } IDirectMusicLyricsTrack;
/* IDirectMusicLyricsTrack IDirectMusicTrack8 part: */ @@ -50,7 +50,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * IsEqualIID(riid, &IID_IDirectMusicTrack8)) *ret_iface = iface; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ret_iface = &This->PersistStreamVtbl; + *ret_iface = &This->dmobj.IPersistStream_iface; else { WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; @@ -240,52 +240,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { IDirectMusicTrack8Impl_Join };
-/* IDirectMusicLyricsTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicLyricsTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicLyricsTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicLyricsTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream) +{ FIXME(": Loading not implemented yet\n"); return S_OK; }
-static HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicLyricsTrack_PersistStream_Vtbl = { - IDirectMusicLyricsTrack_IPersistStream_QueryInterface, - IDirectMusicLyricsTrack_IPersistStream_AddRef, - IDirectMusicLyricsTrack_IPersistStream_Release, - IDirectMusicLyricsTrack_IPersistStream_GetClassID, - IDirectMusicLyricsTrack_IPersistStream_IsDirty, - IDirectMusicLyricsTrack_IPersistStream_Load, - IDirectMusicLyricsTrack_IPersistStream_Save, - IDirectMusicLyricsTrack_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax };
/* for ClassFactory */ @@ -300,12 +269,10 @@ HRESULT WINAPI create_dmlyricstrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicLyricsTrack_PersistStream_Vtbl; - track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(track->pDesc); - track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - memcpy (&track->pDesc->guidClass, &CLSID_DirectMusicLyricsTrack, sizeof (CLSID)); track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicLyricsTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
DMIME_LockModule(); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 0c6f49c..bf81aaf 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -494,7 +494,7 @@ static void test_track(void) const char *name; BOOL todo; } class[] = { - { X(DirectMusicLyricsTrack), TRUE }, + { X(DirectMusicLyricsTrack), FALSE }, { X(DirectMusicMarkerTrack), FALSE }, { X(DirectMusicParamControlTrack), TRUE }, { X(DirectMusicSegmentTriggerTrack), FALSE },
-
Alexandre Julliard