From 4829fcd9b2f7ced07daeba758929bef96c36edcc Mon Sep 17 00:00:00 2001 From: Christian Costa Date: Fri, 30 Mar 2012 01:08:48 +0200 Subject: [PATCH] dmusic: Don't use method implementation directly. Pass through vtable with related macro instead. --- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_private.h | 2 -- dlls/dmusic/port.c | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 80c5d4b70d7..a36682ce574 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -193,7 +193,7 @@ static HRESULT WINAPI IDirectMusic8Impl_Activate (LPDIRECTMUSIC8 iface, BOOL fEn FIXME("(%p, %d): stub\n", This, fEnable); for (i = 0; i < This->nrofports; i++) { - IDirectMusicPortImpl_Activate(This->ppPorts[i], fEnable); + IDirectMusicPort_Activate(This->ppPorts[i], fEnable); } return S_OK; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 1aa05364ce7..c05adf052b4 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -151,8 +151,6 @@ struct IDirectMusicPortImpl { DMUSIC_PRIVATE_CHANNEL_GROUP group[1]; }; -extern HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) DECLSPEC_HIDDEN; - /** Internal factory */ extern HRESULT WINAPI DMUSIC_CreateDirectMusicPortImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter, LPDMUS_PORTPARAMS pPortParams, LPDMUS_PORTCAPS pPortCaps) DECLSPEC_HIDDEN; diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 6cb56348eda..d0bbd9a5f57 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -157,7 +157,8 @@ static HRESULT WINAPI IDirectMusicPortImpl_GetNumChannelGroups (LPDIRECTMUSICPOR return S_OK; } -HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) { +static HRESULT WINAPI IDirectMusicPortImpl_Activate (LPDIRECTMUSICPORT iface, BOOL fActive) +{ IDirectMusicPortImpl *This = (IDirectMusicPortImpl *)iface; TRACE("(%p, %d)\n", This, fActive); This->fActive = fActive;