wine-commits February 2021

wine-commits@winehq.org

2 participants
915 discussions

Alexandre Julliard : Wine release 6.3
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: website Branch: master Commit: 32a973e4f409ff276d96a1285eed7e1a244f300e URL: https://source.winehq.org/git/website.git/?a=commit;h=32a973e4f409ff276d96a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 21:39:46 2021 +0100 Wine release 6.3 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2021022601.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/en/2021022601.xml b/news/en/2021022601.xml new file mode 100644 index 00000000..4b232463 --- /dev/null +++ b/news/en/2021022601.xml @@ -0,0 +1,17 @@ +<news> +<date>February 26, 2021</date> +<title>Wine 6.3 Released</title> +<body> + The Wine development release 6.3 is now available. + <a href="{$root}/announce/6.3">What's new</a> in this release: +<ul> + <li>Better debugger support in the NT syscall interface.</li> + <li>WineGStreamer library converted to PE.</li> + <li>Still more WinRT support in WIDL.</li> + <li>Optional support for build IDs.</li> + <li>Various bug fixes.</li> +</ul> + +The source is <a href="//dl.winehq.org/wine/source/6.x/wine-6.3.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-6.3 : Alexandre Julliard : Release 6.3
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: refs/tags/wine-6.3 Tag: 7fe77f6a6a63eb90839d8bfd5ec045d8d7d79ec0 URL: https://source.winehq.org/git/wine.git/?a=tag;h=7fe77f6a6a63eb90839d8bfd5ec… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 21:37:53 2021 +0100 Release 6.3

1 0

Alexandre Julliard : Release 6.3.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 0f972e2247932f255f131792724e4796b4b2b87a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f972e2247932f255f131792… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 21:37:53 2021 +0100 Release 6.3. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1002 +++++++++++++++++++++++++++++++++---------------------------- AUTHORS | 2 + VERSION | 2 +- configure | 18 +- 4 files changed, 557 insertions(+), 467 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f972e2247932f255f13…

1 0

Hans Leidekker : winhttp/tests: Add tests for client certificate authentication.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: e1352bf0283de7d178a1d4df1f632d6a1b8e8a46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1352bf0283de7d178a1d4df… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Feb 26 16:37:47 2021 +0100 winhttp/tests: Add tests for client certificate authentication. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/tests/winhttp.c | 303 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 303 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e1352bf0283de7d178a1…

1 0

Zebediah Figura : d3d12: Check for VK_KHR_external_memory_capabilities before using VkPhysicalDeviceIDProperties.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: b8f8ed10aa29b3ddbc9495a2cce5c01d3e7b580d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b8f8ed10aa29b3ddbc9495a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Feb 25 10:07:42 2021 -0600 d3d12: Check for VK_KHR_external_memory_capabilities before using VkPhysicalDeviceIDProperties. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d12/d3d12_main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d12/d3d12_main.c b/dlls/d3d12/d3d12_main.c index 3dd4ec796b0..388de0b56c2 100644 --- a/dlls/d3d12/d3d12_main.c +++ b/dlls/d3d12/d3d12_main.c @@ -265,7 +265,9 @@ static VkPhysicalDevice d3d12_get_vk_physical_device(struct vkd3d_instance *inst if ((vr = pfn_vkEnumeratePhysicalDevices(vk_instance, &count, vk_physical_devices)) < 0) goto done; - if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2) + if (!IsEqualGUID(&adapter_info->driver_uuid, &GUID_NULL) && pfn_vkGetPhysicalDeviceProperties2 + && check_vk_instance_extension(vk_instance, pfn_vkGetInstanceProcAddr, + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME)) { TRACE("Matching adapters by UUIDs.\n"); @@ -331,6 +333,7 @@ HRESULT WINAPI D3D12CreateDevice(IUnknown *adapter, D3D_FEATURE_LEVEL minimum_fe }; static const char * const optional_instance_extensions[] = { + VK_KHR_EXTERNAL_MEMORY_CAPABILITIES_EXTENSION_NAME, VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME, }; static const char * const device_extensions[] =

1 0

Jacek Caban : ntdll: Use cpu_info to check for AVX availability.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: c88b2ed3c04fdde86fc1fca670ae862056e614da URL: https://source.winehq.org/git/wine.git/?a=commit;h=c88b2ed3c04fdde86fc1fca6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 26 17:41:31 2021 +0100 ntdll: Use cpu_info to check for AVX availability. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/signal_i386.c | 6 +++--- dlls/ntdll/unix/signal_x86_64.c | 12 ++++-------- dlls/ntdll/unix/system.c | 2 +- dlls/ntdll/unix/unix_private.h | 1 + 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/unix/signal_i386.c b/dlls/ntdll/unix/signal_i386.c index 73b16b645bb..5e6d5fb25eb 100644 --- a/dlls/ntdll/unix/signal_i386.c +++ b/dlls/ntdll/unix/signal_i386.c @@ -721,7 +721,7 @@ static inline NTSTATUS save_xstate( CONTEXT *context ) xsave_area; XSTATE *xs; - if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) + if (!(cpu_info.FeatureSet & CPU_FEATURE_AVX) || !(xs = xstate_from_context( context ))) return STATUS_SUCCESS; if (context_ex->XState.Length < offsetof(XSTATE, YmmContext) @@ -796,7 +796,7 @@ static inline void restore_xstate( const CONTEXT *context ) XSAVE_FORMAT *xrstor_base; XSTATE *xs; - if (!(user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context )))) + if (!(cpu_info.FeatureSet & CPU_FEATURE_AVX) || !(xs = xstate_from_context( context ))) return; xrstor_base = (XSAVE_FORMAT *)xs - 1; @@ -914,7 +914,7 @@ static inline void save_context( struct xcontext *xcontext, const ucontext_t *si context->ContextFlags |= CONTEXT_FLOATING_POINT | CONTEXT_EXTENDED_REGISTERS; memcpy( context->ExtendedRegisters, fpux, sizeof(*fpux) ); if (!fpu) fpux_to_fpu( &context->FloatSave, fpux ); - if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(fpux))) + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xs = XState_sig(fpux))) { context_init_xstate( context, xs ); xcontext->host_compaction_mask = xs->CompactionMask; diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 22a5d34e06c..e62e958b4aa 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -1528,7 +1528,7 @@ static void save_context( struct xcontext *xcontext, const ucontext_t *sigcontex context->ContextFlags |= CONTEXT_FLOATING_POINT; context->u.FltSave = *FPU_sig(sigcontext); context->MxCsr = context->u.FltSave.MxCsr; - if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xs = XState_sig(FPU_sig(sigcontext)))) { /* xcontext and sigcontext are both on the signal stack, so we can * just reference sigcontext without overflowing 32 bit XState.Offset */ @@ -1558,7 +1558,7 @@ static void restore_context( const struct xcontext *xcontext, ucontext_t *sigcon amd64_thread_data()->dr7 = context->Dr7; set_sigcontext( context, sigcontext ); if (FPU_sig(sigcontext)) *FPU_sig(sigcontext) = context->u.FltSave; - if (user_shared_data->XState.EnabledFeatures && (xs = XState_sig(FPU_sig(sigcontext)))) + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xs = XState_sig(FPU_sig(sigcontext)))) xs->CompactionMask = xcontext->host_compaction_mask; } @@ -1599,9 +1599,7 @@ __ASM_GLOBAL_FUNC( set_full_cpu_context, void signal_restore_full_cpu_context(void) { struct syscall_xsave *xsave = get_syscall_xsave( get_syscall_frame() ); - SYSTEM_CPU_INFORMATION cpu_info; - NtQuerySystemInformation( SystemCpuInformation, &cpu_info, sizeof(cpu_info), NULL ); if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) { __asm__ volatile( "xrstor64 %0" : : "m"(xsave->xsave), "a" (7), "d" (0) ); @@ -1850,7 +1848,7 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context ) xsave->xsave = context->u.FltSave; xsave->xstate.Mask |= XSTATE_MASK_LEGACY; } - if (user_shared_data->XState.EnabledFeatures && (xs = xstate_from_context( context ))) + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xs = xstate_from_context( context ))) { CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); @@ -1987,7 +1985,7 @@ NTSTATUS WINAPI NtGetContextThread( HANDLE handle, CONTEXT *context ) amd64_thread_data()->dr6 = context->Dr6; amd64_thread_data()->dr7 = context->Dr7; } - if (user_shared_data->XState.EnabledFeatures && (xstate = xstate_from_context( context ))) + if ((cpu_info.FeatureSet & CPU_FEATURE_AVX) && (xstate = xstate_from_context( context ))) { struct syscall_xsave *xsave = get_syscall_xsave( frame ); CONTEXT_EX *context_ex = (CONTEXT_EX *)(context + 1); @@ -2831,13 +2829,11 @@ void signal_init_process(void) */ void *signal_init_syscalls(void) { - SYSTEM_CPU_INFORMATION cpu_info; void *ptr, *syscall_dispatcher; extern void __wine_syscall_dispatcher_xsave(void) DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher_xsavec(void) DECLSPEC_HIDDEN; - NtQuerySystemInformation( SystemCpuInformation, &cpu_info, sizeof(cpu_info), NULL ); if (xstate_compaction_enabled) syscall_dispatcher = __wine_syscall_dispatcher_xsavec; else if (cpu_info.FeatureSet & CPU_FEATURE_XSAVE) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 56bdd63c89b..788328292de 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -168,7 +168,7 @@ struct smbios_boot_info #define FIRM 0x4649524D #define RSMB 0x52534D42 -static SYSTEM_CPU_INFORMATION cpu_info; +SYSTEM_CPU_INFORMATION cpu_info = { 0 }; /******************************************************************************* * Architecture specific feature detection for CPUs diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index cd11ba1c46b..529cb6edb69 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -129,6 +129,7 @@ extern HANDLE keyed_event DECLSPEC_HIDDEN; extern timeout_t server_start_time DECLSPEC_HIDDEN; extern sigset_t server_block_set DECLSPEC_HIDDEN; extern struct _KUSER_SHARED_DATA *user_shared_data DECLSPEC_HIDDEN; +extern SYSTEM_CPU_INFORMATION cpu_info DECLSPEC_HIDDEN; #ifdef __i386__ extern struct ldt_copy __wine_ldt_copy DECLSPEC_HIDDEN; #endif

1 0

Jacek Caban : include: Use GCC-style InterlockedCompareExchange128 implementation on clang in MSVC mode.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 894dbe835336c45a48b2e3468a478c62899d1fd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=894dbe835336c45a48b2e346… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 26 15:56:13 2021 +0100 include: Use GCC-style InterlockedCompareExchange128 implementation on clang in MSVC mode. It's not yet supported on aarch64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 60 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/include/winnt.h b/include/winnt.h index e19f515eddb..7973960bf21 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6918,9 +6918,6 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) #pragma intrinsic(_InterlockedAnd) #pragma intrinsic(_InterlockedCompareExchange) #pragma intrinsic(_InterlockedCompareExchange64) -#ifdef _WIN64 -#pragma intrinsic(_InterlockedCompareExchange128) -#endif #pragma intrinsic(_InterlockedExchange) #pragma intrinsic(_InterlockedExchangeAdd) #pragma intrinsic(_InterlockedIncrement) @@ -6932,9 +6929,6 @@ static inline BOOLEAN BitScanReverse(DWORD *index, DWORD mask) long _InterlockedAnd(long volatile *,long); long _InterlockedCompareExchange(long volatile*,long,long); long long _InterlockedCompareExchange64(long long volatile*,long long,long long); -#ifdef _WIN64 -unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); -#endif long _InterlockedDecrement(long volatile*); short _InterlockedDecrement16(short volatile*); long _InterlockedExchange(long volatile*,long); @@ -6958,13 +6952,6 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return _InterlockedCompareExchange64( (long long volatile *)dest, xchg, compare ); } -#ifdef _WIN64 -static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) -{ - return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); -} -#endif - static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { return _InterlockedExchange( (long volatile *)dest, val ); @@ -7082,23 +7069,6 @@ static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volati return __sync_val_compare_and_swap( dest, compare, xchg ); } -#ifdef _WIN64 -static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) -{ -#ifdef __x86_64__ - unsigned char ret; - __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" - : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), - "=a" (compare[0]), "=d" (compare[1]) - : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), - "c" (xchg_high), "b" (xchg_low) ); - return ret; -#else - return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); -#endif -} -#endif - static FORCEINLINE LONG WINAPI InterlockedExchange( LONG volatile *dest, LONG val ) { LONG ret; @@ -7165,6 +7135,36 @@ static FORCEINLINE void MemoryBarrier(void) #endif /* __GNUC__ */ +#ifdef _WIN64 +#if defined(_MSC_VER) && !defined(__clang__) + +#pragma intrinsic(_InterlockedCompareExchange128) +unsigned char _InterlockedCompareExchange128(volatile __int64 *, __int64, __int64, __int64 *); +static FORCEINLINE unsigned char WINAPI InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ + return _InterlockedCompareExchange128( dest, xchg_high, xchg_low, compare ); +} + +#else + +static FORCEINLINE unsigned char InterlockedCompareExchange128( volatile __int64 *dest, __int64 xchg_high, __int64 xchg_low, __int64 *compare ) +{ +#ifdef __x86_64__ + unsigned char ret; + __asm__ __volatile__( "lock cmpxchg16b %0; setz %b2" + : "=m" (dest[0]), "=m" (dest[1]), "=r" (ret), + "=a" (compare[0]), "=d" (compare[1]) + : "m" (dest[0]), "m" (dest[1]), "3" (compare[0]), "4" (compare[1]), + "c" (xchg_high), "b" (xchg_low) ); + return ret; +#else + return __sync_bool_compare_and_swap( (__int128 *)dest, *(__int128 *)compare, ((__int128)xchg_high << 64) | xchg_low ); +#endif +} + +#endif +#endif + static FORCEINLINE void YieldProcessor(void) { #ifdef __GNUC__

1 0

Jacek Caban : include: Add MSVC ARM version of NtCurrentTeb.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 4fdea7a7cab3283e7d2eec7538f5da0493c1d68d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4fdea7a7cab3283e7d2eec75… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 26 15:55:26 2021 +0100 include: Add MSVC ARM version of NtCurrentTeb. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index e594c89419a..e19f515eddb 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -2815,6 +2815,12 @@ static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) __asm__("mrc p15, 0, %0, c13, c0, 2" : "=r" (teb)); return teb; } +#elif defined(__arm__) && defined(_MSC_VER) +#pragma intrinsic(_MoveFromCoprocessor) +static FORCEINLINE struct _TEB * WINAPI NtCurrentTeb(void) +{ + return (struct _TEB *)(ULONG_PTR)_MoveFromCoprocessor(15, 0, 13, 0, 2); +} #else extern struct _TEB * WINAPI NtCurrentTeb(void); #endif

1 0

Jacek Caban : include: Fix __dmb declaration.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: e3708c2c79d378ff53f2fe04d1fa9ececbd1f78c URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3708c2c79d378ff53f2fe04… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Feb 26 15:54:05 2021 +0100 include: Fix __dmb declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/msvcrt/intrin.h | 40 ++++++++++++++++++++++++++++++++++++++++ include/winnt.h | 13 +++++-------- 2 files changed, 45 insertions(+), 8 deletions(-) diff --git a/include/msvcrt/intrin.h b/include/msvcrt/intrin.h index 38496251d5a..781c6fac823 100644 --- a/include/msvcrt/intrin.h +++ b/include/msvcrt/intrin.h @@ -22,6 +22,46 @@ static inline void __cpuid(int info[4], int ax) } #endif +#ifdef __aarch64__ +typedef enum _tag_ARM64INTR_BARRIER_TYPE +{ + _ARM64_BARRIER_OSHLD = 0x1, + _ARM64_BARRIER_OSHST = 0x2, + _ARM64_BARRIER_OSH = 0x3, + _ARM64_BARRIER_NSHLD = 0x5, + _ARM64_BARRIER_NSHST = 0x6, + _ARM64_BARRIER_NSH = 0x7, + _ARM64_BARRIER_ISHLD = 0x9, + _ARM64_BARRIER_ISHST = 0xa, + _ARM64_BARRIER_ISH = 0xb, + _ARM64_BARRIER_LD = 0xd, + _ARM64_BARRIER_ST = 0xe, + _ARM64_BARRIER_SY = 0xf +} _ARM64INTR_BARRIER_TYPE; +#endif + +#ifdef __arm__ +typedef enum _tag_ARMINTR_BARRIER_TYPE +{ + _ARM_BARRIER_OSHST = 0x2, + _ARM_BARRIER_OSH = 0x3, + _ARM_BARRIER_NSHST = 0x6, + _ARM_BARRIER_NSH = 0x7, + _ARM_BARRIER_ISHST = 0xa, + _ARM_BARRIER_ISH = 0xb, + _ARM_BARRIER_ST = 0xe, + _ARM_BARRIER_SY = 0xf +} _ARMINTR_BARRIER_TYPE; +#endif + +#if defined(_MSC_VER) && (defined(__arm__) || defined(__aarch64__)) + +void __dmb(unsigned int); + +#pragma intrinsic(__dmb) + +#endif + #ifdef __cplusplus } #endif diff --git a/include/winnt.h b/include/winnt.h index 3a9d13b055c..e594c89419a 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -32,6 +32,11 @@ #endif +#if defined(_MSC_VER) && (defined(__arm__) || defined(__aarch64__)) +#include <intrin.h> +#endif + + #ifdef __cplusplus extern "C" { #endif @@ -7035,10 +7040,6 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__arm__) -#pragma intrinsic(__dmb) - -void __dmb(void); - static FORCEINLINE void MemoryBarrier(void) { __dmb(_ARM_BARRIER_SY); @@ -7046,10 +7047,6 @@ static FORCEINLINE void MemoryBarrier(void) #elif defined(__aarch64__) -#pragma intrinsic(__dmb) - -void __dmb(void); - static FORCEINLINE void MemoryBarrier(void) { __dmb(_ARM64_BARRIER_SY);

1 0

Dmitry Timoshkov : include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 3f951cbe727fa62cb71df1e9712488c5ed12bcee URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f951cbe727fa62cb71df1e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 26 15:53:55 2021 +0100 include/winnt.h: Fix arguments order for _InterlockedCompareExchange64() MSVC intrinsic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/winnt.h b/include/winnt.h index 48f1715c3b6..3a9d13b055c 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -6944,7 +6944,7 @@ static FORCEINLINE LONG WINAPI InterlockedCompareExchange( LONG volatile *dest, static FORCEINLINE LONGLONG WINAPI InterlockedCompareExchange64( LONGLONG volatile *dest, LONGLONG xchg, LONGLONG compare ) { - return _InterlockedCompareExchange64( (long long volatile *)dest, compare, xchg ); + return _InterlockedCompareExchange64( (long long volatile *)dest, xchg, compare ); } #ifdef _WIN64

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2021