Hugh McMaster : reg/tests: Test the placement of the overwrite file flag [ /y].
Alexandre Julliard
julliard at winehq.org
Mon Sep 18 14:43:48 CDT 2017
Module: wine
Branch: master
Commit: f886f9f3d8878245d9ad2c021ecac15495c7bb42
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f886f9f3d8878245d9ad2c021ecac15495c7bb42
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Mon Sep 18 08:27:41 2017 +0000
reg/tests: Test the placement of the overwrite file flag [/y].
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/reg/tests/reg.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c
index c41d284..f4ab824 100644
--- a/programs/reg/tests/reg.c
+++ b/programs/reg/tests/reg.c
@@ -4213,7 +4213,8 @@ static void test_import_31(void)
static void test_export(void)
{
LONG err;
- DWORD r;
+ DWORD r, os_version, major_version, minor_version;
+ HKEY hkey;
err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err);
@@ -4250,6 +4251,36 @@ static void test_export(void)
run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg file2.reg", &r);
ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ /* Test registry export with an empty key */
+ add_key(HKEY_CURRENT_USER, KEY_BASE, &hkey);
+
+ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+
+ os_version = GetVersion();
+ major_version = LOBYTE(LOWORD(os_version));
+ minor_version = HIBYTE(LOWORD(os_version));
+
+ if (major_version > 5 || (major_version == 5 && minor_version == 2))
+ {
+ run_reg_exe("reg export /y HKEY_CURRENT_USER\\" KEY_BASE " file.reg", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " /y file.reg", &r);
+ ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);
+
+ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r);
+ todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);
+ }
+ else /* Windows XP (32-bit) and older */
+ win_skip("File overwrite flag [/y] not supported; skipping position tests\n");
+
+ err = DeleteFileA("file.reg");
+ todo_wine ok(err, "DeleteFile failed: %u\n", GetLastError());
+
+ err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
+ ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err);
}
START_TEST(reg)
More information about the wine-cvs
mailing list