Skip to content

Commit 31334eb

Browse files
committed
[SETUPLIB] Use proper SEH instead of nasty hacks
Addendum to commit 2268b3d
1 parent 8107ff8 commit 31334eb

File tree

4 files changed

+4
-10
lines changed

4 files changed

+4
-10
lines changed

base/setup/lib/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ if(_WINKD_)
55
endif()
66

77
include_directories(spapisup utils)
8+
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/pseh/include)
89

910
list(APPEND SOURCE
1011
spapisup/fileqsup.c

base/setup/lib/utils/filesup.c

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,11 @@
1010

1111
#include "precomp.h"
1212
#include "filesup.h"
13+
#include <pseh/pseh2.h>
1314

1415
#define NDEBUG
1516
#include <debug.h>
1617

17-
18-
// ACHTUNG! HAXX FIXME!!
19-
#define _SEH2_TRY
20-
#define _SEH2_LEAVE goto __SEH2_FINALLY__label;
21-
#define _SEH2_FINALLY __SEH2_FINALLY__label:
22-
#define _SEH2_END
23-
24-
2518
/* FUNCTIONS ****************************************************************/
2619

2720
static

base/setup/reactos/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ add_rc_deps(reactos.rc ${reactos_rc_deps})
1919
add_executable(reactos ${SOURCE} reactos.rc)
2020
add_pch(reactos reactos.h SOURCE)
2121
set_module_type(reactos win32gui UNICODE)
22-
target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib)
22+
target_link_libraries(reactos uuid setuplib ext2lib vfatlib btrfslib ${PSEH_LIB})
2323
target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation
2424
add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll)
2525
add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)

base/setup/usetup/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ endif()
3535

3636
add_pch(usetup usetup.h SOURCE)
3737
set_module_type(usetup nativecui)
38-
target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib btrfslib chkstk)
38+
target_link_libraries(usetup inflib setuplib zlib_solo ext2lib vfatlib btrfslib chkstk ${PSEH_LIB})
3939
add_importlibs(usetup ntdll)
4040
add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)

0 commit comments

Comments
 (0)