Module: wine Branch: master Commit: 45babd780f586eb8d0a93205d0998d6ce3f8396d URL: https://source.winehq.org/git/wine.git/?a=commit;h=45babd780f586eb8d0a93205d...
Author: Andrew Eikum aeikum@codeweavers.com Date: Tue Feb 6 10:52:19 2018 -0600
xaudio2: Fix ClassFactory ref counting.
Signed-off-by: Andrew Eikum aeikum@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/xaudio2_7/xapofx.c | 27 ++++++++++++++++++++------- dlls/xaudio2_7/xaudio_dll.c | 38 ++++++++++++++++++++------------------ dlls/xaudio2_7/xaudio_private.h | 2 +- 3 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/dlls/xaudio2_7/xapofx.c b/dlls/xaudio2_7/xapofx.c index 44dfb47..c39b428 100644 --- a/dlls/xaudio2_7/xapofx.c +++ b/dlls/xaudio2_7/xapofx.c @@ -764,7 +764,8 @@ static HRESULT WINAPI xapocf_CreateInstance(IClassFactory *iface, IUnknown *pOut
static HRESULT WINAPI xapocf_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xapo_cf *This = xapo_impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; }
@@ -777,13 +778,17 @@ static const IClassFactoryVtbl xapo_Vtbl = xapocf_LockServer };
-IClassFactory *make_xapo_factory(REFCLSID clsid) +HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) { + HRESULT hr; struct xapo_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xapo_cf)); ret->IClassFactory_iface.lpVtbl = &xapo_Vtbl; ret->class = clsid; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; }
#if XAUDIO2_VER >= 8 @@ -792,7 +797,9 @@ HRESULT WINAPI CreateAudioVolumeMeter(IUnknown **out) IClassFactory *cf; HRESULT hr;
- cf = make_xapo_factory(&CLSID_AudioVolumeMeter27); + hr = make_xapo_factory(&CLSID_AudioVolumeMeter27, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr;
hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out);
@@ -806,7 +813,9 @@ HRESULT WINAPI CreateAudioReverb(IUnknown **out) IClassFactory *cf; HRESULT hr;
- cf = make_xapo_factory(&CLSID_FXReverb); + hr = make_xapo_factory(&CLSID_FXReverb, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr;
hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)out);
@@ -832,7 +841,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out, void *initdata, UINT32 in class = &CLSID_FXEQ;
if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr;
hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); @@ -890,7 +901,9 @@ HRESULT CDECL CreateFX(REFCLSID clsid, IUnknown **out) /* TODO FXECHO, FXMasteringLimiter, */
if(class){ - cf = make_xapo_factory(class); + hr = make_xapo_factory(class, &IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr;
hr = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index 9b7a07f..0682a5f 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2121,7 +2121,8 @@ static HRESULT WINAPI XAudio2CF_CreateInstance(IClassFactory *iface, IUnknown *p
static HRESULT WINAPI XAudio2CF_LockServer(IClassFactory *iface, BOOL dolock) { - FIXME("(static)->(%d): stub!\n", dolock); + struct xaudio2_cf *This = impl_from_IClassFactory(iface); + FIXME("(%p)->(%d): stub!\n", This, dolock); return S_OK; }
@@ -2134,18 +2135,20 @@ static const IClassFactoryVtbl XAudio2CF_Vtbl = XAudio2CF_LockServer };
-static IClassFactory *make_xaudio2_factory(void) +static HRESULT make_xaudio2_factory(REFIID riid, void **ppv) { + HRESULT hr; struct xaudio2_cf *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(struct xaudio2_cf)); ret->IClassFactory_iface.lpVtbl = &XAudio2CF_Vtbl; ret->ref = 0; - return &ret->IClassFactory_iface; + hr = IClassFactory_QueryInterface(&ret->IClassFactory_iface, riid, ppv); + if(FAILED(hr)) + HeapFree(GetProcessHeap(), 0, ret); + return hr; }
HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) { - IClassFactory *factory = NULL; - TRACE("(%s, %s, %p)\n", debugstr_guid(rclsid), debugstr_guid(riid), ppv);
if(IsEqualGUID(rclsid, &CLSID_XAudio20) || @@ -2155,33 +2158,30 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) IsEqualGUID(rclsid, &CLSID_XAudio24) || IsEqualGUID(rclsid, &CLSID_XAudio25) || IsEqualGUID(rclsid, &CLSID_XAudio26) || - IsEqualGUID(rclsid, &CLSID_XAudio27)){ - factory = make_xaudio2_factory(); + IsEqualGUID(rclsid, &CLSID_XAudio27)) + return make_xaudio2_factory(riid, ppv);
- }else if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || + if(IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter20) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter21) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter22) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter23) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter24) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter25) || IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter26) || - IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)){ - factory = make_xapo_factory(&CLSID_AudioVolumeMeter27); + IsEqualGUID(rclsid, &CLSID_AudioVolumeMeter27)) + return make_xapo_factory(&CLSID_AudioVolumeMeter27, riid, ppv);
- }else if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || + if(IsEqualGUID(rclsid, &CLSID_AudioReverb20) || IsEqualGUID(rclsid, &CLSID_AudioReverb21) || IsEqualGUID(rclsid, &CLSID_AudioReverb22) || IsEqualGUID(rclsid, &CLSID_AudioReverb23) || IsEqualGUID(rclsid, &CLSID_AudioReverb24) || IsEqualGUID(rclsid, &CLSID_AudioReverb25) || IsEqualGUID(rclsid, &CLSID_AudioReverb26) || - IsEqualGUID(rclsid, &CLSID_AudioReverb27)){ - factory = make_xapo_factory(&CLSID_FXReverb); - } - - if(!factory) return CLASS_E_CLASSNOTAVAILABLE; + IsEqualGUID(rclsid, &CLSID_AudioReverb27)) + return make_xapo_factory(&CLSID_FXReverb, riid, ppv);
- return IClassFactory_QueryInterface(factory, riid, ppv); + return CLASS_E_CLASSNOTAVAILABLE; }
HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) @@ -2200,7 +2200,9 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p
TRACE("%p 0x%x 0x%x\n", ppxa2, flags, proc);
- cf = make_xaudio2_factory(); + hr = make_xaudio2_factory(&IID_IClassFactory, (void**)&cf); + if(FAILED(hr)) + return hr;
hr = IClassFactory_CreateInstance(cf, NULL, &IID_IXAudio2, (void**)&xa2); IClassFactory_Release(cf); diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index 1a4aa08..5d3814f 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -181,5 +181,5 @@ extern const IXAudio22Vtbl XAudio22_Vtbl DECLSPEC_HIDDEN; extern const IXAudio27Vtbl XAudio27_Vtbl DECLSPEC_HIDDEN; #endif
-extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN; +extern HRESULT make_xapo_factory(REFCLSID clsid, REFIID riid, void **ppv) DECLSPEC_HIDDEN; extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN;