https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f55096783de379948010b689ae2a4431ddd4b183
commit f55096783de379948010b689ae2a4431ddd4b183 Author: winesync <[email protected]> AuthorDate: Sun Jan 16 21:08:23 2022 +0100 Commit: Thomas Csovcsity <[email protected]> CommitDate: Sun Jun 19 13:06:33 2022 +0200 [WINESYNC] reg: Drop key output from the "Invalid system key" error message. Signed-off-by: Hugh McMaster <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 6d2ab37a44c6d0bd58504cbc3ff20d2828afc841 by Hugh McMaster <[email protected]> manual adjustment needed --- base/applications/cmdutils/reg/lang/en-US.rc | 2 +- base/applications/cmdutils/reg/reg.c | 3 +-- sdk/tools/winesync/reg.cfg | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc index 97064f2522b..97b55e6eda1 100644 --- a/base/applications/cmdutils/reg/lang/en-US.rc +++ b/base/applications/cmdutils/reg/lang/en-US.rc @@ -144,7 +144,7 @@ STRINGTABLE \ /y\n\ \ Overwrite <file> without prompting for confirmation.\n\n" - STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\n" + STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key\n" STRING_OVERWRITE_FILE, "The file '%1' already exists. Do you want to overwrite it?" STRING_KEY_NONEXIST, "reg: Unable to find the specified registry key\n" STRING_KEY_IMPORT_FAILED, "reg: Unable to import the registry key '%1'\n" diff --git a/base/applications/cmdutils/reg/reg.c b/base/applications/cmdutils/reg/reg.c index 2303df81823..c66daeb32b0 100644 --- a/base/applications/cmdutils/reg/reg.c +++ b/base/applications/cmdutils/reg/reg.c @@ -240,8 +240,7 @@ BOOL parse_registry_key(const WCHAR *key, HKEY *root, WCHAR **path) *root = path_get_rootkey(key); if (!*root) { - if (*path) *(*path - 1) = 0; - output_message(STRING_INVALID_SYSTEM_KEY, key); + output_message(STRING_INVALID_SYSTEM_KEY); return FALSE; } diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index 5e3749d9529..595566ef15f 100644 --- a/sdk/tools/winesync/reg.cfg +++ b/sdk/tools/winesync/reg.cfg @@ -4,4 +4,4 @@ directories: files: programs/reg/resource.h: base/applications/cmdutils/reg/resource.h tags: - wine: 8b0602023add5c530e4f257ebf07ebae8e4ffdba + wine: 6d2ab37a44c6d0bd58504cbc3ff20d2828afc841
