gdiplus: Use helper function for remaining HeapFree calls.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Dmitry Timoshkov <dmitry@baikal.ru> Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Use helper function for remaining HeapFree calls.
ffa46769 · Sebastian Lackner · Alexandre Julliard · 1250af49 · ffa46769 · ffa46769
Commit ffa46769 authored Oct 21, 2015 by Sebastian Lackner Committed by Alexandre Julliard Oct 29, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

font.c dlls/gdiplus/font.c +2 -2

image.c dlls/gdiplus/image.c +2 -2

No files found.
--- 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;
    }

--- 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);