Hugh McMaster : reg/tests: Test line concatenation with a new registry key on the next line.

Alexandre Julliard julliard at winehq.org
Tue Jun 27 17:19:07 CDT 2017


Module: wine
Branch: master
Commit: 6731faa5adc85d7b1adddd9cc3664b335c815704
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=6731faa5adc85d7b1adddd9cc3664b335c815704

Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date:   Tue Jun 27 09:05:54 2017 +0000

reg/tests: Test line concatenation with a new registry key on the next line.

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/reg/tests/reg.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index 5076ad1..46f7529 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -1844,6 +1844,25 @@ static void test_import(void)
     todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0);
     todo_wine verify_reg_nonexist(hkey, "Wine53f");
 
+    test_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                    "\"Wine54a\"=hex(2):4c,69,6e,65,20,\\\n"
+                    "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    todo_wine verify_reg_nonexist(hkey, "Wine54a");
+    todo_wine verify_key_nonexist(hkey, "Subkey1");
+
+    test_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                    "\"Wine54b\"=hex(2):4c,69,6e,65,20\\\n"
+                    "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    todo_wine verify_reg_nonexist(hkey, "Wine54b");
+    todo_wine verify_key(hkey, "Subkey2");
+
+    err = RegDeleteKeyA(hkey, "Subkey2");
+    todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err);
+
     err = RegCloseKey(hkey);
     todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);
 
@@ -2873,6 +2892,25 @@ static void test_unicode_import(void)
     todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0);
     todo_wine verify_reg_nonexist(hkey, "Wine53f");
 
+    test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+                     "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                     "\"Wine54a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+                     "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    todo_wine verify_reg_nonexist(hkey, "Wine54a");
+    todo_wine verify_key_nonexist(hkey, "Subkey1");
+
+    test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+                     "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+                     "\"Wine54b\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n"
+                     "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n", &r);
+    todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+    todo_wine verify_reg_nonexist(hkey, "Wine54b");
+    todo_wine verify_key(hkey, "Subkey2");
+
+    err = RegDeleteKeyA(hkey, "Subkey2");
+    todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err);
+
     err = RegCloseKey(hkey);
     todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);
 




More information about the wine-cvs mailing list