https://git.reactos.org/?p=reactos.git;a=commitdiff;h=60a4a6313b1e99cae29804444fa586521fcdd84b
commit 60a4a6313b1e99cae29804444fa586521fcdd84b Author: winesync <[email protected]> AuthorDate: Sun Jan 16 20:10:05 2022 +0100 Commit: Thomas Csovcsity <[email protected]> CommitDate: Sun Jun 19 13:06:29 2022 +0200 [WINESYNC] reg/tests: Try importing registry files with escaped null characters. Signed-off-by: Hugh McMaster <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 1c2b96699973e198e72a01a969af0876387f08e1 by Hugh McMaster <[email protected]> --- modules/rostests/winetests/reg/import.c | 50 ++++++++++++++++----------------- sdk/tools/winesync/reg.cfg | 2 +- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/modules/rostests/winetests/reg/import.c b/modules/rostests/winetests/reg/import.c index 9b7a90ac99c..f8e7e4b7acb 100644 --- a/modules/rostests/winetests/reg/import.c +++ b/modules/rostests/winetests/reg/import.c @@ -1574,22 +1574,22 @@ static void test_import(void) verify_reg(hkey, "Wine68h", REG_BINARY, NULL, 0, 0); verify_reg(hkey, "Wine68i", REG_NONE, NULL, 0, 0); - /* Test with embedded null characters */ + /* Test with escaped null characters */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"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"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -3126,19 +3126,19 @@ static void test_unicode_import(void) /* Test with embedded null characters */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Wine69a\"=\"\\0\n" - "\"Wine69b\"=\"\\0\\0\n" - "\"Wine69c\"=\"Value1\\0\n" - "\"Wine69d\"=\"Value2\\0\\0\\0\\0\n" - "\"Wine69e\"=\"Value3\\0Value4\n" - "\"Wine69f\"=\"\\0Value5\n\n", &r); + "\"Wine69a\"=\"\\\\0\"\n" + "\"Wine69b\"=\"\\\\0\\\\0\"\n" + "\"Wine69c\"=\"Value1\\\\0\"\n" + "\"Wine69d\"=\"Value2\\\\0\\\\0\\\\0\\\\0\"\n" + "\"Wine69e\"=\"Value3\\\\0Value4\"\n" + "\"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"); - verify_reg_nonexist(hkey, "Wine69c"); - verify_reg_nonexist(hkey, "Wine69d"); - verify_reg_nonexist(hkey, "Wine69e"); - verify_reg_nonexist(hkey, "Wine69f"); + verify_reg(hkey, "Wine69a", REG_SZ, "\\0", 3, 0); + verify_reg(hkey, "Wine69b", REG_SZ, "\\0\\0", 5, 0); + verify_reg(hkey, "Wine69c", REG_SZ, "Value1\\0", 9, 0); + verify_reg(hkey, "Wine69d", REG_SZ, "Value2\\0\\0\\0\\0", 15, 0); + verify_reg(hkey, "Wine69e", REG_SZ, "Value3\\0Value4", 15, 0); + verify_reg(hkey, "Wine69f", REG_SZ, "\\0Value5", 9, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 98463213ef7..e3965809336 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: aa98e3f6da78135ecffaa50bb78ad906dfd4570d + wine: 1c2b96699973e198e72a01a969af0876387f08e1
