January 2021 - Wine-Devel - list.winehq.org

[PATCH] readme: Update Russian translation.

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- documentation/README.ru | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/documentation/README.ru b/documentation/README.ru index 5276b99bd91..f3328edd13a 100644 --- a/documentation/README.ru +++ b/documentation/README.ru @@ -31,7 +31,7 @@ make FreeBSD 8.0 или более новой Solaris x86 9 или более новой NetBSD-текущей версии - Mac OS X 10.5 или более новой + Mac OS X 10.8 или более новой Так как Wine требует для запуска поддержку потоков на уровне ядра, поддерживаются только операционные системы, перечисленные выше. Другие @@ -53,9 +53,10 @@ NetBSD: включены в вашем ядре. Mac OS X: - Вам нужен Xcode 2.4 или более новый для компоновки x86. - Драйвер Mac работает на системах OS X версии 10.6 и выше, - он исключается из сборки на системах версии 10.5. + Вам потребуется Xcode/Xcode Command Line Tools или Apple cctools. + Минимальные требования для компиляции это clang 3.8 c MacOSX10.10.sdk и + mingw-w64 v8. MacOSX10.14.sdk и новее может использоваться только для + сборки wine64. Поддерживаемые файловые системы: Wine должен работать на большинстве файловых систем. При использовании файлов -- 2.29.2

Jan. 2, 2021

Re: Error "syntax error near unexpected token `newline'" in configure

by Manuel Reimer

Sorry for the garbage. My mail client killed my layout... Here is the output I get when trying to compile Wine 5.6: checking for strip... strip checking for ranlib... ranlib checking whether ln -s works... yes checking for grep that handles long lines and -e... /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for ldconfig... /sbin/ldconfig checking for msgfmt... msgfmt ../wine-lol/configure: line 7543: syntax error near unexpected token `newline' ../wine-lol/configure: line 7543: ` ''' Maybe someone remembers which fix on Wine fixed such problems. Thanks in advance Manuel

Jan. 2, 2021

Error "syntax error near unexpected token `newline'" in configure

by Manuel Reimer

Hello, I have to compile an older Wine version (5.6) as this is the last version which started the League Of Legends client without major problems. Recently I'm running into the following error while configuring: |checking whether gcc -m32 works... yes checking for the directory containing the Wine tools... checking for flex... flex checking whether flex is recent enough... yes checking for bison... bison checking whether bison is recent enough... yes checking for ar... ar checking for strip... strip checking for ranlib... ranlib checking whether ln -s works... yes checking for grep that handles long lines and -e... /usr/bin/grep checking for egrep... /usr/bin/grep -E checking for ldconfig... /sbin/ldconfig checking for msgfmt... msgfmt ../wine-lol/configure: line 7543: syntax error near unexpected token `newline' ../wine-lol/configure: line 7543: ` ''' I guess this has been fixed in Wine at some point. Does someone maybe remember which fix on Wine repaired this? Thanks in advance Manuel |

Jan. 2, 2021

[PATCH]readme: Update Norwegian translation.

by Sveinar Søpler

Signed-off-by: Sveinar Søpler <cybermax(a)dexter.no> --- documentation/README.no | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)

Jan. 2, 2021

[PATCH] documentation: Update Japanese translation.

by Akihiro Sagawa

Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- documentation/README.ja | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

Jan. 2, 2021

[PATCH] server: Pass the correct size to sockaddr_from_unix() (Valgrind).

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50437 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- server/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 1ff56f7bbe5..5f207e7f180 100644 --- a/server/sock.c +++ b/server/sock.c @@ -459,6 +459,7 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb ) { union unix_sockaddr unix_addr; struct WS_sockaddr *win_addr; + unsigned int remote_len; socklen_t unix_len; int fd, size = 0; char *out_data; @@ -495,7 +496,7 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb ) unix_len = sizeof(unix_addr); win_addr = (struct WS_sockaddr *)(out_data + req->recv_len + sizeof(int)); if (getsockname( fd, &unix_addr.addr, &unix_len ) < 0 || - (win_len = sockaddr_from_unix( &unix_addr, win_addr, req->local_len )) < 0) + (win_len = sockaddr_from_unix( &unix_addr, win_addr, req->local_len - sizeof(int) )) < 0) { set_win32_error( sock_get_error( errno ) ); free( out_data ); @@ -506,8 +507,9 @@ static void fill_accept_output( struct accept_req *req, struct iosb *iosb ) unix_len = sizeof(unix_addr); win_addr = (struct WS_sockaddr *)(out_data + req->recv_len + req->local_len + sizeof(int)); + remote_len = iosb->out_size - req->recv_len - req->local_len; if (getpeername( fd, &unix_addr.addr, &unix_len ) < 0 || - (win_len = sockaddr_from_unix( &unix_addr, win_addr, iosb->out_size - req->recv_len - req->local_len )) < 0) + (win_len = sockaddr_from_unix( &unix_addr, win_addr, remote_len - sizeof(int) )) < 0) { set_win32_error( sock_get_error( errno ) ); free( out_data ); -- 2.29.2

Jan. 1, 2021

[PATCH] ntdll: Implement dynamic spinning

by Jangwoong Kim

Previously, InitialzeCriticalSectionEx with RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN worked as semi-stub. This patch implements dynamic spinning. Specifically, 32th bit from the right (starting with zero index) indicates whether it is dynamically spinning critical section. Signed-off-by: Jangwoong Kim <6812skiii(a)gmail.com> --- dlls/ntdll/critsection.c | 45 +++++++++++++++++++++++++++++++++------- 1 file changed, 38 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/critsection.c b/dlls/ntdll/critsection.c index fe7d933c0fa..8642015e05c 100644 --- a/dlls/ntdll/critsection.c +++ b/dlls/ntdll/critsection.c @@ -20,6 +20,7 @@ #include <assert.h> #include <errno.h> +#include <limits.h> #include <stdarg.h> #include <stdio.h> #include <sys/types.h> @@ -34,6 +35,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); WINE_DECLARE_DEBUG_CHANNEL(relay); +#define IS_DYNAMIC_SPIN crit->SpinCount >> 31 == 1 ? TRUE : FALSE +#define MAX_ADAPTIVE_SPIN_COUNT 100 +#define MIN(a,b) (((a)<(b))?(a):(b)) + static inline void small_pause(void) { #ifdef __i386__ @@ -159,7 +164,7 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionAndSpinCount( RTL_CRITICAL_SECTION * */ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULONG spincount, ULONG flags ) { - if (flags & (RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN|RTL_CRITICAL_SECTION_FLAG_STATIC_INIT)) + if (flags & RTL_CRITICAL_SECTION_FLAG_STATIC_INIT) FIXME("(%p,%u,0x%08x) semi-stub\n", crit, spincount, flags); /* FIXME: if RTL_CRITICAL_SECTION_FLAG_STATIC_INIT is given, we should use @@ -189,8 +194,15 @@ NTSTATUS WINAPI RtlInitializeCriticalSectionEx( RTL_CRITICAL_SECTION *crit, ULON crit->RecursionCount = 0; crit->OwningThread = 0; crit->LockSemaphore = 0; + spincount = spincount & ~0x80000000; + if (flags & RTL_CRITICAL_SECTION_FLAG_DYNAMIC_SPIN) + { + spincount = MIN(spincount, MAX_ADAPTIVE_SPIN_COUNT); + /* 31th bit (from right starting with 0) indicates whether it is dynamically spinning CS */ + spincount |= ((ULONG)1 << 31); + } if (NtCurrentTeb()->Peb->NumberOfProcessors <= 1) spincount = 0; - crit->SpinCount = spincount & ~0x80000000; + crit->SpinCount = spincount; return STATUS_SUCCESS; } @@ -403,14 +415,33 @@ NTSTATUS WINAPI RtlEnterCriticalSection( RTL_CRITICAL_SECTION *crit ) ULONG count; if (RtlTryEnterCriticalSection( crit )) return STATUS_SUCCESS; - for (count = crit->SpinCount; count > 0; count--) + if (IS_DYNAMIC_SPIN) + { + ULONG max_count = MIN(MAX_ADAPTIVE_SPIN_COUNT, crit->SpinCount & ~0x80000000 * 2); + for (count = 0 ; count < max_count ; count++) { + if (crit->LockCount == -1) + { + if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) + { + crit->SpinCount += ((LONG)count - (LONG)(crit->SpinCount & ~0x80000000)) / 10; + goto done; + } + } + small_pause(); + } + crit->SpinCount += ((LONG)count - (LONG)(crit->SpinCount & ~0x80000000)) / 10; + } + else { - if (crit->LockCount > 0) break; /* more than one waiter, don't bother spinning */ - if (crit->LockCount == -1) /* try again */ + for (count = crit->SpinCount; count > 0; count--) { - if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) goto done; + if (crit->LockCount > 0) break; /* more than one waiter, don't bother spinning */ + if (crit->LockCount == -1) /* try again */ + { + if (InterlockedCompareExchange( &crit->LockCount, 0, -1 ) == -1) goto done; + } + small_pause(); } - small_pause(); } } -- 2.25.1

Jan. 1, 2021

[PATCH] winex11.drv: Check that there are connected outputs before using XRandR 1.4.

by Zhiyi Zhang

On headless systems, Wine can still run through a VNC connection even though no outputs are connected. Fallback to using the Xinerama display device handler in this case to report at least one monitor. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49500 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winex11.drv/xrandr.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/dlls/winex11.drv/xrandr.c b/dlls/winex11.drv/xrandr.c index 78ad98acd49..fa748c2af04 100644 --- a/dlls/winex11.drv/xrandr.c +++ b/dlls/winex11.drv/xrandr.c @@ -1555,6 +1555,38 @@ void X11DRV_XRandR_Init(void) #ifdef HAVE_XRRGETPROVIDERRESOURCES if (ret >= 4 && (major > 1 || (major == 1 && minor >= 4))) { + XRRScreenResources *screen_resources; + XRROutputInfo *output_info; + BOOL found_output = FALSE; + INT i; + + screen_resources = xrandr_get_screen_resources(); + if (!screen_resources) + return; + + for (i = 0; i < screen_resources->noutput; ++i) + { + output_info = pXRRGetOutputInfo( gdi_display, screen_resources, screen_resources->outputs[i] ); + if (!output_info) + continue; + + if (output_info->connection == RR_Connected) + { + pXRRFreeOutputInfo( output_info ); + found_output = TRUE; + break; + } + + pXRRFreeOutputInfo( output_info ); + } + pXRRFreeScreenResources( screen_resources ); + + if (!found_output) + { + WARN("No connected outputs found.\n"); + return; + } + display_handler.name = "XRandR 1.4"; display_handler.priority = 200; display_handler.get_gpus = xrandr14_get_gpus; -- 2.27.0

Jan. 1, 2021