2015-09-04 14:16:56 +00:00
|
|
|
|
|
|
|
include_directories(BEFORE include)
|
|
|
|
include_directories(BEFORE include/efi)
|
|
|
|
include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
|
2016-04-20 12:36:25 +00:00
|
|
|
include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib)
|
|
|
|
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs)
|
|
|
|
include_directories(${REACTOS_SOURCE_DIR}/drivers/filesystems)
|
2015-09-04 14:16:56 +00:00
|
|
|
|
|
|
|
add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_)
|
|
|
|
|
2015-09-05 19:18:54 +00:00
|
|
|
list(APPEND BOOTLIB_SOURCE
|
2015-09-04 14:16:56 +00:00
|
|
|
app/bootmgr/bootmgr.h
|
|
|
|
lib/bootlib.c
|
[BOOTLIB]:
- WIP work to begin reading, parsing, mounting and loading the BCD hive into a data store. Untested, has missing pieces.
- Implement BlFileSet/GetInformation, BlFileReadEx, BlFileReadAtOffsetEx and helper structures/functions. Document multiple previously unknown/magic flags.
- Implement BlMmAllocatePhysicalPages. Stub BlMmFreePhysicalPages.
- Implement MmUnmapVirtualAddress, BlMmUnmapVirtualAddressEx when operating in real mode.
- Implement ImgpGetFileSize, ImgpReadFileAtOffset, ImgpOpenFile, ImgpCloseFile, BlImgAllocateImageBuffer, BlImgLoadImageWithProgress2.
- Implement BdDebuggerInitialized, BlBdDebuggerEnabled, BlStatusPrint, BlStatuserror. Stub BlBdPullRemoteFile.
- Implement BlGetBootOptionDevice.
- Implement BiReferenceHive, BiDereferenceHive, BiCloseKey, BiOpenKey. Stub BiFlushKey, BiLoadHive.
- Implement BiAddStoreFromFile, BcdOpenStoreFromFile.
- Stub BlUtlUpdateProcess and BlResourceFindMessage.
- Other misc. cleanups.
[BOOTMGR]:
- Implement BmpFatalErrorMessageFilter, BmErrorPurge, BmpErrorLog, BmFatalErrorEx.
- Implement BmpFwGetFullPath.
- Implement BmOpenDataStore.
- Stub BmOpenBootIni
svn path=/trunk/; revision=69447
2015-10-04 21:07:12 +00:00
|
|
|
lib/misc/debug.c
|
2015-09-05 16:05:20 +00:00
|
|
|
lib/misc/bcd.c
|
2016-01-05 06:09:22 +00:00
|
|
|
lib/misc/bcdopt.c
|
|
|
|
lib/misc/bootreg.c
|
2015-09-05 20:31:14 +00:00
|
|
|
lib/misc/util.c
|
[BOOTLIB]:
- WIP work to begin reading, parsing, mounting and loading the BCD hive into a data store. Untested, has missing pieces.
- Implement BlFileSet/GetInformation, BlFileReadEx, BlFileReadAtOffsetEx and helper structures/functions. Document multiple previously unknown/magic flags.
- Implement BlMmAllocatePhysicalPages. Stub BlMmFreePhysicalPages.
- Implement MmUnmapVirtualAddress, BlMmUnmapVirtualAddressEx when operating in real mode.
- Implement ImgpGetFileSize, ImgpReadFileAtOffset, ImgpOpenFile, ImgpCloseFile, BlImgAllocateImageBuffer, BlImgLoadImageWithProgress2.
- Implement BdDebuggerInitialized, BlBdDebuggerEnabled, BlStatusPrint, BlStatuserror. Stub BlBdPullRemoteFile.
- Implement BlGetBootOptionDevice.
- Implement BiReferenceHive, BiDereferenceHive, BiCloseKey, BiOpenKey. Stub BiFlushKey, BiLoadHive.
- Implement BiAddStoreFromFile, BcdOpenStoreFromFile.
- Stub BlUtlUpdateProcess and BlResourceFindMessage.
- Other misc. cleanups.
[BOOTMGR]:
- Implement BmpFatalErrorMessageFilter, BmErrorPurge, BmpErrorLog, BmFatalErrorEx.
- Implement BmpFwGetFullPath.
- Implement BmOpenDataStore.
- Stub BmOpenBootIni
svn path=/trunk/; revision=69447
2015-10-04 21:07:12 +00:00
|
|
|
lib/misc/image.c
|
2016-01-06 04:43:23 +00:00
|
|
|
lib/misc/resource.c
|
|
|
|
lib/misc/font.c
|
2016-01-20 06:59:12 +00:00
|
|
|
lib/misc/rtlcompat.c
|
[0.4.7][WIN32SS][RTL] Fix regression CORE-16769 + BSOD 0x50 CORE-13907
The main motivation to port all that back is to get rid of Win32K-BSODs 0x50 like CORE-13907
that could be triggered by user-mode-applications.
Technical reason was CORE-14857 "RtlImageNtHeaderEx needs SEH" and issues with hooks+callbacks.
All other tickets mentioned in here were regressions that we experienced on the long
journey towards perfecting the fixes on master head, and those were not happening yet in the older builds,
so they are mentioned in here only to allow tracking where that code went into.
Thanks to Jim Tabor, Mark Jansen & Thomas Faber
By squashed backmerge of the following commits:
0.4.15-dev-3440-g a89844f7408fa1eb5c81e358c27490b095a680b1
0.4.15-dev-3430-g 9cff384c222900d1f25c4beae9362c44da99a3d9
0.4.14-dev-1287-g 568b6d0558d047df1826d7438448432643d7fe5c
0.4.14-dev-1255-g 177ae91bf63810daae17f15bb21be16592c485a1
0.4.14-dev-1241-g 915a5764a98be6f8a03471d68a55e4b1a5899f66
0.4.14-dev-1240-g d8add40e893c4bbbb72211cae3e351445e53a3f4
0.4.14-dev-1002-g feb7df42b475412823b50ea8d22ec98843df6c49
JIRA-tickets: CORE-13907, CORE-16769, CORE-14857, CORE-17856, CORE-17857, partially CORE-13019.
We also had some more dupes of CORE-13907 in JIRA, but I linked all of them (transitively)
towards the initial report, and resolved them without setting a fixVer for them.
In more detail:
--------------
[USER32] Fix BSOD 0x50 in 'WineVDM + Castle Of Winds' CORE-17856 CORE-17857
CORE-17856 BSOD 0x50 when starting Castle of the Winds second time, with WineVDM
CORE-17857 BSOD 0x50 on shutdown after closing Castle of the Winds with WineVDM
0.4.15-dev-3430-g 9cff384c222900d1f25c4beae9362c44da99a3d9
0.4.15-dev-3440-g a89844f7408fa1eb5c81e358c27490b095a680b1
--------------
[NTUSER] Fix Strings and Format to Hooks
Allocate heap instead of data segment to be used for callbacks on user side.
Move and correct initial hook call out setup. Use it in more than one hook call.
This fixes issues with strings out of alignment and use of kernel pointers.
See CORE-13907 (HXD-portable BSOD) and CORE-16769 (HXD-portable exception)
Small wow update.
cherry picked from commit 0.4.14-dev-1287-g 568b6d0558d047df1826d7438448432643d7fe5c
--------------
[RTL] Introduce RtlpImageNtHeader,
which implements the required functionality.
ntdll and ntoskrnl now have a wrapper for this, with SEH.
This protects the function against malformed / bad images,
whilst still being able to use the code in freeldr et al.
Idea from Thomas.
CORE-14857
cherry picked from commit 0.4.14-dev-1255-g 177ae91bf63810daae17f15bb21be16592c485a1
--------------
[WIN32SS] Form Sanity to Hook Callbacks
Fix WH_CALLWNDPROC/RET data to user hook calls.
Helps with CORE-13907 "(HXD-portable BSOD)"
Fixes the logging of "(win32ss/user/ntuser/callback.c:748) err: Failure to make Callback! Status 0xc00000fd" within CORE-13019, but not the whole ticket.
cherry picked from commit 0.4.14-dev-1241-g 915a5764a98be6f8a03471d68a55e4b1a5899f66
--------------
[USER32] Fix null return.
See CORE-16769 "HxD 1.7.7.0 portable unhandled exception"
cherry picked from commit 0.4.14-dev-1240-g d8add40e893c4bbbb72211cae3e351445e53a3f4
--------------
[WIN32SS] Fix a typo in dbg print
cherry picked from commit 0.4.14-dev-1002-g feb7df42b475412823b50ea8d22ec98843df6c49
2022-03-17 13:04:28 +00:00
|
|
|
lib/rtl/libsupp.c
|
2016-01-06 04:43:23 +00:00
|
|
|
lib/firmware/fwutil.c
|
2015-09-06 03:24:30 +00:00
|
|
|
lib/firmware/efi/firmware.c
|
|
|
|
lib/mm/mm.c
|
|
|
|
lib/mm/pagealloc.c
|
|
|
|
lib/mm/heapalloc.c
|
|
|
|
lib/mm/blkalloc.c
|
2015-09-06 20:55:50 +00:00
|
|
|
lib/mm/descriptor.c
|
2015-09-06 21:29:41 +00:00
|
|
|
lib/platform/time.c
|
2015-09-09 16:50:05 +00:00
|
|
|
lib/io/blkcache.c
|
2015-09-11 04:33:24 +00:00
|
|
|
lib/io/etfs.c
|
2015-09-06 21:29:41 +00:00
|
|
|
lib/io/io.c
|
|
|
|
lib/io/device.c
|
|
|
|
lib/io/file.c
|
2015-09-07 04:37:01 +00:00
|
|
|
lib/io/fat.c
|
2015-09-07 19:46:50 +00:00
|
|
|
lib/io/display/display.c
|
|
|
|
lib/io/display/emscons.c
|
|
|
|
lib/io/display/guicons.c
|
|
|
|
lib/io/display/textcons.c
|
|
|
|
lib/io/display/efi/textcons.c
|
|
|
|
lib/io/display/efi/guicons.c
|
|
|
|
lib/io/display/efi/gop.c
|
|
|
|
lib/io/display/efi/uga.c)
|
2015-09-04 14:16:56 +00:00
|
|
|
|
|
|
|
if(ARCH STREQUAL "i386")
|
2015-09-05 19:18:54 +00:00
|
|
|
list(APPEND BOOTLIB_ASM_SOURCE
|
2017-02-04 21:59:52 +00:00
|
|
|
lib/arch/i386/transfer.s
|
2015-09-04 14:16:56 +00:00
|
|
|
)
|
2015-09-05 19:18:54 +00:00
|
|
|
list(APPEND BOOTLIB_SOURCE
|
2015-09-05 20:31:14 +00:00
|
|
|
lib/arch/i386/arch.c
|
2015-09-06 03:24:30 +00:00
|
|
|
lib/mm/i386/mmx86.c
|
2015-09-04 14:16:56 +00:00
|
|
|
)
|
|
|
|
elseif(ARCH STREQUAL "amd64")
|
2015-09-05 19:18:54 +00:00
|
|
|
list(APPEND BOOTLIB_ASM_SOURCE
|
2015-09-04 14:16:56 +00:00
|
|
|
#lib/arch/amd64/foo.asm
|
|
|
|
)
|
2015-09-05 19:18:54 +00:00
|
|
|
list(APPEND BOOTLIB_SOURCE
|
2015-09-04 14:16:56 +00:00
|
|
|
#lib/arch/amd64/foo.c
|
2015-09-08 15:56:33 +00:00
|
|
|
lib/arch/stub/arch.c
|
|
|
|
lib/mm/stub/mm.c
|
2015-09-04 14:16:56 +00:00
|
|
|
)
|
|
|
|
else()
|
2015-09-08 15:56:33 +00:00
|
|
|
list(APPEND BOOTLIB_SOURCE
|
|
|
|
lib/arch/stub/arch.c
|
2015-09-08 15:57:47 +00:00
|
|
|
lib/mm/stub/mm.c
|
2015-09-08 15:56:33 +00:00
|
|
|
)
|
2015-09-04 14:16:56 +00:00
|
|
|
endif()
|
|
|
|
|
2015-09-05 19:18:54 +00:00
|
|
|
add_asm_files(bootlib_asm ${BOOTLIB_ASM_SOURCE})
|
|
|
|
add_library(bootlib ${BOOTLIB_SOURCE} ${bootlib_asm})
|
|
|
|
add_pch(bootlib app/bootmgr/bootmgr.h BOOTLIB_SOURCE)
|
2017-02-05 10:45:50 +00:00
|
|
|
add_dependencies(bootlib bugcodes asm bootmsg xdk)
|
2015-09-04 14:16:56 +00:00
|
|
|
|
|
|
|
list(APPEND BOOTMGR_BASE_SOURCE
|
|
|
|
app/bootmgr/efiemu.c
|
|
|
|
app/bootmgr/bootmgr.c
|
|
|
|
)
|
|
|
|
|
2016-01-06 04:43:23 +00:00
|
|
|
add_executable(bootmgfw ${BOOTMGR_BASE_SOURCE} app/bootmgr/bootmgr.rc)
|
2015-09-04 14:16:56 +00:00
|
|
|
set_target_properties(bootmgfw PROPERTIES SUFFIX ".efi")
|
|
|
|
|
|
|
|
if(MSVC)
|
2017-07-25 17:30:21 +00:00
|
|
|
if (ARCH STREQUAL "arm")
|
|
|
|
add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER")
|
|
|
|
else()
|
|
|
|
add_target_link_flags(bootmgfw "/ignore:4078 /ignore:4254 /DRIVER /FIXED")
|
|
|
|
endif()
|
2015-09-04 14:16:56 +00:00
|
|
|
else()
|
|
|
|
add_target_link_flags(bootmgfw "-Wl,--strip-all,--exclude-all-symbols")
|
|
|
|
endif()
|
|
|
|
|
|
|
|
set_image_base(bootmgfw 0x10000)
|
2015-09-04 14:40:15 +00:00
|
|
|
|
|
|
|
if(MSVC)
|
|
|
|
set_subsystem(bootmgfw EFI_APPLICATION)
|
|
|
|
else()
|
|
|
|
set_subsystem(bootmgfw 10)
|
|
|
|
endif()
|
|
|
|
|
2015-09-04 14:16:56 +00:00
|
|
|
set_entrypoint(bootmgfw EfiEntry)
|
|
|
|
|
2015-09-05 19:18:54 +00:00
|
|
|
target_link_libraries(bootmgfw bootlib cportlib cmlib rtl libcntpr)
|
2015-09-04 14:16:56 +00:00
|
|
|
|
2015-09-04 15:33:12 +00:00
|
|
|
if(STACK_PROTECTOR)
|
|
|
|
target_link_libraries(bootmgfw gcc_ssp)
|
|
|
|
elseif(RUNTIME_CHECKS)
|
|
|
|
target_link_libraries(bootmgfw runtmchk)
|
|
|
|
endif()
|
|
|
|
|
2015-09-04 14:43:01 +00:00
|
|
|
add_dependencies(bootmgfw asm bugcodes)
|
2015-09-04 14:16:56 +00:00
|
|
|
|
2016-01-20 06:59:12 +00:00
|
|
|
list(APPEND ROSLOAD_BASE_SOURCE
|
|
|
|
app/rosload/rosload.c
|
|
|
|
)
|
|
|
|
|
|
|
|
add_executable(rosload ${ROSLOAD_BASE_SOURCE})
|
|
|
|
set_target_properties(rosload PROPERTIES SUFFIX ".efi")
|
|
|
|
|
|
|
|
if(MSVC)
|
2016-01-21 17:08:33 +00:00
|
|
|
add_target_link_flags(rosload "/ignore:4078 /ignore:4254 /DRIVER")
|
2016-01-20 06:59:12 +00:00
|
|
|
else()
|
2016-01-21 17:08:33 +00:00
|
|
|
add_target_link_flags(rosload "-Wl,--strip-all,--exclude-all-symbols,--dynamicbase,--pic-executable")
|
2016-01-20 06:59:12 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
set_image_base(rosload 0x10000)
|
|
|
|
|
|
|
|
if(MSVC)
|
|
|
|
set_subsystem(rosload BOOT_APPLICATION)
|
|
|
|
else()
|
2016-01-20 17:00:51 +00:00
|
|
|
set_subsystem(rosload 16)
|
2016-01-20 06:59:12 +00:00
|
|
|
endif()
|
|
|
|
|
2016-02-03 19:12:34 +00:00
|
|
|
if(ARCH STREQUAL "i386")
|
|
|
|
set_entrypoint(rosload OslMain 4)
|
|
|
|
else()
|
|
|
|
set_entrypoint(rosload OslMain)
|
|
|
|
endif()
|
2016-01-20 06:59:12 +00:00
|
|
|
|
|
|
|
target_link_libraries(rosload bootlib cportlib cmlib rtl libcntpr)
|
|
|
|
|
|
|
|
if(STACK_PROTECTOR)
|
|
|
|
target_link_libraries(rosload gcc_ssp)
|
|
|
|
elseif(RUNTIME_CHECKS)
|
|
|
|
target_link_libraries(rosload runtmchk)
|
|
|
|
endif()
|
|
|
|
|
|
|
|
add_dependencies(rosload asm bugcodes)
|
|
|
|
|
|
|
|
add_cd_file(TARGET rosload DESTINATION reactos/system32/boot NO_CAB FOR all)
|