dmloader: Remove superfluous "IDirectMusicContainer" from method names.

This commit is contained in:
Michael Stefaniuc 2015-04-28 00:14:10 +02:00 committed by Alexandre Julliard
parent 8c6c7f6b49
commit 149859b002
1 changed files with 7 additions and 4 deletions

View File

@ -184,7 +184,9 @@ static inline IDirectMusicContainerImpl *impl_from_IDirectMusicObject(IDirectMus
return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IDirectMusicObject_iface); 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); IDirectMusicContainerImpl *This = impl_from_IDirectMusicObject(iface);
WINE_CHUNK Chunk; WINE_CHUNK Chunk;
DWORD StreamSize, StreamCount, ListSize[1], ListCount[1]; DWORD StreamSize, StreamCount, ListSize[1], ListCount[1];
@ -359,7 +361,7 @@ static const IDirectMusicObjectVtbl dmobject_vtbl = {
dmobj_IDirectMusicObject_Release, dmobj_IDirectMusicObject_Release,
dmobj_IDirectMusicObject_GetDescriptor, dmobj_IDirectMusicObject_GetDescriptor,
dmobj_IDirectMusicObject_SetDescriptor, dmobj_IDirectMusicObject_SetDescriptor,
IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor IDirectMusicObjectImpl_ParseDescriptor
}; };
/* IPersistStream part: */ /* IPersistStream part: */
@ -368,7 +370,8 @@ static inline IDirectMusicContainerImpl *impl_from_IPersistStream(IPersistStream
return CONTAINING_RECORD(iface, IDirectMusicContainerImpl, dmobj.IPersistStream_iface); 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); IDirectMusicContainerImpl *This = impl_from_IPersistStream(iface);
WINE_CHUNK Chunk; WINE_CHUNK Chunk;
DWORD StreamSize, StreamCount, ListSize[3], ListCount[3]; DWORD StreamSize, StreamCount, ListSize[3], ListCount[3];
@ -792,7 +795,7 @@ static const IPersistStreamVtbl persiststream_vtbl = {
dmobj_IPersistStream_Release, dmobj_IPersistStream_Release,
dmobj_IPersistStream_GetClassID, dmobj_IPersistStream_GetClassID,
unimpl_IPersistStream_IsDirty, unimpl_IPersistStream_IsDirty,
IDirectMusicContainerImpl_IPersistStream_Load, IPersistStreamImpl_Load,
unimpl_IPersistStream_Save, unimpl_IPersistStream_Save,
unimpl_IPersistStream_GetSizeMax unimpl_IPersistStream_GetSizeMax
}; };