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>

reg: Close any open registry keys before starting the key deletion process.
82fc4c8c · Hugh McMaster · Alexandre Julliard · b7c838bf · 82fc4c8c · 82fc4c8c
Commit 82fc4c8c authored Aug 25, 2017 by Hugh McMaster Committed by Alexandre Julliard Aug 25, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

import.c programs/reg/import.c +2 -0

reg.c programs/reg/tests/reg.c +2 -2

No files found.
--- a/programs/reg/import.c
+++ b/programs/reg/import.c
@@ -600,6 +600,8 @@ static WCHAR *delete_key_state(struct parser *parser, WCHAR *pos)
 {
    WCHAR *p = pos;

+    close_key(parser);
+
    if (*p == 'H' || *p == 'h')
    {
        HKEY root;

--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -1746,7 +1746,7 @@ static void test_import(void)
                    "\"Wine46a\"=dword:12345678\n\n", &r);
    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
    verify_key_nonexist(hkey, "Subkey4a");
-    todo_wine verify_reg_nonexist(hkey, "Wine46a");
+    verify_reg_nonexist(hkey, "Wine46a");

    test_import_str("REGEDIT4\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);
    ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
    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"
                     "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n"