wine-commits June 2017

wine-commits@winehq.org

2 participants
595 discussions

Hugh McMaster : regedit/tests: Use verify_key() for consistency with the verify_reg*() functions.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: f0e21863c9811407ce85d0ce99c155678f0d7933 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0e21863c9811407ce85d0ce9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:10 2017 +0000 regedit/tests: Use verify_key() for consistency with the verify_reg*() functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/tests/regedit.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/programs/regedit/tests/regedit.c b/programs/regedit/tests/regedit.c index 0cb2959..bc2fe46 100644 --- a/programs/regedit/tests/regedit.c +++ b/programs/regedit/tests/regedit.c @@ -160,8 +160,8 @@ static void r_verify_reg_nonexist(unsigned line, HKEY key, const char *value_nam (value_name && *value_name) ? value_name : "(Default)", lr); } -#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) -static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +#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 lr; @@ -1256,13 +1256,13 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n"); - verify_key_exist(hkey, "Subkey1c "); + verify_key(hkey, "Subkey1c "); lr = RegDeleteKeyA(hkey, "Subkey1c "); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1d\t]\n"); - verify_key_exist(hkey, "Subkey1d\t"); + verify_key(hkey, "Subkey1d\t"); lr = RegDeleteKeyA(hkey, "Subkey1d\t"); ok(lr == ERROR_SUCCESS, "got %d, expected 0\n", lr); @@ -1270,24 +1270,24 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n"); - verify_key_exist(hkey, "Subkey2a"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); - verify_key_exist(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n"); - verify_key_exist(hkey, "Subkey2a"); + verify_key(hkey, "Subkey2a"); exec_import_str("REGEDIT4\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n"); - verify_key_exist(hkey, "Subkey2b"); + verify_key(hkey, "Subkey2b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -1299,8 +1299,8 @@ static void test_key_creation_and_deletion(void) exec_import_str("REGEDIT4\n\n" "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n"); - verify_key_exist(hkey, "Subkey3a"); - verify_key_exist(hkey, "Subkey3b"); + verify_key(hkey, "Subkey3a"); + verify_key(hkey, "Subkey3b"); exec_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n"

1 0

Hugh McMaster : reg/tests: Use the verify_key*() functions where possible.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: e8b260f02a6ced08dbb63b3b1d30171b82d1895d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8b260f02a6ced08dbb63b3b1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:48:01 2017 +0000 reg/tests: Use the verify_key*() functions where possible. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 37 +++++++++++++------------------------ 1 file changed, 13 insertions(+), 24 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 1161914..6262635 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -120,7 +120,7 @@ static void verify_key_nonexist_(unsigned line, HKEY key_base, const char *subke static void test_add(void) { - HKEY hkey, subkey; + HKEY hkey; LONG err; DWORD r, dword, type, size; char buffer[22]; @@ -134,8 +134,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); @@ -167,18 +166,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 */ @@ -545,15 +540,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); @@ -1435,15 +1428,13 @@ static void test_import(void) "[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); + todo_wine 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); + todo_wine verify_key_nonexist(hkey, "Subkey2"); test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n" @@ -2441,15 +2432,13 @@ static void test_unicode_import(void) "[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); + 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" "\\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); + todo_wine verify_key_nonexist(hkey, "Subkey2"); test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\n"

1 0

Hugh McMaster : reg/tests: Use verify_key() for consistency with the verify_reg*() functions.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ceebbfc1ca75f002973c94bf955555f312efef65 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ceebbfc1ca75f002973c94bf9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:52 2017 +0000 reg/tests: Use verify_key() for consistency with the verify_reg*() functions. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e23586c..1161914 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -91,8 +91,8 @@ static void verify_reg_nonexist_(unsigned line, HKEY hkey, const char *value) (value && *value) ? value : "(Default)", err); } -#define verify_key_exist(k,s) verify_key_exist_(__LINE__,k,s) -static void verify_key_exist_(unsigned line, HKEY key_base, const char *subkey) +#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; @@ -1643,14 +1643,14 @@ static void test_import(void) test_import_str("REGEDIT4\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine 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); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -1659,28 +1659,28 @@ static void test_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[ -HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[\t-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[- HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine verify_key(hkey, "Subkey2a"); test_import_str("REGEDIT4\n\n" "[-\tHKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2b"); test_import_str("REGEDIT4\n\n" "[-HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" @@ -1694,8 +1694,8 @@ static void test_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine verify_key(hkey, "Subkey3b"); test_import_str("REGEDIT4\n\n" "[-HKEY_current_USER\\" KEY_BASE "\\sUBKEY3A]\n\n" @@ -2649,14 +2649,14 @@ static void test_unicode_import(void) test_import_wstr("\xef\xbb\xbfWindows Registry Editor Version 5.00\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey1c ]\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1c "); + todo_wine verify_key(hkey, "Subkey1c "); todo_wine err = RegDeleteKeyA(hkey, "Subkey1c "); todo_wine 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); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey1d\t"); + todo_wine verify_key(hkey, "Subkey1d\t"); todo_wine err = RegDeleteKeyA(hkey, "Subkey1d\t"); todo_wine ok(err == ERROR_SUCCESS, "got %d, expected 0\n", err); @@ -2665,28 +2665,28 @@ static void test_unicode_import(void) "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2a]\n\n" "[HKEY_CURRENT_USER\\" KEY_BASE "\\Subkey2b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine verify_key(hkey, "Subkey2a"); + todo_wine 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); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine 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); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine 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); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2a"); + todo_wine 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); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey2b"); + todo_wine 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" @@ -2700,8 +2700,8 @@ static void test_unicode_import(void) "[hkey_CURRENT_user\\" KEY_BASE "\\Subkey3a]\n\n" "[HkEy_CuRrEnT_uSeR\\" KEY_BASE "\\SuBkEy3b]\n\n", &r); todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - todo_wine verify_key_exist(hkey, "Subkey3a"); - todo_wine verify_key_exist(hkey, "Subkey3b"); + todo_wine verify_key(hkey, "Subkey3a"); + todo_wine 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"

1 0

Hugh McMaster : reg/tests: Separate Unicode import tests from the combined import tests.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 22f57c788837df566d7563e915208c712ac43f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f57c788837df566d7563e91… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:42 2017 +0000 reg/tests: Separate Unicode import tests from the combined import tests. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ba36d54..e23586c 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -1836,8 +1836,16 @@ static void test_import(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine 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[8]; + 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); @@ -2984,6 +2992,13 @@ static void test_import_with_whitespace(void) err = RegDeleteKeyA(HKEY_CURRENT_USER, KEY_BASE); todo_wine 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); @@ -3139,5 +3154,7 @@ START_TEST(reg) test_query(); test_v_flags(); test_import(); + test_unicode_import(); test_import_with_whitespace(); + test_unicode_import_with_whitespace(); }

1 0

Hugh McMaster : regedit: Free the buffer and reset data information on error and after setting the value.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 758340a6e1bc045fa4a7ba06b6da8e94243ee871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758340a6e1bc045fa4a7ba06b… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Jun 26 13:47:16 2017 +0000 regedit: Free the buffer and reset data information on error and after setting the value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regproc.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/programs/regedit/regproc.c b/programs/regedit/regproc.c index bc488d3..d6ea5c7 100644 --- a/programs/regedit/regproc.c +++ b/programs/regedit/regproc.c @@ -758,6 +758,9 @@ static WCHAR *string_data_state(struct parser *parser, WCHAR *pos) return line; invalid: + parser->data = NULL; + parser->data_size = 0; + set_state(parser, LINE_START); return line; } @@ -781,6 +784,7 @@ static WCHAR *dword_data_state(struct parser *parser, WCHAR *pos) invalid: HeapFree(GetProcessHeap(), 0, parser->data); parser->data = NULL; + parser->data_size = 0; set_state(parser, LINE_START); return line; @@ -807,6 +811,10 @@ static WCHAR *hex_data_state(struct parser *parser, WCHAR *pos) return line; invalid: + HeapFree(GetProcessHeap(), 0, parser->data); + parser->data = NULL; + parser->data_size = 0; + set_state(parser, LINE_START); return line; } @@ -827,10 +835,10 @@ static WCHAR *set_value_state(struct parser *parser, WCHAR *pos) parser->data, parser->data_size); if (parser->parse_type == REG_DWORD || parser->parse_type == REG_BINARY) - { HeapFree(GetProcessHeap(), 0, parser->data); - parser->data = NULL; - } + + parser->data = NULL; + parser->data_size = 0; if (parser->reg_version == REG_VERSION_31) set_state(parser, PARSE_WIN31_LINE);

1 0

Jacek Caban : wininet: Return an error on redirect with no host name specified.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: cee99826b62b62acb7a8cf1ff32d27633c078e8f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cee99826b62b62acb7a8cf1ff… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 15:36:50 2017 +0200 wininet: Return an error on redirect with no host name specified. Inspired by Michael Müller's patch. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 3 +++ dlls/wininet/tests/http.c | 25 +++++++++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index e0bc55d..02f6609 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4058,6 +4058,9 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) urlComponents.dwUrlPathLength = 1; if(!InternetCrackUrlW(url, url_len, 0, &urlComponents)) return INTERNET_GetLastError(); + + if(!urlComponents.dwHostNameLength) + return ERROR_INTERNET_INVALID_URL; } INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index a3a0980..a2890d3 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -5269,6 +5269,31 @@ static void test_redirect(int port) close_connection(); close_async_handle(req.session, 2); + trace("Test redirect to http URL with no host name...\n"); + + open_socket_request(port, &req); + + SET_EXPECT(INTERNET_STATUS_REQUEST_COMPLETE); + + server_send_string("HTTP/1.1 302 Found\r\n" + "Server: winetest\r\n" + "Location: http:///nohost\r\n" + "Connection: keep-alive\r\n" + "Content-Length: 0\r\n" + "\r\n"); + + WaitForSingleObject(complete_event, INFINITE); + + CHECK_NOTIFIED(INTERNET_STATUS_REQUEST_COMPLETE); + ok(req_error == ERROR_INTERNET_INVALID_URL, "expected ERROR_INTERNET_INVALID_URL, got %u\n", req_error); + + sprintf(expect_url, "http://localhost:%u/socket", port); + test_request_url(req.request, expect_url); + test_status_code(req.request, 302); + + close_connection(); + close_async_handle(req.session, 2); + skip_receive_notification_tests = FALSE; }

1 0

Jacek Caban : wininet: Moved INTERNET_STATUS_REDIRECT notification to HTTP_HandleRedirect.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 61e28c01c60cfe27f13a957ef940c36ef827c9b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61e28c01c60cfe27f13a957ef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Jun 26 15:36:35 2017 +0200 wininet: Moved INTERNET_STATUS_REDIRECT notification to HTTP_HandleRedirect. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 17a1919..e0bc55d 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -4039,27 +4039,33 @@ static WCHAR *get_redirect_url(http_request_t *request) /*********************************************************************** * HTTP_HandleRedirect (internal) */ -static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) +static DWORD HTTP_HandleRedirect(http_request_t *request, WCHAR *url) { + URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; http_session_t *session = request->session; - WCHAR *path; + size_t url_len = strlenW(url); - if(lpszUrl[0]=='/') + if(url[0] == '/') { /* if it's an absolute path, keep the same session info */ - path = heap_strdupW(lpszUrl); + urlComponents.lpszUrlPath = url; + urlComponents.dwUrlPathLength = url_len; } else { - URL_COMPONENTSW urlComponents = { sizeof(urlComponents) }; - BOOL custom_port = FALSE; - substr_t host; - urlComponents.dwHostNameLength = 1; urlComponents.dwUserNameLength = 1; urlComponents.dwUrlPathLength = 1; - if(!InternetCrackUrlW(lpszUrl, strlenW(lpszUrl), 0, &urlComponents)) + if(!InternetCrackUrlW(url, url_len, 0, &urlComponents)) return INTERNET_GetLastError(); + } + + INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, + url, (url_len + 1) * sizeof(WCHAR)); + + if(urlComponents.dwHostNameLength) { + BOOL custom_port = FALSE; + substr_t host; if(urlComponents.nScheme == INTERNET_SCHEME_HTTP) { if(request->hdr.dwFlags & INTERNET_FLAG_SECURE) { @@ -4106,23 +4112,25 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) HTTP_ProcessHeader(request, hostW, request->server->host_port, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); else HTTP_ProcessHeader(request, hostW, request->server->name, HTTP_ADDREQ_FLAG_ADD | HTTP_ADDREQ_FLAG_REPLACE | HTTP_ADDHDR_FLAG_REQ); - - path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); } + heap_free(request->path); request->path = NULL; - if (*path) + if(urlComponents.dwUrlPathLength) { DWORD needed = 1; HRESULT rc; WCHAR dummy = 0; + WCHAR *path; + path = heap_strndupW(urlComponents.lpszUrlPath, urlComponents.dwUrlPathLength); rc = UrlEscapeW(path, &dummy, &needed, URL_ESCAPE_SPACES_ONLY); if (rc != E_POINTER) ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); request->path = heap_alloc(needed*sizeof(WCHAR)); rc = UrlEscapeW(path, request->path, &needed, URL_ESCAPE_SPACES_ONLY); + heap_free(path); if (rc != S_OK) { ERR("Unable to escape string!(%s) (%d)\n",debugstr_w(path),rc); @@ -4130,8 +4138,6 @@ static DWORD HTTP_HandleRedirect(http_request_t *request, LPCWSTR lpszUrl) } } - heap_free(path); - /* Remove custom content-type/length headers on redirects. */ remove_header(request, szContent_Type, TRUE); remove_header(request, szContent_Length, TRUE); @@ -5040,8 +5046,6 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS) { @@ -5238,8 +5242,6 @@ static DWORD HTTP_HttpEndRequestW(http_request_t *request, DWORD dwFlags, DWORD_ request->verb = heap_strdupW(szGET); } http_release_netconn(request, drain_content(request, FALSE)); - INTERNET_SendCallback(&request->hdr, request->hdr.dwContext, INTERNET_STATUS_REDIRECT, - new_url, (strlenW(new_url) + 1) * sizeof(WCHAR)); res = HTTP_HandleRedirect(request, new_url); heap_free(new_url); if (res == ERROR_SUCCESS)

1 0

Alexandre Julliard : wineandroid: Allow putting libraries in the native library directory.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 0a2aac8dcaf9a53ef3abbede35e45d7d232fc77d URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a2aac8dcaf9a53ef3abbede3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:13:35 2017 +0200 wineandroid: Allow putting libraries in the native library directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/WineActivity.java | 11 +++++++++-- dlls/wineandroid.drv/build.gradle.in | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/WineActivity.java b/dlls/wineandroid.drv/WineActivity.java index 295ecc4..6c6edd5 100644 --- a/dlls/wineandroid.drv/WineActivity.java +++ b/dlls/wineandroid.drv/WineActivity.java @@ -88,7 +88,7 @@ public class WineActivity extends Activity HashMap<String,String> env = new HashMap<String,String>(); env.put( "WINELOADER", loader.toString() ); env.put( "WINEPREFIX", prefix.toString() ); - env.put( "LD_LIBRARY_PATH", libdir.toString() ); + env.put( "LD_LIBRARY_PATH", libdir.toString() + ":" + getApplicationInfo().nativeLibraryDir ); env.put( "LC_ALL", locale ); env.put( "LANG", locale ); @@ -111,7 +111,14 @@ public class WineActivity extends Activity createProgressDialog( 0, "Setting up the Windows environment..." ); - System.load( libdir.toString() + "/libwine.so" ); + try + { + System.loadLibrary( "wine" ); + } + catch (java.lang.UnsatisfiedLinkError e) + { + System.load( libdir.toString() + "/libwine.so" ); + } prefix.mkdirs(); runWine( cmdline, env ); diff --git a/dlls/wineandroid.drv/build.gradle.in b/dlls/wineandroid.drv/build.gradle.in index 8f02a12..53633b7 100644 --- a/dlls/wineandroid.drv/build.gradle.in +++ b/dlls/wineandroid.drv/build.gradle.in @@ -74,6 +74,7 @@ android { main.assets.srcDirs = [ "assets" ] main.java.srcDirs = [ "@srcdir@" ] + main.jniLibs.srcDirs = [ "lib" ] main.java.excludes = [ "build" ] main.res.srcDirs = [ "res" ] main.manifest.srcFile "@srcdir@/AndroidManifest.xml"

1 0

Alexandre Julliard : wineandroid: Work around the Android N restriction on loading libhardware.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: 9065fd259776f07dc9a31de9dedd464c4f51de92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9065fd259776f07dc9a31de9d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:12:44 2017 +0200 wineandroid: Work around the Android N restriction on loading libhardware. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/init.c | 126 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/init.c b/dlls/wineandroid.drv/init.c index 5626ad0..47ef4a2 100644 --- a/dlls/wineandroid.drv/init.c +++ b/dlls/wineandroid.drv/init.c @@ -25,6 +25,7 @@ #include <stdarg.h> #include <string.h> +#include <link.h> #include "windef.h" #include "winbase.h" @@ -492,6 +493,115 @@ DECL_FUNCPTR( hw_get_module ); struct gralloc_module_t *gralloc_module = NULL; +#ifndef DT_GNU_HASH +#define DT_GNU_HASH 0x6ffffef5 +#endif + +static unsigned int gnu_hash( const char *name ) +{ + unsigned int h = 5381; + while (*name) h = h * 33 + (unsigned char)*name++; + return h; +} + +static unsigned int hash_symbol( const char *name ) +{ + unsigned int hi, hash = 0; + while (*name) + { + hash = (hash << 4) + (unsigned char)*name++; + hi = hash & 0xf0000000; + hash ^= hi; + hash ^= hi >> 24; + } + return hash; +} + +static void *find_symbol( const struct dl_phdr_info* info, const char *var, int type ) +{ + const ElfW(Dyn) *dyn = NULL; + const ElfW(Phdr) *ph; + const ElfW(Sym) *symtab = NULL; + const Elf32_Word *hashtab = NULL; + const Elf32_Word *gnu_hashtab = NULL; + const char *strings = NULL; + Elf32_Word idx; + + for (ph = info->dlpi_phdr; ph < &info->dlpi_phdr[info->dlpi_phnum]; ++ph) + { + if (PT_DYNAMIC == ph->p_type) + { + dyn = (const ElfW(Dyn) *)(info->dlpi_addr + ph->p_vaddr); + break; + } + } + if (!dyn) return NULL; + + while (dyn->d_tag) + { + if (dyn->d_tag == DT_STRTAB) + strings = (const char*)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_SYMTAB) + symtab = (const ElfW(Sym) *)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_HASH) + hashtab = (const Elf32_Word *)(info->dlpi_addr + dyn->d_un.d_ptr); + if (dyn->d_tag == DT_GNU_HASH) + gnu_hashtab = (const Elf32_Word *)(info->dlpi_addr + dyn->d_un.d_ptr); + dyn++; + } + + if (!symtab || !strings) return NULL; + + if (gnu_hashtab) /* new style hash table */ + { + const unsigned int hash = gnu_hash(var); + const Elf32_Word nbuckets = gnu_hashtab[0]; + const Elf32_Word symbias = gnu_hashtab[1]; + const Elf32_Word nwords = gnu_hashtab[2]; + const ElfW(Addr) *bitmask = (const ElfW(Addr) *)(gnu_hashtab + 4); + const Elf32_Word *buckets = (const Elf32_Word *)(bitmask + nwords); + const Elf32_Word *chains = buckets + nbuckets - symbias; + + if (!(idx = buckets[hash % nbuckets])) return NULL; + do + { + if ((chains[idx] & ~1u) == (hash & ~1u) && + ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && + !strcmp( strings + symtab[idx].st_name, var )) + return (void *)(info->dlpi_addr + symtab[idx].st_value); + } while (!(chains[idx++] & 1u)); + } + else if (hashtab) /* old style hash table */ + { + const unsigned int hash = hash_symbol( var ); + const Elf32_Word nbuckets = hashtab[0]; + const Elf32_Word *buckets = hashtab + 2; + const Elf32_Word *chains = buckets + nbuckets; + + for (idx = buckets[hash % nbuckets]; idx; idx = chains[idx]) + { + if (ELF32_ST_BIND(symtab[idx].st_info) == STB_GLOBAL && + ELF32_ST_TYPE(symtab[idx].st_info) == type && + !strcmp( strings + symtab[idx].st_name, var )) + return (void *)(info->dlpi_addr + symtab[idx].st_value); + } + } + return NULL; +} + +static int enum_libs( struct dl_phdr_info* info, size_t size, void* data ) +{ + const char *p; + + if (!info->dlpi_name) return 0; + if (!(p = strrchr( info->dlpi_name, '/' ))) return 0; + if (strcmp( p, "/libhardware.so" )) return 0; + TRACE( "found libhardware at %p\n", info->dlpi_phdr ); + phw_get_module = find_symbol( info, "hw_get_module", STT_FUNC ); + return 1; +} + static void load_hardware_libs(void) { const struct hw_module_t *module; @@ -504,8 +614,20 @@ static void load_hardware_libs(void) } else { - ERR( "failed to load libhardware: %s\n", error ); - return; + /* Android >= N disallows loading libhardware, so we load libandroid (which imports + * libhardware), and then we can find libhardware in the list of loaded libraries. + */ + if (!wine_dlopen( "libandroid.so", RTLD_GLOBAL, error, sizeof(error) )) + { + ERR( "failed to load libandroid.so: %s\n", error ); + return; + } + dl_iterate_phdr( enum_libs, 0 ); + if (!phw_get_module) + { + ERR( "failed to find hw_get_module\n" ); + return; + } } if (phw_get_module( GRALLOC_HARDWARE_MODULE_ID, &module ) == 0)

1 0

Alexandre Julliard : wineandroid: Fix handling of Caps Lock with non-alphabetic keys.
by Alexandre Julliard 26 Jun '17

26 Jun '17

Module: wine Branch: master Commit: ab006d00854f694e63778ac891f9e19d13450c7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab006d00854f694e63778ac89… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 26 15:12:10 2017 +0200 wineandroid: Fix handling of Caps Lock with non-alphabetic keys. Spotted by Dmitry Timoshkov. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineandroid.drv/keyboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineandroid.drv/keyboard.c b/dlls/wineandroid.drv/keyboard.c index e6e1d02..3d459cd 100644 --- a/dlls/wineandroid.drv/keyboard.c +++ b/dlls/wineandroid.drv/keyboard.c @@ -757,7 +757,7 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, LPWSTR buf, int size, UINT flags, HKL hkl ) { WCHAR buffer[2]; - BOOL shift = (state[VK_SHIFT] & 0x80) || (state[VK_CAPITAL] & 0x01); + BOOL shift = state[VK_SHIFT] & 0x80; BOOL ctrl = state[VK_CONTROL] & 0x80; BOOL numlock = state[VK_NUMLOCK] & 0x01; @@ -798,7 +798,7 @@ INT CDECL ANDROID_ToUnicodeEx( UINT virt, UINT scan, const BYTE *state, } if (virt >= 'A' && virt <= 'Z') { - buffer[0] = shift ? virt : virt + 'a' - 'A'; + buffer[0] = shift || (state[VK_CAPITAL] & 0x01) ? virt : virt + 'a' - 'A'; break; } if (virt >= VK_NUMPAD0 && virt <= VK_NUMPAD9 && numlock && !shift)

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2017