[PATCH 05/10] dmscript: Use the generic DirectMusicObject implementation for DMScript.
Michael Stefaniuc
mstefani at redhat.de
Thu Jun 12 04:26:31 CDT 2014
---
dlls/dmscript/Makefile.in | 2 +
dlls/dmscript/dmscript_private.h | 9 ---
dlls/dmscript/script.c | 154 ++++++++++-----------------------------
3 files changed, 39 insertions(+), 126 deletions(-)
diff --git a/dlls/dmscript/Makefile.in b/dlls/dmscript/Makefile.in
index 5ae479e..9eac24c 100644
--- a/dlls/dmscript/Makefile.in
+++ b/dlls/dmscript/Makefile.in
@@ -1,7 +1,9 @@
MODULE = dmscript.dll
IMPORTS = dxguid uuid ole32 advapi32
+PARENTSRC = ../dmusic
C_SRCS = \
+ dmobject.c \
dmscript_main.c \
script.c \
scripttrack.c
diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h
index 551e7b7..00b469f 100644
--- a/dlls/dmscript/dmscript_private.h
+++ b/dlls/dmscript/dmscript_private.h
@@ -76,18 +76,9 @@ typedef struct {
const char* name;
} guid_info;
-/* used for initialising structs (primarily for DMUS_OBJECTDESC) */
-#define DM_STRUCT_INIT(x) \
- do { \
- memset((x), 0, sizeof(*(x))); \
- (x)->dwSize = sizeof(*x); \
- } while (0)
-
#define FE(x) { x, #x }
#define GE(x) { &x, #x }
-#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
-
/* FOURCC to string conversion for debug messages */
extern const char *debugstr_fourcc (DWORD fourcc) DECLSPEC_HIDDEN;
/* returns name of given GUID */
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c
index 50394bc..78273c6 100644
--- a/dlls/dmscript/script.c
+++ b/dlls/dmscript/script.c
@@ -26,6 +26,7 @@
#endif
#include "dmscript_private.h"
+#include "dmobject.h"
WINE_DEFAULT_DEBUG_CHANNEL(dmscript);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
@@ -36,8 +37,7 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile);
*/
typedef struct IDirectMusicScriptImpl {
IDirectMusicScript IDirectMusicScript_iface;
- const IDirectMusicObjectVtbl *ObjectVtbl;
- const IPersistStreamVtbl *PersistStreamVtbl;
+ struct dmobject dmobj;
LONG ref;
IDirectMusicPerformance *pPerformance;
DMUS_OBJECTDESC *pDesc;
@@ -64,9 +64,9 @@ static HRESULT WINAPI IDirectMusicScriptImpl_QueryInterface(IDirectMusicScript *
if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicScript))
*ret_iface = iface;
else if (IsEqualIID(riid, &IID_IDirectMusicObject))
- *ret_iface = &This->ObjectVtbl;
+ *ret_iface = &This->dmobj.IDirectMusicObject_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;
@@ -206,65 +206,15 @@ static const IDirectMusicScriptVtbl dmscript_vtbl = {
};
/* IDirectMusicScriptImpl IDirectMusicObject part: */
-static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface (LPDIRECTMUSICOBJECT iface, REFIID riid, LPVOID *ppobj) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface);
- return IDirectMusicScript_QueryInterface(&This->IDirectMusicScript_iface, riid, ppobj);
-}
-
-static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface);
- return IDirectMusicScript_AddRef (&This->IDirectMusicScript_iface);
-}
-
-static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_Release (LPDIRECTMUSICOBJECT iface) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface);
- return IDirectMusicScript_Release (&This->IDirectMusicScript_iface);
-}
-
-static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface);
- TRACE("(%p, %p)\n", This, pDesc);
- /* I think we shouldn't return pointer here since then values can be changed; it'd be a mess */
- memcpy (pDesc, This->pDesc, This->pDesc->dwSize);
- return S_OK;
-}
-
-static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor (LPDIRECTMUSICOBJECT iface, LPDMUS_OBJECTDESC pDesc) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface);
- TRACE("(%p, %p): setting descriptor:\n%s\n", This, pDesc, debugstr_DMUS_OBJECTDESC (pDesc));
-
- /* According to MSDN, we should copy only given values, not whole struct */
- if (pDesc->dwValidData & DMUS_OBJ_OBJECT)
- This->pDesc->guidObject = pDesc->guidObject;
- if (pDesc->dwValidData & DMUS_OBJ_CLASS)
- This->pDesc->guidClass = pDesc->guidClass;
- if (pDesc->dwValidData & DMUS_OBJ_NAME)
- lstrcpynW (This->pDesc->wszName, pDesc->wszName, DMUS_MAX_NAME);
- if (pDesc->dwValidData & DMUS_OBJ_CATEGORY)
- lstrcpynW (This->pDesc->wszCategory, pDesc->wszCategory, DMUS_MAX_CATEGORY);
- if (pDesc->dwValidData & DMUS_OBJ_FILENAME)
- lstrcpynW (This->pDesc->wszFileName, pDesc->wszFileName, DMUS_MAX_FILENAME);
- if (pDesc->dwValidData & DMUS_OBJ_VERSION)
- This->pDesc->vVersion = pDesc->vVersion;
- if (pDesc->dwValidData & DMUS_OBJ_DATE)
- This->pDesc->ftDate = pDesc->ftDate;
- if (pDesc->dwValidData & DMUS_OBJ_MEMORY) {
- This->pDesc->llMemLength = pDesc->llMemLength;
- memcpy (This->pDesc->pbMemData, pDesc->pbMemData, pDesc->llMemLength);
- }
- if (pDesc->dwValidData & DMUS_OBJ_STREAM) {
- /* according to MSDN, we copy the stream */
- IStream_Clone (pDesc->pStream, &This->pDesc->pStream);
- }
-
- /* add new flags */
- This->pDesc->dwValidData |= pDesc->dwValidData;
-
- return S_OK;
+static inline IDirectMusicScriptImpl *impl_from_IDirectMusicObject(IDirectMusicObject *iface)
+{
+ return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, dmobj.IDirectMusicObject_iface);
}
-static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, ObjectVtbl, iface);
+static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface,
+ IStream *pStream, DMUS_OBJECTDESC *pDesc)
+{
+ IDirectMusicScriptImpl *This = impl_from_IDirectMusicObject(iface);
DMUS_PRIVATE_CHUNK Chunk;
DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
LARGE_INTEGER liMove; /* used when skipping chunks */
@@ -411,44 +361,24 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor
return S_OK;
}
-static const IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl = {
- IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface,
- IDirectMusicScriptImpl_IDirectMusicObject_AddRef,
- IDirectMusicScriptImpl_IDirectMusicObject_Release,
- IDirectMusicScriptImpl_IDirectMusicObject_GetDescriptor,
- IDirectMusicScriptImpl_IDirectMusicObject_SetDescriptor,
- IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor
+static const IDirectMusicObjectVtbl dmobject_vtbl = {
+ dmobj_IDirectMusicObject_QueryInterface,
+ dmobj_IDirectMusicObject_AddRef,
+ dmobj_IDirectMusicObject_Release,
+ dmobj_IDirectMusicObject_GetDescriptor,
+ dmobj_IDirectMusicObject_SetDescriptor,
+ IDirectMusicObjectImpl_ParseDescriptor
};
/* IDirectMusicScriptImpl IPersistStream part: */
-static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
- return IDirectMusicScript_QueryInterface(&This->IDirectMusicScript_iface, riid, ppobj);
-}
-
-static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
- return IDirectMusicScript_AddRef(&This->IDirectMusicScript_iface);
-}
-
-static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_Release (LPPERSISTSTREAM iface) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
- return IDirectMusicScript_Release(&This->IDirectMusicScript_iface);
-}
-
-static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) {
- TRACE("(%p, %p) method not implemented\n", iface, pClassID);
-
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_IsDirty (LPPERSISTSTREAM iface) {
- return S_FALSE;
+static inline IDirectMusicScriptImpl *impl_from_IPersistStream(IPersistStream *iface)
+{
+ return CONTAINING_RECORD(iface, IDirectMusicScriptImpl, dmobj.IPersistStream_iface);
}
-static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
- ICOM_THIS_MULTI(IDirectMusicScriptImpl, PersistStreamVtbl, iface);
-
+static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
+{
+ IDirectMusicScriptImpl *This = impl_from_IPersistStream(iface);
DMUS_PRIVATE_CHUNK Chunk;
DWORD StreamSize, StreamCount, ListSize[3], ListCount[3];
LARGE_INTEGER liMove; /* used when skipping chunks */
@@ -674,23 +604,15 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREA
return S_OK;
}
-static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) {
- return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) {
- return E_NOTIMPL;
-}
-
-static const IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = {
- IDirectMusicScriptImpl_IPersistStream_QueryInterface,
- IDirectMusicScriptImpl_IPersistStream_AddRef,
- IDirectMusicScriptImpl_IPersistStream_Release,
- IDirectMusicScriptImpl_IPersistStream_GetClassID,
- IDirectMusicScriptImpl_IPersistStream_IsDirty,
- IDirectMusicScriptImpl_IPersistStream_Load,
- IDirectMusicScriptImpl_IPersistStream_Save,
- IDirectMusicScriptImpl_IPersistStream_GetSizeMax
+static const IPersistStreamVtbl persiststream_vtbl = {
+ dmobj_IPersistStream_QueryInterface,
+ dmobj_IPersistStream_AddRef,
+ dmobj_IPersistStream_Release,
+ unimpl_IPersistStream_GetClassID,
+ unimpl_IPersistStream_IsDirty,
+ IPersistStreamImpl_Load,
+ unimpl_IPersistStream_Save,
+ unimpl_IPersistStream_GetSizeMax
};
/* for ClassFactory */
@@ -709,13 +631,11 @@ HRESULT WINAPI DMUSIC_CreateDirectMusicScriptImpl(REFIID lpcGUID, void **ppobj,
return E_OUTOFMEMORY;
obj->IDirectMusicScript_iface.lpVtbl = &dmscript_vtbl;
- obj->ObjectVtbl = &DirectMusicScript_Object_Vtbl;
- obj->PersistStreamVtbl = &DirectMusicScript_PersistStream_Vtbl;
- obj->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC));
- DM_STRUCT_INIT(obj->pDesc);
- obj->pDesc->dwValidData |= DMUS_OBJ_CLASS;
- obj->pDesc->guidClass = CLSID_DirectMusicScript;
obj->ref = 1;
+ dmobject_init(&obj->dmobj, &CLSID_DirectMusicScript, (IUnknown*)&obj->IDirectMusicScript_iface);
+ obj->dmobj.IDirectMusicObject_iface.lpVtbl = &dmobject_vtbl;
+ obj->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl;
+ obj->pDesc = &obj->dmobj.desc;
DMSCRIPT_LockModule();
hr = IDirectMusicScript_QueryInterface(&obj->IDirectMusicScript_iface, lpcGUID, ppobj);
--
1.8.3.1
More information about the wine-patches
mailing list