marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dmstyle: Use the generic IPersistStream for DMCommandTrack.

oldstable
Michael Stefaniuc 2015-07-01 09:16:52 +02:00 committed by Alexandre Julliard
parent 28b606b0f3
commit 819d25a717
2 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
dlls/dmstyle/commandtrack.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);
WINE_DECLARE_DEBUG_CHANNEL(dmfile); WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@ -27,9 +28,8 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
*/ */
typedef struct IDirectMusicCommandTrack { typedef struct IDirectMusicCommandTrack {
IDirectMusicTrack8 IDirectMusicTrack8_iface; IDirectMusicTrack8 IDirectMusicTrack8_iface;
const IPersistStreamVtbl *PersistStreamVtbl; struct dmobject dmobj; /* IPersistStream only */
LONG ref; LONG ref;
DMUS_OBJECTDESC *pDesc;
struct list Commands; struct list Commands;
} IDirectMusicCommandTrack; } IDirectMusicCommandTrack;
@ -52,7 +52,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;
@ -249,32 +249,14 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
IDirectMusicTrack8Impl_Join IDirectMusicTrack8Impl_Join
}; };
/* IDirectMusicCommandTrack IPersistStream part: */ static inline IDirectMusicCommandTrack *impl_from_IPersistStream(IPersistStream *iface)
static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { {
ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); return CONTAINING_RECORD(iface, IDirectMusicCommandTrack, dmobj.IPersistStream_iface);
return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj);
} }
static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface); {
return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); IDirectMusicCommandTrack *This = impl_from_IPersistStream(iface);
}
static ULONG WINAPI IDirectMusicCommandTrack_IPersistStream_Release (LPPERSISTSTREAM iface) {
ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface);
return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface);
}
static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
ICOM_THIS_MULTI(IDirectMusicCommandTrack, PersistStreamVtbl, iface);
FOURCC chunkID; FOURCC chunkID;
DWORD chunkSize, dwSizeOfStruct, nrCommands; DWORD chunkSize, dwSizeOfStruct, nrCommands;
LARGE_INTEGER liMove; /* used when skipping chunks */ LARGE_INTEGER liMove; /* used when skipping chunks */
@ -299,7 +281,7 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR
list_add_tail (&This->Commands, &pNewCommand->entry); list_add_tail (&This->Commands, &pNewCommand->entry);
} }
TRACE_(dmfile)(": reading finished\n"); TRACE_(dmfile)(": reading finished\n");
This->pDesc->dwValidData |= DMUS_OBJ_LOADED; This->dmobj.desc.dwValidData |= DMUS_OBJ_LOADED;
break; break;
} }
default: { default: {
@ -334,23 +316,21 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Load (LPPERSISTSTR
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { static HRESULT WINAPI IPersistStreamImpl_Save(IPersistStream *iface, IStream *stream,
BOOL cleardirty)
{
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { static const IPersistStreamVtbl persiststream_vtbl = {
return E_NOTIMPL; dmobj_IPersistStream_QueryInterface,
} dmobj_IPersistStream_AddRef,
dmobj_IPersistStream_Release,
static const IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = { dmobj_IPersistStream_GetClassID,
IDirectMusicCommandTrack_IPersistStream_QueryInterface, unimpl_IPersistStream_IsDirty,
IDirectMusicCommandTrack_IPersistStream_AddRef, IPersistStreamImpl_Load,
IDirectMusicCommandTrack_IPersistStream_Release, IPersistStreamImpl_Save,
IDirectMusicCommandTrack_IPersistStream_GetClassID, unimpl_IPersistStream_GetSizeMax
IDirectMusicCommandTrack_IPersistStream_IsDirty,
IDirectMusicCommandTrack_IPersistStream_Load,
IDirectMusicCommandTrack_IPersistStream_Save,
IDirectMusicCommandTrack_IPersistStream_GetSizeMax
}; };
/* for ClassFactory */ /* for ClassFactory */
@ -365,12 +345,10 @@ HRESULT WINAPI create_dmcommandtrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY; return E_OUTOFMEMORY;
} }
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
track->PersistStreamVtbl = &DirectMusicCommandTrack_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_DirectMusicCommandTrack;
track->ref = 1; track->ref = 1;
dmobject_init(&track->dmobj, &CLSID_DirectMusicCommandTrack,
(IUnknown *)&track->IDirectMusicTrack8_iface);
track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
list_init (&track->Commands); list_init (&track->Commands);
DMSTYLE_LockModule(); DMSTYLE_LockModule();

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

@ -252,14 +252,13 @@ static void test_track(void)
const char *name; const char *name;
BOOL has_save; BOOL has_save;
BOOL has_join; BOOL has_join;
BOOL todo;
} class[] = { } class[] = {
{ X(DirectMusicAuditionTrack), TRUE, FALSE, FALSE }, { X(DirectMusicAuditionTrack), TRUE, FALSE },
{ X(DirectMusicChordTrack), TRUE, TRUE, FALSE }, { X(DirectMusicChordTrack), TRUE, TRUE },
{ X(DirectMusicCommandTrack), TRUE, TRUE, TRUE }, { X(DirectMusicCommandTrack), TRUE, TRUE },
{ X(DirectMusicMotifTrack), FALSE, FALSE, FALSE }, { X(DirectMusicMotifTrack), FALSE, FALSE },
{ X(DirectMusicMuteTrack), TRUE, FALSE, FALSE }, { X(DirectMusicMuteTrack), TRUE, FALSE },
{ X(DirectMusicStyleTrack), FALSE, TRUE, FALSE }, { X(DirectMusicStyleTrack), FALSE, TRUE },
}; };
#undef X #undef X
unsigned int i; unsigned int i;
@ -329,21 +328,11 @@ static void test_track(void)
hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps);
ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
hr = IPersistStream_GetClassID(ps, &classid); hr = IPersistStream_GetClassID(ps, &classid);
if (class[i].todo) {
todo_wine {
ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr); ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr);
ok(IsEqualGUID(&classid, class[i].clsid), ok(IsEqualGUID(&classid, class[i].clsid),
"Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid)); "Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid));
hr = IPersistStream_IsDirty(ps); hr = IPersistStream_IsDirty(ps);
ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr); ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr);
}
} else {
ok(hr == S_OK, "IPersistStream_GetClassID failed: %08x\n", hr);
ok(IsEqualGUID(&classid, class[i].clsid),
"Expected class %s got %s\n", class[i].name, wine_dbgstr_guid(&classid));
hr = IPersistStream_IsDirty(ps);
ok(hr == S_FALSE, "IPersistStream_IsDirty failed: %08x\n", hr);
}
hr = IPersistStream_GetSizeMax(ps, &size); hr = IPersistStream_GetSizeMax(ps, &size);
ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr); ok(hr == E_NOTIMPL, "IPersistStream_GetSizeMax failed: %08x\n", hr);