Michael Stefaniuc : dmime: Use the generic IPersistStream for DMSysExTrack.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 3 09:02:36 CDT 2015
Module: wine
Branch: master
Commit: 64e8b6c03a0d07bcf955162949aeae8e46de6f50
URL: http://source.winehq.org/git/wine.git/?a=commit;h=64e8b6c03a0d07bcf955162949aeae8e46de6f50
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Jul 3 10:10:10 2015 +0200
dmime: Use the generic IPersistStream for DMSysExTrack.
---
dlls/dmime/sysextrack.c | 67 ++++++++++++------------------------------------
dlls/dmime/tests/dmime.c | 2 +-
2 files changed, 18 insertions(+), 51 deletions(-)
diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c
index caaa7bf..431fca7 100644
--- a/dlls/dmime/sysextrack.c
+++ b/dlls/dmime/sysextrack.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 IDirectMusicSysExTrack {
IDirectMusicTrack8 IDirectMusicTrack8_iface;
- const IPersistStreamVtbl *PersistStreamVtbl;
+ struct dmobject dmobj; /* IPersistStream only */
LONG ref;
- DMUS_OBJECTDESC *pDesc;
} IDirectMusicSysExTrack;
/* IDirectMusicSysExTrack 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;
@@ -242,52 +242,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
IDirectMusicTrack8Impl_Join
};
-/* IDirectMusicSysExTrack IPersistStream part: */
-static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
- ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface);
- return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj);
-}
-
-static ULONG WINAPI IDirectMusicSysExTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
- ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface);
- return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface);
-}
-
-static ULONG WINAPI IDirectMusicSysExTrack_IPersistStream_Release (LPPERSISTSTREAM iface) {
- ICOM_THIS_MULTI(IDirectMusicSysExTrack, PersistStreamVtbl, iface);
- return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface);
-}
-
-static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicSysExTrack_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 IDirectMusicSysExTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) {
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) {
- return E_NOTIMPL;
-}
-
-static const IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl = {
- IDirectMusicSysExTrack_IPersistStream_QueryInterface,
- IDirectMusicSysExTrack_IPersistStream_AddRef,
- IDirectMusicSysExTrack_IPersistStream_Release,
- IDirectMusicSysExTrack_IPersistStream_GetClassID,
- IDirectMusicSysExTrack_IPersistStream_IsDirty,
- IDirectMusicSysExTrack_IPersistStream_Load,
- IDirectMusicSysExTrack_IPersistStream_Save,
- IDirectMusicSysExTrack_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 */
@@ -302,12 +271,10 @@ HRESULT WINAPI create_dmsysextrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY;
}
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
- track->PersistStreamVtbl = &DirectMusicSysExTrack_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_DirectMusicSysExTrack;
track->ref = 1;
+ dmobject_init(&track->dmobj, &CLSID_DirectMusicSysExTrack,
+ (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 35b7d04..0c6f49c 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -499,7 +499,7 @@ static void test_track(void)
{ X(DirectMusicParamControlTrack), TRUE },
{ X(DirectMusicSegmentTriggerTrack), FALSE },
{ X(DirectMusicSeqTrack), FALSE },
- { X(DirectMusicSysExTrack), TRUE },
+ { X(DirectMusicSysExTrack), FALSE },
{ X(DirectMusicTempoTrack), FALSE },
{ X(DirectMusicTimeSigTrack), FALSE },
{ X(DirectMusicWaveTrack), TRUE }
More information about the wine-cvs
mailing list