https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6c0f70db4dadf0a2fad42…
commit 6c0f70db4dadf0a2fad4270596ccce38eae48434
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Jan 16 21:04:41 2022 +0100
Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com>
CommitDate: Sun Jun 19 13:06:31 2022 +0200
[WINESYNC] reg: Better indicate when a registry value is not found.
Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id b80da20656feda99f9c6e749f5cd6d6f3c242cd3 by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
manual adjustment needed
---
base/applications/cmdutils/reg/delete.c | 2 +-
base/applications/cmdutils/reg/lang/en-US.rc | 2 +-
base/applications/cmdutils/reg/query.c | 2 +-
base/applications/cmdutils/reg/resource.h | 2 +-
sdk/tools/winesync/reg.cfg | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/base/applications/cmdutils/reg/delete.c
b/base/applications/cmdutils/reg/delete.c
index c80b622bccb..519d4b880ec 100644
--- a/base/applications/cmdutils/reg/delete.c
+++ b/base/applications/cmdutils/reg/delete.c
@@ -96,7 +96,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR
*value_name
if (RegDeleteValueW(key, value_empty ? NULL : value_name) != ERROR_SUCCESS)
{
RegCloseKey(key);
- output_message(STRING_CANNOT_FIND);
+ output_message(STRING_VALUE_NONEXIST);
return 1;
}
}
diff --git a/base/applications/cmdutils/reg/lang/en-US.rc
b/base/applications/cmdutils/reg/lang/en-US.rc
index d137ce134c7..3457b10bc12 100644
--- a/base/applications/cmdutils/reg/lang/en-US.rc
+++ b/base/applications/cmdutils/reg/lang/en-US.rc
@@ -92,7 +92,7 @@ STRINGTABLE
STRING_INVALID_KEY, "reg: Invalid registry key\n"
STRING_INVALID_CMDLINE, "reg: Invalid command line parameters\n"
STRING_NO_REMOTE, "reg: Unable to access remote machine\n"
- STRING_CANNOT_FIND, "reg: The system was unable to find the specified registry
key or value\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_HEXDATA, "reg: The option [/d] must be followed by a valid
hexadecimal value\n"
diff --git a/base/applications/cmdutils/reg/query.c
b/base/applications/cmdutils/reg/query.c
index a82101a0a29..656ac875ec4 100644
--- a/base/applications/cmdutils/reg/query.c
+++ b/base/applications/cmdutils/reg/query.c
@@ -174,7 +174,7 @@ static int query_value(HKEY key, WCHAR *value_name, WCHAR *path, BOOL
recurse)
{
if (value_name && *value_name)
{
- output_message(STRING_CANNOT_FIND);
+ output_message(STRING_VALUE_NONEXIST);
return 1;
}
output_string(fmt, path);
diff --git a/base/applications/cmdutils/reg/resource.h
b/base/applications/cmdutils/reg/resource.h
index ca42e59a744..6768aaf595e 100644
--- a/base/applications/cmdutils/reg/resource.h
+++ b/base/applications/cmdutils/reg/resource.h
@@ -31,7 +31,7 @@
#define STRING_INVALID_KEY 106
#define STRING_INVALID_CMDLINE 107
#define STRING_NO_REMOTE 108
-#define STRING_CANNOT_FIND 109
+#define STRING_VALUE_NONEXIST 109
#define STRING_UNSUPPORTED_TYPE 110
#define STRING_MISSING_INTEGER 111
#define STRING_MISSING_HEXDATA 112
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index b137c92c31b..c94f10bf936 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: fbecd56db8889f9d349c2f807348cdddf397eab1
+ wine: b80da20656feda99f9c6e749f5cd6d6f3c242cd3