mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 05:10:36 +00:00
dmime: Use the generic IPersistStream for DMParamControlTrack.
This commit is contained in:
parent
22184e3694
commit
4a9eb8bfe0
|
@ -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 IDirectMusicParamControlTrack {
|
||||
IDirectMusicTrack8 IDirectMusicTrack8_iface;
|
||||
const IPersistStreamVtbl *PersistStreamVtbl;
|
||||
struct dmobject dmobj; /* IPersistStream only */
|
||||
LONG ref;
|
||||
DMUS_OBJECTDESC *pDesc;
|
||||
} IDirectMusicParamControlTrack;
|
||||
|
||||
/* IDirectMusicParamControlTrack 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
|
||||
};
|
||||
|
||||
/* IDirectMusicParamControlTrack IPersistStream part: */
|
||||
static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
|
||||
ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface);
|
||||
return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj);
|
||||
}
|
||||
|
||||
static ULONG WINAPI IDirectMusicParamControlTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
|
||||
ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface);
|
||||
return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface);
|
||||
}
|
||||
|
||||
static ULONG WINAPI IDirectMusicParamControlTrack_IPersistStream_Release (LPPERSISTSTREAM iface) {
|
||||
ICOM_THIS_MULTI(IDirectMusicParamControlTrack, PersistStreamVtbl, iface);
|
||||
return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicParamControlTrack_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 IDirectMusicParamControlTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static const IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl = {
|
||||
IDirectMusicParamControlTrack_IPersistStream_QueryInterface,
|
||||
IDirectMusicParamControlTrack_IPersistStream_AddRef,
|
||||
IDirectMusicParamControlTrack_IPersistStream_Release,
|
||||
IDirectMusicParamControlTrack_IPersistStream_GetClassID,
|
||||
IDirectMusicParamControlTrack_IPersistStream_IsDirty,
|
||||
IDirectMusicParamControlTrack_IPersistStream_Load,
|
||||
IDirectMusicParamControlTrack_IPersistStream_Save,
|
||||
IDirectMusicParamControlTrack_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_dmparamcontroltrack(REFIID lpcGUID, void **ppobj)
|
|||
return E_OUTOFMEMORY;
|
||||
}
|
||||
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
|
||||
track->PersistStreamVtbl = &DirectMusicParamControlTrack_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_DirectMusicParamControlTrack;
|
||||
track->ref = 1;
|
||||
dmobject_init(&track->dmobj, &CLSID_DirectMusicParamControlTrack,
|
||||
(IUnknown *)&track->IDirectMusicTrack8_iface);
|
||||
track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
|
||||
|
||||
DMIME_LockModule();
|
||||
hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
|
||||
|
|
|
@ -496,7 +496,7 @@ static void test_track(void)
|
|||
} class[] = {
|
||||
{ X(DirectMusicLyricsTrack), FALSE },
|
||||
{ X(DirectMusicMarkerTrack), FALSE },
|
||||
{ X(DirectMusicParamControlTrack), TRUE },
|
||||
{ X(DirectMusicParamControlTrack), FALSE },
|
||||
{ X(DirectMusicSegmentTriggerTrack), FALSE },
|
||||
{ X(DirectMusicSeqTrack), FALSE },
|
||||
{ X(DirectMusicSysExTrack), FALSE },
|
||||
|
|
Loading…
Reference in a new issue