reg: Support recursion in the 'copy' command.
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
b1ccb87d9d
commit
8d9a228e99
|
@ -90,6 +90,25 @@ static int run_copy(struct key *src, struct key *dest, BOOL recurse, BOOL force)
|
|||
}
|
||||
}
|
||||
|
||||
for (i = 0; recurse; i++)
|
||||
{
|
||||
struct key subkey_src, subkey_dest;
|
||||
|
||||
name_len = max_name_len;
|
||||
|
||||
rc = RegEnumKeyExW(src->hkey, i, name, &name_len, NULL, NULL, NULL, NULL);
|
||||
if (rc) break;
|
||||
|
||||
subkey_src.root = src->hkey;
|
||||
subkey_src.subkey = name;
|
||||
|
||||
subkey_dest.root = dest->hkey;
|
||||
subkey_dest.subkey = name;
|
||||
|
||||
rc = run_copy(&subkey_src, &subkey_dest, TRUE, force);
|
||||
if (rc) goto cleanup;
|
||||
}
|
||||
|
||||
cleanup:
|
||||
free(name);
|
||||
free(data);
|
||||
|
|
|
@ -322,7 +322,7 @@ static void test_copy_complex_data(void)
|
|||
|
||||
run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r);
|
||||
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
|
||||
ok(compare_export("file.reg", complex_data_test, TODO_REG_COMPARE), "compare_export() failed\n");
|
||||
ok(compare_export("file.reg", complex_data_test, 0), "compare_export() failed\n");
|
||||
}
|
||||
|
||||
static void test_copy_key_order(void)
|
||||
|
@ -347,7 +347,7 @@ static void test_copy_key_order(void)
|
|||
|
||||
run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r);
|
||||
ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
|
||||
ok(compare_export("file.reg", key_order_test, TODO_REG_COMPARE), "compare_export() failed\n");
|
||||
ok(compare_export("file.reg", key_order_test, 0), "compare_export() failed\n");
|
||||
}
|
||||
|
||||
static void test_copy_value_order(void)
|
||||
|
|
Loading…
Reference in New Issue