[ros-diffs] [reactos] 98/158: [WINESYNC] reg/tests: Update error messages.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=513271116760043eaebfc…

commit 513271116760043eaebfcfa54b3f5caf45172d9a
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Sun Jan 16 21:17:19 2022 +0100
Commit:     Thomas Csovcsity <thc.fr13nd(a)gmail.com>
CommitDate: Sun Jun 19 13:06:34 2022 +0200

    [WINESYNC] reg/tests: Update error messages.
    
    Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 08786274e25461dc1af3684f0e46c896201b28cb by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
---
 modules/rostests/winetests/reg/add.c | 22 +++++++++++-----------
 sdk/tools/winesync/reg.cfg           |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/modules/rostests/winetests/reg/add.c b/modules/rostests/winetests/reg/add.c
index 78519565b22..23d0115fd64 100644
--- a/modules/rostests/winetests/reg/add.c
+++ b/modules/rostests/winetests/reg/add.c
@@ -57,18 +57,18 @@ void verify_reg_(const char *file, unsigned line, HKEY hkey, const
char *value,
     size = sizeof(data);
     memset(data, 0xdd, size);
     err = RegQueryValueExA(hkey, value, NULL, &type, data, &size);
-    lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got %d\n", err);
+    lok(err == ERROR_SUCCESS, "RegQueryValueEx failed: got error %d\n", err);
     if (err != ERROR_SUCCESS)
         return;
 
     todo_wine_if (todo & TODO_REG_TYPE)
-        lok(type == exp_type, "got wrong type %d, expected %d\n", type,
exp_type);
+        lok(type == exp_type, "got registry type %d, expected %d\n", type,
exp_type);
     todo_wine_if (todo & TODO_REG_SIZE)
-        lok(size == exp_size, "got wrong size %d, expected %d\n", size,
exp_size);
+        lok(size == exp_size, "got data size %d, expected %d\n", size,
exp_size);
     if (exp_data)
     {
         todo_wine_if (todo & TODO_REG_DATA)
-            lok(memcmp(data, exp_data, size) == 0, "got wrong data\n");
+            lok(memcmp(data, exp_data, size) == 0, "registry data does not
match\n");
     }
 }
 
@@ -87,7 +87,7 @@ void open_key_(const char *file, unsigned line, const HKEY base, const
char *pat
     LONG err;
 
     err = RegOpenKeyExA(base, path, 0, KEY_READ|sam, hkey);
-    lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", err);
+    lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err);
 }
 
 void close_key_(const char *file, unsigned line, HKEY hkey)
@@ -95,7 +95,7 @@ void close_key_(const char *file, unsigned line, HKEY hkey)
     LONG err;
 
     err = RegCloseKey(hkey);
-    lok(err == ERROR_SUCCESS, "RegCloseKey failed: %d\n", err);
+    lok(err == ERROR_SUCCESS, "RegCloseKey failed: got error %d\n", err);
 }
 
 void verify_key_(const char *file, unsigned line, HKEY key_base, const char *subkey)
@@ -104,7 +104,7 @@ void verify_key_(const char *file, unsigned line, HKEY key_base, const
char *sub
     LONG err;
 
     err = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey);
-    lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d\n", err);
+    lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err);
 
     if (hkey)
         RegCloseKey(hkey);
@@ -130,7 +130,7 @@ void add_key_(const char *file, unsigned line, const HKEY hkey, const
char *path
 
     err = RegCreateKeyExA(hkey, path, 0, NULL, REG_OPTION_NON_VOLATILE,
                           KEY_READ|KEY_WRITE, NULL, &new_key, NULL);
-    lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", err);
+    lok(err == ERROR_SUCCESS, "RegCreateKeyExA failed: got error %d\n", err);
 
     if (subkey)
         *subkey = new_key;
@@ -145,7 +145,7 @@ void delete_key_(const char *file, unsigned line, const HKEY hkey,
const char *p
         LONG err;
 
         err = RegDeleteKeyA(hkey, path);
-        lok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err);
+        lok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got error %d\n",
err);
     }
 }
 
@@ -197,7 +197,7 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char
*name,
     LONG err;
 
     err = RegSetValueExA(hkey, name, 0, type, (const BYTE *)data, size);
-    lok(err == ERROR_SUCCESS, "RegSetValueExA failed: %d\n", err);
+    lok(err == ERROR_SUCCESS, "RegSetValueExA failed: got error %d\n", err);
 }
 
 void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name)
@@ -205,7 +205,7 @@ void delete_value_(const char *file, unsigned line, const HKEY hkey,
const char
     LONG err;
 
     err = RegDeleteValueA(hkey, name);
-    lok(err == ERROR_SUCCESS, "RegDeleteValueA failed: %d\n", err);
+    lok(err == ERROR_SUCCESS, "RegDeleteValueA failed: got error %d\n", err);
 }
 
 /* Unit tests */
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index a293bf67ea0..553d827ef9a 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: 357601a01b894ecdd0e26f5493914192d7ccae6f
+  wine: 08786274e25461dc1af3684f0e46c896201b28cb