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

reg: Close any open registry keys before starting the key deletion process. 

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2017-08-25 05:37:06 +00:00 committed by Alexandre Julliard
parent b7c838bf98
commit 82fc4c8c62
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
programs/reg/import.c
View File

@ -600,6 +600,8 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos)
{ {
WCHAR *p = pos; WCHAR *p = pos;
close_key(parser);
if (*p == 'H' || *p == 'h') if (*p == 'H' || *p == 'h')
{ {
HKEY root; HKEY root;

4
programs/reg/tests/reg.c
View File

@ -1746,7 +1746,7 @@ static void test_import(void)
"\"Wine46a\"=dword:12345678\n\n", &r); "\"Wine46a\"=dword:12345678\n\n", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
verify_key_nonexist(hkey, "Subkey4a"); verify_key_nonexist(hkey, "Subkey4a");
todo_wine verify_reg_nonexist(hkey, "Wine46a"); verify_reg_nonexist(hkey, "Wine46a");
test_import_str("REGEDIT4\n\n" test_import_str("REGEDIT4\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"
@ -3224,7 +3224,7 @@ static void test_unicode_import(void)
"\"Wine46a\"=dword:12345678\n\n", &r); "\"Wine46a\"=dword:12345678\n\n", &r);
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
verify_key_nonexist(hkey, "Subkey4a"); verify_key_nonexist(hkey, "Subkey4a");
todo_wine verify_reg_nonexist(hkey, "Wine46a"); verify_reg_nonexist(hkey, "Wine46a");
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\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"