huwcampbell.com
Reactos
[SETUPLIB] Use proper SEH instead of nasty hacks
Addendum to commit 2268b3d
+4
-10
+1
base/setup/lib/CMakeLists.txt
+1
base/setup/lib/CMakeLists.txt
+1
-8
base/setup/lib/utils/filesup.c
+1
-8
base/setup/lib/utils/filesup.c
···
10
10
11
11
#include "precomp.h"
12
12
#include "filesup.h"
13
+
#include <pseh/pseh2.h>
13
14
14
15
#define NDEBUG
15
16
#include <debug.h>
16
-
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
17
25
18
/* FUNCTIONS ****************************************************************/
26
19
+1
-1
base/setup/reactos/CMakeLists.txt
+1
-1
base/setup/reactos/CMakeLists.txt
···
19
19
add_executable(reactos ${SOURCE} reactos.rc)
20
20
add_pch(reactos reactos.h SOURCE)
21
21
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})
23
23
target_link_libraries(reactos zlib_solo) ## We use USETUP's cabinet implementation
24
24
add_importlibs(reactos advapi32 gdi32 user32 comctl32 shlwapi setupapi msvcrt kernel32 ntdll)
25
25
add_cd_file(TARGET reactos DESTINATION reactos NO_CAB FOR bootcd)
+1
-1
base/setup/usetup/CMakeLists.txt
+1
-1
base/setup/usetup/CMakeLists.txt
···
35
35
36
36
add_pch(usetup usetup.h SOURCE)
37
37
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})
39
39
add_importlibs(usetup ntdll)
40
40
add_cd_file(TARGET usetup DESTINATION reactos/system32 NO_CAB NAME_ON_CD smss.exe FOR bootcd regtest)