[ros-diffs] [reactos] 31/158: [WINESYNC] reg: Stop parsing REG_SZ values containing NUL character sequences.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=1007673889a6c394af098…

commit 1007673889a6c394af098f8436eecfa4c132e14a
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Jan 16 20:10:05 2022 +0100
Commit:     Thomas Csovcsity <thc.fr13nd(a)gmail.com>
CommitDate: Sun Jun 19 13:06:29 2022 +0200

    [WINESYNC] reg: Stop parsing REG_SZ values containing NUL character sequences.
    
    Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 272d35afc6905dfdf1ffcf0ef2963e3bded1303d by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
---
 base/applications/cmdutils/reg/import.c |  3 +--
 modules/rostests/winetests/reg/import.c | 24 ++++++++++++------------
 sdk/tools/winesync/reg.cfg              |  2 +-
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/base/applications/cmdutils/reg/import.c
b/base/applications/cmdutils/reg/import.c
index f7f87939e23..7ad7b35d5dc 100644
--- a/base/applications/cmdutils/reg/import.c
+++ b/base/applications/cmdutils/reg/import.c
@@ -324,8 +324,7 @@ static BOOL unescape_string(WCHAR *str, WCHAR **unparsed)
                 str[val_idx] = '\r';
                 break;
             case '0':
-                str[val_idx] = '\0';
-                break;
+                return FALSE;
             case '\\':
             case '"':
                 str[val_idx] = str[str_idx];
diff --git a/modules/rostests/winetests/reg/import.c
b/modules/rostests/winetests/reg/import.c
index f8e7e4b7acb..06f9cb05f6c 100644
--- a/modules/rostests/winetests/reg/import.c
+++ b/modules/rostests/winetests/reg/import.c
@@ -1600,12 +1600,12 @@ static void test_import(void)
                     "\"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");
+    verify_reg_nonexist(hkey, "Wine70a");
+    verify_reg_nonexist(hkey, "Wine70b");
+    verify_reg_nonexist(hkey, "Wine70c");
+    verify_reg_nonexist(hkey, "Wine70d");
+    verify_reg_nonexist(hkey, "Wine70e");
+    verify_reg_nonexist(hkey, "Wine70f");
 
     /* Test forward and back slashes */
     test_import_str("REGEDIT4\n\n"
@@ -3149,12 +3149,12 @@ static void test_unicode_import(void)
                      "\"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");
+    verify_reg_nonexist(hkey, "Wine70a");
+    verify_reg_nonexist(hkey, "Wine70b");
+    verify_reg_nonexist(hkey, "Wine70c");
+    verify_reg_nonexist(hkey, "Wine70d");
+    verify_reg_nonexist(hkey, "Wine70e");
+    verify_reg_nonexist(hkey, "Wine70f");
 
     /* Test forward and back slashes */
     test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index 74acd6bb4d9..597dcb68e13 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: 53fd4df85f004597161a26d86333755e7cbff0ff
+  wine: 272d35afc6905dfdf1ffcf0ef2963e3bded1303d