Hugh McMaster : regedit: Skip blank and whitespace-only lines during hex data concatenation.
Module: wine Branch: master Commit: e336c863597bb05a6de784fd6f26e7d3ca104b03 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e336c863597bb05a6de784fd6f... Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 4 12:46:26 2017 +0000 regedit: Skip blank and whitespace-only lines during hex data concatenation. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 2 +- programs/regedit/tests/regedit.c | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index b933f03..f13c21e 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -896,7 +896,7 @@ static WCHAR *hex_multiline_state(struct parser *parser, WCHAR *pos) } while (*line == ' ' || *line == '\t') line++; - if (*line == ';') return line; + if (!*line || *line == ';') return line; if (!isxdigitW(*line)) goto invalid; diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index cd21b61..61f136a 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -911,7 +911,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine25e"); todo_wine verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); verify_reg_nonexist(hkey, "Wine25g"); - todo_wine verify_reg_nonexist(hkey, "Wine25h"); + verify_reg_nonexist(hkey, "Wine25h"); verify_reg_nonexist(hkey, "Wine25i"); verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); @@ -940,7 +940,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine26e"); todo_wine verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); verify_reg_nonexist(hkey, "Wine26g"); - todo_wine verify_reg_nonexist(hkey, "Wine26h"); + verify_reg_nonexist(hkey, "Wine26h"); verify_reg_nonexist(hkey, "Wine26i"); verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); @@ -969,7 +969,7 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine27e"); todo_wine verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); verify_reg_nonexist(hkey, "Wine27g"); - todo_wine verify_reg_nonexist(hkey, "Wine27h"); + verify_reg_nonexist(hkey, "Wine27h"); verify_reg_nonexist(hkey, "Wine27i"); verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); @@ -1004,7 +1004,7 @@ static void test_invalid_import(void) "\"Wine28d\"=hex(2):4c,69,6e,65,20,\\\n\n" "@=\"Default value 4\"\n\n"); verify_reg_nonexist(hkey, "Wine28d"); - todo_wine verify_reg_nonexist(hkey, NULL); + verify_reg_nonexist(hkey, NULL); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1267,7 +1267,7 @@ static void test_comments(void) " 63,61,74,\\\n\n" " 65,6e,\\;comment\n\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1472,7 +1472,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\n\n" " 65,6e,\\\n\n\n\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1481,7 +1481,7 @@ static void test_import_with_whitespace(void) " 63,61,74,\\\n\t\n\t\n" " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" " 61,74,69,6f,6e,00,00\n\n"); - todo_wine verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); lr = RegCloseKey(hkey); ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);
participants (1)
-
Alexandre Julliard