Michael Stefaniuc : dmime: Use the generic IPersistStream for DMWaveTrack.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Jul 3 09:02:37 CDT 2015
Module: wine
Branch: master
Commit: 0789ddc322f4175af43a3bc84e3ec15958514a13
URL: http://source.winehq.org/git/wine.git/?a=commit;h=0789ddc322f4175af43a3bc84e3ec15958514a13
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Fri Jul 3 10:40:53 2015 +0200
dmime: Use the generic IPersistStream for DMWaveTrack.
---
dlls/dmime/tests/dmime.c | 39 ++++++++++------------------
dlls/dmime/wavetrack.c | 67 ++++++++++++------------------------------------
2 files changed, 31 insertions(+), 75 deletions(-)
diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c
index c370a9d..85dd8f0 100644
--- a/dlls/dmime/tests/dmime.c
+++ b/dlls/dmime/tests/dmime.c
@@ -492,17 +492,16 @@ static void test_track(void)
const struct {
REFCLSID clsid;
const char *name;
- BOOL todo;
} class[] = {
- { X(DirectMusicLyricsTrack), FALSE },
- { X(DirectMusicMarkerTrack), FALSE },
- { X(DirectMusicParamControlTrack), FALSE },
- { X(DirectMusicSegmentTriggerTrack), FALSE },
- { X(DirectMusicSeqTrack), FALSE },
- { X(DirectMusicSysExTrack), FALSE },
- { X(DirectMusicTempoTrack), FALSE },
- { X(DirectMusicTimeSigTrack), FALSE },
- { X(DirectMusicWaveTrack), TRUE }
+ { X(DirectMusicLyricsTrack) },
+ { X(DirectMusicMarkerTrack) },
+ { X(DirectMusicParamControlTrack) },
+ { X(DirectMusicSegmentTriggerTrack) },
+ { X(DirectMusicSeqTrack) },
+ { X(DirectMusicSysExTrack) },
+ { X(DirectMusicTempoTrack) },
+ { X(DirectMusicTimeSigTrack) },
+ { X(DirectMusicWaveTrack) }
};
#undef X
unsigned int i;
@@ -517,21 +516,11 @@ static void test_track(void)
hr = IDirectMusicTrack_QueryInterface(dmt, &IID_IPersistStream, (void**)&ps);
ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);
hr = IPersistStream_GetClassID(ps, &classid);
- if (class[i].todo) {
- todo_wine {
- 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);
- }
- } 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);
- }
+ 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);
/* Unimplemented IPersistStream methods */
hr = IPersistStream_GetSizeMax(ps, &size);
diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c
index 981f5fb..bc6e3ca 100644
--- a/dlls/dmime/wavetrack.c
+++ b/dlls/dmime/wavetrack.c
@@ -18,6 +18,7 @@
*/
#include "dmime_private.h"
+#include "dmobject.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmime);
@@ -29,9 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmime);
*/
typedef struct IDirectMusicWaveTrack {
IDirectMusicTrack8 IDirectMusicTrack8_iface;
- const IPersistStreamVtbl *PersistStreamVtbl;
+ struct dmobject dmobj; /* IPersistStream only */
LONG ref;
- DMUS_OBJECTDESC *pDesc;
} IDirectMusicWaveTrack;
/* IDirectMusicWaveTrack IDirectMusicTrack8 part: */
@@ -53,7 +53,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;
@@ -249,52 +249,21 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
IDirectMusicTrack8Impl_Join
};
-/* IDirectMusicWaveTrack IPersistStream part: */
-static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface);
- return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj);
-}
-
-static ULONG WINAPI IDirectMusicWaveTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface);
- return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface);
-}
-
-static ULONG WINAPI IDirectMusicWaveTrack_IPersistStream_Release (LPPERSISTSTREAM iface) {
- ICOM_THIS_MULTI(IDirectMusicWaveTrack, PersistStreamVtbl, iface);
- return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface);
-}
-
-static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicWaveTrack_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 IDirectMusicWaveTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) {
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) {
- return E_NOTIMPL;
-}
-
-static const IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl = {
- IDirectMusicWaveTrack_IPersistStream_QueryInterface,
- IDirectMusicWaveTrack_IPersistStream_AddRef,
- IDirectMusicWaveTrack_IPersistStream_Release,
- IDirectMusicWaveTrack_IPersistStream_GetClassID,
- IDirectMusicWaveTrack_IPersistStream_IsDirty,
- IDirectMusicWaveTrack_IPersistStream_Load,
- IDirectMusicWaveTrack_IPersistStream_Save,
- IDirectMusicWaveTrack_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 */
@@ -309,12 +278,10 @@ HRESULT WINAPI create_dmwavetrack(REFIID lpcGUID, void **ppobj)
return E_OUTOFMEMORY;
}
track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl;
- track->PersistStreamVtbl = &DirectMusicWaveTrack_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_DirectMusicWaveTrack;
track->ref = 1;
+ dmobject_init(&track->dmobj, &CLSID_DirectMusicWaveTrack,
+ (IUnknown *)&track->IDirectMusicTrack8_iface);
+ track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
DMIME_LockModule();
hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj);
More information about the wine-cvs
mailing list