[PATCH 8/8] reg/tests: Test whether EOF invalidates a hex data line ending in a backslash

Hugh McMaster hugh.mcmaster at outlook.com
Tue Jun 27 04:06:48 CDT 2017


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/reg/tests/reg.c | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index 9735f59fbc..8d9dbfa413 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -2073,6 +2073,22 @@ static void test_import(void)
     todo_wine verify_reg_nonexist(hkey, "Wine61a");
     todo_wine verify_reg_nonexist(hkey, "Wine61b");
 
+    test_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                    "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL);
+    todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */,
+                 "got %u, expected 0\n", err);
+    if (err == ERROR_SUCCESS)
+        todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0);
+
+    test_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                    "\"Wine62b\"=hex(7):4c,69,6e,65,20\\", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    todo_wine verify_reg_nonexist(hkey, "Wine62b");
+
     err = RegCloseKey(hkey);
     todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);
 
@@ -3331,6 +3347,22 @@ static void test_unicode_import(void)
     todo_wine verify_reg_nonexist(hkey, "Wine61a");
     todo_wine verify_reg_nonexist(hkey, "Wine61b");
 
+    test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+                     "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                     "\"Wine62a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL);
+    todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */,
+                 "got %u, expected 0\n", err);
+    if (err == ERROR_SUCCESS)
+        todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0);
+
+    test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+                    "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                    "\"Wine62b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00\\", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    todo_wine verify_reg_nonexist(hkey, "Wine62b");
+
     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