Zebediah Figura : quartz/videorenderer: Use calloc() in video_renderer_create().

[Alexandre Julliard]

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

Author: Zebediah Figura <z.figura12(a)gmail.com>
Date:   Wed Apr  1 23:01:01 2020 -0500

quartz/videorenderer: Use calloc() in video_renderer_create().

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

---

 dlls/quartz/videorenderer.c | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 9301e8d769..8fb3a9e422 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -247,7 +247,7 @@ static void video_renderer_destroy(struct strmbase_renderer *iface)
     BaseControlVideo_Destroy(&filter->baseControlVideo);
     CloseHandle(filter->run_event);
     strmbase_renderer_cleanup(&filter->renderer);
-    CoTaskMemFree(filter);
+    free(filter);
 
     InterlockedDecrement(&object_locks);
 }
@@ -701,46 +701,38 @@ static const IOverlayVtbl overlay_vtbl =
 
 HRESULT video_renderer_create(IUnknown *outer, IUnknown **out)
 {
+    VideoRendererImpl *object;
     HRESULT hr;
-    VideoRendererImpl * pVideoRenderer;
 
-    *out = NULL;
-
-    pVideoRenderer = CoTaskMemAlloc(sizeof(VideoRendererImpl));
-
-    pVideoRenderer->init = FALSE;
-    ZeroMemory(&pVideoRenderer->SourceRect, sizeof(RECT));
-    ZeroMemory(&pVideoRenderer->DestRect, sizeof(RECT));
-    ZeroMemory(&pVideoRenderer->WindowPos, sizeof(RECT));
-    pVideoRenderer->FullScreenMode = OAFALSE;
-
-    pVideoRenderer->IOverlay_iface.lpVtbl = &overlay_vtbl;
+    if (!(object = calloc(1, sizeof(*object))))
+        return E_OUTOFMEMORY;
 
-    strmbase_renderer_init(&pVideoRenderer->renderer, outer,
-            &CLSID_VideoRenderer, L"In", &renderer_ops);
+    strmbase_renderer_init(&object->renderer, outer, &CLSID_VideoRenderer, L"In", &renderer_ops);
+    object->IOverlay_iface.lpVtbl = &overlay_vtbl;
 
-    hr = video_window_init(&pVideoRenderer->baseControlWindow, &IVideoWindow_VTable,
-            &pVideoRenderer->renderer.filter, &pVideoRenderer->renderer.sink.pin,
+    hr = video_window_init(&object->baseControlWindow, &IVideoWindow_VTable,
+            &object->renderer.filter, &object->renderer.sink.pin,
             &renderer_BaseWindowFuncTable);
     if (FAILED(hr))
         goto fail;
 
-    hr = basic_video_init(&pVideoRenderer->baseControlVideo, &pVideoRenderer->renderer.filter,
-            &pVideoRenderer->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
+    hr = basic_video_init(&object->baseControlVideo, &object->renderer.filter,
+            &object->renderer.sink.pin, &renderer_BaseControlVideoFuncTable);
     if (FAILED(hr))
         goto fail;
 
-    if (FAILED(hr = BaseWindowImpl_PrepareWindow(&pVideoRenderer->baseControlWindow.baseWindow)))
+    if (FAILED(hr = BaseWindowImpl_PrepareWindow(&object->baseControlWindow.baseWindow)))
         goto fail;
 
-    pVideoRenderer->run_event = CreateEventW(NULL, TRUE, FALSE, NULL);
+    object->run_event = CreateEventW(NULL, TRUE, FALSE, NULL);
 
-    *out = &pVideoRenderer->renderer.filter.IUnknown_inner;
+    TRACE("Created video renderer %p.\n", object);
+    *out = &object->renderer.filter.IUnknown_inner;
     return S_OK;
 
 fail:
-    strmbase_renderer_cleanup(&pVideoRenderer->renderer);
-    CoTaskMemFree(pVideoRenderer);
+    strmbase_renderer_cleanup(&object->renderer);
+    free(object);
     return hr;
 }