[PATCH 2/6] reg/tests: Update reg_open() and reg_open_() definitions
Hugh McMaster
hugh.mcmaster at outlook.com
Wed Jun 16 07:43:06 CDT 2021
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
programs/reg/tests/add.c | 5 ++---
programs/reg/tests/reg_test.h | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/programs/reg/tests/add.c b/programs/reg/tests/add.c
index d2548c7d170..c8091fb7305 100644
--- a/programs/reg/tests/add.c
+++ b/programs/reg/tests/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/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h
index 140f01580e8..ef76e4c92b0 100644
--- a/programs/reg/tests/reg_test.h
+++ b/programs/reg/tests/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);
--
2.32.0
More information about the wine-devel
mailing list