ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

regedit: Do not close the registy key handle when a line break is encountered. 

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2016-10-25 10:21:19 +00:00 committed by Alexandre Julliard
parent cfb10615e1
commit 93f795950d
2 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
programs/regedit/regproc.c
View File

@ -614,12 +614,6 @@ static void processRegEntry(WCHAR* stdInput, BOOL isUnicode)
( stdInput[0] == '\"'))) /* reading a new value=data pair */ ( stdInput[0] == '\"'))) /* reading a new value=data pair */
{ {
processSetValue(stdInput, isUnicode); 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();
} }
} }

18
programs/regedit/tests/regedit.c
View File

@ -243,9 +243,9 @@ static void test_basic_import(void)
"\"Line3\"=\"Value3\"\n\n\n\n" "\"Line3\"=\"Value3\"\n\n\n\n"
"\"Line4\"=\"Value4\"\n\n"); "\"Line4\"=\"Value4\"\n\n");
verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0); 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); verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, 0);
todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, 0);
todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, 0);
exec_import_str("REGEDIT4\n\n" exec_import_str("REGEDIT4\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
@ -259,15 +259,11 @@ static void test_basic_import(void)
"\"Wine4\"=dword:12345678\n\n"); "\"Wine4\"=dword:12345678\n\n");
dword = 0x782; dword = 0x782;
verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0);
todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0);
TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, verify_reg(hkey, "", REG_SZ, "Test", 5, 0);
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);
dword = 0x12345678; dword = 0x12345678;
todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0);
TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA);
RegCloseKey(hkey); RegCloseKey(hkey);