mirror of
https://github.com/reactos/reactos.git
synced 2025-05-31 23:18:39 +00:00
[WINESYNC] reg: Fail if a system key has a trailing backslash but no subkey path.
Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> wine commit id 797520db8f7eb708845891da6f08d3030393d6bc by Hugh McMaster <hugh.mcmaster@outlook.com>
This commit is contained in:
parent
f55096783d
commit
f42b63fd64
3 changed files with 18 additions and 8 deletions
|
@ -234,9 +234,6 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path)
|
|||
if (!sane_path(key))
|
||||
return FALSE;
|
||||
|
||||
*path = wcschr(key, '\\');
|
||||
if (*path) (*path)++;
|
||||
|
||||
*root = path_get_rootkey(key);
|
||||
if (!*root)
|
||||
{
|
||||
|
@ -244,6 +241,19 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path)
|
|||
return FALSE;
|
||||
}
|
||||
|
||||
*path = wcschr(key, '\\');
|
||||
|
||||
if (!*path)
|
||||
return TRUE;
|
||||
|
||||
(*path)++;
|
||||
|
||||
if (!**path)
|
||||
{
|
||||
output_message(STRING_INVALID_SYSTEM_KEY);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
|
|
|
@ -311,12 +311,12 @@ static void test_key_formats(void)
|
|||
|
||||
/* Test validity of trailing backslash after system key */
|
||||
run_reg_exe("reg add HKCU\\ /v Value1 /t REG_SZ /d foo /f", &r);
|
||||
todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
|
||||
todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value1");
|
||||
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Value1");
|
||||
|
||||
run_reg_exe("reg add HKEY_CURRENT_USER\\ /v Value2 /t REG_SZ /d bar /f", &r);
|
||||
todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
|
||||
todo_wine verify_reg_nonexist(HKEY_CURRENT_USER, "Value2");
|
||||
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
|
||||
verify_reg_nonexist(HKEY_CURRENT_USER, "Value2");
|
||||
}
|
||||
|
||||
static void test_add(void)
|
||||
|
|
|
@ -4,4 +4,4 @@ directories:
|
|||
files:
|
||||
programs/reg/resource.h: base/applications/cmdutils/reg/resource.h
|
||||
tags:
|
||||
wine: 6d2ab37a44c6d0bd58504cbc3ff20d2828afc841
|
||||
wine: 797520db8f7eb708845891da6f08d3030393d6bc
|
||||
|
|
Loading…
Reference in a new issue