diff --git a/rostests/winetests/reg/reg.c b/rostests/winetests/reg/reg.c index 1c02d20bc36..8c0b1fbd07c 100644 --- a/rostests/winetests/reg/reg.c +++ b/rostests/winetests/reg/reg.c @@ -90,12 +90,39 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) err = RegQueryValueExA(hkey, value, NULL, NULL, NULL, NULL); lok(err == ERROR_FILE_NOT_FOUND, "registry value '%s' shouldn't exist; got %d, expected 2\n", - value, err); + (value && *value) ? value : "(Default)", err); +} + +#define verify_key(k,s) verify_key_(__LINE__,k,s) +static void verify_key_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG err; + + err = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d\n", err); + + if (hkey) + RegCloseKey(hkey); +} + +#define verify_key_nonexist(k,s) verify_key_nonexist_(__LINE__,k,s) +static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subkey) +{ + HKEY hkey; + LONG err; + + err = RegOpenKeyExA(key_base, subkey, 0, KEY_READ, &hkey); + lok(err == ERROR_FILE_NOT_FOUND, "registry key '%s' shouldn't exist; got %d, expected 2\n", + subkey, err); + + if (hkey) + RegCloseKey(hkey); } static void test_add(void) { - HKEY hkey, subkey; + HKEY hkey; LONG err; DWORD r, dword, type, size; char buffer[22]; @@ -109,8 +136,7 @@ static void test_add(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "got %d\n", err); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg add HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -142,18 +168,14 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest3\\ /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(subkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest3"); + verify_key(hkey, "keytest3"); + err = RegDeleteKeyA(hkey, "keytest3"); ok(err == ERROR_SUCCESS, "got exit code %d\n", err); run_reg_exe("reg add HKCU\\" KEY_BASE "\\keytest4 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %u\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4", 0, KEY_READ, &subkey); - ok(err == ERROR_SUCCESS, "key creation failed, got %d\n", err); - RegCloseKey(subkey); - err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\keytest4"); + verify_key(hkey, "keytest4"); + err = RegDeleteKeyA(hkey, "keytest4"); ok(err == ERROR_SUCCESS, "got exit code %d\n", err); /* REG_NONE */ @@ -520,15 +542,13 @@ static void test_delete(void) run_reg_exe("reg delete HKCU\\" KEY_BASE " /va /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); verify_reg_nonexist(hkey, "foo"); - err = RegOpenKeyExA(hkey, "subkey", 0, KEY_READ, &hsubkey); - ok(err == ERROR_SUCCESS, "got %d\n", err); - RegCloseKey(hsubkey); + verify_key(hkey, "subkey"); + RegCloseKey(hkey); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - ok(err == ERROR_FILE_NOT_FOUND, "got %d\n", err); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); run_reg_exe("reg delete HKCU\\" KEY_BASE " /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %u\n", r); @@ -748,13 +768,16 @@ static BOOL test_import_wstr_(unsigned line, const char *file_contents, DWORD *r memsize = len * sizeof(WCHAR); wstr = HeapAlloc(GetProcessHeap(), 0, memsize); if (!wstr) return FALSE; - MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, memsize); + MultiByteToWideChar(CP_UTF8, 0, file_contents, lenA, wstr, len); regfile = CreateFileA("test.reg", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); lok(regfile != INVALID_HANDLE_VALUE, "Failed to create test.reg file\n"); - if(regfile == INVALID_HANDLE_VALUE) + if (regfile == INVALID_HANDLE_VALUE) + { + HeapFree(GetProcessHeap(), 0, wstr); return FALSE; + } ret = WriteFile(regfile, wstr, memsize, &written, NULL); lok(ret, "WriteFile failed: %u\n", GetLastError()); @@ -774,8 +797,8 @@ static void test_import(void) { DWORD r, dword = 0x123, type, size; char test1_reg[MAX_PATH], test2_reg[MAX_PATH], cmdline[MAX_PATH]; - char test_string[] = "Test string", buffer[8]; - HKEY hkey, subkey; + char test_string[] = "Test string", buffer[24]; + HKEY hkey, subkey = NULL; LONG err; BYTE hex[8]; @@ -783,7 +806,7 @@ static void test_import(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg import /?", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); run_reg_exe("reg import missing.reg", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); @@ -794,23 +817,23 @@ static void test_import(void) sprintf(cmdline, "reg import %s", test1_reg); run_reg_exe(cmdline, &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); sprintf(cmdline, "reg import %s", test2_reg); run_reg_exe(cmdline, &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - todo_wine verify_reg(hkey, "Wine", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "", REG_SZ, test_string, sizeof(test_string), 0); + verify_reg(hkey, "Wine", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "", REG_SZ, test_string, sizeof(test_string), 0); err = RegCloseKey(hkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); sprintf(cmdline, "reg import %s %s", test1_reg, test2_reg); run_reg_exe(cmdline, &r); @@ -829,19 +852,19 @@ static void test_import(void) "got exit code %d, expected 1\n", r); test_import_str("REGEDIT", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("REGEDIT\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("REGEDIT4\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str(" REGEDIT4\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("\tREGEDIT4\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("\nREGEDIT4\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -856,147 +879,147 @@ static void test_import(void) "got exit code %d, expected 1\n", r); test_import_str("REGEDIT3\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("REGEDIT5\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("REGEDIT9\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("REGEDIT 4\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("REGEDIT4 FOO\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("REGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT3\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test1"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test1"); test_import_str("regedit4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test2\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test2"); + verify_reg_nonexist(hkey, "Test2"); test_import_str("Regedit4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test3\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test3"); + verify_reg_nonexist(hkey, "Test3"); test_import_str("REGEDIT 4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test4\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test4"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test4"); test_import_str("REGEDIT4FOO\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test5\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test5"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test5"); test_import_str("REGEDIT4 FOO\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test6\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test6"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test6"); test_import_str("REGEDIT5\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test7\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test7"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test7"); test_import_str("REGEDIT9\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test8\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test8"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test8"); test_import_str("Windows Registry Editor Version 4.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test9\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test9"); + verify_reg_nonexist(hkey, "Test9"); test_import_str("Windows Registry Editor Version 5\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test10\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test10"); + verify_reg_nonexist(hkey, "Test10"); test_import_str("WINDOWS REGISTRY EDITOR VERSION 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test11\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test11"); + verify_reg_nonexist(hkey, "Test11"); test_import_str("Windows Registry Editor version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test12\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test12"); + verify_reg_nonexist(hkey, "Test12"); test_import_str("REGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value1\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Test1", REG_SZ, "Value1", 7, 0); test_import_str("REGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test2\"=\"Value2\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Test2", REG_SZ, "Value2", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Test2", REG_SZ, "Value2", 7, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test3\"=\"Value3\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Test3", REG_SZ, "Value3", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Test3", REG_SZ, "Value3", 7, 0); test_import_str("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); test_import_str("Windows Registry Editor Version 5.00\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_str("Windows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test4\"=\"Value4\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Test4", REG_SZ, "Value4", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Test4", REG_SZ, "Value4", 7, 0); test_import_str("Windows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test5\"=\"Value5\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Test5", REG_SZ, "Value5", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Test5", REG_SZ, "Value5", 7, 0); test_import_str("Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test6\"=\"Value6\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Test6", REG_SZ, "Value6", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Test6", REG_SZ, "Value6", 7, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1004,11 +1027,11 @@ static void test_import(void) "\"Line2\"=\"Value2\"\n\n\n" "\"Line3\"=\"Value3\"\n\n\n\n" "\"Line4\"=\"Value4\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, 0); + verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1020,26 +1043,21 @@ static void test_import(void) "@=\"Test\"\n" ";comment\n\n" "\"Wine4\"=dword:12345678\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x782; - todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); dword = 0x12345678; - todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine5\"=\"No newline\"", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegQueryValueExA(hkey, "Wine5", NULL, NULL, NULL, NULL); - todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), "got %d, expected 0\n", err); if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0); @@ -1048,12 +1066,11 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine6\"=dword:00000050\n\n" "\"Wine7\"=\"No newline\"", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x50; - todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); err = RegQueryValueExA(hkey, "Wine7", NULL, NULL, NULL, NULL); - todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), "got %d, expected 0\n", err); if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); @@ -1064,9 +1081,9 @@ static void test_import(void) "\"Wine8\"=\"Line 1\"\n" ";comment\\\n" "\"Wine9\"=\"Line 2\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); - todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1074,12 +1091,12 @@ static void test_import(void) "\"Wine11\"=\"Value 2\";comment\n" "\"Wine12\"=dword:01020304 #comment\n" "\"Wine13\"=dword:02040608 ;comment\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine10"); - todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine12"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine10"); + verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine12"); dword = 0x2040608; - todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1091,11 +1108,11 @@ static void test_import(void) " ;comment\n" " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" "\"Wine17\"=\"Another valid line\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine14"); - todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); - todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine14"); + verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1105,15 +1122,15 @@ static void test_import(void) " ;\"Comment4\"=\"Value 4\"\n" "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Comment1"); - todo_wine verify_reg_nonexist(hkey, "Comment2"); - todo_wine verify_reg_nonexist(hkey, "Comment3"); - todo_wine verify_reg_nonexist(hkey, "Comment4"); - todo_wine verify_reg_nonexist(hkey, "Wine18"); - todo_wine verify_reg_nonexist(hkey, "Comment5"); - todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg_nonexist(hkey, "Comment6"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Comment1"); + verify_reg_nonexist(hkey, "Comment2"); + verify_reg_nonexist(hkey, "Comment3"); + verify_reg_nonexist(hkey, "Comment4"); + verify_reg_nonexist(hkey, "Wine18"); + verify_reg_nonexist(hkey, "Comment5"); + verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, 0); + verify_reg_nonexist(hkey, "Comment6"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1129,20 +1146,20 @@ static void test_import(void) "\"Wine29\"=;dword:00000002\n" "\"Wine30\"=dword:00000003#comment\n" "\"Wine31\"=dword:00000004;comment\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine20"); - todo_wine verify_reg_nonexist(hkey, "Wine21"); - todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); - todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); - todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); - todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); - todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); - todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); - todo_wine verify_reg_nonexist(hkey, "Wine28"); - todo_wine verify_reg_nonexist(hkey, "Wine29"); - todo_wine verify_reg_nonexist(hkey, "Wine30"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine20"); + verify_reg_nonexist(hkey, "Wine21"); + verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + verify_reg_nonexist(hkey, "Wine28"); + verify_reg_nonexist(hkey, "Wine29"); + verify_reg_nonexist(hkey, "Wine30"); dword = 0x00000004; - todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1150,8 +1167,8 @@ static void test_import(void) " 63,6f,6e,\\;comment\n" " 63,61,74,\\;comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1159,36 +1176,36 @@ static void test_import(void) " 63,6f,6e,\\;comment\n" " 63,61,74,;comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); test_import_str("REGEDIT4\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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line3"); test_import_str("REGEDIT4\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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line4"); test_import_str("Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line5\"=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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line5"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line5"); test_import_str("Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line6\"=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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line6"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line6"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1197,8 +1214,8 @@ static void test_import(void) " 63,6f,6e,\\;comment\n" " 63,61,74,\\;comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line7", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line7", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1207,8 +1224,8 @@ static void test_import(void) " 63,6f,6e,\\;#comment\n" " 63,61,74,\\;#comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line8", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line8", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1217,8 +1234,8 @@ static void test_import(void) " 63,6f,6e,\\;comment\n" " 63,61,74,\\#comment\n" " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line9"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line9"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1227,18 +1244,18 @@ static void test_import(void) " 63,61,74,\\\n\n" " 65,6e,\\;comment\n\n" " 61,74,69,6f,6e,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line10", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line10", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine32a\"=dword:1\n" "\"Wine32b\"=dword:4444\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x1; - todo_wine verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); dword = 0x4444; - todo_wine verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1247,30 +1264,30 @@ static void test_import(void) "\"Wine33c\"=dword:123456789\n" "\"Wine33d\"=dword:012345678\n" "\"Wine33e\"=dword:000000001\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine34a\"=dword:12345678abc\n" "\"Wine34b\"=dword:12345678 abc\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine34a"); - todo_wine verify_reg_nonexist(hkey, "Wine34b"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine34a"); + verify_reg_nonexist(hkey, "Wine34b"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine35a\"=dword:0x123\n" "\"Wine35b\"=dword:123 456\n" "\"Wine35c\"=dword:1234 5678\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine35a"); - todo_wine verify_reg_nonexist(hkey, "Wine35b"); - todo_wine verify_reg_nonexist(hkey, "Wine35c"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine35a"); + verify_reg_nonexist(hkey, "Wine35b"); + verify_reg_nonexist(hkey, "Wine35c"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1278,26 +1295,28 @@ static void test_import(void) "\"Wine36b\"=dword:1234 ;5678\n" "\"Wine36c\"=dword:1234#5678\n" "\"Wine36d\"=dword:1234 #5678\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x1234; - todo_wine verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg_nonexist(hkey, "Wine36c"); - todo_wine verify_reg_nonexist(hkey, "Wine36d"); + verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg_nonexist(hkey, "Wine36c"); + verify_reg_nonexist(hkey, "Wine36d"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine37a\"=\"foo\"bar\"\n" "\"Wine37b\"=\"foo\"\"bar\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine37a"); - todo_wine verify_reg_nonexist(hkey, "Wine37b"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine37a"); + verify_reg_nonexist(hkey, "Wine37b"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default Value Name\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "Default Value Name", 19, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1305,11 +1324,11 @@ static void test_import(void) "\"Test38b\"=\\\"\n" "\"Test38c\"=\\\"Value\\\"\n" "\"Test38d\"=\\\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test38a"); - todo_wine verify_reg_nonexist(hkey, "Test38b"); - todo_wine verify_reg_nonexist(hkey, "Test38c"); - todo_wine verify_reg_nonexist(hkey, "Test38d"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test38a"); + verify_reg_nonexist(hkey, "Test38b"); + verify_reg_nonexist(hkey, "Test38c"); + verify_reg_nonexist(hkey, "Test38d"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1317,54 +1336,54 @@ static void test_import(void) "\"Wine39b\"=\"Value2\"\t\t;comment\n" "\"Wine39c\"=\"Value3\" #comment\n" "\"Wine39d\"=\"Value4\"\t\t#comment\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine39a", REG_SZ, "Value1", 7, 0); - todo_wine verify_reg(hkey, "Wine39b", REG_SZ, "Value2", 7, 0); - todo_wine verify_reg_nonexist(hkey, "Wine39c"); - todo_wine verify_reg_nonexist(hkey, "Wine39d"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine39a", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Wine39b", REG_SZ, "Value2", 7, 0); + verify_reg_nonexist(hkey, "Wine39c"); + verify_reg_nonexist(hkey, "Wine39d"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoBeginQuote\"=Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "TestNoBeginQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "TestNoBeginQuote"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "TestNoEndQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "TestNoEndQuote"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoQuotes\"=Asdffdsa\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "TestNoQuotes"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "TestNoQuotes"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoBeginQuote\"=\"Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "NameNoBeginQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "NameNoBeginQuote"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"NameNoEndQuote=\"Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "NameNoEndQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "NameNoEndQuote"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoQuotes=\"Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "NameNoQuotes"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "NameNoQuotes"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"MixedQuotes=Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "MixedQuotes"); - todo_wine verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "MixedQuotes"); + verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1375,14 +1394,14 @@ static void test_import(void) "\"Wine40e\"=hex(2):4c,69,6e,65,\\\n" "\"Wine40f\"=\"Value 3\"\n" "\"Wine40g\"=\"Value 4\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine40a", REG_EXPAND_SZ, "Line", 5, 0); - todo_wine verify_reg(hkey, "Wine40b", REG_SZ, "Value 1", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine40c"); - todo_wine verify_reg(hkey, "Wine40d", REG_SZ, "Value 2", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine40e"); - todo_wine verify_reg_nonexist(hkey, "Wine40f"); - todo_wine verify_reg(hkey, "Wine40g", REG_SZ, "Value 4", 8, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine40a", REG_EXPAND_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine40b", REG_SZ, "Value 1", 8, 0); + verify_reg_nonexist(hkey, "Wine40c"); + verify_reg(hkey, "Wine40d", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine40e"); + verify_reg_nonexist(hkey, "Wine40f"); + verify_reg(hkey, "Wine40g", REG_SZ, "Value 4", 8, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1390,33 +1409,31 @@ static void test_import(void) "5678\n" "\"Wine41b\"=\"Test \\\n" "Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine41a"); - todo_wine verify_reg_nonexist(hkey, "Wine41b"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine41a"); + verify_reg_nonexist(hkey, "Wine41b"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); dword = 0x00000008; - todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); /* Test key name and value name concatenation */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey1"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey2"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1425,10 +1442,10 @@ static void test_import(void) "\"Wine42b\"=\"Value 2\"\n" "\"Wine\n" "\\42c\"=\"Value 3\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine42a"); - todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine42c"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine42a"); + verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine42c"); /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */ test_import_str("REGEDIT4\n\n" @@ -1458,18 +1475,18 @@ static void test_import(void) "\"Wine43k\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\\#comment\n" " 65,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg_nonexist(hkey, "Wine43c"); - todo_wine verify_reg_nonexist(hkey, "Wine43d"); - todo_wine verify_reg_nonexist(hkey, "Wine43e"); - todo_wine verify_reg_nonexist(hkey, "Wine43f"); - todo_wine verify_reg_nonexist(hkey, "Wine43g"); - todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); - todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine43k"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + verify_reg_nonexist(hkey, "Wine43c"); + verify_reg_nonexist(hkey, "Wine43d"); + verify_reg_nonexist(hkey, "Wine43e"); + verify_reg_nonexist(hkey, "Wine43f"); + verify_reg_nonexist(hkey, "Wine43g"); + verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); + verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); + verify_reg_nonexist(hkey, "Wine43k"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1498,32 +1515,32 @@ static void test_import(void) "\"Wine44k\"=hex(2):25,50,41,\\;comment\n" " 54,48,\\#comment\n" " 25,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine44a", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine verify_reg(hkey, "Wine44b", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine verify_reg_nonexist(hkey, "Wine44c"); - todo_wine verify_reg_nonexist(hkey, "Wine44d"); - todo_wine verify_reg_nonexist(hkey, "Wine44e"); - todo_wine verify_reg_nonexist(hkey, "Wine44f"); - todo_wine verify_reg_nonexist(hkey, "Wine44g"); - todo_wine verify_reg(hkey, "Wine44h", REG_EXPAND_SZ, "%PATH%", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine44a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine44b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine44c"); + verify_reg_nonexist(hkey, "Wine44d"); + verify_reg_nonexist(hkey, "Wine44e"); + verify_reg_nonexist(hkey, "Wine44f"); + verify_reg_nonexist(hkey, "Wine44g"); + verify_reg(hkey, "Wine44h", REG_EXPAND_SZ, "%PATH%", 7, 0); /* Wine44i */ size = sizeof(buffer); err = RegQueryValueExA(hkey, "Wine44i", NULL, &type, (BYTE *)&buffer, &size); - todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); - 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"); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine44j */ size = sizeof(buffer); memset(buffer, '-', size); err = RegQueryValueExA(hkey, "Wine44j", NULL, &type, (BYTE *)&buffer, &size); - todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); - 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"); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine44k */ - todo_wine verify_reg_nonexist(hkey, "Wine44k"); + verify_reg_nonexist(hkey, "Wine44k"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1552,53 +1569,753 @@ static void test_import(void) "\"Wine45k\"=hex:11,22,33,\\;comment\n" " 44,55,66,\\#comment\n" " 77,88\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); hex[0] = 0x11; hex[1] = 0x22; hex[2] = 0x33; hex[3] = 0x44; hex[4] = 0x55; hex[5] = 0x66; hex[6] = 0x77; hex[7] = 0x88; - todo_wine verify_reg(hkey, "Wine45a", REG_BINARY, hex, sizeof(hex), 0); - todo_wine verify_reg(hkey, "Wine45b", REG_BINARY, hex, sizeof(hex), 0); - todo_wine verify_reg_nonexist(hkey, "Wine45c"); - todo_wine verify_reg_nonexist(hkey, "Wine45d"); - todo_wine verify_reg_nonexist(hkey, "Wine45e"); - todo_wine verify_reg_nonexist(hkey, "Wine45f"); - todo_wine verify_reg_nonexist(hkey, "Wine45g"); - todo_wine verify_reg(hkey, "Wine45h", REG_BINARY, hex, sizeof(hex), 0); - todo_wine verify_reg(hkey, "Wine45i", REG_BINARY, hex, 6, 0); - todo_wine verify_reg(hkey, "Wine45j", REG_BINARY, hex, 6, 0); - todo_wine verify_reg_nonexist(hkey, "Wine45k"); + verify_reg(hkey, "Wine45a", REG_BINARY, hex, sizeof(hex), 0); + verify_reg(hkey, "Wine45b", REG_BINARY, hex, sizeof(hex), 0); + verify_reg_nonexist(hkey, "Wine45c"); + verify_reg_nonexist(hkey, "Wine45d"); + verify_reg_nonexist(hkey, "Wine45e"); + verify_reg_nonexist(hkey, "Wine45f"); + verify_reg_nonexist(hkey, "Wine45g"); + verify_reg(hkey, "Wine45h", REG_BINARY, hex, sizeof(hex), 0); + verify_reg(hkey, "Wine45i", REG_BINARY, hex, 6, 0); + verify_reg(hkey, "Wine45j", REG_BINARY, hex, 6, 0); + verify_reg_nonexist(hkey, "Wine45k"); /* Test import with subkeys */ test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - todo_wine verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); err = RegCloseKey(subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - todo_wine verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); err = RegCloseKey(subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + /* Test key creation */ + test_import_str("REGEDIT4\n\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\No_Opening_Bracket]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "No_Opening_Bracket"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "No_Closing_Bracket"); + + test_import_str("REGEDIT4\n\n" + "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey1a"); + + test_import_str("REGEDIT4\n\n" + "[\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1b]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey1b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1c "); + err = RegDeleteKeyA(hkey, "Subkey1c "); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1d\t"); + err = RegDeleteKeyA(hkey, "Subkey1d\t"); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1e\\"); + verify_key(hkey, "Subkey1e"); + err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1e"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1f\\\\"); + verify_key(hkey, "Subkey1f\\"); + verify_key(hkey, "Subkey1f"); + err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1g\\\\\\\\"); + verify_key(hkey, "Subkey1g\\\\"); + verify_key(hkey, "Subkey1g\\"); + verify_key(hkey, "Subkey1g"); + err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + /* Test key deletion. We start by creating some registry keys. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2b"); + + test_import_str("REGEDIT4\n\n" + "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2a"); + + test_import_str("REGEDIT4\n\n" + "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2b"); + + test_import_str("REGEDIT4\n\n" + "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2a"); + + test_import_str("REGEDIT4\n\n" + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2b"); + + test_import_str("REGEDIT4\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey2a"); + verify_key_nonexist(hkey, "Subkey2b"); + + /* Test case sensitivity when creating and deleting registry keys. */ + test_import_str("REGEDIT4\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey3a"); + verify_key(hkey, "Subkey3b"); + + test_import_str("REGEDIT4\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey3a"); + verify_key_nonexist(hkey, "Subkey3b"); + + /* Test mixed key creation and deletion. We start by creating a subkey. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey4a"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine46a\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4a"); + verify_reg_nonexist(hkey, "Wine46a"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine46b\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine46b"); + + /* Test value deletion. We start by creating some registry values. */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine46e\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46b"); + verify_reg_nonexist(hkey, "Wine46c"); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg_nonexist(hkey, "Wine46e"); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + /* Test the accepted range of the hex-based data types */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine47a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine47b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine47c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine47d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine47e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n" + "\"Wine47j\"=hex(0x2):56,61,6c,75,65,00\n" + "\"Wine47k\"=hex(0X2):56,61,6c,75,65,00\n" + "\"Wine47l\"=hex(x2):56,61,6c,75,65,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); + verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); + verify_reg(hkey, "Wine47c", 0x100, "Value", 6, 0); + verify_reg(hkey, "Wine47d", 0x1000, "Value", 6, 0); + verify_reg(hkey, "Wine47e", 0x7fff, "Value", 6, 0); + verify_reg(hkey, "Wine47f", 0xffff, "Value", 6, 0); + verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); + verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); + verify_reg_nonexist(hkey, "Wine47i"); + verify_reg_nonexist(hkey, "Wine47j"); + verify_reg_nonexist(hkey, "Wine47k"); + verify_reg_nonexist(hkey, "Wine47l"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine48a\"=hex(7):4c,69,6e,65,20, \\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine48b\"=hex(7):4c,69,6e,65,20,\t\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine48a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine48b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine49\"=hex(2):25,50,41,54,48,25,00,\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine49", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine50a\"=hex(2):25,50,41,54,48,25,00 ;comment\n" + "\"Wine50b\"=hex(2):25,50,41,54,48,25,00\t;comment\n" + "\"Wine50c\"=hex(2):25,50,41,54,48,25,00 #comment\n" + "\"Wine50d\"=hex(2):25,50,41,54,48,25,00\t#comment\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine50a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine50b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine50c"); + verify_reg_nonexist(hkey, "Wine50d"); + + /* Test support for characters greater than 0xff */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine51a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine51b\"=hex(0):25,1a4,100,164,124,25,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine51a"); + verify_reg_nonexist(hkey, "Wine51b"); + + /* Test the effect of backslashes in hex data */ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine52a\"=hex(2):25,48\\,4f,4d,45,25,00\n" + "\"Wine52b\"=hex(2):25,48,\\4f,4d,45,25,00\n" + "\"Wine52c\"=hex(2):25,48\\ ,4f,4d,45,25,00\n" + "\"Wine52d\"=hex(2):25,48,\\ 4f,4d,45,25,00\n" + "\"Wine52e\"=hex(2):\\25,48,4f,4d,45,25,00\n" + "\"Wine52f\"=hex(2):\\ 25,48,4f,4d,45,25,00\n" + "\"Wine52g\"=hex(2):25,48,4\\f,4d,45,25,00\n" + "\"Wine52h\"=hex(2):25,48,4\\\n" + " f,4d,45,25,00\n" + "\"Wine52i\"=hex(2):25,50,\\,41,54,48,25,00\n" + "\"Wine52j\"=hex(2):25,48,4f,4d,45,25,5c,\\\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine52k\"=hex(2):,\\\n" + " 25,48,4f,4d,45,25,00\n" + "\"Wine52l\"=hex(2):\\\n" + " 25,48,4f,4d,45,25,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine52a"); + verify_reg_nonexist(hkey, "Wine52b"); + verify_reg_nonexist(hkey, "Wine52c"); + verify_reg_nonexist(hkey, "Wine52d"); + verify_reg_nonexist(hkey, "Wine52e"); + verify_reg_nonexist(hkey, "Wine52f"); + verify_reg_nonexist(hkey, "Wine52g"); + verify_reg_nonexist(hkey, "Wine52h"); + verify_reg_nonexist(hkey, "Wine52i"); + verify_reg_nonexist(hkey, "Wine52j"); + verify_reg_nonexist(hkey, "Wine52k"); + verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53b\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53c\"=hex(2):25,48,4f,4d,45,25,5c, \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53d\"=hex(2):25,48,4f,4d,45,25,5c \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53e\"=hex(2):25,48,4f,4d,45,25,5c,\\\t ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine53f\"=hex(2):25,48,4f,4d,45,25,5c\\\t ;comment\n" + " 25,50,41,54,48,25,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine53b"); + verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine53d"); + verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine53f"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54a\"=hex(2):4c,69,6e,65,20,\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine54a"); + verify_key_nonexist(hkey, "Subkey1"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54b\"=hex(2):4c,69,6e,65,20\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine54b"); + verify_key(hkey, "Subkey2"); + + err = RegDeleteKeyA(hkey, "Subkey2"); + ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine55a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine55b\"=\"Test value\"\n" + + "\"Wine55c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine55d\"=\"Test value\"\n" + + "\"Wine55e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine55f\"=\"Test value\"\n" + + "\"Wine55g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine55h\"=\"Test value\"\n" + + "\"Wine55i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine55j\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine55a"); + verify_reg_nonexist(hkey, "Wine55b"); + verify_reg_nonexist(hkey, "Wine55c"); + verify_reg_nonexist(hkey, "Wine55d"); + verify_reg_nonexist(hkey, "Wine55e"); + verify_reg(hkey, "Wine55f", REG_SZ, "Test value", 11, 0); + verify_reg_nonexist(hkey, "Wine55g"); + verify_reg_nonexist(hkey, "Wine55h"); + verify_reg_nonexist(hkey, "Wine55i"); + verify_reg(hkey, "Wine55j", REG_SZ, "Test value", 11, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine56a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine56b\"=dword:00000008\n" + + "\"Wine56c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine56d\"=dword:00000008\n" + + "\"Wine56e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine56f\"=dword:00000008\n" + + "\"Wine56g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine56h\"=dword:00000008\n" + + "\"Wine56i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine56j\"=dword:00000008\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine56a"); + verify_reg_nonexist(hkey, "Wine56b"); + verify_reg_nonexist(hkey, "Wine56c"); + verify_reg_nonexist(hkey, "Wine56d"); + verify_reg_nonexist(hkey, "Wine56e"); + verify_reg(hkey, "Wine56f", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg_nonexist(hkey, "Wine56g"); + verify_reg_nonexist(hkey, "Wine56h"); + verify_reg_nonexist(hkey, "Wine56i"); + verify_reg(hkey, "Wine56j", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine57a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "\"Wine57b\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57c\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + ";comment\n" + "\"Wine57d\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57e\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "#comment\n" + "\"Wine57f\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57g\"=hex(2):25,48,4f,4d,45,25,5c,\\\n\n" + "\"Wine57h\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine57i\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + "\"Wine57j\"=hex(2):25,50,41,54,48,25,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine57a"); + verify_reg_nonexist(hkey, "Wine57b"); + verify_reg_nonexist(hkey, "Wine57c"); + verify_reg_nonexist(hkey, "Wine57d"); + verify_reg_nonexist(hkey, "Wine57e"); + verify_reg(hkey, "Wine57f", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine57g"); + verify_reg_nonexist(hkey, "Wine57h"); + verify_reg_nonexist(hkey, "Wine57i"); + verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + + err = RegDeleteValueW(hkey, NULL); + ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58a\"=hex(2):4c,69,6e,65,20,\\\n" + "@=\"Default value 1\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58a"); + verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58b\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58b"); + verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58c\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58c"); + verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58d\"=hex(2):4c,69,6e,65,20,\\\n\n" + "@=\"Default value 4\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58d"); + verify_reg_nonexist(hkey, NULL); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58e\"=hex(2):4c,69,6e,65,20\\\n" + "@=\"Default value 5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58e"); + verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine59a\"=hex:11,22,33,\\\n" + "\\\n" + " 44,55,66\n" + "\"Wine59b\"=hex:11,22,33,\\\n" + " \\\n" + " 44,55,66\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine59a"); + verify_reg_nonexist(hkey, "Wine59b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60a\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + ";comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " ;comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + "#comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine60c"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60d\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,\\\n" + " #comment\n" + " 65,6e,\\;comment\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine60d"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60e\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n\n" + " 63,61,74,\\\n\n\n" + " 65,6e,\\\n\n\n\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60f\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,\\\n \n" + " 63,61,74,\\\n\t\n\t\n" + " 65,6e,\\\n\t \t\n\t \t\n\t \t\n" + " 61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60f", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine61a"); + verify_reg_nonexist(hkey, "Wine61b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(0):56,61,6c,75,65,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62a", REG_NONE, "Value", 5, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(2):25,50,41,54,48,25,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62b", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62b", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62c\"=hex:11,22,33,44,55,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62c", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62c", REG_BINARY, hex, 5, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62d\"=hex(7):4c,69,6e,65,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62d", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62e\"=hex(100):56,61,6c,75,65,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62e", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62e", 0x100, "Value", 5, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62f\"=hex(7):4c,69,6e,65,20\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine62f"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine63a\"=hex(7):4c,69,6e,65,20,\\\n" + " ,63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine63b\"=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", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine63a"); + verify_reg_nonexist(hkey, "Wine63b"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine64a\"=hex(7):4c,69,6e,65,00,00\n" + "\"Wine64b\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine64c\"=hex(7):4c,69,6e,65,20,\\;comment\n" + " 63,6f,6e,63,61,74,\\\n" + " 65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine64d\"=hex(7):4c,69,6e,65,20,\\;comment\n" + " 63,6f,6e,63,61,74,\n" + " 65,6e,61,74,69,6f,6e,00,00\n" + "\"Wine64e\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,6f,6e,63,61,74,;comment\n" + " 65,6e,61,74,69,6f,6e,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine64a", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine64b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine64c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + /* Wine64d */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine64d", NULL, &type, (BYTE *)&buffer, &size); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); + ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); + ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); + /* Wine64e */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine64e", NULL, &type, (BYTE *)&buffer, &size); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); + ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); + ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine65a\"=hex(100):25,50,41,54,48,25,00\n" + "\"Wine65b\"=hex(100):25,50,41,\\\n" + " 54,48,25,00\n" + "\"Wine65c\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\\\n" + " 25,00\n" + "\"Wine65d\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\n" + " 25,00\n" + "\"Wine65e\"=hex(100):25,50,41,\\;comment\n" + " 54,48,;comment\n" + " 25,00\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine65a", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine65b", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine65c", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine65d", 0x100, "%PATH", 5, 0); + verify_reg(hkey, "Wine65e", 0x100, "%PATH", 5, 0); + + /* Test null-termination of REG_EXPAND_SZ and REG_MULTI_SZ data*/ + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine66a\"=hex(7):4c,69,6e,65\n" + "\"Wine66b\"=hex(7):4c,69,6e,65,\n" + "\"Wine66c\"=hex(7):4c,69,6e,65,00\n" + "\"Wine66d\"=hex(7):4c,69,6e,65,00,\n" + "\"Wine66e\"=hex(7):4c,69,6e,65,00,00\n" + "\"Wine66f\"=hex(7):4c,69,6e,65,00,00,\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66c", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66d", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66e", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine66f", REG_MULTI_SZ, "Line\0", 6, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine67a\"=hex(2):25,50,41,54,48,25\n" + "\"Wine67b\"=hex(2):25,50,41,54,48,25,\n" + "\"Wine67c\"=hex(2):25,50,41,54,48,25,00\n" + "\"Wine67d\"=hex(2):25,50,41,54,48,25,00,\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine67a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine67b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine67c", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine67d", REG_EXPAND_SZ, "%PATH%", 7, 0); err = RegCloseKey(hkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); +} + +static void test_unicode_import(void) +{ + DWORD r, dword = 0x123, type, size; + HKEY hkey, subkey; + LONG err; + char buffer[24]; + BYTE hex[8]; - /* Test file contents - Unicode */ test_import_wstr("REGEDIT\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); @@ -1608,22 +2325,22 @@ static void test_import(void) "got exit code %d, expected 1\n", r); test_import_wstr("\xef\xbb\xbfREGEDIT", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbfREGEDIT\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbfREGEDIT4", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbfREGEDIT4\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf REGEDIT4\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf\tREGEDIT4\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf\nREGEDIT4\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -1631,78 +2348,78 @@ static void test_import(void) test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test1\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test1"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test1"); test_import_wstr("\xef\xbb\xbfregedit4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test2\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test2"); + verify_reg_nonexist(hkey, "Test2"); test_import_wstr("\xef\xbb\xbfRegedit4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test3\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test3"); + verify_reg_nonexist(hkey, "Test3"); test_import_wstr("\xef\xbb\xbfREGEDIT 4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test4\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test4"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test4"); test_import_wstr("\xef\xbb\xbfREGEDIT4FOO\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test5\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test5"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test5"); test_import_wstr("\xef\xbb\xbfREGEDIT4 FOO\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test6\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test6"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test6"); test_import_wstr("\xef\xbb\xbfREGEDIT5\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test7\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test7"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test7"); test_import_wstr("\xef\xbb\xbfREGEDIT9\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test8\"=\"Value\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test8"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test8"); test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode1\"=\"Value1\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Unicode1", REG_SZ, "Value1", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Unicode1", REG_SZ, "Value1", 7, 0); test_import_wstr("\xef\xbb\xbfREGEDIT4\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode2\"=\"Value2\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Unicode2", REG_SZ, "Value2", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Unicode2", REG_SZ, "Value2", 7, 0); test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode3\"=\"Value3\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Unicode3", REG_SZ, "Value3", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Unicode3", REG_SZ, "Value3", 7, 0); test_import_wstr("Windows Registry Editor Version 4.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -1717,20 +2434,20 @@ static void test_import(void) "got exit code %d, expected 1\n", r); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbfWINDOWS Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf\tWindows Registry Editor Version 5.00\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); test_import_wstr("\xef\xbb\xbf\nWindows Registry Editor Version 5.00\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, @@ -1741,46 +2458,46 @@ static void test_import(void) "\"Test9\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test9"); + verify_reg_nonexist(hkey, "Test9"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test10\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test10"); + verify_reg_nonexist(hkey, "Test10"); test_import_wstr("\xef\xbb\xbfWINDOWS REGISTRY EDITOR VERSION 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test11\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test11"); + verify_reg_nonexist(hkey, "Test11"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Test12\"=\"Value\"\n", &r); ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS) /* WinXP */, "got exit code %d, expected 1\n", r); - todo_wine verify_reg_nonexist(hkey, "Test12"); + verify_reg_nonexist(hkey, "Test12"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode4\"=\"Value4\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Unicode4", REG_SZ, "Value4", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Unicode4", REG_SZ, "Value4", 7, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode5\"=\"Value5\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Unicode5", REG_SZ, "Value5", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Unicode5", REG_SZ, "Value5", 7, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Unicode6\"=\"Value6\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Unicode6", REG_SZ, "Value6", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Unicode6", REG_SZ, "Value6", 7, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1788,11 +2505,11 @@ static void test_import(void) "\"Line2\"=\"Value2\"\n\n\n" "\"Line3\"=\"Value3\"\n\n\n\n" "\"Line4\"=\"Value4\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Line1", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Line2", REG_SZ, "Value2", 7, 0); + verify_reg(hkey, "Line3", REG_SZ, "Value3", 7, 0); + verify_reg(hkey, "Line4", REG_SZ, "Value4", 7, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1804,26 +2521,21 @@ static void test_import(void) "@=\"Test\"\n" ";comment\n\n" "\"Wine4\"=dword:12345678\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x782; - todo_wine verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg(hkey, "", REG_SZ, "Test", 5, - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine1", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine2", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine3", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "", REG_SZ, "Test", 5, 0); dword = 0x12345678; - todo_wine verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine4", REG_DWORD, &dword, sizeof(dword), 0); test_import_wstr("\xef\xbb\xbfREGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine5\"=\"No newline\"", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegQueryValueExA(hkey, "Wine5", NULL, NULL, NULL, NULL); - todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), "got %d, expected 0\n", err); if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine5", REG_SZ, "No newline", 11, 0); @@ -1832,12 +2544,11 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine6\"=dword:00000050\n\n" "\"Wine7\"=\"No newline\"", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x50; - todo_wine verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), - TODO_REG_TYPE|TODO_REG_SIZE|TODO_REG_DATA); + verify_reg(hkey, "Wine6", REG_DWORD, &dword, sizeof(dword), 0); err = RegQueryValueExA(hkey, "Wine7", NULL, NULL, NULL, NULL); - todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND /* WinXP */), "got %d, expected 0\n", err); if (err == ERROR_SUCCESS) verify_reg(hkey, "Wine7", REG_SZ, "No newline", 11, 0); @@ -1848,9 +2559,9 @@ static void test_import(void) "\"Wine8\"=\"Line 1\"\n" ";comment\\\n" "\"Wine9\"=\"Line 2\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); - todo_wine verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine8", REG_SZ, "Line 1", 7, 0); + verify_reg(hkey, "Wine9", REG_SZ, "Line 2", 7, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1858,12 +2569,12 @@ static void test_import(void) "\"Wine11\"=\"Value 2\";comment\n" "\"Wine12\"=dword:01020304 #comment\n" "\"Wine13\"=dword:02040608 ;comment\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine10"); - todo_wine verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine12"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine10"); + verify_reg(hkey, "Wine11", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine12"); dword = 0x2040608; - todo_wine verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine13", REG_DWORD, &dword, sizeof(dword), 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1875,11 +2586,11 @@ static void test_import(void) " ;comment\n" " 61,00,74,00,65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" "\"Wine17\"=\"Another valid line\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine14"); - todo_wine verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); - todo_wine verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); - todo_wine verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine14"); + verify_reg(hkey, "Wine15", REG_SZ, "A valid line", 13, 0); + verify_reg(hkey, "Wine16", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine17", REG_SZ, "Another valid line", 19, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1889,15 +2600,15 @@ static void test_import(void) " ;\"Comment4\"=\"Value 4\"\n" "\"Wine18\"=\"Value 6\"#\"Comment5\"=\"Value 5\"\n" "\"Wine19\"=\"Value 7\";\"Comment6\"=\"Value 6\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Comment1"); - todo_wine verify_reg_nonexist(hkey, "Comment2"); - todo_wine verify_reg_nonexist(hkey, "Comment3"); - todo_wine verify_reg_nonexist(hkey, "Comment4"); - todo_wine verify_reg_nonexist(hkey, "Wine18"); - todo_wine verify_reg_nonexist(hkey, "Comment5"); - todo_wine verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, TODO_REG_SIZE|TODO_REG_DATA); - todo_wine verify_reg_nonexist(hkey, "Comment6"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Comment1"); + verify_reg_nonexist(hkey, "Comment2"); + verify_reg_nonexist(hkey, "Comment3"); + verify_reg_nonexist(hkey, "Comment4"); + verify_reg_nonexist(hkey, "Wine18"); + verify_reg_nonexist(hkey, "Comment5"); + verify_reg(hkey, "Wine19", REG_SZ, "Value 7", 8, 0); + verify_reg_nonexist(hkey, "Comment6"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1913,30 +2624,30 @@ static void test_import(void) "\"Wine29\"=;dword:00000002\n" "\"Wine30\"=dword:00000003#comment\n" "\"Wine31\"=dword:00000004;comment\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine20"); - todo_wine verify_reg_nonexist(hkey, "Wine21"); - todo_wine verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); - todo_wine verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); - todo_wine verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); - todo_wine verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); - todo_wine verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); - todo_wine verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); - todo_wine verify_reg_nonexist(hkey, "Wine28"); - todo_wine verify_reg_nonexist(hkey, "Wine29"); - todo_wine verify_reg_nonexist(hkey, "Wine30"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine20"); + verify_reg_nonexist(hkey, "Wine21"); + verify_reg(hkey, "Wine22", REG_SZ, "#comment1", 10, 0); + verify_reg(hkey, "Wine23", REG_SZ, ";comment2", 10, 0); + verify_reg(hkey, "Wine24", REG_SZ, "Value#comment3", 15, 0); + verify_reg(hkey, "Wine25", REG_SZ, "Value;comment4", 15, 0); + verify_reg(hkey, "Wine26", REG_SZ, "Value #comment5", 16, 0); + verify_reg(hkey, "Wine27", REG_SZ, "Value ;comment6", 16, 0); + verify_reg_nonexist(hkey, "Wine28"); + verify_reg_nonexist(hkey, "Wine29"); + verify_reg_nonexist(hkey, "Wine30"); dword = 0x00000004; - todo_wine verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine31", REG_DWORD, &dword, sizeof(dword), 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine32a\"=dword:1\n" "\"Wine32b\"=dword:4444\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x1; - todo_wine verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine32a", REG_DWORD, &dword, sizeof(dword), 0); dword = 0x4444; - todo_wine verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine32b", REG_DWORD, &dword, sizeof(dword), 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1945,30 +2656,30 @@ static void test_import(void) "\"Wine33c\"=dword:123456789\n" "\"Wine33d\"=dword:012345678\n" "\"Wine33e\"=dword:000000001\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine33a"); - todo_wine verify_reg_nonexist(hkey, "Wine33b"); - todo_wine verify_reg_nonexist(hkey, "Wine33c"); - todo_wine verify_reg_nonexist(hkey, "Wine33d"); - todo_wine verify_reg_nonexist(hkey, "Wine33e"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine33a"); + verify_reg_nonexist(hkey, "Wine33b"); + verify_reg_nonexist(hkey, "Wine33c"); + verify_reg_nonexist(hkey, "Wine33d"); + verify_reg_nonexist(hkey, "Wine33e"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine34a\"=dword:12345678abc\n" "\"Wine34b\"=dword:12345678 abc\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine34a"); - todo_wine verify_reg_nonexist(hkey, "Wine34b"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine34a"); + verify_reg_nonexist(hkey, "Wine34b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine35a\"=dword:0x123\n" "\"Wine35b\"=dword:123 456\n" "\"Wine35c\"=dword:1234 5678\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine35a"); - todo_wine verify_reg_nonexist(hkey, "Wine35b"); - todo_wine verify_reg_nonexist(hkey, "Wine35c"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine35a"); + verify_reg_nonexist(hkey, "Wine35b"); + verify_reg_nonexist(hkey, "Wine35c"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -1976,26 +2687,28 @@ static void test_import(void) "\"Wine36b\"=dword:1234 ;5678\n" "\"Wine36c\"=dword:1234#5678\n" "\"Wine36d\"=dword:1234 #5678\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x1234; - todo_wine verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg_nonexist(hkey, "Wine36c"); - todo_wine verify_reg_nonexist(hkey, "Wine36d"); + verify_reg(hkey, "Wine36a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine36b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg_nonexist(hkey, "Wine36c"); + verify_reg_nonexist(hkey, "Wine36d"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine37a\"=\"foo\"bar\"\n" "\"Wine37b\"=\"foo\"\"bar\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine37a"); - todo_wine verify_reg_nonexist(hkey, "Wine37b"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine37a"); + verify_reg_nonexist(hkey, "Wine37b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" - "\"Empty string\"=\"\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + "\"Empty string\"=\"\"\n" + "\"\"=\"Default registry value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Empty string", REG_SZ, "", 1, 0); + verify_reg(hkey, NULL, REG_SZ, "Default registry value", 23, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2003,11 +2716,11 @@ static void test_import(void) "\"Test38b\"=\\\"\n" "\"Test38c\"=\\\"Value\\\"\n" "\"Test38d\"=\\\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Test38a"); - todo_wine verify_reg_nonexist(hkey, "Test38b"); - todo_wine verify_reg_nonexist(hkey, "Test38c"); - todo_wine verify_reg_nonexist(hkey, "Test38d"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Test38a"); + verify_reg_nonexist(hkey, "Test38b"); + verify_reg_nonexist(hkey, "Test38c"); + verify_reg_nonexist(hkey, "Test38d"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2015,54 +2728,54 @@ static void test_import(void) "\"Wine39b\"=\"Value2\"\t\t;comment\n" "\"Wine39c\"=\"Value3\" #comment\n" "\"Wine39d\"=\"Value4\"\t\t#comment\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine39a", REG_SZ, "Value1", 7, 0); - todo_wine verify_reg(hkey, "Wine39b", REG_SZ, "Value2", 7, 0); - todo_wine verify_reg_nonexist(hkey, "Wine39c"); - todo_wine verify_reg_nonexist(hkey, "Wine39d"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine39a", REG_SZ, "Value1", 7, 0); + verify_reg(hkey, "Wine39b", REG_SZ, "Value2", 7, 0); + verify_reg_nonexist(hkey, "Wine39c"); + verify_reg_nonexist(hkey, "Wine39d"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoBeginQuote\"=Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "TestNoBeginQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "TestNoBeginQuote"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoEndQuote\"=\"Asdffdsa\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "TestNoEndQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "TestNoEndQuote"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"TestNoQuotes\"=Asdffdsa\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "TestNoQuotes"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "TestNoQuotes"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoBeginQuote\"=\"Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "NameNoBeginQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "NameNoBeginQuote"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"NameNoEndQuote=\"Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "NameNoEndQuote"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "NameNoEndQuote"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "NameNoQuotes=\"Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "NameNoQuotes"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "NameNoQuotes"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"MixedQuotes=Asdffdsa\"\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "MixedQuotes"); - todo_wine verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "MixedQuotes"); + verify_reg_nonexist(hkey, "MixedQuotes=Asdffdsa"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2073,14 +2786,14 @@ static void test_import(void) "\"Wine40e\"=hex(2):4c,00,69,00,6e,00,65,00,\\\n" "\"Wine40f\"=\"Value 3\"\n" "\"Wine40g\"=\"Value 4\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine40a", REG_EXPAND_SZ, "Line", 5, 0); - todo_wine verify_reg(hkey, "Wine40b", REG_SZ, "Value 1", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine40c"); - todo_wine verify_reg(hkey, "Wine40d", REG_SZ, "Value 2", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine40e"); - todo_wine verify_reg_nonexist(hkey, "Wine40f"); - todo_wine verify_reg(hkey, "Wine40g", REG_SZ, "Value 4", 8, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine40a", REG_EXPAND_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine40b", REG_SZ, "Value 1", 8, 0); + verify_reg_nonexist(hkey, "Wine40c"); + verify_reg(hkey, "Wine40d", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine40e"); + verify_reg_nonexist(hkey, "Wine40f"); + verify_reg(hkey, "Wine40g", REG_SZ, "Value 4", 8, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2088,8 +2801,8 @@ static void test_import(void) " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n" " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line1", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2097,36 +2810,36 @@ static void test_import(void) " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,;comment\n" " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line2", REG_MULTI_SZ, "Line concat", 12, 0); test_import_wstr("\xef\xbb\xbfREGEDIT4\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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line3"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line3"); test_import_wstr("\xef\xbb\xbfREGEDIT4\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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line4"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line4"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line5\"=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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line5"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line5"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Multi-Line6\"=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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line6"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line6"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2135,8 +2848,8 @@ static void test_import(void) " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\;comment\n" " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line7", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line7", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2145,8 +2858,8 @@ static void test_import(void) " 63,00,6f,00,6e,00,\\;#comment\n" " 63,00,61,00,74,00,\\;#comment\n" " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line8", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line8", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2155,8 +2868,8 @@ static void test_import(void) " 63,00,6f,00,6e,00,\\;comment\n" " 63,00,61,00,74,00,\\#comment\n" " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Multi-Line9"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Multi-Line9"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2165,8 +2878,8 @@ static void test_import(void) " 63,00,61,00,74,00,\\\n\n" " 65,00,6e,00,\\;comment\n\n" " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Multi-Line10", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Multi-Line10", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2174,33 +2887,31 @@ static void test_import(void) "5678\n" "\"Wine41b\"=\"Test \\\n" "Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine41a"); - todo_wine verify_reg_nonexist(hkey, "Wine41b"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine41a"); + verify_reg_nonexist(hkey, "Wine41b"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"double\\\"quote\"=\"valid \\\"or\\\" not\"\n" "\"single'quote\"=dword:00000008\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "double\"quote", REG_SZ, "valid \"or\" not", 15, 0); dword = 0x00000008; - todo_wine verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "single'quote", REG_DWORD, &dword, sizeof(dword), 0); /* Test key name and value name concatenation */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\\n" "Subkey1]\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey1"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\n" "\\Subkey2]\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(hkey, "Subkey2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_FILE_NOT_FOUND, "got %d, expected 2\n", err); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey2"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2209,10 +2920,10 @@ static void test_import(void) "\"Wine42b\"=\"Value 2\"\n" "\"Wine\n" "\\42c\"=\"Value 3\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg_nonexist(hkey, "Wine42a"); - todo_wine verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine42c"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine42a"); + verify_reg(hkey, "Wine42b", REG_SZ, "Value 2", 8, 0); + verify_reg_nonexist(hkey, "Wine42c"); /* Test hex data concatenation for REG_NONE, REG_EXPAND_SZ and REG_BINARY */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" @@ -2242,18 +2953,18 @@ static void test_import(void) "\"Wine43k\"=hex(0):56,00,61,00,\\;comment\n" " 6c,00,75,00,\\#comment\n" " 65,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg_nonexist(hkey, "Wine43c"); - todo_wine verify_reg_nonexist(hkey, "Wine43d"); - todo_wine verify_reg_nonexist(hkey, "Wine43e"); - todo_wine verify_reg_nonexist(hkey, "Wine43f"); - todo_wine verify_reg_nonexist(hkey, "Wine43g"); - todo_wine verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); - todo_wine verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); - todo_wine verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); - todo_wine verify_reg_nonexist(hkey, "Wine43k"); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine43a", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + verify_reg(hkey, "Wine43b", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + verify_reg_nonexist(hkey, "Wine43c"); + verify_reg_nonexist(hkey, "Wine43d"); + verify_reg_nonexist(hkey, "Wine43e"); + verify_reg_nonexist(hkey, "Wine43f"); + verify_reg_nonexist(hkey, "Wine43g"); + verify_reg(hkey, "Wine43h", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + verify_reg(hkey, "Wine43i", REG_NONE, "V\0a\0l\0u", 8, 0); + verify_reg(hkey, "Wine43j", REG_NONE, "V\0a\0l\0u", 8, 0); + verify_reg_nonexist(hkey, "Wine43k"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2282,32 +2993,32 @@ static void test_import(void) "\"Wine44k\"=hex(2):25,00,50,00,41,00,\\;comment\n" " 54,00,48,00,\\#comment\n" " 25,00,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine44a", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine verify_reg(hkey, "Wine44b", REG_EXPAND_SZ, "%PATH%", 7, 0); - todo_wine verify_reg_nonexist(hkey, "Wine44c"); - todo_wine verify_reg_nonexist(hkey, "Wine44d"); - todo_wine verify_reg_nonexist(hkey, "Wine44e"); - todo_wine verify_reg_nonexist(hkey, "Wine44f"); - todo_wine verify_reg_nonexist(hkey, "Wine44g"); - todo_wine verify_reg(hkey, "Wine44h", REG_EXPAND_SZ, "%PATH%", 7, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine44a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine44b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine44c"); + verify_reg_nonexist(hkey, "Wine44d"); + verify_reg_nonexist(hkey, "Wine44e"); + verify_reg_nonexist(hkey, "Wine44f"); + verify_reg_nonexist(hkey, "Wine44g"); + verify_reg(hkey, "Wine44h", REG_EXPAND_SZ, "%PATH%", 7, 0); /* Wine44i */ size = sizeof(buffer); err = RegQueryValueExA(hkey, "Wine44i", NULL, &type, (BYTE *)&buffer, &size); - todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); - 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"); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine44j */ size = sizeof(buffer); memset(buffer, '-', size); err = RegQueryValueExA(hkey, "Wine44j", NULL, &type, (BYTE *)&buffer, &size); - todo_wine ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); - 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"); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_EXPAND_SZ, "got wrong type %u, expected %u\n", type, REG_EXPAND_SZ); + ok(size == 6 || broken(size == 5) /* WinXP */, "got wrong size %u, expected 6\n", size); + ok(memcmp(buffer, "%PATH", size) == 0, "got wrong data\n"); /* Wine44k */ - todo_wine verify_reg_nonexist(hkey, "Wine44k"); + verify_reg_nonexist(hkey, "Wine44k"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2336,51 +3047,753 @@ static void test_import(void) "\"Wine45k\"=hex:11,22,33,\\;comment\n" " 44,55,66,\\#comment\n" " 77,88\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); hex[0] = 0x11; hex[1] = 0x22; hex[2] = 0x33; hex[3] = 0x44; hex[4] = 0x55; hex[5] = 0x66; hex[6] = 0x77; hex[7] = 0x88; - todo_wine verify_reg(hkey, "Wine45a", REG_BINARY, hex, sizeof(hex), 0); - todo_wine verify_reg(hkey, "Wine45b", REG_BINARY, hex, sizeof(hex), 0); - todo_wine verify_reg_nonexist(hkey, "Wine45c"); - todo_wine verify_reg_nonexist(hkey, "Wine45d"); - todo_wine verify_reg_nonexist(hkey, "Wine45e"); - todo_wine verify_reg_nonexist(hkey, "Wine45f"); - todo_wine verify_reg_nonexist(hkey, "Wine45g"); - todo_wine verify_reg(hkey, "Wine45h", REG_BINARY, hex, sizeof(hex), 0); - todo_wine verify_reg(hkey, "Wine45i", REG_BINARY, hex, 6, 0); - todo_wine verify_reg(hkey, "Wine45j", REG_BINARY, hex, 6, 0); - todo_wine verify_reg_nonexist(hkey, "Wine45k"); + verify_reg(hkey, "Wine45a", REG_BINARY, hex, sizeof(hex), 0); + verify_reg(hkey, "Wine45b", REG_BINARY, hex, sizeof(hex), 0); + verify_reg_nonexist(hkey, "Wine45c"); + verify_reg_nonexist(hkey, "Wine45d"); + verify_reg_nonexist(hkey, "Wine45e"); + verify_reg_nonexist(hkey, "Wine45f"); + verify_reg_nonexist(hkey, "Wine45g"); + verify_reg(hkey, "Wine45h", REG_BINARY, hex, sizeof(hex), 0); + verify_reg(hkey, "Wine45i", REG_BINARY, hex, 6, 0); + verify_reg(hkey, "Wine45j", REG_BINARY, hex, 6, 0); + verify_reg_nonexist(hkey, "Wine45k"); /* Test import with subkeys */ test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey\"1]\n" "\"Wine\\\\31\"=\"Test value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegOpenKeyExA(hkey, "Subkey\"1", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - todo_wine verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + verify_reg(subkey, "Wine\\31", REG_SZ, "Test value", 11, 0); err = RegCloseKey(subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey\"1"); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey/2]\n" "\"123/\\\"4;'5\"=\"Random value name\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); err = RegOpenKeyExA(hkey, "Subkey/2", 0, KEY_READ, &subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); - todo_wine verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + verify_reg(subkey, "123/\"4;'5", REG_SZ, "Random value name", 18, 0); err = RegCloseKey(subkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE "\\Subkey/2"); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + /* Test key creation */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "HKEY_CURRENT_USER\\" KEY_BASE "\\No_Opening_Bracket]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "No_Opening_Bracket"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\No_Closing_Bracket\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "No_Closing_Bracket"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[ HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1a]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey1a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1b]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey1b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1c "); + err = RegDeleteKeyA(hkey, "Subkey1c "); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1d\t"); + err = RegDeleteKeyA(hkey, "Subkey1d\t"); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1e\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1e\\"); + verify_key(hkey, "Subkey1e"); + err = RegOpenKeyExA(hkey, "Subkey1e", 0, KEY_READ, &subkey); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1e"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1f\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1f\\\\"); + verify_key(hkey, "Subkey1f\\"); + verify_key(hkey, "Subkey1f"); + err = RegOpenKeyExA(hkey, "Subkey1f\\\\", 0, KEY_READ, &subkey); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1f\\\\"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1g\\\\\\\\]\n" + "\"Wine\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey1g\\\\\\\\"); + verify_key(hkey, "Subkey1g\\\\"); + verify_key(hkey, "Subkey1g\\"); + verify_key(hkey, "Subkey1g"); + err = RegOpenKeyExA(hkey, "Subkey1g\\\\", 0, KEY_READ, &subkey); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %u, expected 0\n", err); + verify_reg(subkey, "Wine", REG_SZ, "Test value", 11, 0); + RegCloseKey(subkey); + err = RegDeleteKeyA(hkey, "Subkey1g\\\\"); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %u, expected 0\n", err); + + /* Test key deletion. We start by creating some registry keys. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey2b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey2a"); + verify_key_nonexist(hkey, "Subkey2b"); + + /* Test case sensitivity when creating and deleting registry keys. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" + "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey3a"); + verify_key(hkey, "Subkey3b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" + "[-hKeY_cUrReNt_UsEr\\" KEY_BASE "\\sUbKeY3B]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey3a"); + verify_key_nonexist(hkey, "Subkey3b"); + + /* Test mixed key creation and deletion. We start by creating a subkey. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key(hkey, "Subkey4a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey4a]\n" + "\"Wine46a\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4a"); + verify_reg_nonexist(hkey, "Wine46a"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n" + "[HKEY_CURRENT_USERS\\" KEY_BASE "\\Subkey4b]\n" + "\"Wine46b\"=dword:12345678\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_key_nonexist(hkey, "Subkey4b"); + verify_reg_nonexist(hkey, "Wine46b"); + + /* Test value deletion. We start by creating some registry values. */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=\"Test Value\"\n" + "\"Wine46b\"=dword:00000008\n" + "\"Wine46c\"=hex:11,22,33,44\n" + "\"Wine46d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine46e\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine46f\"=hex(0):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine46a", REG_SZ, "Test Value", 11, 0); + verify_reg(hkey, "Wine46b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine46c", REG_BINARY, hex, 4, 0); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine46e", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine46a\"=-\n" + "\"Wine46b\"= -\n" + "\"Wine46c\"= \t-\t \n" + "\"Wine46d\"=-\"Test\"\n" + "\"Wine46e\"=- ;comment\n" + "\"Wine46f\"=- #comment\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine46a"); + verify_reg_nonexist(hkey, "Wine46b"); + verify_reg_nonexist(hkey, "Wine46c"); + verify_reg(hkey, "Wine46d", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg_nonexist(hkey, "Wine46e"); + verify_reg(hkey, "Wine46f", REG_NONE, "V\0a\0l\0u\0e\0\0", 12, 0); + + /* Test the accepted range of the hex-based data types */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine47a\"=hex(0):56,61,6c,75,65,00\n" + "\"Wine47b\"=hex(10):56,61,6c,75,65,00\n" + "\"Wine47c\"=hex(100):56,61,6c,75,65,00\n" + "\"Wine47d\"=hex(1000):56,61,6c,75,65,00\n" + "\"Wine47e\"=hex(7fff):56,61,6c,75,65,00\n" + "\"Wine47f\"=hex(ffff):56,61,6c,75,65,00\n" + "\"Wine47g\"=hex(7fffffff):56,61,6c,75,65,00\n" + "\"Wine47h\"=hex(ffffffff):56,61,6c,75,65,00\n" + "\"Wine47i\"=hex(100000000):56,61,6c,75,65,00\n" + "\"Wine47j\"=hex(0x2):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine47k\"=hex(0X2):56,00,61,00,6c,00,75,00,65,00,00,00\n" + "\"Wine47l\"=hex(x2):56,00,61,00,6c,00,75,00,65,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine47a", REG_NONE, "Value", 6, 0); + verify_reg(hkey, "Wine47b", 0x10, "Value", 6, 0); + verify_reg(hkey, "Wine47c", 0x100, "Value", 6, 0); + verify_reg(hkey, "Wine47d", 0x1000, "Value", 6, 0); + verify_reg(hkey, "Wine47e", 0x7fff, "Value", 6, 0); + verify_reg(hkey, "Wine47f", 0xffff, "Value", 6, 0); + verify_reg(hkey, "Wine47g", 0x7fffffff, "Value", 6, 0); + verify_reg(hkey, "Wine47h", 0xffffffff, "Value", 6, 0); + verify_reg_nonexist(hkey, "Wine47i"); + verify_reg_nonexist(hkey, "Wine47j"); + verify_reg_nonexist(hkey, "Wine47k"); + verify_reg_nonexist(hkey, "Wine47l"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine48a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00, \\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00, \\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine48b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\t\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\t \t \\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine48a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine48b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine49\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00,\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine49", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine50a\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00 ;comment\n" + "\"Wine50b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\t;comment\n" + "\"Wine50c\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00 #comment\n" + "\"Wine50d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\t#comment\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine50a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine50b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine50c"); + verify_reg_nonexist(hkey, "Wine50d"); + + /* Test support for characters greater than 0xff */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine51a\"=hex(0):25,50,100,54,48,25,00\n" + "\"Wine51b\"=hex(0):25,1a4,100,164,124,25,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine51a"); + verify_reg_nonexist(hkey, "Wine51b"); + + /* Test the effect of backslashes in hex data */ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine52a\"=hex(2):25,00,48\\,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52b\"=hex(2):25,00,48,00,\\4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52c\"=hex(2):25,00,48\\ ,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52d\"=hex(2):25,00,48,00,\\ 4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52e\"=hex(2):\\25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52f\"=hex(2):\\ 25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52g\"=hex(2):25,00,48,00,4\\f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52h\"=hex(2):25,00,48,00,4\\\n" + " f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52i\"=hex(2):25,00,50,00,\\,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine52j\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine52k\"=hex(2):,\\\n" + " 25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n" + "\"Wine52l\"=hex(2):\\\n" + " 25,00,48,00,4f,00,4d,00,45,00,25,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine52a"); + verify_reg_nonexist(hkey, "Wine52b"); + verify_reg_nonexist(hkey, "Wine52c"); + verify_reg_nonexist(hkey, "Wine52d"); + verify_reg_nonexist(hkey, "Wine52e"); + verify_reg_nonexist(hkey, "Wine52f"); + verify_reg_nonexist(hkey, "Wine52g"); + verify_reg_nonexist(hkey, "Wine52h"); + verify_reg_nonexist(hkey, "Wine52i"); + verify_reg_nonexist(hkey, "Wine52j"); + verify_reg_nonexist(hkey, "Wine52k"); + verify_reg(hkey, "Wine52l", REG_EXPAND_SZ, "%HOME%", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine53a\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53b\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53c\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00, \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53d\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00 \\ ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53e\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine53f\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\t ;comment\n" + " 25,00,50,00,41,00,54,00,48,00,25,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine53a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine53b"); + verify_reg(hkey, "Wine53c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine53d"); + verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine53f"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine54a"); + verify_key_nonexist(hkey, "Subkey1"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine54b\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine54b"); + verify_key(hkey, "Subkey2"); + + err = RegDeleteKeyA(hkey, "Subkey2"); + ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine55a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "\"Wine55b\"=\"Test value\"\n" + + "\"Wine55c\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + ";comment\n" + "\"Wine55d\"=\"Test value\"\n" + + "\"Wine55e\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "#comment\n" + "\"Wine55f\"=\"Test value\"\n" + + "\"Wine55g\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n\n" + "\"Wine55h\"=\"Test value\"\n" + + "\"Wine55i\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "\"Wine55j\"=\"Test value\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine55a"); + verify_reg_nonexist(hkey, "Wine55b"); + verify_reg_nonexist(hkey, "Wine55c"); + verify_reg_nonexist(hkey, "Wine55d"); + verify_reg_nonexist(hkey, "Wine55e"); + verify_reg(hkey, "Wine55f", REG_SZ, "Test value", 11, 0); + verify_reg_nonexist(hkey, "Wine55g"); + verify_reg_nonexist(hkey, "Wine55h"); + verify_reg_nonexist(hkey, "Wine55i"); + verify_reg(hkey, "Wine55j", REG_SZ, "Test value", 11, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine56a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "\"Wine56b\"=dword:00000008\n" + + "\"Wine56c\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + ";comment\n" + "\"Wine56d\"=dword:00000008\n" + + "\"Wine56e\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "#comment\n" + "\"Wine56f\"=dword:00000008\n" + + "\"Wine56g\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n\n" + "\"Wine56h\"=dword:00000008\n" + + "\"Wine56i\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "\"Wine56j\"=dword:00000008\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine56a"); + verify_reg_nonexist(hkey, "Wine56b"); + verify_reg_nonexist(hkey, "Wine56c"); + verify_reg_nonexist(hkey, "Wine56d"); + verify_reg_nonexist(hkey, "Wine56e"); + verify_reg(hkey, "Wine56f", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg_nonexist(hkey, "Wine56g"); + verify_reg_nonexist(hkey, "Wine56h"); + verify_reg_nonexist(hkey, "Wine56i"); + verify_reg(hkey, "Wine56j", REG_DWORD, &dword, sizeof(dword), 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine57a\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + "\"Wine57b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57c\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + ";comment\n" + "\"Wine57d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57e\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n" + "#comment\n" + "\"Wine57f\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57g\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00,\\\n\n" + "\"Wine57h\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + + "\"Wine57i\"=hex(2):25,00,48,00,4f,00,4d,00,45,00,25,00,5c,00\\\n" + "\"Wine57j\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine57a"); + verify_reg_nonexist(hkey, "Wine57b"); + verify_reg_nonexist(hkey, "Wine57c"); + verify_reg_nonexist(hkey, "Wine57d"); + verify_reg_nonexist(hkey, "Wine57e"); + verify_reg(hkey, "Wine57f", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg_nonexist(hkey, "Wine57g"); + verify_reg_nonexist(hkey, "Wine57h"); + verify_reg_nonexist(hkey, "Wine57i"); + verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + + err = RegDeleteValueW(hkey, NULL); + ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58a\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "@=\"Default value 1\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58a"); + verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58b\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + ";comment\n" + "@=\"Default value 2\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58b"); + verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58c\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n" + "#comment\n" + "@=\"Default value 3\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58c"); + verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %u\n", err); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58d\"=hex(2):4c,00,69,00,6e,00,65,00,20,00,\\\n\n" + "@=\"Default value 4\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58d"); + verify_reg_nonexist(hkey, NULL); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine58e\"=hex(2):4c,00,69,00,6e,00,65,00,20,00\\\n" + "@=\"Default value 5\"\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine58e"); + verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine59a\"=hex:11,22,33,\\\n" + "\\\n" + " 44,55,66\n" + "\"Wine59b\"=hex:11,22,33,\\\n" + " \\\n" + " 44,55,66\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine59a"); + verify_reg_nonexist(hkey, "Wine59b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + ";comment\n" + " 65,00,6e,00,\\;comment\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60a", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " ;comment\n" + " 65,00,6e,00,\\;comment\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60c\"=hex(7):4c,69,6e,65,20,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + "#comment\n" + " 65,00,6e,00,\\;comment\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine60c"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " #comment\n" + " 65,00,6e,00,\\;comment\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine60d"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60e\"=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", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine60f\"=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", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine60f", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine61a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine61b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine61a"); + verify_reg_nonexist(hkey, "Wine61b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(0):56,61,6c,75,65,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62a", REG_NONE, "Value", 5, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62b", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62b", REG_EXPAND_SZ, "%PATH%", 7, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62c\"=hex:11,22,33,44,55,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62c", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62c", REG_BINARY, hex, 5, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62d\"=hex(7):4c,00,69,00,6e,00,65,00,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62d", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62d", REG_MULTI_SZ, "Line", 5, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62e\"=hex(100):56,61,6c,75,65,\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62e", NULL, NULL, NULL, NULL); + ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + verify_reg(hkey, "Wine62e", 0x100, "Value", 5, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62f\"=hex(7):4c,00,69,00,6e,00,65,00,20,00\\", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine62f"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine63a\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " ,63,00,6f,00,6e,00,\\\n" + " 63,00,61,00,74,00,\\\n" + " 65,00,6e,00,\\\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine63b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,,00,6f,00,6e,00,\\\n" + " 63,00,61,00,74,00,\\\n" + " 65,00,6e,00,\\\n" + " 61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, "Wine63a"); + verify_reg_nonexist(hkey, "Wine63b"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine64a\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00\n" + "\"Wine64b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine64c\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\;comment\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\\\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine64d\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\;comment\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n" + "\"Wine64e\"=hex(7):4c,00,69,00,6e,00,65,00,20,00,\\\n" + " 63,00,6f,00,6e,00,63,00,61,00,74,00,;comment\n" + " 65,00,6e,00,61,00,74,00,69,00,6f,00,6e,00,00,00,00,00\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine64a", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine64b", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine64c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + /* Wine64d */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine64d", NULL, &type, (BYTE *)&buffer, &size); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); + ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); + ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); + /* Wine64e */ + size = sizeof(buffer); + err = RegQueryValueExA(hkey, "Wine64e", NULL, &type, (BYTE *)&buffer, &size); + ok(err == ERROR_SUCCESS, "RegQueryValueExA failed: %d\n", err); + ok(type == REG_MULTI_SZ, "got wrong type %u, expected %u\n", type, REG_MULTI_SZ); + ok(size == 12 || broken(size == 11) /* WinXP */, "got wrong size %u, expected 12\n", size); + ok(memcmp(buffer, "Line concat", size) == 0, "got wrong data\n"); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine65a\"=hex(100):25,50,41,54,48,25,00\n" + "\"Wine65b\"=hex(100):25,50,41,\\\n" + " 54,48,25,00\n" + "\"Wine65c\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\\\n" + " 25,00\n" + "\"Wine65d\"=hex(100):25,50,41,\\;comment\n" + " 54,48,\n" + " 25,00\n" + "\"Wine65e\"=hex(100):25,50,41,\\;comment\n" + " 54,48,;comment\n" + " 25,00\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine65a", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine65b", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine65c", 0x100, "%PATH%", 7, 0); + verify_reg(hkey, "Wine65d", 0x100, "%PATH", 5, 0); + verify_reg(hkey, "Wine65e", 0x100, "%PATH", 5, 0); + + /* Test null-termination of REG_EXPAND_SZ and REG_MULTI_SZ data*/ + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine66a\"=hex(7):4c,00,69,00,6e,00,65,00\n" + "\"Wine66b\"=hex(7):4c,00,69,00,6e,00,65,00,\n" + "\"Wine66c\"=hex(7):4c,00,69,00,6e,00,65,00,00,00\n" + "\"Wine66d\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,\n" + "\"Wine66e\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00\n" + "\"Wine66f\"=hex(7):4c,00,69,00,6e,00,65,00,00,00,00,00,\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine66a", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66b", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66c", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66d", REG_MULTI_SZ, "Line", 5, 0); + verify_reg(hkey, "Wine66e", REG_MULTI_SZ, "Line\0", 6, 0); + verify_reg(hkey, "Wine66f", REG_MULTI_SZ, "Line\0", 6, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine67a\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00\n" + "\"Wine67b\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,\n" + "\"Wine67c\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00\n" + "\"Wine67d\"=hex(2):25,00,50,00,41,00,54,00,48,00,25,00,00,00,\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine67a", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine67b", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine67c", REG_EXPAND_SZ, "%PATH%", 7, 0); + verify_reg(hkey, "Wine67d", REG_EXPAND_SZ, "%PATH%", 7, 0); err = RegCloseKey(hkey); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); } static void test_import_with_whitespace(void) @@ -2391,64 +3804,64 @@ static void test_import_with_whitespace(void) test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", err); test_import_str(" REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1a\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0); test_import_str("\tREGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1b\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0); test_import_str(" \t REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1c\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0); test_import_str("REGEDIT4\n\n" " [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2a\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); test_import_str("REGEDIT4\n\n" "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2b\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); test_import_str("REGEDIT4\n\n" " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2c\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" " \"Wine3a\"=\"Two leading spaces\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\t\"Wine3b\"=\"One leading tab\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" " \t \"Wine3c\"=\"Space, tab, space\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); test_import_str(" REGEDIT4\n\n" "\t\t\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2458,11 +3871,11 @@ static void test_import_with_whitespace(void) " 63,6f,6e,\\;comment\n" "\t\t\t\t63,61,74,\\;comment\n" " \t65,6e,61,74,69,6f,6e,00,00\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); dword = 0x112233; - todo_wine verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_str(" REGEDIT4\n\n" "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2470,125 +3883,132 @@ static void test_import_with_whitespace(void) "\t\t\"Wine5b\"\t\t=\"Leading tabs\"\n" "\t \"Wine5c\"=\t \"Tabs and spaces\"\n" " \"Wine5d\" \t = \t \"More whitespace\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); - todo_wine verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); - todo_wine verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + 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); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, " Wine6a", REG_SZ, "Leading spaces", 15, 0); - todo_wine verify_reg(hkey, "\t\tWine6b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + 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); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine7a", REG_SZ, " Four spaces in the data", 28, 0); - todo_wine verify_reg(hkey, "Wine7b", REG_SZ, "\t\tTwo tabs in the data", 23, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + 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); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine8a\"=\"Trailing spaces\" \n" "\"Wine8b\"=\"Trailing tabs and spaces\"\t \t\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); - todo_wine verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); + verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine9a\"=dword: 00000008\n" "\"Wine9b\"=dword:\t\t00000008\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x00000008; - todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "@ = \"Test Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\t@\t=\tdword:\t00000008\t\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); err = RegCloseKey(hkey); - todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); +} + +static void test_unicode_import_with_whitespace(void) +{ + HKEY hkey; + DWORD r, dword; + LONG err; test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); - todo_wine ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegOpenKeyExA failed: got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1a\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine1a", REG_SZ, "Value", 6, 0); test_import_wstr("\xef\xbb\xbf\tWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1b\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine1b", REG_SZ, "Value", 6, 0); test_import_wstr("\xef\xbb\xbf \t Windows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine1c\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine1c", REG_SZ, "Value", 6, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" " [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2a\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine2a", REG_SZ, "Value", 6, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2b\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine2b", REG_SZ, "Value", 6, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" " \t [HKEY_CURRENT_USER\\" KEY_BASE "]\n" "\"Wine2c\"=\"Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine2c", REG_SZ, "Value", 6, 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" " \"Wine3a\"=\"Two leading spaces\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine3a", REG_SZ, "Two leading spaces", 19, 0); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine3b", REG_SZ, "One leading tab", 16, 0); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %u, expected 0\n", r); + verify_reg(hkey, "Wine3c", REG_SZ, "Space, tab, space", 18, 0); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "\t\t\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2598,11 +4018,11 @@ static void test_import_with_whitespace(void) " 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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine4a", REG_SZ, "Tab and four spaces", 20, 0); dword = 0x112233; - todo_wine verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + verify_reg(hkey, "Wine4b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine4c", REG_MULTI_SZ, "Line concatenation\0", 20, 0); test_import_wstr("\xef\xbb\xbf Windows Registry Editor Version 5.00\n\n" "\t[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2610,64 +4030,181 @@ static void test_import_with_whitespace(void) "\t\t\"Wine5b\"\t\t=\"Leading tabs\"\n" "\t \"Wine5c\"=\t \"Tabs and spaces\"\n" " \"Wine5d\" \t = \t \"More whitespace\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine5a", REG_SZ, "Leading spaces", 15, 0); - todo_wine verify_reg(hkey, "Wine5b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, "Wine5c", REG_SZ, "Tabs and spaces", 16, 0); - todo_wine verify_reg(hkey, "Wine5d", REG_SZ, "More whitespace", 16, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + 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); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, " Wine6a", REG_SZ, "Leading spaces", 15, 0); - todo_wine verify_reg(hkey, "\t\tWine6b", REG_SZ, "Leading tabs", 13, 0); - todo_wine verify_reg(hkey, " Wine6c ", REG_SZ, " Spaces everywhere ", 22, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + 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); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine7a", REG_SZ, " Four spaces in the data", 28, 0); - todo_wine verify_reg(hkey, "Wine7b", REG_SZ, "\t\tTwo tabs in the data", 23, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + 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); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); - todo_wine verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "Wine8a", REG_SZ, "Trailing spaces", 16, 0); + verify_reg(hkey, "Wine8b", REG_SZ, "Trailing tabs and spaces", 25, 0); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0x00000008; - todo_wine verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); - todo_wine verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9a", REG_DWORD, &dword, sizeof(dword), 0); + verify_reg(hkey, "Wine9b", REG_DWORD, &dword, sizeof(dword), 0); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" "@ = \"Test Value\"\n\n", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "Test Value", 11, 0); test_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", &r); - todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_DWORD, &dword, sizeof(DWORD), 0); err = RegCloseKey(hkey); - todo_wine ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegCloseKey failed: got %d, expected 0\n", err); err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); - todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: got %d, expected 0\n", err); +} + +static void test_import_31(void) +{ + LONG err; + HKEY hkey; + DWORD r; + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(err == ERROR_SUCCESS || err == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", err); + + /* Check if reg.exe is running with elevated privileges */ + err = RegCreateKeyExA(HKEY_CLASSES_ROOT, KEY_BASE, 0, NULL, REG_OPTION_NON_VOLATILE, + KEY_READ|KEY_SET_VALUE, NULL, &hkey, NULL); + if (err == ERROR_ACCESS_DENIED) + { + win_skip("reg.exe is not running with elevated privileges; " + "skipping Windows 3.1 import tests\n"); + return; + } + + /* Test simple value */ + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value0\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "Value0", 7, 0); + + /* Test proper handling of spaces and equals signs */ + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " =Value1\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "Value1", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, " Value2", 8, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = Value3 \r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "Value3 ", 8, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value4\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "Value4", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " Value5\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "Value5", 7, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE "\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "", 1, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " \r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "", 1, 0); + + test_import_str("REGEDIT\r\n" + "HKEY_CLASSES_ROOT\\" KEY_BASE " = No newline", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg(hkey, "", REG_SZ, "No newline", 11, 0); + + err = RegDeleteValueW(hkey, NULL); + ok(err == ERROR_SUCCESS, "RegDeleteValue failed: %d\n", err); + + /* Test character validity at the start of the line */ + test_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1a\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + " HKEY_CLASSES_ROOT\\" KEY_BASE " = Value1b\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "\tHKEY_CLASSES_ROOT\\" KEY_BASE " = Value1c\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + ";HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2a\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "#HKEY_CLASSES_ROOT\\" KEY_BASE " = Value2b\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + /* Test case sensitivity */ + test_import_str("REGEDIT\r\n" + "hkey_classes_root\\" KEY_BASE " = Value3a\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "hKEY_CLASSES_ROOT\\" KEY_BASE " = Value3b\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + test_import_str("REGEDIT\r\n" + "Hkey_Classes_Root\\" KEY_BASE " = Value3c\r\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + verify_reg_nonexist(hkey, ""); + + RegCloseKey(hkey); + + err = RegDeleteKeyA(HKEY_CLASSES_ROOT, KEY_BASE); + ok(err == ERROR_SUCCESS, "RegDeleteKeyA failed: %d\n", err); } START_TEST(reg) @@ -2683,5 +4220,8 @@ START_TEST(reg) test_query(); test_v_flags(); test_import(); + test_unicode_import(); test_import_with_whitespace(); + test_unicode_import_with_whitespace(); + test_import_31(); }