Commit 554d996c authored by Hugh McMaster's avatar Hugh McMaster Committed by Alexandre Julliard

reg/tests: Test whether the "0x" prefix is valid when importing hex data.

parent c50a1d94
...@@ -1782,7 +1782,9 @@ static void test_import(void) ...@@ -1782,7 +1782,9 @@ static void test_import(void)
"\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n"
"\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n"
"\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n"
"\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n"
"\"Wine47j\"=hex(0x2):56,61,6c,75,65,00\n"
"\"Wine47k\"=hex(x2)::56,61,6c,75,65,00\n\n", &r);
todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0);
...@@ -1793,6 +1795,8 @@ static void test_import(void) ...@@ -1793,6 +1795,8 @@ static void test_import(void)
todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0);
todo_wine verify_reg_nonexist(hkey, "Wine47i"); todo_wine verify_reg_nonexist(hkey, "Wine47i");
todo_wine verify_reg_nonexist(hkey, "Wine47j");
todo_wine verify_reg_nonexist(hkey, "Wine47k");
test_import_str("REGEDIT4\n\n" test_import_str("REGEDIT4\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
...@@ -3116,7 +3120,9 @@ static void test_unicode_import(void) ...@@ -3116,7 +3120,9 @@ static void test_unicode_import(void)
"\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n"
"\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n"
"\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n"
"\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n\n", &r); "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n"
"\"Wine47j\"=hex(0x2):56,00,61,00,6c,00,75,00,65,00,00,00\n"
"\"Wine47k\"=hex(x2):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r);
todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0);
...@@ -3127,6 +3133,8 @@ static void test_unicode_import(void) ...@@ -3127,6 +3133,8 @@ static void test_unicode_import(void)
todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0);
todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); todo_wine verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0);
todo_wine verify_reg_nonexist(hkey, "Wine47i"); todo_wine verify_reg_nonexist(hkey, "Wine47i");
todo_wine verify_reg_nonexist(hkey, "Wine47j");
todo_wine verify_reg_nonexist(hkey, "Wine47k");
test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment