Zebediah Figura : quartz/dsoundrender: Use calloc() in dsound_render_create().

Alexandre Julliard julliard at winehq.org
Wed Apr 1 15:50:58 CDT 2020


Module: wine
Branch: master
Commit: e1bdc1e7a001a8efb203186e7dd7d1d62a3e302e
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e1bdc1e7a001a8efb203186e7dd7d1d62a3e302e

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue Mar 31 23:48:18 2020 -0500

quartz/dsoundrender: Use calloc() in dsound_render_create().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/quartz/dsoundrender.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index e4a39239e5..00b2a5a2be 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -502,7 +502,7 @@ static void dsound_render_destroy(struct strmbase_renderer *iface)
     filter->dsound = NULL;
 
     strmbase_renderer_cleanup(&filter->renderer);
-    CoTaskMemFree(filter);
+    free(filter);
 
     InterlockedDecrement(&object_locks);
 }
@@ -821,9 +821,8 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out)
     DSoundRenderImpl *object;
     HRESULT hr;
 
-    if (!(object = CoTaskMemAlloc(sizeof(*object))))
+    if (!(object = calloc(1, sizeof(*object))))
         return E_OUTOFMEMORY;
-    memset(object, 0, sizeof(*object));
 
     strmbase_renderer_init(&object->renderer, outer,
             &CLSID_DSoundRender, L"Audio Input pin (rendered)", &renderer_ops);
@@ -831,7 +830,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out)
     if (FAILED(hr = system_clock_create(&object->renderer.filter.IUnknown_inner, &object->system_clock)))
     {
         strmbase_renderer_cleanup(&object->renderer);
-        CoTaskMemFree(object);
+        free(object);
         return hr;
     }
 
@@ -842,7 +841,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out)
     {
         IUnknown_Release(object->system_clock);
         strmbase_renderer_cleanup(&object->renderer);
-        CoTaskMemFree(object);
+        free(object);
         return hr;
     }
 
@@ -852,7 +851,7 @@ HRESULT dsound_render_create(IUnknown *outer, IUnknown **out)
         IDirectSound8_Release(object->dsound);
         IUnknown_Release(object->system_clock);
         strmbase_renderer_cleanup(&object->renderer);
-        CoTaskMemFree(object);
+        free(object);
         return hr;
     }
 




More information about the wine-cvs mailing list