Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/add.c | 6 +++--- programs/reg/delete.c | 4 ++-- programs/reg/export.c | 20 ++++++++++---------- programs/reg/import.c | 20 ++++++++++---------- programs/reg/query.c | 16 ++++++++-------- programs/reg/reg.c | 2 +- programs/reg/reg.h | 1 - 7 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/programs/reg/add.c b/programs/reg/add.c index ef6f467db34..3d0a509b4f0 100644 --- a/programs/reg/add.c +++ b/programs/reg/add.c @@ -107,7 +107,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW break; no_hex_data: /* cleanup, print error */ - heap_free(out_data); + free(out_data); output_message(STRING_MISSING_HEXDATA); out_data = NULL; break; @@ -131,7 +131,7 @@ static LPBYTE get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, DW
if (destindex && !buffer[destindex - 1] && (!buffer[destindex] || destindex == 1)) { - heap_free(buffer); + free(buffer); output_message(STRING_INVALID_STRING); return NULL; } @@ -200,7 +200,7 @@ int reg_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, }
RegSetValueExW(key, value_name, 0, reg_type, reg_data, reg_count); - heap_free(reg_data); + free(reg_data); }
RegCloseKey(key); diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 429cb84fb53..6ead3fc6919 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -76,7 +76,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, rc = RegDeleteValueW(key, value_name); if (rc != ERROR_SUCCESS) { - heap_free(value_name); + free(value_name); RegCloseKey(key); output_message(STRING_VALUEALL_FAILED, key_name); return 1; @@ -89,7 +89,7 @@ int reg_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, } else break; } - heap_free(value_name); + free(value_name); } else if (value_name || value_empty) { diff --git a/programs/reg/export.c b/programs/reg/export.c index 763ac996aec..30f01c8b94f 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -89,8 +89,8 @@ static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); line_len = swprintf(buf, line_len + 4, quoted_fmt, str); write_file(hFile, buf); - heap_free(buf); - heap_free(str); + free(buf); + free(str); } else { @@ -112,7 +112,7 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) str = escape_string(data, len, &line_len); *buf = malloc((line_len + 3) * sizeof(WCHAR)); swprintf(*buf, line_len + 3, fmt, str); - heap_free(str); + free(str); }
static void export_dword_data(WCHAR **buf, DWORD *data) @@ -139,7 +139,7 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) WCHAR *buf = malloc(15 * sizeof(WCHAR)); line_len = swprintf(buf, 15, hexp_fmt, type); write_file(hFile, buf); - heap_free(buf); + free(buf); }
return line_len; @@ -216,7 +216,7 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, if (size || type == REG_SZ) { write_file(hFile, buf); - heap_free(buf); + free(buf); }
export_newline(hFile); @@ -230,7 +230,7 @@ static void export_key_name(HANDLE hFile, WCHAR *name) buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); swprintf(buf, lstrlenW(name) + 7, fmt, name); write_file(hFile, buf); - heap_free(buf); + free(buf); }
static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) @@ -277,8 +277,8 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) else break; }
- heap_free(data); - heap_free(value_name); + free(data); + free(value_name);
subkey_name = malloc(MAX_SUBKEY_LEN * sizeof(WCHAR));
@@ -297,13 +297,13 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) export_registry_data(hFile, subkey, subkey_path); RegCloseKey(subkey); } - heap_free(subkey_path); + free(subkey_path); i++; } else break; }
- heap_free(subkey_name); + free(subkey_name); return 0; }
diff --git a/programs/reg/import.c b/programs/reg/import.c index 5f6b52f7f41..93d6d46aef9 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -357,7 +357,7 @@ static void close_key(struct parser *parser) { if (parser->hkey) { - heap_free(parser->key_name); + free(parser->key_name); parser->key_name = NULL;
RegCloseKey(parser->hkey); @@ -394,7 +394,7 @@ static LONG open_key(struct parser *parser, WCHAR *path) static void free_parser_data(struct parser *parser) { if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - heap_free(parser->data); + free(parser->data);
parser->data = NULL; parser->data_size = 0; @@ -428,7 +428,7 @@ static void prepare_hex_string_data(struct parser *parser)
parser->data = GetWideStringN(parser->data, parser->data_size, &parser->data_size); parser->data_size *= sizeof(WCHAR); - heap_free(data); + free(data); } } } @@ -486,7 +486,7 @@ static WCHAR *header_state(struct parser *parser, WCHAR *pos) header[1] = parser->two_wchars[1]; lstrcpyW(header + 2, line); parser->reg_version = parse_file_header(header); - heap_free(header); + free(header); } else parser->reg_version = parse_file_header(line);
@@ -626,7 +626,7 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos) /* handler for parser DEFAULT_VALUE_NAME state */ static WCHAR *default_value_name_state(struct parser *parser, WCHAR *pos) { - heap_free(parser->value_name); + free(parser->value_name); parser->value_name = NULL;
set_state(parser, DATA_START); @@ -638,7 +638,7 @@ static WCHAR *quoted_value_name_state(struct parser *parser, WCHAR *pos) { WCHAR *val_name = pos, *p;
- heap_free(parser->value_name); + free(parser->value_name); parser->value_name = NULL;
if (!unescape_string(val_name, &p)) @@ -878,7 +878,7 @@ static WCHAR *get_lineA(FILE *fp) static char *buf, *next; char *line;
- heap_free(lineW); + free(lineW);
if (!fp) goto cleanup;
@@ -924,7 +924,7 @@ static WCHAR *get_lineA(FILE *fp)
cleanup: lineW = NULL; - if (size) heap_free(buf); + free(buf); size = 0; return NULL; } @@ -977,7 +977,7 @@ static WCHAR *get_lineW(FILE *fp) }
cleanup: - if (size) heap_free(buf); + free(buf); size = 0; return NULL; } @@ -1035,7 +1035,7 @@ int reg_import(int argc, WCHAR *argvW[]) if (parser.reg_version == REG_VERSION_INVALID) goto error;
- heap_free(parser.value_name); + free(parser.value_name); close_key(&parser);
fclose(fp); diff --git a/programs/reg/query.c b/programs/reg/query.c index 3ad05eafe21..6ab518c91d9 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -123,7 +123,7 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD { reg_data = reg_data_to_wchar(type, data, data_size); output_string(fmt, reg_data); - heap_free(reg_data); + free(reg_data); } else { @@ -168,7 +168,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) num_values_found++; }
- heap_free(data); + free(data);
if (!recurse) { @@ -202,13 +202,13 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) query_value(subkey, value_name, subkey_path, recurse); RegCloseKey(subkey); } - heap_free(subkey_path); + free(subkey_path); i++; } else break; }
- heap_free(subkey_name); + free(subkey_name); return 0; }
@@ -257,8 +257,8 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) else break; }
- heap_free(data); - heap_free(value_name); + free(data); + free(value_name);
if (i || recurse) output_string(newlineW); @@ -282,7 +282,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) query_all(subkey, subkey_path, recurse); RegCloseKey(subkey); } - heap_free(subkey_path); + free(subkey_path); } else output_string(fmt_path, path, subkey_name); i++; @@ -290,7 +290,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) else break; }
- heap_free(subkey_name); + free(subkey_name);
if (i && !recurse) output_string(newlineW); diff --git a/programs/reg/reg.c b/programs/reg/reg.c index ba812641ad8..7b8dd1f37f5 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -87,7 +87,7 @@ void output_writeconsole(const WCHAR *str, DWORD wlen)
WideCharToMultiByte(GetConsoleOutputCP(), 0, str, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - heap_free(msgA); + free(msgA); } }
diff --git a/programs/reg/reg.h b/programs/reg/reg.h index dda1a45b737..89492ae8f74 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -21,7 +21,6 @@
#include <stdlib.h> #include <windows.h> -#include <wine/heap.h> #include "resource.h"
#define MAX_SUBKEY_LEN 257