mirror of
git://source.winehq.org/git/wine.git
synced 2024-09-06 06:20:56 +00:00
dmcompos: Use the generic IPersistStream for DMChordMapTrack.
This commit is contained in:
parent
836a392bd3
commit
d9a54d563d
|
@ -18,6 +18,7 @@
|
|||
*/
|
||||
|
||||
#include "dmcompos_private.h"
|
||||
#include "dmobject.h"
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
|
||||
|
||||
|
@ -26,9 +27,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos);
|
|||
*/
|
||||
typedef struct IDirectMusicChordMapTrack {
|
||||
IDirectMusicTrack8 IDirectMusicTrack8_iface;
|
||||
const IPersistStreamVtbl *PersistStreamVtbl;
|
||||
struct dmobject dmobj; /* IPersistStream only */
|
||||
LONG ref;
|
||||
DMUS_OBJECTDESC *pDesc;
|
||||
} IDirectMusicChordMapTrack;
|
||||
|
||||
/* IDirectMusicChordMapTrack 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;
|
||||
|
@ -244,53 +244,27 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
|
|||
IDirectMusicTrack8Impl_Join
|
||||
};
|
||||
|
||||
/* IDirectMusicChordMapTrack IPersistStream part: */
|
||||
static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
|
||||
ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface);
|
||||
return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj);
|
||||
static inline IDirectMusicChordMapTrack *impl_from_IPersistStream(IPersistStream *iface)
|
||||
{
|
||||
return CONTAINING_RECORD(iface, IDirectMusicChordMapTrack, dmobj.IPersistStream_iface);
|
||||
}
|
||||
|
||||
static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
|
||||
ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface);
|
||||
return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface);
|
||||
}
|
||||
|
||||
static ULONG WINAPI IDirectMusicChordMapTrack_IPersistStream_Release (LPPERSISTSTREAM iface) {
|
||||
ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface);
|
||||
return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
|
||||
ICOM_THIS_MULTI(IDirectMusicChordMapTrack, PersistStreamVtbl, iface);
|
||||
static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
|
||||
{
|
||||
IDirectMusicChordMapTrack *This = impl_from_IPersistStream(iface);
|
||||
FIXME("(%p, %p): Loading not implemented yet\n", This, pStm);
|
||||
return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) {
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static const IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = {
|
||||
IDirectMusicChordMapTrack_IPersistStream_QueryInterface,
|
||||
IDirectMusicChordMapTrack_IPersistStream_AddRef,
|
||||
IDirectMusicChordMapTrack_IPersistStream_Release,
|
||||
IDirectMusicChordMapTrack_IPersistStream_GetClassID,
|
||||
IDirectMusicChordMapTrack_IPersistStream_IsDirty,
|
||||
IDirectMusicChordMapTrack_IPersistStream_Load,
|
||||
IDirectMusicChordMapTrack_IPersistStream_Save,
|
||||
IDirectMusicChordMapTrack_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 */
|
||||
|
@ -305,12 +279,10 @@ HRESULT WINAPI create_dmchordmaptrack(REFIID lpcGUID, void **ppobj)
|
|||
return E_OUTOFMEMORY;
|
||||
}
|
||||
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
|
||||
track->PersistStreamVtbl = &DirectMusicChordMapTrack_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_DirectMusicChordMapTrack;
|
||||
track->ref = 1;
|
||||
dmobject_init(&track->dmobj, &CLSID_DirectMusicChordMapTrack,
|
||||
(IUnknown *)&track->IDirectMusicTrack8_iface);
|
||||
track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
|
||||
|
||||
DMCOMPOS_LockModule();
|
||||
hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
|
||||
|
|
|
@ -313,13 +313,13 @@ static void test_chordmaptrack(void)
|
|||
hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps);
|
||||
ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
|
||||
hr = IPersistStream_GetClassID(ps, &class);
|
||||
todo_wine ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr);
|
||||
todo_wine ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack),
|
||||
ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr);
|
||||
ok(IsEqualGUID(&class, &CLSID_DirectMusicChordMapTrack),
|
||||
"Expected class CLSID_DirectMusicChordMapTrack got %s\n", wine_dbgstr_guid(&class));
|
||||
|
||||
/* Unimplemented IPersistStream methods */
|
||||
hr = IPersistStream_IsDirty(ps);
|
||||
todo_wine ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr);
|
||||
ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr);
|
||||
hr = IPersistStream_GetSizeMax(ps, &size);
|
||||
ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr);
|
||||
hr = IPersistStream_Save(ps, NULL, TRUE);
|
||||
|
|
Loading…
Reference in a new issue