https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea4fae511610ef9e29a0a…
commit ea4fae511610ef9e29a0ac6a11c4197a939e537f
Author: winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Jan 17 18:47:35 2022 +0100
Commit: Thomas Csovcsity <thc.fr13nd(a)gmail.com>
CommitDate: Sun Jun 19 13:06:37 2022 +0200
[WINESYNC] reg/tests: Update reg_open() and reg_open_() definitions.
Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
wine commit id 0eb85504b4b9bdeef8a402d39024e20ad99789a0 by Hugh McMaster
<hugh.mcmaster(a)outlook.com>
---
modules/rostests/winetests/reg/add.c | 5 ++---
modules/rostests/winetests/reg/reg_test.h | 5 ++---
sdk/tools/winesync/reg.cfg | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/modules/rostests/winetests/reg/add.c b/modules/rostests/winetests/reg/add.c
index d2548c7d170..c8091fb7305 100644
--- a/modules/rostests/winetests/reg/add.c
+++ b/modules/rostests/winetests/reg/add.c
@@ -81,12 +81,11 @@ void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey,
const char
(value && *value) ? value : "(Default)", err);
}
-void open_key_(const char *file, unsigned line, const HKEY base, const char *path,
- const DWORD sam, HKEY *hkey)
+void open_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam,
HKEY *hkey)
{
LONG err;
- err = RegOpenKeyExA(base, path, 0, KEY_READ|sam, hkey);
+ err = RegOpenKeyExA(root, path, 0, KEY_READ|sam, hkey);
lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got error %d\n", err);
}
diff --git a/modules/rostests/winetests/reg/reg_test.h
b/modules/rostests/winetests/reg/reg_test.h
index 140f01580e8..ef76e4c92b0 100644
--- a/modules/rostests/winetests/reg/reg_test.h
+++ b/modules/rostests/winetests/reg/reg_test.h
@@ -46,9 +46,8 @@ void verify_reg_(const char *file, unsigned line, HKEY hkey, const char
*value,
#define verify_reg_nonexist(k,v) verify_reg_nonexist_(__FILE__,__LINE__,k,v)
void verify_reg_nonexist_(const char *file, unsigned line, HKEY hkey, const char
*value);
-#define open_key(b,p,s,k) open_key_(__FILE__,__LINE__,b,p,s,k)
-void open_key_(const char *file, unsigned line, const HKEY base, const char *path,
- const DWORD sam, HKEY *hkey);
+#define open_key(r,p,s,k) open_key_(__FILE__,__LINE__,r,p,s,k)
+void open_key_(const char *file, unsigned line, HKEY root, const char *path, REGSAM sam,
HKEY *hkey);
#define close_key(k) close_key_(__FILE__,__LINE__,k)
void close_key_(const char *file, unsigned line, HKEY hkey);
diff --git a/sdk/tools/winesync/reg.cfg b/sdk/tools/winesync/reg.cfg
index 978a8b294d1..482efc510ba 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: f06869199571466c989b0e75a8edfb55ad6e541a
+ wine: 0eb85504b4b9bdeef8a402d39024e20ad99789a0