December 2017 - Wine-Devel - list.winehq.org

[PATCH 09/13] reg: Export registry value names
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 124 +++++++++++++++++++++++++++++++++++++++++++++-- programs/reg/tests/reg.c | 20 ++++---- 2 files changed, 131 insertions(+), 13 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index f98ca1f89b..b94d79f27a 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -33,6 +33,87 @@ static void write_file(HANDLE hFile, const WCHAR *str) WriteFile(hFile, str, lstrlenW(str) * sizeof(WCHAR), &written, NULL); } +static WCHAR *escape_string(WCHAR *str, size_t str_len, size_t *line_len) +{ + size_t i, escape_count, pos; + WCHAR *buf; + + for (i = 0, escape_count = 0; i < str_len; i++) + { + WCHAR c = str[i]; + if (c == '\r' || c == '\n' || c == '\\' || c == '"' || c == '\0') + escape_count++; + } + + buf = heap_xalloc((str_len + escape_count + 1) * sizeof(WCHAR)); + + for (i = 0, pos = 0; i < str_len; i++, pos++) + { + WCHAR c = str[i]; + + switch (c) + { + case '\r': + buf[pos++] = '\\'; + buf[pos] = 'r'; + break; + case '\n': + buf[pos++] = '\\'; + buf[pos] = 'n'; + break; + case '\\': + buf[pos++] = '\\'; + buf[pos] = '\\'; + break; + case '"': + buf[pos++] = '\\'; + buf[pos] = '"'; + break; + case '\0': + buf[pos++] = '\\'; + buf[pos] = '0'; + break; + default: + buf[pos] = c; + } + } + + buf[pos] = 0; + *line_len = pos; + return buf; +} + +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}; + size_t line_len; + + if (name && *name) + { + WCHAR *str = escape_string(name, len, &line_len); + WCHAR *buf = heap_xalloc((line_len + 4) * sizeof(WCHAR)); + line_len = sprintfW(buf, quoted_fmt, str); + write_file(hFile, buf); + heap_free(buf); + heap_free(str); + } + else + { + line_len = lstrlenW(default_name); + write_file(hFile, default_name); + } + + return line_len; +} + +static void export_newline(HANDLE hFile) +{ + static const WCHAR newline[] = {'\r','\n',0}; + + write_file(hFile, newline); +} + static void export_key_name(HANDLE hFile, WCHAR *name) { static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; @@ -44,6 +125,42 @@ static void export_key_name(HANDLE hFile, WCHAR *name) heap_free(buf); } +static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) +{ + LONG rc; + DWORD max_value_len = 256, value_len; + DWORD i; + WCHAR *value_name; + + export_key_name(hFile, path); + + value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + + i = 0; + for (;;) + { + value_len = max_value_len; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, NULL, NULL, NULL); + + if (rc == ERROR_SUCCESS) + { + export_value_name(hFile, value_name, value_len); + FIXME(": export of data types not yet implemented\n"); + export_newline(hFile); + i++; + } + else if (rc == ERROR_MORE_DATA) + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } + else break; + } + + heap_free(value_name); + return 0; +} + static void export_file_header(HANDLE hFile) { static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', @@ -108,6 +225,7 @@ int reg_export(int argc, WCHAR *argv[]) WCHAR *path, *long_key; BOOL overwrite_file = FALSE; HANDLE hFile; + int ret; if (argc == 3 || argc > 5) goto error; @@ -126,13 +244,13 @@ int reg_export(int argc, WCHAR *argv[]) hFile = get_file_handle(argv[3], overwrite_file); export_file_header(hFile); - export_key_name(hFile, long_key); - FIXME(": operation not yet implemented\n"); + ret = export_registry_data(hFile, hkey, long_key); + export_newline(hFile); CloseHandle(hFile); RegCloseKey(hkey); - return 1; + return ret; error: output_message(STRING_INVALID_SYNTAX); diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 62299aa268..f1fa8e6ea5 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4422,7 +4422,7 @@ static void test_export(void) add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); os_version = GetVersion(); major_version = LOBYTE(LOWORD(os_version)); @@ -4437,12 +4437,12 @@ static void test_export(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); } else /* Windows XP (32-bit) and older */ win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); - ok(compare_export("file.reg", empty_key_test, TODO_REG_COMPARE), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); /* Test registry export with a simple data structure */ dword = 0x100; @@ -4450,7 +4450,7 @@ static void test_export(void) add_value(hkey, "String", REG_SZ, "Your text here...", 18); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", simple_test, TODO_REG_COMPARE), "compare_export() failed\n"); /* Test registry export with a complex data structure */ @@ -4488,7 +4488,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", complex_test, TODO_REG_COMPARE), "compare_export() failed\n"); err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); @@ -4502,7 +4502,7 @@ static void test_export(void) RegCloseKey(subkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(hkey, "Subkey1"); @@ -4517,7 +4517,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4535,7 +4535,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4553,7 +4553,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", empty_hex_test2, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4572,7 +4572,7 @@ static void test_export(void) RegCloseKey(hkey); run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(compare_export("file.reg", hex_types_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); -- 2.15.0

1 0

[PATCH 08/13] reg: Export the name of the specified registry key
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index d34878b877..f98ca1f89b 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -33,6 +33,17 @@ static void write_file(HANDLE hFile, const WCHAR *str) WriteFile(hFile, str, lstrlenW(str) * sizeof(WCHAR), &written, NULL); } +static void export_key_name(HANDLE hFile, WCHAR *name) +{ + static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; + WCHAR *buf; + + buf = heap_xalloc((lstrlenW(name) + 7) * sizeof(WCHAR)); + sprintfW(buf, fmt, name); + write_file(hFile, buf); + heap_free(buf); +} + static void export_file_header(HANDLE hFile) { static const WCHAR header[] = { 0xfeff,'W','i','n','d','o','w','s',' ', @@ -115,6 +126,7 @@ int reg_export(int argc, WCHAR *argv[]) hFile = get_file_handle(argv[3], overwrite_file); export_file_header(hFile); + export_key_name(hFile, long_key); FIXME(": operation not yet implemented\n"); CloseHandle(hFile); -- 2.15.0

1 0

[PATCH 07/13] reg: Export the registry file header
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index 81ffd220a3..d34878b877 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -26,6 +26,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); +static void write_file(HANDLE hFile, const WCHAR *str) +{ + DWORD written; + + WriteFile(hFile, str, lstrlenW(str) * sizeof(WCHAR), &written, NULL); +} + +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'}; + + write_file(hFile, header); +} + static HANDLE create_file(const WCHAR *filename, DWORD action) { return CreateFileW(filename, GENERIC_WRITE, 0, NULL, action, FILE_ATTRIBUTE_NORMAL, NULL); @@ -98,6 +114,7 @@ int reg_export(int argc, WCHAR *argv[]) } hFile = get_file_handle(argv[3], overwrite_file); + export_file_header(hFile); FIXME(": operation not yet implemented\n"); CloseHandle(hFile); -- 2.15.0

1 0

[PATCH 06/13] reg: Prompt the user to overwrite the export file if it already exists
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 4 ++-- programs/reg/reg.h | 2 ++ programs/reg/reg.rc | 1 + programs/reg/resource.h | 1 + programs/reg/tests/reg.c | 18 +++++++++--------- 6 files changed, 59 insertions(+), 12 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 9d0d33274e..81ffd220a3 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -17,6 +17,7 @@ */ #include <windows.h> +#include <stdlib.h> #include <wine/unicode.h> #include <wine/debug.h> @@ -25,6 +26,44 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg); +static HANDLE create_file(const WCHAR *filename, DWORD action) +{ + return CreateFileW(filename, GENERIC_WRITE, 0, NULL, action, FILE_ATTRIBUTE_NORMAL, NULL); +} + +static HANDLE get_file_handle(WCHAR *filename, BOOL overwrite_file) +{ + HANDLE hFile = create_file(filename, overwrite_file ? CREATE_ALWAYS : CREATE_NEW); + + if (hFile == INVALID_HANDLE_VALUE) + { + DWORD error = GetLastError(); + + if (error == ERROR_FILE_EXISTS) + { + if (!ask_confirm(STRING_OVERWRITE_FILE, filename)) + { + output_message(STRING_CANCELLED); + exit(0); + } + + hFile = create_file(filename, CREATE_ALWAYS); + } + else + { + WCHAR *str; + + FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | + FORMAT_MESSAGE_IGNORE_INSERTS, NULL, error, 0, (WCHAR *)&str, 0, NULL); + output_writeconsole(str, lstrlenW(str)); + LocalFree(str); + exit(1); + } + } + + return hFile; +} + static BOOL is_overwrite_switch(const WCHAR *s) { if (strlenW(s) > 2) @@ -40,6 +79,8 @@ int reg_export(int argc, WCHAR *argv[]) { HKEY root, hkey; WCHAR *path, *long_key; + BOOL overwrite_file = FALSE; + HANDLE hFile; if (argc == 3 || argc > 5) goto error; @@ -47,7 +88,7 @@ int reg_export(int argc, WCHAR *argv[]) if (!parse_registry_key(argv[2], &root, &path, &long_key)) return 1; - if (argc == 5 && !is_overwrite_switch(argv[4])) + if (argc == 5 && !(overwrite_file = is_overwrite_switch(argv[4]))) goto error; if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) @@ -56,7 +97,9 @@ int reg_export(int argc, WCHAR *argv[]) return 1; } + hFile = get_file_handle(argv[3], overwrite_file); FIXME(": operation not yet implemented\n"); + CloseHandle(hFile); RegCloseKey(hkey); diff --git a/programs/reg/reg.c b/programs/reg/reg.c index e26928470e..a3e2cf730a 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -111,7 +111,7 @@ BOOL heap_free(void *buf) return HeapFree(GetProcessHeap(), 0, buf); } -static void output_writeconsole(const WCHAR *str, DWORD wlen) +void output_writeconsole(const WCHAR *str, DWORD wlen) { DWORD count, ret; @@ -176,7 +176,7 @@ static void WINAPIV output_string(const WCHAR *fmt, ...) } /* ask_confirm() adapted from programs/cmd/builtins.c */ -static BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) +BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info) { HMODULE hmod; WCHAR Ybuffer[4]; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 3b5ab86ff9..35f22a5db6 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -27,7 +27,9 @@ void *heap_xalloc(size_t size); void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); +void output_writeconsole(const WCHAR *str, DWORD wlen); void WINAPIV output_message(unsigned int id, ...); +BOOL ask_confirm(unsigned int msgid, WCHAR *reg_info); HKEY path_get_rootkey(const WCHAR *path); BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 2ac0b22809..9d8cb882c7 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -68,4 +68,5 @@ STRINGTABLE STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" + STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index aef2ca9738..518f92ceac 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -58,3 +58,4 @@ #define STRING_ESCAPE_SEQUENCE 135 #define STRING_EXPORT_USAGE 136 #define STRING_INVALID_SYSTEM_KEY 137 +#define STRING_OVERWRITE_FILE 138 diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9e4a8145a6..62299aa268 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4289,7 +4289,7 @@ static BOOL compare_export_(unsigned line, const char *filename, const char *exp lok(!lstrcmpW(fbuf, wstr), "export data does not match expected data\n"); ret = DeleteFileA(filename); - todo_wine lok(ret, "DeleteFile failed: %u\n", GetLastError()); + lok(ret, "DeleteFile failed: %u\n", GetLastError()); exit: HeapFree(GetProcessHeap(), 0, fbuf); @@ -4442,7 +4442,7 @@ static void test_export(void) else /* Windows XP (32-bit) and older */ win_skip("File overwrite flag [/y] not supported; skipping position tests\n"); - todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_key_test, TODO_REG_COMPARE), "compare_export() failed\n"); /* Test registry export with a simple data structure */ dword = 0x100; @@ -4451,7 +4451,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_test, TODO_REG_COMPARE), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); @@ -4489,7 +4489,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", complex_test, TODO_REG_COMPARE), "compare_export() failed\n"); err = delete_tree(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS, "delete_tree() failed: %d\n", err); @@ -4503,7 +4503,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2"); @@ -4518,7 +4518,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", value_order_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", value_order_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4536,7 +4536,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", empty_hex_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4554,7 +4554,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", empty_hex_test2, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -4573,7 +4573,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", hex_types_test, TODO_REG_COMPARE), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); } -- 2.15.0

1 0

[PATCH 05/13] reg: Validate the registry key before commencing the export operation
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 720b9ef703..9d0d33274e 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -38,7 +38,7 @@ static BOOL is_overwrite_switch(const WCHAR *s) int reg_export(int argc, WCHAR *argv[]) { - HKEY root; + HKEY root, hkey; WCHAR *path, *long_key; if (argc == 3 || argc > 5) @@ -50,7 +50,16 @@ int reg_export(int argc, WCHAR *argv[]) if (argc == 5 && !is_overwrite_switch(argv[4])) goto error; + if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey)) + { + output_message(STRING_INVALID_KEY); + return 1; + } + FIXME(": operation not yet implemented\n"); + + RegCloseKey(hkey); + return 1; error: -- 2.15.0

1 0

[PATCH 04/13] reg: Print a more informative error message if the system key is invalid
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/reg.c | 9 +++--- programs/reg/reg.rc | 1 + programs/reg/resource.h | 73 +++++++++++++++++++++++++------------------------ 3 files changed, 43 insertions(+), 40 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a65bfc8d05..e26928470e 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -878,16 +878,17 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long if (!sane_path(key)) return FALSE; + *path = strchrW(key, '\\'); + if (*path) (*path)++; + *root = path_get_rootkey(key); if (!*root) { - output_message(STRING_INVALID_KEY); + if (*path) *(*path - 1) = 0; + output_message(STRING_INVALID_SYSTEM_KEY, key); return FALSE; } - *path = strchrW(key, '\\'); - if (*path) (*path)++; - *long_key = get_long_key(*root, *path); return TRUE; diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 1647e222fa..2ac0b22809 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -67,4 +67,5 @@ STRINGTABLE STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" + STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 8441638657..aef2ca9738 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -21,39 +21,40 @@ #include <windef.h> /* Translation IDs. */ -#define STRING_USAGE 101 -#define STRING_ADD_USAGE 102 -#define STRING_DELETE_USAGE 103 -#define STRING_QUERY_USAGE 104 -#define STRING_SUCCESS 105 -#define STRING_INVALID_KEY 106 -#define STRING_INVALID_CMDLINE 107 -#define STRING_NO_REMOTE 108 -#define STRING_CANNOT_FIND 109 -#define STRING_UNSUPPORTED_TYPE 110 -#define STRING_MISSING_INTEGER 111 -#define STRING_MISSING_HEXDATA 112 -#define STRING_UNHANDLED_TYPE 113 -#define STRING_OVERWRITE_VALUE 114 -#define STRING_YESNO 115 -#define STRING_YES 116 -#define STRING_NO 117 -#define STRING_CANCELLED 118 -#define STRING_DEFAULT_VALUE 119 -#define STRING_DELETE_VALUE 120 -#define STRING_DELETE_VALUEALL 121 -#define STRING_DELETE_SUBKEY 122 -#define STRING_INVALID_STRING 123 -#define STRING_VALUEALL_FAILED 124 -#define STRING_GENERAL_FAILURE 125 -#define STRING_MATCHES_FOUND 126 -#define STRING_INVALID_SYNTAX 127 -#define STRING_INVALID_OPTION 128 -#define STRING_REG_HELP 129 -#define STRING_FUNC_HELP 130 -#define STRING_VALUE_NOT_SET 131 -#define STRING_IMPORT_USAGE 132 -#define STRING_FILE_NOT_FOUND 133 -#define STRING_OPEN_KEY_FAILED 134 -#define STRING_ESCAPE_SEQUENCE 135 -#define STRING_EXPORT_USAGE 136 +#define STRING_USAGE 101 +#define STRING_ADD_USAGE 102 +#define STRING_DELETE_USAGE 103 +#define STRING_QUERY_USAGE 104 +#define STRING_SUCCESS 105 +#define STRING_INVALID_KEY 106 +#define STRING_INVALID_CMDLINE 107 +#define STRING_NO_REMOTE 108 +#define STRING_CANNOT_FIND 109 +#define STRING_UNSUPPORTED_TYPE 110 +#define STRING_MISSING_INTEGER 111 +#define STRING_MISSING_HEXDATA 112 +#define STRING_UNHANDLED_TYPE 113 +#define STRING_OVERWRITE_VALUE 114 +#define STRING_YESNO 115 +#define STRING_YES 116 +#define STRING_NO 117 +#define STRING_CANCELLED 118 +#define STRING_DEFAULT_VALUE 119 +#define STRING_DELETE_VALUE 120 +#define STRING_DELETE_VALUEALL 121 +#define STRING_DELETE_SUBKEY 122 +#define STRING_INVALID_STRING 123 +#define STRING_VALUEALL_FAILED 124 +#define STRING_GENERAL_FAILURE 125 +#define STRING_MATCHES_FOUND 126 +#define STRING_INVALID_SYNTAX 127 +#define STRING_INVALID_OPTION 128 +#define STRING_REG_HELP 129 +#define STRING_FUNC_HELP 130 +#define STRING_VALUE_NOT_SET 131 +#define STRING_IMPORT_USAGE 132 +#define STRING_FILE_NOT_FOUND 133 +#define STRING_OPEN_KEY_FAILED 134 +#define STRING_ESCAPE_SEQUENCE 135 +#define STRING_EXPORT_USAGE 136 +#define STRING_INVALID_SYSTEM_KEY 137 -- 2.15.0

1 0

[PATCH 03/13] reg: Validate the system key before commencing the export operation
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 6 ++++++ programs/reg/reg.c | 2 +- programs/reg/reg.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 530d11b707..720b9ef703 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -38,9 +38,15 @@ static BOOL is_overwrite_switch(const WCHAR *s) int reg_export(int argc, WCHAR *argv[]) { + HKEY root; + WCHAR *path, *long_key; + if (argc == 3 || argc > 5) goto error; + if (!parse_registry_key(argv[2], &root, &path, &long_key)) + return 1; + if (argc == 5 && !is_overwrite_switch(argv[4])) goto error; diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7affdd282b..a65bfc8d05 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -873,7 +873,7 @@ static WCHAR *get_long_key(HKEY root, WCHAR *path) return long_key; } -static BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key) { if (!sane_path(key)) return FALSE; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index b4751e408c..3b5ab86ff9 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -29,6 +29,7 @@ void *heap_xrealloc(void *buf, size_t size); BOOL heap_free(void *buf); void WINAPIV output_message(unsigned int id, ...); HKEY path_get_rootkey(const WCHAR *path); +BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path, WCHAR **long_key); /* import.c */ int reg_import(const WCHAR *filename); -- 2.15.0

1 0

[PATCH 02/13] reg: Add basic syntax checks for the export operation
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/export.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index f4318eff72..530d11b707 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -18,12 +18,37 @@ #include <windows.h> +#include <wine/unicode.h> #include <wine/debug.h> +#include "reg.h" + WINE_DEFAULT_DEBUG_CHANNEL(reg); +static BOOL is_overwrite_switch(const WCHAR *s) +{ + if (strlenW(s) > 2) + return FALSE; + + if ((s[0] == '/' || s[0] == '-') && (s[1] == 'y' || s[1] == 'Y')) + return TRUE; + + return FALSE; +} + int reg_export(int argc, WCHAR *argv[]) { + if (argc == 3 || argc > 5) + goto error; + + if (argc == 5 && !is_overwrite_switch(argv[4])) + goto error; + FIXME(": operation not yet implemented\n"); return 1; + +error: + output_message(STRING_INVALID_SYNTAX); + output_message(STRING_FUNC_HELP, struprW(argv[1])); + return 1; } -- 2.15.0

1 0

[PATCH 01/13] reg: Add initial support for the export operation
by Hugh McMaster Dec. 3, 2017

Dec. 3, 2017

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/Makefile.in | 1 + programs/reg/export.c | 29 +++++++++++++++++++++++++++++ programs/reg/reg.c | 6 ++++++ programs/reg/reg.h | 3 +++ programs/reg/reg.rc | 3 ++- programs/reg/resource.h | 1 + programs/reg/tests/reg.c | 2 +- 7 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 programs/reg/export.c diff --git a/programs/reg/Makefile.in b/programs/reg/Makefile.in index 256bcde62b..7c6a899362 100644 --- a/programs/reg/Makefile.in +++ b/programs/reg/Makefile.in @@ -4,6 +4,7 @@ IMPORTS = advapi32 DELAYIMPORTS = user32 C_SRCS = \ + export.c \ import.c \ reg.c diff --git a/programs/reg/export.c b/programs/reg/export.c new file mode 100644 index 0000000000..f4318eff72 --- /dev/null +++ b/programs/reg/export.c @@ -0,0 +1,29 @@ +/* + * Copyright 2017 Hugh McMaster + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windows.h> + +#include <wine/debug.h> + +WINE_DEFAULT_DEBUG_CHANNEL(reg); + +int reg_export(int argc, WCHAR *argv[]) +{ + FIXME(": operation not yet implemented\n"); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 42fd6e9daa..7affdd282b 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -908,6 +908,7 @@ enum operations { REG_ADD, REG_DELETE, REG_IMPORT, + REG_EXPORT, REG_QUERY, REG_INVALID }; @@ -919,6 +920,7 @@ static enum operations get_operation(const WCHAR *str, int *op_help) static const WCHAR add[] = {'a','d','d',0}; static const WCHAR delete[] = {'d','e','l','e','t','e',0}; static const WCHAR import[] = {'i','m','p','o','r','t',0}; + static const WCHAR export[] = {'e','x','p','o','r','t',0}; static const WCHAR query[] = {'q','u','e','r','y',0}; static const struct op_info op_array[] = @@ -926,6 +928,7 @@ static enum operations get_operation(const WCHAR *str, int *op_help) { add, REG_ADD, STRING_ADD_USAGE }, { delete, REG_DELETE, STRING_DELETE_USAGE }, { import, REG_IMPORT, STRING_IMPORT_USAGE }, + { export, REG_EXPORT, STRING_EXPORT_USAGE }, { query, REG_QUERY, STRING_QUERY_USAGE }, { NULL, -1, 0 } }; @@ -994,6 +997,9 @@ int wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argvW[2]); + if (op == REG_EXPORT) + return reg_export(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 07bbecf8d5..b4751e408c 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -33,4 +33,7 @@ HKEY path_get_rootkey(const WCHAR *path); /* import.c */ int reg_import(const WCHAR *filename); +/* export.c */ +int reg_export(int argc, WCHAR *argv[]); + #endif /* __REG_H__ */ diff --git a/programs/reg/reg.rc b/programs/reg/reg.rc index 9a00cc1c57..1647e222fa 100644 --- a/programs/reg/reg.rc +++ b/programs/reg/reg.rc @@ -29,7 +29,7 @@ STRINGTABLE STRING_USAGE, "Usage:\n\ \ REG [operation] [parameters]\n\n\ \Supported operations:\n\ -\ ADD | DELETE | IMPORT | QUERY\n\n\ +\ ADD | DELETE | IMPORT | EXPORT | QUERY\n\n\ \For help on a specific operation, type:\n\ \ REG [operation] /?\n\n" STRING_ADD_USAGE, "REG ADD key_name [/v value_name | /ve] [/t type] [/s separator] [/d data] [/f]\n" @@ -66,4 +66,5 @@ STRINGTABLE STRING_FILE_NOT_FOUND, "reg: The file '%1' was not found.\n" STRING_OPEN_KEY_FAILED, "reg: Unable to open the registry key '%1'.\n" STRING_ESCAPE_SEQUENCE, "reg: Unrecognized escape sequence [\\%1!c!]\n" + STRING_EXPORT_USAGE, "REG EXPORT key_name file.reg [/y]\n" } diff --git a/programs/reg/resource.h b/programs/reg/resource.h index 1f2c150d63..8441638657 100644 --- a/programs/reg/resource.h +++ b/programs/reg/resource.h @@ -56,3 +56,4 @@ #define STRING_FILE_NOT_FOUND 133 #define STRING_OPEN_KEY_FAILED 134 #define STRING_ESCAPE_SEQUENCE 135 +#define STRING_EXPORT_USAGE 136 diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0bab8bc2af..9e4a8145a6 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4389,7 +4389,7 @@ static void test_export(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg export /?", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg export \\\\remote-pc\\HKLM\\Wine file.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); -- 2.15.0

1 0

[PATCH 01/29] ANNOUNCE: move WineHQ URLs to https
by Austin English Dec. 2, 2017

Dec. 2, 2017

Signed-off-by: Austin English <austinenglish(a)gmail.com> --- ANNOUNCE | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ANNOUNCE b/ANNOUNCE index 16368ac168..6450ac35d5 100644 --- a/ANNOUNCE +++ b/ANNOUNCE @@ -10,17 +10,17 @@ What's new in this release (see below for details): The source is available from the following locations: - http://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz + https://dl.winehq.org/wine/source/2.x/wine-2.22.tar.xz http://mirrors.ibiblio.org/wine/source/2.x/wine-2.22.tar.xz Binary packages for various distributions will be available from: - http://www.winehq.org/download + https://www.winehq.org/download -You will find documentation on http://www.winehq.org/documentation +You will find documentation on https://www.winehq.org/documentation You can also get the current source directly from the git -repository. Check http://www.winehq.org/git for details. +repository. Check https://wiki.winehq.org/Git_Wine_Tutorial for details. Wine is available thanks to the work of many people. See the file AUTHORS in the distribution for the complete list. -- 2.13.6

2 31