February 2021 - Wine-commits

Rémi Bernon : widl: Strip last separator in append_namespaces if suffix is NULL.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: 5f6fdb183880a60ce06e2488329c5493dcb5997c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f6fdb183880a60ce06e2488… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 26 09:43:05 2021 +0100 widl: Strip last separator in append_namespaces if suffix is NULL. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typetree.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 6522e09dacf..9220cfb50e9 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -124,7 +124,12 @@ static size_t append_namespaces(char **buf, size_t *len, size_t pos, struct name size_t n = 0; n += strappend(buf, len, pos + n, "%s", prefix); if (nested) n += append_namespace(buf, len, pos + n, namespace, separator, abi_prefix); - n += strappend(buf, len, pos + n, "%s", suffix); + if (suffix) n += strappend(buf, len, pos + n, "%s", suffix); + else if (nested) + { + n -= strlen(separator); + (*buf)[n] = 0; + } return n; }

1 0

Rémi Bernon : widl: Generate helper macros for WinRT implementation.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: dc65f8865458e44c5c1f712a771565843bae923a URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc65f8865458e44c5c1f712a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Feb 26 09:43:06 2021 +0100 widl: Generate helper macros for WinRT implementation. This generates additional macros to help keeping implementation simple, guarded with WIDL_using ifdefs, like this: #ifdef WIDL_using_Windows_Foo #define IFooVtbl __x_ABI_CWindows_CFoo_CIFooVtbl #define IFoo __x_ABI_CWindows_CFoo_CIFoo #define IFoo_DoFoo __x_ABI_CWindows_CFoo_CIFoo_DoFoo #endif /* WIDL_using_Windows_Foo */ Implementation files can define the desired WIDL_using preprocessor macros before including the header, and then implement or use the interface methods with the simple non-prefixed names instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ tools/widl/typetree.c | 19 +++++++++++++++++++ tools/widl/widltypes.h | 1 + 3 files changed, 65 insertions(+) diff --git a/tools/widl/header.c b/tools/widl/header.c index cb0dc2f43a3..16c8b57fd6e 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -48,6 +48,8 @@ static void write_type_v(FILE *f, const decl_spec_t *t, int is_field, int declon static void write_apicontract_guard_start(FILE *header, const expr_t *expr); static void write_apicontract_guard_end(FILE *header, const expr_t *expr); +static void write_widl_using_macros(FILE *header, type_t *iface); + static void indent(FILE *h, int delta) { int c; @@ -634,6 +636,7 @@ static void write_type_definition(FILE *f, type_t *t, int declonly) fprintf(f, "#else\n"); write_type_left(f, &ds, NAME_C, declonly, TRUE); fprintf(f, ";\n"); + if (winrt_mode) write_widl_using_macros(f, t); fprintf(f, "#endif\n\n"); } if (contract) write_apicontract_guard_end(f, contract); @@ -1644,6 +1647,47 @@ static void write_com_interface_start(FILE *header, const type_t *iface) fprintf(header,"#define __%s_%sINTERFACE_DEFINED__\n\n", iface->c_name, dispinterface ? "DISP" : ""); } +static void write_widl_using_method_macros(FILE *header, const type_t *iface, const type_t *top_iface) +{ + const statement_t *stmt; + const char *name = top_iface->short_name ? top_iface->short_name : top_iface->name; + + if (type_iface_get_inherit(iface)) write_widl_using_method_macros(header, type_iface_get_inherit(iface), top_iface); + + STATEMENTS_FOR_EACH_FUNC(stmt, type_iface_get_stmts(iface)) + { + const var_t *func = stmt->u.var; + const char *func_name; + + if (is_override_method(iface, top_iface, func)) continue; + if (is_callas(func->attrs)) continue; + + func_name = get_name(func); + fprintf(header, "#define %s_%s %s_%s\n", name, func_name, top_iface->c_name, func_name); + } +} + +static void write_widl_using_macros(FILE *header, type_t *iface) +{ + const UUID *uuid = get_attrp(iface->attrs, ATTR_UUID); + const char *name = iface->short_name ? iface->short_name : iface->name; + char *macro; + + if (!strcmp(iface->name, iface->c_name)) return; + + macro = format_namespace(iface->namespace, "WIDL_using_", "_", NULL, NULL); + fprintf(header, "#ifdef %s\n", macro); + + if (uuid) fprintf(header, "#define IID_%s IID_%s\n", name, iface->c_name); + if (iface->type_type == TYPE_INTERFACE) fprintf(header, "#define %sVtbl %sVtbl\n", name, iface->c_name); + fprintf(header, "#define %s %s\n", name, iface->c_name); + + if (iface->type_type == TYPE_INTERFACE) write_widl_using_method_macros(header, iface, iface); + + fprintf(header, "#endif /* %s */\n", macro); + free(macro); +} + static void write_com_interface_end(FILE *header, type_t *iface) { int dispinterface = is_attr(iface->attrs, ATTR_DISPINTERFACE); @@ -1721,6 +1765,7 @@ static void write_com_interface_end(FILE *header, type_t *iface) fprintf(header, "#else\n"); write_inline_wrappers(header, type, type, iface->c_name); fprintf(header, "#endif\n"); + if (winrt_mode) write_widl_using_macros(header, iface); fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n"); diff --git a/tools/widl/typetree.c b/tools/widl/typetree.c index 9220cfb50e9..a1e7abc31e5 100644 --- a/tools/widl/typetree.c +++ b/tools/widl/typetree.c @@ -53,6 +53,7 @@ type_t *make_type(enum type_type type) t->signature = NULL; t->qualified_name = NULL; t->impl_name = NULL; + t->short_name = NULL; memset(&t->details, 0, sizeof(t->details)); t->typestring_offset = 0; t->ptrdesc = 0; @@ -347,6 +348,22 @@ static char *format_parameterized_type_signature(type_t *type, typeref_list_t *p return buf; } +static char *format_parameterized_type_short_name(type_t *type, typeref_list_t *params, const char *prefix) +{ + size_t len = 0, pos = 0; + char *buf = NULL; + typeref_t *ref; + + pos += strappend(&buf, &len, pos, "%s%s", prefix, type->name); + if (params) LIST_FOR_EACH_ENTRY(ref, params, typeref_t, entry) + { + type = type_pointer_get_root_type(ref->type); + pos += strappend(&buf, &len, pos, "_%s", type->name); + } + + return buf; +} + static char *format_parameterized_type_impl_name(type_t *type, typeref_list_t *params, const char *prefix) { size_t len = 0, pos = 0; @@ -1201,11 +1218,13 @@ type_t *type_parameterized_type_specialize_declare(type_t *type, typeref_list_t new_type->name = format_parameterized_type_name(type, params); reg_type(new_type, new_type->name, new_type->namespace, 0); new_type->c_name = format_parameterized_type_c_name(type, params, ""); + new_type->short_name = format_parameterized_type_short_name(type, params, ""); if (new_type->type_type == TYPE_DELEGATE) { new_type->details.delegate.iface = duptype(tmpl->details.delegate.iface, 0); compute_delegate_iface_names(new_type, type, params); + new_type->details.delegate.iface->short_name = format_parameterized_type_short_name(type, params, "I"); } return new_type; diff --git a/tools/widl/widltypes.h b/tools/widl/widltypes.h index d37d732744b..0ecd8f34d6a 100644 --- a/tools/widl/widltypes.h +++ b/tools/widl/widltypes.h @@ -505,6 +505,7 @@ struct _type_t { const char *signature; const char *qualified_name; const char *impl_name; + const char *short_name; unsigned int typestring_offset; unsigned int ptrdesc; /* used for complex structs */ int typelib_idx;

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

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

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: 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 : 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

Alexandre Julliard : joy.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: ec9a3d99062504c5b249fbd1e62cb4359cc03836 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec9a3d99062504c5b249fbd1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:43 2021 +0100 joy.cpl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/joy.cpl/Makefile.in | 2 +- dlls/joy.cpl/main.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/joy.cpl/Makefile.in b/dlls/joy.cpl/Makefile.in index d1b0e45552e..db6883bb121 100644 --- a/dlls/joy.cpl/Makefile.in +++ b/dlls/joy.cpl/Makefile.in @@ -1,7 +1,7 @@ MODULE = joy.cpl IMPORTS = dxguid dinput dinput8 ole32 comctl32 user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ main.c diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c index 66ac58f7038..3ea417843f4 100644 --- a/dlls/joy.cpl/main.c +++ b/dlls/joy.cpl/main.c @@ -47,9 +47,6 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) switch (reason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: DisableThreadLibraryCalls(hdll); hcpl = hdll;

1 0

Alexandre Julliard : localspl: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: ade15558dbb87fbceb3e59fc9385ebf86a928723 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ade15558dbb87fbceb3e59fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 11:40:32 2021 +0100 localspl: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/localspl/Makefile.in | 3 +-- dlls/localspl/localmon.c | 18 +++++++++++++ dlls/localspl/localspl_main.c | 55 ---------------------------------------- dlls/localspl/localspl_private.h | 4 --- dlls/localspl/provider.c | 16 +++--------- 5 files changed, 22 insertions(+), 74 deletions(-) diff --git a/dlls/localspl/Makefile.in b/dlls/localspl/Makefile.in index abff68a499b..4b0ec9509d0 100644 --- a/dlls/localspl/Makefile.in +++ b/dlls/localspl/Makefile.in @@ -1,11 +1,10 @@ MODULE = localspl.dll IMPORTS = spoolss user32 advapi32 -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ localmon.c \ - localspl_main.c \ provider.c RC_SRCS = localspl.rc diff --git a/dlls/localspl/localmon.c b/dlls/localspl/localmon.c index 19a74566503..d4346505319 100644 --- a/dlls/localspl/localmon.c +++ b/dlls/localspl/localmon.c @@ -81,6 +81,24 @@ static struct list xcv_handles = LIST_INIT( xcv_handles ); static const WCHAR WinNT_CV_PortsW[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Ports"; static const WCHAR WinNT_CV_WindowsW[] = L"Software\\Microsoft\\Windows NT\\CurrentVersion\\Windows"; +static HINSTANCE LOCALSPL_hInstance; + +/***************************************************** + * DllMain + */ +BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) +{ + TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); + + switch(fdwReason) + { + case DLL_PROCESS_ATTACH: + DisableThreadLibraryCalls( hinstDLL ); + LOCALSPL_hInstance = hinstDLL; + break; + } + return TRUE; +} /****************************************************************** * does_port_exist (internal) diff --git a/dlls/localspl/localspl_main.c b/dlls/localspl/localspl_main.c deleted file mode 100644 index 48db9c31a6f..00000000000 --- a/dlls/localspl/localspl_main.c +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Implementation of the Local Printprovider/ Printmonitor/ Prontprocessor - * - * Copyright 2006-2009 Detlef Riekenberg - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" - -#include "wine/debug.h" -#include "localspl_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(localspl); - - -HINSTANCE LOCALSPL_hInstance = NULL; - -/***************************************************** - * DllMain - */ -BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - TRACE("(%p, %d, %p)\n",hinstDLL, fdwReason, lpvReserved); - - switch(fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls( hinstDLL ); - LOCALSPL_hInstance = hinstDLL; - setup_provider(); - break; - } - return TRUE; -} diff --git a/dlls/localspl/localspl_private.h b/dlls/localspl/localspl_private.h index f27005c16de..ed44b1413c9 100644 --- a/dlls/localspl/localspl_private.h +++ b/dlls/localspl/localspl_private.h @@ -23,10 +23,6 @@ #include <windef.h> -/* ## DLL-wide Globals ## */ -extern HINSTANCE LOCALSPL_hInstance DECLSPEC_HIDDEN; -void setup_provider(void) DECLSPEC_HIDDEN; - /* ## Resource-ID ## */ #define IDS_LOCALPORT 500 #define IDS_LOCALMONITOR 507 diff --git a/dlls/localspl/provider.c b/dlls/localspl/provider.c index 93a457ab0ba..7dde72d323d 100644 --- a/dlls/localspl/provider.c +++ b/dlls/localspl/provider.c @@ -99,8 +99,6 @@ typedef struct { static struct list monitor_handles = LIST_INIT( monitor_handles ); static monitor_t * pm_localport; -static const PRINTPROVIDOR * pprovider = NULL; - static const WCHAR fmt_driversW[] = L"System\\CurrentControlSet\\control\\Print\\Environments\\%s\\Drivers%s"; static const WCHAR fmt_printprocessorsW[] = @@ -2508,12 +2506,7 @@ static BOOL WINAPI fpXcvData(HANDLE hXcv, LPCWSTR pszDataName, PBYTE pInputData, return TRUE; } -/***************************************************** - * setup_provider [internal] - */ -void setup_provider(void) -{ - static const PRINTPROVIDOR backend = { +static const PRINTPROVIDOR backend = { fpOpenPrinter, NULL, /* fpSetJob */ NULL, /* fpGetJob */ @@ -2600,10 +2593,7 @@ void setup_provider(void) NULL, /* fpFlushPrinter */ NULL, /* fpSendRecvBidiData */ NULL /* fpAddDriverCatalog */ - }; - pprovider = &backend; - -} +}; /***************************************************** * InitializePrintProvidor (localspl.@) @@ -2631,7 +2621,7 @@ BOOL WINAPI InitializePrintProvidor(LPPRINTPROVIDOR pPrintProvidor, { TRACE("(%p, %u, %s)\n", pPrintProvidor, cbPrintProvidor, debugstr_w(pFullRegistryPath)); - memcpy(pPrintProvidor, pprovider, + memcpy(pPrintProvidor, &backend, (cbPrintProvidor < sizeof(PRINTPROVIDOR)) ? cbPrintProvidor : sizeof(PRINTPROVIDOR)); return TRUE;

1 0

Alexandre Julliard : mscoree: Use --prefer-native instead of DLL_WINE_PREATTACH.
by Alexandre Julliard 26 Feb '21

26 Feb '21

Module: wine Branch: master Commit: ce90e69eeb330656c066e232bf6b5ac93ea30245 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce90e69eeb330656c066e232… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Feb 26 10:22:51 2021 +0100 mscoree: Use --prefer-native instead of DLL_WINE_PREATTACH. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/Makefile.in | 2 +- dlls/mscoree/mscoree_main.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mscoree/Makefile.in b/dlls/mscoree/Makefile.in index 5302e45e1a1..a36e11ee3ac 100644 --- a/dlls/mscoree/Makefile.in +++ b/dlls/mscoree/Makefile.in @@ -1,7 +1,7 @@ MODULE = mscoree.dll IMPORTS = dbghelp uuid shell32 advapi32 ole32 oleaut32 shlwapi -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native C_SRCS = \ assembly.c \ diff --git a/dlls/mscoree/mscoree_main.c b/dlls/mscoree/mscoree_main.c index 4679d79e662..59cb17a0357 100644 --- a/dlls/mscoree/mscoree_main.c +++ b/dlls/mscoree/mscoree_main.c @@ -224,8 +224,6 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) switch (fdwReason) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ case DLL_PROCESS_ATTACH: runtimehost_init(); DisableThreadLibraryCalls(hinstDLL);

1 0