Alexandre Julliard : regedit/tests: Get rid of version check.
Alexandre Julliard
julliard at winehq.org
Tue Jan 2 13:19:02 CST 2018
Module: wine
Branch: master
Commit: 6c5deaa4745e0fdf7cef46499a9593c17c946087
URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c5deaa4745e0fdf7cef46499a9593c17c946087
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jan 2 15:22:16 2018 +0100
regedit/tests: Get rid of version check.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/regedit/tests/regedit.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)
diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c
index d67c57b..3bab7e1 100644
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -1647,7 +1647,7 @@ static void test_invalid_import_unicode(void)
{
LONG lr;
HKEY hkey;
- DWORD dword = 0x8, os_version, major_version, minor_version;
+ DWORD dword = 0x8;
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr);
@@ -1740,19 +1740,10 @@ static void test_invalid_import_unicode(void)
"\"Test10\"=\"Value\"\n");
verify_reg_nonexist(hkey, "Test10");
- os_version = GetVersion();
- major_version = LOBYTE(LOWORD(os_version));
- minor_version = HIBYTE(LOWORD(os_version));
-
- if (major_version > 5 || (major_version == 5 && minor_version > 0))
- {
- exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n"
- "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
- "\"Test11\"=\"Value\"\n");
- verify_reg_nonexist(hkey, "Test11");
- }
- else /* Windows 2000 */
- win_skip("Skipping a non-standard header test\n");
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test11\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test11");
/* Test multi-line import with incorrect comma placement */
exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
More information about the wine-cvs
mailing list