Zebediah Figura : strmbase: Use heap_alloc_zero() in enum_pins_create().

[Alexandre Julliard]

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

Author: Zebediah Figura 
Date:   Tue May 14 19:41:56 2019 -0500

strmbase: Use heap_alloc_zero() in enum_pins_create().

Signed-off-by: Zebediah Figura 
Signed-off-by: Alexandre Julliard

---

dlls/strmbase/enumpins.c         | 33 ++++++++++++++++-----------------
 dlls/strmbase/strmbase_private.h |  1 +
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c
index 15d6cab..4503a47 100644
--- a/dlls/strmbase/enumpins.c
+++ b/dlls/strmbase/enumpins.c
@@ -39,36 +39,35 @@ static inline IEnumPinsImpl *impl_from_IEnumPins(IEnumPins *iface)

static const struct IEnumPinsVtbl IEnumPinsImpl_Vtbl;

-HRESULT enum_pins_create(BaseFilter *base, IEnumPins **ppEnum)
+HRESULT enum_pins_create(BaseFilter *base, IEnumPins **out)
 {
-    IEnumPinsImpl * pEnumPins;
+    IEnumPinsImpl *object;
     IPin *pin;

-    if (!ppEnum)
+    if (!out)
         return E_POINTER;

-    pEnumPins = CoTaskMemAlloc(sizeof(IEnumPinsImpl));
-    if (!pEnumPins)
+    if (!(object = heap_alloc_zero(sizeof(*object))))
     {
-        *ppEnum = NULL;
+        *out = NULL;
         return E_OUTOFMEMORY;
     }
-    pEnumPins->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl;
-    pEnumPins->refCount = 1;
-    pEnumPins->uIndex = 0;
-    pEnumPins->base = base;
+
+    object->IEnumPins_iface.lpVtbl = &IEnumPinsImpl_Vtbl;
+    object->refCount = 1;
+    object->base = base;
     IBaseFilter_AddRef(&base->IBaseFilter_iface);
-    *ppEnum = &pEnumPins->IEnumPins_iface;
-    pEnumPins->Version = base->pin_version;
-    pEnumPins->count = 0;
+    object->Version = base->pin_version;

-    while ((pin = base->pFuncsTable->pfnGetPin(base, pEnumPins->count)))
+    while ((pin = base->pFuncsTable->pfnGetPin(base, object->count)))
     {
         IPin_Release(pin);
-        ++pEnumPins->count;
+        ++object->count;
     }

-    TRACE("Created new enumerator (%p)\n", *ppEnum);
+    TRACE("Created enumerator %p.\n", object);
+    *out = &object->IEnumPins_iface;
+
     return S_OK;
 }

@@ -114,7 +113,7 @@ static ULONG WINAPI IEnumPinsImpl_Release(IEnumPins * iface)
     if (!ref)
     {
         IBaseFilter_Release(&This->base->IBaseFilter_iface);
-        CoTaskMemFree(This);
+        heap_free(This);
     }

return ref;
diff --git a/dlls/strmbase/strmbase_private.h b/dlls/strmbase/strmbase_private.h
index de13a53..fc1e27d 100644
--- a/dlls/strmbase/strmbase_private.h
+++ b/dlls/strmbase/strmbase_private.h
@@ -28,6 +28,7 @@
 #include "dshow.h"
 #include "uuids.h"
 #include "wine/debug.h"
+#include "wine/heap.h"
 #include "wine/list.h"
 #include "wine/strmbase.h"
 #include "wine/unicode.h"