https://git.reactos.org/?p=reactos.git;a=commitdiff;h=235d5af3afa58ff432c5efa6ef0780aacbb7f066
commit 235d5af3afa58ff432c5efa6ef0780aacbb7f066 Author: winesync <[email protected]> AuthorDate: Sun Jan 16 21:01:12 2022 +0100 Commit: Thomas Csovcsity <[email protected]> CommitDate: Sun Jun 19 13:06:31 2022 +0200 [WINESYNC] reg: Add a new message to indicate when a registry key fails to import. Signed-off-by: Hugh McMaster <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 9b7a5cfb0e709e4434575daf960f803338bdf6bd by Hugh McMaster <[email protected]> manual adjustment needed --- base/applications/cmdutils/reg/import.c | 4 ++-- base/applications/cmdutils/reg/lang/en-US.rc | 1 + base/applications/cmdutils/reg/resource.h | 1 + sdk/tools/winesync/reg.cfg | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/base/applications/cmdutils/reg/import.c b/base/applications/cmdutils/reg/import.c index 3ce8fce7394..223e7db0e48 100644 --- a/base/applications/cmdutils/reg/import.c +++ b/base/applications/cmdutils/reg/import.c @@ -523,7 +523,7 @@ static WCHAR *parse_win31_line_state(struct parser *parser, WCHAR *pos) if (open_key(parser, line) != ERROR_SUCCESS) { - output_message(STRING_OPEN_KEY_FAILED, line); + output_message(STRING_KEY_IMPORT_FAILED, line); return line; } @@ -584,7 +584,7 @@ static WCHAR *key_name_state(struct parser *parser, WCHAR *pos) return p + 1; } else if (open_key(parser, p) != ERROR_SUCCESS) - output_message(STRING_OPEN_KEY_FAILED, p); + output_message(STRING_KEY_IMPORT_FAILED, p); done: set_state(parser, LINE_START); diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc index 038d7658dc0..11ae14280ff 100644 --- a/base/applications/cmdutils/reg/lang/en-US.rc +++ b/base/applications/cmdutils/reg/lang/en-US.rc @@ -147,4 +147,5 @@ STRINGTABLE STRING_INVALID_SYSTEM_KEY, "reg: Invalid system key [%1]\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/resource.h b/base/applications/cmdutils/reg/resource.h index 508761d01ac..ca42e59a744 100644 --- a/base/applications/cmdutils/reg/resource.h +++ b/base/applications/cmdutils/reg/resource.h @@ -62,3 +62,4 @@ #define STRING_INVALID_SYSTEM_KEY 137 #define STRING_OVERWRITE_FILE 138 #define STRING_KEY_NONEXIST 139 +#define STRING_KEY_IMPORT_FAILED 140 diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index e01102a7d73..821e260688b 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: fa2ed01352f8f027625d464915cd953e10766d73 + wine: 9b7a5cfb0e709e4434575daf960f803338bdf6bd
