GitHub-Mirror/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos synced 2025-10-05 16:02:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS][NTDLL][UCRTBASE] Use new setjmp/longjmp

Browse Source 
This fixes 2 todo tests
This commit is contained in:
Timo Kreuzer
2025-07-02 22:21:17 +03:00
parent 011ce7088c
commit 6d321562c9
11 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dll/ntdll/CMakeLists.txt
View File

@@ -65,7 +65,7 @@ set_module_type(ntdll win32dll ENTRYPOINT 0)
set_subsystem(ntdll console)
################# END HACK #################
target_link_libraries(ntdll ntdll_vista_static etwtrace csrlib rtl rtl_um rtl_vista ntdllsys libcntpr uuid ${PSEH_LIB})
target_link_libraries(ntdll ntdll_vista_static etwtrace csrlib rtl rtl_um rtl_vista ntdllsys libcntpr setjmp uuid ${PSEH_LIB})
if(DLL_EXPORT_VERSION GREATER_EQUAL 0x600)
target_link_libraries(ntdll cryptlib)
endif()

2
dll/win32/crtdll/CMakeLists.txt
View File

@@ -19,7 +19,7 @@ list(APPEND SOURCE
add_library(crtdll MODULE ${SOURCE})
set_module_type(crtdll win32dll ENTRYPOINT DllMain 12)
target_link_libraries(crtdll crt wine ${PSEH_LIB})
target_link_libraries(crtdll crt vcruntime wine ${PSEH_LIB})
add_importlibs(crtdll kernel32 ntdll)
add_cd_file(TARGET crtdll DESTINATION reactos/system32 FOR all)

2
dll/win32/msvcrt/CMakeLists.txt
View File

@@ -33,7 +33,7 @@ list(APPEND SOURCE
add_library(msvcrt MODULE ${SOURCE})
set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)
add_dependencies(msvcrt psdk)
target_link_libraries(msvcrt crt cpprt wine ${PSEH_LIB})
target_link_libraries(msvcrt crt vcruntime cpprt wine ${PSEH_LIB})
if(MSVC)
# export of deleting destructor "name"

6
dll/win32/ucrtbase/ucrtbase.spec
View File

@@ -125,9 +125,9 @@
@ cdecl __fpecode()
@ cdecl __initialize_lconv_for_unsigned_char()
@ cdecl -stub __intrinsic_abnormal_termination() # CHECKME
@ cdecl -stub -norelay __intrinsic_setjmp(ptr) # _setjmp
@ cdecl -norelay __intrinsic_setjmp(ptr)
@ cdecl -impsym _setjmp(long ptr) __intrinsic_setjmp
@ cdecl -stub -arch=!i386 -norelay __intrinsic_setjmpex(ptr ptr) # _setjmpex
@ cdecl -arch=!i386 -norelay __intrinsic_setjmpex(ptr ptr)
@ cdecl __isascii(long)
@ cdecl __iscsym(long)
@ cdecl __iscsymf(long)
@@ -2560,7 +2560,7 @@
@ cdecl set_terminate(ptr)
@ cdecl set_unexpected(ptr)
@ cdecl setbuf(ptr ptr)
@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr ptr) _setjmp
@ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr ptr) __intrinsic_setjmp
@ cdecl setlocale(long str)
@ cdecl setvbuf(ptr str long long)
@ cdecl signal(long long)

4
hal/halx86/CMakeLists.txt
View File

@@ -23,9 +23,9 @@ function(add_hal _halname)
${CMAKE_CURRENT_BINARY_DIR}/hal.def)
if(${_halname} STREQUAL "hal")
target_link_libraries(${_halname} libcntpr arbiter fast486 ${PSEH_LIB})
target_link_libraries(${_halname} libcntpr setjmp arbiter fast486 ${PSEH_LIB})
else()
target_link_libraries(${_halname} libcntpr fast486 ${PSEH_LIB})
target_link_libraries(${_halname} libcntpr setjmp fast486 ${PSEH_LIB})
endif()
add_importlibs(${_halname} ntoskrnl)

6
modules/rostests/apitests/compiler/pseh.c
View File

@@ -2966,10 +2966,10 @@ void Test_collided_unwind(void)
_SEH2_END;
}
todo_ros ok(Flags == (1 | 2 | 8), "Flags = %x\n", Flags);
todo_ros ok(Count == 2, "Count = %d\n", Count);
ok(Flags == (1 | 2 | 8), "Flags = %x\n", Flags);
ok(Count == 2, "Count = %d\n", Count);
#ifdef _M_IX86
todo_ros ok(__readfsdword(0) == Registration, "SEH registration corrupted!\n");
ok(__readfsdword(0) == Registration, "SEH registration corrupted!\n");
*(unsigned int*)NtCurrentTeb() = Registration;
#endif

2
ntoskrnl/CMakeLists.txt
View File

@@ -46,7 +46,7 @@ set_module_type(ntoskrnl kernel)
source_group(TREE ${REACTOS_SOURCE_DIR}/ntoskrnl PREFIX "Source Files" FILES ${NTOSKRNL_SOURCE})
target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid poguid ioevent)
target_link_libraries(ntoskrnl cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
if(STACK_PROTECTOR)
target_sources(ntoskrnl PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)

2
ntoskrnl/ntkrnlmp/CMakeLists.txt
View File

@@ -37,7 +37,7 @@ if(STACK_PROTECTOR)
target_sources(ntkrnlmp PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>)
endif()
target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr wdmguid poguid ioevent)
target_link_libraries(ntkrnlmp cportlib csq ${PSEH_LIB} arbiter cmlib ntlsalib rtl ${ROSSYM_LIB} libcntpr setjmp wdmguid poguid ioevent)
add_importlibs(ntkrnlmp hal kdcom bootvid)
add_pch(ntkrnlmp ${REACTOS_SOURCE_DIR}/ntoskrnl/include/ntoskrnl.h "${NTKRNLMP_PCH_SKIP_SOURCE}")
add_dependencies(ntkrnlmp psdk asm)

1
sdk/lib/crt/CMakeLists.txt
View File

@@ -15,7 +15,6 @@ include(misc/misc.cmake)
include(printf/printf.cmake)
include(process/process.cmake)
include(search/search.cmake)
include(setjmp/setjmp.cmake)
include(startup/startup.cmake)
include(stdio/stdio.cmake)
include(stdlib/stdlib.cmake)

1
sdk/lib/crt/ucrtsupport.cmake
View File

@@ -9,7 +9,6 @@ list(APPEND UCRTSUPP_SOURCE
)
list(APPEND UCRTSUPP_ASM_SOURCE
${CRT_SETJMP_ASM_SOURCE}
${CRT_WINE_ASM_SOURCE}
)

2
win32ss/drivers/font/ftfd/CMakeLists.txt
View File

@@ -18,7 +18,7 @@ add_library(ftfd MODULE
${CMAKE_CURRENT_BINARY_DIR}/ftfd.def)
set_module_type(ftfd kerneldll ENTRYPOINT FtfdEnableDriver 12)
target_link_libraries(ftfd freetype libcntpr ${PSEH_LIB})
target_link_libraries(ftfd freetype libcntpr setjmp ${PSEH_LIB})
add_pch(ftfd ftfd.h "${PCH_SKIP_SOURCE}")
add_importlibs(ftfd win32k)
add_dependencies(ftfd psdk)