reg/tests: Split first sequence of 'import' tests from reg.c.

programs/reg/tests/Makefile.in

@@ -3,5 +3,6 @@ IMPORTS   = advapi32
 
 C_SRCS = \
 	delete.c \
+	import.c \
 	query.c \
 	reg.c

programs/reg/tests/reg_test.h

@@ -24,6 +24,7 @@
 #include "wine/test.h"
 
 /* Common #defines */
+#define lok ok_(__FILE__,line)
 #define KEY_WINE "Software\\Wine"
 #define KEY_BASE KEY_WINE "\\reg_test"
 #define REG_EXIT_SUCCESS 0
@@ -33,9 +34,16 @@
 #define run_reg_exe(c,r) run_reg_exe_(__LINE__,c,r)
 BOOL run_reg_exe_(unsigned line, const char *cmd, DWORD *rc);
 
+#define verify_reg(k,v,t,d,s,todo) verify_reg_(__LINE__,k,v,t,d,s,todo)
+void verify_reg_(unsigned line, HKEY hkey, const char* value, DWORD exp_type,
+                 const void *exp_data, DWORD exp_size, DWORD todo);
+
 #define verify_reg_nonexist(k,v) verify_reg_nonexist_(__LINE__,k,v)
 void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value);
 
+#define open_key(b,p,s,k) open_key_(__LINE__,b,p,s,k)
+void open_key_(unsigned line, const HKEY base, const char *path, const DWORD sam, HKEY *hkey);
+
 #define close_key(k) close_key_(__LINE__,k)
 void close_key_(unsigned line, HKEY hkey);
 
@@ -56,4 +64,12 @@ LONG delete_tree(const HKEY key, const char *subkey);
 #define add_value(k,n,t,d,s) add_value_(__LINE__,k,n,t,d,s)
 void add_value_(unsigned line, HKEY hkey, const char *name, DWORD type, const void *data, size_t size);
 
+#define delete_value(k,n) delete_value_(__LINE__,k,n)
+void delete_value_(unsigned line, const HKEY hkey, const char *name);
+
+/* import.c */
+#define test_import_str(c,r) import_reg(__LINE__,c,FALSE,r)
+#define test_import_wstr(c,r) import_reg(__LINE__,c,TRUE,r)
+BOOL import_reg(unsigned line, const char *contents, BOOL unicode, DWORD *rc);
+
 #endif /* __REG_TEST_H__ */