Hugh McMaster : regedit: Do not import the line if a hex data type has a " 0x" prefix.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b811b166945185d9dd2c47143a01cb943017eacb
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b811b166945185d9dd2c47143a...

Author: Hugh McMaster 
Date:   Wed Jul  5 13:33:12 2017 +0000

regedit: Do not import the line if a hex data type has a "0x" prefix.

Signed-off-by: Hugh McMaster 
Signed-off-by: Alexandre Julliard

---

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 e94d14e..cddebf7 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 5e127de..2b33bc9 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"