February 2017 - Wine-Commits

Bruno Jesus : ws2_32/tests: Add a 2 buffer WSARecv test.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 803418c239934093e7a1d1fad3ee2d8079ee5817 URL: http://source.winehq.org/git/wine.git/?a=commit;h=803418c239934093e7a1d1fad… Author: Bruno Jesus <bjesus(a)codeweavers.com> Date: Sat Feb 25 12:46:49 2017 -0300 ws2_32/tests: Add a 2 buffer WSARecv test. Signed-off-by: Bruno Jesus <bjesus(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 44 +++++++++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index b42c078..b61905e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6626,7 +6626,7 @@ static void test_WSARecv(void) { SOCKET src, dest, server = INVALID_SOCKET; char buf[20]; - WSABUF bufs; + WSABUF bufs[2]; WSAOVERLAPPED ov; DWORD bytesReturned, flags, id; struct linger ling; @@ -6645,8 +6645,8 @@ static void test_WSARecv(void) memset(&ov, 0, sizeof(ov)); flags = 0; - bufs.len = 2; - bufs.buf = buf; + bufs[0].len = 2; + bufs[0].buf = buf; /* Send 4 bytes and receive in two calls of 2 */ SetLastError(0xdeadbeef); @@ -6655,31 +6655,49 @@ static void test_WSARecv(void) ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); + ok(bytesReturned == 2, "Expected 2, got %d\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned, "Expected 2, got %d\n", bytesReturned); + ok(bytesReturned == 2, "Expected 2, got %d\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - bufs.len = 4; + bufs[0].len = 4; SetLastError(0xdeadbeef); iret = send(src, "test", 4, 0); ok(iret == 4, "Expected 4, got %d\n", iret); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); SetLastError(0xdeadbeef); bytesReturned = 0xdeadbeef; - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, NULL, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, NULL, NULL); ok(!iret, "Expected 0, got %d\n", iret); - ok(bytesReturned, "Expected 4, got %d\n", bytesReturned); + ok(bytesReturned == 4, "Expected 4, got %d\n", bytesReturned); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); - bufs.len = sizeof(buf); + /* Test 2 buffers */ + bufs[0].len = 4; + bufs[1].len = 5; + bufs[1].buf = buf + 10; + SetLastError(0xdeadbeef); + iret = send(src, "deadbeefs", 9, 0); + ok(iret == 9, "Expected 9, got %d\n", iret); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + SetLastError(0xdeadbeef); + bytesReturned = 0xdeadbeef; + iret = WSARecv(dest, bufs, 2, &bytesReturned, &flags, NULL, NULL); + ok(!iret, "Expected 0, got %d\n", iret); + ok(bytesReturned == 9, "Expected 9, got %d\n", bytesReturned); + bufs[0].buf[4] = '\0'; + bufs[1].buf[5] = '\0'; + ok(!strcmp(bufs[0].buf, "dead"), "buf[0] doesn't match: %s != dead\n", bufs[0].buf); + ok(!strcmp(bufs[1].buf, "beefs"), "buf[1] doesn't match: %s != beefs\n", bufs[1].buf); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + bufs[0].len = sizeof(buf); ov.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); ok(ov.hEvent != NULL, "could not create event object, errno = %d\n", GetLastError()); if (!ov.hEvent) @@ -6690,10 +6708,10 @@ static void test_WSARecv(void) iret = setsockopt (src, SOL_SOCKET, SO_LINGER, (char *) &ling, sizeof(ling)); ok(!iret, "Failed to set linger %d\n", GetLastError()); - iret = WSARecv(dest, &bufs, 1, NULL, &flags, &ov, NULL); + iret = WSARecv(dest, bufs, 1, NULL, &flags, &ov, NULL); ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); - iret = WSARecv(dest, &bufs, 1, &bytesReturned, &flags, &ov, NULL); + iret = WSARecv(dest, bufs, 1, &bytesReturned, &flags, &ov, NULL); ok(iret == SOCKET_ERROR && GetLastError() == ERROR_IO_PENDING, "WSARecv failed - %d error %d\n", iret, GetLastError()); closesocket(src);

1 0

Jacek Caban : wininet: Improved netconn_drain_content.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 7b42dc4931201a078029fb35d51cb1d0c75e2d1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b42dc4931201a078029fb35d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Feb 27 15:20:26 2017 +0100 wininet: Improved netconn_drain_content. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 15 ++++++++------ dlls/wininet/tests/http.c | 52 +++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 55 insertions(+), 12 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 635b7d6..21b93dd 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -2682,17 +2682,20 @@ static BOOL netconn_drain_content(data_stream_t *stream, http_request_t *req) { netconn_stream_t *netconn_stream = (netconn_stream_t*)stream; BYTE buf[1024]; - int len; + int len, res; + size_t size; - if(netconn_end_of_data(stream, req)) - return TRUE; + if(netconn_stream->content_length == ~0u) + return FALSE; - do { - if(NETCON_recv(req->netconn, buf, sizeof(buf), FALSE, &len) != ERROR_SUCCESS) + while(netconn_stream->content_read < netconn_stream->content_length) { + size = min(sizeof(buf), netconn_stream->content_length-netconn_stream->content_read); + res = NETCON_recv(req->netconn, buf, size, FALSE, &len); + if(res || !len) return FALSE; netconn_stream->content_read += len; - }while(netconn_stream->content_read < netconn_stream->content_length); + } return TRUE; } diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index fb64e3c..6df30fa 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -4652,7 +4652,14 @@ static void _readex_expect_sync_data(unsigned line, HINTERNET req, DWORD flags, _readex_expect_sync_data_len(line, req, flags, buf, buf_size, exdata, strlen(exdata)); } -static void send_response_and_wait(const char *response, BOOL close_connection, INTERNET_BUFFERSW *buf) +static void close_connection(void) +{ + char c; + SetEvent(conn_wait_event); + recv(server_socket, &c, 1, 0); +} + +static void send_response_and_wait(const char *response, BOOL do_close_connection, INTERNET_BUFFERSW *buf) { DWORD orig_size = buf->dwBufferLength; @@ -4661,11 +4668,8 @@ static void send_response_and_wait(const char *response, BOOL close_connection, if(response) server_send_string(response); - if(close_connection) { - char c; - SetEvent(conn_wait_event); - recv(server_socket, &c, 1, 0); - } + if(do_close_connection) + close_connection(); WaitForSingleObject(hCompleteEvent, INFINITE); @@ -4821,6 +4825,41 @@ static void test_http_read(int port) CloseHandle(server_req_rec_event); } +static void test_connection_break(int port) +{ + INTERNET_BUFFERSW ib; + test_request_t req; + char buf[24000]; + + if(!is_ie7plus) + return; + + hCompleteEvent = CreateEventW(NULL, FALSE, FALSE, NULL); + conn_wait_event = CreateEventW(NULL, FALSE, FALSE, NULL); + server_req_rec_event = CreateEventW(NULL, FALSE, FALSE, NULL); + + memset(&ib, 0, sizeof(ib)); + ib.dwStructSize = sizeof(ib); + ib.lpvBuffer = buf; + + trace("Testing InternetReadFileExW on broken connection...\n"); + + open_read_test_request(port, &req, + "HTTP/1.1 200 OK\r\n" + "Server: winetest\r\n" + "Content-Length: 10000\r\n" + "\r\n" + "xx"); + + /* close connection and make sure that it's closed on handle release. */ + close_connection(); + SET_EXPECT(INTERNET_STATUS_CLOSING_CONNECTION); + SET_EXPECT(INTERNET_STATUS_CONNECTION_CLOSED); + close_async_handle(req.session, hCompleteEvent, 2); + CHECK_NOTIFIED(INTERNET_STATUS_CLOSING_CONNECTION); + CHECK_NOTIFIED(INTERNET_STATUS_CONNECTION_CLOSED); +} + static void test_long_url(int port) { char long_path[INTERNET_MAX_PATH_LENGTH*2] = "/echo_request?"; @@ -4919,6 +4958,7 @@ static void test_http_connection(void) test_basic_auth_credentials_reuse(si.port); test_async_read(si.port); test_http_read(si.port); + test_connection_break(si.port); test_long_url(si.port); test_remove_dot_segments(si.port);

1 0

Kim Malmo : po: Update Norwegian translation.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 42a62ad83920bcdeeddb67f8053eb0717cd63fa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a62ad83920bcdeeddb67f80… Author: Kim Malmo <berencamlost(a)msn.com> Date: Mon Feb 27 15:31:52 2017 +0000 po: Update Norwegian translation. Signed-off-by: Kim Malmo <berencamlost(a)msn.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/nb_NO.po | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/po/nb_NO.po b/po/nb_NO.po index da76ed9..3af4b72 100644 --- a/po/nb_NO.po +++ b/po/nb_NO.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2017-02-02 16:00+0100\n" +"PO-Revision-Date: 2017-02-27 16:00+0100\n" "Last-Translator: Kim Malmo <berencamlost(a)msn.com>\n" "Language-Team: Norwegian Bokmål <alexsornes(a)gmail.com>\n" "Language: nb_NO\n" @@ -12220,17 +12220,13 @@ msgid "Exports selected branch of the registry to a text file" msgstr "Eksporterer den valgte greinen av registeret til en tekstfil" #: regedit.rc:187 -#, fuzzy -#| msgid "Confirm Value Delete" msgid "Confirm Key Delete" -msgstr "Bekreft sletting av verdi" +msgstr "Bekreft sletting av nøkkel" #: regedit.rc:188 -#, fuzzy -#| msgid "Are you sure you want to delete the registry key '%1'?" msgid "" "Are you sure you want to delete the registry key '%1' and all of its subkeys?" -msgstr "Vil du virkelig slette registernøkkel \"%1\"?" +msgstr "Vil du virkelig slette registernøkkel \"%1\" og alle dens undernøkler?" #: regsvr32.rc:32 msgid ""

1 0

Piotr Caban : msvcr100: Add _NonReentrantBlockingLock class implementation.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 3d6ec3ea1948f8f1489683e1605aabfdd8e665c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6ec3ea1948f8f1489683e16… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:16:07 2017 +0100 msvcr100: Add _NonReentrantBlockingLock class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/concrt140/concrt140.spec | 20 ++++++++++---------- dlls/msvcr100/msvcr100.spec | 20 ++++++++++---------- dlls/msvcr110/msvcr110.spec | 30 +++++++++++++++--------------- dlls/msvcr120/msvcr120.spec | 30 +++++++++++++++--------------- dlls/msvcr120_app/msvcr120_app.spec | 30 +++++++++++++++--------------- 5 files changed, 65 insertions(+), 65 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3d6ec3ea1948f8f148968…

1 0

Piotr Caban : msvcr100: Add _ReentrantBlockingLock tests.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 0e7fa9006807fb95b28bf3ac9088614371463a81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e7fa9006807fb95b28bf3ac9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Feb 27 18:16:17 2017 +0100 msvcr100: Add _ReentrantBlockingLock tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/tests/msvcr100.c | 66 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 045d698..cdac1b9 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -134,6 +134,10 @@ typedef struct yield_func yield_func; } SpinWait; +typedef struct { + CRITICAL_SECTION cs; +} _ReentrantBlockingLock; + static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); @@ -163,6 +167,17 @@ static void (__thiscall *preader_writer_lock_unlock)(void*); static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock)(void*); static MSVCRT_bool (__thiscall *preader_writer_lock_try_lock_read)(void*); +static _ReentrantBlockingLock* (__thiscall *p_ReentrantBlockingLock_ctor)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock_dtor)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock__Acquire)(_ReentrantBlockingLock*); +static void (__thiscall *p_ReentrantBlockingLock__Release)(_ReentrantBlockingLock*); +static MSVCRT_bool (__thiscall *p_ReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); +static _ReentrantBlockingLock* (__thiscall *p_NonReentrantBlockingLock_ctor)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock_dtor)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock__Acquire)(_ReentrantBlockingLock*); +static void (__thiscall *p_NonReentrantBlockingLock__Release)(_ReentrantBlockingLock*); +static MSVCRT_bool (__thiscall *p_NonReentrantBlockingLock__TryAcquire)(_ReentrantBlockingLock*); + /* make sure we use the correct errno */ #undef errno #define errno (*p_errno()) @@ -211,6 +226,17 @@ static BOOL init(void) SET(preader_writer_lock_unlock, "?unlock(a)reader_writer_lock@Concurrency@@QEAAXXZ"); SET(preader_writer_lock_try_lock, "?try_lock(a)reader_writer_lock@Concurrency@@QEAA_NXZ"); SET(preader_writer_lock_try_lock_read, "?try_lock_read(a)reader_writer_lock@Concurrency@@QEAA_NXZ"); + + SET(p_ReentrantBlockingLock_ctor, "??0_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_ReentrantBlockingLock_dtor, "??1_ReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_ReentrantBlockingLock__Acquire, "?_Acquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_ReentrantBlockingLock__Release, "?_Release(a)_ReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_ReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ"); + SET(p_NonReentrantBlockingLock_ctor, "??0_NonReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_NonReentrantBlockingLock_dtor, "??1_NonReentrantBlockingLock(a)details@Concurrency@@QEAA(a)XZ"); + SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAAXXZ"); + SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QEAA_NXZ"); } else { SET(pSpinWait_ctor_yield, "??0?$_SpinWait@$00(a)details@Concurrency@@QAE(a)P6AXXZ@Z"); SET(pSpinWait_dtor, "??_F?$_SpinWait@$00(a)details@Concurrency@@QAEXXZ"); @@ -227,6 +253,17 @@ static BOOL init(void) SET(preader_writer_lock_unlock, "?unlock(a)reader_writer_lock@Concurrency@@QAEXXZ"); SET(preader_writer_lock_try_lock, "?try_lock(a)reader_writer_lock@Concurrency@@QAE_NXZ"); SET(preader_writer_lock_try_lock_read, "?try_lock_read(a)reader_writer_lock@Concurrency@@QAE_NXZ"); + + SET(p_ReentrantBlockingLock_ctor, "??0_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_ReentrantBlockingLock_dtor, "??1_ReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_ReentrantBlockingLock__Acquire, "?_Acquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_ReentrantBlockingLock__Release, "?_Release(a)_ReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_ReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_ReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ"); + SET(p_NonReentrantBlockingLock_ctor, "??0_NonReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_NonReentrantBlockingLock_dtor, "??1_NonReentrantBlockingLock(a)details@Concurrency@@QAE(a)XZ"); + SET(p_NonReentrantBlockingLock__Acquire, "?_Acquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_NonReentrantBlockingLock__Release, "?_Release(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAEXXZ"); + SET(p_NonReentrantBlockingLock__TryAcquire, "?_TryAcquire(a)_NonReentrantBlockingLock@details(a)Concurrency@@QAE_NXZ"); } init_thiscall_thunk(); @@ -640,6 +677,34 @@ static void test_reader_writer_lock(void) call_func1(preader_writer_lock_dtor, rw_lock); } +static void test__ReentrantBlockingLock(void) +{ + _ReentrantBlockingLock rbl; + MSVCRT_bool ret; + + call_func1(p_ReentrantBlockingLock_ctor, &rbl); + ret = call_func1(p_ReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_ReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_ReentrantBlockingLock__Acquire, &rbl); + ret = call_func1(p_ReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_ReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock__Release, &rbl); + call_func1(p_ReentrantBlockingLock_dtor, &rbl); + + call_func1(p_NonReentrantBlockingLock_ctor, &rbl); + ret = call_func1(p_NonReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_NonReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_NonReentrantBlockingLock__Acquire, &rbl); + ret = call_func1(p_NonReentrantBlockingLock__TryAcquire, &rbl); + ok(ret, "_NonReentrantBlockingLock__TryAcquire failed\n"); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock__Release, &rbl); + call_func1(p_NonReentrantBlockingLock_dtor, &rbl); +} + START_TEST(msvcr100) { if (!init()) @@ -652,4 +717,5 @@ START_TEST(msvcr100) test_atoi(); test__SpinWait(); test_reader_writer_lock(); + test__ReentrantBlockingLock(); }

1 0

Nikolay Sivov : gdiplus/tests: Fix region leak (Valgrind).
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 371c43550ca9724e241fa4dc5f12a3b4e7ce9873 URL: http://source.winehq.org/git/wine.git/?a=commit;h=371c43550ca9724e241fa4dc5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Feb 26 16:55:28 2017 +0300 gdiplus/tests: Fix region leak (Valgrind). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/region.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index e0ad48e..d4d8772 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -147,6 +147,8 @@ static void test_region_data(DWORD *data, UINT size, INT line) /* some Windows versions fail to properly clear the aligned DWORD */ ok_(__FILE__, line)(data[size - 1] == buf[size - 1] || broken(data[size - 1] != buf[size - 1]), "off %u: %#x != %#x\n", size - 1, data[size - 1], buf[size - 1]); + + GdipDeleteRegion(region); } static void test_getregiondata(void)

1 0

Huw Davies : dsound: Merge two identical allocation blocks.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: b47487af999f48ba2700b4dd5ff6cd47891d4787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b47487af999f48ba2700b4dd5… Author: Huw Davies <huw(a)codeweavers.com> Date: Sun Feb 26 17:42:22 2017 +0000 dsound: Merge two identical allocation blocks. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/primary.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index ed41a5c..b10ba02 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -238,19 +238,9 @@ static HRESULT DSOUND_PrimaryOpen(DirectSoundDevice *device, WAVEFORMATEX *wfx, mixfloat = TRUE; /* reallocate emulated primary buffer */ - if (forcewave) { - if (device->buffer) - newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen); - else - newbuf = HeapAlloc(GetProcessHeap(), 0, new_buflen); - - if (!newbuf) { - ERR("failed to allocate primary buffer\n"); - return DSERR_OUTOFMEMORY; - } - FillMemory(newbuf, new_buflen, (wfx->wBitsPerSample == 8) ? 128 : 0); - } else if (!mixfloat) { - new_buflen = frames * sizeof(float); + if (forcewave || !mixfloat) { + if (!forcewave) + new_buflen = frames * sizeof(float); if (device->buffer) newbuf = HeapReAlloc(GetProcessHeap(), 0, device->buffer, new_buflen);

1 0

Henri Verbeet : usp10: Introduce an enumeration for GSUB lookup types.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 66dce1e75f3cebfcd383921041eae4e9f04ec487 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66dce1e75f3cebfcd38392104… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 23 08:10:29 2017 +0100 usp10: Introduce an enumeration for GSUB lookup types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/opentype.c | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/dlls/usp10/opentype.c b/dlls/usp10/opentype.c index 1ad9c39..a1ad3dc 100644 --- a/dlls/usp10/opentype.c +++ b/dlls/usp10/opentype.c @@ -61,6 +61,18 @@ enum gpos_lookup_type GPOS_LOOKUP_POSITION_EXTENSION = 0x9, }; +enum gsub_lookup_type +{ + GSUB_LOOKUP_SINGLE = 0x1, + GSUB_LOOKUP_MULTIPLE = 0x2, + GSUB_LOOKUP_ALTERNATE = 0x3, + GSUB_LOOKUP_LIGATURE = 0x4, + GSUB_LOOKUP_CONTEXT = 0x5, + GSUB_LOOKUP_CONTEXT_CHAINED = 0x6, + GSUB_LOOKUP_EXTENSION = 0x7, + GSUB_LOOKUP_CONTEXT_CHAINED_REVERSE = 0x8, +}; + typedef struct { WORD platformID; WORD encodingID; @@ -851,7 +863,7 @@ static const BYTE *GSUB_get_subtable(const OT_LookupTable *look, int index) { int offset = GET_BE_WORD(look->SubTable[index]); - if (GET_BE_WORD(look->LookupType) == 7) + if (GET_BE_WORD(look->LookupType) == GSUB_LOOKUP_EXTENSION) { const GSUB_ExtensionPosFormat1 *ext = (const GSUB_ExtensionPosFormat1 *)((const BYTE *)look + offset); if (GET_BE_WORD(ext->SubstFormat) == 1) @@ -1423,14 +1435,16 @@ static INT GSUB_apply_ChainContextSubst(const OT_LookupList* lookup, const OT_Lo static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD *glyphs, INT glyph_index, INT write_dir, INT *glyph_count) { int offset; - int type; + enum gsub_lookup_type type; const OT_LookupTable *look; offset = GET_BE_WORD(lookup->Lookup[lookup_index]); look = (const OT_LookupTable*)((const BYTE*)lookup + offset); type = GET_BE_WORD(look->LookupType); - TRACE("type %i, flag %x, subtables %i\n",type,GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); - if (type == 7) + TRACE("type %#x, flag %#x, subtables %u.\n", type, + GET_BE_WORD(look->LookupFlag),GET_BE_WORD(look->SubTableCount)); + + if (type == GSUB_LOOKUP_EXTENSION) { if (GET_BE_WORD(look->SubTableCount)) { @@ -1452,23 +1466,23 @@ static INT GSUB_apply_lookup(const OT_LookupList* lookup, INT lookup_index, WORD } switch(type) { - case 1: + case GSUB_LOOKUP_SINGLE: return GSUB_apply_SingleSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 2: + case GSUB_LOOKUP_MULTIPLE: return GSUB_apply_MultipleSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 3: + case GSUB_LOOKUP_ALTERNATE: return GSUB_apply_AlternateSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 4: + case GSUB_LOOKUP_LIGATURE: return GSUB_apply_LigatureSubst(look, glyphs, glyph_index, write_dir, glyph_count); - case 5: + case GSUB_LOOKUP_CONTEXT: return GSUB_apply_ContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); - case 6: + case GSUB_LOOKUP_CONTEXT_CHAINED: return GSUB_apply_ChainContextSubst(lookup, look, glyphs, glyph_index, write_dir, glyph_count); - case 7: + case GSUB_LOOKUP_EXTENSION: FIXME("Extension Substitution types not valid here\n"); break; default: - FIXME("We do not handle SubType %i\n",type); + FIXME("Unhandled GSUB lookup type %#x.\n", type); } return GSUB_E_NOGLYPH; }

1 0

André Hentschel : oleaut32: Fix OleLoadPictureEx spec file entry.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: d90fcb426772316133279c0ae87f97055284da82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d90fcb426772316133279c0ae… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:06 2017 +0100 oleaut32: Fix OleLoadPictureEx spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/oleaut32.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/oleaut32/oleaut32.spec b/dlls/oleaut32/oleaut32.spec index 680a588..dccdb5f 100644 --- a/dlls/oleaut32/oleaut32.spec +++ b/dlls/oleaut32/oleaut32.spec @@ -377,7 +377,7 @@ 397 stub UserMSG_to_local 398 stub UserMSG_free_inst 399 stub UserMSG_free_local -401 stdcall OleLoadPictureEx(ptr long long long long long long ptr) +401 stdcall OleLoadPictureEx(ptr long long ptr long long long ptr) 402 stub OleLoadPictureFileEx 411 stdcall SafeArrayCreateVector(long long long) 412 stdcall SafeArrayCopyData(ptr ptr)

1 0

André Hentschel : msvcrt: Fix _CxxThrowException spec file entry.
by Alexandre Julliard Feb. 27, 2017

Feb. 27, 2017

Module: wine Branch: master Commit: 673ef69309347f5aacb1658027933bb66d66618e URL: http://source.winehq.org/git/wine.git/?a=commit;h=673ef69309347f5aacb165802… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri Feb 24 22:59:04 2017 +0100 msvcrt: Fix _CxxThrowException spec file entry. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt20/msvcrt20.spec | 2 +- dlls/msvcrt40/msvcrt40.spec | 2 +- dlls/msvcrtd/msvcrtd.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index d1cd0b4..741ca2e 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1,5 +1,5 @@ @ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo -@ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog @ cdecl _FindAndUnlinkFrame(ptr) ucrtbase._FindAndUnlinkFrame @ stub _GetImageBase diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6a70e83..915410b 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -523,7 +523,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _FindAndUnlinkFrame(ptr) @ cdecl _Getdays() diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 77a4ab6..32b1644 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -843,7 +843,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise @ cdecl _FindAndUnlinkFrame(ptr) diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index a447fde..e08aa33 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -826,7 +826,7 @@ @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ stub _Cbuild @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub -arch=arm _FPE_Raise @ stub _FCbuild diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 96413a0..d4601f8 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -820,7 +820,7 @@ @ cdecl -arch=i386 _CItanh() msvcr120._CItanh @ stub _Cbuild @ cdecl _CreateFrameInfo(ptr ptr) msvcr120._CreateFrameInfo -@ stdcall _CxxThrowException(long long) msvcr120._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcr120._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcr120._EH_prolog @ stub -arch=arm _FPE_Raise @ stub _FCbuild diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index ca3ff87..e67d5e2 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -108,7 +108,7 @@ @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 7e6d7c0..6411144 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -102,7 +102,7 @@ @ cdecl -arch=i386 _CItan() @ cdecl -arch=i386 _CItanh() @ cdecl _CRT_RTC_INIT(ptr ptr long long long) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d488651..d4821da 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -153,7 +153,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _FindAndUnlinkFrame(ptr) @ stub -arch=win64 _GetImageBase diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 0157f42..0dc60df 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -150,7 +150,7 @@ @ cdecl _CRT_RTC_INIT(ptr ptr long long long) @ cdecl _CRT_RTC_INITW(ptr ptr long long long) @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _FindAndUnlinkFrame(ptr) @ cdecl _Getdays() diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 589bc1d..a426d94 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -164,7 +164,7 @@ # stub _CrtSetReportHook # stub _CrtSetReportHook2 # stub _CrtSetReportMode -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ cdecl _Getdays() @ cdecl _Getmonths() diff --git a/dlls/msvcrt20/msvcrt20.spec b/dlls/msvcrt20/msvcrt20.spec index 2187843..dd7db71 100644 --- a/dlls/msvcrt20/msvcrt20.spec +++ b/dlls/msvcrt20/msvcrt20.spec @@ -790,7 +790,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcrt._CxxThrowException @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter @ cdecl -arch=i386,x86_64,arm -norelay __CxxFrameHandler(ptr ptr ptr ptr) msvcrt.__CxxFrameHandler diff --git a/dlls/msvcrt40/msvcrt40.spec b/dlls/msvcrt40/msvcrt40.spec index a1e14f8..17cbd78 100644 --- a/dlls/msvcrt40/msvcrt40.spec +++ b/dlls/msvcrt40/msvcrt40.spec @@ -864,7 +864,7 @@ @ cdecl -arch=i386 _CIsqrt() msvcrt._CIsqrt @ cdecl -arch=i386 _CItan() msvcrt._CItan @ cdecl -arch=i386 _CItanh() msvcrt._CItanh -@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcrt._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcrt._EH_prolog @ extern _HUGE msvcrt._HUGE @ cdecl _XcptFilter(long ptr) msvcrt._XcptFilter diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec index 34ad1d3..21312d2 100644 --- a/dlls/msvcrtd/msvcrtd.spec +++ b/dlls/msvcrtd/msvcrtd.spec @@ -116,7 +116,7 @@ @ stub _CrtSetReportFile @ cdecl _CrtSetReportHook(ptr) @ cdecl _CrtSetReportMode(long long) -@ stdcall _CxxThrowException(long long) msvcrt._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) msvcrt._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() msvcrt._EH_prolog @ cdecl _Getdays() msvcrt._Getdays @ cdecl _Getmonths() msvcrt._Getmonths diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 4bcd12e..6b349ee 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -18,7 +18,7 @@ @ stub _Cmulcc @ stub _Cmulcr @ cdecl _CreateFrameInfo(ptr ptr) -@ stdcall _CxxThrowException(long long) +@ stdcall _CxxThrowException(ptr ptr) @ cdecl -arch=i386 -norelay _EH_prolog() @ stub _Exit @ stub _FCbuild diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index 1b9f3f9..fe8ae75 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -1,5 +1,5 @@ @ cdecl _CreateFrameInfo(ptr ptr) ucrtbase._CreateFrameInfo -@ stdcall _CxxThrowException(long long) ucrtbase._CxxThrowException +@ stdcall _CxxThrowException(ptr ptr) ucrtbase._CxxThrowException @ cdecl -arch=i386 -norelay _EH_prolog() ucrtbase._EH_prolog @ cdecl _FindAndUnlinkFrame(ptr) ucrtbase._FindAndUnlinkFrame @ cdecl _IsExceptionObjectToBeDestroyed(ptr) ucrtbase._IsExceptionObjectToBeDestroyed

1 0