3 Jun
2017
3 Jun
'17
10:36 p.m.
Author: akhaldi
Date: Sat Jun 3 22:36:19 2017
New Revision: 74840
URL: http://svn.reactos.org/svn/reactos?rev=74840&view=rev
Log:
[REGEDIT_WINETEST] Sync with Wine Staging 2.9. CORE-13362
Modified:
trunk/rostests/winetests/regedit/regedit.c
Modified: trunk/rostests/winetests/regedit/regedit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/regedit/regedit…
==============================================================================
--- trunk/rostests/winetests/regedit/regedit.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/regedit/regedit.c [iso-8859-1] Sat Jun 3 22:36:19 2017
@@ -167,8 +167,8 @@
static void test_basic_import(void)
{
- HKEY hkey;
- DWORD dword = 0x17;
+ HKEY hkey, subkey;
+ DWORD dword = 0x17, type, size;
char exp_binary[] = {0xAA,0xBB,0xCC,0x11};
WCHAR wide_test[] =
{0xFEFF,'W','i','n','d','o','w','s','
','R','e','g',
'i','s','t','r','y','
','E','d','i','t','o','r','
','V','e','r','s',
@@ -188,6 +188,8 @@
'l','u','e','"','\r',0};
WCHAR wide_exp[] =
{0x3041,'V','a','l','u','e',0};
LONG lr;
+ char buffer[8];
+ BYTE hex[8];
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND,
@@ -235,6 +237,11 @@
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
"\"With=Equals\"=\"asdf\"\n");
verify_reg(hkey, "With=Equals", REG_SZ, "asdf", 5, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Empty string\"=\"\"\n\n");
+ verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0);
exec_import_str("REGEDIT4\n\n"
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
@@ -251,8 +258,8 @@
"[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
"\"Wine1\"=dword:00000782\n\n"
"\"Wine2\"=\"Test Value\"\n"
- "\"Wine3\"=hex(7):4c,69,6e,65,20,\
- 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n"
+ "\"Wine3\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n"
"#comment\n"
"@=\"Test\"\n"
";comment\n\n"
@@ -265,16 +272,217 @@
dword = 0x12345678;
verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0);
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine5\"=\"No newline\"");
+ verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine6\"=dword:00000050\n\n"
+ "\"Wine7\"=\"No newline\"");
+ dword = 0x50;
+ verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0);
+ verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine8a\"=dword:1\n"
+ "\"Wine8b\"=dword:4444\n\n");
+ dword = 0x1;
+ verify_reg(hkey, "Wine8a", REG_DWORD, &dword, sizeof(dword), 0);
+ dword = 0x4444;
+ verify_reg(hkey, "Wine8b", REG_DWORD, &dword, sizeof(dword), 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine9a\"=hex(2):4c,69,6e,65,00\n"
+ "\"Wine9b\"=\"Value 1\"\n"
+ "\"Wine9c\"=hex(2):4c,69,6e,65\\\n"
+ "\"Wine9d\"=\"Value 2\"\n"
+ "\"Wine9e\"=hex(2):4c,69,6e,65,\\\n"
+ "\"Wine9f\"=\"Value 3\"\n"
+ "\"Wine9g\"=\"Value 4\"\n\n");
+ verify_reg(hkey, "Wine9a", REG_EXPAND_SZ, "Line", 5, 0);
+ verify_reg(hkey, "Wine9b", REG_SZ, "Value 1", 8, 0);
+ verify_reg_nonexist(hkey, "Wine9c");
+ todo_wine verify_reg(hkey, "Wine9d", REG_SZ, "Value 2", 8, 0);
+ verify_reg_nonexist(hkey, "Wine9e");
+ verify_reg_nonexist(hkey, "Wine9f");
+ verify_reg(hkey, "Wine9g", REG_SZ, "Value 4", 8, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"double\\\"quote\"=\"valid
\\\"or\\\" not\"\n"
+ "\"single'quote\"=dword:00000008\n\n");
+ verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\"
not", 15, 0);
+ dword = 0x00000008;
+ verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword),
0);
+
+ /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+
"\"Wine10a\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n"
+ "\"Wine10b\"=hex(0):56,00,61,00,6c,00,\\\n"
+ " 75,00,65,00,00,00\n"
+ "\"Wine10c\"=hex(0):56,00,61,00,\\;comment\n"
+ " 6c,00,75,00,\\\n"
+ " 65,00,00,00\n"
+ "\"Wine10d\"=hex(0):56,00,61,00,\\;comment\n"
+ " 6c,00,75,00,\n"
+ " 65,00,00,00\n"
+ "\"Wine10e\"=hex(0):56,00,61,00,\\;comment\n"
+ " 6c,00,75,00,;comment\n"
+ " 65,00,00,00\n");
+ verify_reg(hkey, "Wine10a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12,
0);
+ verify_reg(hkey, "Wine10b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12,
0);
+ todo_wine verify_reg(hkey, "Wine10c", REG_NONE,
"V\0a\0l\0u\0e\0\0", 12, 0);
+ todo_wine verify_reg(hkey, "Wine10d", REG_NONE, "V\0a\0l\0u", 8,
0);
+ todo_wine verify_reg(hkey, "Wine10e", REG_NONE, "V\0a\0l\0u", 8,
0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine11a\"=hex(2):25,50,41,54,48,25,00\n"
+ "\"Wine11b\"=hex(2):25,50,41,\\\n"
+ " 54,48,25,00\n"
+ "\"Wine11c\"=hex(2):25,50,41,\\;comment\n"
+ " 54,48,\\\n"
+ " 25,00\n"
+ "\"Wine11d\"=hex(2):25,50,41,\\;comment\n"
+ " 54,48,\n"
+ " 25,00\n"
+ "\"Wine11e\"=hex(2):25,50,41,\\;comment\n"
+ " 54,48,;comment\n"
+ " 25,00\n");
+ verify_reg(hkey, "Wine11a", REG_EXPAND_SZ, "%PATH%", 7, 0);
+ verify_reg(hkey, "Wine11b", REG_EXPAND_SZ, "%PATH%", 7, 0);
+ todo_wine verify_reg(hkey, "Wine11c", REG_EXPAND_SZ, "%PATH%", 7,
0);
+ /* Wine11d */
+ size = sizeof(buffer);
+ lr = RegQueryValueExA(hkey, "Wine11d", NULL, &type, (BYTE
*)&buffer, &size);
+ todo_wine ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr);
+ todo_wine ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n",
type, REG_EXPAND_SZ);
+ todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u,
expected 6\n", size);
+ todo_wine ok(memcmp(buffer, "%PATH", size) == 0, "got wrong
data\n");
+ /* Wine11e */
+ size = sizeof(buffer);
+ memset(buffer, '-', size);
+ lr = RegQueryValueExA(hkey, "Wine11e", NULL, &type, (BYTE
*)&buffer, &size);
+ todo_wine ok(lr == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", lr);
+ todo_wine ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n",
type, REG_EXPAND_SZ);
+ todo_wine ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u,
expected 6\n", size);
+ todo_wine ok(memcmp(buffer, "%PATH", size) == 0, "got wrong
data\n");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine12a\"=hex:11,22,33,44,55,66,77,88\n"
+ "\"Wine12b\"=hex:11,22,33,44,\\\n"
+ " 55,66,77,88\n"
+ "\"Wine12c\"=hex:11,22,33,44,\\;comment\n"
+ " 55,66,\\\n"
+ " 77,88\n"
+ "\"Wine12d\"=hex:11,22,33,44,\\;comment\n"
+ " 55,66,\n"
+ " 77,88\n"
+ "\"Wine12e\"=hex:11,22,33,44,\\;comment\n"
+ " 55,66,;comment\n"
+ " 77,88\n");
+ hex[0] = 0x11; hex[1] = 0x22; hex[2] = 0x33; hex[3] = 0x44;
+ hex[4] = 0x55; hex[5] = 0x66; hex[6] = 0x77; hex[7] = 0x88;
+ verify_reg(hkey, "Wine12a", REG_BINARY, hex, sizeof(hex), 0);
+ verify_reg(hkey, "Wine12b", REG_BINARY, hex, sizeof(hex), 0);
+ todo_wine verify_reg(hkey, "Wine12c", REG_BINARY, hex, sizeof(hex), 0);
+ todo_wine verify_reg(hkey, "Wine12d", REG_BINARY, hex, 6, 0);
+ todo_wine verify_reg(hkey, "Wine12e", REG_BINARY, hex, 6, 0);
+
+ /* Test import with subkeys */
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE
"\\Subkey\"1]\n"
+ "\"Wine\\\\31\"=\"Test value\"\n\n");
+ lr = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey);
+ ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr);
+ verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0);
+ lr = RegCloseKey(subkey);
+ ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr);
+ lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1");
+ ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n"
+ "\"123/\\\"4;'5\"=\"Random value
name\"\n\n");
+ lr = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey);
+ ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr);
+ verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value
name", 18, 0);
+ lr = RegCloseKey(subkey);
+ ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr);
+ lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2");
+ ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr);
+
RegCloseKey(hkey);
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr);
}
+static void test_basic_import_31(void)
+{
+ HKEY hkey;
+ LONG lr;
+
+ lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE);
+ ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND,
+ "RegDeleteKeyA failed: %d\n", lr);
+
+ /* Test simple value */
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n");
+ lr = RegOpenKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, KEY_READ, &hkey);
+ ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
+ verify_reg(hkey, "", REG_SZ, "Value0", 7, 0);
+
+ /* Test proper handling of spaces and equals signs */
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " =Value1\r\n");
+ verify_reg(hkey, "", REG_SZ, "Value1", 7, 0);
+
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " =
Value2\r\n");
+ verify_reg(hkey, "", REG_SZ, " Value2", 8, 0);
+
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value3
\r\n");
+ verify_reg(hkey, "", REG_SZ, "Value3 ", 8, 0);
+
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " Value4\r\n");
+ verify_reg(hkey, "", REG_SZ, "Value4", 7, 0);
+
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " Value5\r\n");
+ verify_reg(hkey, "", REG_SZ, "Value5", 7, 0);
+
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE "\r\n");
+ verify_reg(hkey, "", REG_SZ, "", 1, 0);
+
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " \r\n");
+ verify_reg(hkey, "", REG_SZ, "", 1, 0);
+
+ exec_import_str("REGEDIT\r\n"
+ "HKEY_CLASSES_ROOT\\" KEY_BASE " = No newline");
+ verify_reg(hkey, "", REG_SZ, "No newline", 11, 0);
+
+ RegCloseKey(hkey);
+
+ lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE);
+ ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr);
+}
+
static void test_invalid_import(void)
{
LONG lr;
- HKEY hkey;
+ HKEY hkey, subkey;
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed:
%d\n", lr);
@@ -317,10 +525,589 @@
verify_reg_nonexist(hkey, "MixedQuotes");
verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa");
+ /* Test import with non-standard registry file headers */
+ exec_import_str("REGEDIT3\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test1\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test1");
+
+ exec_import_str("regedit4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test2\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test2");
+
+ exec_import_str("Regedit4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test3\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test3");
+
+ exec_import_str("REGEDIT 4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test4\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test4");
+
+ exec_import_str("REGEDIT4FOO\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test5\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test5");
+
+ exec_import_str("REGEDIT4 FOO\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test6\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test6");
+
+ exec_import_str("REGEDIT5\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test7\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test7");
+
+ exec_import_str("Windows Registry Editor Version 4.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test8\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test8");
+
+ exec_import_str("Windows Registry Editor Version 5\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test9\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test9");
+
+ exec_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test10\"=\"Value\"\n");
+ verify_reg_nonexist(hkey, "Test10");
+
+ exec_import_str("Windows 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_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line1\"=hex(7):4c,69,6e,65,20\\\n"
+ ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Multi-Line1");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line2\"=hex(7):4c,69,6e,65,20\\\n"
+ " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Multi-Line2");
+
+ exec_import_str("Windows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line3\"=hex(7):4c,69,6e,65,20\\\n"
+ ",63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Multi-Line3");
+
+ exec_import_str("Windows Registry Editor Version 5.00\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line4\"=hex(7):4c,69,6e,65,20\\\n"
+ " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Multi-Line4");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test12a\"=dword:\n"
+ "\"Test12b\"=dword:hello\n"
+ "\"Test12c\"=dword:123456789\n"
+ "\"Test12d\"=dword:012345678\n"
+ "\"Test12e\"=dword:000000001\n\n");
+ verify_reg_nonexist(hkey, "Test12a");
+ verify_reg_nonexist(hkey, "Test12b");
+ verify_reg_nonexist(hkey, "Test12c");
+ verify_reg_nonexist(hkey, "Test12d");
+ verify_reg_nonexist(hkey, "Test12e");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test13a\"=dword:12345678abc\n"
+ "\"Test13b\"=dword:12345678 abc\n\n");
+ verify_reg_nonexist(hkey, "Test13a");
+ verify_reg_nonexist(hkey, "Test13b");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test14a\"=dword:0x123\n"
+ "\"Test14b\"=dword:123 456\n"
+ "\"Test14c\"=dword:1234 5678\n\n");
+ verify_reg_nonexist(hkey, "Test14a");
+ verify_reg_nonexist(hkey, "Test14b");
+ verify_reg_nonexist(hkey, "Test14c");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test15a\"=\"foo\"bar\"\n"
+
"\"Test15b\"=\"foo\"\"bar\"\n\n");
+ verify_reg_nonexist(hkey, "Test15a");
+ verify_reg_nonexist(hkey, "Test15b");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test16a\"=\n"
+ "\"Test16b\"=\\\"\n"
+ "\"Test16c\"=\\\"Value\\\"\n"
+ "\"Test16d\"=\\\"Value\"\n\n");
+ verify_reg_nonexist(hkey, "Test16a");
+ verify_reg_nonexist(hkey, "Test16b");
+ verify_reg_nonexist(hkey, "Test16c");
+ verify_reg_nonexist(hkey, "Test16d");
+
+ /* Test key name and value name concatenation */
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n"
+ "Subkey1]\n");
+ lr = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey);
+ ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "\n"
+ "\\Subkey2]\n");
+ lr = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey);
+ ok(lr == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", lr);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test\\\n"
+ "17a\"=\"Value 1\"\n"
+ "\"Test17b\"=\"Value 2\"\n"
+ "\"Test\n"
+ "\\17c\"=\"Value 3\"\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Test17a");
+ verify_reg(hkey, "Test17b", REG_SZ, "Value 2", 8, 0);
+ verify_reg_nonexist(hkey, "Test17c");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test18a\"=dword:1234\\\n"
+ "5678\n"
+ "\"Test18b\"=\"Test \\\n"
+ "Value\"\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Test18a");
+ todo_wine verify_reg_nonexist(hkey, "Test18b");
+
+ /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test19a\"=hex(0):56,00,61,00,6c,00\\\n"
+ ",75,00,65,00,00,00\n"
+ "\"Test19b\"=hex(0):56,00,61,00,6c,00\\\n"
+ " ,75,00,65,00,00,00\n"
+ "\"Test19c\"=hex(0):56,00,61,00,6c,00\\\n"
+ " 75,00,65,00,00,00\n"
+ "\"Test19d\"=hex(0):56,00,61,00,6c,00,7\\\n"
+ "5,00,65,00,00,00\n"
+ "\"Test19e\"=hex(0):56,00,61,00,6c,00,7\\\n"
+ " 5,00,65,00,00,00\n"
+ "\"Test19f\"=hex(0):56,00,61,00,\\;comment\n"
+ " 6c,00,75,00,\\#comment\n"
+ " 65,00,00,00\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Test19a");
+ todo_wine verify_reg_nonexist(hkey, "Test19b");
+ todo_wine verify_reg_nonexist(hkey, "Test19c");
+ todo_wine verify_reg_nonexist(hkey, "Test19d");
+ todo_wine verify_reg_nonexist(hkey, "Test19e");
+ verify_reg_nonexist(hkey, "Test19f");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test20a\"=hex(2):25,50,41\\\n"
+ ",54,48,25,00\n"
+ "\"Test20b\"=hex(2):25,50,41\\\n"
+ " ,54,48,25,00\n"
+ "\"Test20c\"=hex(2):25,50,41\\\n"
+ " 54,48,25,00\n"
+ "\"Test20d\"=hex(2):25,50,4\\\n"
+ "1,54,48,25,00\n"
+ "\"Test20e\"=hex(2):25,50,4\\\n"
+ " 1,54,48,25,00\n"
+ "\"Test20f\"=hex(2):25,50,41,\\;comment\n"
+ " 54,48,\\#comment\n"
+ " 25,00\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Test20a");
+ todo_wine verify_reg_nonexist(hkey, "Test20b");
+ verify_reg_nonexist(hkey, "Test20c");
+ todo_wine verify_reg_nonexist(hkey, "Test20d");
+ todo_wine verify_reg_nonexist(hkey, "Test20e");
+ verify_reg_nonexist(hkey, "Test20f");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Test21a\"=hex:11,22,33,44\\\n"
+ ",55,66,77,88\n"
+ "\"Test21b\"=hex:11,22,33,44\\\n"
+ " ,55,66,77,88\n"
+ "\"Test21c\"=hex:11,22,33,44\\\n"
+ " 55,66,77,88\n"
+ "\"Test21d\"=hex:11,22,33,4\\\n"
+ "4,55,66,77,88\n"
+ "\"Test21e\"=hex:11,22,33,4\\\n"
+ " 4,55,66,77,88\n"
+ "\"Test21f\"=hex:11,22,33,\\;comment\n"
+ " 44,55,66,\\#comment\n"
+ " 77,88\n\n");
+ todo_wine verify_reg_nonexist(hkey, "Test21a");
+ todo_wine verify_reg_nonexist(hkey, "Test21b");
+ verify_reg_nonexist(hkey, "Test21c");
+ todo_wine verify_reg_nonexist(hkey, "Test21d");
+ todo_wine verify_reg_nonexist(hkey, "Test21e");
+ verify_reg_nonexist(hkey, "Test21f");
+
RegCloseKey(hkey);
lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr);
+}
+
+static void test_invalid_import_31(void)
+{
+ HKEY hkey;
+ LONG lr;
+
+ lr = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE,
+ KEY_READ, NULL, &hkey, NULL);
+ ok(lr == ERROR_SUCCESS, "RegCreateKeyExA failed: %d\n", lr);
+
+ /* Test character validity at the start of the line */
+ exec_import_str("REGEDIT\r\n"
+ " HKEY_CLASSES_ROOT\\" KEY_BASE " =
Value1a\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ exec_import_str("REGEDIT\r\n"
+ " HKEY_CLASSES_ROOT\\" KEY_BASE " =
Value1b\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ exec_import_str("REGEDIT\r\n"
+ "\tHKEY_CLASSES_ROOT\\" KEY_BASE " =
Value1c\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ exec_import_str("REGEDIT\r\n"
+ ";HKEY_CLASSES_ROOT\\" KEY_BASE " =
Value2a\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ exec_import_str("REGEDIT\r\n"
+ "#HKEY_CLASSES_ROOT\\" KEY_BASE " =
Value2b\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ /* Test case sensitivity */
+ exec_import_str("REGEDIT\r\n"
+ "hkey_classes_root\\" KEY_BASE " =
Value3a\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ exec_import_str("REGEDIT\r\n"
+ "hKEY_CLASSES_ROOT\\" KEY_BASE " =
Value3b\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ exec_import_str("REGEDIT\r\n"
+ "Hkey_Classes_Root\\" KEY_BASE " =
Value3c\r\n");
+ todo_wine verify_reg_nonexist(hkey, "");
+
+ RegCloseKey(hkey);
+
+ lr = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE);
+ ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr);
+}
+
+static void test_comments(void)
+{
+ LONG lr;
+ HKEY hkey;
+ 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_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "#comment\\\n"
+ "\"Wine1\"=\"Line 1\"\n"
+ ";comment\\\n"
+ "\"Wine2\"=\"Line 2\"\n\n");
+ lr = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey);
+ ok(lr == ERROR_SUCCESS, "RegOpenKeyExA failed: %d\n", lr);
+ todo_wine verify_reg(hkey, "Wine1", REG_SZ, "Line 1", 7, 0);
+ todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Line 2", 7, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine3\"=\"Value 1\"#comment\n"
+ "\"Wine4\"=\"Value 2\";comment\n"
+ "\"Wine5\"=dword:01020304 #comment\n"
+ "\"Wine6\"=dword:02040608 ;comment\n\n");
+ verify_reg_nonexist(hkey, "Wine3");
+ verify_reg(hkey, "Wine4", REG_SZ, "Value 2", 8, 0);
+ verify_reg_nonexist(hkey, "Wine5");
+ dword = 0x2040608;
+ verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine7\"=hex(7):4c,69,6e,65,20,\\\n"
+ " #comment\n"
+ " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n"
+ "\"Wine8\"=\"A valid line\"\n"
+ "\"Wine9\"=hex(7):4c,69,6e,65,20,\\\n"
+ " ;comment\n"
+ " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n"
+ "\"Wine10\"=\"Another valid
line\"\n\n");
+ verify_reg_nonexist(hkey, "Wine7");
+ verify_reg(hkey, "Wine8", REG_SZ, "A valid line", 13, 0);
+ todo_wine verify_reg(hkey, "Wine9", REG_MULTI_SZ, "Line
concatenation\0", 20, 0);
+ verify_reg(hkey, "Wine10", REG_SZ, "Another valid line", 19, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "#\"Comment1\"=\"Value 1\"\n"
+ ";\"Comment2\"=\"Value 2\"\n"
+ " #\"Comment3\"=\"Value 3\"\n"
+ " ;\"Comment4\"=\"Value 4\"\n"
+ "\"Wine11\"=\"Value
6\"#\"Comment5\"=\"Value 5\"\n"
+ "\"Wine12\"=\"Value
7\";\"Comment6\"=\"Value 6\"\n\n");
+ verify_reg_nonexist(hkey, "Comment1");
+ verify_reg_nonexist(hkey, "Comment2");
+ verify_reg_nonexist(hkey, "Comment3");
+ verify_reg_nonexist(hkey, "Comment4");
+ verify_reg_nonexist(hkey, "Wine11");
+ verify_reg_nonexist(hkey, "Comment5");
+ verify_reg(hkey, "Wine12", REG_SZ, "Value 7", 8, 0);
+ verify_reg_nonexist(hkey, "Comment6");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine13\"=#\"Value 8\"\n"
+ "\"Wine14\"=;\"Value 9\"\n"
+ "\"Wine15\"=\"#comment1\"\n"
+ "\"Wine16\"=\";comment2\"\n"
+ "\"Wine17\"=\"Value#comment3\"\n"
+ "\"Wine18\"=\"Value;comment4\"\n"
+ "\"Wine19\"=\"Value #comment5\"\n"
+ "\"Wine20\"=\"Value ;comment6\"\n"
+ "\"Wine21\"=#dword:00000001\n"
+ "\"Wine22\"=;dword:00000002\n"
+ "\"Wine23\"=dword:00000003#comment\n"
+ "\"Wine24\"=dword:00000004;comment\n\n");
+ verify_reg_nonexist(hkey, "Wine13");
+ verify_reg_nonexist(hkey, "Wine14");
+ verify_reg(hkey, "Wine15", REG_SZ, "#comment1", 10, 0);
+ verify_reg(hkey, "Wine16", REG_SZ, ";comment2", 10, 0);
+ verify_reg(hkey, "Wine17", REG_SZ, "Value#comment3", 15, 0);
+ verify_reg(hkey, "Wine18", REG_SZ, "Value;comment4", 15, 0);
+ verify_reg(hkey, "Wine19", REG_SZ, "Value #comment5", 16, 0);
+ verify_reg(hkey, "Wine20", REG_SZ, "Value ;comment6", 16, 0);
+ verify_reg_nonexist(hkey, "Wine21");
+ verify_reg_nonexist(hkey, "Wine22");
+ verify_reg_nonexist(hkey, "Wine23");
+ dword = 0x00000004;
+ verify_reg(hkey, "Wine24", REG_DWORD, &dword, sizeof(dword), 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine25a\"=dword:1234;5678\n"
+ "\"Wine25b\"=dword:1234 ;5678\n"
+ "\"Wine25c\"=dword:1234#5678\n"
+ "\"Wine25d\"=dword:1234 #5678\n\n");
+ dword = 0x1234;
+ verify_reg(hkey, "Wine25a", REG_DWORD, &dword, sizeof(dword), 0);
+ verify_reg(hkey, "Wine25b", REG_DWORD, &dword, sizeof(dword), 0);
+ verify_reg_nonexist(hkey, "Wine25c");
+ verify_reg_nonexist(hkey, "Wine25d");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine26a\"=\"Value1\" ;comment\n"
+ "\"Wine26b\"=\"Value2\"\t\t;comment\n"
+ "\"Wine26c\"=\"Value3\" #comment\n"
+
"\"Wine26d\"=\"Value4\"\t\t#comment\n\n");
+ verify_reg(hkey, "Wine26a", REG_SZ, "Value1", 7, 0);
+ verify_reg(hkey, "Wine26b", REG_SZ, "Value2", 7, 0);
+ verify_reg_nonexist(hkey, "Wine26c");
+ verify_reg_nonexist(hkey, "Wine26d");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line1\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,\\;comment\n"
+ " 63,61,74,\\;comment\n"
+ " 65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line
concatenation\0", 20, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line2\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,\\;comment\n"
+ " 63,61,74,;comment\n"
+ " 65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line
concat", 12, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line3\"=hex(7):4c,69,6e,\\;comment\n"
+ " 65,20,\\;comment\n"
+ " 63,6f,6e,\\;comment\n"
+ " 63,61,74,\\;comment\n"
+ " 65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg(hkey, "Multi-Line3", REG_MULTI_SZ, "Line
concatenation\0", 20, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line4\"=hex(7):4c,69,6e,\\;#comment\n"
+ " 65,20,\\;#comment\n"
+ " 63,6f,6e,\\;#comment\n"
+ " 63,61,74,\\;#comment\n"
+ " 65,6e,61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg(hkey, "Multi-Line4", REG_MULTI_SZ, "Line
concatenation\0", 20, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line5\"=hex(7):4c,69,6e,\\;comment\n"
+ " 65,20,\\;comment\n"
+ " 63,6f,6e,\\;comment\n"
+ " 63,61,74,\\#comment\n"
+ " 65,6e,61,74,69,6f,6e,00,00\n\n");
+ verify_reg_nonexist(hkey, "Multi-Line5");
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Multi-Line6\"=hex(7):4c,69,6e,65,20,\\\n"
+ " 63,6f,6e,\\;comment\n"
+ " 63,61,74,\\\n\n"
+ " 65,6e,\\;comment\n\n"
+ " 61,74,69,6f,6e,00,00\n\n");
+ todo_wine verify_reg(hkey, "Multi-Line6", REG_MULTI_SZ, "Line
concatenation\0", 20, 0);
+
+ RegCloseKey(hkey);
+
+ lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);
+ ok(lr == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", lr);
+}
+
+static void test_import_with_whitespace(void)
+{
+ HKEY hkey;
+ LONG lr;
+ DWORD dword;
+
+ exec_import_str(" REGEDIT4\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_str(" REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine1a\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0);
+
+ exec_import_str("\tREGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine1b\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0);
+
+ exec_import_str(" \t REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine1c\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ " [HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine2a\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine2b\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\"Wine2c\"=\"Value\"\n\n");
+ verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0);
+
+ exec_import_str("REGEDIT4\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_str("REGEDIT4\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_str("REGEDIT4\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_str(" REGEDIT4\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,69,6e,65,20,\\\n"
+ " 63,6f,6e,\\;comment\n"
+ "\t\t\t\t63,61,74,\\;comment\n"
+ " \t65,6e,61,74,69,6f,6e,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);
+ todo_wine verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line
concatenation\0", 20, 0);
+
+ exec_import_str(" REGEDIT4\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_str("REGEDIT4\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_str("REGEDIT4\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_str("REGEDIT4\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_str("REGEDIT4\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_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "@ = \"Test Value\"\n\n");
+ verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0);
+
+ exec_import_str("REGEDIT4\n\n"
+ "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"
+ "\t@\t=\tdword:\t00000008\t\n\n");
+ verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 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);
}
START_TEST(regedit)
@@ -337,5 +1124,9 @@
supports_wchar = exec_import_wstr(wchar_test);
test_basic_import();
+ test_basic_import_31();
test_invalid_import();
+ test_invalid_import_31();
+ test_comments();
+ test_import_with_whitespace();
}