Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 13:11:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] reg: Fail if the source and destination keys are the same when copying.

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

wine commit id 0abc002a3e232be3445241e435ef17ac89d6c947 by Hugh McMaster <hugh.mcmaster@outlook.com>

manual adjustment needed
This commit is contained in:
winesync 2022-01-17 18:43:11 +01:00 committed by Thomas Csovcsity
parent ded0675d66
commit 20aa38c6e7
4 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -163,6 +163,12 @@ int reg_copy(int argc, WCHAR *argvW[])
}
}
if (src.root == dest.root && !lstrcmpiW(src.subkey, dest.subkey))
{
output_message(STRING_COPY_SRC_DEST_SAME);
return 1;
}
return run_copy(&src, &dest, recurse, force);
invalid:

17
base/applications/cmdutils/reg/reg.c
View file

@ -206,7 +206,7 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD
WCHAR *get_long_key(HKEY root, WCHAR *path)
{
int i, len, path_len;
int i, len;
WCHAR *long_key;
for (i = 0; i < ARRAY_SIZE(root_rels); i++)
@ -224,15 +224,7 @@ WCHAR *get_long_key(HKEY root, WCHAR *path)
return long_key;
}
path_len = lstrlenW(path);
if (path[path_len - 1] == '\\')
{
path[path_len - 1] = 0;
path_len--;
}
len += path_len + 1; /* add one for the concatenating backslash */
len += lstrlenW(path) + 1; /* add one for the concatenating backslash */
long_key = malloc((len + 1) * sizeof(WCHAR));
swprintf(long_key, L"%s\\%s", root_rels[i].long_name, path);
return long_key;
@ -240,6 +232,8 @@ WCHAR *get_long_key(HKEY root, WCHAR *path)
BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path)
{
WCHAR *p;
if (!sane_path(key))
return FALSE;
@ -263,6 +257,9 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path)
return FALSE;
}
p = *path + lstrlenW(*path) - 1;
if (*p == '\\') *p = 0;
return TRUE;
}

3
base/applications/cmdutils/reg/resource.h
View file

@ -61,6 +61,9 @@
#define STRING_OVERWRITE_VALUE 205
#define STRING_INVALID_CMDLINE 206
/* copy.c */
#define STRING_COPY_SRC_DEST_SAME 250
/* delete.c */
#define STRING_DELETE_VALUE 300
#define STRING_DELETE_VALUEALL 301

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

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