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

Nikolay Sivov : crypt32: Fix tracing of out argument (Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 55e3a03ba3e1d47b9860ae5e274bea481e8bf461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=55e3a03ba3e1d47b9860ae5e2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 09:04:45 2015 +0300 crypt32: Fix tracing of out argument (Coverity). --- dlls/crypt32/decode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/crypt32/decode.c b/dlls/crypt32/decode.c index 90d8cdf..888ea05 100644 --- a/dlls/crypt32/decode.c +++ b/dlls/crypt32/decode.c @@ -5757,8 +5757,8 @@ BOOL CRYPT_AsnDecodeCMSSignedInfo(const BYTE *pbEncoded, DWORD cbEncoded, offsetof(CRYPT_SIGNED_INFO, rgSignerInfo), 0 }, }; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, signedInfo, *pcbSignedInfo); + TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, signedInfo, pcbSignedInfo); ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, signedInfo, pcbSignedInfo, @@ -5875,8 +5875,8 @@ BOOL CRYPT_AsnDecodePKCSEnvelopedData(const BYTE *pbEncoded, DWORD cbEncoded, offsetof(CRYPT_ENVELOPED_DATA, encryptedContentInfo.contentType), 0 }, }; - TRACE("%p, %d, %08x, %p, %p, %d\n", pbEncoded, cbEncoded, dwFlags, - pDecodePara, envelopedData, *pcbEnvelopedData); + TRACE("%p, %d, %08x, %p, %p, %p\n", pbEncoded, cbEncoded, dwFlags, + pDecodePara, envelopedData, pcbEnvelopedData); ret = CRYPT_AsnDecodeSequence(items, sizeof(items) / sizeof(items[0]), pbEncoded, cbEncoded, dwFlags, pDecodePara, envelopedData,

1 0

Nikolay Sivov : msctf: Set fActive directly in ActivateLanguageProfile() ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: d4bbcc44cb8e3e4d01121e1f4d24e3a0a5b01b84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d4bbcc44cb8e3e4d01121e1f4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 09:25:42 2015 +0300 msctf: Set fActive directly in ActivateLanguageProfile() (Coverity). --- dlls/msctf/inputprocessor.c | 5 ++--- dlls/msctf/msctf.c | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/inputprocessor.c b/dlls/msctf/inputprocessor.c index 89eb746..01af325 100644 --- a/dlls/msctf/inputprocessor.c +++ b/dlls/msctf/inputprocessor.c @@ -549,10 +549,9 @@ static HRESULT WINAPI InputProcessorProfiles_ActivateLanguageProfile( LanguageProfile.clsid = *rclsid; LanguageProfile.langid = langid; LanguageProfile.guidProfile = *guidProfiles; + LanguageProfile.fActive = TRUE; - hr = add_active_textservice(&LanguageProfile); - - return hr; + return add_active_textservice(&LanguageProfile); } static HRESULT WINAPI InputProcessorProfiles_GetActiveLanguageProfile( diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 4ea6a0a..85d2540 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -371,7 +371,6 @@ HRESULT add_active_textservice(TF_LANGUAGEPROFILE *lp) actsvr->pITfTextInputProcessor = NULL; actsvr->LanguageProfile = *lp; - actsvr->LanguageProfile.fActive = TRUE; actsvr->pITfKeyEventSink = NULL; /* get TIP category */

1 0

Sebastian Lackner : ws2_32/tests: Add tests for calling select with zero timeout.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 3d51b4eb9de6922affb52e57e36fb28e46f334ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d51b4eb9de6922affb52e57e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 7 19:18:51 2015 +0200 ws2_32/tests: Add tests for calling select with zero timeout. --- dlls/ws2_32/tests/sock.c | 38 +++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 6d328e6..610a563 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3523,30 +3523,46 @@ static void test_select(void) struct sockaddr_in address; select_thread_params thread_params; HANDLE thread_handle; - DWORD id; + DWORD ticks, id; fdRead = socket(AF_INET, SOCK_STREAM, 0); ok( (fdRead != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); fdWrite = socket(AF_INET, SOCK_STREAM, 0); ok( (fdWrite != INVALID_SOCKET), "socket failed unexpectedly: %d\n", WSAGetLastError() ); + maxfd = fdRead; + if (fdWrite > maxfd) + maxfd = fdWrite; + FD_ZERO_ALL(); FD_SET_ALL(fdRead); FD_SET_ALL(fdWrite); select_timeout.tv_sec=0; - select_timeout.tv_usec=500; + select_timeout.tv_usec=0; - maxfd = fdRead; - if (fdWrite > maxfd) - maxfd = fdWrite; - + ticks = GetTickCount(); ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); - ok ( (ret == 0), "select should not return any socket handles\n"); - ok ( !FD_ISSET(fdRead, &readfds), "FD should not be set\n"); - ok ( !FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); - ok ( !FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); - ok ( !FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + ticks = GetTickCount() - ticks; + ok(ret == 0, "select should not return any socket handles\n"); + ok(ticks < 10, "select was blocking for %u ms, expected < 10 ms\n", ticks); + ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); + ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + FD_ZERO_ALL(); + FD_SET_ALL(fdRead); + FD_SET_ALL(fdWrite); + select_timeout.tv_sec=0; + select_timeout.tv_usec=500; + + ret = select(maxfd+1, &readfds, &writefds, &exceptfds, &select_timeout); + ok(ret == 0, "select should not return any socket handles\n"); + ok(!FD_ISSET(fdRead, &readfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &writefds), "FD should not be set\n"); + ok(!FD_ISSET(fdRead, &exceptfds), "FD should not be set\n"); + ok(!FD_ISSET(fdWrite, &exceptfds), "FD should not be set\n"); + ok ((listen(fdWrite, SOMAXCONN) == SOCKET_ERROR), "listen did not fail\n"); ret = closesocket(fdWrite); ok ( (ret == 0), "closesocket failed unexpectedly: %d\n", ret);

1 0

Sebastian Lackner : ws2_32: Fix uninitialized memory access in do_poll ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: f542a0c18b5a6f0f4d0ef3ce1eb72f48c458035f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f542a0c18b5a6f0f4d0ef3ce1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 7 19:19:39 2015 +0200 ws2_32: Fix uninitialized memory access in do_poll (Coverity). --- dlls/ws2_32/socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fdf68a3..1a4533b 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -4800,6 +4800,7 @@ static int do_poll(struct pollfd *pollfds, int count, int timeout) { if (errno != EINTR) break; if (timeout < 0) continue; + if (timeout == 0) return 0; gettimeofday( &tv2, 0 );

1 0

Nikolay Sivov : oleaut32: Remove dead switch case VT_I1 entry for VarSub ( Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 7bb743cca6b41a82e8aa4117a87afd50be9e6fc3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bb743cca6b41a82e8aa4117a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:14:50 2015 +0300 oleaut32: Remove dead switch case VT_I1 entry for VarSub (Coverity). --- dlls/oleaut32/variant.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index feba6c5..8ca9cf9 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -3947,9 +3947,6 @@ HRESULT WINAPI VarSub(LPVARIANT left, LPVARIANT right, LPVARIANT result) case VT_I2: V_I2(result) = V_I2(&lv) - V_I2(&rv); break; - case VT_I1: - V_I1(result) = V_I1(&lv) - V_I1(&rv); - break; case VT_UI1: V_UI1(result) = V_UI2(&lv) - V_UI1(&rv); break;

1 0

Nikolay Sivov : gameux: Use matching heap call (Coverity).
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 8abd5b76c454a5dac37101292fe8fb0c1f4e1acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=8abd5b76c454a5dac37101292… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Jun 7 23:55:48 2015 +0300 gameux: Use matching heap call (Coverity). --- dlls/gameux/gameexplorer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gameux/gameexplorer.c b/dlls/gameux/gameexplorer.c index 6bdb2e4..63bf69d 100644 --- a/dlls/gameux/gameexplorer.c +++ b/dlls/gameux/gameexplorer.c @@ -756,7 +756,7 @@ HRESULT GAMEUX_FindGameInstanceId( if(SUCCEEDED(hr)) { ++dwMaxSubKeyLen; /* for string terminator */ - lpName = CoTaskMemAlloc(dwMaxSubKeyLen*sizeof(WCHAR)); + lpName = HeapAlloc(GetProcessHeap(), 0, dwMaxSubKeyLen*sizeof(WCHAR)); if(!lpName) hr = E_OUTOFMEMORY; }

1 0

Sebastian Lackner : kernel32/tests: Add tests for virtual memory alignment behaviour.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 5204d89dc99574040f8d9759f94ba74638fe382f URL: http://source.winehq.org/git/wine.git/?a=commit;h=5204d89dc99574040f8d9759f… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 5 07:32:40 2015 +0200 kernel32/tests: Add tests for virtual memory alignment behaviour. AT_ROUND_TO_PAGE is only available on 32-bit non-wow64 systems. --- dlls/kernel32/tests/virtual.c | 201 +++++++++++++++++++++++++++++++++++++++++- include/winnt.h | 1 + 2 files changed, 200 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5204d89dc99574040f8d9…

1 0

Sebastian Lackner : ntdll: Fix status code when NtMapViewOfSection parameter check fails.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 8ddab2c2f47c53753aa69c588ba86dc9e22d8939 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ddab2c2f47c53753aa69c588… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 5 07:35:11 2015 +0200 ntdll: Fix status code when NtMapViewOfSection parameter check fails. --- dlls/kernel32/tests/virtual.c | 3 --- dlls/ntdll/virtual.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 15fc715..6082740 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1072,7 +1072,6 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 1; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); /* ptr has to be aligned */ @@ -1080,7 +1079,6 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); /* still not 64k aligned */ @@ -1088,7 +1086,6 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 0, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_MAPPED_ALIGNMENT, "NtMapViewOfSection returned %x\n", status ); /* zero_bits != 0 is not allowed when an address is set */ diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 0629816..72309f6 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2602,7 +2602,7 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* Check parameters */ if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) - return STATUS_INVALID_PARAMETER; + return STATUS_MAPPED_ALIGNMENT; switch(protect) {

1 0

Sebastian Lackner : quartz: Fix handling of periodic advice timers.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: b513e07c55504f623baf8d838d00ac628eac7614 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b513e07c55504f623baf8d838… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sun Jun 7 20:15:20 2015 +0200 quartz: Fix handling of periodic advice timers. --- dlls/quartz/systemclock.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 043299b..cdb06f7 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -127,6 +127,7 @@ static DWORD WINAPI SystemClockAdviseThread(LPVOID lpParam) { it = nextit; } if (NULL != it) timeOut = (DWORD) ((it->rtBaseTime + it->rtIntervalTime) - curTime) / (REFERENCE_TIME)10000; + else timeOut = INFINITE; /** Now Periodics Advice: semi sorted list (sort cannot be used) */ for (it = This->pPeriodicAdvise; NULL != it; it = it->next) {

1 0

Nikolay Sivov : dwrite: Use [0,~0u) as initial text range.
by Alexandre Julliard 08 Jun '15

08 Jun '15

Module: wine Branch: master Commit: 496aec11e51d6d7159239967c19fe40d3fe775a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=496aec11e51d6d7159239967c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Jun 6 18:50:04 2015 +0300 dwrite: Use [0,~0u) as initial text range. --- dlls/dwrite/layout.c | 52 ++++++++++-------------- dlls/dwrite/tests/layout.c | 98 ++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 108 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=496aec11e51d6d7159239…

1 0