Module: wine Branch: master Commit: f7dc10d2ce36ad84d8ce7f0fc3bb9d77d7d88a36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7dc10d2ce36ad84d8ce7f0fc3...
Author: Michael Stefaniuc mstefani@redhat.de Date: Sun Jan 12 21:59:30 2014 +0100
dmscript: Don't use the method implementations directly.
---
dlls/dmscript/script.c | 13 ++++--------- dlls/dmscript/scripttrack.c | 9 +++------ 2 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 090e0ce..80959cf 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -31,11 +31,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); WINE_DECLARE_DEBUG_CHANNEL(dmfile);
-static ULONG WINAPI IDirectMusicScriptImpl_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicScript_AddRef (LPDIRECTMUSICSCRIPT iface); -static ULONG WINAPI IDirectMusicScriptImpl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface); -static ULONG WINAPI IDirectMusicScriptImpl_IPersistStream_AddRef (LPPERSISTSTREAM iface); - /***************************************************************************** * IDirectMusicScriptImpl implementation */ @@ -46,19 +41,19 @@ static HRESULT WINAPI IDirectMusicScriptImpl_IUnknown_QueryInterface (LPUNKNOWN
if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicScriptImpl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicScript)) { *ppobj = &This->ScriptVtbl; - IDirectMusicScriptImpl_IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); + IDirectMusicScript_AddRef ((LPDIRECTMUSICSCRIPT)&This->ScriptVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicObject)) { *ppobj = &This->ObjectVtbl; - IDirectMusicScriptImpl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); + IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicScriptImpl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }
diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 7ff8ef8..d17b7e1 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -24,9 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); /***************************************************************************** * IDirectMusicScriptTrack implementation */ -static ULONG WINAPI IDirectMusicScriptTrack_IUnknown_AddRef (LPUNKNOWN iface); -static ULONG WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_AddRef (LPDIRECTMUSICTRACK8 iface); -static ULONG WINAPI IDirectMusicScriptTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface);
/* IDirectMusicScriptTrack IUnknown part: */ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { @@ -35,16 +32,16 @@ static HRESULT WINAPI IDirectMusicScriptTrack_IUnknown_QueryInterface (LPUNKNOWN TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); if (IsEqualIID (riid, &IID_IUnknown)) { *ppobj = &This->UnknownVtbl; - IDirectMusicScriptTrack_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { *ppobj = (LPDIRECTMUSICTRACK8)&This->TrackVtbl; - IDirectMusicScriptTrack_IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); + IDirectMusicTrack_AddRef ((LPDIRECTMUSICTRACK8)&This->TrackVtbl); return S_OK; } else if (IsEqualIID (riid, &IID_IPersistStream)) { *ppobj = &This->PersistStreamVtbl; - IDirectMusicScriptTrack_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); + IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl); return S_OK; }