March 2022 - Wine-devel - list.winehq.org

[PATCH] po: Remove spaces before linefeeds in the Dutch translation.
by Francois Gouget 15 Mar '22

15 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/nl.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] po: Remove a space before a linefeed in the Chinese translation.
by Francois Gouget 15 Mar '22

15 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] po: Remove spaces before linefeeds in the Spanish translation.
by Francois Gouget 15 Mar '22

15 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/es.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] po: Remove a space before a linefeed in the French translation.
by Francois Gouget 15 Mar '22

15 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] po: Fix backslash duplication in a French translation.
by Francois Gouget 15 Mar '22

15 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- po/fr.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] po: Fix the French translation of 'code page'.
by Francois Gouget 15 Mar '22

15 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- See https://fr.wikipedia.org/wiki/Page_de_code --- po/fr.po | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)

1 0

[PATCH] kernelbase: Add a trailing linefeed to a couple of FIXME() messages.
by Francois Gouget 15 Mar '22

15 Mar '22

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/kernelbase/path.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index d59f20adb6e..410d87ce620 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -2433,7 +2433,7 @@ HRESULT WINAPI PathMatchSpecExA(const char *path, const char *mask, DWORD flags) TRACE("%s, %s\n", wine_dbgstr_a(path), wine_dbgstr_a(mask)); if (flags) - FIXME("Ignoring flags %#lx.", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!lstrcmpA(mask, "*.*")) return S_OK; /* Matches every path */ @@ -2488,7 +2488,7 @@ HRESULT WINAPI PathMatchSpecExW(const WCHAR *path, const WCHAR *mask, DWORD flag TRACE("%s, %s\n", wine_dbgstr_w(path), wine_dbgstr_w(mask)); if (flags) - FIXME("Ignoring flags %#lx.", flags); + FIXME("Ignoring flags %#lx.\n", flags); if (!lstrcmpW(mask, L"*.*")) return S_OK; /* Matches every path */ -- 2.30.2

1 0

[PATCH 5/6 v2] msvcp140: Add SRWLock based _Mtx_t and _Cnd_t implementation.
by Piotr Caban 15 Mar '22

15 Mar '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp90/misc.c | 13 ++--- dlls/msvcp90/msvcp90.h | 37 +++++++++----- dlls/msvcp90/msvcp_main.c | 101 +++++++++++++++++++++++++++++--------- 3 files changed, 107 insertions(+), 44 deletions(-)

2 1

[PATCH] msvcp90: Reimplement condition variables on top of RtlWaitOnAddress().
by Henri Verbeet 15 Mar '22

15 Mar '22

This is largely the same as the condition variable implementation in ntdll. There are essentially two reasons for doing this: - RtlWaitOnAddress() avoids server calls, compared to the existing keyed event implementation. - The NtReleaseKeyedEvent() call in _Cnd_signal() can hang if a thread was killed inside _Cnd_wait(), for example by an application calling exit(). Piotr Caban reports this scenario is supposed to work with msvcp140, although not necessarily with earlier versions of msvcp. (And indeed, native msvcp140 is a workaround for the affected applications.) Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/msvcp90/misc.c | 44 ++++++++++++++------------------------------ 1 file changed, 14 insertions(+), 30 deletions(-) diff --git a/dlls/msvcp90/misc.c b/dlls/msvcp90/misc.c index c7a56ad9e97..3ccb628fa24 100644 --- a/dlls/msvcp90/misc.c +++ b/dlls/msvcp90/misc.c @@ -853,19 +853,9 @@ typedef _Cnd_t *_Cnd_arg_t; #define CND_T_TO_ARG(c) (&(c)) #endif -static HANDLE keyed_event; - void __cdecl _Cnd_init_in_situ(_Cnd_t cnd) { InitializeConditionVariable(&cnd->cv); - - if(!keyed_event) { - HANDLE event; - - NtCreateKeyedEvent(&event, GENERIC_READ|GENERIC_WRITE, NULL, 0); - if(InterlockedCompareExchangePointer(&keyed_event, event, NULL) != NULL) - NtClose(event); - } } int __cdecl _Cnd_init(_Cnd_t *cnd) @@ -878,51 +868,47 @@ int __cdecl _Cnd_init(_Cnd_t *cnd) int __cdecl _Cnd_wait(_Cnd_arg_t cnd, _Mtx_arg_t mtx) { CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; + int value = *(int *)&cv->Ptr; - InterlockedExchangeAdd( (LONG *)&cv->Ptr, 1 ); _Mtx_unlock(mtx); - - NtWaitForKeyedEvent(keyed_event, &cv->Ptr, FALSE, NULL); - + RtlWaitOnAddress(&cv->Ptr, &value, sizeof(value), NULL); _Mtx_lock(mtx); + return 0; } int __cdecl _Cnd_timedwait(_Cnd_arg_t cnd, _Mtx_arg_t mtx, const xtime *xt) { CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; + int value = *(int *)&cv->Ptr; LARGE_INTEGER timeout; NTSTATUS status; - InterlockedExchangeAdd( (LONG *)&cv->Ptr, 1 ); _Mtx_unlock(mtx); - timeout.QuadPart = (ULONGLONG)(ULONG)_Xtime_diff_to_millis(xt) * -10000; - status = NtWaitForKeyedEvent(keyed_event, &cv->Ptr, FALSE, &timeout); - if (status) - { - if (!interlocked_dec_if_nonzero( (LONG *)&cv->Ptr )) - status = NtWaitForKeyedEvent( keyed_event, &cv->Ptr, FALSE, NULL ); - } - + status = RtlWaitOnAddress(&cv->Ptr, &value, sizeof(value), &timeout); _Mtx_lock(mtx); + return status ? CND_TIMEDOUT : 0; } int __cdecl _Cnd_broadcast(_Cnd_arg_t cnd) { CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; - LONG val = InterlockedExchange( (LONG *)&cv->Ptr, 0 ); - while (val-- > 0) - NtReleaseKeyedEvent( keyed_event, &cv->Ptr, FALSE, NULL ); + + InterlockedIncrement((LONG *)&cv->Ptr); + RtlWakeAddressAll(cv); + return 0; } int __cdecl _Cnd_signal(_Cnd_arg_t cnd) { CONDITION_VARIABLE *cv = &CND_T_FROM_ARG(cnd)->cv; - if (interlocked_dec_if_nonzero( (LONG *)&cv->Ptr )) - NtReleaseKeyedEvent( keyed_event, &cv->Ptr, FALSE, NULL ); + + InterlockedIncrement((LONG *)&cv->Ptr); + RtlWakeAddressSingle(cv); + return 0; } @@ -1781,8 +1767,6 @@ void init_misc(void *base) void free_misc(void) { #if _MSVCP_VER >= 110 - if(keyed_event) - NtClose(keyed_event); HeapFree(GetProcessHeap(), 0, broadcast_at_thread_exit.to_broadcast); #endif } -- 2.20.1

4 4

[PATCH 6/6 v2] msvcp140: Add condition variable tests.
by Piotr Caban 15 Mar '22

15 Mar '22

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcp140/tests/msvcp140.c | 191 +++++++++++++++++++++++++++++++++ 1 file changed, 191 insertions(+)

1 0