[PATCH v2 1/4] oleaut32: Use CRT allocation functions in connpt.c.

[Alex Henrie]

From: Alex Henrie

---
 dlls/oleaut32/connpt.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c
index 993f2d9cf08..40bf30d71ef 100644
--- a/dlls/oleaut32/connpt.c
+++ b/dlls/oleaut32/connpt.c
@@ -110,8 +110,8 @@ static void ConnectionPointImpl_Destroy(ConnectionPointImpl *Obj)
       Obj->sinks[i] = NULL;
     }
   }
-  HeapFree(GetProcessHeap(), 0, Obj->sinks);
-  HeapFree(GetProcessHeap(), 0, Obj);
+  free(Obj->sinks);
+  free(Obj);
   return;
 }

@@ -214,8 +214,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
   }
   if(i == This->maxSinks) {
     This->maxSinks += MAXSINKS;
-    This->sinks = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->sinks,
-			      This->maxSinks * sizeof(IUnknown *));
+    This->sinks = _recalloc(This->sinks, This->maxSinks, sizeof(IUnknown*));
   }
   This->sinks[i] = lpSink;
   This->nSinks++;
@@ -254,7 +253,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections(IConnectionPoint *ifac

if(This->nSinks == 0) return OLE_E_NOCONNECTION;

-  pCD = HeapAlloc(GetProcessHeap(), 0, sizeof(CONNECTDATA) * This->nSinks);
+  pCD = malloc(sizeof(CONNECTDATA) * This->nSinks);

for(i = 0, nextslot = 0; i < This->maxSinks; i++) {
     if(This->sinks[i] != NULL) {
@@ -274,7 +273,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections(IConnectionPoint *ifac
                                        &IID_IEnumConnections, (void**)ppEnum);
   IEnumConnections_Release(&EnumObj->IEnumConnections_iface);

-  HeapFree(GetProcessHeap(), 0, pCD);
+  free(pCD);
   return hr;
 }

@@ -297,13 +296,13 @@ static EnumConnectionsImpl *EnumConnectionsImpl_Construct(IUnknown *pUnk,
    						  DWORD nSinks,
    						  CONNECTDATA *pCD)
 {
-  EnumConnectionsImpl *Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj));
+  EnumConnectionsImpl *Obj = malloc(sizeof(*Obj));
   DWORD i;

Obj->IEnumConnections_iface.lpVtbl = &EnumConnectionsImpl_VTable;
   Obj->ref = 1;
   Obj->pUnk = pUnk;
-  Obj->pCD = HeapAlloc(GetProcessHeap(), 0, nSinks * sizeof(CONNECTDATA));
+  Obj->pCD = malloc(nSinks * sizeof(CONNECTDATA));
   Obj->nConns = nSinks;
   Obj->nCur = 0;

@@ -321,8 +320,8 @@ static void EnumConnectionsImpl_Destroy(EnumConnectionsImpl *Obj)
   for(i = 0; i < Obj->nConns; i++)
     IUnknown_Release(Obj->pCD[i].pUnk);

-  HeapFree(GetProcessHeap(), 0, Obj->pCD);
-  HeapFree(GetProcessHeap(), 0, Obj);
+  free(Obj->pCD);
+  free(Obj);
   return;
 }

@@ -487,7 +486,7 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid,
   TRACE("(%p %s %p)\n", pUnk, debugstr_guid(riid), pCP);

*pCP = NULL;
-  Obj = HeapAlloc(GetProcessHeap(), 0, sizeof(*Obj));
+  Obj = malloc(sizeof(*Obj));
   if (!Obj)
     return E_OUTOFMEMORY;

@@ -496,7 +495,7 @@ HRESULT CreateConnectionPoint(IUnknown *pUnk, REFIID riid,
   Obj->ref = 1;
   Obj->iid = *riid;
   Obj->maxSinks = MAXSINKS;
-  Obj->sinks = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IUnknown*) * MAXSINKS);
+  Obj->sinks = calloc(MAXSINKS, sizeof(IUnknown*));
   Obj->nSinks = 0;

*pCP = &Obj->IConnectionPoint_iface;