Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-18 11:15:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CPPRT][CRT][MSVCRT] Move __CxxFrameHandler3 to crt and export it on NT6

Browse source 
Previously it was in cpprt, which is a support library for C++, containing functions that are not exported by msvcrt. But since Vista __CxxFrameHandler3 is exported by msvcrt. Therefore move it to crt, and to satisfy pre-Vista configurations, also add it to msvcrtex.
This commit is contained in:
Timo Kreuzer 2020-09-24 07:49:16 +02:00
parent 310563aece
commit ce848e5c11
9 changed files with 58 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sdk/lib/cpprt/CMakeLists.txt
View file

@ -11,7 +11,6 @@ list(APPEND SOURCE
if(ARCH STREQUAL "i386")
add_asm_files(cpprt_asm i386/cpprt.s)
list(APPEND SOURCE i386/framehandler.c)
elseif(ARCH STREQUAL "amd64")
add_asm_files(cpprt_asm amd64/cpprt.s)
elseif(ARCH STREQUAL "arm")

3
sdk/lib/cpprt/amd64/cpprt.s
View file

@ -19,9 +19,6 @@ DEFINE_ALIAS ??_M@YAXPEAX_K1P6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@
; void __cdecl `eh vector destructor iterator'(void * __ptr64,unsigned __int64,int,void (__cdecl*)(void * __ptr64))
DEFINE_ALIAS ??_M@YAXPEAX_KHP6AX0@Z@Z, ?MSVCRTEX_eh_vector_destructor_iterator@@YAXPEAX_KHP6AX0@Z@Z
; These are the same
DEFINE_ALIAS __CxxFrameHandler3, __CxxFrameHandler
; void __cdecl operator delete(void * __ptr64,struct std::nothrow_t const & __ptr64)
DEFINE_ALIAS ??3@YAXPEAXAEBUnothrow_t@std@@@Z, ??3@YAXPEAX@Z

17
sdk/lib/cpprt/i386/cpprt.s
View file

@ -7,23 +7,6 @@ EXTERN &orig : PROC
ALIAS <&alias> = <&orig>
ENDM
EXTERN _CxxHandleV8Frame@20 : PROC
PUBLIC ___CxxFrameHandler3
___CxxFrameHandler3:
push eax
push dword ptr [esp + 20]
push dword ptr [esp + 20]
push dword ptr [esp + 20]
push dword ptr [esp + 20]
call _CxxHandleV8Frame@20
ret
EXTERN ___CxxFrameHandler : PROC
PUBLIC _CallCxxFrameHandler
_CallCxxFrameHandler:
mov eax, dword ptr [esp + 20]
jmp ___CxxFrameHandler
; void __stdcall `eh vector constructor iterator'(void *,unsigned int,int,void (__thiscall*)(void *),void (__thiscall*)(void *))
DEFINE_ALIAS ??_L@YGXPAXIHP6EX0@Z1@Z, ?MSVCRTEX_eh_vector_constructor_iterator@@YGXPAXIHP6EX0@Z1@Z

46
sdk/lib/cpprt/i386/framehandler.c
View file

@ -1,46 +0,0 @@
/*
* PROJECT: ReactOS C++ runtime library
* LICENSE: GPLv2+ - See COPYING in the top level directory
* PURPOSE: __CxxFrameHandler3 to __CxxFrameHandler wrapper
* PROGRAMMER: Thomas Faber (thomas.faber@reactos.org)
*/
#define WIN32_NO_STATUS
#include <windef.h>
#include <winbase.h>
#include <ndk/rtltypes.h>
#define WINE_NO_TRACE_MSGS
#include <wine/debug.h>
#include <wine/exception.h>
#include <internal/wine/msvcrt.h>
#include <internal/wine/cppexcept.h>
extern DWORD CDECL CallCxxFrameHandler(PEXCEPTION_RECORD rec, EXCEPTION_REGISTRATION_RECORD *frame,
PCONTEXT context, EXCEPTION_REGISTRATION_RECORD **dispatch,
const cxx_function_descr *descr);
DWORD
__stdcall
CxxHandleV8Frame(
_In_ PEXCEPTION_RECORD rec,
_In_ EXCEPTION_REGISTRATION_RECORD *frame,
_In_ PCONTEXT context,
_In_ EXCEPTION_REGISTRATION_RECORD **dispatch,
_In_ const cxx_function_descr *descr)
{
cxx_function_descr stub_descr;
if (descr->magic != CXX_FRAME_MAGIC_VC8)
return CallCxxFrameHandler(rec, frame, context, dispatch, descr);
if ((descr->flags & FUNC_DESCR_SYNCHRONOUS) &&
(rec->ExceptionCode != CXX_EXCEPTION))
{
return ExceptionContinueSearch; /* handle only c++ exceptions */
}
stub_descr = *descr;
stub_descr.magic = CXX_FRAME_MAGIC_VC7;
return CallCxxFrameHandler(rec, frame, context, dispatch, &stub_descr);
}