From afdc334935d2008269ead04ad954e4acc00d5f61 Mon Sep 17 00:00:00 2001
From: Toni Spets <toni.spets@iki.fi>
Date: Tue, 16 Nov 2010 17:32:31 +0200
Subject: [PATCH] Use HeapFree to free heaps, incorrectly used std free Convert
 last malloc/free to HeapAlloc/HeapFree

---
 clipper.c | 2 +-
 palette.c | 2 +-
 render.c  | 3 +--
 surface.c | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/clipper.c b/clipper.c
index 999feec..e8b4b0d 100644
--- a/clipper.c
+++ b/clipper.c
@@ -41,7 +41,7 @@ ULONG __stdcall ddraw_clipper_Release(IDirectDrawClipperImpl *This)
 
     if(This->Ref == 0)
     {
-        free(This);
+        HeapFree(GetProcessHeap(), 0, This);
         return 0;
     }
 
diff --git a/palette.c b/palette.c
index 404d37d..027f9f1 100644
--- a/palette.c
+++ b/palette.c
@@ -64,7 +64,7 @@ ULONG __stdcall ddraw_palette_Release(IDirectDrawPaletteImpl *This)
 
     if(This->Ref == 0)
     {
-        free(This);
+        HeapFree(GetProcessHeap(), 0, This);
         return 0;
     }
 
diff --git a/render.c b/render.c
index 58b57cc..6c03199 100644
--- a/render.c
+++ b/render.c
@@ -129,11 +129,10 @@ DWORD WINAPI render_main(void)
         SetEvent(ddraw->render.ev);
     }
 
+    HeapFree(GetProcessHeap(), 0, tex);
     CloseHandle(ddraw->render.ev);
     ddraw->render.ev = NULL;
 
-    free(tex);
-
     wglMakeCurrent(NULL, NULL);
     wglDeleteContext(hRC);
     ReleaseDC(ddraw->hWnd, hDC);
diff --git a/surface.c b/surface.c
index 2317f05..a90426c 100644
--- a/surface.c
+++ b/surface.c
@@ -52,7 +52,7 @@ ULONG __stdcall ddraw_surface_Release(IDirectDrawSurfaceImpl *This)
         }
         if(This->surface)
         {
-            free(This->surface);
+            HeapFree(GetProcessHeap(), 0, This->surface);
         }
         if(This->palette)
         {
@@ -433,7 +433,7 @@ HRESULT __stdcall ddraw_CreateSurface(IDirectDrawImpl *This, LPDDSURFACEDESC lpD
     {
         Surface->lPitch = Surface->width;
         Surface->lXPitch = Surface->bpp / 8;
-        Surface->surface = malloc(Surface->width * Surface->height * Surface->lXPitch);
+        Surface->surface = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, Surface->width * Surface->height * Surface->lXPitch);
     }
 
     printf(" Surface = %p (%dx%d@%d)\n", Surface, (int)Surface->width, (int)Surface->height, (int)Surface->bpp);