From 4e81a977c7601ae5542bb0084a72b44a891bff57 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Thu, 12 Jun 2014 11:12:28 +0200
Subject: [PATCH] dmusic: Use generic "unimplemented" methods for
 IPersistStream.

---
 dlls/dmusic/collection.c | 28 ++++------------------------
 dlls/dmusic/dmobject.c   | 26 ++++++++++++++++++++++++++
 dlls/dmusic/dmobject.h   |  9 +++++++++
 3 files changed, 39 insertions(+), 24 deletions(-)

diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c
index 9c6f3571c2d..c7084dbec06 100644
--- a/dlls/dmusic/collection.c
+++ b/dlls/dmusic/collection.c
@@ -390,16 +390,6 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = {
 };
 
 /* IDirectMusicCollectionImpl IPersistStream part: */
-static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetClassID(LPPERSISTSTREAM iface, CLSID* pClassID)
-{
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_IsDirty(LPPERSISTSTREAM iface)
-{
-    return S_FALSE;
-}
-
 static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTSTREAM iface, IStream* stream)
 {
     IDirectMusicCollectionImpl *This = impl_from_IPersistStream(iface);
@@ -703,25 +693,15 @@ static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Load(LPPERSISTST
     return S_OK;
 }
 
-static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_Save(LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty)
-{
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetSizeMax(LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize)
-{
-    return E_NOTIMPL;
-}
-
 static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_QueryInterface,
     dmobj_IPersistStream_AddRef,
     dmobj_IPersistStream_Release,
-	IDirectMusicCollectionImpl_IPersistStream_GetClassID,
-	IDirectMusicCollectionImpl_IPersistStream_IsDirty,
+    unimpl_IPersistStream_GetClassID,
+    unimpl_IPersistStream_IsDirty,
 	IDirectMusicCollectionImpl_IPersistStream_Load,
-	IDirectMusicCollectionImpl_IPersistStream_Save,
-	IDirectMusicCollectionImpl_IPersistStream_GetSizeMax
+    unimpl_IPersistStream_Save,
+    unimpl_IPersistStream_GetSizeMax
 };
 
 
diff --git a/dlls/dmusic/dmobject.c b/dlls/dmusic/dmobject.c
index f6c83a0f172..4afd5b923a2 100644
--- a/dlls/dmusic/dmobject.c
+++ b/dlls/dmusic/dmobject.c
@@ -134,6 +134,32 @@ ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface)
     return IUnknown_Release(This->outer_unk);
 }
 
+/* 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)
 {
diff --git a/dlls/dmusic/dmobject.h b/dlls/dmusic/dmobject.h
index 1a09a0b8f83..35749395a7a 100644
--- a/dlls/dmusic/dmobject.h
+++ b/dlls/dmusic/dmobject.h
@@ -42,3 +42,12 @@ HRESULT WINAPI dmobj_IPersistStream_QueryInterface(IPersistStream *iface, REFIID
         void **ret_iface) DECLSPEC_HIDDEN;
 ULONG WINAPI dmobj_IPersistStream_AddRef(IPersistStream *iface) DECLSPEC_HIDDEN;
 ULONG WINAPI dmobj_IPersistStream_Release(IPersistStream *iface) 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;