Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/tests/export.c | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 27d70b6a663..d2598dd8d48 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -335,6 +335,7 @@ static void test_export(void) ""Wine2a"=hex(1):\n" ""Wine2b"=hex(3):\n" ""Wine2c"=hex(4):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine2a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine2b", REG_BINARY, NULL, 0, 0); @@ -351,6 +352,7 @@ static void test_export(void) ""Wine3a"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" ""Wine3b"=hex(3):12,34,56,78\n" ""Wine3c"=hex(4):40,30,20,10\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); memcpy(hex, "\x12\x34\x56\x78", 4);
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/tests/copy.c | 141 ++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 106 ++++++++++++------------- programs/reg/tests/reg_test.h | 4 + 3 files changed, 198 insertions(+), 53 deletions(-)
diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 7126b00d50e..579d91a35ab 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -256,6 +256,145 @@ static void test_copy_simple_data(void) todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); }
+static void test_copy_complex_data(void) +{ + HKEY hkey, subkey; + DWORD r, dword; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + + add_key(hkey, "Subkey1", &subkey); + add_value(subkey, "Binary", REG_BINARY, "\x11\x22\x33\x44", 4); + add_value(subkey, "Undefined hex", 0x100, "%PATH%", 7); + close_key(subkey); + + add_key(hkey, "Subkey2a", &subkey); + add_value(subkey, "double"quote", REG_SZ, ""Hello, World!"", 16); + dword = 0x8; + add_value(subkey, "single'quote", REG_DWORD, &dword, sizeof(dword)); + close_key(subkey); + + add_key(hkey, "Subkey2a\Subkey2b", &subkey); + add_value(subkey, NULL, REG_SZ, "Default value name", 19); + add_value(subkey, "Multiple strings", REG_MULTI_SZ, "Line1\0Line2\0Line3\0", 19); + close_key(subkey); + + add_key(hkey, "Subkey3a", &subkey); + add_value(subkey, "Backslash", REG_SZ, "Use \\ to escape a backslash", 29); + close_key(subkey); + + add_key(hkey, "Subkey3a\Subkey3b\Subkey3c", &subkey); + add_value(subkey, "String expansion", REG_EXPAND_SZ, "%HOME%\%PATH%", 14); + add_value(subkey, "Zero data type", REG_NONE, "Value", 6); + close_key(subkey); + + add_key(hkey, "Subkey4", &subkey); + dword = 0x12345678; + add_value(subkey, NULL, REG_DWORD, &dword, sizeof(dword)); + add_value(subkey, "43981", 0xabcd, "Value", 6); + close_key(subkey); + + close_key(hkey); + + /* Copy values only */ + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + 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); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + /* Copy subkeys and values */ + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + 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); + todo_wine ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); +} + +static void test_copy_hex_data(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + /* Try copying empty hex values */ + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_value(hkey, "Wine1a", REG_NONE, NULL, 0); + add_value(hkey, "Wine1b", REG_SZ, NULL, 0); + add_value(hkey, "Wine1c", REG_EXPAND_SZ, NULL, 0); + add_value(hkey, "Wine1d", REG_BINARY, NULL, 0); + add_value(hkey, "Wine1e", REG_DWORD, NULL, 0); + add_value(hkey, "Wine1f", REG_MULTI_SZ, NULL, 0); + add_value(hkey, "Wine1g", 0x100, NULL, 0); + add_value(hkey, "Wine1h", 0xabcd, NULL, 0); + close_key(hkey); + + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\" KEY_BASE " file.reg /y", &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"); + + delete_key(HKEY_CURRENT_USER, COPY_SRC); + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Try copying after importing alternative registry data types */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\" COPY_SRC "]\n" + ""Wine2a"=hex(1):\n" + ""Wine2b"=hex(3):\n" + ""Wine2c"=hex(4):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\" KEY_BASE " file.reg /y", &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"); + + delete_key(HKEY_CURRENT_USER, COPY_SRC); + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + /* Try copying more complex hex data */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\" COPY_SRC "]\n" + ""Wine3a"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" + ""Wine3b"=hex(3):12,34,56,78\n" + ""Wine3c"=hex(4):40,30,20,10\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + 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); + todo_wine ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); +} + START_TEST(copy) { DWORD r; @@ -268,4 +407,6 @@ START_TEST(copy) test_command_syntax(); test_copy_empty_key(); test_copy_simple_data(); + test_copy_complex_data(); + test_copy_hex_data(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index d2598dd8d48..8ea9bda3f1c 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -73,6 +73,58 @@ const char *simple_data_test = ""DWORD"=dword:00000100\r\n" ""String"="Your text here..."\r\n\r\n";
+const char *complex_data_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" + ""DWORD"=dword:00000100\r\n" + ""String"="Your text here..."\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey1]\r\n" + ""Binary"=hex:11,22,33,44\r\n" + ""Undefined hex"=hex(100):25,50,41,54,48,25,00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey2a]\r\n" + ""double\"quote"="\"Hello, World!\""\r\n" + ""single'quote"=dword:00000008\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey2a\Subkey2b]\r\n" + "@="Default value name"\r\n" + ""Multiple strings"=hex(7):4c,00,69,00,6e,00,65,00,31,00,00,00,4c,00,69,00,6e,\\r\n" + " 00,65,00,32,00,00,00,4c,00,69,00,6e,00,65,00,33,00,00,00,00,00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey3a]\r\n" + ""Backslash"="Use \\\\ to escape a backslash"\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey3a\Subkey3b]\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey3a\Subkey3b\Subkey3c]\r\n" + ""String expansion"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,25,00,50,\\r\n" + " 00,41,00,54,00,48,00,25,00,00,00\r\n" + ""Zero data type"=hex(0):56,61,6c,75,65,00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey4]\r\n" + "@=dword:12345678\r\n" + ""43981"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; + +const char *empty_hex_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" + ""Wine1a"=hex(0):\r\n" + ""Wine1b"=""\r\n" + ""Wine1c"=hex(2):\r\n" + ""Wine1d"=hex:\r\n" + ""Wine1e"=hex(4):\r\n" + ""Wine1f"=hex(7):\r\n" + ""Wine1g"=hex(100):\r\n" + ""Wine1h"=hex(abcd):\r\n\r\n"; + +const char *empty_hex_test2 = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" + ""Wine2a"=""\r\n" + ""Wine2b"=hex:\r\n" + ""Wine2c"=hex(4):\r\n\r\n"; + +const char *hex_types_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" + ""Wine3a"="Value"\r\n" + ""Wine3b"=hex:12,34,56,78\r\n" + ""Wine3c"=dword:10203040\r\n\r\n"; +
/* Unit tests */
@@ -83,32 +135,6 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8];
- const char *complex_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" - ""DWORD"=dword:00000100\r\n" - ""String"="Your text here..."\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey1]\r\n" - ""Binary"=hex:11,22,33,44\r\n" - ""Undefined hex"=hex(100):25,50,41,54,48,25,00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey2a]\r\n" - ""double\"quote"="\"Hello, World!\""\r\n" - ""single'quote"=dword:00000008\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey2a\Subkey2b]\r\n" - "@="Default value name"\r\n" - ""Multiple strings"=hex(7):4c,00,69,00,6e,00,65,00,31,00,00,00,4c,00,69,00,6e,\\r\n" - " 00,65,00,32,00,00,00,4c,00,69,00,6e,00,65,00,33,00,00,00,00,00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey3a]\r\n" - ""Backslash"="Use \\\\ to escape a backslash"\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey3a\Subkey3b]\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey3a\Subkey3b\Subkey3c]\r\n" - ""String expansion"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,25,00,50,\\r\n" - " 00,41,00,54,00,48,00,25,00,00,00\r\n" - ""Zero data type"=hex(0):56,61,6c,75,65,00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\Subkey4]\r\n" - "@=dword:12345678\r\n" - ""43981"=hex(abcd):56,61,6c,75,65,00\r\n\r\n"; - const char *key_order_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n\r\n" @@ -121,32 +147,6 @@ static void test_export(void) ""Value 2"="I was added first!"\r\n" ""Value 1"="I was added second!"\r\n\r\n";
- const char *empty_hex_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" - ""Wine1a"=hex(0):\r\n" - ""Wine1b"=""\r\n" - ""Wine1c"=hex(2):\r\n" - ""Wine1d"=hex:\r\n" - ""Wine1e"=hex(4):\r\n" - ""Wine1f"=hex(7):\r\n" - ""Wine1g"=hex(100):\r\n" - ""Wine1h"=hex(abcd):\r\n\r\n"; - - const char *empty_hex_test2 = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" - ""Wine2a"=""\r\n" - ""Wine2b"=hex:\r\n" - ""Wine2c"=hex(4):\r\n\r\n"; - - const char *hex_types_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" - ""Wine3a"="Value"\r\n" - ""Wine3b"=hex:12,34,56,78\r\n" - ""Wine3c"=dword:10203040\r\n\r\n"; - const char *embedded_null_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" @@ -286,7 +286,7 @@ static void test_export(void)
run_reg_exe("reg export HKEY_CURRENT_USER\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", complex_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n"); delete_tree(HKEY_CURRENT_USER, KEY_BASE);
/* Test the export order of registry keys */ diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 3f4677a7a69..40880fa6c0a 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -80,6 +80,10 @@ BOOL compare_export_(const char *file, unsigned line, const char *filename, const char *expected, DWORD todo); extern const char *empty_key_test; extern const char *simple_data_test; +extern const char *complex_data_test; +extern const char *empty_hex_test; +extern const char *empty_hex_test2; +extern const char *hex_types_test;
/* import.c */ #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r)
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com --- programs/reg/tests/copy.c | 93 +++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 58 +++++++++++----------- programs/reg/tests/reg_test.h | 3 ++ 3 files changed, 125 insertions(+), 29 deletions(-)
diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 579d91a35ab..3ed75acad4d 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -395,6 +395,96 @@ static void test_copy_hex_data(void) todo_wine ok(compare_export("file.reg", hex_types_test, 0), "compare_export() failed\n"); }
+static void test_copy_embedded_null_values(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\" COPY_SRC "]\n" + ""Wine4a"=dword:00000005\n" + ""Wine4b"=hex(1):00,00,00,00,00,00,00,00\n" + ""Wine4c"="Value"\n" + ""Wine4d"=hex(1):00,00,61,00,62,00,63,00\n" + ""Wine4e"=dword:00000100\n" + ""Wine4f"=hex(1):00,00,56,00,61,00,6c,00,75,00,65,00,00,00\n" + ""Wine4g"="Value2"\n" + ""Wine4h"=hex(1):61,00,62,00,63,00,00,00, \\n" + " 64,00,65,00,66,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + 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); + todo_wine ok(compare_export("file.reg", embedded_null_test, 0), "compare_export() failed\n"); +} + +static void test_copy_slashes(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_key(hkey, "https://winehq.org", NULL); + add_value(hkey, "count/up", REG_SZ, "one/two/three", 14); + add_value(hkey, "\foo\bar", REG_SZ, "", 1); + close_key(hkey); + + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", slashes_test, 0), "compare_export() failed\n"); +} + +static void test_copy_escaped_null_values(void) +{ + HKEY hkey; + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + add_value(hkey, "Wine5a", REG_SZ, "\0", 3); + add_value(hkey, "Wine5b", REG_SZ, "\0\0", 5); + add_value(hkey, "Wine5c", REG_SZ, "Value1\0", 9); + add_value(hkey, "Wine5d", REG_SZ, "Value2\0\0\0\0", 15); + add_value(hkey, "Wine5e", REG_SZ, "Value3\0Value4", 15); + add_value(hkey, "Wine5f", REG_SZ, "\0Value5", 9); + close_key(hkey); + + run_reg_exe("reg copy HKCU\" COPY_SRC " HKCU\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", escaped_null_test, 0), "compare_export() failed\n"); + + delete_key(HKEY_CURRENT_USER, COPY_SRC); + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); +} + START_TEST(copy) { DWORD r; @@ -409,4 +499,7 @@ START_TEST(copy) test_copy_simple_data(); test_copy_complex_data(); test_copy_hex_data(); + test_copy_embedded_null_values(); + test_copy_slashes(); + test_copy_escaped_null_values(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 8ea9bda3f1c..be1d9ea4f86 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -125,6 +125,35 @@ const char *hex_types_test = ""Wine3b"=hex:12,34,56,78\r\n" ""Wine3c"=dword:10203040\r\n\r\n";
+const char *embedded_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" + ""Wine4a"=dword:00000005\r\n" + ""Wine4b"=""\r\n" + ""Wine4c"="Value"\r\n" + ""Wine4d"=""\r\n" + ""Wine4e"=dword:00000100\r\n" + ""Wine4f"=""\r\n" + ""Wine4g"="Value2"\r\n" + ""Wine4h"="abc"\r\n\r\n"; + +const char *slashes_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" + ""count/up"="one/two/three"\r\n" + ""\\foo\\bar"=""\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "\https://winehq.org%5D%5Cr%5Cn%5Cr%5Cn"; + +const char *escaped_null_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" + ""Wine5a"="\\0"\r\n" + ""Wine5b"="\\0\\0"\r\n" + ""Wine5c"="Value1\\0"\r\n" + ""Wine5d"="Value2\\0\\0\\0\\0"\r\n" + ""Wine5e"="Value3\\0Value4"\r\n" + ""Wine5f"="\\0Value5"\r\n\r\n"; +
/* Unit tests */
@@ -147,35 +176,6 @@ static void test_export(void) ""Value 2"="I was added first!"\r\n" ""Value 1"="I was added second!"\r\n\r\n";
- const char *embedded_null_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" - ""Wine4a"=dword:00000005\r\n" - ""Wine4b"=""\r\n" - ""Wine4c"="Value"\r\n" - ""Wine4d"=""\r\n" - ""Wine4e"=dword:00000100\r\n" - ""Wine4f"=""\r\n" - ""Wine4g"="Value2"\r\n" - ""Wine4h"="abc"\r\n\r\n"; - - const char *slashes_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" - ""count/up"="one/two/three"\r\n" - ""\\foo\\bar"=""\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "\https://winehq.org%5D%5Cr%5Cn%5Cr%5Cn"; - - const char *escaped_null_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\" KEY_BASE "]\r\n" - ""Wine5a"="\\0"\r\n" - ""Wine5b"="\\0\\0"\r\n" - ""Wine5c"="Value1\\0"\r\n" - ""Wine5d"="Value2\\0\\0\\0\\0"\r\n" - ""Wine5e"="Value3\\0Value4"\r\n" - ""Wine5f"="\\0Value5"\r\n\r\n"; - delete_tree(HKEY_CURRENT_USER, KEY_BASE); verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE);
diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 40880fa6c0a..14636b4edc9 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -84,6 +84,9 @@ extern const char *complex_data_test; extern const char *empty_hex_test; extern const char *empty_hex_test2; extern const char *hex_types_test; +extern const char *slashes_test; +extern const char *embedded_null_test; +extern const char *escaped_null_test;
/* import.c */ #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r)
-
Hugh McMaster