Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/export.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-)
diff --git a/programs/reg/export.c b/programs/reg/export.c index 30f01c8b94f..3150c075f26 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -79,15 +79,14 @@ static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len)
static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) { - static const WCHAR quoted_fmt[] = {'"','%','s','"','=',0}; - static const WCHAR default_name[] = {'@','=',0}; + static const WCHAR *default_name = L"@="; size_t line_len;
if (name && *name) { WCHAR *str = escape_string(name, len, &line_len); WCHAR *buf = malloc((line_len + 4) * sizeof(WCHAR)); - line_len = swprintf(buf, line_len + 4, quoted_fmt, str); + line_len = swprintf(buf, line_len + 4, L""%s"=", str); write_file(hFile, buf); free(buf); free(str); @@ -105,28 +104,24 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) { size_t len = 0, line_len; WCHAR *str; - static const WCHAR fmt[] = {'"','%','s','"',0};
if (size) len = size / sizeof(WCHAR) - 1; str = escape_string(data, len, &line_len); *buf = malloc((line_len + 3) * sizeof(WCHAR)); - swprintf(*buf, line_len + 3, fmt, str); + swprintf(*buf, line_len + 3, L""%s"", str); free(str); }
static void export_dword_data(WCHAR **buf, DWORD *data) { - static const WCHAR fmt[] = {'d','w','o','r','d',':','%','0','8','x',0}; - *buf = malloc(15 * sizeof(WCHAR)); - swprintf(*buf, 15, fmt, *data); + swprintf(*buf, 15, L"dword:%08x", *data); }
static size_t export_hex_data_type(HANDLE hFile, DWORD type) { - static const WCHAR hex[] = {'h','e','x',':',0}; - static const WCHAR hexp_fmt[] = {'h','e','x','(','%','x',')',':',0}; + static const WCHAR *hex = L"hex:"; size_t line_len;
if (type == REG_BINARY) @@ -137,7 +132,7 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) else { WCHAR *buf = malloc(15 * sizeof(WCHAR)); - line_len = swprintf(buf, 15, hexp_fmt, type); + line_len = swprintf(buf, 15, L"hex(%x):", type); write_file(hFile, buf); free(buf); } @@ -150,8 +145,6 @@ static size_t export_hex_data_type(HANDLE hFile, DWORD type) static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, DWORD line_len, void *data, DWORD size) { - static const WCHAR fmt[] = {'%','0','2','x',0}; - static const WCHAR hex_concat[] = {'\','\r','\n',' ',' ',0}; size_t num_commas, i, pos;
line_len += export_hex_data_type(hFile, type); @@ -163,7 +156,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type,
for (i = 0, pos = 0; i < size; i++) { - pos += swprintf(*buf + pos, 3, fmt, ((BYTE *)data)[i]); + pos += swprintf(*buf + pos, 3, L"%02x", ((BYTE *)data)[i]); if (i == num_commas) break; (*buf)[pos++] = ','; (*buf)[pos] = 0; @@ -172,7 +165,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type, if (line_len >= MAX_HEX_CHARS) { write_file(hFile, *buf); - write_file(hFile, hex_concat); + write_file(hFile, L"\\r\n "); line_len = 2; pos = 0; } @@ -181,7 +174,7 @@ static void export_hex_data(HANDLE hFile, WCHAR **buf, DWORD type,
static void export_newline(HANDLE hFile) { - static const WCHAR newline[] = {'\r','\n',0}; + static const WCHAR *newline = L"\r\n";
write_file(hFile, newline); } @@ -224,11 +217,10 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len,
static void export_key_name(HANDLE hFile, WCHAR *name) { - static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; WCHAR *buf;
buf = malloc((lstrlenW(name) + 7) * sizeof(WCHAR)); - swprintf(buf, lstrlenW(name) + 7, fmt, name); + swprintf(buf, lstrlenW(name) + 7, L"\r\n[%s]\r\n", name); write_file(hFile, buf); free(buf); } @@ -309,9 +301,7 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path)
static void export_file_header(HANDLE hFile) { - static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', - 'R','e','g','i','s','t','r','y',' ','E','d','i','t','o','r',' ', - 'V','e','r','s','i','o','n',' ','5','.','0','0','\r','\n',0}; + static const WCHAR *header = L"\uFEFFWindows Registry Editor Version 5.00\r\n";
write_file(hFile, header); }
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/export.c | 28 +++++++++++++++++----------- programs/reg/reg.c | 10 ++++++---- programs/reg/reg.h | 1 + 3 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/programs/reg/export.c b/programs/reg/export.c index 3150c075f26..79f055c691f 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -344,27 +344,33 @@ static HANDLE get_file_handle(WCHAR *filename, BOOL overwrite_file) return hFile; }
-static BOOL is_overwrite_switch(const WCHAR *s) -{ - return is_switch(s, 'y'); -} - int reg_export(int argc, WCHAR *argvW[]) { HKEY root, hkey; WCHAR *path, *long_key; BOOL overwrite_file = FALSE; HANDLE hFile; - int ret; + int i, ret;
- if (argc == 3 || argc > 5) - goto error; + if (argc < 4) goto invalid;
if (!parse_registry_key(argvW[2], &root, &path, &long_key)) return 1;
- if (argc == 5 && !(overwrite_file = is_overwrite_switch(argvW[4]))) - goto error; + for (i = 4; i < argc; i++) + { + WCHAR *str; + + if (argvW[i][0] != '/' && argvW[i][0] != '-') + goto invalid; + + str = &argvW[i][1]; + + if (is_char(*str, 'y') && !str[1]) + overwrite_file = TRUE; + else + goto invalid; + }
if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) { @@ -382,7 +388,7 @@ int reg_export(int argc, WCHAR *argvW[])
return ret;
-error: +invalid: output_message(STRING_INVALID_SYNTAX); output_message(STRING_FUNC_HELP, wcsupr(argvW[1])); return 1; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 10aaabf92da..6b337f5d415 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -250,15 +250,17 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long return TRUE; }
+BOOL is_char(const WCHAR s, const WCHAR c) +{ + return (s == c || s == towupper(c)); +} + BOOL is_switch(const WCHAR *s, const WCHAR c) { if (lstrlenW(s) > 2) return FALSE;
- if ((s[0] == '/' || s[0] == '-') && (s[1] == c || s[1] == towupper(c))) - return TRUE; - - return FALSE; + return ((s[0] == '/' || s[0] == '-') && is_char(s[1], c)); }
static BOOL is_help_switch(const WCHAR *s) diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 3525bed75b8..c7719a6e4f0 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -40,6 +40,7 @@ BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); HKEY path_get_rootkey(const WCHAR *path); WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len); BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); +BOOL is_char(const WCHAR s, const WCHAR c); BOOL is_switch(const WCHAR *s, const WCHAR c);
/* add.c */
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/delete.c | 4 ++-- programs/reg/export.c | 2 +- programs/reg/query.c | 2 +- programs/reg/reg.rc | 1 + programs/reg/resource.h | 1 + 5 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/programs/reg/delete.c b/programs/reg/delete.c index 1f3755b3365..c80b622bccb 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -46,7 +46,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name { if (RegDeleteTreeW(root, path) != ERROR_SUCCESS) { - output_message(STRING_CANNOT_FIND); + output_message(STRING_KEY_NONEXIST); return 1; } output_message(STRING_SUCCESS); @@ -55,7 +55,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &key)) { - output_message(STRING_CANNOT_FIND); + output_message(STRING_KEY_NONEXIST); return 1; }
diff --git a/programs/reg/export.c b/programs/reg/export.c index 79f055c691f..5d55eaad407 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -374,7 +374,7 @@ int reg_export(int argc, WCHAR *argvW[])
if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) { - output_message(STRING_INVALID_KEY); + output_message(STRING_KEY_NONEXIST); return 1; }
diff --git a/programs/reg/query.c b/programs/reg/query.c index 961d926a10b..a82101a0a29 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -302,7 +302,7 @@ static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,
if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS) { - output_message(STRING_CANNOT_FIND); + output_message(STRING_KEY_NONEXIST); return 1; }
diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 6077ace0ccb..10ad38942c3 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -170,4 +170,5 @@ STRINGTABLE
STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" + STRING_KEY_NONEXIST, "reg: Unable to find the specified registry key\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 518f92ceac3..f1a8016b57f 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -59,3 +59,4 @@ #define STRING_EXPORT_USAGE 136 #define STRING_INVALID_SYSTEM_KEY 137 #define STRING_OVERWRITE_FILE 138 +#define STRING_KEY_NONEXIST 139
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/import.c | 4 ++-- programs/reg/reg.rc | 1 + programs/reg/resource.h | 1 + 3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/programs/reg/import.c b/programs/reg/import.c index 3ce8fce7394..223e7db0e48 100644 --- a/programs/reg/import.c +++ b/programs/reg/import.c @@ -523,7 +523,7 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos)
if (open_key(parser, line) != ERROR_SUCCESS) { - output_message(STRING_OPEN_KEY_FAILED, line); + output_message(STRING_KEY_IMPORT_FAILED, line); return line; }
@@ -584,7 +584,7 @@ static WCHAR *key_name_state(struct parser *parser, WCHAR *pos) return p + 1; } else if (open_key(parser, p) != ERROR_SUCCESS) - output_message(STRING_OPEN_KEY_FAILED, p); + output_message(STRING_KEY_IMPORT_FAILED, p);
done: set_state(parser, LINE_START); diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 10ad38942c3..b0a27b33606 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -171,4 +171,5 @@ STRINGTABLE STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" STRING_KEY_NONEXIST, "reg: Unable to find the specified registry key\n" + STRING_KEY_IMPORT_FAILED, "reg: Unable to import the registry key '%1'\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index f1a8016b57f..188b2d13cf4 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -60,3 +60,4 @@ #define STRING_INVALID_SYSTEM_KEY 137 #define STRING_OVERWRITE_FILE 138 #define STRING_KEY_NONEXIST 139 +#define STRING_KEY_IMPORT_FAILED 140
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/reg.rc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index b0a27b33606..87ea1e2323d 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -112,7 +112,7 @@ STRINGTABLE \ /s\n\ \ List all registry entries under <key> and its subkeys.\n\n"
- STRING_SUCCESS, "The operation completed successfully\n" + STRING_SUCCESS, "reg: The operation completed successfully\n" STRING_INVALID_KEY, "reg: Invalid registry key\n" STRING_INVALID_CMDLINE, "reg: Invalid command line parameters\n" STRING_NO_REMOTE, "reg: Unable to access remote machine\n" @@ -125,7 +125,7 @@ STRINGTABLE STRING_YESNO, " (Yes|No)" STRING_YES, "#msgctxt#Yes key#Y" STRING_NO, "#msgctxt#No key#N" - STRING_CANCELLED, "The registry operation was cancelled\n" + STRING_CANCELLED, "reg: The registry operation was cancelled\n" STRING_DEFAULT_VALUE, "(Default)" STRING_DELETE_VALUE, "Are you sure you want to delete the registry value '%1'?" STRING_DELETE_VALUEALL, "Are you sure you want to delete all registry values in '%1'?"
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/delete.c | 2 +- programs/reg/query.c | 2 +- programs/reg/reg.rc | 2 +- programs/reg/resource.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/programs/reg/delete.c b/programs/reg/delete.c index c80b622bccb..519d4b880ec 100644 --- a/programs/reg/delete.c +++ b/programs/reg/delete.c @@ -96,7 +96,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS) { RegCloseKey(key); - output_message(STRING_CANNOT_FIND); + output_message(STRING_VALUE_NONEXIST); return 1; } } diff --git a/programs/reg/query.c b/programs/reg/query.c index a82101a0a29..656ac875ec4 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -174,7 +174,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL recurse) { if (value_name && *value_name) { - output_message(STRING_CANNOT_FIND); + output_message(STRING_VALUE_NONEXIST); return 1; } output_string(fmt, path); diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 87ea1e2323d..abfed18b93b 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -116,7 +116,7 @@ STRINGTABLE STRING_INVALID_KEY, "reg: Invalid registry key\n" STRING_INVALID_CMDLINE, "reg: Invalid command line parameters\n" STRING_NO_REMOTE, "reg: Unable to access remote machine\n" - STRING_CANNOT_FIND, "reg: The system was unable to find the specified registry key or value\n" + STRING_VALUE_NONEXIST, "reg: Unable to find the specified registry value\n" STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 188b2d13cf4..8b0d9de7653 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -29,7 +29,7 @@ #define STRING_INVALID_KEY 106 #define STRING_INVALID_CMDLINE 107 #define STRING_NO_REMOTE 108 -#define STRING_CANNOT_FIND 109 +#define STRING_VALUE_NONEXIST 109 #define STRING_UNSUPPORTED_TYPE 110 #define STRING_MISSING_INTEGER 111 #define STRING_MISSING_HEXDATA 112
-
Hugh McMaster