February 2024 - Wine-Commits

Alexandre Julliard : include: Remove the private definitions of the exception flags.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: c67053bcce84d08731ba8363047d8bf2b643f865 URL: https://gitlab.winehq.org/wine/wine/-/commit/c67053bcce84d08731ba8363047d8b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:27:03 2024 +0100 include: Remove the private definitions of the exception flags. --- include/winternl.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/include/winternl.h b/include/winternl.h index cccbc149480..057ffcb87d8 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3866,14 +3866,6 @@ typedef struct _RTL_PROCESS_MODULE_INFORMATION_EX #define THREAD_CREATE_FLAGS_ACCESS_CHECK_IN_TARGET 0x00000020 #define THREAD_CREATE_FLAGS_INITIAL_THREAD 0x00000080 -#define EH_NONCONTINUABLE 0x01 -#define EH_UNWINDING 0x02 -#define EH_EXIT_UNWIND 0x04 -#define EH_STACK_INVALID 0x08 -#define EH_NESTED_CALL 0x10 -#define EH_TARGET_UNWIND 0x20 -#define EH_COLLIDED_UNWIND 0x40 - #ifdef __WINESRC__ /* Wine-specific exceptions codes */

1 0

Zebediah Figura : shell32: Return an initial "New" menu.
by Alexandre Julliard Feb. 29, 2024

Feb. 29, 2024

Module: wine Branch: master Commit: e564b0d775406aa3da2cc23d68ff4be28fbcdb3b URL: https://gitlab.winehq.org/wine/wine/-/commit/e564b0d775406aa3da2cc23d68ff4b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun Feb 25 23:27:51 2024 -0600 shell32: Return an initial "New" menu. --- dlls/shell32/new_menu.c | 47 +++++++++- dlls/shell32/shell32.rc | 2 + dlls/shell32/shell32_main.c | 13 +++ dlls/shell32/shell32_main.h | 2 + dlls/shell32/shlview_cmenu.c | 10 +-- dlls/shell32/shresdef.h | 2 + po/ar.po | 210 ++++++++++++++++++++++--------------------- po/ast.po | 210 ++++++++++++++++++++++--------------------- po/bg.po | 210 ++++++++++++++++++++++--------------------- po/ca.po | 210 ++++++++++++++++++++++--------------------- po/cs.po | 210 ++++++++++++++++++++++--------------------- po/da.po | 210 ++++++++++++++++++++++--------------------- po/de.po | 210 ++++++++++++++++++++++--------------------- po/el.po | 210 ++++++++++++++++++++++--------------------- po/en.po | 210 ++++++++++++++++++++++--------------------- po/en_US.po | 210 ++++++++++++++++++++++--------------------- po/eo.po | 210 ++++++++++++++++++++++--------------------- po/es.po | 210 ++++++++++++++++++++++--------------------- po/fa.po | 210 ++++++++++++++++++++++--------------------- po/fi.po | 210 ++++++++++++++++++++++--------------------- po/fr.po | 210 ++++++++++++++++++++++--------------------- po/he.po | 210 ++++++++++++++++++++++--------------------- po/hi.po | 210 ++++++++++++++++++++++--------------------- po/hr.po | 210 ++++++++++++++++++++++--------------------- po/hu.po | 210 ++++++++++++++++++++++--------------------- po/it.po | 210 ++++++++++++++++++++++--------------------- po/ja.po | 210 ++++++++++++++++++++++--------------------- po/ka.po | 210 ++++++++++++++++++++++--------------------- po/ko.po | 210 ++++++++++++++++++++++--------------------- po/lt.po | 210 ++++++++++++++++++++++--------------------- po/ml.po | 210 ++++++++++++++++++++++--------------------- po/nb_NO.po | 210 ++++++++++++++++++++++--------------------- po/nl.po | 210 ++++++++++++++++++++++--------------------- po/or.po | 210 ++++++++++++++++++++++--------------------- po/pa.po | 210 ++++++++++++++++++++++--------------------- po/pl.po | 210 ++++++++++++++++++++++--------------------- po/pt_BR.po | 210 ++++++++++++++++++++++--------------------- po/pt_PT.po | 210 ++++++++++++++++++++++--------------------- po/rm.po | 210 ++++++++++++++++++++++--------------------- po/ro.po | 210 ++++++++++++++++++++++--------------------- po/ru.po | 210 ++++++++++++++++++++++--------------------- po/si.po | 210 ++++++++++++++++++++++--------------------- po/sk.po | 210 ++++++++++++++++++++++--------------------- po/sl.po | 210 ++++++++++++++++++++++--------------------- po/sr_RS(a)cyrillic.po | 210 ++++++++++++++++++++++--------------------- po/sr_RS(a)latin.po | 210 ++++++++++++++++++++++--------------------- po/sv.po | 210 ++++++++++++++++++++++--------------------- po/ta.po | 210 ++++++++++++++++++++++--------------------- po/te.po | 210 ++++++++++++++++++++++--------------------- po/th.po | 210 ++++++++++++++++++++++--------------------- po/tr.po | 210 ++++++++++++++++++++++--------------------- po/uk.po | 210 ++++++++++++++++++++++--------------------- po/wa.po | 210 ++++++++++++++++++++++--------------------- po/wine.pot | 210 ++++++++++++++++++++++--------------------- po/zh_CN.po | 210 ++++++++++++++++++++++--------------------- po/zh_TW.po | 210 ++++++++++++++++++++++--------------------- 56 files changed, 5413 insertions(+), 5163 deletions(-)

1 0

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

Feb. 29, 2024

Module: wine Branch: master Commit: b0a7439b30d35cdbb01603546917abcd1f95a4a8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b0a7439b30d35cdbb01603546917ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:25:34 2024 +0100 winedbg: Use the official definitions for exception flags. --- programs/winedbg/info.c | 2 +- programs/winedbg/tgt_active.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index 5e724afc0ed..48b783aeb3e 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -1095,7 +1095,7 @@ void info_win32_exception(void) dbg_printf("0x%08lx", rec->ExceptionCode); break; } - if (rec->ExceptionFlags & EH_STACK_INVALID) + if (rec->ExceptionFlags & EXCEPTION_STACK_INVALID) dbg_printf(", invalid program stack"); switch (addr.Mode) diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index 17578857133..9587ef450d2 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -275,7 +275,7 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance } if (first_chance && !is_debug && !DBG_IVAR(BreakOnFirstChance) && - !(rec->ExceptionFlags & EH_STACK_INVALID)) + !(rec->ExceptionFlags & EXCEPTION_STACK_INVALID)) { /* pass exception to program except for debug exceptions */ return DBG_EXCEPTION_NOT_HANDLED;

1 0

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

Feb. 29, 2024

Module: wine Branch: master Commit: 8605708e025dc1877c2b6512b612917fa247523d URL: https://gitlab.winehq.org/wine/wine/-/commit/8605708e025dc1877c2b6512b61291… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:24:53 2024 +0100 winecrt0: Use the official definitions for exception flags. --- dlls/winecrt0/exception.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/winecrt0/exception.c b/dlls/winecrt0/exception.c index 3187189dd1c..58cf91172ac 100644 --- a/dlls/winecrt0/exception.c +++ b/dlls/winecrt0/exception.c @@ -100,7 +100,7 @@ DWORD __cdecl __wine_exception_handler( EXCEPTION_RECORD *record, __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; EXCEPTION_POINTERS ptrs; - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; ptrs.ExceptionRecord = record; @@ -125,7 +125,7 @@ DWORD __cdecl __wine_exception_ctx_handler( EXCEPTION_RECORD *record, __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; EXCEPTION_POINTERS ptrs; - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; ptrs.ExceptionRecord = record; @@ -147,7 +147,7 @@ DWORD __cdecl __wine_exception_handler_page_fault( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; if (record->ExceptionCode != STATUS_ACCESS_VIOLATION) return ExceptionContinueSearch; @@ -159,7 +159,7 @@ DWORD __cdecl __wine_exception_handler_all( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND | EH_NESTED_CALL)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND | EXCEPTION_NESTED_CALL)) return ExceptionContinueSearch; unwind_frame( record, frame ); } @@ -169,7 +169,7 @@ DWORD __cdecl __wine_finally_handler( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; wine_frame->u.finally_func( FALSE ); @@ -182,7 +182,7 @@ DWORD __cdecl __wine_finally_ctx_handler( EXCEPTION_RECORD *record, CONTEXT *context, EXCEPTION_REGISTRATION_RECORD **pdispatcher ) { - if (record->ExceptionFlags & (EH_UNWINDING | EH_EXIT_UNWIND)) + if (record->ExceptionFlags & (EXCEPTION_UNWINDING | EXCEPTION_EXIT_UNWIND)) { __WINE_FRAME *wine_frame = (__WINE_FRAME *)frame; wine_frame->u.finally_func_ctx( FALSE, wine_frame->ctx );

1 0

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

Feb. 29, 2024

Module: wine Branch: master Commit: 3282eda5255cdd4aff7aae8fa277af2ca800c510 URL: https://gitlab.winehq.org/wine/wine/-/commit/3282eda5255cdd4aff7aae8fa277af… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 28 16:24:37 2024 +0100 win32u: Use the official definitions for exception flags. --- dlls/win32u/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/main.c b/dlls/win32u/main.c index e06386da693..ace2c9d0cd3 100644 --- a/dlls/win32u/main.c +++ b/dlls/win32u/main.c @@ -2187,7 +2187,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;

1 0

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