[PATCH 0/1] MR4271: jsproxy: Use CRT allocation functions.

[PATCH 1/1] jsproxy: Use CRT allocation functions.

[Alex Henrie]

From: Alex Henrie

---
 dlls/jsproxy/main.c | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c
index b93d1200f42..4e69210dce3 100644
--- a/dlls/jsproxy/main.c
+++ b/dlls/jsproxy/main.c
@@ -31,7 +31,6 @@
 #include "dispex.h"
 #include "activscp.h"
 #include "wine/debug.h"
-#include "wine/heap.h"

WINE_DEFAULT_DEBUG_CHANNEL(jsproxy);

@@ -50,7 +49,7 @@ static inline WCHAR *strdupAW( const char *src, int len )
     if (src)
     {
         int dst_len = MultiByteToWideChar( CP_ACP, 0, src, len, NULL, 0 );
-        if ((dst = heap_alloc( (dst_len + 1) * sizeof(WCHAR) )))
+        if ((dst = malloc( (dst_len + 1) * sizeof(WCHAR) )))
         {
             len = MultiByteToWideChar( CP_ACP, 0, src, len, dst, dst_len );
             dst[dst_len] = 0;
@@ -65,7 +64,7 @@ static inline char *strdupWA( const WCHAR *src )
     if (src)
     {
         int len = WideCharToMultiByte( CP_ACP, 0, src, -1, NULL, 0, NULL, NULL );
-        if ((dst = heap_alloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL );
+        if ((dst = malloc( len ))) WideCharToMultiByte( CP_ACP, 0, src, -1, dst, len, NULL, NULL );
     }
     return dst;
 }
@@ -85,7 +84,7 @@ BOOL WINAPI InternetDeInitializeAutoProxyDll( LPSTR mime, DWORD reserved )

EnterCriticalSection( &cs_jsproxy );

-    heap_free( global_script->text );
+    free( global_script->text );
     global_script->text = NULL;

LeaveCriticalSection( &cs_jsproxy );
@@ -104,17 +103,17 @@ static WCHAR *load_script( const char *filename )
     if (handle == INVALID_HANDLE_VALUE) return NULL;

size = GetFileSize( handle, NULL );
-    if (!(buffer = heap_alloc( size ))) goto done;
+    if (!(buffer = malloc( size ))) goto done;
     if (!ReadFile( handle, buffer, size, &bytes_read, NULL ) || bytes_read != size) goto done;

len = MultiByteToWideChar( CP_ACP, 0, buffer, size, NULL, 0 );
-    if (!(script = heap_alloc( (len + 1) * sizeof(WCHAR) ))) goto done;
+    if (!(script = malloc( (len + 1) * sizeof(WCHAR) ))) goto done;
     MultiByteToWideChar( CP_ACP, 0, buffer, size, script, len );
     script[len] = 0;

done:
     CloseHandle( handle );
-    heap_free( buffer );
+    free( buffer );
     return script;
 }

@@ -141,13 +140,13 @@ BOOL WINAPI JSPROXY_InternetInitializeAutoProxyDll( DWORD version, LPSTR tmpfile
             LeaveCriticalSection( &cs_jsproxy );
             return FALSE;
         }
-        heap_free( global_script->text );
+        free( global_script->text );
         if ((global_script->text = strdupAW( buffer->lpszScriptBuffer,
                         buffer->dwScriptBufferSize ))) ret = TRUE;
     }
     else
     {
-        heap_free( global_script->text );
+        free( global_script->text );
         if ((global_script->text = load_script( tmpfile ))) ret = TRUE;
     }

@@ -263,10 +262,10 @@ static char *get_computer_name( COMPUTER_NAME_FORMAT format )

GetComputerNameExA( format, NULL, &size );
     if (GetLastError() != ERROR_MORE_DATA) return NULL;
-    if (!(ret = heap_alloc( size ))) return NULL;
+    if (!(ret = malloc( size ))) return NULL;
     if (!GetComputerNameExA( format, ret, &size ))
     {
-        heap_free( ret );
+        free( ret );
         return NULL;
     }
     return ret;
@@ -295,7 +294,7 @@ static HRESULT dns_resolve( const WCHAR *hostname, VARIANT *result )

if (!hostnameA) return E_OUTOFMEMORY;
         res = getaddrinfo( hostnameA, NULL, NULL, &ai );
-        heap_free( hostnameA );
+        free( hostnameA );
         if (res) return S_FALSE;

elem = ai;
@@ -589,8 +588,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW
     ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy );

done:
-    heap_free( hostnameW );
-    heap_free( urlW );
+    free( hostnameW );
+    free( urlW );
     LeaveCriticalSection( &cs_jsproxy );
     return ret;
 }