February 2016 - Wine-commits

Francois Gouget : shell32/tests: Use todo_wine_if() in tests.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: e48a569434855a3d91b083f282ae66c0674f728f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e48a569434855a3d91b083f28… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 16 02:49:48 2016 +0100 shell32/tests: Use todo_wine_if() in tests. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 185 ++++++++----------------------------------- 1 file changed, 31 insertions(+), 154 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e48a569434855a3d91b08…

1 0

Francois Gouget : shell32/tests: Take into account the Windows 10 DDE race condition.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: c8bc68ecb4d8b4c2adc429fef23f13b3795643b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8bc68ecb4d8b4c2adc429fef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Tue Feb 16 02:50:14 2016 +0100 shell32/tests: Take into account the Windows 10 DDE race condition. Also improve the description of this race condition. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlexec.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/shell32/tests/shlexec.c b/dlls/shell32/tests/shlexec.c index 9cfe3de..e003356 100644 --- a/dlls/shell32/tests/shlexec.c +++ b/dlls/shell32/tests/shlexec.c @@ -146,6 +146,7 @@ static char* getChildString(const char* sect, const char* key) * ***/ +#define CHILD_DDE_TIMEOUT 2500 static DWORD ddeInst; static HSZ hszTopic; static char ddeExec[MAX_PATH], ddeApplication[MAX_PATH]; @@ -270,7 +271,7 @@ static void doChild(int argc, char** argv) hdde = DdeNameService(ddeInst, hszApplication, 0, DNS_REGISTER | DNS_FILTEROFF); ok(hdde != NULL, "DdeNameService() failed le=%u\n", GetLastError()); - timer = SetTimer(NULL, 0, 2500, childTimeout); + timer = SetTimer(NULL, 0, CHILD_DDE_TIMEOUT, childTimeout); dde_ready = OpenEventA(EVENT_MODIFY_STATE, FALSE, "winetest_shlexec_dde_ready"); SetEvent(dde_ready); @@ -2350,18 +2351,23 @@ static void test_dde(void) GetLastError() == ERROR_FILE_NOT_FOUND && strcmp(winetest_platform, "windows") == 0) { - /* Windows 10 does not call WaitForInputIdle() for DDE, which - * breaks the tests. So force the call by adding - * SEE_MASK_WAITFORINPUTIDLE. + /* Windows 10 does not call WaitForInputIdle() for DDE which creates + * a race condition as the DDE server may not have time to start up. + * When that happens the test fails with the above results and we + * compensate by forcing the WaitForInputIdle() call. */ trace("Adding SEE_MASK_WAITFORINPUTIDLE for Windows 10\n"); ddeflags |= SEE_MASK_WAITFORINPUTIDLE; delete_test_association(".sde"); + Sleep(CHILD_DDE_TIMEOUT); continue; } okShell(32 < rc, "failed: rc=%lu err=%u\n", rc, GetLastError()); if (test->ddeexec) - okShell(waitforinputidle_count == 1, "WaitForInputIdle() was called %u times\n", waitforinputidle_count); + okShell(waitforinputidle_count == 1 || + broken(waitforinputidle_count == 0) /* Win10 race */, + "WaitForInputIdle() was called %u times\n", + waitforinputidle_count); else okShell(waitforinputidle_count == 0, "WaitForInputIdle() was called %u times for a non-DDE case\n", waitforinputidle_count);

1 0

Sebastian Lackner : ws2_32/tests: Add tests for getsockopt() with SO_SNDBUF and SO_RCVBUF optname.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 4d959241c8f6279954a7358a111b3e732c92aff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d959241c8f6279954a7358a1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 05:00:50 2016 +0100 ws2_32/tests: Add tests for getsockopt() with SO_SNDBUF and SO_RCVBUF optname. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index aeb7a62..4f11cce 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1328,6 +1328,7 @@ static void test_set_getsockopt(void) WSAPROTOCOL_INFOA infoA; WSAPROTOCOL_INFOW infoW; char providername[WSAPROTOCOL_LEN + 1]; + DWORD value; struct _prottest { int family, type, proto; @@ -1371,6 +1372,27 @@ static void test_set_getsockopt(void) err = getsockopt(s, SOL_SOCKET, SO_SNDTIMEO, (char *) &timeout, &size); ok( !err, "get/setsockopt(SO_SNDTIMEO) failed error: %d\n", WSAGetLastError()); ok( timeout == SOCKTIMEOUT2, "getsockopt(SO_SNDTIMEO) returned wrong value %d\n", timeout); + + /* SO_SNDBUF */ + value = 4096; + size = sizeof(value); + err = setsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&value, size); + ok( !err, "setsockopt(SO_SNDBUF) failed error: %u\n", WSAGetLastError() ); + value = 0xdeadbeef; + err = getsockopt(s, SOL_SOCKET, SO_SNDBUF, (char *)&value, &size); + ok( !err, "getsockopt(SO_SNDBUF) failed error: %u\n", WSAGetLastError() ); + todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + + /* SO_RCVBUF */ + value = 4096; + size = sizeof(value); + err = setsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&value, size); + ok( !err, "setsockopt(SO_RCVBUF) failed error: %u\n", WSAGetLastError() ); + value = 0xdeadbeef; + err = getsockopt(s, SOL_SOCKET, SO_RCVBUF, (char *)&value, &size); + ok( !err, "getsockopt(SO_RCVBUF) failed error: %u\n", WSAGetLastError() ); + todo_wine ok( value == 4096, "expected 4096, got %u\n", value ); + /* SO_LINGER */ for( i = 0; i < sizeof(linger_testvals)/sizeof(LINGER);i++) { size = sizeof(lingval);

1 0

Sebastian Lackner : kernel32: Do not inherit QT_* environment variables to Windows environment.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 4ac066cdaa3255b4c527b45ba685e30b189cb16d URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ac066cdaa3255b4c527b45ba… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 04:48:10 2016 +0100 kernel32: Do not inherit QT_* environment variables to Windows environment. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c index 1d306a7..86333be 100644 --- a/dlls/kernel32/process.c +++ b/dlls/kernel32/process.c @@ -134,7 +134,8 @@ static inline BOOL is_special_env_var( const char *var ) !strncmp( var, "PWD=", sizeof("PWD=")-1 ) || !strncmp( var, "HOME=", sizeof("HOME=")-1 ) || !strncmp( var, "TEMP=", sizeof("TEMP=")-1 ) || - !strncmp( var, "TMP=", sizeof("TMP=")-1 )); + !strncmp( var, "TMP=", sizeof("TMP=")-1 ) || + !strncmp( var, "QT_", sizeof("QT_")-1 )); }

1 0

Sebastian Lackner : services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 94fb7c3b8bdb8e713dd229ad78621f91916240ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=94fb7c3b8bdb8e713dd229ad7… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 06:02:30 2016 +0100 services: Start SERVICE_FILE_SYSTEM_DRIVER services with winedevice. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/services/services.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/services/services.c b/programs/services/services.c index 1335837..53a3846 100644 --- a/programs/services/services.c +++ b/programs/services/services.c @@ -631,7 +631,8 @@ static DWORD get_service_binary_path(const struct service_entry *service_entry, ExpandEnvironmentStringsW(service_entry->config.lpBinaryPathName, *path, size); - if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER) + if (service_entry->config.dwServiceType == SERVICE_KERNEL_DRIVER || + service_entry->config.dwServiceType == SERVICE_FILE_SYSTEM_DRIVER) { static const WCHAR winedeviceW[] = {'\\','w','i','n','e','d','e','v','i','c','e','.','e','x','e',' ',0}; WCHAR system_dir[MAX_PATH];

1 0

Sebastian Lackner : winegstreamer: Manually assign union variables.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 4c8125601ba8cdfdf600a8876e2c58d6fa6a3276 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c8125601ba8cdfdf600a8876… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue Feb 16 06:42:54 2016 +0100 winegstreamer: Manually assign union variables. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gst_cbs.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gst_cbs.c b/dlls/winegstreamer/gst_cbs.c index c851798..96325d0 100644 --- a/dlls/winegstreamer/gst_cbs.c +++ b/dlls/winegstreamer/gst_cbs.c @@ -286,9 +286,11 @@ void Gstreamer_transform_pad_added_wrapper(GstElement *filter, GstPad *pad, gpoi gboolean query_sink_wrapper(GstPad *pad, GstObject *parent, GstQuery *query) { - struct cb_data cbdata = { QUERY_SINK, - { .query_sink_data = {pad, parent, query} } - }; + struct cb_data cbdata = { QUERY_SINK }; + + cbdata.u.query_sink_data.pad = pad; + cbdata.u.query_sink_data.parent = parent; + cbdata.u.query_sink_data.query = query; call_cb(&cbdata);

1 0

Hugh McMaster : reg/tests: Add two more tests for REG_DWORD.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 0f42948bf1680daf4dfaca2f3abd71e7830f7621 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f42948bf1680daf4dfaca2f3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:05 2016 +1100 reg/tests: Add two more tests for REG_DWORD. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 4b780b0..2a96dd7 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -292,6 +292,15 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r); + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + dword = ~0u; + verify_reg(hkey, "dword12", REG_DWORD, &dword, sizeof(dword), + (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + + run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); + todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r);

1 0

Hugh McMaster : reg: Fail if strtolW cannot convert the entire data string into a DWORD.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 2fd010110ae7e7c76f9368ec237622fa061148ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd010110ae7e7c76f9368ec2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:06 2016 +1100 reg: Fail if strtolW cannot convert the entire data string into a DWORD. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 20de804..7a66753 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -244,7 +244,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r LPWSTR rest; DWORD val; val = strtolW(data, &rest, 0); - if (rest == data) { + if (*rest) { output_message(STRING_MISSING_INTEGER); break; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 2a96dd7..37fc40a 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -258,7 +258,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword4 /t REG_DWORD /d 123xyz /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword5 /t reg_dword /d 12345678 /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -276,7 +276,7 @@ static void test_add(void) "got wrong data %d, expected %d\n", dword, 123); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword7 /t reg_dword /d 0xabcdefg /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -299,7 +299,7 @@ static void test_add(void) (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); /* REG_DWORD_LITTLE_ENDIAN */ run_reg_exe("reg add HKCU\\" KEY_BASE " /v DWORD_LE /t REG_DWORD_LITTLE_ENDIAN /d 456 /f", &r);

1 0

Hugh McMaster : reg: Use strtoulW during conversion so we can set any value in the DWORD range.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 948888b9502537c6b872c87a994542a92987e2d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=948888b9502537c6b872c87a9… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:07 2016 +1100 reg: Use strtoulW during conversion so we can set any value in the DWORD range. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 7a66753..f676e77 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -243,7 +243,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r { LPWSTR rest; DWORD val; - val = strtolW(data, &rest, 0); + val = strtoulW(data, &rest, 0); if (*rest) { output_message(STRING_MISSING_INTEGER); break; diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 37fc40a..ba9fbed 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -281,8 +281,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0xdeadbeef /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = 0xdeadbeef; - verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), - (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); @@ -295,8 +294,7 @@ static void test_add(void) run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword12 /t REG_DWORD /d 0xffffffff /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); dword = ~0u; - verify_reg(hkey, "dword12", REG_DWORD, &dword, sizeof(dword), - (sizeof(long) > sizeof(DWORD)) ? 0 : TODO_REG_DATA); + verify_reg(hkey, "dword12", REG_DWORD, &dword, sizeof(dword), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword13 /t REG_DWORD /d 00x123 /f", &r); ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r);

1 0

Hugh McMaster : reg: Fail if the data argument for REG_DWORD begins with a minus sign.
by Alexandre Julliard 16 Feb '16

16 Feb '16

Module: wine Branch: master Commit: 474361ecb489fdedd78dd6be2ed20c2e031bf9af URL: http://source.winehq.org/git/wine.git/?a=commit;h=474361ecb489fdedd78dd6be2… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Feb 16 17:12:08 2016 +1100 reg: Fail if the data argument for REG_DWORD begins with a minus sign. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 2 +- programs/reg/tests/reg.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index f676e77..3c98fc0 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -244,7 +244,7 @@ static LPBYTE get_regdata(LPWSTR data, DWORD reg_type, WCHAR separator, DWORD *r LPWSTR rest; DWORD val; val = strtoulW(data, &rest, 0); - if (*rest) { + if (*rest || data[0] == '-') { output_message(STRING_MISSING_INTEGER); break; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index ba9fbed..0077101 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -284,9 +284,9 @@ static void test_add(void) verify_reg(hkey, "dword8", REG_DWORD, &dword, sizeof(dword), 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword9 /f /d -1", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /v dword10 /f /d -0x1", &r); - todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); + ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %u\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword8 /t REG_dword /d 0x01ffffffff /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d\n", r);

1 0