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

[WINESYNC] reg: Print the full key path without a trailing backslash.

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

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

manual adjustment needed
This commit is contained in:
winesync 2022-01-16 21:10:12 +01:00 • committed by Thomas Csovcsity
parent f42b63fd64
commit a0060cdcee
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -205,10 +205,10 @@ WCHAR *build_subkey_path(WCHAR *path, DWORD path_len, WCHAR *subkey_name, DWORD
WCHAR *get_long_key(HKEY root, WCHAR *path) WCHAR *get_long_key(HKEY root, WCHAR *path)
{ {
DWORD i, array_size = ARRAY_SIZE(root_rels), len; int i, len, path_len;
WCHAR *long_key; WCHAR *long_key;
for (i = 0; i < array_size; i++) for (i = 0; i < ARRAY_SIZE(root_rels); i++)
{ {
if (root == root_rels[i].key) if (root == root_rels[i].key)
break; break;
@ -223,7 +223,15 @@ WCHAR *get_long_key(HKEY root, WCHAR *path)
return long_key; return long_key;
} }
len += lstrlenW(path) + 1; /* add one for the backslash */ 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 */
long_key = malloc((len + 1) * sizeof(WCHAR)); long_key = malloc((len + 1) * sizeof(WCHAR));
swprintf(long_key, L"%s\\%s", root_rels[i].long_name, path); swprintf(long_key, L"%s\\%s", root_rels[i].long_name, path);
return long_key; return long_key;

2
modules/rostests/winetests/reg/query.c
View file

@ -251,7 +251,7 @@ static void test_query(void)
read_reg_output("reg query HKCU\\" KEY_BASE "\\ /s", buf, sizeof(buf), &r); read_reg_output("reg query HKCU\\" KEY_BASE "\\ /s", buf, sizeof(buf), &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);
compare_query(buf, test6, FALSE, TODO_REG_COMPARE); compare_query(buf, test6, FALSE, 0);
read_reg_output("reg query HKCU\\" KEY_BASE " /v Wine /s", buf, sizeof(buf), &r); read_reg_output("reg query HKCU\\" KEY_BASE " /v Wine /s", buf, sizeof(buf), &r);
ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */, ok(r == REG_EXIT_SUCCESS || r == REG_EXIT_FAILURE /* WinXP */,

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: 797520db8f7eb708845891da6f08d3030393d6bc wine: e685718c3b701b67e1920a8e4f2ddce31d3ca800