December 2017 - Wine-commits

Hugh McMaster : reg: Export the registry file header.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: fefae9ca78fdcfc5c789a8ab9007191c9b9f7cc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fefae9ca78fdcfc5c789a8ab9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:16 2017 +0000 reg: Export the registry file header. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index 81ffd22..d34878b 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);

1 0

Hugh McMaster : reg: Export the name of the specified registry key.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: ab3ee817c30aa7592cf8222b55eae2dedbf300a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab3ee817c30aa7592cf8222b5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:18 2017 +0000 reg: Export the name of the specified registry key. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index d34878b..f98ca1f 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);

1 0

Hugh McMaster : reg: Export registry value names.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 879282ec1481f80f6f93fa7d4624107cc8c0b6fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=879282ec1481f80f6f93fa7d4… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:19 2017 +0000 reg: Export registry value names. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f98ca1f..b94d79f 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 62299aa..f1fa8e6 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);

1 0

Hugh McMaster : reg: Export REG_SZ data.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 2af9d75ba5158a2614633408b9374c1044ef3280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2af9d75ba5158a2614633408b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:20 2017 +0000 reg: Export REG_SZ data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 58 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index b94d79f..ff16963 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -107,6 +107,20 @@ static size_t export_value_name(HANDLE hFile, WCHAR *name, size_t len) return line_len; } +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 = heap_xalloc((line_len + 3) * sizeof(WCHAR)); + sprintfW(*buf, fmt, str); + heap_free(str); +} + static void export_newline(HANDLE hFile) { static const WCHAR newline[] = {'\r','\n',0}; @@ -114,6 +128,25 @@ static void export_newline(HANDLE hFile) write_file(hFile, newline); } +static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, + DWORD type, void *data, size_t size) +{ + WCHAR *buf = NULL; + + export_value_name(hFile, value_name, value_len); + + if (type == REG_SZ) + { + export_string_data(&buf, data, size); + write_file(hFile, buf); + heap_free(buf); + } + else + FIXME(": export of data type [0x%x] not yet implemented\n", type); + + export_newline(hFile); +} + static void export_key_name(HANDLE hFile, WCHAR *name) { static const WCHAR fmt[] = {'\r','\n','[','%','s',']','\r','\n',0}; @@ -129,34 +162,45 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) { LONG rc; DWORD max_value_len = 256, value_len; - DWORD i; + DWORD max_data_bytes = 2048, data_size; + DWORD i, type; WCHAR *value_name; + BYTE *data; export_key_name(hFile, path); value_name = heap_xalloc(max_value_len * sizeof(WCHAR)); + data = heap_xalloc(max_data_bytes); i = 0; for (;;) { value_len = max_value_len; - rc = RegEnumValueW(key, i, value_name, &value_len, NULL, NULL, NULL, NULL); + data_size = max_data_bytes; + rc = RegEnumValueW(key, i, value_name, &value_len, NULL, &type, data, &data_size); if (rc == ERROR_SUCCESS) { - export_value_name(hFile, value_name, value_len); - FIXME(": export of data types not yet implemented\n"); - export_newline(hFile); + export_data(hFile, value_name, value_len, type, data, data_size); i++; } else if (rc == ERROR_MORE_DATA) { - max_value_len *= 2; - value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + if (data_size > max_data_bytes) + { + max_data_bytes = data_size; + data = heap_xrealloc(data, max_data_bytes); + } + else + { + max_value_len *= 2; + value_name = heap_xrealloc(value_name, max_value_len * sizeof(WCHAR)); + } } else break; } + heap_free(data); heap_free(value_name); return 0; }

1 0

Hugh McMaster : reg: Export hex data types.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: b31f16885dab1871c820ae6aaf788b4482cc78cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=b31f16885dab1871c820ae6aa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:21 2017 +0000 reg: Export hex data types. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 79 +++++++++++++++++++++++++++++++++++++++++++----- programs/reg/tests/reg.c | 4 +-- 2 files changed, 73 insertions(+), 10 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index ff16963..6e59ca4 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -20,12 +20,9 @@ #include <stdlib.h> #include <wine/unicode.h> -#include <wine/debug.h> #include "reg.h" -WINE_DEFAULT_DEBUG_CHANNEL(reg); - static void write_file(HANDLE hFile, const WCHAR *str) { DWORD written; @@ -121,6 +118,62 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) heap_free(str); } +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}; + size_t line_len; + + if (type == REG_BINARY) + { + line_len = lstrlenW(hex); + write_file(hFile, hex); + } + else + { + WCHAR *buf = heap_xalloc(15 * sizeof(WCHAR)); + line_len = sprintfW(buf, hexp_fmt, type); + write_file(hFile, buf); + heap_free(buf); + } + + return line_len; +} + +#define MAX_HEX_CHARS 77 + +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); + + if (!size) return; + + num_commas = size - 1; + *buf = heap_xalloc(size * 3 * sizeof(WCHAR)); + + for (i = 0, pos = 0; i < size; i++) + { + pos += sprintfW(*buf + pos, fmt, ((BYTE *)data)[i]); + if (i == num_commas) break; + (*buf)[pos++] = ','; + (*buf)[pos] = 0; + line_len += 3; + + if (line_len >= MAX_HEX_CHARS) + { + write_file(hFile, *buf); + write_file(hFile, hex_concat); + line_len = 2; + pos = 0; + } + } +} + static void export_newline(HANDLE hFile) { static const WCHAR newline[] = {'\r','\n',0}; @@ -132,17 +185,27 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, DWORD type, void *data, size_t size) { WCHAR *buf = NULL; + size_t line_len = export_value_name(hFile, value_name, value_len); - export_value_name(hFile, value_name, value_len); - - if (type == REG_SZ) + switch (type) { + case REG_SZ: export_string_data(&buf, data, size); + break; + case REG_NONE: + case REG_EXPAND_SZ: + case REG_BINARY: + case REG_MULTI_SZ: + default: + export_hex_data(hFile, &buf, type, line_len, data, size); + break; + } + + if (size || type == REG_SZ) + { write_file(hFile, buf); heap_free(buf); } - else - FIXME(": export of data type [0x%x] not yet implemented\n", type); export_newline(hFile); } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index f1fa8e6..88ec308 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4536,7 +4536,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &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"); + ok(compare_export("file.reg", empty_hex_test, 0), "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); 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"); + ok(compare_export("file.reg", empty_hex_test2, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : reg: Export REG_DWORD values.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 491801063fae82b6cb63e3eaa710b0b698f76b38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=491801063fae82b6cb63e3eaa… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:23 2017 +0000 reg: Export REG_DWORD values. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 15 +++++++++++++++ programs/reg/tests/reg.c | 4 ++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index 6e59ca4..b566263 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -118,6 +118,14 @@ static void export_string_data(WCHAR **buf, WCHAR *data, size_t size) heap_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 = heap_xalloc(15 * sizeof(WCHAR)); + sprintfW(*buf, fmt, *data); +} + static size_t export_hex_data_type(HANDLE hFile, DWORD type) { static const WCHAR hex[] = {'h','e','x',':',0}; @@ -192,6 +200,13 @@ static void export_data(HANDLE hFile, WCHAR *value_name, DWORD value_len, case REG_SZ: export_string_data(&buf, data, size); break; + case REG_DWORD: + if (size) + { + export_dword_data(&buf, data); + break; + } + /* fall through */ case REG_NONE: case REG_EXPAND_SZ: case REG_BINARY: diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 88ec308..1ec9ca0 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4451,7 +4451,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &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"); + ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); @@ -4573,7 +4573,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &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"); + ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); delete_key(HKEY_CURRENT_USER, KEY_BASE); }

1 0

Hugh McMaster : reg: Recursively export all subkeys and data.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 72db61da978d7c825dd0f413ca13c1c99d2867ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=72db61da978d7c825dd0f413c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:24 2017 +0000 reg: Recursively export all subkeys and data. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 33 +++++++++++++++++++++++++++++++-- programs/reg/reg.c | 2 +- programs/reg/reg.h | 1 + programs/reg/tests/reg.c | 4 ++-- 4 files changed, 35 insertions(+), 5 deletions(-) diff --git a/programs/reg/export.c b/programs/reg/export.c index b566263..ac570a6 100644 --- a/programs/reg/export.c +++ b/programs/reg/export.c @@ -236,14 +236,18 @@ static void export_key_name(HANDLE hFile, WCHAR *name) heap_free(buf); } +#define MAX_SUBKEY_LEN 257 + static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) { LONG rc; DWORD max_value_len = 256, value_len; DWORD max_data_bytes = 2048, data_size; - DWORD i, type; - WCHAR *value_name; + DWORD subkey_len; + DWORD i, type, path_len; + WCHAR *value_name, *subkey_name, *subkey_path; BYTE *data; + HKEY subkey; export_key_name(hFile, path); @@ -280,6 +284,31 @@ static int export_registry_data(HANDLE hFile, HKEY key, WCHAR *path) heap_free(data); heap_free(value_name); + + subkey_name = heap_xalloc(MAX_SUBKEY_LEN * sizeof(WCHAR)); + + path_len = lstrlenW(path); + + i = 0; + for (;;) + { + subkey_len = MAX_SUBKEY_LEN; + rc = RegEnumKeyExW(key, i, subkey_name, &subkey_len, NULL, NULL, NULL, NULL); + if (rc == ERROR_SUCCESS) + { + subkey_path = build_subkey_path(path, path_len, subkey_name, subkey_len); + if (!RegOpenKeyExW(key, subkey_name, 0, KEY_READ, &subkey)) + { + export_registry_data(hFile, subkey, subkey_path); + RegCloseKey(subkey); + } + heap_free(subkey_path); + i++; + } + else break; + } + + heap_free(subkey_name); return 0; } diff --git a/programs/reg/reg.c b/programs/reg/reg.c index a3e2cf7..33e381c 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -637,7 +637,7 @@ static void output_value(const WCHAR *value_name, DWORD type, BYTE *data, DWORD output_string(newlineW); } -static WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) +WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD subkey_len) { WCHAR *subkey_path; static const WCHAR fmt[] = {'%','s','\\','%','s',0}; diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 35f22a5..2132e92 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -31,6 +31,7 @@ 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); +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); /* import.c */ diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1ec9ca0..81c9495 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -4489,7 +4489,7 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &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"); + ok(compare_export("file.reg", complex_test, 0), "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); 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"); + ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n"); delete_key(hkey, "Subkey1"); delete_key(hkey, "Subkey2");

1 0

Józef Kucia : d3dx9: Avoid passing FALSE as D3DRS_CLIPPLANEENABLE bitmask.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: 5831e884f511506479cba8ff0116b111397ca3ee URL: http://source.winehq.org/git/wine.git/?a=commit;h=5831e884f511506479cba8ff0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Dec 2 10:24:44 2017 +0100 d3dx9: Avoid passing FALSE as D3DRS_CLIPPLANEENABLE bitmask. D3DRS_CLIPPLANEENABLE is mask, not a boolean value. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/sprite.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/sprite.c b/dlls/d3dx9_36/sprite.c index 17ad16a..2ff2b41 100644 --- a/dlls/d3dx9_36/sprite.c +++ b/dlls/d3dx9_36/sprite.c @@ -209,7 +209,7 @@ static void set_states(struct d3dx9_sprite *object) IDirect3DDevice9_SetRenderState(object->device, D3DRS_ALPHATESTENABLE, object->alphacmp_caps); IDirect3DDevice9_SetRenderState(object->device, D3DRS_BLENDOP, D3DBLENDOP_ADD); IDirect3DDevice9_SetRenderState(object->device, D3DRS_CLIPPING, TRUE); - IDirect3DDevice9_SetRenderState(object->device, D3DRS_CLIPPLANEENABLE, FALSE); + IDirect3DDevice9_SetRenderState(object->device, D3DRS_CLIPPLANEENABLE, 0); IDirect3DDevice9_SetRenderState(object->device, D3DRS_COLORWRITEENABLE, D3DCOLORWRITEENABLE_ALPHA | D3DCOLORWRITEENABLE_BLUE | D3DCOLORWRITEENABLE_GREEN | D3DCOLORWRITEENABLE_RED); IDirect3DDevice9_SetRenderState(object->device, D3DRS_CULLMODE, D3DCULL_NONE);

1 0

Hugh McMaster : reg: Add initial support for the export operation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

1 0

Hugh McMaster : reg: Add basic syntax checks for the export operation.
by Alexandre Julliard 04 Dec '17

04 Dec '17

Module: wine Branch: master Commit: d4255506d5196a0905dff31a91ca804ad6a87cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4255506d5196a0905dff31a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Sun Dec 3 06:50:10 2017 +0000 reg: Add basic syntax checks for the export operation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/export.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/programs/reg/export.c b/programs/reg/export.c index f4318ef..530d11b 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; }

1 0