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

Wine staging 6.0-rc5 release
by Alistair Leslie-Hughes 03 Jan '21

03 Jan '21

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 6.0-rc5 (785 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * None Added: * [50292] Process-local synchronization objects use private interfaces into the Unix library Updated: * dsound-EAX Where can you help * Run Steam/Battle.net/GOG/UPlay/Epic * Test your favorite game. * Test your favorite applications. * Improve staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] readme: Update Simplified Chinese translation.
by Zhiyi Zhang 03 Jan '21

03 Jan '21

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- documentation/README.zh_cn | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/documentation/README.zh_cn b/documentation/README.zh_cn index 936172471b2..fa0850a0a6c 100644 --- a/documentation/README.zh_cn +++ b/documentation/README.zh_cn @@ -33,7 +33,7 @@ Wine 是自由软件，在 GNU LGPL 协议下发布；请查看 LICENSE 文件 FreeBSD 8.0 或更新版本 Solaris x86 9 或更新版本 NetBSD-current - Mac OS X 10.5 或更新版本 + Mac OS X 10.8 或更新版本鉴于运行 Wine 需要内核级别的线程支持，仅以上提及的操作系统能被支持。其它拥有内核线程的操作系统可能在未来得到支持。 @@ -51,8 +51,9 @@ NetBSD 信息：请确保您在内核中启用了 USER_LDT、SYSVSHM、SYSVSEM 和 SYSVMSG 选项。 Mac OS X 信息: - 在 x86 平台下，您需要 Xcode 2.4 或更新版本以正常进行编译。 - Mac 驱动需要 OS X 10.6 或更新版本。它在 10.5 下不会编译通过。 + 您需要Xcode/Xcode Command Line Tools或者Apple cctools。 + 编译Wine的最低要求是clang 3.8以及MacOSX10.10.sdk和mingw-w64 v8。 + MacOSX10.14.sdk或者更新版本只能编译wine64。支持的文件系统： -- 2.27.0

1 0

[PATCH] readme: Update Russian translation.
by Nikolay Sivov 03 Jan '21

03 Jan '21

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

1 0

Error "syntax error near unexpected token `newline'" in configure
by Manuel Reimer 02 Jan '21

02 Jan '21

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 |

1 1

[PATCH]readme: Update Norwegian translation.
by Sveinar Søpler 02 Jan '21

02 Jan '21

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

1 0

[PATCH] documentation: Update Japanese translation.
by Akihiro Sagawa 02 Jan '21

02 Jan '21

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

1 0

[PATCH] server: Pass the correct size to sockaddr_from_unix() (Valgrind).
by Zebediah Figura 01 Jan '21

01 Jan '21

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

1 0

[PATCH] ntdll: Implement dynamic spinning
by Jangwoong Kim 01 Jan '21

01 Jan '21

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

1 0