Michael Stefaniuc : dmloader: Remove superfluous "IDirectMusicContainer" from method names.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 149859b00290f229242ac28c61b245283b9c3f85
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=149859b00290f229242ac28c61...

Author: Michael Stefaniuc 
Date:   Tue Apr 28 00:14:10 2015 +0200

dmloader: Remove superfluous "IDirectMusicContainer" from method names.

---

dlls/dmloader/container.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c
index 2e15a71..ab43c6b 100644
--- a/dlls/dmloader/container.c
+++ b/dlls/dmloader/container.c
@@ -184,7 +184,9 @@ static inline IDirectMusicContainerImpl *impl_from_IDirectMusicObject(IDirectMus
     return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IDirectMusicObject_iface);
 }

-static HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor (LPDIRECTMUSICOBJECT iface, LPSTREAM pStream, LPDMUS_OBJECTDESC pDesc) {
+static HRESULT WINAPI IDirectMusicObjectImpl_ParseDescriptor(IDirectMusicObject *iface,
+        IStream *pStream, DMUS_OBJECTDESC *pDesc)
+{
         IDirectMusicContainerImpl *This = impl_from_IDirectMusicObject(iface);
    WINE_CHUNK Chunk;
    DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
@@ -359,7 +361,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = {
     dmobj_IDirectMusicObject_Release,
     dmobj_IDirectMusicObject_GetDescriptor,
     dmobj_IDirectMusicObject_SetDescriptor,
-	IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor
+    IDirectMusicObjectImpl_ParseDescriptor
 };

/* IPersistStream part: */
@@ -368,7 +370,8 @@ static inline IDirectMusicContainerImpl *impl_from_IPersistStream(IPersistStream
     return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IPersistStream_iface);
 }

-static HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) {
+static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm)
+{
         IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface);
    WINE_CHUNK Chunk;
    DWORD StreamSize, StreamCount, ListSize[3], ListCount[3];
@@ -792,7 +795,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
     dmobj_IPersistStream_Release,
     dmobj_IPersistStream_GetClassID,
     unimpl_IPersistStream_IsDirty,
-	IDirectMusicContainerImpl_IPersistStream_Load,
+    IPersistStreamImpl_Load,
     unimpl_IPersistStream_Save,
     unimpl_IPersistStream_GetSizeMax
 };