Hugh McMaster : regedit/tests: Add Unicode tests for importing registry data with whitespace.
Alexandre Julliard
julliard at winehq.org
Thu Aug 24 14:18:25 CDT 2017
Module: wine
Branch: master
Commit: 634156b10a17276a368cf4ad447c5aef28f20589
URL: http://source.winehq.org/git/wine.git/?a=commit;h=634156b10a17276a368cf4ad447c5aef28f20589
Author: Hugh McMaster <hugh.mcmaster at outlook.com>
Date: Thu Aug 24 12:46:00 2017 +0000
regedit/tests: Add Unicode tests for importing registry data with whitespace.
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/regedit/tests/regedit.c | 151 +++++++++++++++++++++++++++++++++++++++
1 file changed, 151 insertions(+)
diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c
index af95711..8114cce 100644
--- a/programs/regedit/tests/regedit.c
+++ b/programs/regedit/tests/regedit.c
@@ -2223,6 +2223,156 @@ static void test_import_with_whitespace(void)
ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr);
}
+static void test_import_with_whitespace_unicode(void)
+{
+ HKEY hkey;
+ LONG lr;
+ DWORD dword;
+
+ lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
+ ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr);
+
+ exec_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n");
+
+ lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey);
+ ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", lr);
+
+ exec_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine1a\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0);
+
+ exec_import_wstr("\xef\xbb\xbf\tWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine1b\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0);
+
+ exec_import_wstr("\xef\xbb\xbf \t Windows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine1c\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ " [HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine2a\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine2b\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine2c\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ " \"Wine3a\"=\"Two leading spaces\"\n\n");
+ verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\t\"Wine3b\"=\"One leading tab\"\n\n");
+ verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ " \t \"Wine3c\"=\"Space, tab, space\"\n\n");
+ verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0);
+
+ exec_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n"
+ "\t\t\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\t \"Wine4a\"=\"Tab and four spaces\"\n"
+ " \"Wine4b\"=dword:00112233\n"
+ "\t \t \t \t \t \t \"Wine4c\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+ " 63,00,6f,00,6e,00,\\;comment\n"
+ "\t\t\t\t63,00,61,00,74,00,\\;comment\n"
+ " \t65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n");
+ verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0);
+ dword = 0x112233;
+ verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0);
+ verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
+ exec_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n"
+ "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ " \"Wine5a\"=\"Leading spaces\"\n"
+ "\t\t\"Wine5b\"\t\t=\"Leading tabs\"\n"
+ "\t \"Wine5c\"=\t \"Tabs and spaces\"\n"
+ " \"Wine5d\" \t = \t \"More whitespace\"\n\n");
+ verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0);
+ verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0);
+ verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0);
+ verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\" Wine6a\"=\"Leading spaces\"\n"
+ "\"\t\tWine6b\"=\"Leading tabs\"\n"
+ " \" Wine6c \" = \" Spaces everywhere \" \n\n");
+ verify_reg(hkey, " Wine6a", REG_SZ, "Leading spaces", 15, 0);
+ verify_reg(hkey, "\t\tWine6b", REG_SZ, "Leading tabs", 13, 0);
+ verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine7a\"=\" Four spaces in the data\"\n"
+ "\"Wine7b\"=\"\t\tTwo tabs in the data\"\n\n");
+ verify_reg(hkey, "Wine7a", REG_SZ, " Four spaces in the data", 28, 0);
+ verify_reg(hkey, "Wine7b", REG_SZ, "\t\tTwo tabs in the data", 23, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine8a\"=\"Trailing spaces\" \n"
+ "\"Wine8b\"=\"Trailing tabs and spaces\"\t \t\n\n");
+ verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0);
+ verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine9a\"=dword: 00000008\n"
+ "\"Wine9b\"=dword:\t\t00000008\n\n");
+ dword = 0x00000008;
+ verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0);
+ verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "@ = \"Test Value\"\n\n");
+ verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\t@\t=\tdword:\t00000008\t\n\n");
+ verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine10a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+ " 63,00,6f,00,6e,00,\\\n\n"
+ " 63,00,61,00,74,00,\\\n\n\n"
+ " 65,00,6e,00,\\\n\n\n\n"
+ " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n");
+ verify_reg(hkey, "Wine10a", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
+ exec_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine10b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n"
+ " 63,00,6f,00,6e,00,\\\n \n"
+ " 63,00,61,00,74,00,\\\n\t\n\t\n"
+ " 65,00,6e,00,\\\n\t \t\n\t \t\n\t \t\n"
+ " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n");
+ verify_reg(hkey, "Wine10b", REG_MULTI_SZ, "Line concatenation\0", 20, 0);
+
+ lr = RegCloseKey(hkey);
+ ok(lr == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", lr);
+
+ lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
+ ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", lr);
+}
+
static void test_key_creation_and_deletion(void)
{
HKEY hkey, subkey;
@@ -2424,6 +2574,7 @@ START_TEST(regedit)
test_comments();
test_comments_unicode();
test_import_with_whitespace();
+ test_import_with_whitespace_unicode();
test_key_creation_and_deletion();
test_value_deletion();
}
More information about the wine-cvs
mailing list