[PATCH 6/8] reg/tests: Test the effects of comments and new lines that appear between valid hex data lines
Hugh McMaster
hugh.mcmaster at outlook.com
Tue Jun 27 04:06:31 CDT 2017
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/tests/reg.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 100 insertions(+)
diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index 931e089cef..fea7403d8f 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -2013,6 +2013,56 @@ static void test_import(void)
todo_wine verify_reg_nonexist(hkey, "Wine59a");
todo_wine verify_reg_nonexist(hkey, "Wine59b");
+ test_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60a\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,63,61,74,\\\n"
+ ";comment\n"
+ " 65,6e,\\;comment\n"
+ " 61,74,69,6f,6e,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg(hkey, "Wine60a", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
+ test_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60b\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,63,61,74,\\\n"
+ " ;comment\n"
+ " 65,6e,\\;comment\n"
+ " 61,74,69,6f,6e,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg(hkey, "Wine60b", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
+ test_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60c\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,63,61,74,\\\n"
+ "#comment\n"
+ " 65,6e,\\;comment\n"
+ " 61,74,69,6f,6e,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg_nonexist(hkey, "Wine60c");
+
+ test_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60d\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,63,61,74,\\\n"
+ " #comment\n"
+ " 65,6e,\\;comment\n"
+ " 61,74,69,6f,6e,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg_nonexist(hkey, "Wine60d");
+
+ test_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60e\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,\\\n\n"
+ " 63,61,74,\\\n\n\n"
+ " 65,6e,\\\n\n\n\n"
+ " 61,74,69,6f,6e,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
err = RegCloseKey(hkey);
todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);
@@ -3211,6 +3261,56 @@ static void test_unicode_import(void)
todo_wine verify_reg_nonexist(hkey, "Wine59a");
todo_wine verify_reg_nonexist(hkey, "Wine59b");
+ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+ " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n"
+ ";comment\n"
+ " 65,00,6e,00,\\;comment\n"
+ " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg(hkey, "Wine60a", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
+ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+ " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n"
+ " ;comment\n"
+ " 65,00,6e,00,\\;comment\n"
+ " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg(hkey, "Wine60b", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
+ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60c\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n"
+ "#comment\n"
+ " 65,00,6e,00,\\;comment\n"
+ " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg_nonexist(hkey, "Wine60c");
+
+ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+ " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n"
+ " #comment\n"
+ " 65,00,6e,00,\\;comment\n"
+ " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg_nonexist(hkey, "Wine60d");
+
+ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine60e\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+ " 63,00,6f,00,6e,00,\\\n\n"
+ " 63,00,61,00,74,00,\\\n\n\n"
+ " 65,00,6e,00,\\\n\n\n\n"
+ " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ todo_wine verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
err = RegCloseKey(hkey);
todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);
--
2.11.0
More information about the wine-patches
mailing list