- Wine-Commits - list.winehq.org

Alexandre Julliard : msvcrt: Use the official definitions for exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 8739aef4ff31c6cf4e8a625cf430e3d0ac6334d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/8739aef4ff31c6cf4e8a625cf430e3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:24:17 2024 +0100 msvcrt: Use the official definitions for exception flags. --- dlls/msvcrt/cpp.c | 4 ++-- dlls/msvcrt/except_i386.c | 14 +++++++------- dlls/msvcrt/except_x86_64.c | 4 ++-- dlls/msvcrt/exception_ptr.c | 6 +++--- dlls/msvcrt/handler4.c | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/msvcrt/cpp.c b/dlls/msvcrt/cpp.c index ce89f5fb0b4..7e59aaf78c6 100644 --- a/dlls/msvcrt/cpp.c +++ b/dlls/msvcrt/cpp.c @@ -1024,7 +1024,7 @@ void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) args[0] = CXX_FRAME_MAGIC_VC6; args[1] = (ULONG_PTR)object; args[2] = (ULONG_PTR)type; - RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 3, args ); + RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, 3, args ); } #else void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) @@ -1035,7 +1035,7 @@ void WINAPI _CxxThrowException( void *object, const cxx_exception_type *type ) args[1] = (ULONG_PTR)object; args[2] = (ULONG_PTR)type; RtlPcToFileHeader( (void*)type, (void**)&args[3]); - RaiseException( CXX_EXCEPTION, EH_NONCONTINUABLE, 4, args ); + RaiseException( CXX_EXCEPTION, EXCEPTION_NONCONTINUABLE, 4, args ); } #endif diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index a870b26edaa..45e6558fcf1 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -332,7 +332,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG { catch_func_nested_frame *nested_frame = (catch_func_nested_frame *)frame; - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (rec->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { __CxxUnregisterExceptionObject(&nested_frame->frame_info, FALSE); return ExceptionContinueSearch; @@ -351,7 +351,7 @@ static DWORD catch_function_nested_handler( EXCEPTION_RECORD *rec, EXCEPTION_REG { /* exception was rethrown */ *rec = *prev_rec; - rec->ExceptionFlags &= ~EH_UNWINDING; + rec->ExceptionFlags &= ~EXCEPTION_UNWINDING; if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) @@ -569,7 +569,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame (rec->ExceptionCode != CXX_EXCEPTION)) return ExceptionContinueSearch; /* handle only c++ exceptions */ - if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) + if (rec->ExceptionFlags & (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND)) { if (descr->unwind_count && !nested_frame) cxx_local_unwind( frame, descr, -1 ); return ExceptionContinueSearch; @@ -584,7 +584,7 @@ DWORD CDECL cxx_frame_handler( PEXCEPTION_RECORD rec, cxx_exception_frame* frame rec->ExceptionInformation[1] == 0 && rec->ExceptionInformation[2] == 0) { *rec = *msvcrt_get_thread_data()->exc_record; - rec->ExceptionFlags &= ~EH_UNWINDING; + rec->ExceptionFlags &= ~EXCEPTION_UNWINDING; if(TRACE_ON(seh)) { TRACE("detect rethrow: exception code: %lx\n", rec->ExceptionCode); if(rec->ExceptionCode == CXX_EXCEPTION) @@ -759,7 +759,7 @@ static DWORD MSVCRT_nested_handler(PEXCEPTION_RECORD rec, PCONTEXT context, EXCEPTION_REGISTRATION_RECORD** dispatch) { - if (!(rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND))) + if (!(rec->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND))) return ExceptionContinueSearch; *dispatch = frame; return ExceptionCollidedUnwind; @@ -874,7 +874,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec, __asm__ __volatile__ ("cld"); - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (rec->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { /* Unwinding the current frame */ msvcrt_local_unwind2(frame, TRYLEVEL_END, &frame->_ebp); @@ -945,7 +945,7 @@ int CDECL _except_handler4_common( ULONG *cookie, void (*check_cookie)(void), /* FIXME: no cookie validation yet */ - if (rec->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (rec->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { /* Unwinding the current frame */ msvcrt_local_unwind4( cookie, frame, -2, &frame->_ebp ); diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index 9b8db6d0d67..8b37e13cb77 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -564,9 +564,9 @@ static DWORD cxx_frame_handler(EXCEPTION_RECORD *rec, ULONG64 frame, } } - if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) + if (rec->ExceptionFlags & (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND)) { - if (rec->ExceptionFlags & EH_TARGET_UNWIND) + if (rec->ExceptionFlags & EXCEPTION_TARGET_UNWIND) cxx_local_unwind(orig_frame, dispatch, descr, cxx_is_consolidate(rec) ? rec->ExceptionInformation[3] : trylevel); else diff --git a/dlls/msvcrt/exception_ptr.c b/dlls/msvcrt/exception_ptr.c index bd341ac49a1..34c2bcdc4ea 100644 --- a/dlls/msvcrt/exception_ptr.c +++ b/dlls/msvcrt/exception_ptr.c @@ -169,7 +169,7 @@ void __cdecl __ExceptionPtrRethrow(const exception_ptr *ep) return; } - RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), + RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & ~EXCEPTION_UNWINDING, ep->rec->NumberParameters, ep->rec->ExceptionInformation); } @@ -306,7 +306,7 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->ExceptionFlags = EXCEPTION_NONCONTINUABLE; ep->rec->NumberParameters = 3; ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; @@ -344,7 +344,7 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->ExceptionFlags = EXCEPTION_NONCONTINUABLE; ep->rec->NumberParameters = 4; ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; diff --git a/dlls/msvcrt/handler4.c b/dlls/msvcrt/handler4.c index 40cb1a7c3b8..2e225b21458 100644 --- a/dlls/msvcrt/handler4.c +++ b/dlls/msvcrt/handler4.c @@ -736,12 +736,12 @@ static DWORD cxx_frame_handler4(EXCEPTION_RECORD *rec, ULONG64 frame, TRACE("setting orig_frame to %Ix\n", orig_frame); } - if (rec->ExceptionFlags & (EH_UNWINDING|EH_EXIT_UNWIND)) + if (rec->ExceptionFlags & (EXCEPTION_UNWINDING|EXCEPTION_EXIT_UNWIND)) { int last_level = -1; - if ((rec->ExceptionFlags & EH_TARGET_UNWIND) && cxx_is_consolidate(rec)) + if ((rec->ExceptionFlags & EXCEPTION_TARGET_UNWIND) && cxx_is_consolidate(rec)) last_level = rec->ExceptionInformation[3]; - else if ((rec->ExceptionFlags & EH_TARGET_UNWIND) && rec->ExceptionCode == STATUS_LONGJUMP) + else if ((rec->ExceptionFlags & EXCEPTION_TARGET_UNWIND) && rec->ExceptionCode == STATUS_LONGJUMP) last_level = ip_to_state4(rva_to_ptr(descr->ip_map, dispatch->ImageBase), descr->ip_count, dispatch, dispatch->TargetIp);

1 0

Alexandre Julliard : msvcp90: Use the official definitions for exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 35ef1be8ef6fe2c4b1d7687250ddb5061adc8435 URL: https://gitlab.winehq.org/wine/wine/-/commit/35ef1be8ef6fe2c4b1d7687250ddb5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:23:57 2024 +0100 msvcp90: Use the official definitions for exception flags. --- dlls/msvcp90/exception.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcp90/exception.c b/dlls/msvcp90/exception.c index c881b37cd97..052172d2d09 100644 --- a/dlls/msvcp90/exception.c +++ b/dlls/msvcp90/exception.c @@ -1094,7 +1094,7 @@ static void exception_ptr_rethrow(const exception_ptr *ep) return; } - RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & (~EH_UNWINDING), + RaiseException(ep->rec->ExceptionCode, ep->rec->ExceptionFlags & ~EXCEPTION_UNWINDING, ep->rec->NumberParameters, ep->rec->ExceptionInformation); } @@ -1424,7 +1424,7 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->ExceptionFlags = EXCEPTION_NONCONTINUABLE; ep->rec->NumberParameters = 3; ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; ep->rec->ExceptionInformation[2] = (ULONG_PTR)type; @@ -1462,7 +1462,7 @@ void __cdecl __ExceptionPtrCopyException(exception_ptr *ep, memset(ep->rec, 0, sizeof(EXCEPTION_RECORD)); ep->rec->ExceptionCode = CXX_EXCEPTION; - ep->rec->ExceptionFlags = EH_NONCONTINUABLE; + ep->rec->ExceptionFlags = EXCEPTION_NONCONTINUABLE; ep->rec->NumberParameters = 4; ep->rec->ExceptionInformation[0] = CXX_FRAME_MAGIC_VC6; ep->rec->ExceptionInformation[2] = (ULONG_PTR)type;

1 0

Alexandre Julliard : wow64: Use the official definitions for exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 18543523e863eddfac753e429587f18c651a77f7 URL: https://gitlab.winehq.org/wine/wine/-/commit/18543523e863eddfac753e429587f1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:25:11 2024 +0100 wow64: Use the official definitions for exception flags. --- dlls/wow64/syscall.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 9f1f324ce35..1b52db370a3 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -127,7 +127,7 @@ void __cdecl __wine_spec_unimplemented_stub( const char *module, const char *fun EXCEPTION_RECORD record; record.ExceptionCode = EXCEPTION_WINE_STUB; - record.ExceptionFlags = EH_NONCONTINUABLE; + record.ExceptionFlags = EXCEPTION_NONCONTINUABLE; record.ExceptionRecord = NULL; record.ExceptionAddress = __wine_spec_unimplemented_stub; record.NumberParameters = 2; @@ -1410,7 +1410,7 @@ NTSTATUS WINAPI Wow64RaiseException( int code, EXCEPTION_RECORD *rec ) break; case 0x29: /* __fastfail */ int_rec.ExceptionCode = STATUS_STACK_BUFFER_OVERRUN; - int_rec.ExceptionFlags = EH_NONCONTINUABLE; + int_rec.ExceptionFlags = EXCEPTION_NONCONTINUABLE; int_rec.NumberParameters = 1; int_rec.ExceptionInformation[0] = ctx32.i386.Ecx; first_chance = FALSE;

1 0

Alexandre Julliard : ntdll: Use the official definitions for exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 97259a304968f3ec4bd2f2a58fffc6da51609f38 URL: https://gitlab.winehq.org/wine/wine/-/commit/97259a304968f3ec4bd2f2a58fffc6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:18:56 2024 +0100 ntdll: Use the official definitions for exception flags. --- dlls/ntdll/exception.c | 8 +++---- dlls/ntdll/loader.c | 2 +- dlls/ntdll/signal_arm.c | 28 ++++++++++++------------ dlls/ntdll/signal_arm64.c | 28 ++++++++++++------------ dlls/ntdll/signal_i386.c | 14 ++++++------ dlls/ntdll/signal_x86_64.c | 28 ++++++++++++------------ dlls/ntdll/tests/exception.c | 48 +++++++++++++++++++---------------------- dlls/ntdll/unix/signal_arm.c | 4 ++-- dlls/ntdll/unix/signal_arm64.c | 4 ++-- dlls/ntdll/unix/signal_i386.c | 4 ++-- dlls/ntdll/unix/signal_x86_64.c | 4 ++-- dlls/ntdll/unix/thread.c | 2 +- 12 files changed, 85 insertions(+), 89 deletions(-)

1 0

Alexandre Julliard : kernelbase: Use the official definitions for exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 0698f732af10d00fc359847954c1dcf6ee316a8f URL: https://gitlab.winehq.org/wine/wine/-/commit/0698f732af10d00fc359847954c1dc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:23:20 2024 +0100 kernelbase: Use the official definitions for exception flags. --- dlls/kernelbase/debug.c | 2 +- dlls/kernelbase/loader.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/kernelbase/debug.c b/dlls/kernelbase/debug.c index 43714c3be2e..8eb5094dbef 100644 --- a/dlls/kernelbase/debug.c +++ b/dlls/kernelbase/debug.c @@ -363,7 +363,7 @@ void WINAPI DECLSPEC_HOTPATCH RaiseException( DWORD code, DWORD flags, DWORD cou EXCEPTION_RECORD record; record.ExceptionCode = code; - record.ExceptionFlags = flags & EH_NONCONTINUABLE; + record.ExceptionFlags = flags & EXCEPTION_NONCONTINUABLE; record.ExceptionRecord = NULL; record.ExceptionAddress = RaiseException; if (count && args) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index 59b91596f13..e0be2a88d2b 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -209,7 +209,7 @@ FARPROC WINAPI DECLSPEC_HOTPATCH DelayLoadFailureHook( LPCSTR name, LPCSTR funct ERR( "failed to delay load %s.%u\n", name, LOWORD(function) ); args[0] = (ULONG_PTR)name; args[1] = (ULONG_PTR)function; - RaiseException( EXCEPTION_WINE_STUB, EH_NONCONTINUABLE, 2, args ); + RaiseException( EXCEPTION_WINE_STUB, EXCEPTION_NONCONTINUABLE, 2, args ); return NULL; }

1 0

Alexandre Julliard : krnl386.exe: Use the official definitions for exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 9c5df8004d3a4f1e4ecef3f9ab2393f561365587 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c5df8004d3a4f1e4ecef3f9ab2393… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:23:36 2024 +0100 krnl386.exe: Use the official definitions for exception flags. --- dlls/krnl386.exe16/wowthunk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/krnl386.exe16/wowthunk.c b/dlls/krnl386.exe16/wowthunk.c index 22471d6d612..b729c38e8f1 100644 --- a/dlls/krnl386.exe16/wowthunk.c +++ b/dlls/krnl386.exe16/wowthunk.c @@ -142,7 +142,7 @@ static BOOL fix_selector( CONTEXT *context ) static DWORD call16_handler( EXCEPTION_RECORD *record, EXCEPTION_REGISTRATION_RECORD *frame, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { /* unwinding: restore the stack pointer in the TEB, and leave the Win16 mutex */ STACK32FRAME *frame32 = CONTAINING_RECORD(frame, STACK32FRAME, frame);

1 0

Jacek Caban : winebuild: Output load config on PE targets.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 7a66313cfb6a2aeb68864ea1a9c3cfb7ca82a994 URL: https://gitlab.winehq.org/wine/wine/-/commit/7a66313cfb6a2aeb68864ea1a9c3cf… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 29 01:10:52 2024 +0100 winebuild: Output load config on PE targets. --- dlls/winecrt0/arm64ec.c | 22 ------------- tools/winebuild/spec32.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+), 22 deletions(-) diff --git a/dlls/winecrt0/arm64ec.c b/dlls/winecrt0/arm64ec.c index 949de0a4e0c..64bb001274a 100644 --- a/dlls/winecrt0/arm64ec.c +++ b/dlls/winecrt0/arm64ec.c @@ -102,26 +102,4 @@ asm( "\t.section .rdata,\"dr\"\n" "\t.rva __os_arm64x_helper7\n" "\t.rva __os_arm64x_helper8\n" ); -asm( "\t.section .rdata,\"dr\"\n" - "\t.globl _load_config_used\n" - "\t.balign 8\n" - "_load_config_used:\n" - "\t.word 0x140\n" - "\t.fill 0x54, 1, 0\n" - "\t.xword 0\n" /* FIXME: __security_cookie */ - "\t.fill 0x10, 1, 0\n" - "\t.xword __guard_check_icall_fptr\n" - "\t.xword __guard_dispatch_icall_fptr\n" - "\t.xword __guard_fids_table\n" - "\t.xword __guard_fids_count\n" - "\t.xword __guard_flags\n" - "\t.xword 0\n" - "\t.xword __guard_iat_table\n" - "\t.xword __guard_iat_count\n" - "\t.xword __guard_longjmp_table\n" - "\t.xword __guard_longjmp_count\n" - "\t.xword 0\n" - "\t.xword __chpe_metadata\n" - "\t.fill 0x78, 1, 0\n" ); - #endif /* __arm64ec__ */ diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 7e41f2d5a3d..857985cb292 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -605,6 +605,89 @@ void output_exports( DLLSPEC *spec ) } +/******************************************************************* + * output_load_config + * + * Output the load configuration structure. + */ +static void output_load_config(void) +{ + if (!is_pe()) return; + + output( "\n/* load_config */\n\n" ); + output( "\t%s\n", get_asm_rodata_section() ); + output( "\t.globl %s\n", asm_name( "_load_config_used" )); + output( "\t.balign %u\n", get_ptr_size() ); + output( "%s:\n", asm_name( "_load_config_used" )); + output( "\t.long %u\n", get_ptr_size() == 8 ? 0x140 : 0xc0 ); /* Size */ + output( "\t.long 0\n" ); /* TimeDateStamp */ + output( "\t.short 0\n" ); /* MajorVersion */ + output( "\t.short 0\n" ); /* MinorVersion */ + output( "\t.long 0\n" ); /* GlobalFlagsClear */ + output( "\t.long 0\n" ); /* GlobalFlagsSet */ + output( "\t.long 0\n" ); /* CriticalSectionDefaultTimeout */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* DeCommitFreeBlockThreshold */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* DeCommitTotalFreeThreshold */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* LockPrefixTable */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* MaximumAllocationSize */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* VirtualMemoryThreshold */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* ProcessAffinityMask */ + output( "\t.long 0\n" ); /* ProcessHeapFlags */ + output( "\t.short 0\n" ); /* CSDVersion */ + output( "\t.short 0\n" ); /* DependentLoadFlags */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* EditList */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* SecurityCookie */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* SEHandlerTable */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* SEHandlerCount */ + if (target.cpu == CPU_ARM64EC) + { + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( "__guard_check_icall_fptr" )); + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( "__guard_dispatch_icall_fptr" )); + } + else + { + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardCFCheckFunctionPointer */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardCFDispatchFunctionPointer */ + } + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardCFFunctionTable */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardCFFunctionCount */ + if (target.cpu == CPU_ARM64EC) + output( "\t.long %s\n", asm_name( "__guard_flags" )); + else + output( "\t.long 0\n" ); /* GuardFlags */ + output( "\t.short 0\n" ); /* CodeIntegrity.Flags */ + output( "\t.short 0\n" ); /* CodeIntegrity.Catalog */ + output( "\t.long 0\n" ); /* CodeIntegrity.CatalogOffset */ + output( "\t.long 0\n" ); /* CodeIntegrity.Reserved */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardAddressTakenIatEntryTable */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardAddressTakenIatEntryCount */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardLongJumpTargetTable */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardLongJumpTargetCount */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* DynamicValueRelocTable */ + if (target.cpu == CPU_ARM64EC) + output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( "__chpe_metadata" )); + else + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* CHPEMetadataPointer */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardRFFailureRoutine */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardRFFailureRoutineFunctionPointer */ + output( "\t.long 0\n" ); /* DynamicValueRelocTableOffset */ + output( "\t.short 0\n" ); /* DynamicValueRelocTableSection */ + output( "\t.short 0\n" ); /* Reserved2 */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardRFVerifyStackPointerFunctionPointer */ + output( "\t.long 0\n" ); /* HotPatchTableOffset */ + output( "\t.long 0\n" ); /* Reserved3 */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* EnclaveConfigurationPointer */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* VolatileMetadataPointer */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardEHContinuationTable */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardEHContinuationCount */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardXFGCheckFunctionPointer */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardXFGDispatchFunctionPointer */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardXFGTableDispatchFunctionPointer */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* CastGuardOsDeterminedFailureMode */ + output( "\t%s 0\n", get_asm_ptr_keyword() ); /* GuardMemcpyFunctionPointer */ +} + + /******************************************************************* * output_module * @@ -744,6 +827,7 @@ void output_spec32_file( DLLSPEC *spec ) output_exports( spec ); output_imports( spec ); if (needs_get_pc_thunk) output_get_pc_thunk(); + output_load_config(); output_resources( spec ); output_gnu_stack_note(); close_output_file();

1 0

Brendan McGrath : mshtml: Pass DOMEvent instead of nsIDOMEvent during handle_event.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 277acf61d0fb8e5d36fbadda8ecb349dd3dcc435 URL: https://gitlab.winehq.org/wine/wine/-/commit/277acf61d0fb8e5d36fbadda8ecb34… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Thu Feb 29 11:46:06 2024 +1100 mshtml: Pass DOMEvent instead of nsIDOMEvent during handle_event. --- dlls/mshtml/htmlanchor.c | 8 ++++---- dlls/mshtml/htmlarea.c | 8 ++++---- dlls/mshtml/htmlelem.c | 6 +++--- dlls/mshtml/htmlevent.c | 2 +- dlls/mshtml/htmlevent.h | 4 ++-- dlls/mshtml/htmlform.c | 6 +++--- 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/dlls/mshtml/htmlanchor.c b/dlls/mshtml/htmlanchor.c index b3bdd3584d7..efd2fa9b06e 100644 --- a/dlls/mshtml/htmlanchor.c +++ b/dlls/mshtml/htmlanchor.c @@ -829,13 +829,13 @@ static void HTMLAnchorElement_unlink(DispatchEx *dispex) unlink_ref(&This->nsanchor); } -static HRESULT HTMLAnchorElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAnchorElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default) { HTMLAnchorElement *This = impl_from_DispatchEx(dispex); nsAString href_str, target_str; nsresult nsres; - if(eid == EVENTID_CLICK) { + if(event->event_id == EVENTID_CLICK) { nsAString_Init(&href_str, NULL); nsres = nsIDOMHTMLAnchorElement_GetHref(This->nsanchor, &href_str); if (NS_FAILED(nsres)) { @@ -850,14 +850,14 @@ static HRESULT HTMLAnchorElement_handle_event(DispatchEx *dispex, eventid_t eid, goto fallback; } - return handle_link_click_event(&This->element, &href_str, &target_str, event, prevent_default); + return handle_link_click_event(&This->element, &href_str, &target_str, event->nsevent, prevent_default); fallback: nsAString_Finish(&href_str); nsAString_Finish(&target_str); } - return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default); + return HTMLElement_handle_event(&This->element.node.event_target.dispex, event, prevent_default); } static const NodeImplVtbl HTMLAnchorElementImplVtbl = { diff --git a/dlls/mshtml/htmlarea.c b/dlls/mshtml/htmlarea.c index aa13ee997d2..96c5ba9322f 100644 --- a/dlls/mshtml/htmlarea.c +++ b/dlls/mshtml/htmlarea.c @@ -439,13 +439,13 @@ static void HTMLAreaElement_unlink(DispatchEx *dispex) unlink_ref(&This->nsarea); } -static HRESULT HTMLAreaElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLAreaElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default) { HTMLAreaElement *This = impl_from_DispatchEx(dispex); nsAString href_str, target_str; nsresult nsres; - if(eid == EVENTID_CLICK) { + if(event->event_id == EVENTID_CLICK) { nsAString_Init(&href_str, NULL); nsres = nsIDOMHTMLAreaElement_GetHref(This->nsarea, &href_str); if (NS_FAILED(nsres)) { @@ -460,14 +460,14 @@ static HRESULT HTMLAreaElement_handle_event(DispatchEx *dispex, eventid_t eid, n goto fallback; } - return handle_link_click_event(&This->element, &href_str, &target_str, event, prevent_default); + return handle_link_click_event(&This->element, &href_str, &target_str, event->nsevent, prevent_default); fallback: nsAString_Finish(&href_str); nsAString_Finish(&target_str); } - return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default); + return HTMLElement_handle_event(&This->element.node.event_target.dispex, event, prevent_default); } static const NodeImplVtbl HTMLAreaElementImplVtbl = { diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 687e62f1784..aa635200f7f 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -7001,16 +7001,16 @@ void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid) ensure_doc_nsevent_handler(This->node.doc, This->node.nsnode, eid); } -HRESULT HTMLElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +HRESULT HTMLElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default) { HTMLElement *This = impl_from_DispatchEx(dispex); - switch(eid) { + switch(event->event_id) { case EVENTID_KEYDOWN: { nsIDOMKeyEvent *key_event; nsresult nsres; - nsres = nsIDOMEvent_QueryInterface(event, &IID_nsIDOMKeyEvent, (void**)&key_event); + nsres = nsIDOMEvent_QueryInterface(event->nsevent, &IID_nsIDOMKeyEvent, (void**)&key_event); if(NS_SUCCEEDED(nsres)) { UINT32 code = 0; diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 1ae3a0de384..494db359403 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -5133,7 +5133,7 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, vtbl = dispex_get_vtbl(&target_chain[i]->dispex); if(!vtbl->handle_event) continue; - hres = vtbl->handle_event(&target_chain[i]->dispex, event->event_id, event->nsevent, &prevent_default); + hres = vtbl->handle_event(&target_chain[i]->dispex, event, &prevent_default); if(FAILED(hres) || event->stop_propagation) break; if(prevent_default) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 645e99a4c19..eb92569f375 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -131,7 +131,7 @@ typedef struct { nsISupports *(*get_gecko_target)(DispatchEx*); void (*bind_event)(DispatchEx*,eventid_t); EventTarget *(*get_parent_event_target)(DispatchEx*); - HRESULT (*handle_event)(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*); + HRESULT (*handle_event)(DispatchEx*,DOMEvent*,BOOL*); ConnectionPointContainer *(*get_cp_container)(DispatchEx*); IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*); } event_target_vtbl_t; @@ -141,7 +141,7 @@ IHTMLEventObj *default_set_current_event(HTMLInnerWindow*,IHTMLEventObj*); nsISupports *HTMLElement_get_gecko_target(DispatchEx*); void HTMLElement_bind_event(DispatchEx*,eventid_t); EventTarget *HTMLElement_get_parent_event_target(DispatchEx*); -HRESULT HTMLElement_handle_event(DispatchEx*,eventid_t,nsIDOMEvent*,BOOL*); +HRESULT HTMLElement_handle_event(DispatchEx*,DOMEvent*,BOOL*); ConnectionPointContainer *HTMLElement_get_cp_container(DispatchEx*); IHTMLEventObj *HTMLElement_set_current_event(DispatchEx*,IHTMLEventObj*); diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index fc30742d540..648e1efa6b5 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -944,16 +944,16 @@ static HRESULT HTMLFormElement_invoke(DispatchEx *dispex, DISPID id, LCID lcid, return S_OK; } -static HRESULT HTMLFormElement_handle_event(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *event, BOOL *prevent_default) +static HRESULT HTMLFormElement_handle_event(DispatchEx *dispex, DOMEvent *event, BOOL *prevent_default) { HTMLFormElement *This = impl_from_DispatchEx(dispex); - if(eid == EVENTID_SUBMIT) { + if(event->event_id == EVENTID_SUBMIT) { *prevent_default = TRUE; return IHTMLFormElement_submit(&This->IHTMLFormElement_iface); } - return HTMLElement_handle_event(&This->element.node.event_target.dispex, eid, event, prevent_default); + return HTMLElement_handle_event(&This->element.node.event_target.dispex, event, prevent_default); } static const NodeImplVtbl HTMLFormElementImplVtbl = {

1 0

Brendan McGrath : mshtml: Always use the event target dispex.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 74ff9f23717d2a8a8255d213099d2709e55e9c63 URL: https://gitlab.winehq.org/wine/wine/-/commit/74ff9f23717d2a8a8255d213099d27… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Mon Feb 26 14:39:01 2024 +1100 mshtml: Always use the event target dispex. The event target may be from a different document to the document associated with the event handler. --- dlls/mshtml/nsevents.c | 2 +- dlls/mshtml/tests/dom.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index ec4d1f6694a..daac94dd368 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -444,7 +444,7 @@ static nsresult handle_htmlevent(HTMLDocumentNode *doc, nsIDOMEvent *nsevent) target = &node->event_target; } - hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event); + hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&target->dispex), &event); if(FAILED(hres)) { IEventTarget_Release(&target->IEventTarget_iface); return NS_OK; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 0b0d826aaa1..8383f167cdd 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -12084,18 +12084,14 @@ static void test_document_mode_after_initnew(void) } hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target); - todo_wine ok(hres == S_OK, "QueryInterface(IID_IEventTarget) returned %08lx.\n", hres); - todo_wine ok(event_target != NULL, "event_target == NULL\n"); - if (event_target != NULL) - IEventTarget_Release(event_target); + IEventTarget_Release(event_target); V_VT(&var) = VT_EMPTY; hres = IHTMLDocument6_get_documentMode(doc6, &var); ok(hres == S_OK, "get_documentMode failed: %08lx\n", hres); ok(V_VT(&var) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&var)); - todo_wine ok(V_R4(&var) == 9, "documentMode = %f, expected 9\n", V_R4(&var)); IHTMLDocument6_Release(doc6); VariantClear(&var);

1 0

Brendan McGrath : mshtml: Use generic event dispatcher for DOMContentLoaded.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: 54980a786814ce3bed1f17be6e77658f9b9430ec URL: https://gitlab.winehq.org/wine/wine/-/commit/54980a786814ce3bed1f17be6e7765… Author: Brendan McGrath <bmcgrath(a)codeweavers.com> Date: Wed Feb 21 11:05:05 2024 +1100 mshtml: Use generic event dispatcher for DOMContentLoaded. Use generic event dispatcher instead of nsevent for the DOMContentLoaded event. Also allow processing before dispatching event. Only update dom_content_loaded_event start/end time when the event is trusted. --- dlls/mshtml/htmldoc.c | 36 +++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlevent.c | 14 +++++++++++++- dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/nsevents.c | 22 ---------------------- 4 files changed, 49 insertions(+), 24 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4267b13ffab..e16b75675d5 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -6104,6 +6104,38 @@ static HRESULT HTMLDocumentNode_location_hook(DispatchEx *dispex, WORD flags, DI 0, flags, dp, res, ei, caller); } +static HRESULT HTMLDocumentNode_pre_handle_event(DispatchEx* dispex, DOMEvent *event) +{ + HTMLDocumentNode *doc = impl_from_DispatchEx(dispex); + switch(event->event_id) { + case EVENTID_DOMCONTENTLOADED: { + if(event->trusted && doc->window) + doc->window->dom_content_loaded_event_start_time = get_time_stamp(); + break; + } + default: + break; + } + + return S_OK; +} + +static HRESULT HTMLDocumentNode_handle_event(DispatchEx* dispex, DOMEvent *event, BOOL *prevent_default) +{ + HTMLDocumentNode *doc = impl_from_DispatchEx(dispex); + switch(event->event_id) { + case EVENTID_DOMCONTENTLOADED: { + if(event->trusted && doc->window) + doc->window->dom_content_loaded_event_end_time = get_time_stamp(); + break; + } + default: + break; + } + + return S_OK; +} + static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { { .query_interface = HTMLDocumentNode_query_interface, @@ -6118,8 +6150,10 @@ static const event_target_vtbl_t HTMLDocumentNode_event_target_vtbl = { .get_gecko_target = HTMLDocumentNode_get_gecko_target, .bind_event = HTMLDocumentNode_bind_event, .get_parent_event_target = HTMLDocumentNode_get_parent_event_target, + .pre_handle_event = HTMLDocumentNode_pre_handle_event, + .handle_event = HTMLDocumentNode_handle_event, .get_cp_container = HTMLDocumentNode_get_cp_container, - .set_current_event = HTMLDocumentNode_set_current_event + .set_current_event = HTMLDocumentNode_set_current_event, }; static const NodeImplVtbl HTMLDocumentFragmentImplVtbl = { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 494db359403..7d6eb04fe9d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -118,7 +118,7 @@ typedef struct { /* Keep these sorted case sensitively */ static const event_info_t event_info[] = { {L"DOMContentLoaded", EVENT_TYPE_EVENT, 0, - EVENT_BUBBLES | EVENT_CANCELABLE}, + EVENT_DEFAULTLISTENER | EVENT_HASDEFAULTHANDLERS | EVENT_BUBBLES | EVENT_CANCELABLE }, {L"abort", EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT, EVENT_BIND_TO_TARGET}, {L"afterprint", EVENT_TYPE_EVENT, DISPID_EVMETH_ONAFTERPRINT, @@ -5100,6 +5100,18 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, IEventTarget_AddRef(&event_target->IEventTarget_iface); event->phase = DEP_CAPTURING_PHASE; + + if(event_info[event->event_id].flags & EVENT_HASDEFAULTHANDLERS) { + for(i = 0; i < chain_cnt; i++) { + vtbl = dispex_get_vtbl(&target_chain[i]->dispex); + if(!vtbl->pre_handle_event) + continue; + hres = vtbl->pre_handle_event(&target_chain[i]->dispex, event); + if(FAILED(hres) || event->stop_propagation) + break; + } + } + i = chain_cnt-1; while(!event->stop_propagation && i) call_event_handlers(target_chain[i--], event, dispatch_mode); diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index eb92569f375..333f8add57e 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -131,6 +131,7 @@ typedef struct { nsISupports *(*get_gecko_target)(DispatchEx*); void (*bind_event)(DispatchEx*,eventid_t); EventTarget *(*get_parent_event_target)(DispatchEx*); + HRESULT (*pre_handle_event)(DispatchEx*,DOMEvent*); HRESULT (*handle_event)(DispatchEx*,DOMEvent*,BOOL*); ConnectionPointContainer *(*get_cp_container)(DispatchEx*); IHTMLEventObj *(*set_current_event)(DispatchEx*,IHTMLEventObj*); diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 482d3196770..ec4d1f6694a 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -48,7 +48,6 @@ typedef struct { static nsresult handle_blur(HTMLDocumentNode*,nsIDOMEvent*); static nsresult handle_focus(HTMLDocumentNode*,nsIDOMEvent*); static nsresult handle_keypress(HTMLDocumentNode*,nsIDOMEvent*); -static nsresult handle_dom_content_loaded(HTMLDocumentNode*,nsIDOMEvent*); static nsresult handle_pageshow(HTMLDocumentNode*,nsIDOMEvent*); static nsresult handle_pagehide(HTMLDocumentNode*,nsIDOMEvent*); static nsresult handle_load(HTMLDocumentNode*,nsIDOMEvent*); @@ -68,7 +67,6 @@ static const struct { { EVENTID_BLUR, 0, handle_blur }, { EVENTID_FOCUS, 0, handle_focus }, { EVENTID_KEYPRESS, BUBBLES, handle_keypress }, - { EVENTID_DOMCONTENTLOADED, OVERRIDE, handle_dom_content_loaded }, { EVENTID_PAGESHOW, OVERRIDE, handle_pageshow }, { EVENTID_PAGEHIDE, OVERRIDE, handle_pagehide }, { EVENTID_LOAD, OVERRIDE, handle_load }, @@ -234,26 +232,6 @@ static nsresult handle_keypress(HTMLDocumentNode *doc, nsIDOMEvent *event) return NS_OK; } -static nsresult handle_dom_content_loaded(HTMLDocumentNode *doc, nsIDOMEvent *nsevent) -{ - DOMEvent *event; - HRESULT hres; - - if(doc->window) - doc->window->dom_content_loaded_event_start_time = get_time_stamp(); - - hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event); - if(SUCCEEDED(hres)) { - dispatch_event(&doc->node.event_target, event); - IDOMEvent_Release(&event->IDOMEvent_iface); - } - - if(doc->window) - doc->window->dom_content_loaded_event_end_time = get_time_stamp(); - - return NS_OK; -} - static nsresult handle_pageshow(HTMLDocumentNode *doc, nsIDOMEvent *nsevent) { HTMLInnerWindow *window;

1 0