Module: wine Branch: master Commit: 3f353e00255110df44890b943015aa120906e4a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f353e00255110df44890b9430...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Aug 27 12:28:04 2012 +0200
dsound: Use proper helpers for iface calls.
---
dlls/dsound/dsound_main.c | 4 ++-- dlls/dsound/propset.c | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 9c550eb..3fded64 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -655,7 +655,7 @@ static inline IClassFactoryImpl *impl_from_IClassFactory(IClassFactory *iface) }
static HRESULT WINAPI -DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) +DSCF_QueryInterface(IClassFactory *iface, REFIID riid, LPVOID *ppobj) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); TRACE("(%p, %s, %p)\n", This, debugstr_guid(riid), ppobj); @@ -665,7 +665,7 @@ DSCF_QueryInterface(LPCLASSFACTORY iface, REFIID riid, LPVOID *ppobj) IsEqualIID(riid, &IID_IClassFactory)) { *ppobj = iface; - IUnknown_AddRef(iface); + IClassFactory_AddRef(iface); return S_OK; } *ppobj = NULL; diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index eb4c195..d14a388 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -68,9 +68,7 @@ static IKsPrivatePropertySetImpl *impl_from_IKsPropertySet(IKsPropertySet *iface
/* IUnknown methods */ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface( - LPKSPROPERTYSET iface, - REFIID riid, - LPVOID *ppobj ) + IKsPropertySet *iface, REFIID riid, void **ppobj) { IKsPrivatePropertySetImpl *This = impl_from_IKsPropertySet(iface); TRACE("(%p,%s,%p)\n",This,debugstr_guid(riid),ppobj); @@ -78,7 +76,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QueryInterface( if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IKsPropertySet)) { *ppobj = iface; - IUnknown_AddRef(iface); + IKsPropertySet_AddRef(iface); return S_OK; } *ppobj = NULL;