Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-02 15:16:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg: Support recursion in the 'copy' command.

Browse source 
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 8d9a228e99e1252a0d82c88e6a64635548c478a6 by Hugh McMaster <hugh.mcmaster@outlook.com>
This commit is contained in:
winesync 2022-01-17 18:43:11 +01:00 • committed by Thomas Csovcsity
parent da2d23fb94
commit ded0675d66
3 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
base/applications/cmdutils/reg/copy.c
View file

@ -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: cleanup:
free(name); free(name);
free(data); free(data);

4
modules/rostests/winetests/reg/copy.c
View file

@ -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); 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(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) 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); 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(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) static void test_copy_value_order(void)

2
sdk/tools/winesync/reg.cfg
View file

@ -4,4 +4,4 @@ directories:
files: files:
programs/reg/resource.h: base/applications/cmdutils/reg/resource.h programs/reg/resource.h: base/applications/cmdutils/reg/resource.h
tags: tags:
wine: b1ccb87d9debb1a07e35263a76b6e34a7dd6ee49 wine: 8d9a228e99e1252a0d82c88e6a64635548c478a6