Commit f339506f authored by Alex Henrie's avatar Alex Henrie Committed by Alexandre Julliard

find: Use CRT allocation functions.

parent dcc049ad
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <shlwapi.h> #include <shlwapi.h>
#include "wine/heap.h"
#include "wine/debug.h" #include "wine/debug.h"
#include "resources.h" #include "resources.h"
...@@ -53,7 +52,7 @@ static WCHAR* read_line_from_handle(HANDLE handle) ...@@ -53,7 +52,7 @@ static WCHAR* read_line_from_handle(HANDLE handle)
WCHAR *line_converted; WCHAR *line_converted;
int line_converted_length; int line_converted_length;
BOOL success; BOOL success;
char *line = heap_alloc(line_max); char *line = malloc(line_max);
for (;;) for (;;)
{ {
...@@ -76,7 +75,7 @@ static WCHAR* read_line_from_handle(HANDLE handle) ...@@ -76,7 +75,7 @@ static WCHAR* read_line_from_handle(HANDLE handle)
if (length + 1 >= line_max) if (length + 1 >= line_max)
{ {
line_max *= 2; line_max *= 2;
line = heap_realloc(line, line_max); line = realloc(line, line_max);
} }
line[length++] = c; line[length++] = c;
...@@ -87,10 +86,10 @@ static WCHAR* read_line_from_handle(HANDLE handle) ...@@ -87,10 +86,10 @@ static WCHAR* read_line_from_handle(HANDLE handle)
line[length - 1] = 0; line[length - 1] = 0;
line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0); line_converted_length = MultiByteToWideChar(CP_ACP, 0, line, -1, 0, 0);
line_converted = heap_alloc(line_converted_length * sizeof(WCHAR)); line_converted = malloc(line_converted_length * sizeof(WCHAR));
MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length); MultiByteToWideChar(CP_ACP, 0, line, -1, line_converted, line_converted_length);
heap_free(line); free(line);
return line_converted; return line_converted;
} }
...@@ -104,14 +103,14 @@ static void write_to_stdout(const WCHAR *str) ...@@ -104,14 +103,14 @@ static void write_to_stdout(const WCHAR *str)
int codepage = CP_ACP; int codepage = CP_ACP;
str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL); str_converted_length = WideCharToMultiByte(codepage, 0, str, str_length, NULL, 0, NULL, NULL);
str_converted = heap_alloc(str_converted_length); str_converted = malloc(str_converted_length);
WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL); WideCharToMultiByte(codepage, 0, str, str_length, str_converted, str_converted_length, NULL, NULL);
WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), str_converted, str_converted_length, &bytes_written, NULL);
if (bytes_written < str_converted_length) if (bytes_written < str_converted_length)
ERR("Failed to write output\n"); ERR("Failed to write output\n");
heap_free(str_converted); free(str_converted);
} }
static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind) static BOOL run_find_for_line(const WCHAR *line, const WCHAR *tofind)
...@@ -173,7 +172,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ...@@ -173,7 +172,7 @@ int __cdecl wmain(int argc, WCHAR *argv[])
if (file_paths_len >= file_paths_max) if (file_paths_len >= file_paths_max)
{ {
file_paths_max = file_paths_max ? file_paths_max * 2 : 2; file_paths_max = file_paths_max ? file_paths_max * 2 : 2;
file_paths = heap_realloc(file_paths, sizeof(WCHAR*) * file_paths_max); file_paths = realloc(file_paths, sizeof(WCHAR*) * file_paths_max);
} }
file_paths[file_paths_len++] = argv[i]; file_paths[file_paths_len++] = argv[i];
} }
...@@ -219,7 +218,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ...@@ -219,7 +218,7 @@ int __cdecl wmain(int argc, WCHAR *argv[])
if (run_find_for_line(line, tofind)) if (run_find_for_line(line, tofind))
exitcode = 0; exitcode = 0;
heap_free(line); free(line);
} }
CloseHandle(input); CloseHandle(input);
} }
...@@ -232,10 +231,10 @@ int __cdecl wmain(int argc, WCHAR *argv[]) ...@@ -232,10 +231,10 @@ int __cdecl wmain(int argc, WCHAR *argv[])
if (run_find_for_line(line, tofind)) if (run_find_for_line(line, tofind))
exitcode = 0; exitcode = 0;
heap_free(line); free(line);
} }
} }
heap_free(file_paths); free(file_paths);
return exitcode; return exitcode;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment