Hugh McMaster : regedit: Do not close the registy key handle when a line break is encountered.
Alexandre Julliard
julliard at winehq.org
Tue Oct 25 14:58:22 CDT 2016
Module: wine
Branch: master
Commit: 93f795950d3af3cedb902e7de0ed7617a0101d9b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=93f795950d3af3cedb902e7de0ed7617a0101d9b
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Tue Oct 25 10:21:19 2016 +0000
regedit: Do not close the registy key handle when a line break is encountered.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/regedit/regproc.c | 6 ------
programs/regedit/tests/regedit.c | 18 +++++++-----------
2 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c
index 7c5105f..7f1475e 100644
--- a/programs/regedit/regproc.c
+++ b/programs/regedit/regproc.c
@@ -614,12 +614,6 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode)
( stdInput[0] == '\"'))) /* reading a new value=data pair */
{
processSetValue(stdInput, isUnicode);
- } else
- {
- /* Since we are assuming that the file format is valid we must be
- * reading a blank line which indicates the end of this key processing
- */
- closeKey();
}
}
diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c
index 9692c06..efd7715 100644
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -243,9 +243,9 @@ static void test_basic_import(void)
"\"Line3\"=\"Value3\"\n\n\n\n"
"\"Line4\"=\"Value4\"\n\n");
verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0);
- todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
- todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
- todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
+ verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, 0);
+ verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, 0);
+ verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, 0);
exec_import_str("REGEDIT4\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
@@ -259,15 +259,11 @@ static void test_basic_import(void)
"\"Wine4\"=dword:12345678\n\n");
dword = 0x782;
verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0);
- todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11,
- TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
- todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20,
- TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
- todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5,
- TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
+ verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0);
+ verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+ verify_reg(hkey, "", REG_SZ, "Test", 5, 0);
dword = 0x12345678;
- todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword),
- TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
+ verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0);
RegCloseKey(hkey);
More information about the wine-cvs
mailing list