From 9cd9cfd2edd66ea3d4848d6eb8866a1c457ea623 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Mon, 9 Aug 2004 19:46:47 +0000
Subject: [PATCH] Use Heap function in preference to malloc/free.

---
 dlls/shell32/dialogs.c | 25 ++++++++++++++++---------
 dlls/shell32/systray.c |  5 ++---
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/dlls/shell32/dialogs.c b/dlls/shell32/dialogs.c
index 273910a9339..5a8e8059ff1 100644
--- a/dlls/shell32/dialogs.c
+++ b/dlls/shell32/dialogs.c
@@ -142,7 +142,7 @@ INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
                     HWND htxt = NULL ;
                     if ((ic = GetWindowTextLengthA (htxt = GetDlgItem (hwnd, 12298))))
                         {
-                        psz = malloc (ic + 2) ;
+                        psz = HeapAlloc( GetProcessHeap, 0, (ic + 2) );
                         GetWindowTextA (htxt, psz, ic + 1) ;
 
                         if (ShellExecuteA(NULL, "open", psz, NULL, NULL, SW_SHOWNORMAL) < (HINSTANCE)33)
@@ -160,12 +160,12 @@ INT_PTR CALLBACK RunDlgProc (HWND hwnd, UINT message, WPARAM wParam, LPARAM lPar
                             LocalFree ((HLOCAL)pszSysMsg) ;
                             MessageBoxA (hwnd, szMsg, "Nix", MB_OK | MB_ICONEXCLAMATION) ;
 
-                            free (psz) ;
+                            HeapFree(GetProcessHeap(), 0, psz);
                             SendMessageA (htxt, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ;
                             return TRUE ;
                             }
                         FillList (htxt, psz) ;
-                        free (psz) ;
+                        HeapFree(GetProcessHeap(), 0, psz);
                         EndDialog (hwnd, 0) ;
                         }
                     }
@@ -254,13 +254,14 @@ void FillList (HWND hCb, char *pszLatest)
 
     if (icList > 0)
         {
-        pszList = malloc (icList) ;
+        pszList = HeapAlloc( GetProcessHeap(), 0, icList) ;
         if (ERROR_SUCCESS != RegQueryValueExA (hkey, "MRUList", NULL, NULL, pszList, &icList))
             MessageBoxA (hCb, "Unable to grab MRUList !", "Nix", MB_OK) ;
         }
     else
         {
-        pszList = malloc (icList = 1) ;
+        icList = 1 ;
+        pszList = HeapAlloc( GetProcessHeap(), 0, icList) ;
         pszList[0] = 0 ;
         }
 
@@ -273,7 +274,10 @@ void FillList (HWND hCb, char *pszLatest)
 
         if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, NULL, &icCmd))
             MessageBoxA (hCb, "Unable to grab size of index", "Nix", MB_OK) ;
-        pszCmd = realloc (pszCmd, icCmd) ;
+        if( pszCmd )
+            pszCmd = HeapReAlloc(GetProcessHeap(), 0, pszCmd, icCmd) ;
+        else
+            pszCmd = HeapAlloc(GetProcessHeap(), 0, icCmd) ;
         if (ERROR_SUCCESS != RegQueryValueExA (hkey, szIndex, NULL, NULL, pszCmd, &icCmd))
             MessageBoxA (hCb, "Unable to grab index", "Nix", MB_OK) ;
 
@@ -339,7 +343,10 @@ void FillList (HWND hCb, char *pszLatest)
         SendMessageA (hCb, CB_SETEDITSEL, 0, MAKELPARAM (0, -1)) ;
 
         cMatch = ++cMax ;
-        pszList = realloc (pszList, ++icList) ;
+        if( pszList )
+            pszList = HeapReAlloc(GetProcessHeap(), 0, pszList, ++icList) ;
+        else
+            pszList = HeapAlloc(GetProcessHeap(), 0, ++icList) ;
         memmove (&pszList[1], pszList, icList - 1) ;
         pszList[0] = cMatch ;
         szIndex[0] = cMatch ;
@@ -348,8 +355,8 @@ void FillList (HWND hCb, char *pszLatest)
 
     RegSetValueExA (hkey, "MRUList", 0, REG_SZ, pszList, strlen (pszList) + 1) ;
 
-    free (pszCmd) ;
-    free (pszList) ;
+    HeapFree( GetProcessHeap(), 0, pszCmd) ;
+    HeapFree( GetProcessHeap(), 0, pszList) ;
     }
 
 
diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index 55d0403883e..fe490f5d45c 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -28,7 +28,6 @@
 # include <unistd.h>
 #endif
 #include <stdarg.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "windef.h"
@@ -289,7 +288,7 @@ static BOOL SYSTRAY_Add(PNOTIFYICONDATAA pnid)
     ptrayItem = &((*ptrayItem)->nextTrayItem);
   }
   /* Allocate SystrayItem for element and add to end of list. */
-  (*ptrayItem) = ( SystrayItem *)malloc( sizeof(SystrayItem) );
+  (*ptrayItem) = HeapAlloc(GetProcessHeap(),0,sizeof(SystrayItem));
 
   /* Initialize and set data for the tray element. */
   SYSTRAY_ItemInit( (*ptrayItem) );
@@ -337,7 +336,7 @@ static BOOL SYSTRAY_Delete(PNOTIFYICONDATAA pnid)
       TRACE("%p: %p %s\n", *ptrayItem, (*ptrayItem)->notifyIcon.hWnd, (*ptrayItem)->notifyIcon.szTip);
       SYSTRAY_ItemTerm(*ptrayItem);
 
-      free(*ptrayItem);
+      HeapFree(GetProcessHeap(),0,*ptrayItem);
       *ptrayItem = next;
 
       return TRUE;