June 2017 - Wine-commits - list.winehq.org

Hugh McMaster : reg/tests: Test line concatenation with a new registry key on the next line.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 6731faa5adc85d7b1adddd9cc3664b335c815704 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6731faa5adc85d7b1adddd9cc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:05:54 2017 +0000 reg/tests: Test line concatenation with a new registry key on the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 5076ad1..46f7529 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1844,6 +1844,25 @@ static void test_import(void) todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54a"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54b"); + todo_wine verify_key(hkey, "Subkey2"); + + err = RegDeleteKeyA(hkey, "Subkey2"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2873,6 +2892,25 @@ static void test_unicode_import(void) todo_wine verify_reg(hkey, "Wine53e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54a"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine54b"); + todo_wine verify_key(hkey, "Subkey2"); + + err = RegDeleteKeyA(hkey, "Subkey2"); + todo_wine ok(err == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", err); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test line concatenation with comments, new lines and comma variations before a new registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: c7ca2d81082cc28525f316d50d1af51306f9a888 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7ca2d81082cc28525f316d50… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:03 2017 +0000 reg/tests: Test line concatenation with comments, new lines and comma variations before a new registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 46f7529..0d69d44 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1863,6 +1863,96 @@ static void test_import(void) err = RegDeleteKeyA(hkey, "Subkey2"); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine55a"); + todo_wine verify_reg_nonexist(hkey, "Wine55b"); + todo_wine verify_reg_nonexist(hkey, "Wine55c"); + todo_wine verify_reg_nonexist(hkey, "Wine55d"); + todo_wine verify_reg_nonexist(hkey, "Wine55e"); + todo_wine verify_reg(hkey, "Wine55f", REG_SZ, "Test value", 11, 0); + todo_wine verify_reg_nonexist(hkey, "Wine55g"); + todo_wine verify_reg_nonexist(hkey, "Wine55h"); + todo_wine verify_reg_nonexist(hkey, "Wine55i"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine56a"); + todo_wine verify_reg_nonexist(hkey, "Wine56b"); + todo_wine verify_reg_nonexist(hkey, "Wine56c"); + todo_wine verify_reg_nonexist(hkey, "Wine56d"); + todo_wine verify_reg_nonexist(hkey, "Wine56e"); + todo_wine verify_reg(hkey, "Wine56f", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine56g"); + todo_wine verify_reg_nonexist(hkey, "Wine56h"); + todo_wine verify_reg_nonexist(hkey, "Wine56i"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine57a"); + todo_wine verify_reg_nonexist(hkey, "Wine57b"); + todo_wine verify_reg_nonexist(hkey, "Wine57c"); + todo_wine verify_reg_nonexist(hkey, "Wine57d"); + todo_wine verify_reg_nonexist(hkey, "Wine57e"); + todo_wine verify_reg(hkey, "Wine57f", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine57g"); + todo_wine verify_reg_nonexist(hkey, "Wine57h"); + todo_wine verify_reg_nonexist(hkey, "Wine57i"); + todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2911,6 +3001,96 @@ static void test_unicode_import(void) err = RegDeleteKeyA(hkey, "Subkey2"); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine55a"); + todo_wine verify_reg_nonexist(hkey, "Wine55b"); + todo_wine verify_reg_nonexist(hkey, "Wine55c"); + todo_wine verify_reg_nonexist(hkey, "Wine55d"); + todo_wine verify_reg_nonexist(hkey, "Wine55e"); + todo_wine verify_reg(hkey, "Wine55f", REG_SZ, "Test value", 11, 0); + todo_wine verify_reg_nonexist(hkey, "Wine55g"); + todo_wine verify_reg_nonexist(hkey, "Wine55h"); + todo_wine verify_reg_nonexist(hkey, "Wine55i"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine56a"); + todo_wine verify_reg_nonexist(hkey, "Wine56b"); + todo_wine verify_reg_nonexist(hkey, "Wine56c"); + todo_wine verify_reg_nonexist(hkey, "Wine56d"); + todo_wine verify_reg_nonexist(hkey, "Wine56e"); + todo_wine verify_reg(hkey, "Wine56f", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine56g"); + todo_wine verify_reg_nonexist(hkey, "Wine56h"); + todo_wine verify_reg_nonexist(hkey, "Wine56i"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine57a"); + todo_wine verify_reg_nonexist(hkey, "Wine57b"); + todo_wine verify_reg_nonexist(hkey, "Wine57c"); + todo_wine verify_reg_nonexist(hkey, "Wine57d"); + todo_wine verify_reg_nonexist(hkey, "Wine57e"); + todo_wine verify_reg(hkey, "Wine57f", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine57g"); + todo_wine verify_reg_nonexist(hkey, "Wine57h"); + todo_wine verify_reg_nonexist(hkey, "Wine57i"); + todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 72ecfe55074b826632722e9b695a324e67a20cee URL: http://source.winehq.org/git/wine.git/?a=commit;h=72ecfe55074b826632722e9b6… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:12 2017 +0000 reg/tests: Test line concatenation with comments, new lines and comma variations before a new default registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 100 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 98 insertions(+), 2 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0d69d44..49d810f 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -892,7 +892,7 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_str("REGEDIT3\n\n" @@ -1953,6 +1953,54 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine57i"); todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegDeleteValueW(hkey, NULL); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58a"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58b"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58c"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58d"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58e"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2002,7 +2050,7 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ, &hkey); + err = RegOpenKeyExA(HKEY_CURRENT_USER, KEY_BASE, 0, KEY_READ|KEY_SET_VALUE, &hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); test_import_wstr("\xef\xbb\xbfREGEDIT3\n\n" @@ -3091,6 +3139,54 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine57i"); todo_wine verify_reg(hkey, "Wine57j", REG_EXPAND_SZ, "%PATH%", 7, 0); + err = RegDeleteValueW(hkey, NULL); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58a"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58b"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58c"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 3", 16, 0); + + err = RegDeleteValueW(hkey, NULL); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58d"); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine58e"); + todo_wine verify_reg(hkey, NULL, REG_SZ, "Default value 5", 16, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 2a992c0caae42f9502f64782f948ec032e72e3e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a992c0caae42f9502f64782f… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:22 2017 +0000 reg/tests: Test whether a line beginning with a backslash can follow a line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 49d810f..931e089 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2001,6 +2001,18 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine58e"); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine59a"); + todo_wine verify_reg_nonexist(hkey, "Wine59b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3187,6 +3199,18 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine58e"); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine59a"); + todo_wine verify_reg_nonexist(hkey, "Wine59b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test the effects of comments and new lines that appear between valid hex data lines.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: b5b1ed2c856a43e9c4201b9fc4cb7f7f4cb73eef URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5b1ed2c856a43e9c4201b9fc… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:31 2017 +0000 reg/tests: Test the effects of comments and new lines that appear between valid hex data lines. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 100 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 100 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 931e089..fea7403 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2013,6 +2013,56 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine59a"); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3211,6 +3261,56 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine59a"); todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg(hkey, "Wine60e", REG_MULTI_SZ, "Line concatenation\0", 20, 0); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test whether a forward slash can be used as a concatenation marker.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 09b600cdaf01452b91055716532f9f8f6fb8d4e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09b600cdaf01452b910557165… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:40 2017 +0000 reg/tests: Test whether a forward slash can be used as a concatenation marker. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index fea7403..9735f59 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2063,6 +2063,16 @@ static void test_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine verify_reg(hkey, "Wine60e", 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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3311,6 +3321,16 @@ static void test_unicode_import(void) todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); todo_wine 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" + "\"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); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine61a"); + todo_wine verify_reg_nonexist(hkey, "Wine61b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : reg/tests: Test whether EOF invalidates a hex data line ending in a backslash.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 3d47e94f44817a58693678b72aa33166f38cd1e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d47e94f44817a58693678b72… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 09:06:48 2017 +0000 reg/tests: Test whether EOF invalidates a hex data line ending in a backslash. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 9735f59..8d9dbfa 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -2073,6 +2073,22 @@ static void test_import(void) todo_wine verify_reg_nonexist(hkey, "Wine61a"); todo_wine verify_reg_nonexist(hkey, "Wine61b"); + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + + test_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,69,6e,65,20\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine62b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -3331,6 +3347,22 @@ static void test_unicode_import(void) todo_wine verify_reg_nonexist(hkey, "Wine61a"); todo_wine 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(7):4c,00,69,00,6e,00,65,00,20,00,\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + err = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(err == ERROR_SUCCESS || broken(err == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", err); + if (err == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + + test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,00,69,00,6e,00,65,00,20,00\\", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_reg_nonexist(hkey, "Wine62b"); + err = RegCloseKey(hkey); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err);

1 0

Hugh McMaster : regedit/tests: Test backslashes with whitespace variations and comma placement.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 6b36ce329d9d0a0118ef4f0e5fe375cb3fed9b4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b36ce329d9d0a0118ef4f0e5… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:41 2017 +0000 regedit/tests: Test backslashes with whitespace variations and comma placement. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 83fe725..79740c4 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1089,6 +1089,27 @@ static void test_comments(void) verify_reg_nonexist(hkey, "Wine27c"); verify_reg_nonexist(hkey, "Wine27d"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine28a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28b\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28c\"=hex(2):25,48,4f,4d,45,25,5c, \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28d\"=hex(2):25,48,4f,4d,45,25,5c \\ ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28e\"=hex(2):25,48,4f,4d,45,25,5c,\\\t ;comment\n" + " 25,50,41,54,48,25,00\n" + "\"Wine28f\"=hex(2):25,48,4f,4d,45,25,5c\\\t ;comment\n" + " 25,50,41,54,48,25,00\n\n"); + verify_reg(hkey, "Wine28a", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine28b"); + todo_wine verify_reg(hkey, "Wine28c", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine28d"); + todo_wine verify_reg(hkey, "Wine28e", REG_EXPAND_SZ, "%HOME%\\%PATH%", 14, 0); + verify_reg_nonexist(hkey, "Wine28f"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with a new registry key on the next line.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: 82263293f6a9362b4110e7eb26da4f84dd000764 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82263293f6a9362b4110e7eb2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:50 2017 +0000 regedit/tests: Test line concatenation with a new registry key on the next line. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79740c4..e2aea48 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -856,6 +856,23 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine23j"); verify_reg_nonexist(hkey, "Wine23k"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine24a\"=hex(2):4c,69,6e,65,20,\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1]\n"); + verify_reg_nonexist(hkey, "Wine24a"); + verify_key_nonexist(hkey, "Subkey1"); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine24b\"=hex(2):4c,69,6e,65,20\\\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2]\n"); + verify_reg_nonexist(hkey, "Wine24b"); + todo_wine verify_key(hkey, "Subkey2"); + + lr = RegDeleteKeyA(hkey, "Subkey2"); + todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test line concatenation with comments, new lines and comma variations before a new registry value.
by Alexandre Julliard 27 Jun '17

27 Jun '17

Module: wine Branch: master Commit: db9e4199e0c4de248a927df0d0f3577d00d5ce2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=db9e4199e0c4de248a927df0d… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:30:59 2017 +0000 regedit/tests: Test line concatenation with comments, new lines and comma variations before a new registry value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 88 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 88 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index e2aea48..706b987 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -551,6 +551,7 @@ static void test_invalid_import(void) { LONG lr; HKEY hkey; + DWORD dword = 0x8; lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); ok(lr == ERROR_SUCCESS || lr == ERROR_FILE_NOT_FOUND, "RegDeleteKeyA failed: %d\n", lr); @@ -873,6 +874,93 @@ static void test_invalid_import(void) lr = RegDeleteKeyA(hkey, "Subkey2"); todo_wine ok(lr == ERROR_SUCCESS, "RegDeleteKey failed: %u\n", lr); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine25a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine25b\"=\"Test value\"\n" + + "\"Wine25c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine25d\"=\"Test value\"\n" + + "\"Wine25e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine25f\"=\"Test value\"\n" + + "\"Wine25g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine25h\"=\"Test value\"\n" + + "\"Wine25i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine25j\"=\"Test value\"\n\n"); + verify_reg_nonexist(hkey, "Wine25a"); + verify_reg_nonexist(hkey, "Wine25b"); + verify_reg_nonexist(hkey, "Wine25c"); + todo_wine verify_reg_nonexist(hkey, "Wine25d"); + verify_reg_nonexist(hkey, "Wine25e"); + verify_reg(hkey, "Wine25f", REG_SZ, "Test value", 11, 0); + todo_wine verify_reg_nonexist(hkey, "Wine25g"); + todo_wine verify_reg_nonexist(hkey, "Wine25h"); + verify_reg_nonexist(hkey, "Wine25i"); + todo_wine verify_reg(hkey, "Wine25j", REG_SZ, "Test value", 11, 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine26a\"=hex(2):4c,69,6e,65,20,\\\n" + "\"Wine26b\"=dword:00000008\n" + + "\"Wine26c\"=hex(2):4c,69,6e,65,20,\\\n" + ";comment\n" + "\"Wine26d\"=dword:00000008\n" + + "\"Wine26e\"=hex(2):4c,69,6e,65,20,\\\n" + "#comment\n" + "\"Wine26f\"=dword:00000008\n" + + "\"Wine26g\"=hex(2):4c,69,6e,65,20,\\\n\n" + "\"Wine26h\"=dword:00000008\n" + + "\"Wine26i\"=hex(2):4c,69,6e,65,20\\\n" + "\"Wine26j\"=dword:00000008\n\n"); + verify_reg_nonexist(hkey, "Wine26a"); + verify_reg_nonexist(hkey, "Wine26b"); + verify_reg_nonexist(hkey, "Wine26c"); + todo_wine verify_reg_nonexist(hkey, "Wine26d"); + verify_reg_nonexist(hkey, "Wine26e"); + verify_reg(hkey, "Wine26f", REG_DWORD, &dword, sizeof(dword), 0); + todo_wine verify_reg_nonexist(hkey, "Wine26g"); + todo_wine verify_reg_nonexist(hkey, "Wine26h"); + verify_reg_nonexist(hkey, "Wine26i"); + todo_wine verify_reg(hkey, "Wine26j", REG_DWORD, &dword, sizeof(dword), 0); + + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine27a\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "\"Wine27b\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27c\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + ";comment\n" + "\"Wine27d\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27e\"=hex(2):25,48,4f,4d,45,25,5c,\\\n" + "#comment\n" + "\"Wine27f\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27g\"=hex(2):25,48,4f,4d,45,25,5c,\\\n\n" + "\"Wine27h\"=hex(2):25,50,41,54,48,25,00\n" + + "\"Wine27i\"=hex(2):25,48,4f,4d,45,25,5c\\\n" + "\"Wine27j\"=hex(2):25,50,41,54,48,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine27a"); + verify_reg_nonexist(hkey, "Wine27b"); + verify_reg_nonexist(hkey, "Wine27c"); + todo_wine verify_reg_nonexist(hkey, "Wine27d"); + verify_reg_nonexist(hkey, "Wine27e"); + verify_reg(hkey, "Wine27f", REG_EXPAND_SZ, "%PATH%", 7, 0); + todo_wine verify_reg_nonexist(hkey, "Wine27g"); + todo_wine verify_reg_nonexist(hkey, "Wine27h"); + verify_reg_nonexist(hkey, "Wine27i"); + todo_wine verify_reg(hkey, "Wine27j", REG_EXPAND_SZ, "%PATH%", 7, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0