Hugh McMaster : regedit/tests: Test the importing of hex values with no data.

[Alexandre Julliard]

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

Author: Hugh McMaster 
Date:   Thu Oct  5 11:53:23 2017 +0000

regedit/tests: Test the importing of hex values with no data.

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

---

programs/regedit/tests/regedit.c | 41 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c
index f97134e..79640a5 100644
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -126,8 +126,11 @@ static void verify_reg_(unsigned line, HKEY hkey, const char *value,
         lok(type == exp_type, "got wrong type %d, expected %d\n", type, exp_type);
     todo_wine_if (todo & TODO_REG_SIZE)
         lok(size == exp_size, "got wrong size %d, expected %d\n", size, exp_size);
-    todo_wine_if (todo & TODO_REG_DATA)
-        lok(memcmp(data, exp_data, size) == 0, "got wrong data\n");
+    if (exp_data)
+    {
+        todo_wine_if (todo & TODO_REG_DATA)
+            lok(memcmp(data, exp_data, size) == 0, "got wrong data\n");
+    }
 }

#define verify_reg_nonexist(k,n) r_verify_reg_nonexist(__LINE__,k,n)
@@ -641,6 +644,23 @@ static void test_basic_import(void)
     verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0);
     verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0);

+    exec_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\" KEY_BASE "]\n"
+                    ""Wine22a"=hex(1):\n"
+                    ""Wine22b"=hex(2):\n"
+                    ""Wine22c"=hex(3):\n"
+                    ""Wine22d"=hex(4):\n"
+                    ""Wine22e"=hex(7):\n"
+                    ""Wine22f"=hex(100):\n"
+                    ""Wine22g"=hex(abcd):\n\n");
+    verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0);
+    verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE);
+    verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0);
+    verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0);
+    verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE);
+    verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0);
+    verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0);
+
     RegCloseKey(hkey);

delete_key(HKEY_CURRENT_USER, KEY_BASE);
@@ -1038,6 +1058,23 @@ static void test_basic_import_unicode(void)
     verify_reg(hkey, "Wine21c", REG_EXPAND_SZ, "%PATH%", 7, 0);
     verify_reg(hkey, "Wine21d", REG_EXPAND_SZ, "%PATH%", 7, 0);

+    exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+                     "[HKEY_CURRENT_USER\" KEY_BASE "]\n"
+                     ""Wine22a"=hex(1):\n"
+                     ""Wine22b"=hex(2):\n"
+                     ""Wine22c"=hex(3):\n"
+                     ""Wine22d"=hex(4):\n"
+                     ""Wine22e"=hex(7):\n"
+                     ""Wine22f"=hex(100):\n"
+                     ""Wine22g"=hex(abcd):\n\n");
+    verify_reg(hkey, "Wine22a", REG_SZ, NULL, 0, 0);
+    verify_reg(hkey, "Wine22b", REG_EXPAND_SZ, NULL, 0, TODO_REG_SIZE);
+    verify_reg(hkey, "Wine22c", REG_BINARY, NULL, 0, 0);
+    verify_reg(hkey, "Wine22d", REG_DWORD, NULL, 0, 0);
+    verify_reg(hkey, "Wine22e", REG_MULTI_SZ, NULL, 0, TODO_REG_SIZE);
+    verify_reg(hkey, "Wine22f", 0x100, NULL, 0, 0);
+    verify_reg(hkey, "Wine22g", 0xabcd, NULL, 0, 0);
+
     RegCloseKey(hkey);

delete_key(HKEY_CURRENT_USER, KEY_BASE);