Alexandre Julliard : msvcrt: Unify __CppXcptFilter implementations.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 670e45934669ae89fda4cc5b9324ac0a4c96427f
URL:    https://gitlab.winehq.org/wine/wine/-/commit/670e45934669ae89fda4cc5b9324ac0...

Author: Alexandre Julliard 
Date:   Fri May 17 12:31:49 2024 +0200

msvcrt: Unify __CppXcptFilter implementations.

---

dlls/msvcrt/except.c         | 10 ++++++++++
 dlls/msvcrt/except_arm.c     | 11 -----------
 dlls/msvcrt/except_arm64.c   | 11 -----------
 dlls/msvcrt/except_arm64ec.c | 11 -----------
 dlls/msvcrt/except_i386.c    | 10 ----------
 dlls/msvcrt/except_x86_64.c  | 11 -----------
 6 files changed, 10 insertions(+), 54 deletions(-)

diff --git a/dlls/msvcrt/except.c b/dlls/msvcrt/except.c
index a7140a9011f..ba8a6c6b216 100644
--- a/dlls/msvcrt/except.c
+++ b/dlls/msvcrt/except.c
@@ -277,6 +277,16 @@ int CDECL _XcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
     return msvcrt_exception_filter(ptr);
 }

+/*********************************************************************
+ *		__CppXcptFilter (MSVCRT.@)
+ */
+int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
+{
+    /* only filter c++ exceptions */
+    if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
+    return _XcptFilter(ex, ptr);
+}
+
 /*********************************************************************
  *		_abnormal_termination (MSVCRT.@)
  */
diff --git a/dlls/msvcrt/except_arm.c b/dlls/msvcrt/except_arm.c
index a79cbe63c44..21173db4925 100644
--- a/dlls/msvcrt/except_arm.c
+++ b/dlls/msvcrt/except_arm.c
@@ -61,17 +61,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, DWORD frame
 }

-/*********************************************************************
- *		__CppXcptFilter (MSVCRT.@)
- */
-int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
-{
-    /* only filter c++ exceptions */
-    if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
-    return _XcptFilter(ex, ptr);
-}
-
-
 /*********************************************************************
  *		__CxxDetectRethrow (MSVCRT.@)
  */
diff --git a/dlls/msvcrt/except_arm64.c b/dlls/msvcrt/except_arm64.c
index 793c71f3251..9a7a91a3b2e 100644
--- a/dlls/msvcrt/except_arm64.c
+++ b/dlls/msvcrt/except_arm64.c
@@ -62,17 +62,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler(EXCEPTION_RECORD *rec, ULONG64 fra
 }

-/*********************************************************************
- *		__CppXcptFilter (MSVCRT.@)
- */
-int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
-{
-    /* only filter c++ exceptions */
-    if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
-    return _XcptFilter(ex, ptr);
-}
-
-
 /*********************************************************************
  *		__CxxDetectRethrow (MSVCRT.@)
  */
diff --git a/dlls/msvcrt/except_arm64ec.c b/dlls/msvcrt/except_arm64ec.c
index d9ea54c4d1c..f90e3797d05 100644
--- a/dlls/msvcrt/except_arm64ec.c
+++ b/dlls/msvcrt/except_arm64ec.c
@@ -61,17 +61,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr
 }

-/*********************************************************************
- *		__CppXcptFilter (MSVCRT.@)
- */
-int CDECL __CppXcptFilter( NTSTATUS ex, PEXCEPTION_POINTERS ptr )
-{
-    /* only filter c++ exceptions */
-    if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
-    return _XcptFilter(ex, ptr);
-}
-
-
 /*********************************************************************
  *		__CxxDetectRethrow (MSVCRT.@)
  */
diff --git a/dlls/msvcrt/except_i386.c b/dlls/msvcrt/except_i386.c
index f63d3910e04..98956f2ec48 100644
--- a/dlls/msvcrt/except_i386.c
+++ b/dlls/msvcrt/except_i386.c
@@ -689,16 +689,6 @@ void __stdcall __CxxLongjmpUnwind( const _JUMP_BUFFER *buf )
     cxx_local_unwind( frame, descr, buf->TryLevel );
 }

-/*********************************************************************
- *		__CppXcptFilter (MSVCRT.@)
- */
-int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
-{
-    /* only filter c++ exceptions */
-    if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
-    return _XcptFilter( ex, ptr );
-}
-
 /*********************************************************************
  *		__CxxDetectRethrow (MSVCRT.@)
  */
diff --git a/dlls/msvcrt/except_x86_64.c b/dlls/msvcrt/except_x86_64.c
index 3a2e13b3082..b4b49ba9373 100644
--- a/dlls/msvcrt/except_x86_64.c
+++ b/dlls/msvcrt/except_x86_64.c
@@ -655,17 +655,6 @@ EXCEPTION_DISPOSITION CDECL __CxxFrameHandler( EXCEPTION_RECORD *rec, ULONG64 fr
 }

-/*********************************************************************
- *		__CppXcptFilter (MSVCRT.@)
- */
-int CDECL __CppXcptFilter(NTSTATUS ex, PEXCEPTION_POINTERS ptr)
-{
-    /* only filter c++ exceptions */
-    if (ex != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH;
-    return _XcptFilter( ex, ptr );
-}
-
-
 /*********************************************************************
  *		__CxxDetectRethrow (MSVCRT.@)
  */