- Wine-Devel - list.winehq.org

[PATCH 1/4] ws2_32/tests: Test selecting the same socket twice.
by Zebediah Figura Dec. 29, 2021

Dec. 29, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/sock.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a678f619342..95f858a86e3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -3325,6 +3325,16 @@ static void test_select(void) ok(ret == 1, "select returned %d\n", ret); ok(FD_ISSET(fdWrite, &writefds), "fdWrite socket is not in the set\n"); + /* select the same socket twice */ + writefds.fd_count = 2; + writefds.fd_array[0] = fdWrite; + writefds.fd_array[1] = fdWrite; + ret = select(0, NULL, &writefds, NULL, &select_timeout); + ok(ret == 1, "select returned %d\n", ret); + ok(writefds.fd_count == 1, "got count %u\n", writefds.fd_count); + ok(writefds.fd_array[0] == fdWrite, "got fd %#Ix\n", writefds.fd_array[0]); + ok(writefds.fd_array[1] == fdWrite, "got fd %#Ix\n", writefds.fd_array[1]); + /* tests for overlapping fd_set pointers */ FD_ZERO(&readfds); FD_SET(fdWrite, &readfds); -- 2.34.1

2 7

[PATCH] po: Update on Brazilian Portuguese
by Roberto Pungartnik Dec. 29, 2021

Dec. 29, 2021

2 1

[PATCH] wininet: Do not call InternetUnlockRequestFile when locking failed.
by Robert Wilhelm Dec. 29, 2021

Dec. 29, 2021

This should fix crashes on W10L vms, when we pass NULL to InternetUnlockRequestFile after prior lock already failed. Crashes are here: https://test.winehq.org/data/tests/wininet:http.html Behavior after crash is here: https://testbot.winehq.org/JobDetails.pl?Key=104580 Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/wininet/tests/http.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index cf3f62f868a..ee56c64fbd9 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -1718,10 +1718,13 @@ static void InternetLockRequestFile_test(void) ret = InternetLockRequestFile(req.request, &lock2); ok(ret, "InternetLockRequestFile returned: %x(%u)\n", ret, GetLastError()); + ok(lock2 != NULL, "lock2 == NULL\n"); ok(lock == lock2, "lock != lock2\n"); - ret = InternetUnlockRequestFile(lock2); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + if (lock2) { + ret = InternetUnlockRequestFile(lock2); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); @@ -1731,8 +1734,12 @@ static void InternetLockRequestFile_test(void) ret = DeleteFileA(file_name); ok(!ret && GetLastError() == ERROR_SHARING_VIOLATION, "Deleting file returned %x(%u)\n", ret, GetLastError()); - ret = InternetUnlockRequestFile(lock); - ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + ok(lock != NULL, "lock == 0\n"); + if (lock) + { + ret = InternetUnlockRequestFile(lock); + ok(ret, "InternetUnlockRequestFile failed: %u\n", GetLastError()); + } ret = DeleteFileA(file_name); ok(ret, "Deleting file returned %x(%u)\n", ret, GetLastError()); -- 2.31.1

3 2

[PATCH 01/10] loader: Use long instead of int for syscall return type in i386 code.
by Jinoh Kang Dec. 29, 2021

Dec. 29, 2021

Although int = long effectively in i386, this makes it clear that a machine word-width value is being returned. Also, future patches adding syscalls returning pointers can use the same type (long) for return value consistently. While we're at it, slightly change SYSCALL_RET function macro to include the parameter only once. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- loader/preloader.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/loader/preloader.c b/loader/preloader.c index 585be50624f..cb20afd4d5a 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -236,7 +236,7 @@ __ASM_GLOBAL_FUNC(_start, /* wrappers for Linux system calls */ -#define SYSCALL_RET(ret) (((ret) < 0 && (ret) > -4096) ? -1 : (ret)) +#define SYSCALL_RET(ret) (((unsigned long)(ret) > -4096UL) ? -1 : (ret)) static inline __attribute__((noreturn)) void wld_exit( int code ) { @@ -247,7 +247,7 @@ static inline __attribute__((noreturn)) void wld_exit( int code ) static inline int wld_open( const char *name, int flags ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (5 /* SYS_open */), "r" (name), "c" (flags) ); return SYSCALL_RET(ret); @@ -255,7 +255,7 @@ static inline int wld_open( const char *name, int flags ) static inline int wld_close( int fd ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (6 /* SYS_close */), "r" (fd) ); return SYSCALL_RET(ret); @@ -263,7 +263,7 @@ static inline int wld_close( int fd ) static inline ssize_t wld_read( int fd, void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (3 /* SYS_read */), "r" (fd), "c" (buffer), "d" (len) @@ -273,7 +273,7 @@ static inline ssize_t wld_read( int fd, void *buffer, size_t len ) static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (4 /* SYS_write */), "r" (fd), "c" (buffer), "d" (len) ); return SYSCALL_RET(ret); @@ -281,7 +281,7 @@ static inline ssize_t wld_write( int fd, const void *buffer, size_t len ) static inline int wld_mprotect( const void *addr, size_t len, int prot ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (125 /* SYS_mprotect */), "r" (addr), "c" (len), "d" (prot) ); return SYSCALL_RET(ret); @@ -328,7 +328,7 @@ __ASM_GLOBAL_FUNC(wld_mmap, static inline int wld_prctl( int code, long arg ) { - int ret; + long ret; __asm__ __volatile__( "pushl %%ebx; movl %2,%%ebx; int $0x80; popl %%ebx" : "=a" (ret) : "0" (172 /* SYS_prctl */), "r" (code), "c" (arg) ); return SYSCALL_RET(ret); -- 2.31.1

3 11

[PATCH] MAINTAINERS: Updating my email address.
by Esme Povirk Dec. 29, 2021

Dec. 29, 2021

Signed-off-by: Esme Povirk <esme(a)codeweavers.com> --- MAINTAINERS | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index d1f92c3a50b..97f9c78ae21 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -53,7 +53,7 @@ P: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/comctl32/ Common Item Dialog -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/comdlg32/itemdlg.c F: dlls/comdlg32/tests/itemdlg.c @@ -118,7 +118,7 @@ M: Nikolay Sivov <nsivov(a)codeweavers.com> F: dlls/dwrite/ DotNet Runtime -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/mscoree/ GDI @@ -146,7 +146,7 @@ F: dlls/win32u/printdrv.c F: dlls/win32u/region.c GDIPlus -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/gdiplus/ GPhoto Driver @@ -240,7 +240,7 @@ F: dlls/ole32/marshal.c F: dlls/ole32/usrmarshal.c OLE Storage -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/ole32/filelockbytes.c F: dlls/ole32/memlockbytes.c F: dlls/ole32/stg_stream.c @@ -280,7 +280,7 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: dlls/rpcrt4 TWAIN -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> F: dlls/twain_32/ F: dlls/sane.ds/ F: dlls/gphoto2.ds/ @@ -314,9 +314,10 @@ P: Zebediah Figura <z.figura12(a)gmail.com> F: tools/widl Windows Imaging Component -M: Esme Povirk <vincent(a)codeweavers.com> +M: Esme Povirk <esme(a)codeweavers.com> F: dlls/windowscodecs/ F: dlls/windowscodecsext/ +F: dlls/wmphoto/ Windows Management Instrumentation M: Hans Leidekker <hans(a)codeweavers.com> @@ -376,7 +377,7 @@ P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> P: Jacek Caban <jacek(a)codeweavers.com> -P: Esme Povirk <vincent(a)codeweavers.com> +P: Esme Povirk <esme(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com> F: * F: */ -- 2.30.2

1 0

[PATCH] ntdll/env: RtlCreateProcessParametersEx: Don't add unnecessary padding
by Keno Fischer Dec. 29, 2021

Dec. 29, 2021

RtlCreateProcessParametersEx tries to align all strings to either 8 or 4 byte boundaries (it seems wine and various windows versions disagree about which). However, using the previous algorithm, we would adding padding bytes for the alignment of the Environment, even if no Environment was specified. Windows does not add these padding bytes and in fact we were testing that they are not present. Prior to this patch, I am seeing the following test failure locally: env.c:461: Test failed: wrong end ptr 00000000002427D6/00000000002427D8 This patch fixes the issue by not allocating the superfluous padding bytes, matching the Windows behavior and fixing the test. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- dlls/ntdll/env.c | 42 ++++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/env.c b/dlls/ntdll/env.c index bb8931a556b..454ca4c234d 100644 --- a/dlls/ntdll/env.c +++ b/dlls/ntdll/env.c @@ -499,6 +499,11 @@ PRTL_USER_PROCESS_PARAMETERS WINAPI RtlDeNormalizeProcessParams( RTL_USER_PROCES #define ROUND_SIZE(size) (((size) + sizeof(void *) - 1) & ~(sizeof(void *) - 1)) +static void *align_ptr(void *ptr) +{ + return (void*)(((UINT_PTR)ptr + sizeof(void *) - 1) & ~(sizeof(void *) - 1)); +} + /* append a unicode string to the process params data; helper for RtlCreateProcessParameters */ static void append_unicode_string( void **data, const UNICODE_STRING *src, UNICODE_STRING *dst ) @@ -507,13 +512,19 @@ static void append_unicode_string( void **data, const UNICODE_STRING *src, dst->MaximumLength = src->MaximumLength; if (dst->MaximumLength) { - dst->Buffer = *data; + dst->Buffer = align_ptr( *data ); memcpy( dst->Buffer, src->Buffer, dst->Length ); - *data = (char *)dst->Buffer + ROUND_SIZE( dst->MaximumLength ); + *data = (char *)dst->Buffer + dst->MaximumLength; } else dst->Buffer = NULL; } +static void add_rounded_size(SIZE_T *size, SIZE_T new_size) +{ + if (new_size) { + *size = ROUND_SIZE(*size) + new_size; + } +} /****************************************************************************** * RtlCreateProcessParametersEx [NTDLL.@] @@ -556,17 +567,20 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu if (!ShellInfo) ShellInfo = &empty_str; if (!RuntimeInfo) RuntimeInfo = &null_str; - if (Environment) env_size = get_env_length( Environment ) * sizeof(WCHAR); - - size = (sizeof(RTL_USER_PROCESS_PARAMETERS) - + ROUND_SIZE( ImagePathName->MaximumLength ) - + ROUND_SIZE( DllPath->MaximumLength ) - + ROUND_SIZE( curdir.MaximumLength ) - + ROUND_SIZE( CommandLine->MaximumLength ) - + ROUND_SIZE( WindowTitle->MaximumLength ) - + ROUND_SIZE( Desktop->MaximumLength ) - + ROUND_SIZE( ShellInfo->MaximumLength ) - + ROUND_SIZE( RuntimeInfo->MaximumLength )); + size = sizeof(RTL_USER_PROCESS_PARAMETERS); + add_rounded_size(&size, ImagePathName->MaximumLength); + add_rounded_size(&size, DllPath->MaximumLength); + add_rounded_size(&size, curdir.MaximumLength); + add_rounded_size(&size, CommandLine->MaximumLength); + add_rounded_size(&size, WindowTitle->MaximumLength); + add_rounded_size(&size, Desktop->MaximumLength); + add_rounded_size(&size, ShellInfo->MaximumLength); + add_rounded_size(&size, RuntimeInfo->MaximumLength); + + if (Environment) { + env_size = get_env_length( Environment ) * sizeof(WCHAR); + size = ROUND_SIZE(size); + } if ((ptr = RtlAllocateHeap( GetProcessHeap(), HEAP_ZERO_MEMORY, size + ROUND_SIZE( env_size ) ))) { @@ -587,7 +601,7 @@ NTSTATUS WINAPI RtlCreateProcessParametersEx( RTL_USER_PROCESS_PARAMETERS **resu append_unicode_string( &ptr, Desktop, &params->Desktop ); append_unicode_string( &ptr, ShellInfo, &params->ShellInfo ); append_unicode_string( &ptr, RuntimeInfo, &params->RuntimeInfo ); - if (Environment) params->Environment = memcpy( ptr, Environment, env_size ); + if (Environment) params->Environment = memcpy( align_ptr(ptr), Environment, env_size ); *result = params; if (!(flags & PROCESS_PARAMS_FLAG_NORMALIZED)) RtlDeNormalizeProcessParams( params ); } -- 2.25.1

1 0

[PATCH] ws2_32: Correctly null-terminate the addrinfo chain.
by Zebediah Figura Dec. 29, 2021

Dec. 29, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52288 Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/unixlib.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ws2_32/unixlib.c b/dlls/ws2_32/unixlib.c index e89ebe35248..56a0bed308d 100644 --- a/dlls/ws2_32/unixlib.c +++ b/dlls/ws2_32/unixlib.c @@ -752,6 +752,7 @@ static NTSTATUS unix_getaddrinfo( void *args ) dst->ai_addrlen = sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, NULL, 0 ); dst->ai_addr = next; sockaddr_from_unix( (const union unix_sockaddr *)src->ai_addr, dst->ai_addr, dst->ai_addrlen ); + dst->ai_next = NULL; next = (char *)dst->ai_addr + dst->ai_addrlen; if (dst == params->info || !addrinfo_in_list( params->info, dst )) @@ -763,8 +764,6 @@ static NTSTATUS unix_getaddrinfo( void *args ) } } - dst->ai_next = NULL; - freeaddrinfo( unix_info ); return 0; #else -- 2.34.1

1 0

[PATCH] ntdll: Always prefer native signal restorer over the custom one.
by Jinoh Kang Dec. 29, 2021

Dec. 29, 2021

A few months after the custom signal restorer for Android was commited, bionic rolled its own signal restorer. The patch is at: https://android-review.googlesource.com/c/platform/bionic/+/107692 In general, rolling our own signal restorer is not a good idea since it interferes with unwinding. GDB seems especially unhappy when the signal restorer's name isn't exactly "__restore_rt". Fix this by using the custom signal restorer only if the vDSO has disappeared and libc doesn't supply its own signal restorer. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- dlls/ntdll/unix/signal_i386.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 6bb5649e2b5..f98269535bb 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -50,6 +50,9 @@ #ifdef HAVE_SYS_UCONTEXT_H # include <sys/ucontext.h> #endif +#ifdef HAVE_SYS_AUXV_H +# include <sys/auxv.h> +#endif #include "ntstatus.h" #define WIN32_NO_STATUS @@ -150,9 +153,9 @@ typedef struct ucontext #define FPUX_sig(context) (FPU_sig(context) && !((context)->uc_mcontext.fpregs->status >> 16) ? (XSAVE_FORMAT *)(FPU_sig(context) + 1) : NULL) #define XState_sig(fpu) (((unsigned int *)fpu->Reserved4)[12] == FP_XSTATE_MAGIC1 ? (XSTATE *)(fpu + 1) : NULL) -#ifdef __ANDROID__ -/* custom signal restorer since we may have unmapped the one in vdso, and bionic doesn't check for that */ -void rt_sigreturn(void); +#if defined(__linux__) && defined(SA_RESTORER) +/* backup signal restorer if we have unmapped the one in vDSO, and libc doesn't supply its own restorer */ +extern void rt_sigreturn(void) DECLSPEC_HIDDEN; __ASM_GLOBAL_FUNC( rt_sigreturn, "movl $173,%eax\n\t" /* NR_rt_sigreturn */ "int $0x80" ); @@ -2329,9 +2332,18 @@ void signal_init_process(void) sig_act.sa_mask = server_block_set; sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK; -#ifdef __ANDROID__ - sig_act.sa_flags |= SA_RESTORER; - sig_act.sa_restorer = rt_sigreturn; +#if defined(__linux__) && defined(SA_RESTORER) + if (!getauxval(AT_SYSINFO_EHDR)) { + struct sigaction real_sig_act; + + sig_act.sa_sigaction = int_handler; + if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; + if (sigaction( SIGINT, NULL, &real_sig_act ) == -1) goto error; + if (!(real_sig_act.sa_flags & SA_RESTORER)) { + sig_act.sa_flags |= SA_RESTORER; + sig_act.sa_restorer = rt_sigreturn; + } + } #endif sig_act.sa_sigaction = int_handler; if (sigaction( SIGINT, &sig_act, NULL ) == -1) goto error; -- 2.31.1

1 0

[PATCH] conhost: Fix status for READ_CONSOLE ioctl
by Keno Fischer Dec. 29, 2021

Dec. 29, 2021

Without this patch conhost would attempt to process non-existent input, spewing stdout with various cursor moves and incorrectly returning the ReadConsole call early. Fix that by only attempting input processing if there are actually input records to be processed and properly returning STATUS_PENDING if the input processing is not yet complete. Signed-off-by: Keno Fischer <keno(a)juliacomputing.com> --- programs/conhost/conhost.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/conhost/conhost.c b/programs/conhost/conhost.c index 78f6e345170..64a77e52b43 100644 --- a/programs/conhost/conhost.c +++ b/programs/conhost/conhost.c @@ -1385,7 +1385,14 @@ static NTSTATUS read_console( struct console *console, unsigned int ioctl, size_ if (edit_line_grow( console, 1 )) console->edit_line.buf[0] = 0; console->pending_read = out_size; - return process_console_input( console ); + + /* If there are any pending input records, cook them now. */ + if (console->record_count) + { + process_console_input( console ); + } + + return console->edit_line.status; } /* add input events to a console input queue */ -- 2.25.1

2 2

[PATCH] po: Update Japanese translation.
by Akihiro Sagawa Dec. 29, 2021

Dec. 29, 2021

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- po/ja.po | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-)

2 1