https://git.reactos.org/?p=reactos.git;a=commitdiff;h=123e459be571684e584031...
commit 123e459be571684e584031beef5b92da66fbfdbb Author: winesync ros-dev@reactos.org AuthorDate: Sun Jan 16 21:15:48 2022 +0100 Commit: Thomas Csovcsity thc.fr13nd@gmail.com CommitDate: Sun Jun 19 13:06:34 2022 +0200
[WINESYNC] reg: Use correct error message if RegCreateKeyExW() fails.
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id dedcd7c100461cf8be46387ebd65b60488c13ecf by Hugh McMaster hugh.mcmaster@outlook.com
manual adjustment needed --- base/applications/cmdutils/reg/add.c | 2 +- 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, 4 insertions(+), 2 deletions(-)
diff --git a/base/applications/cmdutils/reg/add.c b/base/applications/cmdutils/reg/add.c index ff209bfc0ff..db909167f30 100644 --- a/base/applications/cmdutils/reg/add.c +++ b/base/applications/cmdutils/reg/add.c @@ -157,7 +157,7 @@ static int run_add(HKEY root, WCHAR *path, WCHAR *value_name, BOOL value_empty, if (RegCreateKeyExW(root, path, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ|KEY_WRITE, NULL, &hkey, NULL)) { - output_message(STRING_INVALID_KEY); + output_message(STRING_ACCESS_DENIED); return 1; }
diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc index 97b55e6eda1..060ac3f9d29 100644 --- a/base/applications/cmdutils/reg/lang/en-US.rc +++ b/base/applications/cmdutils/reg/lang/en-US.rc @@ -152,4 +152,5 @@ STRINGTABLE \ Access the registry using the 32-bit view.\n\n\ \ /reg:64\n\ \ Access the registry using the 64-bit view.\n\n" + STRING_ACCESS_DENIED, "reg: Unable to access or create the specified registry key\n" } diff --git a/base/applications/cmdutils/reg/resource.h b/base/applications/cmdutils/reg/resource.h index c1698e91c7e..3e148854ff5 100644 --- a/base/applications/cmdutils/reg/resource.h +++ b/base/applications/cmdutils/reg/resource.h @@ -64,3 +64,4 @@ #define STRING_KEY_NONEXIST 139 #define STRING_KEY_IMPORT_FAILED 140 #define STRING_REG_VIEW_USAGE 141 +#define STRING_ACCESS_DENIED 142 diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index a1273c41652..f322b64ccc7 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: 8203c5db0248d38f06af55411ac4f4c89976fad2 + wine: dedcd7c100461cf8be46387ebd65b60488c13ecf