May 2024 - Wine-commits - list.winehq.org

Alexandre Julliard : msvcrt: Add helpers to abstract RVA accesses to RTTI data.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 3447792a5ad683000bd333d59aa0a10afeab00ec URL: https://gitlab.winehq.org/wine/wine/-/commit/3447792a5ad683000bd333d59aa0a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:31:34 2024 +0200 msvcrt: Add helpers to abstract RVA accesses to RTTI data. --- dlls/msvcp90/cxx.h | 40 ++++++++++++++++++++++++++++++++++-- dlls/msvcrt/cpp.c | 54 ++++++++++++++----------------------------------- dlls/msvcrt/cppexcept.h | 2 +- dlls/msvcrt/cxx.h | 40 ++++++++++++++++++++++++++++++++++-- 4 files changed, 92 insertions(+), 44 deletions(-) diff --git a/dlls/msvcp90/cxx.h b/dlls/msvcp90/cxx.h index a7c7a86a899..c0b43f78256 100644 --- a/dlls/msvcp90/cxx.h +++ b/dlls/msvcp90/cxx.h @@ -16,8 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winternl.h" +#include "rtlsupportapi.h" #include "wine/asm.h" +#ifndef __x86_64__ +#undef RTTI_USE_RVA +#else +#define RTTI_USE_RVA 1 +#endif + #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -44,7 +53,7 @@ #endif /* _WIN64 */ -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA #define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ @@ -330,7 +339,7 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA typedef struct _rtti_base_descriptor { @@ -445,6 +454,33 @@ typedef struct extern const vtable_ptr type_info_vtable; +#ifdef RTTI_USE_RVA + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + void *base; + return (uintptr_t)RtlPcToFileHeader( (void *)ptr, &base ); +} + +static inline void *rtti_rva( unsigned int rva, uintptr_t base ) +{ + return (void *)(base + rva); +} + +#else + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + return 0; +} + +static inline void *rtti_rva( const void *ptr, uintptr_t base ) +{ + return (void *)ptr; +} + +#endif + #define CREATE_TYPE_INFO_VTABLE \ DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \ diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 943f5936a19..b98dca4ee6c 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -65,62 +65,38 @@ static inline const rtti_object_locator *get_obj_locator( void *cppobj ) return (const rtti_object_locator *)vtable[-1]; } -#ifndef __x86_64__ -static void dump_obj_locator( const rtti_object_locator *ptr ) +static uintptr_t get_obj_locator_base( const rtti_object_locator *ptr ) { - int i; - const rtti_object_hierarchy *h = ptr->type_hierarchy; - - TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", - ptr, ptr->signature, ptr->base_class_offset, ptr->flags, - ptr->type_descriptor, dbgstr_type_info(ptr->type_descriptor), ptr->type_hierarchy ); - TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", - h->signature, h->attributes, h->array_len, h->base_classes ); - for (i = 0; i < h->array_len; i++) - { - TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", - h->base_classes->bases[i], - h->base_classes->bases[i]->num_base_classes, - h->base_classes->bases[i]->offsets.this_offset, - h->base_classes->bases[i]->offsets.vbase_descr, - h->base_classes->bases[i]->offsets.vbase_offset, - h->base_classes->bases[i]->attributes, - h->base_classes->bases[i]->type_descriptor, - dbgstr_type_info(h->base_classes->bases[i]->type_descriptor) ); - } +#ifdef RTTI_USE_RVA + if (ptr->signature) return (uintptr_t)ptr - ptr->object_locator; +#endif + return rtti_rva_base( ptr ); } -#else - static void dump_obj_locator( const rtti_object_locator *ptr ) { int i; - char *base = ptr->signature == 0 ? RtlPcToFileHeader((void*)ptr, (void**)&base) : (char*)ptr - ptr->object_locator; - const rtti_object_hierarchy *h = (const rtti_object_hierarchy*)(base + ptr->type_hierarchy); - const type_info *type_descriptor = (const type_info*)(base + ptr->type_descriptor); + uintptr_t base = get_obj_locator_base( ptr ); + const rtti_object_hierarchy *h = rtti_rva( ptr->type_hierarchy, base ); + const type_info *type_descriptor = rtti_rva( ptr->type_descriptor, base ); TRACE( "%p: sig=%08x base_offset=%08x flags=%08x type=%p %s hierarchy=%p\n", ptr, ptr->signature, ptr->base_class_offset, ptr->flags, type_descriptor, dbgstr_type_info(type_descriptor), h ); TRACE( " hierarchy: sig=%08x attr=%08x len=%d base classes=%p\n", - h->signature, h->attributes, h->array_len, base + h->base_classes ); + h->signature, h->attributes, h->array_len, rtti_rva(h->base_classes, base) ); for (i = 0; i < h->array_len; i++) { - const rtti_base_descriptor *bases = (rtti_base_descriptor*)(base + - ((const rtti_base_array*)(base + h->base_classes))->bases[i]); + const rtti_base_array *base_array = rtti_rva( h->base_classes, base ); + const rtti_base_descriptor *bases = rtti_rva( base_array->bases[i], base ); TRACE( " base class %p: num %d off %d,%d,%d attr %08x type %p %s\n", - bases, - bases->num_base_classes, - bases->offsets.this_offset, - bases->offsets.vbase_descr, - bases->offsets.vbase_offset, - bases->attributes, - base + bases->type_descriptor, - dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); + bases, bases->num_base_classes, bases->offsets.this_offset, + bases->offsets.vbase_descr, bases->offsets.vbase_offset, bases->attributes, + rtti_rva( bases->type_descriptor, base ), + dbgstr_type_info((const type_info*)(base + bases->type_descriptor)) ); } } -#endif /****************************************************************** * ??0exception@@QAE(a)ABQBD@Z (MSVCRT.@) diff --git a/dlls/msvcrt/cppexcept.h b/dlls/msvcrt/cppexcept.h index 48b370d1be6..adde30b6d15 100644 --- a/dlls/msvcrt/cppexcept.h +++ b/dlls/msvcrt/cppexcept.h @@ -28,7 +28,7 @@ #define CXX_FRAME_MAGIC_VC8 0x19930522 #define CXX_EXCEPTION 0xe06d7363 -#ifdef __x86_64__ +#ifdef RTTI_USE_RVA #define CXX_EXCEPTION_PARAMS 4 #else #define CXX_EXCEPTION_PARAMS 3 diff --git a/dlls/msvcrt/cxx.h b/dlls/msvcrt/cxx.h index a7c7a86a899..c0b43f78256 100644 --- a/dlls/msvcrt/cxx.h +++ b/dlls/msvcrt/cxx.h @@ -16,8 +16,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include "windef.h" +#include "winternl.h" +#include "rtlsupportapi.h" #include "wine/asm.h" +#ifndef __x86_64__ +#undef RTTI_USE_RVA +#else +#define RTTI_USE_RVA 1 +#endif + #ifdef _WIN64 #define VTABLE_ADD_FUNC(name) "\t.quad " THISCALL_NAME(name) "\n" @@ -44,7 +53,7 @@ #endif /* _WIN64 */ -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA #define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \ static type_info name ## _type_info = { \ @@ -330,7 +339,7 @@ typedef struct int vbase_offset; /* offset of this pointer offset in virtual base class descriptor */ } this_ptr_offsets; -#ifndef __x86_64__ +#ifndef RTTI_USE_RVA typedef struct _rtti_base_descriptor { @@ -445,6 +454,33 @@ typedef struct extern const vtable_ptr type_info_vtable; +#ifdef RTTI_USE_RVA + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + void *base; + return (uintptr_t)RtlPcToFileHeader( (void *)ptr, &base ); +} + +static inline void *rtti_rva( unsigned int rva, uintptr_t base ) +{ + return (void *)(base + rva); +} + +#else + +static inline uintptr_t rtti_rva_base( const void *ptr ) +{ + return 0; +} + +static inline void *rtti_rva( const void *ptr, uintptr_t base ) +{ + return (void *)ptr; +} + +#endif + #define CREATE_TYPE_INFO_VTABLE \ DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \ void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \

1 0

Alexandre Julliard : msvcrt: Unify __RTtypeid implementation.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 04755e4aac432de9c2dad9e0a252ff8e98b8dc47 URL: https://gitlab.winehq.org/wine/wine/-/commit/04755e4aac432de9c2dad9e0a252ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:33:54 2024 +0200 msvcrt: Unify __RTtypeid implementation. --- dlls/msvcrt/cpp.c | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index b98dca4ee6c..60a3da82773 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -731,7 +731,6 @@ void CDECL unexpected(void) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ -#ifndef __x86_64__ const type_info* CDECL __RTtypeid(void *cppobj) { const type_info *ret; @@ -746,42 +745,9 @@ const type_info* CDECL __RTtypeid(void *cppobj) __TRY { const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - ret = obj_locator->type_descriptor; - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - __non_rtti_object_ctor( &e, "Bad read pointer - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - } - __ENDTRY - return ret; -} + uintptr_t base = get_obj_locator_base( obj_locator ); -#else - -const type_info* CDECL __RTtypeid(void *cppobj) -{ - const type_info *ret; - - if (!cppobj) - { - bad_typeid e; - bad_typeid_ctor( &e, "Attempted a typeid of NULL pointer!" ); - _CxxThrowException( &e, &bad_typeid_exception_type ); - } - - __TRY - { - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - char *base; - - if(obj_locator->signature == 0) - base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); - else - base = (char*)obj_locator - obj_locator->object_locator; - - ret = (type_info*)(base + obj_locator->type_descriptor); + ret = rtti_rva( obj_locator->type_descriptor, base ); } __EXCEPT_PAGE_FAULT { @@ -792,7 +758,6 @@ const type_info* CDECL __RTtypeid(void *cppobj) __ENDTRY return ret; } -#endif /****************************************************************** * __RTDynamicCast (MSVCRT.@)

1 0

Alexandre Julliard : msvcrt: Unify __RTDynamicCast implementation.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: df4c55624957f4d55ac394ed4445759b4d0d3366 URL: https://gitlab.winehq.org/wine/wine/-/commit/df4c55624957f4d55ac394ed444575… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:35:04 2024 +0200 msvcrt: Unify __RTDynamicCast implementation. --- dlls/msvcrt/cpp.c | 74 +++++-------------------------------------------------- 1 file changed, 6 insertions(+), 68 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 60a3da82773..08bed2d178c 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -781,7 +781,6 @@ const type_info* CDECL __RTtypeid(void *cppobj) * This function is usually called by compiler generated code as a result * of using one of the C++ dynamic cast statements. */ -#ifndef __x86_64__ void* CDECL __RTDynamicCast(void *cppobj, int unknown, type_info *src, type_info *dst, int do_throw) @@ -805,21 +804,23 @@ void* CDECL __RTDynamicCast(void *cppobj, int unknown, { int i; const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - const rtti_object_hierarchy *obj_bases = obj_locator->type_hierarchy; - const rtti_base_descriptor * const* base_desc = obj_bases->base_classes->bases; + uintptr_t base = get_obj_locator_base( obj_locator ); + const rtti_object_hierarchy *obj_bases = rtti_rva( obj_locator->type_hierarchy, base ); + const rtti_base_array *base_array = rtti_rva( obj_bases->base_classes, base ); if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); ret = NULL; for (i = 0; i < obj_bases->array_len; i++) { - const type_info *typ = base_desc[i]->type_descriptor; + const rtti_base_descriptor *base_desc = rtti_rva( base_array->bases[i], base ); + const type_info *typ = rtti_rva( base_desc->type_descriptor, base ); if (!strcmp(typ->mangled, dst->mangled)) { /* compute the correct this pointer for that base class */ void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; - ret = get_this_pointer( &base_desc[i]->offsets, this_ptr ); + ret = get_this_pointer( &base_desc->offsets, this_ptr ); break; } } @@ -844,69 +845,6 @@ void* CDECL __RTDynamicCast(void *cppobj, int unknown, return ret; } -#else - -void* CDECL __RTDynamicCast(void *cppobj, int unknown, - type_info *src, type_info *dst, - int do_throw) -{ - void *ret; - - if (!cppobj) return NULL; - - TRACE("obj: %p unknown: %d src: %p %s dst: %p %s do_throw: %d)\n", - cppobj, unknown, src, dbgstr_type_info(src), dst, dbgstr_type_info(dst), do_throw); - - __TRY - { - int i; - const rtti_object_locator *obj_locator = get_obj_locator( cppobj ); - const rtti_object_hierarchy *obj_bases; - const rtti_base_array *base_array; - char *base; - - if (TRACE_ON(msvcrt)) dump_obj_locator(obj_locator); - - if(obj_locator->signature == 0) - base = RtlPcToFileHeader((void*)obj_locator, (void**)&base); - else - base = (char*)obj_locator - obj_locator->object_locator; - - obj_bases = (const rtti_object_hierarchy*)(base + obj_locator->type_hierarchy); - base_array = (const rtti_base_array*)(base + obj_bases->base_classes); - - ret = NULL; - for (i = 0; i < obj_bases->array_len; i++) - { - const rtti_base_descriptor *base_desc = (const rtti_base_descriptor*)(base + base_array->bases[i]); - const type_info *typ = (const type_info*)(base + base_desc->type_descriptor); - - if (!strcmp(typ->mangled, dst->mangled)) - { - void *this_ptr = (char *)cppobj - obj_locator->base_class_offset; - ret = get_this_pointer( &base_desc->offsets, this_ptr ); - break; - } - } - if (!ret && do_throw) - { - const char *msg = "Bad dynamic_cast!"; - bad_cast e; - bad_cast_ctor( &e, &msg ); - _CxxThrowException( &e, &bad_cast_exception_type ); - } - } - __EXCEPT_PAGE_FAULT - { - __non_rtti_object e; - __non_rtti_object_ctor( &e, "Access violation - no RTTI data!" ); - _CxxThrowException( &e, &__non_rtti_object_exception_type ); - } - __ENDTRY - return ret; -} -#endif - /****************************************************************** * __RTCastToVoid (MSVCRT.@)

1 0

Alexandre Julliard : msvcrt: Unify _CxxThrowException implementation.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: 6aa08b13e9db5c98d3e98f38d2cfac02e00253d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/6aa08b13e9db5c98d3e98f38d2cfac… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:36:18 2024 +0200 msvcrt: Unify _CxxThrowException implementation. --- dlls/msvcrt/cpp.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index 08bed2d178c..c941be8fd36 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -887,28 +887,16 @@ void* CDECL __RTCastToVoid(void *cppobj) /********************************************************************* * _CxxThrowException (MSVCRT.@) */ -#ifndef __x86_64__ -void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) -{ - ULONG_PTR args[3]; - - args[0] = CXX_FRAME_MAGIC_VC6; - args[1] = (ULONG_PTR)object; - args[2] = (ULONG_PTR)type; - RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, 3, args ); -} -#else void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) { - ULONG_PTR args[4]; + ULONG_PTR args[CXX_EXCEPTION_PARAMS]; args[0] = CXX_FRAME_MAGIC_VC6; args[1] = (ULONG_PTR)object; args[2] = (ULONG_PTR)type; - RtlPcToFileHeader( (void*)type, (void**)&args[3]); - RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, 4, args ); + if (CXX_EXCEPTION_PARAMS == 4) args[3] = rtti_rva_base( type ); + RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, CXX_EXCEPTION_PARAMS, args ); } -#endif #if _MSVCR_VER >= 80

1 0

Alexandre Julliard : msvcrt: Unify _is_exception_typeof implementation.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: f7e2ac9546b808aab55535a7fed206a8761d2916 URL: https://gitlab.winehq.org/wine/wine/-/commit/f7e2ac9546b808aab55535a7fed206… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon May 20 16:37:15 2024 +0200 msvcrt: Unify _is_exception_typeof implementation. --- dlls/msvcrt/cpp.c | 47 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 41 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index c941be8fd36..7e0d3f69396 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -904,42 +904,6 @@ void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) * ?_is_exception_typeof@@YAHABVtype_info@@PAU_EXCEPTION_POINTERS@@@Z * ?_is_exception_typeof@@YAHAEBVtype_info@@PEAU_EXCEPTION_POINTERS@@@Z */ -#ifndef __x86_64__ -int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) -{ - int ret = -1; - - TRACE("(%p %p)\n", ti, ep); - - __TRY - { - EXCEPTION_RECORD *rec = ep->ExceptionRecord; - - if (is_cxx_exception( rec )) - { - const cxx_type_info_table *tit = ((cxx_exception_type*)rec->ExceptionInformation[2])->type_info_table; - int i; - - for (i=0; i<tit->count; i++) { - if (ti==tit->info[i]->type_info || !strcmp(ti->mangled, tit->info[i]->type_info->mangled)) - { - ret = 1; - break; - } - } - - if (i == tit->count) - ret = 0; - } - } - __EXCEPT_PAGE_FAULT - __ENDTRY - - if(ret == -1) - terminate(); - return ret; -} -#else int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) { int ret = -1; @@ -953,12 +917,14 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) if (is_cxx_exception( rec )) { const cxx_exception_type *et = (cxx_exception_type*)rec->ExceptionInformation[2]; - const cxx_type_info_table *tit = (const cxx_type_info_table*)(rec->ExceptionInformation[3]+et->type_info_table); + uintptr_t base = (CXX_EXCEPTION_PARAMS == 4) ? rec->ExceptionInformation[3] : 0; + const cxx_type_info_table *tit = rtti_rva( et->type_info_table, base ); int i; - for (i=0; i<tit->count; i++) { - const cxx_type_info *cti = (const cxx_type_info*)(rec->ExceptionInformation[3]+tit->info[i]); - const type_info *except_ti = (const type_info*)(rec->ExceptionInformation[3]+cti->type_info); + for (i=0; i<tit->count; i++) + { + const cxx_type_info *cti = rtti_rva( tit->info[i], base ); + const type_info *except_ti = rtti_rva( cti->type_info, base ); if (ti==except_ti || !strcmp(ti->mangled, except_ti->mangled)) { ret = 1; @@ -977,7 +943,6 @@ int __cdecl _is_exception_typeof(const type_info *ti, EXCEPTION_POINTERS *ep) terminate(); return ret; } -#endif /********************************************************************* * __clean_type_info_names_internal (MSVCR80.@)

1 0

Brendan Shanks : ntdll: Don't warn on macOS and FreeBSD when xattr doesn't exist.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: ed9ec141d527839160d9b6272e53967777887db1 URL: https://gitlab.winehq.org/wine/wine/-/commit/ed9ec141d527839160d9b6272e5396… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon May 20 12:20:30 2024 -0700 ntdll: Don't warn on macOS and FreeBSD when xattr doesn't exist. --- dlls/ntdll/unix/file.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index d292d934efa..d1a6573ed69 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1595,6 +1595,9 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret; +#endif +#ifdef ENOATTR + if (errno == ENOATTR) return ret; #endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", errno, strerror( errno ) ); @@ -1694,6 +1697,9 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) if (errno == ENOTSUP) return ret; #ifdef ENODATA if (errno == ENODATA) return ret; +#endif +#ifdef ENOATTR + if (errno == ENOATTR) return ret; #endif WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", path, errno, strerror( errno ) );

1 0

Paul Gofman : wine.inf: Add InstallationType field to CurrentVersion.
by Alexandre Julliard 20 May '24

20 May '24

Module: wine Branch: master Commit: c3d641927a3e54f35d454a83092b7d33fddd360e URL: https://gitlab.winehq.org/wine/wine/-/commit/c3d641927a3e54f35d454a83092b7d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Fri May 17 17:48:00 2024 -0600 wine.inf: Add InstallationType field to CurrentVersion. --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 4aed3e73e06..256a24bc5a1 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2520,6 +2520,7 @@ HKLM,%CurrentVersionNT%,"DigitalProductId",1,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,\ 00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00,00 HKLM,%CurrentVersionNT%,"EditionId",2,"Professional" +HKLM,%CurrentVersionNT%,"InstallationType",2,"Client" HKLM,%CurrentVersionNT%,"ProductName",2,"Windows 10 Pro" HKLM,%Control%\ProductOptions,"ProductType",2,"WinNT" HKLM,%Control%\Windows,"CSDVersion",0x10003,0

1 0

Huw Davies : maintainers: Remove Andrew Eikum.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 7a4a9983abe3452ba94d13379c255fdb49ea6229 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a4a9983abe3452ba94d13379c255f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri May 17 16:57:00 2024 +0100 maintainers: Remove Andrew Eikum. As discussed with Andrew privately. --- MAINTAINERS | 6 ------ 1 file changed, 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 22979d93ea1..d6631b1d69c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -37,7 +37,6 @@ F: dlls/ntdll/signal_arm* F: programs/winedbg/be_arm* Audio I/O -P: Andrew Eikum <coldpie(a)fastmail.com> P: Huw Davies <huw(a)codeweavers.com> F: dlls/dsound/ F: dlls/mmdevapi/ @@ -206,11 +205,6 @@ F: dlls/winexinput.sys/ F: dlls/winmm/joystick.c F: dlls/xinput*/ -Media format conversion -P: Andrew Eikum <coldpie(a)fastmail.com> -F: dlls/*.acm/ -F: dlls/msacm32/ - Media Foundation GStreamer backend M: Rémi Bernon <rbernon(a)codeweavers.com> P: Nikolay Sivov <nsivov(a)codeweavers.com>

1 0

Fabian Maurer : win32u: Factor out scroll timer handling.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: ea078cf4790afc18e2006a7f71ec55d47f318b4a URL: https://gitlab.winehq.org/wine/wine/-/commit/ea078cf4790afc18e2006a7f71ec55… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Mon May 13 18:17:35 2024 +0200 win32u: Factor out scroll timer handling. --- dlls/win32u/scroll.c | 65 +++++++++++++++------------------------------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index f72ef0c2929..5ea35f1d908 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -512,6 +512,21 @@ static POINT clip_scroll_pos( RECT *rect, POINT pt ) return pt; } +void update_scroll_timer(HWND hwnd, HWND owner_hwnd, HWND ctl_hwnd, enum SCROLL_HITTEST hittest, UINT msg, UINT msg_send, BOOL vertical ) +{ + if (hittest == g_tracking_info.hit_test) + { + if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) + { + send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, msg_send, (LPARAM)ctl_hwnd ); + } + + NtUserSetSystemTimer( hwnd, SCROLL_TIMER, + msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); + } + else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); +} + /*********************************************************************** * handle_scroll_event * @@ -681,33 +696,12 @@ void handle_scroll_event( HWND hwnd, int bar, UINT msg, POINT pt ) case SCROLL_TOP_ARROW: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, TRUE, FALSE ); - if (hittest == g_tracking_info.hit_test) - { - if ((msg == WM_LBUTTONDOWN) || (msg == WM_SYSTIMER)) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_LINEUP, (LPARAM)ctl_hwnd ); - } - - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_LINEUP, vertical ); break; case SCROLL_TOP_RECT: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, FALSE, TRUE ); - if (hittest == g_tracking_info.hit_test) - { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_PAGEUP, (LPARAM)ctl_hwnd ); - } - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_PAGEUP, vertical ); break; case SCROLL_THUMB: @@ -755,33 +749,12 @@ void handle_scroll_event( HWND hwnd, int bar, UINT msg, POINT pt ) case SCROLL_BOTTOM_RECT: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, FALSE, TRUE ); - if (hittest == g_tracking_info.hit_test) - { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_PAGEDOWN, (LPARAM)ctl_hwnd ); - } - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_PAGEDOWN, vertical ); break; case SCROLL_BOTTOM_ARROW: draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, TRUE, FALSE ); - if (hittest == g_tracking_info.hit_test) - { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) - { - send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, - SB_LINEDOWN, (LPARAM)ctl_hwnd ); - } - - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); - } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + update_scroll_timer( hwnd, owner_hwnd, ctl_hwnd, hittest, msg, SB_LINEDOWN, vertical ); break; }

1 0

Fabian Maurer : win32u: Only set scroll timer if it's not running.
by Alexandre Julliard 17 May '24

17 May '24

Module: wine Branch: master Commit: 171e0adde5f9fc675b9f7d3ec10dae20cb4b0156 URL: https://gitlab.winehq.org/wine/wine/-/commit/171e0adde5f9fc675b9f7d3ec10dae… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 15 21:32:12 2024 +0200 win32u: Only set scroll timer if it's not running. This fixes a regression from bb496ea8 where we got a WM_MOUSEMOVE and this leads to skipping the initial scroll delay. Also closer mimics windows behavior, moving the mouse should not reset the scrolling timer. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56582 --- dlls/win32u/scroll.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/scroll.c b/dlls/win32u/scroll.c index 5ea35f1d908..f34fe80c7e6 100644 --- a/dlls/win32u/scroll.c +++ b/dlls/win32u/scroll.c @@ -62,6 +62,9 @@ static struct SCROLL_TRACKING_INFO g_tracking_info; /* Is the moving thumb being displayed? */ static BOOL scroll_moving_thumb = FALSE; +/* is there currently a running timer for scrolling delay ?*/ +static BOOL scroll_timer_running = FALSE; + /* data for window that has (one or two) scroll bars */ struct win_scroll_bar_info { @@ -516,15 +519,19 @@ void update_scroll_timer(HWND hwnd, HWND owner_hwnd, HWND ctl_hwnd, enum SCROLL_ { if (hittest == g_tracking_info.hit_test) { - if (msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) + if (!scroll_timer_running || msg == WM_LBUTTONDOWN || msg == WM_SYSTIMER) { send_message( owner_hwnd, vertical ? WM_VSCROLL : WM_HSCROLL, msg_send, (LPARAM)ctl_hwnd ); + scroll_timer_running = TRUE; + NtUserSetSystemTimer( hwnd, SCROLL_TIMER, + msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); } - - NtUserSetSystemTimer( hwnd, SCROLL_TIMER, - msg == WM_LBUTTONDOWN ? SCROLL_FIRST_DELAY : SCROLL_REPEAT_DELAY ); } - else NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + else + { + scroll_timer_running = FALSE; + NtUserKillSystemTimer( hwnd, SCROLL_TIMER ); + } } /*********************************************************************** @@ -789,6 +796,7 @@ void handle_scroll_event( HWND hwnd, int bar, UINT msg, POINT pt ) /* Terminate tracking */ g_tracking_info.win = 0; scroll_moving_thumb = FALSE; + scroll_timer_running = FALSE; hittest = SCROLL_NOWHERE; draw_scroll_bar( hwnd, hdc, bar, hittest, &g_tracking_info, TRUE, TRUE ); }

1 0