Hugh McMaster : regedit/tests: Test the effects of EOF on hex data during concatenation.

[Alexandre Julliard]

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

Author: Hugh McMaster 
Date:   Fri Jul  7 11:47:35 2017 +0000

regedit/tests: Test the effects of EOF on hex data during concatenation.

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

---

programs/regedit/tests/regedit.c | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c
index 7389781..b3f6e76 100644
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -494,11 +494,28 @@ static void test_basic_import(void)

exec_import_str("REGEDIT4\n\n"
                     "[HKEY_CURRENT_USER\" KEY_BASE "]\n"
-                    ""Wine17"=hex(7):4c,69,6e,65,20,\");
-    lr = RegQueryValueExA(hkey, "Wine17", NULL, NULL, NULL, NULL);
-    ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND) /* WinXP */, "got %u, expected 0\n", lr);
-    if (lr == ERROR_SUCCESS)
-        verify_reg(hkey, "Wine17", REG_MULTI_SZ, "Line ", 6, TODO_REG_SIZE | TODO_REG_DATA);
+                    ""Wine17a"=hex(0):56,61,6c,75,65,\");
+    verify_reg(hkey, "Wine17a", REG_NONE, "Value", 5, 0);
+
+    exec_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\" KEY_BASE "]\n"
+                    ""Wine17b"=hex(2):25,50,41,54,48,25,\");
+    verify_reg(hkey, "Wine17b", REG_EXPAND_SZ, "%PATH%", 7, TODO_REG_SIZE | TODO_REG_DATA);
+
+    exec_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\" KEY_BASE "]\n"
+                    ""Wine17c"=hex:11,22,33,44,55,\");
+    verify_reg(hkey, "Wine17c", REG_BINARY, hex, 5, 0);
+
+    exec_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\" KEY_BASE "]\n"
+                    ""Wine17d"=hex(7):4c,69,6e,65,\");
+    verify_reg(hkey, "Wine17d", REG_MULTI_SZ, "Line", 5, TODO_REG_SIZE | TODO_REG_DATA);
+
+    exec_import_str("REGEDIT4\n\n"
+                    "[HKEY_CURRENT_USER\" KEY_BASE "]\n"
+                    ""Wine17e"=hex(100):56,61,6c,75,65,\");
+    verify_reg(hkey, "Wine17e", 0x100, "Value", 5, 0);

exec_import_str("REGEDIT4\n\n"
                     "[HKEY_CURRENT_USER\" KEY_BASE "]\n"