- Wine-Commits - list.winehq.org

Michael Stefaniuc : Release 7.0.2.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Alexandre Julliard : gitlab: Add workaround for more strict git ownership check.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Paul Gofman : winhttp/tests: Avoid race condition on closing connection in server_thread().
by Alexandre Julliard March 27, 2023

March 27, 2023

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

David Curtiss : ws2_32: Allow getsockname after AcceptEx.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Rémi Bernon : server: Avoid using pointer value after realloc.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Eric Pouech : winedbg: Fix retrieving integral values.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Zebediah Figura : libwine: Avoid comparing the result of pointer arithmetic to zero.
by Alexandre Julliard March 27, 2023

March 27, 2023

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

Piotr Caban : msvcrt: Fix _wputenv_s invalid argument handling.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 43b190c7075ddaab7584a8668c194d7cd593a64d URL: https://gitlab.winehq.org/wine/wine/-/commit/43b190c7075ddaab7584a8668c194d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Sat Oct 22 14:32:30 2022 +0200 msvcrt: Fix _wputenv_s invalid argument handling. (cherry picked from commit f943d4497226e69265a8a278f5795756ba1b2f47) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/environ.c | 4 ++-- dlls/msvcrt/tests/environ.c | 39 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 39 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 5c4db668be3..fbde7dbbed6 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -197,8 +197,8 @@ errno_t CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); - if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; - if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; + if (!MSVCRT_CHECK_PMT(name != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(value != NULL)) return EINVAL; if (!SetEnvironmentVariableW(name, value[0] ? value : NULL)) { diff --git a/dlls/msvcrt/tests/environ.c b/dlls/msvcrt/tests/environ.c index 62e4f3133cf..03129dcbf14 100644 --- a/dlls/msvcrt/tests/environ.c +++ b/dlls/msvcrt/tests/environ.c @@ -19,6 +19,7 @@ */ #include "wine/test.h" +#include <errno.h> #include <stdlib.h> #include <process.h> @@ -45,8 +46,10 @@ static const char *a_very_long_env_string = static char ***(__cdecl *p__p__environ)(void); static WCHAR ***(__cdecl *p__p__wenviron)(void); -static void (*p_get_environ)(char ***); -static void (*p_get_wenviron)(WCHAR ***); +static void (__cdecl *p_get_environ)(char ***); +static void (__cdecl *p_get_wenviron)(WCHAR ***); +static errno_t (__cdecl *p_putenv_s)(const char*, const char*); +static errno_t (__cdecl *p_wputenv_s)(const wchar_t*, const wchar_t*); static char ***p_environ; static WCHAR ***p_wenviron; @@ -61,6 +64,8 @@ static void init(void) p_wenviron = (void *)GetProcAddress(hmod, "_wenviron"); p_get_environ = (void *)GetProcAddress(hmod, "_get_environ"); p_get_wenviron = (void *)GetProcAddress(hmod, "_get_wenviron"); + p_putenv_s = (void *)GetProcAddress(hmod, "_putenv_s"); + p_wputenv_s = (void *)GetProcAddress(hmod, "_wputenv_s"); } static void test_system(void) @@ -237,6 +242,8 @@ static void test__wenviron(void) static void test_environment_manipulation(void) { + errno_t ret; + ok( _putenv("cat=") == 0, "_putenv failed on deletion of nonexistent environment variable\n" ); ok( _putenv("cat=dog") == 0, "failed setting cat=dog\n" ); ok( strcmp(getenv("cat"), "dog") == 0, "getenv did not return 'dog'\n" ); @@ -247,6 +254,34 @@ static void test_environment_manipulation(void) ok( _putenv(a_very_long_env_string) == 0, "_putenv failed for long environment string\n"); ok( getenv("nonexistent") == NULL, "getenv should fail with nonexistent var name\n" ); + + if (p_putenv_s) + { + ret = p_putenv_s(NULL, "dog"); + ok( ret == EINVAL, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("cat", NULL); + ok( ret == EINVAL, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("a=b", NULL); + ok( ret == EINVAL, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("cat", "a=b"); + ok( !ret, "_putenv_s returned %d\n", ret); + ret = p_putenv_s("cat", ""); + ok( !ret, "_putenv_s returned %d\n", ret); + } + + if (p_wputenv_s) + { + ret = p_wputenv_s(NULL, L"dog"); + ok( ret == EINVAL, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"cat", NULL); + ok( ret == EINVAL, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"a=b", NULL); + ok( ret == EINVAL, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"cat", L"a=b"); + ok( !ret, "_wputenv_s returned %d\n", ret); + ret = p_wputenv_s(L"cat", L""); + ok( !ret, "_wputenv_s returned %d\n", ret); + } } START_TEST(environ)

1 0

Robert Wilhelm : scrrun: Avoid memory leak in error case.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: 7398ee371ab1dd9465fcb12eb12dd1963cc0eab7 URL: https://gitlab.winehq.org/wine/wine/-/commit/7398ee371ab1dd9465fcb12eb12dd1… Author: Robert Wilhelm <robert.wilhelm(a)gmx.net> Date: Fri Aug 19 11:02:01 2022 +0200 scrrun: Avoid memory leak in error case. (cherry picked from commit ccc001ee4379d74d6dd04269532e1d824cc85763) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/scrrun/filesystem.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/scrrun/filesystem.c b/dlls/scrrun/filesystem.c index 28636800131..38a21443ff2 100644 --- a/dlls/scrrun/filesystem.c +++ b/dlls/scrrun/filesystem.c @@ -3328,7 +3328,11 @@ static HRESULT WINAPI filesys_GetTempName(IFileSystem3 *iface, BSTR *result) return E_OUTOFMEMORY; if(!RtlGenRandom(&random, sizeof(random))) + { + SysFreeString(*result); return E_FAIL; + } + swprintf(*result, 13, L"rad%05X.tmp", random & 0xfffff); return S_OK; }

1 0

Piotr Caban : msvcrt: Fix _wputenv_s return value on error.
by Alexandre Julliard March 27, 2023

March 27, 2023

Module: wine Branch: oldstable Commit: d4a998f795bd354284abc451f256facbdf192228 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4a998f795bd354284abc451f256fa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Oct 21 13:30:19 2022 +0200 msvcrt: Fix _wputenv_s return value on error. (cherry picked from commit f0e6447b7fc10c21bf6aa04f70a5094f16a294a5) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/environ.c | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 698dc761381..5e07fe5e367 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -186,19 +186,24 @@ int CDECL _putenv_s(const char *name, const char *value) /********************************************************************* * _wputenv_s (MSVCRT.@) */ -int CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) +errno_t CDECL _wputenv_s(const wchar_t *name, const wchar_t *value) { - int ret; + errno_t ret = 0; TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); if (!MSVCRT_CHECK_PMT(name != NULL)) return -1; if (!MSVCRT_CHECK_PMT(value != NULL)) return -1; - ret = SetEnvironmentVariableW(name, value[0] ? value : NULL) ? 0 : -1; - - /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ - if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + if (!SetEnvironmentVariableW(name, value[0] ? value : NULL)) + { + /* _putenv returns success on deletion of nonexistent variable */ + if (GetLastError() != ERROR_ENVVAR_NOT_FOUND) + { + msvcrt_set_errno(GetLastError()); + ret = *_errno(); + } + } MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron);

1 0