[reactos] 58/158: [WINESYNC] reg: Add a message to better indicate when a specified registry key is not found.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e11511da86fe791ebfc83c...

commit e11511da86fe791ebfc83c4cbede3ba8cbc55114
Author:     winesync [e-mail]
AuthorDate: Sun Jan 16 20:59:23 2022 +0100
Commit:     Thomas Csovcsity [e-mail]
CommitDate: Sun Jun 19 13:06:31 2022 +0200

[WINESYNC] reg: Add a message to better indicate when a specified registry key is not found.

Signed-off-by: Hugh McMaster [e-mail]
    Signed-off-by: Alexandre Julliard [e-mail]

wine commit id fa2ed01352f8f027625d464915cd953e10766d73 by Hugh McMaster [e-mail]

manual adjustment needed
---
 base/applications/cmdutils/reg/delete.c      | 4 ++--
 base/applications/cmdutils/reg/export.c      | 2 +-
 base/applications/cmdutils/reg/lang/en-US.rc | 1 +
 base/applications/cmdutils/reg/query.c       | 2 +-
 base/applications/cmdutils/reg/resource.h    | 1 +
 sdk/tools/winesync/reg.cfg                   | 2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/base/applications/cmdutils/reg/delete.c b/base/applications/cmdutils/reg/delete.c
index 1f3755b3365..c80b622bccb 100644
--- a/base/applications/cmdutils/reg/delete.c
+++ b/base/applications/cmdutils/reg/delete.c
@@ -46,7 +46,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name
     {
         if (RegDeleteTreeW(root, path) != ERROR_SUCCESS)
         {
-            output_message(STRING_CANNOT_FIND);
+            output_message(STRING_KEY_NONEXIST);
             return 1;
         }
         output_message(STRING_SUCCESS);
@@ -55,7 +55,7 @@ static int run_delete(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name

if (RegOpenKeyExW(root, path, 0, KEY_READ|KEY_SET_VALUE, &key))
     {
-        output_message(STRING_CANNOT_FIND);
+        output_message(STRING_KEY_NONEXIST);
         return 1;
     }

diff --git a/base/applications/cmdutils/reg/export.c b/base/applications/cmdutils/reg/export.c
index 5e84369a234..0b6d9ad9cbe 100644
--- a/base/applications/cmdutils/reg/export.c
+++ b/base/applications/cmdutils/reg/export.c
@@ -374,7 +374,7 @@ int reg_export(int argc, WCHAR *argvW[])

if (RegOpenKeyExW(root, path, 0, KEY_READ, &hkey))
     {
-        output_message(STRING_INVALID_KEY);
+        output_message(STRING_KEY_NONEXIST);
         return 1;
     }

diff --git a/base/applications/cmdutils/reg/lang/en-US.rc b/base/applications/cmdutils/reg/lang/en-US.rc
index 24ae3691e5b..038d7658dc0 100644
--- a/base/applications/cmdutils/reg/lang/en-US.rc
+++ b/base/applications/cmdutils/reg/lang/en-US.rc
@@ -146,4 +146,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"
 }
diff --git a/base/applications/cmdutils/reg/query.c b/base/applications/cmdutils/reg/query.c
index 961d926a10b..a82101a0a29 100644
--- a/base/applications/cmdutils/reg/query.c
+++ b/base/applications/cmdutils/reg/query.c
@@ -302,7 +302,7 @@ static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name,

if (RegOpenKeyExW(root, path, 0, KEY_READ, &key) != ERROR_SUCCESS)
     {
-        output_message(STRING_CANNOT_FIND);
+        output_message(STRING_KEY_NONEXIST);
         return 1;
     }

diff --git a/base/applications/cmdutils/reg/resource.h b/base/applications/cmdutils/reg/resource.h
index 3658adc1556..508761d01ac 100644
--- a/base/applications/cmdutils/reg/resource.h
+++ b/base/applications/cmdutils/reg/resource.h
@@ -61,3 +61,4 @@
 #define STRING_EXPORT_USAGE           136
 #define STRING_INVALID_SYSTEM_KEY     137
 #define STRING_OVERWRITE_FILE         138
+#define STRING_KEY_NONEXIST           139
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index d0b804e2ede..e01102a7d73 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: 4df5c1641e7091f42c2313b275d999f2b9d25eff
+  wine: fa2ed01352f8f027625d464915cd953e10766d73