Jacek Caban : wininet: Use wrappers for HeapReAlloc calls.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 55b2722816900ccb8b104ff18ed0142d8660793c
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=55b2722816900ccb8b104ff18ed0142d8660793c

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Fri Apr 22 12:35:05 2011 +0200

wininet: Use wrappers for HeapReAlloc calls.

---

 dlls/wininet/ftp.c  |    6 ++----
 dlls/wininet/http.c |   12 ++++++------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 79881cb..07052c2 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -3762,8 +3762,7 @@ static BOOL FTP_ParseDirectory(ftp_session_t *lpwfs, INT nSocket, LPCWSTR lpszSe
             LPFILEPROPERTIESW tmpafp;
             
             sizeFilePropArray *= 2;
-            tmpafp = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, *lpafp,
-                sizeof(FILEPROPERTIESW)*sizeFilePropArray);
+            tmpafp = heap_realloc_zero(*lpafp, sizeof(FILEPROPERTIESW)*sizeFilePropArray);
             if (NULL == tmpafp)
             {
                 bSuccess = FALSE;
@@ -3781,8 +3780,7 @@ static BOOL FTP_ParseDirectory(ftp_session_t *lpwfs, INT nSocket, LPCWSTR lpszSe
         {
             LPFILEPROPERTIESW tmpafp;
 
-            tmpafp = HeapReAlloc(GetProcessHeap(), 0, *lpafp,
-                sizeof(FILEPROPERTIESW)*indexFilePropArray);
+            tmpafp = heap_realloc(*lpafp, sizeof(FILEPROPERTIESW)*indexFilePropArray);
             if (NULL != tmpafp)
                 *lpafp = tmpafp;
         }
diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c
index 2e1bc20..f1ed423 100644
--- a/dlls/wininet/http.c
+++ b/dlls/wininet/http.c
@@ -5359,7 +5359,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear)
 
     while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders)
         cchMaxRawHeaders *= 2;
-    temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR));
+    temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR));
     if (temp == NULL) goto lend;
     lpszRawHeaders = temp;
     memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR));
@@ -5386,7 +5386,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear)
             {
                 while (cchRawHeaders + buflen + strlenW(szCrLf) > cchMaxRawHeaders)
                     cchMaxRawHeaders *= 2;
-                temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR));
+                temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders+1)*sizeof(WCHAR));
                 if (temp == NULL) goto lend;
                 lpszRawHeaders = temp;
                 memcpy(lpszRawHeaders+cchRawHeaders, buffer, (buflen-1)*sizeof(WCHAR));
@@ -5415,7 +5415,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear)
     if (cchRawHeaders + strlenW(szCrLf) > cchMaxRawHeaders)
     {
         cchMaxRawHeaders = cchRawHeaders + strlenW(szCrLf);
-        temp = HeapReAlloc(GetProcessHeap(), 0, lpszRawHeaders, (cchMaxRawHeaders + 1) * sizeof(WCHAR));
+        temp = heap_realloc(lpszRawHeaders, (cchMaxRawHeaders + 1) * sizeof(WCHAR));
         if (temp == NULL) goto lend;
         lpszRawHeaders = temp;
     }
@@ -5589,7 +5589,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR
 
         len = origlen + valuelen + ((ch > 0) ? 2 : 0);
 
-        lpsztmp = HeapReAlloc(GetProcessHeap(), 0, lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR));
+        lpsztmp = heap_realloc(lphttpHdr->lpszValue, (len+1)*sizeof(WCHAR));
         if (lpsztmp)
         {
             lphttpHdr->lpszValue = lpsztmp;
@@ -5608,7 +5608,7 @@ static DWORD HTTP_ProcessHeader(http_request_t *request, LPCWSTR field, LPCWSTR
         }
         else
         {
-            WARN("HeapReAlloc (%d bytes) failed\n",len+1);
+            WARN("heap_realloc (%d bytes) failed\n",len+1);
             res = ERROR_OUTOFMEMORY;
         }
     }
@@ -5692,7 +5692,7 @@ static DWORD HTTP_InsertCustomHeader(http_request_t *request, LPHTTPHEADERW lpHd
     TRACE("--> %s: %s\n", debugstr_w(lpHdr->lpszField), debugstr_w(lpHdr->lpszValue));
     count = request->nCustHeaders + 1;
     if (count > 1)
-	lph = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, request->custHeaders, sizeof(HTTPHEADERW) * count);
+	lph = heap_realloc_zero(request->custHeaders, sizeof(HTTPHEADERW) * count);
     else
 	lph = heap_alloc_zero(sizeof(HTTPHEADERW) * count);