Skip to content

Commit 3d8bfdd

Browse files
committed
[MSVCRT] Comment out some x86 exception handling functions
Use our own instead
1 parent d2336be commit 3d8bfdd

1 file changed

Lines changed: 6 additions & 0 deletions

File tree

dll/win32/msvcrt/except_i386.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -547,13 +547,15 @@ static void msvcrt_local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame,
547547
TRACE("unwound OK\n");
548548
}
549549

550+
#ifndef __REACTOS__
550551
/*******************************************************************
551552
* _local_unwind2 (MSVCRT.@)
552553
*/
553554
void CDECL _local_unwind2(MSVCRT_EXCEPTION_FRAME* frame, int trylevel)
554555
{
555556
msvcrt_local_unwind2( frame, trylevel, &frame->_ebp );
556557
}
558+
#endif
557559

558560
/*******************************************************************
559561
* _local_unwind4 (MSVCRT.@)
@@ -563,6 +565,9 @@ void CDECL _local_unwind4( ULONG *cookie, MSVCRT_EXCEPTION_FRAME* frame, int try
563565
msvcrt_local_unwind4( cookie, frame, trylevel, &frame->_ebp );
564566
}
565567

568+
#ifdef __REACTOS__
569+
void CDECL _global_unwind2(EXCEPTION_REGISTRATION_RECORD* frame);
570+
#else
566571
/*******************************************************************
567572
* _global_unwind2 (MSVCRT.@)
568573
*/
@@ -657,6 +662,7 @@ int CDECL _except_handler3(PEXCEPTION_RECORD rec,
657662
TRACE("reached TRYLEVEL_END, returning ExceptionContinueSearch\n");
658663
return ExceptionContinueSearch;
659664
}
665+
#endif
660666

661667
/*********************************************************************
662668
* _except_handler4_common (MSVCRT.@)

0 commit comments

Comments
 (0)