ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmstyle: Use the generic IPersistStream for DMMotifTrack.

This commit is contained in:
Michael Stefaniuc 2015-06-30 09:28:28 +02:00 committed by Alexandre Julliard
parent c1647cbbef
commit 699efa6f3e
2 changed files with 18 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
dlls/dmstyle/motiftrack.c
View File

@ -18,6 +18,7 @@
*/ */
#include "dmstyle_private.h" #include "dmstyle_private.h"
#include "dmobject.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
*/ */
typedef struct IDirectMusicMotifTrack { typedef struct IDirectMusicMotifTrack {
IDirectMusicTrack8 IDirectMusicTrack8_iface; IDirectMusicTrack8 IDirectMusicTrack8_iface;
const IPersistStreamVtbl *PersistStreamVtbl; struct dmobject dmobj; /* IPersistStream only */
LONG ref; LONG ref;
DMUS_OBJECTDESC *pDesc;
} IDirectMusicMotifTrack; } IDirectMusicMotifTrack;
/* IDirectMusicMotifTrack IDirectMusicTrack8 part: */ /* IDirectMusicMotifTrack IDirectMusicTrack8 part: */
@ -50,7 +50,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *
IsEqualIID(riid, &IID_IDirectMusicTrack8)) IsEqualIID(riid, &IID_IDirectMusicTrack8))
*ret_iface = iface; *ret_iface = iface;
else if (IsEqualIID(riid, &IID_IPersistStream)) else if (IsEqualIID(riid, &IID_IPersistStream))
*ret_iface = &This->PersistStreamVtbl; *ret_iface = &This->dmobj.IPersistStream_iface;
else { else {
WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface);
return E_NOINTERFACE; return E_NOINTERFACE;
@ -248,52 +248,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
IDirectMusicTrack8Impl_Join IDirectMusicTrack8Impl_Join
}; };
/* IDirectMusicMotifTrack IPersistStream part: */ static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *stream)
static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { {
ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface);
return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj);
}
static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface);
return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface);
}
static ULONG WINAPI IDirectMusicMotifTrack_IPersistStream_Release (LPPERSISTSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicMotifTrack, PersistStreamVtbl, iface);
return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface);
}
static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
FIXME(": Loading not implemented yet\n"); FIXME(": Loading not implemented yet\n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { static const IPersistStreamVtbl persiststream_vtbl = {
return E_NOTIMPL; dmobj_IPersistStream_QueryInterface,
} dmobj_IPersistStream_AddRef,
dmobj_IPersistStream_Release,
static HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { dmobj_IPersistStream_GetClassID,
return E_NOTIMPL; unimpl_IPersistStream_IsDirty,
} IPersistStreamImpl_Load,
unimpl_IPersistStream_Save,
static const IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = { unimpl_IPersistStream_GetSizeMax
IDirectMusicMotifTrack_IPersistStream_QueryInterface,
IDirectMusicMotifTrack_IPersistStream_AddRef,
IDirectMusicMotifTrack_IPersistStream_Release,
IDirectMusicMotifTrack_IPersistStream_GetClassID,
IDirectMusicMotifTrack_IPersistStream_IsDirty,
IDirectMusicMotifTrack_IPersistStream_Load,
IDirectMusicMotifTrack_IPersistStream_Save,
IDirectMusicMotifTrack_IPersistStream_GetSizeMax
}; };
/* for ClassFactory */ /* for ClassFactory */
@ -308,12 +277,10 @@ HRESULT WINAPI create_dmmotiftrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
track->PersistStreamVtbl = &DirectMusicMotifTrack_PersistStream_Vtbl;
track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
DM_STRUCT_INIT(track->pDesc);
track->pDesc->dwValidData |= DMUS_OBJ_CLASS;
track->pDesc->guidClass = CLSID_DirectMusicMotifTrack;
track->ref = 1; track->ref = 1;
dmobject_init(&track->dmobj, &CLSID_DirectMusicMotifTrack,
(IUnknown *)&track->IDirectMusicTrack8_iface);
track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
DMSTYLE_LockModule(); DMSTYLE_LockModule();
hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);

2
dlls/dmstyle/tests/dmstyle.c
View File

@ -257,7 +257,7 @@ static void test_track(void)
{ X(DirectMusicAuditionTrack), TRUE, FALSE, FALSE }, { X(DirectMusicAuditionTrack), TRUE, FALSE, FALSE },
{ X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, { X(DirectMusicChordTrack), TRUE, TRUE, FALSE },
{ X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, { X(DirectMusicCommandTrack), TRUE, TRUE, TRUE },
{ X(DirectMusicMotifTrack), FALSE, FALSE, TRUE }, { X(DirectMusicMotifTrack), FALSE, FALSE, FALSE },
{ X(DirectMusicMuteTrack), TRUE, FALSE, FALSE }, { X(DirectMusicMuteTrack), TRUE, FALSE, FALSE },
{ X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, { X(DirectMusicStyleTrack), FALSE, TRUE, FALSE },
}; };