dmscript: Use the generic DirectMusicObject implementation for DMScript.

dlls/dmscript/Makefile.in

@@ -2,6 +2,7 @@ MODULE    = dmscript.dll
 IMPORTS   = dxguid uuid ole32 advapi32
 
 C_SRCS = \
+	dmobject.c \
 	dmscript_main.c \
 	script.c \
 	scripttrack.c

dlls/dmscript/dmobject.c

+/*
+ * Base IDirectMusicObject Implementation
+ * Keep in sync with the master in dlls/dmusic/dmobject.c
+ *
+ * Copyright (C) 2003-2004 Rok Mandeljc
+ * Copyright (C) 2014 Michael Stefaniuc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#define COBJMACROS
+#include "objbase.h"
+#include "dmusici.h"
+#include "dmobject.h"
+#include "wine/debug.h"
+
+WINE_DEFAULT_DEBUG_CHANNEL(dmobj);
+
+/* Generic IDirectMusicObject methods */
+static inline struct dmobject *impl_from_IDirectMusicObject(IDirectMusicObject *iface)
+{
+    return CONTAINING_RECORD(iface, struct dmobject, IDirectMusicObject_iface);
+}
+
+HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
+        void **ret_iface)
+{
+    struct dmobject *This = impl_from_IDirectMusicObject(iface);
+    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
+}
+
+ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface)
+{
+    struct dmobject *This = impl_from_IDirectMusicObject(iface);
+    return IUnknown_AddRef(This->outer_unk);
+}
+
+ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface)
+{
+    struct dmobject *This = impl_from_IDirectMusicObject(iface);
+    return IUnknown_Release(This->outer_unk);
+}
+
+HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
+        DMUS_OBJECTDESC *desc)
+{
+    struct dmobject *This = impl_from_IDirectMusicObject(iface);
+
+    TRACE("(%p/%p)->(%p)\n", iface, This, desc);
+
+    if (!desc)
+        return E_POINTER;
+
+    memcpy(desc, &This->desc, This->desc.dwSize);
+
+    return S_OK;
+}
+
+HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
+        DMUS_OBJECTDESC *desc)
+{
+    struct dmobject *This = impl_from_IDirectMusicObject(iface);
+    HRESULT ret = S_OK;
+
+    TRACE("(%p, %p)\n", iface, desc);
+
+    if (!desc)
+        return E_POINTER;
+
+    /* Immutable property */
+    if (desc->dwValidData & DMUS_OBJ_CLASS)
+    {
+        desc->dwValidData &= ~DMUS_OBJ_CLASS;
+        ret = S_FALSE;
+    }
+    /* Set only valid fields */
+    if (desc->dwValidData & DMUS_OBJ_OBJECT)
+        This->desc.guidObject = desc->guidObject;
+    if (desc->dwValidData & DMUS_OBJ_NAME)
+        lstrcpynW(This->desc.wszName, desc->wszName, DMUS_MAX_NAME);
+    if (desc->dwValidData & DMUS_OBJ_CATEGORY)
+        lstrcpynW(This->desc.wszCategory, desc->wszCategory, DMUS_MAX_CATEGORY);
+    if (desc->dwValidData & DMUS_OBJ_FILENAME)
+        lstrcpynW(This->desc.wszFileName, desc->wszFileName, DMUS_MAX_FILENAME);
+    if (desc->dwValidData & DMUS_OBJ_VERSION)
+        This->desc.vVersion = desc->vVersion;
+    if (desc->dwValidData & DMUS_OBJ_DATE)
+        This->desc.ftDate = desc->ftDate;
+    if (desc->dwValidData & DMUS_OBJ_MEMORY) {
+        This->desc.llMemLength = desc->llMemLength;
+        memcpy(This->desc.pbMemData, desc->pbMemData, desc->llMemLength);
+    }
+    if (desc->dwValidData & DMUS_OBJ_STREAM)
+        IStream_Clone(desc->pStream, &This->desc.pStream);
+
+    This->desc.dwValidData |= desc->dwValidData;
+
+    return ret;
+}
+
+/* Generic IPersistStream methods */
+static inline struct dmobject *impl_from_IPersistStream(IPersistStream *iface)
+{
+    return CONTAINING_RECORD(iface, struct dmobject, IPersistStream_iface);
+}
+
+HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
+        void **ret_iface)
+{
+    struct dmobject *This = impl_from_IPersistStream(iface);
+    return IUnknown_QueryInterface(This->outer_unk, riid, ret_iface);
+}
+
+ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface)
+{
+    struct dmobject *This = impl_from_IPersistStream(iface);
+    return IUnknown_AddRef(This->outer_unk);
+}
+
+ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface)
+{
+    struct dmobject *This = impl_from_IPersistStream(iface);
+    return IUnknown_Release(This->outer_unk);
+}
+
+HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
+{
+    struct dmobject *This = impl_from_IPersistStream(iface);
+
+    TRACE("(%p, %p)\n", This, class);
+
+    if (!class)
+        return E_POINTER;
+
+    *class = This->desc.guidClass;
+
+    return S_OK;
+}
+
+/* IPersistStream methods not implemented in native */
+HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class)
+{
+    TRACE("(%p, %p): method not implemented\n", iface, class);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface)
+{
+    TRACE("(%p): method not implemented, always returning S_FALSE\n", iface);
+    return S_FALSE;
+}
+
+HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
+        BOOL clear_dirty)
+{
+    TRACE("(%p, %p, %d): method not implemented\n", iface, stream, clear_dirty);
+    return E_NOTIMPL;
+}
+
+HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface, ULARGE_INTEGER *size)
+{
+    TRACE("(%p, %p): method not implemented\n", iface, size);
+    return E_NOTIMPL;
+}
+
+
+void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk)
+{
+    dmobj->outer_unk = outer_unk;
+    dmobj->desc.dwSize = sizeof(dmobj->desc);
+    dmobj->desc.dwValidData = DMUS_OBJ_CLASS;
+    dmobj->desc.guidClass = *class;
+}

dlls/dmscript/dmobject.h

+/*
+ * Base IDirectMusicObject Implementation
+ * Keep in sync with the master in dlls/dmusic/dmobject.h
+ *
+ * Copyright (C) 2014 Michael Stefaniuc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+struct dmobject {
+    IDirectMusicObject IDirectMusicObject_iface;
+    IPersistStream IPersistStream_iface;
+    IUnknown *outer_unk;
+    DMUS_OBJECTDESC desc;
+};
+
+void dmobject_init(struct dmobject *dmobj, const GUID *class, IUnknown *outer_unk) DECLSPEC_HIDDEN;
+
+/* Generic IDirectMusicObject methods */
+HRESULT WINAPI dmobj_IDirectMusicObject_QueryInterface(IDirectMusicObject *iface, REFIID riid,
+        void **ret_iface) DECLSPEC_HIDDEN;
+ULONG WINAPI dmobj_IDirectMusicObject_AddRef(IDirectMusicObject *iface) DECLSPEC_HIDDEN;
+ULONG WINAPI dmobj_IDirectMusicObject_Release(IDirectMusicObject *iface) DECLSPEC_HIDDEN;
+HRESULT WINAPI dmobj_IDirectMusicObject_GetDescriptor(IDirectMusicObject *iface,
+        DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN;
+HRESULT WINAPI dmobj_IDirectMusicObject_SetDescriptor(IDirectMusicObject *iface,
+        DMUS_OBJECTDESC *desc) DECLSPEC_HIDDEN;
+
+/* Generic IPersistStream methods */
+HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID riid,
+        void **ret_iface) DECLSPEC_HIDDEN;
+ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN;
+ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) DECLSPEC_HIDDEN;
+HRESULT WINAPI dmobj_IPersistStream_GetClassID(IPersistStream *iface, CLSID *class) DECLSPEC_HIDDEN;
+
+/* IPersistStream methods not implemented in native */
+HRESULT WINAPI unimpl_IPersistStream_GetClassID(IPersistStream *iface,
+        CLSID *class) DECLSPEC_HIDDEN;
+HRESULT WINAPI unimpl_IPersistStream_IsDirty(IPersistStream *iface) DECLSPEC_HIDDEN;
+HRESULT WINAPI unimpl_IPersistStream_Save(IPersistStream *iface, IStream *stream,
+        BOOL clear_dirty) DECLSPEC_HIDDEN;
+HRESULT WINAPI unimpl_IPersistStream_GetSizeMax(IPersistStream *iface,
+        ULARGE_INTEGER *size) DECLSPEC_HIDDEN;

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 */

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);