[PATCH 5/5] ddrawex: Use the global memory allocation helpers.

[Henri Verbeet]

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
---
 dlls/ddrawex/ddraw.c           | 12 +++++++-----
 dlls/ddrawex/ddrawex_private.h |  2 ++
 dlls/ddrawex/main.c            | 12 ++++++------
 dlls/ddrawex/surface.c         |  4 ++--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/dlls/ddrawex/ddraw.c b/dlls/ddrawex/ddraw.c
index e2df885..2bb7e90 100644
--- a/dlls/ddrawex/ddraw.c
+++ b/dlls/ddrawex/ddraw.c
@@ -166,7 +166,7 @@ static ULONG WINAPI ddrawex4_Release(IDirectDraw4 *iface)
     if (!refcount)
     {
         IDirectDraw4_Release(ddrawex->parent);
-        HeapFree(GetProcessHeap(), 0, ddrawex);
+        heap_free(ddrawex);
     }
 
     return refcount;
@@ -1426,7 +1426,7 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
     if (outer_unknown)
         FIXME("Implement aggregation in ddrawex's IDirectDraw interface.\n");
 
-    if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object))))
+    if (!(object = heap_alloc_zero(sizeof(*object))))
         return E_OUTOFMEMORY;
 
     object->ref = 1;
@@ -1447,9 +1447,11 @@ HRESULT WINAPI ddrawex_factory_CreateDirectDraw(IDirectDrawFactory *iface, GUID
     return DD_OK;
 
 err:
-    if(object && object->parent) IDirectDraw4_Release(object->parent);
-    if(parent) IDirectDraw_Release(parent);
-    HeapFree(GetProcessHeap(), 0, object);
+    if (object && object->parent)
+        IDirectDraw4_Release(object->parent);
+    if (parent)
+        IDirectDraw_Release(parent);
+    heap_free(object);
     *ddraw = NULL;
     return hr;
 }
diff --git a/dlls/ddrawex/ddrawex_private.h b/dlls/ddrawex/ddrawex_private.h
index 0ddec63..f5adf79 100644
--- a/dlls/ddrawex/ddrawex_private.h
+++ b/dlls/ddrawex/ddrawex_private.h
@@ -19,6 +19,8 @@
 #ifndef __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
 #define __WINE_DLLS_DDRAWEX_DDRAWEX_PRIVATE_H
 
+#include "wine/heap.h"
+
 DEFINE_GUID(CLSID_DirectDrawFactory, 0x4fd2a832, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);
 DEFINE_GUID(IID_IDirectDrawFactory, 0x4fd2a833, 0x86c8, 0x11d0, 0x8f, 0xca, 0x0, 0xc0, 0x4f, 0xd9, 0x18, 0x9d);
 
diff --git a/dlls/ddrawex/main.c b/dlls/ddrawex/main.c
index 855b6d7..9fc6c2c 100644
--- a/dlls/ddrawex/main.c
+++ b/dlls/ddrawex/main.c
@@ -84,7 +84,7 @@ static ULONG WINAPI ddrawex_class_factory_Release(IClassFactory *iface)
     TRACE("%p decreasing refcount to %u.\n", iface, refcount);
 
     if (!refcount)
-        HeapFree(GetProcessHeap(), 0, factory);
+        heap_free(factory);
 
     return refcount;
 }
@@ -163,7 +163,7 @@ static ULONG WINAPI ddrawex_factory_Release(IDirectDrawFactory *iface)
     TRACE("%p decreasing refcount to %u.\n", iface, refcount);
 
     if (!refcount)
-        HeapFree(GetProcessHeap(), 0, factory);
+        heap_free(factory);
 
     return refcount;
 }
@@ -195,13 +195,13 @@ static HRESULT ddrawex_factory_create(IUnknown *outer_unknown, REFIID riid, void
     if (outer_unknown)
         return CLASS_E_NOAGGREGATION;
 
-    if (!(factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory))))
+    if (!(factory = heap_alloc_zero(sizeof(*factory))))
         return E_OUTOFMEMORY;
 
     factory->IDirectDrawFactory_iface.lpVtbl = &ddrawex_factory_vtbl;
 
     if (FAILED(hr = ddrawex_factory_QueryInterface(&factory->IDirectDrawFactory_iface, riid, out)))
-        HeapFree(GetProcessHeap(), 0, factory);
+        heap_free(factory);
 
     return hr;
 }
@@ -234,8 +234,8 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **out)
         return CLASS_E_CLASSNOTAVAILABLE;
     }
 
-    factory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*factory));
-    if (factory == NULL) return E_OUTOFMEMORY;
+    if (!(factory = heap_alloc_zero(sizeof(*factory))))
+        return E_OUTOFMEMORY;
 
     factory->IClassFactory_iface.lpVtbl = &ddrawex_class_factory_vtbl;
     factory->ref = 1;
diff --git a/dlls/ddrawex/surface.c b/dlls/ddrawex/surface.c
index 6f1637e..9fcda86 100644
--- a/dlls/ddrawex/surface.c
+++ b/dlls/ddrawex/surface.c
@@ -124,7 +124,7 @@ static ULONG WINAPI ddrawex_surface4_Release(IDirectDrawSurface4 *iface)
     {
         IDirectDrawSurface4_FreePrivateData(surface->parent, &IID_DDrawexPriv);
         IDirectDrawSurface4_Release(surface->parent);
-        HeapFree(GetProcessHeap(), 0, surface);
+        heap_free(surface);
     }
 
     return refcount;
@@ -1208,7 +1208,7 @@ IDirectDrawSurface4 *dds_get_outer(IDirectDrawSurface4 *inner)
         struct ddrawex_surface *impl;
 
         TRACE("Creating new ddrawex surface wrapper for surface %p\n", inner);
-        impl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*impl));
+        impl = heap_alloc_zero(sizeof(*impl));
         impl->ref = 1;
         impl->IDirectDrawSurface3_iface.lpVtbl = &ddrawex_surface3_vtbl;
         impl->IDirectDrawSurface4_iface.lpVtbl = &ddrawex_surface4_vtbl;
-- 
2.1.4