From ffa467691df932f0a346c5fba943f32cf77baecd Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Wed, 21 Oct 2015 00:53:48 +0200 Subject: [PATCH] gdiplus: Use helper function for remaining HeapFree calls. Signed-off-by: Sebastian Lackner Signed-off-by: Dmitry Timoshkov Signed-off-by: Vincent Povirk Signed-off-by: Alexandre Julliard --- dlls/gdiplus/font.c | 4 ++-- dlls/gdiplus/image.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index dffba1e58f1..63eaed2cba0 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -1590,7 +1590,7 @@ void free_installed_fonts(void) { while (installedFontCollection.count) GdipDeleteFontFamily(installedFontCollection.FontFamilies[--installedFontCollection.count]); - HeapFree(GetProcessHeap(), 0, installedFontCollection.FontFamilies); + heap_free(installedFontCollection.FontFamilies); installedFontCollection.FontFamilies = NULL; installedFontCollection.allocated = 0; } @@ -1618,7 +1618,7 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, return 0; memcpy(new_family_list, fonts->FontFamilies, fonts->count*sizeof(void*)); - HeapFree(GetProcessHeap(), 0, fonts->FontFamilies); + heap_free(fonts->FontFamilies); fonts->FontFamilies = new_family_list; fonts->allocated = new_alloc_count; } diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index f475f9bd6ff..53ace057134 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1716,7 +1716,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromHICON(HICON hicon, GpBitmap** bitmap) dst_row += lockeddata.Stride; } - HeapFree(GetProcessHeap(), 0, bits); + heap_free(bits); } else { @@ -2884,7 +2884,7 @@ GpStatus WINGDIPAPI GdipGetAllPropertyItems(GpImage *image, UINT size, memcpy(item_value, item->value, item_size); item_value += item_size; - HeapFree(GetProcessHeap(), 0, item); + heap_free(item); } PropVariantClear(&id); -- 2.11.4.GIT