- Wine-Devel - list.winehq.org

[PATCH 0/3] MR187: ntdll/tests: Test if RtlFormatMessage modifies va_list on error.
by Daniel Lehman (＠dlehman25) June 4, 2022

June 4, 2022

Signed-off-by: Daniel Lehman <dlehman25(a)gmail.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/187

2 3

[PATCH v3 0/2] MR155: ntdll: Fix reading stale Information from IOSB.
by Jinoh Kang (＠iamahuman) June 4, 2022

June 4, 2022

Enforce proper atomic update so that other threads do not read stale data from IO_STATUS_BLOCK. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> -- v3: ntdll: Fix reading stale Information from IOSB. include: Define atomic read/write helpers for 32-bit integers. https://gitlab.winehq.org/wine/wine/-/merge_requests/155

3 3

[PATCH] include: Define atomic read/write helpers for 32-bit integers.
by Jinoh Kang June 4, 2022

June 4, 2022

Based on the corresponding functions from Windows SDK header files. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- include/winnt.h | 121 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 87c4b4da92d..a98201dc3b0 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6475,6 +6475,70 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __i386__ */ +#if defined(__i386__) || defined(__x86_64__) + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = *src; + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = *src; + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + *dest = value; +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + *dest = value; +} + +#else + +/* __iso_volatile_* intrinsics do not need explicit declarations. */ +#pragma intrinsic(__iso_volatile_load32) +#pragma intrinsic(__iso_volatile_store32) + +#if defined(__arm__) +#define WINE_MEMORY_BARRIER_ACQUIRE() __dmb(_ARM_BARRIER_ISH) +#define WINE_MEMORY_BARRIER_RELEASE() __dmb(_ARM_BARRIER_ISH) +#elif defined(__aarch64__) +#define WINE_MEMORY_BARRIER_ACQUIRE() __dmb(_ARM64_BARRIER_ISH) +#define WINE_MEMORY_BARRIER_RELEASE() __dmb(_ARM64_BARRIER_ISH) +#endif /* defined(__arm__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value = __iso_volatile_load32( (int const volatile *)src ); + WINE_MEMORY_BARRIER_ACQUIRE(); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value = __iso_volatile_load32( (int const volatile *)src ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + WINE_MEMORY_BARRIER_RELEASE(); + __iso_volatile_store32( (int volatile *)dest, value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + __iso_volatile_store32( (int volatile *)dest, value ); +} + +#endif /* defined(__i386__) || defined(__x86_64__) */ + #elif defined(__GNUC__) static FORCEINLINE BOOLEAN WINAPI BitScanForward(DWORD *index, DWORD mask) @@ -6588,6 +6652,43 @@ static FORCEINLINE void MemoryBarrier(void) __sync_synchronize(); } +#if defined(__x86_64__) || defined(__i386__) +/* On x86, Support old GCC with either no or buggy (GCC BZ#81316) __atomic_* support */ +#define WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) do { *(ret) = *(ptr); __asm__ __volatile__( "" ::: "memory" ); } while (0) +#define WINE_ATOMIC_LOAD_RELAXED(ptr, ret) do { *(ret) = *(ptr); } while (0) +#define WINE_ATOMIC_STORE_RELEASE(ptr, val) do { __asm__ __volatile__( "" ::: "memory" ); *(ptr) = *(val); } while (0) +#define WINE_ATOMIC_STORE_RELAXED(ptr, val) do { *(ptr) = *(val); } while (0) +#else +#define WINE_ATOMIC_LOAD_ACQUIRE(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_ACQUIRE) +#define WINE_ATOMIC_LOAD_RELAXED(ptr, ret) __atomic_load(ptr, ret, __ATOMIC_RELAXED) +#define WINE_ATOMIC_STORE_RELEASE(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELEASE) +#define WINE_ATOMIC_STORE_RELAXED(ptr, val) __atomic_store(ptr, val, __ATOMIC_RELAXED) +#endif /* defined(__x86_64__) || defined(__i386__) */ + +static FORCEINLINE LONG ReadAcquire( LONG const volatile *src ) +{ + LONG value; + WINE_ATOMIC_LOAD_ACQUIRE( src, &value ); + return value; +} + +static FORCEINLINE LONG ReadNoFence( LONG const volatile *src ) +{ + LONG value; + WINE_ATOMIC_LOAD_RELAXED( src, &value ); + return value; +} + +static FORCEINLINE void WriteRelease( LONG volatile *dest, LONG value ) +{ + WINE_ATOMIC_STORE_RELEASE( dest, &value ); +} + +static FORCEINLINE void WriteNoFence( LONG volatile *dest, LONG value ) +{ + WINE_ATOMIC_STORE_RELAXED( dest, &value ); +} + static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) { #if defined(__x86_64__) || defined(__i386__) @@ -6603,6 +6704,26 @@ static FORCEINLINE DECLSPEC_NORETURN void __fastfail(unsigned int code) #endif /* __GNUC__ */ +static FORCEINLINE ULONG ReadULongAcquire( ULONG const volatile *src ) +{ + return (ULONG)ReadAcquire( (LONG const volatile *)src ); +} + +static FORCEINLINE ULONG ReadULongNoFence( ULONG const volatile *src ) +{ + return (ULONG)ReadNoFence( (LONG const volatile *)src ); +} + +static FORCEINLINE void WriteULongRelease( ULONG volatile *dest, ULONG value ) +{ + WriteRelease( (LONG volatile *)dest, value ); +} + +static FORCEINLINE void WriteULongNoFence( ULONG volatile *dest, ULONG value ) +{ + WriteNoFence( (LONG volatile *)dest, value ); +} + #ifdef _WIN64 #define InterlockedCompareExchange128 _InterlockedCompareExchange128 -- 2.34.3

1 0

[PATCH v3 0/2] MR135: Cancel asyncs queued by thread when the thread is terminated
by Paul Gofman (＠gofman) June 4, 2022

June 4, 2022

Inspired by the discussion for MR 127 (https://www.winehq.org/pipermail/wine-devel/2022-May/217832.html) and is aimed to replace the second patch (ws2_32: Use allocated IO status block in select().) in that MR. When the thread calls server's terminate_thread for itself queuing the system APC though SIGUSR1 might race with the thread exit, there seems no easy and reliable way to be sure that signal is processed before the thread's stack and TEB are freed. Thus I am making the system APCs to be queued to the thread to be processed by server_select() after (terminate_thread) server call. When terminate_thread is called for the other thread the system APC will always be delivered through some other thread. Thread stack and TEB are not freed when the thread is killed externally, so completing the async from another thread should probably be fine. -- v3: ntdll: Cancel asyncs when thread is terminated. ws2_32/tests: Add tests for terminated thread asyncs completion. https://gitlab.winehq.org/wine/wine/-/merge_requests/135

4 7

[PATCH 0/1] MR185: d2d1: Use d3d11 constants for constant buffer description.
by Nikolay Sivov (＠nsivov) June 4, 2022

June 4, 2022

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> -- https://gitlab.winehq.org/wine/wine/-/merge_requests/185

2 1

Wine staging 7.10 release
by Alistair Leslie-Hughes June 3, 2022

June 3, 2022

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary since last release * Rebased to current wine 7.10 (545 patches are applied to wine vanilla) Upstreamed (Either directly from staging or fixed with a similar patch). * kernelbase: Implement sortkey generation on official tables * kernelbase: Implement sortkey punctuation * kernelbase: Implement sortkey for Japanese characters * kernelbase: Implement sortkey expansion * kernelbase: Implement sortkey language support * kernelbase: Implement CompareString functions Added: * [#53038] - dwmapi: Supply some defaults values for DwmGetCompositionTimingInfo. * [#53035] - dwmapi: DwmFlush return S_OK. Updated: * None 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

Re: [PATCH v3 0/1] MR163: avicap32: Add fallback Unixlib function and thunk to use when V4L is unavailable. - approved
by Alexandre Julliard (＠julliard) June 3, 2022

June 3, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/163

1 0

Re: [PATCH v2 0/1] MR184: mscoree: Update Wine Mono to 7.3.0. - approved
by Alexandre Julliard (＠julliard) June 3, 2022

June 3, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/184

1 0

Re: [PATCH v2 0/11] MR177: winemac: PE conversion - approved
by Alexandre Julliard (＠julliard) June 3, 2022

June 3, 2022

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/177

1 0

[PATCH] vbscript: Implement IsDate().
by Robert Wilhelm June 3, 2022

June 3, 2022

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/vbscript/global.c | 31 +++++++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 13 +++++++++++++ 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 90cfd557038..222e0534665 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -425,6 +425,25 @@ HRESULT to_int(VARIANT *v, int *ret) return S_OK; } +static HRESULT to_date(VARIANT *v, DATE *ret) +{ + VARIANT r; + HRESULT hres; + + V_VT(&r) = VT_EMPTY; + hres = VariantChangeType(&r, v, 0, VT_DATE); + if(FAILED(hres)) { + hres = VariantChangeType(&r, v, 0, VT_R8); + if(FAILED(hres)) + return hres; + hres = VariantChangeType(&r, &r, 0, VT_DATE); + if(FAILED(hres)) + return hres; + } + *ret = V_DATE(&r); + return S_OK; +} + static HRESULT to_double(VARIANT *v, double *ret) { VARIANT dst; @@ -935,8 +954,16 @@ static HRESULT Global_VarType(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt static HRESULT Global_IsDate(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + HRESULT hres; + DATE d; + + TRACE("%s\n", debugstr_variant(arg)); + + assert(args_cnt == 1); + + hres = to_date(arg, &d); + + return return_bool(res, SUCCEEDED(hres)); } static HRESULT Global_IsEmpty(BuiltinDisp *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index be1d4a806c0..d70f95ce69b 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -181,6 +181,19 @@ Call ok(not isObject(4), "isObject(4) is true?") Call ok(not isObject("x"), "isObject(""x"") is true?") Call ok(not isObject(Null), "isObject(Null) is true?") +Call ok(not isDate(new EmptyClass), "isDate(new EmptyClass) is true?") +Set x = new EmptyClass +Call ok(not isDate(x), "isDate(x) is true?") +x = CDate(1) +Call ok(isDate(x), "isDate(x) is not true?") +Call ok(isDate(empty), "isDate(empty) is not true?") +Call ok(not isDate(Nothing), "isDate(Nothing) is true?") +Call ok(isDate(true), "isDate(true) is not true?") +Call ok(isDate(4), "isDate(4) is not true?") +Call ok(isDate("4"), "isDate(""4"") is not true?") +Call ok(not isDate("x"), "isDate(""x"") is true?") +Call ok(not isDate(Null), "isDate(Null) is true?") + Call ok(not isEmpty(new EmptyClass), "isEmpty(new EmptyClass) is true?") Set x = new EmptyClass Call ok(not isEmpty(x), "isEmpty(x) is true?") -- 2.36.1

2 1