[PATCH 4/5] devenum: Use calloc() in moniker_create().

[Zebediah Figura]

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 dlls/devenum/mediacatenum.c | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c
index 7b553a07b7d..d6feb657972 100644
--- a/dlls/devenum/mediacatenum.c
+++ b/dlls/devenum/mediacatenum.c
@@ -406,7 +406,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface)
     if (ref == 0) {
         if (This->type != DEVICE_DMO)
             CoTaskMemFree(This->name);
-        CoTaskMemFree(This);
+        free(This);
         DEVENUM_UnlockModule();
     }
     return ref;
@@ -771,20 +771,17 @@ static const IMonikerVtbl IMoniker_Vtbl =
 
 struct moniker *moniker_create(void)
 {
-    struct moniker *pMoniker;
+    struct moniker *object;
 
-    pMoniker = CoTaskMemAlloc(sizeof(*pMoniker));
-    if (!pMoniker)
+    if (!(object = calloc(1, sizeof(*object))))
         return NULL;
 
-    pMoniker->IMoniker_iface.lpVtbl = &IMoniker_Vtbl;
-    pMoniker->ref = 1;
-    pMoniker->has_class = FALSE;
-    pMoniker->name = NULL;
+    object->IMoniker_iface.lpVtbl = &IMoniker_Vtbl;
+    object->ref = 1;
 
     DEVENUM_LockModule();
 
-    return pMoniker;
+    return object;
 }
 
 static inline EnumMonikerImpl *impl_from_IEnumMoniker(IEnumMoniker *iface)
-- 
2.26.0