March 2023 - Wine-commits - list.winehq.org

Zebediah Figura : libwine: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: b480fb86953a4f397e2b850d1839fe4411ce6b82 URL: https://gitlab.winehq.org/wine/wine/-/commit/b480fb86953a4f397e2b850d1839fe… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Thu Sep 15 23:15:30 2022 -0500 libwine: Avoid comparing the result of pointer arithmetic to zero. gcc warns about this: ../wine/libs/wine/mmap.c: In function ‘wine_mmap_add_reserved_area_obsolete’: ../wine/libs/wine/mmap.c:504:9: error: the comparison will always evaluate as ‘true’ for the pointer operand in ‘(char *)addr + (sizetype)size’ must not be NULL [-Werror=address] 504 | if (!((char *)addr + size)) size--; /* avoid wrap-around */ | ^ (cherry picked from commit d17fe0a7920c09a16e75b74213ae0e8bbbd1cba0) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- libs/wine/mmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/wine/mmap.c b/libs/wine/mmap.c index ad51153d039..1f8ae3c7720 100644 --- a/libs/wine/mmap.c +++ b/libs/wine/mmap.c @@ -501,7 +501,7 @@ void wine_mmap_add_reserved_area_obsolete( void *addr, size_t size ) struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ LIST_FOR_EACH( ptr, &reserved_areas ) { @@ -560,7 +560,7 @@ void wine_mmap_remove_reserved_area_obsolete( void *addr, size_t size, int unmap struct reserved_area *area; struct list *ptr; - if (!((char *)addr + size)) size--; /* avoid wrap-around */ + if (!((intptr_t)addr + size)) size--; /* avoid wrap-around */ ptr = list_head( &reserved_areas ); /* find the first area covering address */

1 0

Eric Pouech : winedbg: Fix retrieving integral values.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 8799d50cc8a2e761c9d8b673b4b7f8d4551198f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/8799d50cc8a2e761c9d8b673b4b7f8… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Fri May 20 17:03:27 2022 +0200 winedbg: Fix retrieving integral values. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> (cherry picked from commit 685126e85711131c4a7b02bd612111a22fd5f53c) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/winedbg/types.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/programs/winedbg/types.c b/programs/winedbg/types.c index 1383f025430..60d9b8035aa 100644 --- a/programs/winedbg/types.c +++ b/programs/winedbg/types.c @@ -91,11 +91,15 @@ dbg_lgint_t types_extract_as_lgint(const struct dbg_lvalue* lvalue, switch (bt) { case btChar: + case btWChar: + case btBool: case btInt: + case btLong: if (!memory_fetch_integer(lvalue, (unsigned)size, s = TRUE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break; case btUInt: + case btULong: if (!memory_fetch_integer(lvalue, (unsigned)size, s = FALSE, &rtn)) RaiseException(DEBUG_STATUS_INTERNAL_ERROR, 0, 0, NULL); break;

1 0

Rémi Bernon : server: Avoid using pointer value after realloc.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 4cf98d91cfe025ea76d907aa04769e50da3147ed URL: https://gitlab.winehq.org/wine/wine/-/commit/4cf98d91cfe025ea76d907aa04769e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 22 18:53:54 2022 +0200 server: Avoid using pointer value after realloc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit c57eda2432fc81b29a631c0296831220792c8380) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- server/queue.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/server/queue.c b/server/queue.c index 4f69a082b74..29c90b60f8c 100644 --- a/server/queue.c +++ b/server/queue.c @@ -3310,15 +3310,14 @@ DECL_HANDLER(get_cursor_history) DECL_HANDLER(get_rawinput_buffer) { struct thread_input *input = current->queue->input; - data_size_t size = 0, next_size = 0; + data_size_t size = 0, next_size = 0, pos = 0; struct list *ptr; - char *buf, *cur, *tmp; + char *buf, *tmp; int count = 0, buf_size = 16 * sizeof(struct hardware_msg_data); if (!req->buffer_size) buf = NULL; else if (!(buf = mem_alloc( buf_size ))) return; - cur = buf; ptr = list_head( &input->msg_list ); while (ptr) { @@ -3331,31 +3330,31 @@ DECL_HANDLER(get_rawinput_buffer) next_size = req->rawinput_size + extra_size; if (size + next_size > req->buffer_size) break; - if (cur + data->size > buf + get_reply_max_size()) break; - if (cur + data->size > buf + buf_size) + if (pos + data->size > get_reply_max_size()) break; + if (pos + data->size > buf_size) { buf_size += buf_size / 2 + extra_size; if (!(tmp = realloc( buf, buf_size ))) { + free( buf ); set_error( STATUS_NO_MEMORY ); return; } - cur = tmp + (cur - buf); buf = tmp; } - memcpy( cur, data, data->size ); + memcpy( buf + pos, data, data->size ); list_remove( &msg->entry ); free_message( msg ); size += next_size; - cur += sizeof(*data); + pos += sizeof(*data); count++; } reply->next_size = next_size; reply->count = count; - set_reply_data_ptr( buf, cur - buf ); + set_reply_data_ptr( buf, pos ); } DECL_HANDLER(update_rawinput_devices)

1 0

David Curtiss : ws2_32: Allow getsockname after AcceptEx.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 88c2d88df0e5ca94dccf50fb521b459359e0b98e URL: https://gitlab.winehq.org/wine/wine/-/commit/88c2d88df0e5ca94dccf50fb521b45… Author: David Curtiss <david.curtiss(a)ni.com> Date: Mon Jun 6 15:34:12 2022 -0500 ws2_32: Allow getsockname after AcceptEx. .NET 6's HTTP/Socket code queries this. Winsock allows getsockname on the AcceptEx AcceptSocket, but only if SO_UPDATE_ACCEPT_CONTEXT is set. Signed-off-by: David Curtiss <david.curtiss(a)ni.com> (cherry picked from commit 68d4643a6758cbe87f90054fdcabf0558fc353ca) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 9 +++++++++ server/sock.c | 1 + 2 files changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 09ec6009c3f..23b50117c58 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7507,6 +7507,15 @@ todo_wine ok(bret, "GetOverlappedResult failed, error %d\n", GetLastError()); ok(bytesReturned == 0, "bytesReturned isn't supposed to be %d\n", bytesReturned); + /* Try to call getsockname on the acceptor socket. + * + * On Windows, this requires setting SO_UPDATE_ACCEPT_CONTEXT. */ + iret = setsockopt(acceptor, SOL_SOCKET, SO_UPDATE_ACCEPT_CONTEXT, (char *)&listener, sizeof(SOCKET)); + ok(!iret, "Failed to set accept context %d\n", GetLastError()); + iret = getsockname(acceptor, (struct sockaddr *)&peerAddress, &remoteSize); + ok(!iret, "getsockname failed.\n"); + ok(remoteSize == sizeof(struct sockaddr_in), "got remote size %u\n", remoteSize); + closesocket(connector); connector = INVALID_SOCKET; closesocket(acceptor); diff --git a/server/sock.c b/server/sock.c index 650e67a2e0a..af756a45c42 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1785,6 +1785,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) } acceptsock->state = SOCK_CONNECTED; + acceptsock->bound = 1; acceptsock->pending_events = 0; acceptsock->reported_events = 0; acceptsock->proto = sock->proto;

1 0

Paul Gofman : winhttp/tests: Avoid race condition on closing connection in server_thread().
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 7bd2197b60cc91666e161220e8e8a765bb8292d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/7bd2197b60cc91666e161220e8e8a7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Nov 17 14:58:38 2022 -0600 winhttp/tests: Avoid race condition on closing connection in server_thread(). The connection may be cached and checked for availability for request before the server thread closes it. (cherry picked from commit f75a8b3555a8db6276a2edea587d1a1a043b36df) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/winhttp/tests/notification.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/tests/notification.c b/dlls/winhttp/tests/notification.c index 72cef89a618..f28ea1d1d5a 100644 --- a/dlls/winhttp/tests/notification.c +++ b/dlls/winhttp/tests/notification.c @@ -858,7 +858,7 @@ struct server_info }; static int server_socket; -static HANDLE server_socket_available, server_socket_done; +static HANDLE server_socket_available, server_socket_closed, server_socket_done; static DWORD CALLBACK server_thread(LPVOID param) { @@ -893,7 +893,7 @@ static DWORD CALLBACK server_thread(LPVOID param) do { if (c == -1) c = accept(s, NULL, NULL); - + ResetEvent(server_socket_closed); memset(buffer, 0, sizeof buffer); for(i = 0; i < sizeof buffer - 1; i++) { @@ -920,6 +920,7 @@ static DWORD CALLBACK server_thread(LPVOID param) } shutdown(c, 2); closesocket(c); + SetEvent(server_socket_closed); c = -1; } while (!last_request); @@ -1206,6 +1207,7 @@ static void test_persistent_connection(int port) SetEvent( server_socket_done ); CloseHandle( info.wait ); + WaitForSingleObject( server_socket_closed, INFINITE ); } struct test_recursion_context @@ -1390,6 +1392,7 @@ START_TEST (notification) ok(thread != NULL, "failed to create thread %u\n", GetLastError()); server_socket_available = CreateEventW( NULL, 0, 0, NULL ); + server_socket_closed = CreateEventW( NULL, 0, 0, NULL ); server_socket_done = CreateEventW( NULL, 0, 0, NULL ); ret = WaitForSingleObject( si.event, 10000 ); @@ -1409,4 +1412,5 @@ START_TEST (notification) CloseHandle( thread ); CloseHandle( server_socket_available ); CloseHandle( server_socket_done ); + CloseHandle( server_socket_closed ); }

1 0

Alexandre Julliard : gitlab: Add workaround for more strict git ownership check.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: a4916aa2417a605268c8f077911075cb5726503f URL: https://gitlab.winehq.org/wine/wine/-/commit/a4916aa2417a605268c8f077911075… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Mar 10 09:33:13 2023 +0100 gitlab: Add workaround for more strict git ownership check. (cherry picked from commit 7af84c79a19afe1476c401f9be93dc6ef8ae56fb) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- tools/gitlab/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/gitlab/build.yml b/tools/gitlab/build.yml index 3cdc731467a..32608ffb80e 100644 --- a/tools/gitlab/build.yml +++ b/tools/gitlab/build.yml @@ -21,6 +21,7 @@ - export CCACHE_DIR="$BASEDIR/ccache" - export CCACHE_COMPILERCHECK=content - export PATH="/usr/lib/ccache:$PATH" + - git config --global --add safe.directory $CI_PROJECT_DIR - mkdir -p build32 build64 - rm -fr .git/rebase-merge # in case a previous CI run failed in git rebase

1 0

Michael Stefaniuc : Release 7.0.2.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 229d05a8541659da75ea7ea39e54fc3639c3a215 URL: https://gitlab.winehq.org/wine/wine/-/commit/229d05a8541659da75ea7ea39e54fc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Tue Mar 14 22:21:16 2023 +0100 Release 7.0.2. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- ANNOUNCE | 448 +++++++++++++++++++++++++++++++------------------------------- AUTHORS | 4 + VERSION | 2 +- configure | 26 ++-- 4 files changed, 239 insertions(+), 241 deletions(-)

1 0

Huw Davies : nsi: Use the correct members for the error and discard counts.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 24c5f4f147e90ac0749396d493f4f825d0c24ce3 URL: https://gitlab.winehq.org/wine/wine/-/commit/24c5f4f147e90ac0749396d493f4f8… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 10 14:10:54 2022 -0500 nsi: Use the correct members for the error and discard counts. Wine-Bug: https://bugs.winehq.org//show_bug.cgi?id=53234 (cherry picked from commit 673da9cdecd8fed165bc467ece59c7d0ff24a403) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- include/wine/nsi.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/wine/nsi.h b/include/wine/nsi.h index b8e59c7bf54..916a92a549c 100644 --- a/include/wine/nsi.h +++ b/include/wine/nsi.h @@ -54,11 +54,9 @@ struct nsi_ndis_ifinfo_dynamic DWORD mtu; ULONG64 xmit_speed; ULONG64 rcv_speed; - ULONG64 in_errors; + ULONG64 unk2[3]; ULONG64 in_discards; - ULONG64 out_errors; - ULONG64 out_discards; - ULONG64 unk2; + ULONG64 in_errors; ULONG64 in_octets; ULONG64 in_ucast_pkts; ULONG64 in_mcast_pkts; @@ -67,7 +65,8 @@ struct nsi_ndis_ifinfo_dynamic ULONG64 out_ucast_pkts; ULONG64 out_mcast_pkts; ULONG64 out_bcast_pkts; - ULONG64 unk3[2]; + ULONG64 out_errors; + ULONG64 out_discards; ULONG64 in_ucast_octs; ULONG64 in_mcast_octs; ULONG64 in_bcast_octs;

1 0

David Kahurani : win32u: Use allocator mechanism to allocate DC attributes.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 9e9152843bba79a62fc4ed99f84a5b0bd5d49fef URL: https://gitlab.winehq.org/wine/wine/-/commit/9e9152843bba79a62fc4ed99f84a5b… Author: David Kahurani <k.kahurani(a)gmail.com> Date: Mon Sep 19 10:58:45 2022 +0300 win32u: Use allocator mechanism to allocate DC attributes. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53645 (cherry picked from commit 903c91fc60aa7f3da127ab81e2c27844eec9bcdd) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/win32u/dc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 3aae73779e9..ca0b08fa2d3 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -548,7 +548,7 @@ INT WINAPI NtGdiSaveDC( HDC hdc ) release_dc_ptr( dc ); return 0; } - if (!(newdc->attr = calloc( 1, sizeof(*newdc->attr) ))) + if (!(newdc->attr = alloc_dc_attr() )) { free( newdc ); release_dc_ptr( dc );

1 0

Alistair Leslie-Hughes : odbc: SQLGetInfoW allow NULL parameter InfoValue.
by Alexandre Julliard 27 Mar '23

27 Mar '23

Module: wine Branch: oldstable Commit: 87ce92d1a7c2e4ed3fd8d98b165cc23d9f0307d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/87ce92d1a7c2e4ed3fd8d98b165cc2… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Sat Sep 24 17:01:35 2022 +1000 odbc: SQLGetInfoW allow NULL parameter InfoValue. MSDN states, a NULL InfoValue parameter will return as the length. unixODBC which we currently use, handles this scenario. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53714 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> (cherry picked from commit e8b7c1da6cc7de8374c02df126719844e4744bb5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/odbc32/proxyodbc.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 573a5b280a2..d60c2518736 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -1041,12 +1041,6 @@ SQLRETURN WINAPI SQLGetInfo(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQL TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); - if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfo, &params ); TRACE("Returning %d\n", ret); return ret; @@ -2246,12 +2240,6 @@ SQLRETURN WINAPI SQLGetInfoW(SQLHDBC ConnectionHandle, SQLUSMALLINT InfoType, SQ TRACE("(ConnectionHandle, %p, InfoType %d, InfoValue %p, BufferLength %d, StringLength %p)\n", ConnectionHandle, InfoType, InfoValue, BufferLength, StringLength); - if (!InfoValue) - { - WARN("Unexpected NULL InfoValue address\n"); - return SQL_ERROR; - } - ret = ODBC_CALL( SQLGetInfoW, &params ); TRACE("Returning %d\n", ret); return ret;

1 0