Changeset 6710 for trunk/src/quartz/memalloc.c

Timestamp:

Sep 15, 2001, 11:28:23 AM (24 years ago)

Author:

sandervl

Message:

wine update

File:

• trunk/src/quartz/memalloc.c (modified) (2 diffs)

trunk/src/quartz/memalloc.c

@@ -1 @@
-/* $Id: memalloc.c,v 1.3 2001-09-05 13:36:37 bird Exp $ */
 /*
  * Implementation of CLSID_MemoryAllocator.
@@ -31 +30 @@
 };
 
+static void QUARTZ_DestroyMemoryAllocator(IUnknown* punk)
+{
+        CMemoryAllocator_THIS(punk,unk);
+
+        CMemoryAllocator_UninitIMemAllocator( This );
+}
+
 HRESULT QUARTZ_CreateMemoryAllocator(IUnknown* punkOuter,void** ppobj)
 {
-    CMemoryAllocator*   pma;
+        CMemoryAllocator*       pma;
+        HRESULT hr;
 
-    TRACE("(%p,%p)\n",punkOuter,ppobj);
+        TRACE("(%p,%p)\n",punkOuter,ppobj);
 
-    pma = (CMemoryAllocator*)QUARTZ_AllocObj( sizeof(CMemoryAllocator) );
-    if ( pma == NULL )
-        return E_OUTOFMEMORY;
+        pma = (CMemoryAllocator*)QUARTZ_AllocObj( sizeof(CMemoryAllocator) );
+        if ( pma == NULL )
+                return E_OUTOFMEMORY;
 
-    QUARTZ_IUnkInit( &pma->unk, punkOuter );
-    CMemoryAllocator_InitIMemAllocator( pma );
+        QUARTZ_IUnkInit( &pma->unk, punkOuter );
+        hr = CMemoryAllocator_InitIMemAllocator( pma );
+        if ( FAILED(hr) )
+        {
+                QUARTZ_FreeObj( pma );
+                return hr;
+        }
 
-    pma->unk.pEntries = IFEntries;
-    pma->unk.dwEntries = sizeof(IFEntries)/sizeof(IFEntries[0]);
+        pma->unk.pEntries = IFEntries;
+        pma->unk.dwEntries = sizeof(IFEntries)/sizeof(IFEntries[0]);
+        pma->unk.pOnFinalRelease = QUARTZ_DestroyMemoryAllocator;
 
-    *ppobj = (void*)(&pma->unk);
+        *ppobj = (void*)(&pma->unk);
 
-    return S_OK;
+        return S_OK;
 }