[PATCH] reg: Stop parsing REG_SZ values containing NUL character sequences

[Hugh McMaster]

Signed-off-by: Hugh McMaster 
---
 programs/reg/import.c       |  3 +--
 programs/reg/tests/import.c | 24 ++++++++++++------------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/programs/reg/import.c b/programs/reg/import.c
index f7f87939e23..7ad7b35d5dc 100644
--- a/programs/reg/import.c
+++ b/programs/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/programs/reg/tests/import.c b/programs/reg/tests/import.c
index f8e7e4b7acb..06f9cb05f6c 100644
--- a/programs/reg/tests/import.c
+++ b/programs/reg/tests/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"