Module: wine Branch: master Commit: e5e52a9a9fbc1c552613a8144a608d83489b67bf URL: https://gitlab.winehq.org/wine/wine/-/commit/e5e52a9a9fbc1c552613a8144a608d8...
Author: Alexandre Julliard julliard@winehq.org Date: Fri May 17 12:32:12 2024 +0200
msvcrt: Unify __CxxQueryExceptionSize implementations.
---
dlls/msvcrt/except.c | 8 ++++++++ dlls/msvcrt/except_arm.c | 9 --------- dlls/msvcrt/except_arm64.c | 9 --------- dlls/msvcrt/except_arm64ec.c | 9 --------- dlls/msvcrt/except_i386.c | 9 --------- dlls/msvcrt/except_x86_64.c | 9 --------- 6 files changed, 8 insertions(+), 45 deletions(-)
diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c index ba8a6c6b216..c224c472c55 100644 --- a/dlls/msvcrt/except.c +++ b/dlls/msvcrt/except.c @@ -287,6 +287,14 @@ int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr) return _XcptFilter(ex, ptr); }
+/********************************************************************* + * __CxxQueryExceptionSize (MSVCRT.@) + */ +unsigned int CDECL __CxxQueryExceptionSize(void) +{ + return sizeof(cxx_exception_type); +} + /********************************************************************* * _abnormal_termination (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c index 21173db4925..84a2f358213 100644 --- a/dlls/msvcrt/except_arm.c +++ b/dlls/msvcrt/except_arm.c @@ -85,15 +85,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) }
-/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c index 9a7a91a3b2e..fc1af2e2689 100644 --- a/dlls/msvcrt/except_arm64.c +++ b/dlls/msvcrt/except_arm64.c @@ -86,15 +86,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) }
-/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /******************************************************************* * _setjmp (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c index f90e3797d05..826884f4df4 100644 --- a/dlls/msvcrt/except_arm64ec.c +++ b/dlls/msvcrt/except_arm64ec.c @@ -85,15 +85,6 @@ BOOL CDECL __CxxDetectRethrow( PEXCEPTION_POINTERS ptrs ) }
-/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _fpieee_flt (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c index 98956f2ec48..6ce65fc7122 100644 --- a/dlls/msvcrt/except_i386.c +++ b/dlls/msvcrt/except_i386.c @@ -712,15 +712,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) return (msvcrt_get_thread_data()->exc_record == rec); }
-/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /********************************************************************* * _EH_prolog (MSVCRT.@) */ diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c index b4b49ba9373..a2537c9a549 100644 --- a/dlls/msvcrt/except_x86_64.c +++ b/dlls/msvcrt/except_x86_64.c @@ -679,15 +679,6 @@ BOOL CDECL __CxxDetectRethrow(PEXCEPTION_POINTERS ptrs) }
-/********************************************************************* - * __CxxQueryExceptionSize (MSVCRT.@) - */ -unsigned int CDECL __CxxQueryExceptionSize(void) -{ - return sizeof(cxx_exception_type); -} - - /******************************************************************* * longjmp (MSVCRT.@) */