[PATCH 3/3] regedit: Do not import the line if a hex data type has a "0x" prefix

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/regproc.c       | 2 +-
 programs/regedit/tests/regedit.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index e94d14e0fe..ee5c142c65 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -363,7 +363,7 @@ static BOOL parse_data_type(struct parser *parser, WCHAR **line)
             WCHAR *end;
             DWORD val;
 
-            if (!**line)
+            if (!**line || tolowerW((*line)[1]) == 'x')
                 return FALSE;
 
             /* "hex(xx):" is special */
diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c
index 5e127debc6..2b33bc9ca0 100644
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -467,7 +467,7 @@ static void test_basic_import(void)
     verify_reg(hkey, "Wine13g", 0x7fffffff, "Value", 6, 0);
     verify_reg(hkey, "Wine13h", 0xffffffff, "Value", 6, 0);
     verify_reg_nonexist(hkey, "Wine13i");
-    todo_wine verify_reg_nonexist(hkey, "Wine13j");
+    verify_reg_nonexist(hkey, "Wine13j");
     verify_reg_nonexist(hkey, "Wine13k");
 
     exec_import_str("REGEDIT4\n\n"
-- 
2.11.0