https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4dc3ccab177845c227372614fd0dc34b0d32f90
commit d4dc3ccab177845c227372614fd0dc34b0d32f90 Author: winesync <[email protected]> AuthorDate: Sun Jan 16 14:51:45 2022 +0100 Commit: Thomas Csovcsity <[email protected]> CommitDate: Sun Jun 19 13:06:28 2022 +0200 [WINESYNC] reg/tests: Add additional tests with embedded NUL characters. Signed-off-by: Hugh McMaster <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 6c62ffeca7f381199bef1969452fcef46b979f0f by Hugh McMaster <[email protected]> --- modules/rostests/winetests/reg/reg.c | 36 ++++++++++++++++++++++++++++++++++-- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/modules/rostests/winetests/reg/reg.c b/modules/rostests/winetests/reg/reg.c index 471c6ad8d46..db02fc770e2 100644 --- a/modules/rostests/winetests/reg/reg.c +++ b/modules/rostests/winetests/reg/reg.c @@ -2360,7 +2360,7 @@ static void test_import(void) "\"Wine69c\"=\"Value1\\0\n" "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value4\n\n", &r); + "\"Wine69f\"=\"\\0Value5\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "Wine69a"); verify_reg_nonexist(hkey, "Wine69b"); @@ -2369,6 +2369,22 @@ static void test_import(void) verify_reg_nonexist(hkey, "Wine69e"); verify_reg_nonexist(hkey, "Wine69f"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine70a\"=\"\\0\"\n" + "\"Wine70b\"=\"\\0\\0\"\n" + "\"Wine70c\"=\"Value1\\0\"\n" + "\"Wine70d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine70e\"=\"Value3\\0Value4\"\n" + "\"Wine70f\"=\"\\0Value5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine70a"); + todo_wine verify_reg_nonexist(hkey, "Wine70b"); + todo_wine verify_reg_nonexist(hkey, "Wine70c"); + todo_wine verify_reg_nonexist(hkey, "Wine70d"); + todo_wine verify_reg_nonexist(hkey, "Wine70e"); + todo_wine verify_reg_nonexist(hkey, "Wine70f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); @@ -3882,7 +3898,7 @@ static void test_unicode_import(void) "\"Wine69c\"=\"Value1\\0\n" "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value4\n\n", &r); + "\"Wine69f\"=\"\\0Value5\n\n", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "Wine69a"); verify_reg_nonexist(hkey, "Wine69b"); @@ -3891,6 +3907,22 @@ static void test_unicode_import(void) verify_reg_nonexist(hkey, "Wine69e"); verify_reg_nonexist(hkey, "Wine69f"); + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine70a\"=\"\\0\"\n" + "\"Wine70b\"=\"\\0\\0\"\n" + "\"Wine70c\"=\"Value1\\0\"\n" + "\"Wine70d\"=\"Value2\\0\\0\\0\\0\"\n" + "\"Wine70e\"=\"Value3\\0Value4\"\n" + "\"Wine70f\"=\"\\0Value5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine70a"); + todo_wine verify_reg_nonexist(hkey, "Wine70b"); + todo_wine verify_reg_nonexist(hkey, "Wine70c"); + todo_wine verify_reg_nonexist(hkey, "Wine70d"); + todo_wine verify_reg_nonexist(hkey, "Wine70e"); + todo_wine verify_reg_nonexist(hkey, "Wine70f"); + close_key(hkey); delete_key(HKEY_CURRENT_USER, KEY_BASE); diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 00bfa0dfb33..9f7a030d3e3 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: 93fbe09ed098f6356485c6390a533e04f6ff3959 + wine: 6c62ffeca7f381199bef1969452fcef46b979f0f
