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

Hugh McMaster : regedit/tests: Test backslashes with whitespace variations and comma placement.
by Alexandre Julliard June 27, 2017

June 27, 2017

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 : reg/tests: Test line concatenation with a new registry key on the next line.
by Alexandre Julliard June 27, 2017

June 27, 2017

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

Alexandre Julliard : ws2_32/tests: Print IP addresses as unsigned.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 33a4d90138c10345e68a98c6af7460a77b28e2d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33a4d90138c10345e68a98c6a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 19:12:10 2017 +0200 ws2_32/tests: Print IP addresses as unsigned. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 23464ac..f3ba11c 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4757,7 +4757,7 @@ static void test_gethostbyname_hack(void) } ok(memcmp(he->h_addr_list[0], loopback, he->h_length) == 0, - "gethostbyname(\"localhost\") returned %d.%d.%d.%d\n", + "gethostbyname(\"localhost\") returned %u.%u.%u.%u\n", he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); } @@ -4781,7 +4781,7 @@ static void test_gethostbyname_hack(void) if (he->h_addr_list[0][0] == 127) { ok(memcmp(he->h_addr_list[0], magic_loopback, he->h_length) == 0, - "gethostbyname(\"%s\") returned %d.%d.%d.%d not 127.12.34.56\n", + "gethostbyname(\"%s\") returned %u.%u.%u.%u not 127.12.34.56\n", name, he->h_addr_list[0][0], he->h_addr_list[0][1], he->h_addr_list[0][2], he->h_addr_list[0][3]); }

1 0

Hugh McMaster : regedit/tests: Test whether EOF invalidates a hex data line ending in a backslash.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: ec0043f0839d6a9b617858ce8512194805d5754f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0043f0839d6a9b617858ce8… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:37:12 2017 +0000 regedit/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/regedit/tests/regedit.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 79213c6..fec6e3e 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -486,6 +486,15 @@ static void test_basic_import(void) " 25,48,4f,4d,45,25,00\n\n"); verify_reg(hkey, "Wine16", REG_EXPAND_SZ, "%HOME%", 7, 0); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62a\"=hex(7):4c,69,6e,65,20,\\"); + lr = RegQueryValueExA(hkey, "Wine62a", NULL, NULL, NULL, NULL); + todo_wine ok(lr == ERROR_SUCCESS || broken(lr == ERROR_FILE_NOT_FOUND) /* WinXP */, + "got %u, expected 0\n", lr); + if (lr == ERROR_SUCCESS) + todo_wine verify_reg(hkey, "Wine62a", REG_MULTI_SZ, "Line ", 6, 0); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); @@ -1021,6 +1030,11 @@ static void test_invalid_import(void) verify_reg_nonexist(hkey, "Wine30a"); verify_reg_nonexist(hkey, "Wine30b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine62b\"=hex(7):4c,69,6e,65,20\\"); + verify_reg_nonexist(hkey, "Wine62b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

Hugh McMaster : regedit/tests: Test whether a forward slash can be used as a concatenation marker.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 82d3be80948390c84d8528078eb3d6eadc349bdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=82d3be80948390c84d8528078… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jun 27 12:33:11 2017 +0000 regedit/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/regedit/tests/regedit.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index f7334e4..79213c6 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -1012,6 +1012,15 @@ static void test_invalid_import(void) todo_wine verify_reg_nonexist(hkey, "Wine29a"); todo_wine verify_reg_nonexist(hkey, "Wine29b"); + exec_import_str("REGEDIT4\n\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" + "\"Wine30a\"=hex(0):25,48,4f,4d,45,25,5c,/\n" + " 25,50,41,54,48,25,00\n" + "\"Wine30b\"=hex(0):25,48,4f,4d,45,25,5c/\n" + " 25,50,41,54,48,25,00\n\n"); + verify_reg_nonexist(hkey, "Wine30a"); + verify_reg_nonexist(hkey, "Wine30b"); + RegCloseKey(hkey); lr = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE);

1 0

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

June 27, 2017

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 line beginning with a backslash can follow a line ending in a backslash.
by Alexandre Julliard June 27, 2017

June 27, 2017

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 line concatenation with comments, new lines and comma variations before a new registry value.
by Alexandre Julliard June 27, 2017

June 27, 2017

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

Alexandre Julliard : secur32/tests: Add some braces to silence a clang warning.
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 9d38b8ee6f85e3241b58619fed7bd89025201958 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d38b8ee6f85e3241b58619fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jun 27 12:12:40 2017 +0200 secur32/tests: Add some braces to silence a clang warning. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/tests/ntlm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index d11cef7..254b668 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -574,7 +574,7 @@ static void testInitializeSecurityContextFlags(void) { SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; - SspiData client = {0}; + SspiData client = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; ULONG req_attr, ctxt_attr; TimeStamp ttl; @@ -794,7 +794,7 @@ static void testAuth(ULONG data_rep, BOOL fake) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client = {0}, server = {0}; + SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; SecPkgContext_Sizes ctxt_sizes; @@ -923,7 +923,7 @@ static void testSignSeal(void) SECURITY_STATUS sec_status; PSecPkgInfoA pkg_info = NULL; BOOL first = TRUE; - SspiData client = {0}, server = {0}; + SspiData client = {{0}}, server = {{0}}; SEC_WINNT_AUTH_IDENTITY_A id; static char sec_pkg_name[] = "NTLM"; SecBufferDesc crypt;

1 0

Zebediah Figura : msi: Implement UI messages in MsiOpenPackage().
by Alexandre Julliard June 27, 2017

June 27, 2017

Module: wine Branch: master Commit: 9032279c728186d81d4d965b769f7de7eaf634c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9032279c728186d81d4d965b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Jun 26 20:28:02 2017 -0500 msi: Implement UI messages in MsiOpenPackage(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msi.rc | 2 + dlls/msi/package.c | 53 +++++++++++++ dlls/msi/resource.h | 2 + dlls/msi/tests/format.c | 18 +++++ po/ar.po | 196 +++++++++++++++++++++++++----------------------- po/bg.po | 196 +++++++++++++++++++++++++----------------------- po/ca.po | 196 +++++++++++++++++++++++++----------------------- po/cs.po | 196 +++++++++++++++++++++++++----------------------- po/da.po | 196 +++++++++++++++++++++++++----------------------- po/de.po | 196 +++++++++++++++++++++++++----------------------- po/el.po | 196 +++++++++++++++++++++++++----------------------- po/en.po | 196 +++++++++++++++++++++++++----------------------- po/en_US.po | 196 +++++++++++++++++++++++++----------------------- po/eo.po | 196 +++++++++++++++++++++++++----------------------- po/es.po | 196 +++++++++++++++++++++++++----------------------- po/fa.po | 196 +++++++++++++++++++++++++----------------------- po/fi.po | 196 +++++++++++++++++++++++++----------------------- po/fr.po | 196 +++++++++++++++++++++++++----------------------- po/he.po | 196 +++++++++++++++++++++++++----------------------- po/hi.po | 196 +++++++++++++++++++++++++----------------------- po/hr.po | 196 +++++++++++++++++++++++++----------------------- po/hu.po | 196 +++++++++++++++++++++++++----------------------- po/it.po | 196 +++++++++++++++++++++++++----------------------- po/ja.po | 196 +++++++++++++++++++++++++----------------------- po/ko.po | 196 +++++++++++++++++++++++++----------------------- po/lt.po | 196 +++++++++++++++++++++++++----------------------- po/ml.po | 196 +++++++++++++++++++++++++----------------------- po/nb_NO.po | 196 +++++++++++++++++++++++++----------------------- po/nl.po | 196 +++++++++++++++++++++++++----------------------- po/or.po | 196 +++++++++++++++++++++++++----------------------- po/pa.po | 196 +++++++++++++++++++++++++----------------------- po/pl.po | 196 +++++++++++++++++++++++++----------------------- po/pt_BR.po | 196 +++++++++++++++++++++++++----------------------- po/pt_PT.po | 196 +++++++++++++++++++++++++----------------------- po/rm.po | 196 +++++++++++++++++++++++++----------------------- po/ro.po | 196 +++++++++++++++++++++++++----------------------- po/ru.po | 196 +++++++++++++++++++++++++----------------------- po/sk.po | 196 +++++++++++++++++++++++++----------------------- po/sl.po | 196 +++++++++++++++++++++++++----------------------- po/sr_RS(a)cyrillic.po | 196 +++++++++++++++++++++++++----------------------- po/sr_RS(a)latin.po | 196 +++++++++++++++++++++++++----------------------- po/sv.po | 196 +++++++++++++++++++++++++----------------------- po/te.po | 196 +++++++++++++++++++++++++----------------------- po/th.po | 196 +++++++++++++++++++++++++----------------------- po/tr.po | 196 +++++++++++++++++++++++++----------------------- po/uk.po | 196 +++++++++++++++++++++++++----------------------- po/wa.po | 196 +++++++++++++++++++++++++----------------------- po/wine.pot | 196 +++++++++++++++++++++++++----------------------- po/zh_CN.po | 196 +++++++++++++++++++++++++----------------------- po/zh_TW.po | 196 +++++++++++++++++++++++++----------------------- 50 files changed, 4767 insertions(+), 4324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9032279c728186d81d4d9…

1 0