https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f9a0d83961625bc7b319e8...
commit f9a0d83961625bc7b319e8de0b7fe59778647061 Author: winesync ros-dev@reactos.org AuthorDate: Sun Jan 16 21:19:21 2022 +0100 Commit: Thomas Csovcsity thc.fr13nd@gmail.com CommitDate: Sun Jun 19 13:06:35 2022 +0200
[WINESYNC] reg: Update an error message.
Signed-off-by: Hugh McMaster hugh.mcmaster@outlook.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id fa4268dcbcfe0b1bcbe3adafb7e3dd542eb6d928 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 | 2 +- base/applications/cmdutils/reg/resource.h | 2 +- sdk/tools/winesync/reg.cfg | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/base/applications/cmdutils/reg/add.c b/base/applications/cmdutils/reg/add.c index 0236dfb4742..fb0ee2a03fd 100644 --- a/base/applications/cmdutils/reg/add.c +++ b/base/applications/cmdutils/reg/add.c @@ -76,7 +76,7 @@ static BOOL get_regdata(const WCHAR *data, DWORD reg_type, WCHAR separator, unsigned long val; val = wcstoul(data, &rest, (towlower(data[1]) == 'x') ? 16 : 10); if (*rest || data[0] == '-' || (val == ~0u && errno == ERANGE)) { - output_message(STRING_MISSING_INTEGER); + output_message(STRING_MISSING_NUMBER); return FALSE; } *size_bytes = sizeof(DWORD); diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc index 955d31c02e3..2fb2c253aa6 100644 --- a/base/applications/cmdutils/reg/lang/en-US.rc +++ b/base/applications/cmdutils/reg/lang/en-US.rc @@ -94,7 +94,7 @@ STRINGTABLE STRING_NO_REMOTE, "reg: Unable to access remote machine\n" STRING_VALUE_NONEXIST, "reg: Unable to find the specified registry value\n" STRING_UNSUPPORTED_TYPE, "reg: Unsupported registry data type [%1]\n" - STRING_MISSING_INTEGER, "reg: The option [/d] must be followed by a valid integer\n" + STRING_MISSING_NUMBER, "reg: The option [/d] must be followed by a valid numeric value\n" STRING_MISSING_HEXDATA, "reg: The option [/d] must be followed by a valid hexadecimal value\n" STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n" STRING_OVERWRITE_VALUE, "The registry value '%1' already exists. Do you want to overwrite it?" diff --git a/base/applications/cmdutils/reg/resource.h b/base/applications/cmdutils/reg/resource.h index 3e148854ff5..3dc103b56b9 100644 --- a/base/applications/cmdutils/reg/resource.h +++ b/base/applications/cmdutils/reg/resource.h @@ -33,7 +33,7 @@ #define STRING_NO_REMOTE 108 #define STRING_VALUE_NONEXIST 109 #define STRING_UNSUPPORTED_TYPE 110 -#define STRING_MISSING_INTEGER 111 +#define STRING_MISSING_NUMBER 111 #define STRING_MISSING_HEXDATA 112 #define STRING_UNHANDLED_TYPE 113 #define STRING_OVERWRITE_VALUE 114 diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg index b9ae209f6ec..74438397053 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: 5bee1882c009d399d4e9082bcf75a4ea9b51bfe0 + wine: fa4268dcbcfe0b1bcbe3adafb7e3dd542eb6d928