From 09b600cdaf01452b91055716532f9f8f6fb8d4e2 Mon Sep 17 00:00:00 2001 From: Hugh McMaster <hugh.mcmaster@outlook.com> Date: Tue, 27 Jun 2017 09:06:40 +0000 Subject: [PATCH] reg/tests: Test whether a forward slash can be used as a concatenation marker. Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index fea7403d8f1..9735f59fbc5 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2063,6 +2063,16 @@ static void test_import(void) 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); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,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, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3311,6 +3321,16 @@ static void test_unicode_import(void) 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); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,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, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); -- GitLab