Michael Stefaniuc : dmstyle: Do not use method implementations directly.
Alexandre Julliard
julliard at winehq.org
Wed Jan 29 14:53:32 CST 2014
Module: wine
Branch: master
Commit: e383cc393a586f7f788aa5ff8ccc4eb0ce5f08b2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e383cc393a586f7f788aa5ff8ccc4eb0ce5f08b2
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Tue Jan 28 23:13:07 2014 +0100
dmstyle: Do not use method implementations directly.
---
dlls/dmstyle/style.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c
index 077ed06..7e27934 100644
--- a/dlls/dmstyle/style.c
+++ b/dlls/dmstyle/style.c
@@ -23,11 +23,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(dmstyle);
WINE_DECLARE_DEBUG_CHANNEL(dmfile);
-static ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_AddRef (LPUNKNOWN iface);
-static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef (LPDIRECTMUSICSTYLE8 iface);
-static ULONG WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_AddRef (LPDIRECTMUSICOBJECT iface);
-static ULONG WINAPI IDirectMusicStyle8Impl_IPersistStream_AddRef (LPPERSISTSTREAM iface);
-
/*****************************************************************************
* IDirectMusicStyleImpl implementation
*/
@@ -38,23 +33,20 @@ static HRESULT WINAPI IDirectMusicStyle8Impl_IUnknown_QueryInterface (LPUNKNOWN
if (IsEqualIID (riid, &IID_IUnknown)) {
*ppobj = &This->UnknownVtbl;
- IDirectMusicStyle8Impl_IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl);
+ IUnknown_AddRef((LPUNKNOWN)&This->UnknownVtbl);
return S_OK;
- } else if (IsEqualIID (riid, &IID_IDirectMusicStyle)) {
- *ppobj = &This->StyleVtbl;
- IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl);
- return S_OK;
- } else if (IsEqualIID (riid, &IID_IDirectMusicStyle8)) {
+ } else if (IsEqualIID(riid, &IID_IDirectMusicStyle) ||
+ IsEqualIID(riid, &IID_IDirectMusicStyle8)) {
*ppobj = &This->StyleVtbl;
- IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef ((LPDIRECTMUSICSTYLE8)&This->StyleVtbl);
+ IDirectMusicStyle8_AddRef((LPDIRECTMUSICSTYLE8)&This->StyleVtbl);
return S_OK;
} else if (IsEqualIID (riid, &IID_IDirectMusicObject)) {
*ppobj = &This->ObjectVtbl;
- IDirectMusicStyle8Impl_IDirectMusicObject_AddRef ((LPDIRECTMUSICOBJECT)&This->ObjectVtbl);
+ IDirectMusicObject_AddRef((LPDIRECTMUSICOBJECT)&This->ObjectVtbl);
return S_OK;
} else if (IsEqualIID (riid, &IID_IPersistStream)) {
*ppobj = &This->PersistStreamVtbl;
- IDirectMusicStyle8Impl_IPersistStream_AddRef ((LPPERSISTSTREAM)&This->PersistStreamVtbl);
+ IPersistStream_AddRef((LPPERSISTSTREAM)&This->PersistStreamVtbl);
return S_OK;
}
More information about the wine-cvs
mailing list