Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 09/11: [FREELDR] Implement loading of rosload as 2nd stage loader
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e56911f66bf933d12d1bc… commit e56911f66bf933d12d1bc247f041dc99ca8c7078 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Oct 6 08:23:55 2024 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Implement loading of rosload as 2nd stage loader --- boot/freeldr/freeldr/CMakeLists.txt | 20 ++---------- boot/freeldr/freeldr/freeldr.c | 64 ++++++++++++++++++++++++++++++++++++- boot/freeldr/freeldr/freeldr.spec | 48 +--------------------------- boot/freeldr/freeldr/lib/peloader.c | 5 ++- boot/freeldr/freeldr/pcat.cmake | 6 ++-- boot/freeldr/freeldr/uefi.cmake | 14 ++++++-- 6 files changed, 84 insertions(+), 73 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index ef1426cff19..ffbdaffa178 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -58,11 +58,6 @@ list(APPEND FREELDR_BOOTLIB_SOURCE list(APPEND FREELDR_BOOTMGR_SOURCE include/freeldr.h - custom.c - # linuxboot.c - miscboot.c - options.c - oslist.c settings.c ui/directui.c # ui/gui.c @@ -88,10 +83,7 @@ if(ARCH STREQUAL "i386") # arch/i386/linux.S list(APPEND FREELDR_ARC_SOURCE - arch/i386/i386bug.c - arch/i386/halstub.c - arch/i386/ntoskrnl.c - disk/scsiport.c) + arch/i386/i386bug.c) list(APPEND FREELDR_NTLDR_SOURCE ntldr/arch/i386/winldr.c @@ -118,17 +110,11 @@ else() endif() list(APPEND FREELDR_BASE_SOURCE - bootmgr.c # This file is compiled with custom definitions freeldr.c - ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds - ## even if ${FREELDR_NTLDR_SOURCE} is not added, - ## otherwise we get linking errors with Rtl**Bitmap** APIs. - ## Do not happen on MSVC builds however... - ntldr/inffile.c - ntldr/ntldropts.c + ntldr/ntldropts.c # Should be in rosload, but is currently needed by machpc.c, etc. lib/rtl/libsupp.c) -if(ARCH STREQUAL "i386") +if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64") # Must be included together with disk/scsiport.c list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index e1c58709bda..e39cf7e84aa 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -30,6 +30,64 @@ CCHAR FrLdrBootPath[MAX_PATH] = ""; /* FUNCTIONS ******************************************************************/ +static +BOOLEAN +LoadRosload( + _In_ PCSTR RosloadPath, + _Out_ PVOID* ImageBase, + _Out_ PLDR_DATA_TABLE_ENTRY* DataTableEntry) +{ + CHAR FullPath[MAX_PATH]; + BOOLEAN Success; + + /* Create full rosload.exe path */ + RtlStringCbPrintfA(FullPath, + sizeof(FullPath), + "%s\\%s", + FrLdrBootPath, + RosloadPath); + + TRACE("Loading second stage loader '%s'\n", FullPath); + + /* Load rosload.exe as a bootloader image. The base name is "scsiport.sys", + because it exports ScsiPort* functions for ntbootdd.sys */ + Success = PeLdrLoadBootImage(FullPath, + "scsiport.sys", + ImageBase, + DataTableEntry); + if (!Success) + { + WARN("Failed to load second stage loader '%s'\n", FullPath); + return FALSE; + } + + return TRUE; +} + +static +ULONG +LaunchSecondStageLoader(VOID) +{ + PLDR_DATA_TABLE_ENTRY RosloadDTE; + PVOID ImageBase; + LONG (*EntryPoint)(VOID); + + /* Load the second stage loader */ + if (!LoadRosload("rosload.exe", &ImageBase, &RosloadDTE)) + { + /* Try in loader directory */ + if (!LoadRosload("loader\\rosload.exe", &ImageBase, &RosloadDTE)) + { + return ENOENT; + } + } + + /* Call the entrypoint */ + printf("Launching rosload.exe...\n"); + EntryPoint = VaToPa(RosloadDTE->EntryPoint); + return (*EntryPoint)(); +} + VOID __cdecl BootMain(IN PCCH CmdLine) { /* Load the default settings from the command-line */ @@ -77,7 +135,11 @@ VOID __cdecl BootMain(IN PCCH CmdLine) goto Quit; } - RunLoader(); + /* Launch second stage loader */ + if (LaunchSecondStageLoader() != ESUCCESS) + { + UiMessageBoxCritical("Unable to load second stage loader."); + } Quit: /* If we reach this point, something went wrong before, therefore reboot */ diff --git a/boot/freeldr/freeldr/freeldr.spec b/boot/freeldr/freeldr/freeldr.spec index 2ea08b1927c..6d7b5f9d788 100644 --- a/boot/freeldr/freeldr/freeldr.spec +++ b/boot/freeldr/freeldr/freeldr.spec @@ -1,50 +1,3 @@ -@ stdcall RtlAssert(ptr ptr long ptr) -@ varargs -arch=i386 ScsiDebugPrint(long str) -@ stdcall -arch=i386 ScsiPortCompleteRequest(ptr long long long long) -@ stdcall -arch=i386 ScsiPortConvertPhysicalAddressToUlong(long long) -@ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) -#@ stdcall -arch=x86_64 ScsiPortConvertUlongToPhysicalAddress(long) -@ stdcall -arch=i386 ScsiPortFlushDma(ptr) -@ stdcall -arch=i386 ScsiPortFreeDeviceBase(ptr ptr) -@ stdcall -arch=i386 ScsiPortGetBusData(ptr long long long ptr long) -@ stdcall -arch=i386 ScsiPortGetDeviceBase(ptr long long long long long long) -@ stdcall -arch=i386 ScsiPortGetLogicalUnit(ptr long long long) -@ stdcall -arch=i386 ScsiPortGetPhysicalAddress(ptr ptr ptr long) -@ stdcall -arch=i386 ScsiPortGetSrb(ptr long long long long) -@ stdcall -arch=i386 ScsiPortGetUncachedExtension(ptr ptr long) -@ stdcall -arch=i386 ScsiPortGetVirtualAddress(ptr long long) -@ stdcall -arch=i386 ScsiPortInitialize(ptr ptr ptr ptr) -@ stdcall -arch=i386 ScsiPortIoMapTransfer(ptr ptr long long) -@ stdcall -arch=i386 ScsiPortLogError(ptr ptr long long long long long) -@ stdcall -arch=i386 ScsiPortMoveMemory(ptr ptr long) -@ cdecl -arch=i386 ScsiPortNotification() -@ stdcall -arch=i386 ScsiPortReadPortBufferUchar(ptr ptr long) -@ stdcall -arch=i386 ScsiPortReadPortBufferUshort(ptr ptr long) -@ stdcall -arch=i386 ScsiPortReadPortBufferUlong(ptr ptr long) -@ stdcall -arch=i386 ScsiPortReadPortUchar(ptr) -@ stdcall -arch=i386 ScsiPortReadPortUshort(ptr) -@ stdcall -arch=i386 ScsiPortReadPortUlong(ptr) -@ stdcall -arch=i386 ScsiPortReadRegisterBufferUchar(ptr ptr long) -@ stdcall -arch=i386 ScsiPortReadRegisterBufferUshort(ptr ptr long) -@ stdcall -arch=i386 ScsiPortReadRegisterBufferUlong(ptr ptr long) -@ stdcall -arch=i386 ScsiPortReadRegisterUchar(ptr) -@ stdcall -arch=i386 ScsiPortReadRegisterUshort(ptr) -@ stdcall -arch=i386 ScsiPortReadRegisterUlong(ptr) -@ stdcall -arch=i386 ScsiPortSetBusDataByOffset(ptr long long long ptr long long) -@ stdcall -arch=i386 ScsiPortStallExecution(long) -@ stdcall -arch=i386 ScsiPortValidateRange(ptr long long long long long long) -@ stdcall -arch=i386 ScsiPortWritePortBufferUchar(ptr ptr long) -@ stdcall -arch=i386 ScsiPortWritePortBufferUshort(ptr ptr long) -@ stdcall -arch=i386 ScsiPortWritePortBufferUlong(ptr ptr long) -@ stdcall -arch=i386 ScsiPortWritePortUchar(ptr long) -@ stdcall -arch=i386 ScsiPortWritePortUshort(ptr long) -@ stdcall -arch=i386 ScsiPortWritePortUlong(ptr long) -@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUchar(ptr ptr long) -@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUshort(ptr ptr long) -@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUlong(ptr ptr long) -@ stdcall -arch=i386 ScsiPortWriteRegisterUchar(ptr long) -@ stdcall -arch=i386 ScsiPortWriteRegisterUshort(ptr long) -@ stdcall -arch=i386 ScsiPortWriteRegisterUlong(ptr long) # ARC @ cdecl ArcClose() @@ -164,6 +117,7 @@ @ cdecl RamDiskInitialize() @ cdecl Reboot() @ cdecl Relocator16Boot() +@ stdcall RtlAssert(ptr ptr long ptr) @ cdecl StallExecutionProcessor() # Additional stuff for scsiport diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index 750e18547ff..5015704a521 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -528,10 +528,9 @@ PeLdrInitializeModuleList(VOID) InitializeListHead(&FrLdrModuleList); - /* Allocate a data table entry for freeldr.sys. - The base name is scsiport.sys for imports from ntbootdd.sys */ + /* Allocate a data table entry for freeldr.sys */ if (!PeLdrAllocateDataTableEntry(&FrLdrModuleList, - "scsiport.sys", + "freeldr.sys", "freeldr.sys", &__ImageBase, &FreeldrDTE)) diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake index 02c85cf7110..78121be46f8 100644 --- a/boot/freeldr/freeldr/pcat.cmake +++ b/boot/freeldr/freeldr/pcat.cmake @@ -155,7 +155,7 @@ add_library(freeldr_common ${PCATLDR_ARC_SOURCE} ${FREELDR_BOOTLIB_SOURCE} ${PCATLDR_BOOTMGR_SOURCE} - ${FREELDR_NTLDR_SOURCE}) +) if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang") # We need to reduce the binary size @@ -170,7 +170,7 @@ set(PCH_SOURCE ${PCATLDR_ARC_SOURCE} ${FREELDR_BOOTLIB_SOURCE} ${PCATLDR_BOOTMGR_SOURCE} - ${FREELDR_NTLDR_SOURCE}) +) add_pch(freeldr_common include/freeldr.h PCH_SOURCE) add_dependencies(freeldr_common bugcodes asm xdk) @@ -221,7 +221,7 @@ if(ARCH STREQUAL "i386") target_link_libraries(freeldr_pe mini_hal) endif() -target_link_libraries(freeldr_pe freeldr_common cportlib blcmlib blrtl libcntpr) +target_link_libraries(freeldr_pe freeldr_common cportlib libcntpr blrtl) # dynamic analysis switches if(STACK_PROTECTOR) diff --git a/boot/freeldr/freeldr/uefi.cmake b/boot/freeldr/freeldr/uefi.cmake index a3bc6a7e2e0..97a9a82c102 100644 --- a/boot/freeldr/freeldr/uefi.cmake +++ b/boot/freeldr/freeldr/uefi.cmake @@ -43,13 +43,20 @@ else() #TBD endif() +list(APPEND UEFILDR_BOOTMGR_SOURCE + ${FREELDR_BOOTMGR_SOURCE} + custom.c + options.c + oslist.c +) + add_asm_files(uefifreeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE} ${UEFILDR_COMMON_ASM_SOURCE}) add_library(uefifreeldr_common ${uefifreeldr_common_asm} ${UEFILDR_ARC_SOURCE} ${FREELDR_BOOTLIB_SOURCE} - ${FREELDR_BOOTMGR_SOURCE} + ${UEFILDR_BOOTMGR_SOURCE} ${FREELDR_NTLDR_SOURCE}) target_compile_definitions(uefifreeldr_common PRIVATE UEFIBOOT) @@ -62,7 +69,7 @@ endif() set(PCH_SOURCE ${UEFILDR_ARC_SOURCE} ${FREELDR_BOOTLIB_SOURCE} - ${FREELDR_BOOTMGR_SOURCE} + ${UEFILDR_BOOTMGR_SOURCE} ${FREELDR_NTLDR_SOURCE}) add_pch(uefifreeldr_common include/arch/uefi/uefildr.h PCH_SOURCE) @@ -79,6 +86,9 @@ spec2def(uefildr.exe freeldr.spec) list(APPEND UEFILDR_BASE_SOURCE include/arch/uefi/uefildr.h arch/uefi/uefildr.c + bootmgr.c + ntldr/setupldr.c + ntldr/inffile.c ${FREELDR_BASE_SOURCE}) if(ARCH STREQUAL "i386")

1 0

[reactos] 08/11: [FREELDR] Use StallExecutionProcessor instead of KeStallExecutionProcessor
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=adacd51a300bea4f12839… commit adacd51a300bea4f12839e9ce5d07ff9f284f6a4 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 3 17:01:42 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Use StallExecutionProcessor instead of KeStallExecutionProcessor The latter will only be available in rosload.exe. --- boot/freeldr/freeldr/lib/fs/pxe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/boot/freeldr/freeldr/lib/fs/pxe.c b/boot/freeldr/freeldr/lib/fs/pxe.c index 1a1866ed058..93e2de75abf 100644 --- a/boot/freeldr/freeldr/lib/fs/pxe.c +++ b/boot/freeldr/freeldr/lib/fs/pxe.c @@ -94,7 +94,7 @@ BOOLEAN CallPxe(UINT16 Service, PVOID Parameter) if (Service != PXENV_TFTP_READ) { // HACK: this delay shouldn't be necessary - KeStallExecutionProcessor(100 * 1000); // 100 ms + StallExecutionProcessor(100 * 1000); // 100 ms TRACE("PxeCall(0x%x, %p)\n", Service, Parameter); }

1 0

[reactos] 07/11: [MINIHAL] Move the definition of _MINIHAL_ to directory scope
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=78ded05547ca67fba1145… commit 78ded05547ca67fba11450ef5361e6f19788a31e Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sun Nov 3 16:59:19 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [MINIHAL] Move the definition of _MINIHAL_ to directory scope This is required, so that the definition is available when preprocessing asm files on MSVC builds. Otherwise systimer.s will contain KeStallExecutionProcessor, which must not be used in freeldr. --- hal/halx86/minihal/CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hal/halx86/minihal/CMakeLists.txt b/hal/halx86/minihal/CMakeLists.txt index d446bf3cc7b..4a7ca0f9d89 100644 --- a/hal/halx86/minihal/CMakeLists.txt +++ b/hal/halx86/minihal/CMakeLists.txt @@ -1,4 +1,9 @@ +# We need to define this here, because the target definitions are not +# passed to CL, when preprocessing the asm files on MSVC builds. +# See CORE-19847 +add_definitions(-D_MINIHAL_) + list(APPEND MINI_HAL_SOURCE ../generic/portio.c ../legacy/bus/bushndlr.c @@ -39,6 +44,6 @@ endif() add_asm_files(mini_hal_asm ../generic/systimer.S) add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) -target_compile_definitions(mini_hal PRIVATE _MINIHAL_ _BLDR_ _NTSYSTEM_) +target_compile_definitions(mini_hal PRIVATE _BLDR_ _NTSYSTEM_) add_dependencies(mini_hal psdk bugcodes asm) add_pch(mini_hal ../include/hal.h MINI_HAL_SOURCE)

1 0

[reactos] 06/11: [USETUP] Install rosload.exe
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d516e71d3b044d2030c5… commit 3d516e71d3b044d2030c588f8f3172df8a7f76b3 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 3 11:32:51 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [USETUP] Install rosload.exe --- base/setup/lib/bootsup.c | 15 +++++++++++++-- base/setup/lib/utils/bldrsup.c | 2 +- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/base/setup/lib/bootsup.c b/base/setup/lib/bootsup.c index 4c57fc8218b..1ee5f8c133d 100644 --- a/base/setup/lib/bootsup.c +++ b/base/setup/lib/bootsup.c @@ -880,7 +880,6 @@ InstallMbrBootCodeToDisk( InstallMbrBootCode); } - static NTSTATUS InstallBootloaderFiles( @@ -895,7 +894,19 @@ InstallBootloaderFiles( CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\freeldr.sys"); CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"freeldr.sys"); - DPRINT1("Copy: %S ==> %S\n", SrcPath, DstPath); + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); + Status = SetupCopyFile(SrcPath, DstPath, FALSE); + if (!NT_SUCCESS(Status)) + { + DPRINT1("SetupCopyFile() failed (Status 0x%08lx)\n", Status); + return Status; + } + + /* Copy rosload to the system partition, always overwriting the older version */ + CombinePaths(SrcPath, ARRAYSIZE(SrcPath), 2, SourceRootPath->Buffer, L"\\loader\\rosload.exe"); + CombinePaths(DstPath, ARRAYSIZE(DstPath), 2, SystemRootPath->Buffer, L"rosload.exe"); + + DPRINT("Copy: %S ==> %S\n", SrcPath, DstPath); Status = SetupCopyFile(SrcPath, DstPath, FALSE); if (!NT_SUCCESS(Status)) { diff --git a/base/setup/lib/utils/bldrsup.c b/base/setup/lib/utils/bldrsup.c index ad13cbe51df..097a79dc222 100644 --- a/base/setup/lib/utils/bldrsup.c +++ b/base/setup/lib/utils/bldrsup.c @@ -124,7 +124,7 @@ NtLdrEnumerateBootEntries( // Question 2: What if many config files are possible? NTOS_BOOT_LOADER_FILES NtosBootLoaders[] = { - {FreeLdr, L"freeldr.sys\0", L"freeldr.ini", + {FreeLdr, L"freeldr.sys\0" L"rosload.exe\0", L"freeldr.ini", OpenIniBootLoaderStore, CloseIniBootLoaderStore, (PENUM_BOOT_STORE_ENTRIES)FreeLdrEnumerateBootEntries}, {NtLdr , L"ntldr\0" L"osloader.exe\0", L"boot.ini", OpenIniBootLoaderStore, CloseIniBootLoaderStore, (PENUM_BOOT_STORE_ENTRIES)NtLdrEnumerateBootEntries },

1 0

[reactos] 05/11: [ROSLOAD] Add rosload.exe target as 2nd stage loader
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=17cf47df447064146d405… commit 17cf47df447064146d4057b19e2235805df1fd51 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 2 09:10:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [ROSLOAD] Add rosload.exe target as 2nd stage loader --- boot/freeldr/freeldr/CMakeLists.txt | 1 + boot/freeldr/freeldr/rosload.cmake | 105 ++++++++++++++++++++++++++++++++++++ boot/freeldr/freeldr/rosload.spec | 47 ++++++++++++++++ 3 files changed, 153 insertions(+) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 2a349833b07..ef1426cff19 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -135,6 +135,7 @@ if(ARCH STREQUAL "i386") endif() include(pcat.cmake) +include(rosload.cmake) if(NOT ARCH STREQUAL "i386" OR NOT (SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox")) include(uefi.cmake) endif() diff --git a/boot/freeldr/freeldr/rosload.cmake b/boot/freeldr/freeldr/rosload.cmake new file mode 100644 index 00000000000..6af8eccf380 --- /dev/null +++ b/boot/freeldr/freeldr/rosload.cmake @@ -0,0 +1,105 @@ +## +## PROJECT: FreeLoader +## LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) +## PURPOSE: Build definitions for rosload 2nd stage loader +## COPYRIGHT: Copyright 2024 Timo Kreuzer <timo.kreuzer(a)reactos.org> +## + +spec2def(rosload.exe rosload.spec) + +list(APPEND ROSLOAD_SOURCE + include/freeldr.h + bootmgr.c + custom.c + linuxboot.c + miscboot.c + options.c + oslist.c + lib/rtl/libsupp.c + ${REACTOS_SOURCE_DIR}/ntoskrnl/config/cmboot.c + ntldr/conversion.c + ntldr/inffile.c + ntldr/registry.c + ntldr/setupldr.c + ntldr/winldr.c + ntldr/wlmemory.c + ntldr/wlregistry.c +) + +if(ARCH STREQUAL "i386") + + list(APPEND ROSLOAD_SOURCE + arch/i386/halstub.c + arch/i386/ntoskrnl.c + disk/scsiport.c + ntldr/arch/i386/winldr.c + ntldr/headless.c) + + if(SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox") + # These machine types require built-in bitmap font + list(APPEND ROSLOAD_SOURCE + arch/vgafont.c) + endif() + + list(APPEND ROSLOAD_ASM_SOURCE + arch/i386/drvmap.S + arch/i386/linux.S) + +elseif(ARCH STREQUAL "amd64") + + list(APPEND ROSLOAD_SOURCE + ntldr/arch/amd64/winldr.c) + + list(APPEND ROSLOAD_ASM_SOURCE + arch/amd64/misc.S + arch/amd64/linux.S + ) + +elseif(ARCH STREQUAL "arm") + + list(APPEND ROSLOAD_SOURCE + ntldr/arch/arm/winldr.c) + + list(APPEND ROSLOAD_ASM_SOURCE + arch/arm/boot.S) + +else() + #TBD +endif() + +add_asm_files(rosload_asm ${ROSLOAD_ASM_SOURCE}) + +add_executable(rosload + ${ROSLOAD_SOURCE} + ${rosload_asm} + ${CMAKE_CURRENT_BINARY_DIR}/rosload.def +) + +set_target_properties(rosload + PROPERTIES + ENABLE_EXPORTS TRUE + DEFINE_SYMBOL "") + +set_image_base(rosload 0x10000) # 0x200000 +set_subsystem(rosload native) +set_entrypoint(rosload RunLoader) + +if(ARCH STREQUAL "i386") + target_link_libraries(rosload mini_hal) +endif() + +target_link_libraries(rosload blcmlib blrtl libcntpr) +add_importlibs(rosload freeldr) + +# dynamic analysis switches +if(STACK_PROTECTOR) + target_sources(rosload PRIVATE $<TARGET_OBJECTS:gcc_ssp_nt>) +endif() + +if(RUNTIME_CHECKS) + target_link_libraries(rosload runtmchk) +endif() + +add_dependencies(rosload bugcodes asm xdk) + +add_cd_file(TARGET rosload DESTINATION loader NO_CAB FOR bootcd regtest livecd hybridcd) diff --git a/boot/freeldr/freeldr/rosload.spec b/boot/freeldr/freeldr/rosload.spec new file mode 100644 index 00000000000..04bfebebebe --- /dev/null +++ b/boot/freeldr/freeldr/rosload.spec @@ -0,0 +1,47 @@ +@ stdcall RtlAssert(ptr ptr long ptr) +@ varargs -arch=i386 ScsiDebugPrint(long str) +@ stdcall -arch=i386 ScsiPortCompleteRequest(ptr long long long long) +@ stdcall -arch=i386 ScsiPortConvertPhysicalAddressToUlong(long long) +@ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) +#@ stdcall -arch=x86_64 ScsiPortConvertUlongToPhysicalAddress(long) +@ stdcall -arch=i386 ScsiPortFlushDma(ptr) +@ stdcall -arch=i386 ScsiPortFreeDeviceBase(ptr ptr) +@ stdcall -arch=i386 ScsiPortGetBusData(ptr long long long ptr long) +@ stdcall -arch=i386 ScsiPortGetDeviceBase(ptr long long long long long long) +@ stdcall -arch=i386 ScsiPortGetLogicalUnit(ptr long long long) +@ stdcall -arch=i386 ScsiPortGetPhysicalAddress(ptr ptr ptr long) +@ stdcall -arch=i386 ScsiPortGetSrb(ptr long long long long) +@ stdcall -arch=i386 ScsiPortGetUncachedExtension(ptr ptr long) +@ stdcall -arch=i386 ScsiPortGetVirtualAddress(ptr long long) +@ stdcall -arch=i386 ScsiPortInitialize(ptr ptr ptr ptr) +@ stdcall -arch=i386 ScsiPortIoMapTransfer(ptr ptr long long) +@ stdcall -arch=i386 ScsiPortLogError(ptr ptr long long long long long) +@ stdcall -arch=i386 ScsiPortMoveMemory(ptr ptr long) +@ cdecl -arch=i386 ScsiPortNotification() +@ stdcall -arch=i386 ScsiPortReadPortBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadPortBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadPortBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadPortUchar(ptr) +@ stdcall -arch=i386 ScsiPortReadPortUshort(ptr) +@ stdcall -arch=i386 ScsiPortReadPortUlong(ptr) +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadRegisterUchar(ptr) +@ stdcall -arch=i386 ScsiPortReadRegisterUshort(ptr) +@ stdcall -arch=i386 ScsiPortReadRegisterUlong(ptr) +@ stdcall -arch=i386 ScsiPortSetBusDataByOffset(ptr long long long ptr long long) +@ stdcall -arch=i386 ScsiPortStallExecution(long) +@ stdcall -arch=i386 ScsiPortValidateRange(ptr long long long long long long) +@ stdcall -arch=i386 ScsiPortWritePortBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWritePortBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWritePortBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWritePortUchar(ptr long) +@ stdcall -arch=i386 ScsiPortWritePortUshort(ptr long) +@ stdcall -arch=i386 ScsiPortWritePortUlong(ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterUchar(ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterUshort(ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterUlong(ptr long)

1 0

[reactos] 04/11: [FREELDR] Remove ShowBootOptions from Menu code
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ebcf3f23aaa9417c7d0b2… commit ebcf3f23aaa9417c7d0b268021aa0e21d33a762b Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 2 21:18:13 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Remove ShowBootOptions from Menu code This removes a dependency of UI code to boot options code by getting rid of a call to DisplayBootTimeOptions() from within the menu code. Instead this is now handled by MainBootMenuKeyPressFilter. --- boot/freeldr/freeldr/bootmgr.c | 2 +- boot/freeldr/freeldr/custom.c | 1 - boot/freeldr/freeldr/include/ui.h | 3 --- boot/freeldr/freeldr/include/ui/noui.h | 1 - boot/freeldr/freeldr/include/ui/tui.h | 1 - boot/freeldr/freeldr/options.c | 1 - boot/freeldr/freeldr/ui/directui.c | 1 - boot/freeldr/freeldr/ui/minitui.c | 8 +------- boot/freeldr/freeldr/ui/noui.c | 1 - boot/freeldr/freeldr/ui/tui.c | 2 +- boot/freeldr/freeldr/ui/tuimenu.c | 8 -------- boot/freeldr/freeldr/ui/ui.c | 3 +-- 12 files changed, 4 insertions(+), 28 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index 0fe04a55813..b0494083d75 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -340,6 +340,7 @@ MainBootMenuKeyPressFilter( { case KEY_F8: DoOptionsMenu(&((OperatingSystemItem*)Context)[SelectedMenuItem]); + DisplayBootTimeOptions(); return TRUE; #ifdef HAS_OPTION_MENU_EDIT_CMDLINE @@ -433,7 +434,6 @@ VOID RunLoader(VOID) if (!UiDisplayMenu("Please select the operating system to start:", "For troubleshooting and advanced startup options for " "ReactOS, press F8.", - TRUE, OperatingSystemDisplayNames, OperatingSystemCount, DefaultOperatingSystem, diff --git a/boot/freeldr/freeldr/custom.c b/boot/freeldr/freeldr/custom.c index f0e984deb66..7519d2d7fa5 100644 --- a/boot/freeldr/freeldr/custom.c +++ b/boot/freeldr/freeldr/custom.c @@ -126,7 +126,6 @@ VOID OptionMenuCustomBoot(VOID) OperatingSystemItem OperatingSystem; if (!UiDisplayMenu("Please choose a boot method:", NULL, - FALSE, CustomBootMenuList, RTL_NUMBER_OF(CustomBootMenuList), 0, -1, diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index ee613a9ad42..cedc2fa922a 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -211,7 +211,6 @@ typedef struct tagUI_MENU_INFO { PCSTR MenuHeader; PCSTR MenuFooter; - BOOLEAN ShowBootOptions; PCSTR* MenuItemList; ULONG MenuItemCount; @@ -236,7 +235,6 @@ BOOLEAN UiDisplayMenu( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, @@ -293,7 +291,6 @@ typedef struct tagUIVTBL BOOLEAN (*DisplayMenu)( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, diff --git a/boot/freeldr/freeldr/include/ui/noui.h b/boot/freeldr/freeldr/include/ui/noui.h index df986bfd178..ac6524dec54 100644 --- a/boot/freeldr/freeldr/include/ui/noui.h +++ b/boot/freeldr/freeldr/include/ui/noui.h @@ -93,7 +93,6 @@ BOOLEAN NoUiDisplayMenu( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index 9017c0b4ef6..4a3f3e25ef9 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -149,7 +149,6 @@ BOOLEAN TuiDisplayMenu( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index 9a604bf90b3..27eb1dda090 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -95,7 +95,6 @@ VOID DoOptionsMenu(IN OperatingSystemItem* OperatingSystem) CHAR DebugChannelString[100]; if (!UiDisplayMenu("Select an option:", NULL, - TRUE, OptionsMenuList, sizeof(OptionsMenuList) / sizeof(OptionsMenuList[0]), 11, // Use "Start ReactOS normally" as default; see the switch below. diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index 197061927d2..7788fa1e84d 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -139,7 +139,6 @@ BOOLEAN UiDisplayMenu( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index d44aef6bc67..1ca4e8b5062 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -56,7 +56,7 @@ BOOLEAN MiniTuiInitialize(VOID) VOID MiniTuiDrawBackdrop(VOID) { /* Fill in a black background */ - TuiFillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 1, + TuiFillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 3, UiBackdropFillStyle, ATTR(UiBackdropFgColor, UiBackdropBgColor)); @@ -225,12 +225,6 @@ MiniTuiDrawMenu( ATTR(UiMenuFgColor, UiMenuBgColor)); } - /* Display the boot options if needed */ - if (MenuInfo->ShowBootOptions) - { - DisplayBootTimeOptions(); - } - VideoCopyOffScreenBufferToVRAM(); } diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index e79598bec63..80fefea0c9a 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -163,7 +163,6 @@ BOOLEAN NoUiDisplayMenu( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index 5960dcd5d44..80c5e3b0100 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -275,7 +275,7 @@ VOID TuiDrawBackdrop(VOID) TuiFillArea(0, TUI_TITLE_BOX_CHAR_HEIGHT, UiScreenWidth - 1, - UiScreenHeight - 2, + UiScreenHeight - 3, UiBackdropFillStyle, ATTR(UiBackdropFgColor, UiBackdropBgColor)); diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 7559380389c..ff6f95e1128 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -30,7 +30,6 @@ BOOLEAN TuiDisplayMenu( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, @@ -80,7 +79,6 @@ TuiDisplayMenu( /* Setup the MENU_INFO structure */ MenuInformation.MenuHeader = MenuHeader; MenuInformation.MenuFooter = MenuFooter; - MenuInformation.ShowBootOptions = ShowBootOptions; MenuInformation.MenuItemList = MenuItemList; MenuInformation.MenuItemCount = MenuItemCount; MenuInformation.MenuTimeRemaining = MenuTimeOut; @@ -219,12 +217,6 @@ TuiDrawMenu( /* Update the status bar */ UiVtbl.DrawStatusText("Use \x18 and \x19 to select, then press ENTER."); - /* Display the boot options if needed */ - if (MenuInfo->ShowBootOptions) - { - DisplayBootTimeOptions(); - } - VideoCopyOffScreenBufferToVRAM(); } diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 2583517e847..3496921cb53 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -605,7 +605,6 @@ BOOLEAN UiDisplayMenu( IN PCSTR MenuHeader, IN PCSTR MenuFooter OPTIONAL, - IN BOOLEAN ShowBootOptions, IN PCSTR MenuItemList[], IN ULONG MenuItemCount, IN ULONG DefaultMenuItem, @@ -615,7 +614,7 @@ UiDisplayMenu( IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, IN PVOID Context OPTIONAL) { - return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, ShowBootOptions, + return UiVtbl.DisplayMenu(MenuHeader, MenuFooter, MenuItemList, MenuItemCount, DefaultMenuItem, MenuTimeOut, SelectedMenuItem, CanEscape, KeyPressFilter, Context);

1 0

[reactos] 03/11: [FREELDR] Move MachInitializeBootDevices to BootMain
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9daef292e90f11e744d5c… commit 9daef292e90f11e744d5c7b64396c6c62602f201 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Sat Oct 5 18:33:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Move MachInitializeBootDevices to BootMain --- boot/freeldr/freeldr/bootmgr.c | 6 ------ boot/freeldr/freeldr/freeldr.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index 51030b03641..0fe04a55813 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -363,12 +363,6 @@ VOID RunLoader(VOID) ULONG SelectedOperatingSystem; ULONG i; - if (!MachInitializeBootDevices()) - { - UiMessageBoxCritical("Error when detecting hardware."); - return; - } - #ifdef _M_IX86 #ifndef UEFIBOOT /* Load additional SCSI driver (if any) */ diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index 612216b9c5b..e1c58709bda 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -71,6 +71,12 @@ VOID __cdecl BootMain(IN PCCH CmdLine) goto Quit; } + if (!MachInitializeBootDevices()) + { + UiMessageBoxCritical("Error when detecting hardware."); + goto Quit; + } + RunLoader(); Quit:

1 0

[reactos] 02/11: [FREELDR] Export functions for a 2nd stage loader
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f81c1910ee1cc29c01bca… commit f81c1910ee1cc29c01bca03f0e52551eec647dba Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 2 12:07:09 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Export functions for a 2nd stage loader --- boot/freeldr/freeldr/CMakeLists.txt | 2 +- boot/freeldr/freeldr/freeldr.spec | 227 +++++++++++++++++++++++++++------- boot/freeldr/freeldr/lib/debug.c | 34 +++++ boot/freeldr/freeldr/lib/mm/meminit.c | 8 ++ boot/freeldr/freeldr/pcat.cmake | 2 +- 5 files changed, 226 insertions(+), 47 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index b97b15a1763..2a349833b07 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -131,7 +131,7 @@ list(APPEND FREELDR_BASE_SOURCE if(ARCH STREQUAL "i386") # Must be included together with disk/scsiport.c list(APPEND FREELDR_BASE_SOURCE - ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def) + ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def) endif() include(pcat.cmake) diff --git a/boot/freeldr/freeldr/freeldr.spec b/boot/freeldr/freeldr/freeldr.spec index 3ffd70aac37..2ea08b1927c 100644 --- a/boot/freeldr/freeldr/freeldr.spec +++ b/boot/freeldr/freeldr/freeldr.spec @@ -1,47 +1,184 @@ @ stdcall RtlAssert(ptr ptr long ptr) -@ varargs ScsiDebugPrint(long str) -@ stdcall ScsiPortCompleteRequest(ptr long long long long) -@ stdcall ScsiPortConvertPhysicalAddressToUlong(long long) +@ varargs -arch=i386 ScsiDebugPrint(long str) +@ stdcall -arch=i386 ScsiPortCompleteRequest(ptr long long long long) +@ stdcall -arch=i386 ScsiPortConvertPhysicalAddressToUlong(long long) @ stdcall -arch=i386 ScsiPortConvertUlongToPhysicalAddress(long) -@ stdcall -arch=x86_64 ScsiPortConvertUlongToPhysicalAddress(long) -@ stdcall ScsiPortFlushDma(ptr) -@ stdcall ScsiPortFreeDeviceBase(ptr ptr) -@ stdcall ScsiPortGetBusData(ptr long long long ptr long) -@ stdcall ScsiPortGetDeviceBase(ptr long long long long long long) -@ stdcall ScsiPortGetLogicalUnit(ptr long long long) -@ stdcall ScsiPortGetPhysicalAddress(ptr ptr ptr long) -@ stdcall ScsiPortGetSrb(ptr long long long long) -@ stdcall ScsiPortGetUncachedExtension(ptr ptr long) -@ stdcall ScsiPortGetVirtualAddress(ptr long long) -@ stdcall ScsiPortInitialize(ptr ptr ptr ptr) -@ stdcall ScsiPortIoMapTransfer(ptr ptr long long) -@ stdcall ScsiPortLogError(ptr ptr long long long long long) -@ stdcall ScsiPortMoveMemory(ptr ptr long) -@ cdecl ScsiPortNotification() -@ stdcall ScsiPortReadPortBufferUchar(ptr ptr long) -@ stdcall ScsiPortReadPortBufferUshort(ptr ptr long) -@ stdcall ScsiPortReadPortBufferUlong(ptr ptr long) -@ stdcall ScsiPortReadPortUchar(ptr) -@ stdcall ScsiPortReadPortUshort(ptr) -@ stdcall ScsiPortReadPortUlong(ptr) -@ stdcall ScsiPortReadRegisterBufferUchar(ptr ptr long) -@ stdcall ScsiPortReadRegisterBufferUshort(ptr ptr long) -@ stdcall ScsiPortReadRegisterBufferUlong(ptr ptr long) -@ stdcall ScsiPortReadRegisterUchar(ptr) -@ stdcall ScsiPortReadRegisterUshort(ptr) -@ stdcall ScsiPortReadRegisterUlong(ptr) -@ stdcall ScsiPortSetBusDataByOffset(ptr long long long ptr long long) -@ stdcall ScsiPortStallExecution(long) -@ stdcall ScsiPortValidateRange(ptr long long long long long long) -@ stdcall ScsiPortWritePortBufferUchar(ptr ptr long) -@ stdcall ScsiPortWritePortBufferUshort(ptr ptr long) -@ stdcall ScsiPortWritePortBufferUlong(ptr ptr long) -@ stdcall ScsiPortWritePortUchar(ptr long) -@ stdcall ScsiPortWritePortUshort(ptr long) -@ stdcall ScsiPortWritePortUlong(ptr long) -@ stdcall ScsiPortWriteRegisterBufferUchar(ptr ptr long) -@ stdcall ScsiPortWriteRegisterBufferUshort(ptr ptr long) -@ stdcall ScsiPortWriteRegisterBufferUlong(ptr ptr long) -@ stdcall ScsiPortWriteRegisterUchar(ptr long) -@ stdcall ScsiPortWriteRegisterUshort(ptr long) -@ stdcall ScsiPortWriteRegisterUlong(ptr long) +#@ stdcall -arch=x86_64 ScsiPortConvertUlongToPhysicalAddress(long) +@ stdcall -arch=i386 ScsiPortFlushDma(ptr) +@ stdcall -arch=i386 ScsiPortFreeDeviceBase(ptr ptr) +@ stdcall -arch=i386 ScsiPortGetBusData(ptr long long long ptr long) +@ stdcall -arch=i386 ScsiPortGetDeviceBase(ptr long long long long long long) +@ stdcall -arch=i386 ScsiPortGetLogicalUnit(ptr long long long) +@ stdcall -arch=i386 ScsiPortGetPhysicalAddress(ptr ptr ptr long) +@ stdcall -arch=i386 ScsiPortGetSrb(ptr long long long long) +@ stdcall -arch=i386 ScsiPortGetUncachedExtension(ptr ptr long) +@ stdcall -arch=i386 ScsiPortGetVirtualAddress(ptr long long) +@ stdcall -arch=i386 ScsiPortInitialize(ptr ptr ptr ptr) +@ stdcall -arch=i386 ScsiPortIoMapTransfer(ptr ptr long long) +@ stdcall -arch=i386 ScsiPortLogError(ptr ptr long long long long long) +@ stdcall -arch=i386 ScsiPortMoveMemory(ptr ptr long) +@ cdecl -arch=i386 ScsiPortNotification() +@ stdcall -arch=i386 ScsiPortReadPortBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadPortBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadPortBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadPortUchar(ptr) +@ stdcall -arch=i386 ScsiPortReadPortUshort(ptr) +@ stdcall -arch=i386 ScsiPortReadPortUlong(ptr) +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortReadRegisterUchar(ptr) +@ stdcall -arch=i386 ScsiPortReadRegisterUshort(ptr) +@ stdcall -arch=i386 ScsiPortReadRegisterUlong(ptr) +@ stdcall -arch=i386 ScsiPortSetBusDataByOffset(ptr long long long ptr long long) +@ stdcall -arch=i386 ScsiPortStallExecution(long) +@ stdcall -arch=i386 ScsiPortValidateRange(ptr long long long long long long) +@ stdcall -arch=i386 ScsiPortWritePortBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWritePortBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWritePortBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWritePortUchar(ptr long) +@ stdcall -arch=i386 ScsiPortWritePortUshort(ptr long) +@ stdcall -arch=i386 ScsiPortWritePortUlong(ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUchar(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUshort(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterBufferUlong(ptr ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterUchar(ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterUshort(ptr long) +@ stdcall -arch=i386 ScsiPortWriteRegisterUlong(ptr long) + +# ARC +@ cdecl ArcClose() +@ cdecl ArcGetDiskCount() +@ cdecl ArcGetDiskInfo() +@ cdecl ArcGetFileInformation() +@ cdecl ArcGetTime() +@ cdecl ArcOpen() +@ cdecl ArcRead() +@ cdecl ArcSeek() + +# Debug +@ cdecl DbgParseDebugChannels() +@ cdecl DbgPrint(str) +@ cdecl DbgPrint2(long long str long str) +@ cdecl DebugDumpBuffer() +@ cdecl DebugInit() +@ cdecl FrLdrBugCheckWithMessage() +@ stdcall KeBugCheckEx(long long long long long) + +# Heap +@ cdecl FrLdrHeapAllocateEx() +@ cdecl FrLdrHeapFreeEx() +@ cdecl FrLdrHeapAlloc() +@ cdecl FrLdrHeapFree() +@ cdecl FrLdrTempAlloc() +@ cdecl FrLdrTempFree() +@ cdecl FrLdrHeapCleanupAll() + +# INI (check if we can move this to rosload) +@ cdecl IniAddSection() +@ cdecl IniAddSettingValueToSection() +@ cdecl IniCleanup() +@ cdecl IniGetFileSectionListHead() +@ cdecl IniGetNumSectionItems() +@ cdecl IniGetSectionSettingNameSize() +@ cdecl IniGetSectionSettingValueSize() +@ cdecl IniFileInitialize() +@ cdecl IniModifySettingValue() +@ cdecl IniOpenSection() +@ cdecl IniReadSettingByName() +@ cdecl IniReadSettingByNumber() + +# Mm +@ cdecl AddMemoryDescriptor() +@ cdecl MmAllocateHighestMemoryBelowAddress() +@ cdecl MmAllocateMemoryAtAddress() +@ cdecl MmAllocateMemoryWithType() +@ cdecl MmFreeMemory() +@ cdecl MmGetBiosMemoryMap() +@ cdecl MmGetHighestPhysicalPage() +@ cdecl MmGetLoaderPagesSpanned() +@ cdecl MmGetMemoryMap() +@ cdecl MmGetSystemMemoryMapTypeString() +@ cdecl MmGetTotalPagesInLookupTable() + +# NtLdr options +@ cdecl NtLdrGetNextOption() +@ cdecl NtLdrGetOption() +@ cdecl NtLdrGetOptionEx() +@ cdecl NtLdrGetOptionExN() +@ cdecl NtLdrAddOptions() + +# PeLdr +@ cdecl PeLdrAllocateDataTableEntry() +@ cdecl PeLdrCheckForLoadedDll() +@ cdecl PeLdrFreeDataTableEntry() +@ cdecl PeLdrImportDllLoadCallback() +@ cdecl PeLdrInitSecurityCookie() +@ cdecl PeLdrLoadBootImage() +@ cdecl PeLdrLoadImage() +@ cdecl PeLdrLoadImageEx() +@ cdecl PeLdrScanImportDescriptorTable() + +# UI +@ cdecl UiDisplayMenu() +@ cdecl UiDrawBackdrop() +@ cdecl UiDrawProgressBarCenter() +@ cdecl UiDrawStatusText() +@ cdecl UiDrawText() +@ cdecl UiEditBox() +@ cdecl UiGetMenuBgColor() +@ cdecl UiGetScreenHeight() +@ cdecl UiIndicateProgress() +@ cdecl UiInitialize() +@ cdecl UiMessageBox() +@ cdecl UiMessageBoxCritical() +@ cdecl UiResetForSOS() +@ cdecl UiSetProgressBarSubset() +@ cdecl UiSetProgressBarText() +@ cdecl UiShowMessageBoxesInArgv() +@ cdecl UiShowMessageBoxesInSection() +@ cdecl UiUnInitialize() +@ cdecl UiUpdateProgressBar() +@ cdecl TuiPrintf() + +# Other +@ cdecl ChainLoadBiosBootSectorCode() +@ cdecl ConstructArcPath() +@ cdecl DissectArcPath() +@ cdecl DiskStopFloppyMotor() +@ cdecl DriveMapGetBiosDriveNumber() +@ cdecl FrldrGetBootDrive() +@ cdecl FrldrGetBootPartition() +@ cdecl FrLdrGetBootPath() +@ cdecl FsGetServiceName() +@ cdecl FsOpenFile() # Why not ArcOpen? +@ cdecl GetArgumentValue() +@ cdecl GetBootMgrInfo() +@ cdecl IsAcpiPresent() +@ cdecl LoadSettings() +@ cdecl MachHwDetect() +@ cdecl MachPrepareForReactOS() +@ cdecl MachGetExtendedBIOSData() +@ cdecl MachVideoGetFontsFromFirmware() +@ cdecl PxeCallApi() +@ cdecl RamDiskInitialize() +@ cdecl Reboot() +@ cdecl Relocator16Boot() +@ cdecl StallExecutionProcessor() + +# Additional stuff for scsiport +@ stdcall CpDoesPortExist(ptr) +@ stdcall CpEnableFifo(ptr long) +@ stdcall CpGetByte(ptr ptr long long) +@ stdcall CpInitialize(ptr ptr long) +@ stdcall CpPutByte(ptr long) +@ cdecl DissectArcPath2() +@ cdecl -i386 DriveMapMapDrivesInSection() +@ cdecl FsRegisterDevice() +@ cdecl FsGetDeviceSpecific() +@ cdecl FsSetDeviceSpecific() +@ stdcall ExAllocatePool(long long) +@ stdcall ExAllocatePoolWithTag(long long long) +@ stdcall ExFreePool(ptr) +@ stdcall ExFreePoolWithTag(ptr long) +@ cdecl MmSetMemoryType() diff --git a/boot/freeldr/freeldr/lib/debug.c b/boot/freeldr/freeldr/lib/debug.c index c1f9d954cd3..efb059e2740 100644 --- a/boot/freeldr/freeldr/lib/debug.c +++ b/boot/freeldr/freeldr/lib/debug.c @@ -424,12 +424,46 @@ DbgParseDebugChannels(PCHAR Value) #else +#undef DebugInit +VOID +DebugInit( + _In_ PCSTR DebugString) +{ + UNREFERENCED_PARAMETER(DebugString); +} + ULONG DbgPrint(PCCH Format, ...) { + UNREFERENCED_PARAMETER(Format); return 0; } +VOID +DbgPrint2(ULONG Mask, ULONG Level, const char *File, ULONG Line, char *Format, ...) +{ + UNREFERENCED_PARAMETER(Mask); + UNREFERENCED_PARAMETER(Level); + UNREFERENCED_PARAMETER(File); + UNREFERENCED_PARAMETER(Line); + UNREFERENCED_PARAMETER(Format); +} + +VOID +DebugDumpBuffer(ULONG Mask, PVOID Buffer, ULONG Length) +{ + UNREFERENCED_PARAMETER(Mask); + UNREFERENCED_PARAMETER(Buffer); + UNREFERENCED_PARAMETER(Length); +} + +#undef DbgParseDebugChannels +VOID +DbgParseDebugChannels(PCHAR Value) +{ + UNREFERENCED_PARAMETER(Value); +} + #endif // DBG ULONG diff --git a/boot/freeldr/freeldr/lib/mm/meminit.c b/boot/freeldr/freeldr/lib/mm/meminit.c index fe3d29ebb12..b3b8ac3171e 100644 --- a/boot/freeldr/freeldr/lib/mm/meminit.c +++ b/boot/freeldr/freeldr/lib/mm/meminit.c @@ -109,6 +109,14 @@ DbgDumpMemoryMap( } DbgPrint("\n"); } +#else +/* Dummy, so we can export it */ +PCSTR +MmGetSystemMemoryMapTypeString( + TYPE_OF_MEMORY Type) +{ + return "-"; +} #endif ULONG diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake index 020ae7e018a..02c85cf7110 100644 --- a/boot/freeldr/freeldr/pcat.cmake +++ b/boot/freeldr/freeldr/pcat.cmake @@ -22,7 +22,7 @@ elseif(ARCH STREQUAL "amd64") endif() -spec2def(freeldr_pe.exe freeldr.spec) +spec2def(freeldr.sys freeldr.spec ADD_IMPORTLIB) list(APPEND PCATLDR_ARC_SOURCE ${FREELDR_ARC_SOURCE}

1 0

[reactos] 01/11: [FREELDR] Replace some macros/inline functions and global variables with functions
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2f9dde09e1c94a9f3f405… commit 2f9dde09e1c94a9f3f4051d7a8a0ab8b286e7b62 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Wed Oct 2 12:32:36 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Replace some macros/inline functions and global variables with functions This allows to easily import them from a 2nd stage loader without having to bother about _declspec(dllimport) --- boot/freeldr/freeldr/arch/arcemul.c | 21 +++++++++++++++++ boot/freeldr/freeldr/arch/archwsup.c | 15 ++++++++++++ boot/freeldr/freeldr/arch/i386/hwacpi.c | 5 ++++ boot/freeldr/freeldr/arch/uefi/uefihw.c | 5 ++++ boot/freeldr/freeldr/bootmgr.c | 19 +++++++-------- boot/freeldr/freeldr/disk/scsiport.c | 2 +- boot/freeldr/freeldr/freeldr.c | 15 ++++++++++++ boot/freeldr/freeldr/include/disk.h | 4 ++++ boot/freeldr/freeldr/include/inifile.h | 1 + boot/freeldr/freeldr/include/machine.h | 14 ++++-------- boot/freeldr/freeldr/include/mm.h | 33 ++++++++------------------- boot/freeldr/freeldr/include/settings.h | 2 ++ boot/freeldr/freeldr/include/ui.h | 9 ++++++++ boot/freeldr/freeldr/lib/inifile/inifile.c | 5 ++++ boot/freeldr/freeldr/lib/mm/heap.c | 30 ++++++++++++++++++++++-- boot/freeldr/freeldr/lib/mm/meminit.c | 19 +++++++++++++++ boot/freeldr/freeldr/lib/mm/mm.c | 5 ++++ boot/freeldr/freeldr/lib/rtl/libsupp.c | 4 ++-- boot/freeldr/freeldr/miscboot.c | 4 ++-- boot/freeldr/freeldr/ntldr/arch/i386/winldr.c | 2 +- boot/freeldr/freeldr/ntldr/winldr.c | 19 ++++++++------- boot/freeldr/freeldr/ntldr/winldr.h | 17 -------------- boot/freeldr/freeldr/ntldr/wlmemory.c | 15 +++++------- boot/freeldr/freeldr/options.c | 4 ++-- boot/freeldr/freeldr/oslist.c | 2 +- boot/freeldr/freeldr/settings.c | 7 +++++- boot/freeldr/freeldr/ui/ui.c | 28 +++++++++++++++++++++++ 27 files changed, 216 insertions(+), 90 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arcemul.c b/boot/freeldr/freeldr/arch/arcemul.c index a72f492bc5d..f44ffaf7b6c 100644 --- a/boot/freeldr/freeldr/arch/arcemul.c +++ b/boot/freeldr/freeldr/arch/arcemul.c @@ -40,4 +40,25 @@ ArcGetRelativeTime(VOID) return ret; } +PCONFIGURATION_COMPONENT_DATA +MachHwDetect(_In_opt_ PCSTR Options) +{ + return MachVtbl.HwDetect(Options); +} + +VOID MachPrepareForReactOS(VOID) +{ + MachVtbl.PrepareForReactOS(); +} + +VOID MachGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize) +{ + MachVtbl.GetExtendedBIOSData(ExtendedBIOSDataArea, ExtendedBIOSDataSize); +} + +VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers) +{ + MachVtbl.VideoGetFontsFromFirmware(RomFontPointers); +} + /* EOF */ diff --git a/boot/freeldr/freeldr/arch/archwsup.c b/boot/freeldr/freeldr/arch/archwsup.c index f112270ad25..e46a8f87498 100644 --- a/boot/freeldr/freeldr/arch/archwsup.c +++ b/boot/freeldr/freeldr/arch/archwsup.c @@ -243,3 +243,18 @@ FldrCreateComponentKey( /* Return the child */ *ComponentKey = ComponentData; } + +ULONG ArcGetDiskCount(VOID) +{ + return reactos_disk_count; +} + +PARC_DISK_SIGNATURE_EX ArcGetDiskInfo(ULONG Index) +{ + if (Index >= reactos_disk_count) + { + return NULL; + } + + return &reactos_arc_disk_info[Index]; +} diff --git a/boot/freeldr/freeldr/arch/i386/hwacpi.c b/boot/freeldr/freeldr/arch/i386/hwacpi.c index ccd42b144e0..f2b43fde015 100644 --- a/boot/freeldr/freeldr/arch/i386/hwacpi.c +++ b/boot/freeldr/freeldr/arch/i386/hwacpi.c @@ -25,6 +25,11 @@ DBG_DEFAULT_CHANNEL(HWDETECT); BOOLEAN AcpiPresent = FALSE; +BOOLEAN IsAcpiPresent(VOID) +{ + return AcpiPresent; +} + static PRSDP_DESCRIPTOR FindAcpiBios(VOID) { diff --git a/boot/freeldr/freeldr/arch/uefi/uefihw.c b/boot/freeldr/freeldr/arch/uefi/uefihw.c index f671446b474..674d4bff84d 100644 --- a/boot/freeldr/freeldr/arch/uefi/uefihw.c +++ b/boot/freeldr/freeldr/arch/uefi/uefihw.c @@ -24,6 +24,11 @@ BOOLEAN AcpiPresent = FALSE; /* FUNCTIONS *****************************************************************/ +BOOLEAN IsAcpiPresent(VOID) +{ + return AcpiPresent; +} + static PRSDP_DESCRIPTOR FindAcpiBios(VOID) diff --git a/boot/freeldr/freeldr/bootmgr.c b/boot/freeldr/freeldr/bootmgr.c index ce977170d5d..51030b03641 100644 --- a/boot/freeldr/freeldr/bootmgr.c +++ b/boot/freeldr/freeldr/bootmgr.c @@ -85,7 +85,7 @@ WarnDeprecated( CHAR msgString[300]; /* If the user didn't cancel the timeout, don't display the warning */ - if (BootMgrInfo.TimeOut >= 0) + if (GetBootMgrInfo()->TimeOut >= 0) return; va_start(ap, MsgFmt); @@ -183,6 +183,7 @@ BuildArgvForOsLoader( PCHAR* Argv; PCHAR* Args; PCHAR SettingName, SettingValue; + PCCHAR BootPath = FrLdrGetBootPath(); *pArgc = 0; @@ -208,7 +209,7 @@ BuildArgvForOsLoader( /* i == 0: Program name */ // TODO: Provide one in the future... /* i == 1: SystemPartition : from where FreeLdr has been started */ - Size += (strlen("SystemPartition=") + strlen(FrLdrBootPath) + 1) * sizeof(CHAR); + Size += (strlen("SystemPartition=") + strlen(BootPath) + 1) * sizeof(CHAR); /* i == 2: LoadIdentifier : ASCII string that may be used * to associate an identifier with a set of load parameters */ if (LoadIdentifier) @@ -236,7 +237,7 @@ BuildArgvForOsLoader( /* i == 1: SystemPartition */ { strcpy(SettingName, "SystemPartition="); - strcat(SettingName, FrLdrBootPath); + strcat(SettingName, BootPath); *Args++ = SettingName; SettingName += (strlen(SettingName) + 1); @@ -333,7 +334,7 @@ MainBootMenuKeyPressFilter( IN PVOID Context OPTIONAL) { /* Any key-press cancels the global timeout */ - BootMgrInfo.TimeOut = -1; + GetBootMgrInfo()->TimeOut = -1; switch (KeyPress) { @@ -394,7 +395,7 @@ VOID RunLoader(VOID) #endif /* Debugger main initialization */ - DebugInit(BootMgrInfo.DebugString); + DebugInit(GetBootMgrInfo()->DebugString); /* UI main initialization */ if (!UiInitialize(TRUE)) @@ -427,7 +428,7 @@ VOID RunLoader(VOID) } /* Find all the message box settings and run them */ - UiShowMessageBoxesInSection(BootMgrInfo.FrLdrSection); + UiShowMessageBoxesInSection(GetBootMgrInfo()->FrLdrSection); for (;;) { @@ -442,7 +443,7 @@ VOID RunLoader(VOID) OperatingSystemDisplayNames, OperatingSystemCount, DefaultOperatingSystem, - BootMgrInfo.TimeOut, + GetBootMgrInfo()->TimeOut, &SelectedOperatingSystem, FALSE, MainBootMenuKeyPressFilter, @@ -455,12 +456,12 @@ VOID RunLoader(VOID) /* Load the chosen operating system */ LoadOperatingSystem(&OperatingSystemList[SelectedOperatingSystem]); - BootMgrInfo.TimeOut = -1; + GetBootMgrInfo()->TimeOut = -1; /* If we get there, the OS loader failed. As it may have * messed up the display, re-initialize the UI. */ #ifndef _M_ARM - UiVtbl.UnInitialize(); + UiUnInitialize(""); #endif UiInitialize(TRUE); } diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index 52d6fd4ecc6..fa63d6e6387 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -1647,7 +1647,7 @@ LoadBootDeviceDriver(VOID) #endif /* Create full ntbootdd.sys path */ - strcpy(NtBootDdPath, FrLdrBootPath); + strcpy(NtBootDdPath, FrLdrGetBootPath()); strcat(NtBootDdPath, "\\NTBOOTDD.SYS"); /* Load ntbootdd.sys */ diff --git a/boot/freeldr/freeldr/freeldr.c b/boot/freeldr/freeldr/freeldr.c index d533061fb5d..612216b9c5b 100644 --- a/boot/freeldr/freeldr/freeldr.c +++ b/boot/freeldr/freeldr/freeldr.c @@ -124,3 +124,18 @@ double log10(double x) __debugbreak(); return 0.0; } + +PCCHAR FrLdrGetBootPath(VOID) +{ + return FrLdrBootPath; +} + +UCHAR FrldrGetBootDrive(VOID) +{ + return FrldrBootDrive; +} + +ULONG FrldrGetBootPartition(VOID) +{ + return FrldrBootPartition; +} diff --git a/boot/freeldr/freeldr/include/disk.h b/boot/freeldr/freeldr/include/disk.h index ec12a8f4b31..2bf598901e9 100644 --- a/boot/freeldr/freeldr/include/disk.h +++ b/boot/freeldr/freeldr/include/disk.h @@ -153,3 +153,7 @@ DiskGetPartitionEntry( * SCSI support (disk/scsiport.c) */ ULONG LoadBootDeviceDriver(VOID); + +PCCHAR FrLdrGetBootPath(VOID); +UCHAR FrldrGetBootDrive(VOID); +ULONG FrldrGetBootPartition(VOID); diff --git a/boot/freeldr/freeldr/include/inifile.h b/boot/freeldr/freeldr/include/inifile.h index 0bc8e60968a..7a33a992bff 100644 --- a/boot/freeldr/freeldr/include/inifile.h +++ b/boot/freeldr/freeldr/include/inifile.h @@ -83,3 +83,4 @@ BOOLEAN IniAddSection(PCSTR SectionName, ULONG_PTR* SectionId); BOOLEAN IniAddSettingValueToSection(ULONG_PTR SectionId, PCSTR SettingName, PCSTR SettingValue); BOOLEAN IniModifySettingValue(ULONG_PTR SectionId, PCSTR SettingName, PCSTR SettingValue); VOID IniCleanup(VOID); +PLIST_ENTRY IniGetFileSectionListHead(VOID); diff --git a/boot/freeldr/freeldr/include/machine.h b/boot/freeldr/freeldr/include/machine.h index 7e6e5c249be..2cab94982e1 100644 --- a/boot/freeldr/freeldr/include/machine.h +++ b/boot/freeldr/freeldr/include/machine.h @@ -97,8 +97,6 @@ VOID MachInit(const char *CmdLine); MachVtbl.VideoGetDisplaySize((W), (H), (D)) #define MachVideoGetBufferSize() \ MachVtbl.VideoGetBufferSize() -#define MachVideoGetFontsFromFirmware(RomFontPointers) \ - MachVtbl.VideoGetFontsFromFirmware((RomFontPointers)) #define MachVideoSetTextCursorPosition(X, Y) \ MachVtbl.VideoSetTextCursorPosition((X), (Y)) #define MachVideoHideShowTextCursor(Show) \ @@ -117,10 +115,6 @@ VOID MachInit(const char *CmdLine); MachVtbl.VideoSync() #define MachBeep() \ MachVtbl.Beep() -#define MachPrepareForReactOS() \ - MachVtbl.PrepareForReactOS() -#define MachGetExtendedBIOSData(ExtendedBIOSDataArea, ExtendedBIOSDataSize) \ - MachVtbl.GetExtendedBIOSData((ExtendedBIOSDataArea), (ExtendedBIOSDataSize)) #define MachGetFloppyCount() \ MachVtbl.GetFloppyCount() #define MachDiskReadLogicalSectors(Drive, Start, Count, Buf) \ @@ -133,9 +127,6 @@ VOID MachInit(const char *CmdLine); #define MachInitializeBootDevices() \ MachVtbl.InitializeBootDevices() -#define MachHwDetect(Options) \ - MachVtbl.HwDetect(Options) - #define MachHwIdle() \ MachVtbl.HwIdle() @@ -144,4 +135,9 @@ VOID MachInit(const char *CmdLine); TIMEINFO* ArcGetTime(VOID); ULONG ArcGetRelativeTime(VOID); +PCONFIGURATION_COMPONENT_DATA MachHwDetect(_In_opt_ PCSTR Options); +VOID MachPrepareForReactOS(VOID); +VOID MachGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize); +VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers); + /* EOF */ diff --git a/boot/freeldr/freeldr/include/mm.h b/boot/freeldr/freeldr/include/mm.h index a3f34a55f78..2c934153674 100644 --- a/boot/freeldr/freeldr/include/mm.h +++ b/boot/freeldr/freeldr/include/mm.h @@ -118,7 +118,7 @@ BOOLEAN MmAreMemoryPagesAvailable(PVOID PageLookupTable, PFN_NUMBER TotalPageCou VOID MmSetMemoryType(PVOID MemoryAddress, SIZE_T MemorySize, TYPE_OF_MEMORY NewType); // Use with EXTREME caution! PPAGE_LOOKUP_TABLE_ITEM MmGetMemoryMap(PFN_NUMBER *NoEntries); // Returns a pointer to the memory mapping table and a number of entries in it - +PFN_NUMBER MmGetTotalPagesInLookupTable(VOID); //BOOLEAN MmInitializeMemoryManager(ULONG LowMemoryStart, ULONG LowMemoryLength); BOOLEAN MmInitializeMemoryManager(VOID); @@ -129,12 +129,14 @@ VOID MmFreeMemory(PVOID MemoryPointer); PVOID MmAllocateMemoryAtAddress(SIZE_T MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType); PVOID MmAllocateHighestMemoryBelowAddress(SIZE_T MemorySize, PVOID DesiredAddress, TYPE_OF_MEMORY MemoryType); +PFN_NUMBER MmGetHighestPhysicalPage(VOID); +PFN_NUMBER MmGetLoaderPagesSpanned(VOID); +ULONG MmGetBiosMemoryMap(_Out_ PFREELDR_MEMORY_DESCRIPTOR *MemoryMap); + /* Heap */ #define DEFAULT_HEAP_SIZE (1024 * 1024) #define TEMP_HEAP_SIZE (32 * 1024 * 1024) -extern PVOID FrLdrDefaultHeap; -extern PVOID FrLdrTempHeap; extern SIZE_T FrLdrImageSize; PVOID @@ -169,34 +171,17 @@ FrLdrHeapFreeEx( PVOID Pointer, ULONG Tag); -FORCEINLINE PVOID -FrLdrHeapAlloc(SIZE_T MemorySize, ULONG Tag) -{ - return FrLdrHeapAllocateEx(FrLdrDefaultHeap, MemorySize, Tag); -} +FrLdrHeapAlloc(SIZE_T MemorySize, ULONG Tag); -FORCEINLINE VOID -FrLdrHeapFree(PVOID MemoryPointer, ULONG Tag) -{ - FrLdrHeapFreeEx(FrLdrDefaultHeap, MemoryPointer, Tag); -} +FrLdrHeapFree(PVOID MemoryPointer, ULONG Tag); -FORCEINLINE PVOID FrLdrTempAlloc( _In_ SIZE_T Size, - _In_ ULONG Tag) -{ - return FrLdrHeapAllocateEx(FrLdrTempHeap, Size, Tag); -} + _In_ ULONG Tag); -FORCEINLINE VOID FrLdrTempFree( - PVOID Allocation, ULONG Tag) -{ - FrLdrHeapFreeEx(FrLdrTempHeap, Allocation, Tag); -} - + PVOID Allocation, ULONG Tag); diff --git a/boot/freeldr/freeldr/include/settings.h b/boot/freeldr/freeldr/include/settings.h index 8c60a145068..e5f5c9c58b4 100644 --- a/boot/freeldr/freeldr/include/settings.h +++ b/boot/freeldr/freeldr/include/settings.h @@ -17,6 +17,8 @@ typedef struct _BOOTMGRINFO extern BOOTMGRINFO BootMgrInfo; +PBOOTMGRINFO GetBootMgrInfo(VOID); + VOID LoadSettings( _In_opt_ PCSTR CmdLine); diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index 1b47cc89447..ee613a9ad42 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -103,6 +103,12 @@ VOID UiMessageBoxCritical( _In_ PCSTR MessageText); +ULONG +UiGetScreenHeight(VOID); + +UCHAR +UiGetMenuBgColor(VOID); + /* Loading Progress-Bar Functions ********************************************/ /* @@ -302,6 +308,9 @@ typedef struct tagUIVTBL VOID UiInit(const char *CmdLine); +VOID +UiResetForSOS(VOID); + extern UIVTBL UiVtbl; /* diff --git a/boot/freeldr/freeldr/lib/inifile/inifile.c b/boot/freeldr/freeldr/lib/inifile/inifile.c index a1bd7c9f91a..64130c8a24d 100644 --- a/boot/freeldr/freeldr/lib/inifile/inifile.c +++ b/boot/freeldr/freeldr/lib/inifile/inifile.c @@ -22,6 +22,11 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(INIFILE); +PLIST_ENTRY IniGetFileSectionListHead(VOID) +{ + return &IniFileSectionListHead; +} + BOOLEAN IniOpenSection(PCSTR SectionName, ULONG_PTR* SectionId) { PLIST_ENTRY Entry; diff --git a/boot/freeldr/freeldr/lib/mm/heap.c b/boot/freeldr/freeldr/lib/mm/heap.c index 35adcd35039..66a8c6a8f23 100644 --- a/boot/freeldr/freeldr/lib/mm/heap.c +++ b/boot/freeldr/freeldr/lib/mm/heap.c @@ -31,8 +31,8 @@ DBG_DEFAULT_CHANNEL(HEAP); #define REDZONE_LOW(Block) ((ULONG64*)Block->Data + 1) #define REDZONE_HI(Block) ((ULONG64*)((PUCHAR)Block->Data + 16 + *REDZONE_SIZE(Block))) -PVOID FrLdrDefaultHeap; -PVOID FrLdrTempHeap; +static PVOID FrLdrDefaultHeap; +static PVOID FrLdrTempHeap; typedef struct _BLOCK_DATA { @@ -529,6 +529,32 @@ FrLdrHeapFreeEx( #endif } +PVOID +FrLdrHeapAlloc(SIZE_T MemorySize, ULONG Tag) +{ + return FrLdrHeapAllocateEx(FrLdrDefaultHeap, MemorySize, Tag); +} + +VOID +FrLdrHeapFree(PVOID MemoryPointer, ULONG Tag) +{ + FrLdrHeapFreeEx(FrLdrDefaultHeap, MemoryPointer, Tag); +} + +PVOID +FrLdrTempAlloc( + _In_ SIZE_T Size, + _In_ ULONG Tag) +{ + return FrLdrHeapAllocateEx(FrLdrTempHeap, Size, Tag); +} + +VOID +FrLdrTempFree( + PVOID Allocation, ULONG Tag) +{ + FrLdrHeapFreeEx(FrLdrTempHeap, Allocation, Tag); +} /* Wrapper functions *********************************************************/ diff --git a/boot/freeldr/freeldr/lib/mm/meminit.c b/boot/freeldr/freeldr/lib/mm/meminit.c index 953b6596330..fe3d29ebb12 100644 --- a/boot/freeldr/freeldr/lib/mm/meminit.c +++ b/boot/freeldr/freeldr/lib/mm/meminit.c @@ -34,6 +34,19 @@ PFREELDR_MEMORY_DESCRIPTOR BiosMemoryMap; ULONG BiosMemoryMapEntryCount; SIZE_T FrLdrImageSize; +ULONG +MmGetBiosMemoryMap(_Out_ PFREELDR_MEMORY_DESCRIPTOR *MemoryMap) +{ + *MemoryMap = BiosMemoryMap; + return BiosMemoryMapEntryCount; +} + +PFN_NUMBER +MmGetTotalPagesInLookupTable(VOID) +{ + return TotalPagesInLookupTable; +} + #if DBG typedef struct { @@ -702,3 +715,9 @@ BOOLEAN MmAreMemoryPagesAvailable(PVOID PageLookupTable, PFN_NUMBER TotalPageCou return TRUE; } + +PFN_NUMBER +MmGetHighestPhysicalPage(VOID) +{ + return MmHighestPhysicalPage; +} diff --git a/boot/freeldr/freeldr/lib/mm/mm.c b/boot/freeldr/freeldr/lib/mm/mm.c index 7153c70f62f..92967231d55 100644 --- a/boot/freeldr/freeldr/lib/mm/mm.c +++ b/boot/freeldr/freeldr/lib/mm/mm.c @@ -303,3 +303,8 @@ PPAGE_LOOKUP_TABLE_ITEM MmGetMemoryMap(PFN_NUMBER *NoEntries) return RealPageLookupTable; } +PFN_NUMBER +MmGetLoaderPagesSpanned(VOID) +{ + return LoaderPagesSpanned; +} diff --git a/boot/freeldr/freeldr/lib/rtl/libsupp.c b/boot/freeldr/freeldr/lib/rtl/libsupp.c index 585164d03f3..8ab6d9e0075 100644 --- a/boot/freeldr/freeldr/lib/rtl/libsupp.c +++ b/boot/freeldr/freeldr/lib/rtl/libsupp.c @@ -35,7 +35,7 @@ NTAPI RtlpAllocateMemory(ULONG Bytes, ULONG Tag) { - return FrLdrHeapAllocateEx(FrLdrDefaultHeap, Bytes, Tag); + return FrLdrHeapAlloc(Bytes, Tag); } @@ -44,7 +44,7 @@ NTAPI RtlpFreeMemory(PVOID Mem, ULONG Tag) { - FrLdrHeapFreeEx(FrLdrDefaultHeap, Mem, Tag); + FrLdrHeapFree(Mem, Tag); } NTSTATUS diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index 5243d8c9186..b080fdfbed1 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -145,8 +145,8 @@ LoadAndBootSector( BiosDriveNumber = 0; if (!BiosDriveNumber) { - BiosDriveNumber = FrldrBootDrive; - PartitionNumber = FrldrBootPartition; + BiosDriveNumber = FrldrGetBootDrive(); + PartitionNumber = FrldrGetBootPartition(); } diff --git a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c index 0999baf60d0..2a2054ff405 100644 --- a/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c +++ b/boot/freeldr/freeldr/ntldr/arch/i386/winldr.c @@ -117,7 +117,7 @@ MempAllocatePageTables(VOID) // Max number of entries = MaxPageNum >> 10 // FIXME: This is a number to describe ALL physical memory // and windows doesn't expect ALL memory mapped... - NumPageTables = TotalPagesInLookupTable >> 10; + NumPageTables = MmGetTotalPagesInLookupTable() >> 10; TRACE("NumPageTables = %d\n", NumPageTables); diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index f3405b70ba3..5dc97f2acb5 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -15,12 +15,10 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); -// FIXME: Find a better way to retrieve ARC disk information -extern ULONG reactos_disk_count; -extern ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[]; +ULONG ArcGetDiskCount(VOID); +PARC_DISK_SIGNATURE_EX ArcGetDiskInfo(ULONG Index); -extern ULONG LoaderPagesSpanned; -extern BOOLEAN AcpiPresent; +BOOLEAN IsAcpiPresent(VOID); extern HEADLESS_LOADER_BLOCK LoaderRedirectionInformation; extern BOOLEAN WinLdrTerminalConnected; @@ -199,7 +197,8 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, InitializeListHead(&LoaderBlock->ArcDiskInformation->DiskSignatureListHead); /* Convert ARC disk information from freeldr to a correct format */ - for (i = 0; i < reactos_disk_count; i++) + ULONG DiscCount = ArcGetDiskCount(); + for (i = 0; i < DiscCount; i++) { PARC_DISK_SIGNATURE_EX ArcDiskSig; @@ -208,12 +207,12 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, if (!ArcDiskSig) { ERR("Failed to allocate ARC structure! Ignoring remaining ARC disks. (i = %lu, DiskCount = %lu)\n", - i, reactos_disk_count); + i, DiscCount); break; } /* Copy the data over */ - RtlCopyMemory(ArcDiskSig, &reactos_arc_disk_info[i], sizeof(ARC_DISK_SIGNATURE_EX)); + RtlCopyMemory(ArcDiskSig, ArcGetDiskInfo(i), sizeof(ARC_DISK_SIGNATURE_EX)); /* Set the ARC Name pointer */ ArcDiskSig->DiskSignature.ArcName = PaToVa(ArcDiskSig->ArcName); @@ -248,7 +247,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock, Extension->Profile.Status = 2; /* Check if FreeLdr detected a ACPI table */ - if (AcpiPresent) + if (IsAcpiPresent()) { /* Set the pointer to something for compatibility */ Extension->AcpiTable = (PVOID)1; @@ -1265,7 +1264,7 @@ LoadAndBootWindowsCommon( WinLdrSetProcessorContext(OperatingSystemVersion); /* Save final value of LoaderPagesSpanned */ - LoaderBlock->Extension->LoaderPagesSpanned = LoaderPagesSpanned; + LoaderBlock->Extension->LoaderPagesSpanned = MmGetLoaderPagesSpanned(); TRACE("Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n", KiSystemStartup, LoaderBlockVA); diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index b18c8f4f78a..0d8ba5fc264 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -79,23 +79,6 @@ extern BOOLEAN SosEnabled; extern BOOLEAN PaeModeOn; #endif -FORCEINLINE -VOID -UiResetForSOS(VOID) -{ -#ifdef _M_ARM - /* Re-initialize the UI */ - UiInitialize(TRUE); -#else - /* Reset the UI and switch to MiniTui */ - UiVtbl.UnInitialize(); - UiVtbl = MiniTuiVtbl; - UiVtbl.Initialize(); -#endif - /* Disable the progress bar */ - UiProgressBar.Show = FALSE; -} - VOID NtLdrOutputLoadMsg( _In_ PCSTR FileName, diff --git a/boot/freeldr/freeldr/ntldr/wlmemory.c b/boot/freeldr/freeldr/ntldr/wlmemory.c index f784e1b2ef5..1be38e97864 100644 --- a/boot/freeldr/freeldr/ntldr/wlmemory.c +++ b/boot/freeldr/freeldr/ntldr/wlmemory.c @@ -14,8 +14,6 @@ #include <debug.h> DBG_DEFAULT_CHANNEL(WINDOWS); -extern ULONG LoaderPagesSpanned; - static const PCSTR MemTypeDesc[] = { "ExceptionBlock ", // ? "SystemBlock ", // ? @@ -47,11 +45,6 @@ static VOID WinLdrInsertDescriptor(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PMEMORY_ALLOCATION_DESCRIPTOR NewDescriptor); -extern PFREELDR_MEMORY_DESCRIPTOR BiosMemoryMap; -extern ULONG BiosMemoryMapEntryCount; -extern PFN_NUMBER MmLowestPhysicalPage; -extern PFN_NUMBER MmHighestPhysicalPage; - /* GLOBALS ***************************************************************/ MEMORY_ALLOCATION_DESCRIPTOR *Mad; @@ -114,7 +107,7 @@ MempSetupPagingForRegion( BasePage, PageCount, Type); /* Make sure we don't map too high */ - if (BasePage + PageCount > LoaderPagesSpanned) return; + if (BasePage + PageCount > MmGetLoaderPagesSpanned()) return; switch (Type) { @@ -310,12 +303,16 @@ WinLdrSetupMemoryLayout(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock) MadCount++; } #endif + PFREELDR_MEMORY_DESCRIPTOR BiosMemoryMap; + ULONG BiosMemoryMapEntryCount; + + BiosMemoryMapEntryCount = MmGetBiosMemoryMap(&BiosMemoryMap); /* Now we need to add high descriptors from the bios memory map */ for (i = 0; i < BiosMemoryMapEntryCount; i++) { /* Check if its higher than the lookup table */ - if (BiosMemoryMap->BasePage > MmHighestPhysicalPage) + if (BiosMemoryMap->BasePage > MmGetHighestPhysicalPage()) { /* Copy this descriptor */ MempAddMemoryBlock(LoaderBlock, diff --git a/boot/freeldr/freeldr/options.c b/boot/freeldr/freeldr/options.c index ac302254bf5..9a604bf90b3 100644 --- a/boot/freeldr/freeldr/options.c +++ b/boot/freeldr/freeldr/options.c @@ -244,9 +244,9 @@ VOID DisplayBootTimeOptions(VOID) /* Display the chosen boot options */ UiDrawText(0, - UiScreenHeight - 2, + UiGetScreenHeight() - 2, BootOptions, - ATTR(COLOR_LIGHTBLUE, UiMenuBgColor)); + ATTR(COLOR_LIGHTBLUE, UiGetMenuBgColor())); } VOID AppendBootTimeOptions(PCHAR BootOptions) diff --git a/boot/freeldr/freeldr/oslist.c b/boot/freeldr/freeldr/oslist.c index a472345aa87..d38d7f8aa33 100644 --- a/boot/freeldr/freeldr/oslist.c +++ b/boot/freeldr/freeldr/oslist.c @@ -75,7 +75,7 @@ InitOperatingSystemList( return NULL; /* Retrieve the default OS */ - DefaultOSName = BootMgrInfo.DefaultOs; + DefaultOSName = GetBootMgrInfo()->DefaultOs; /* Now loop through the operating system section and load each item */ for (i = 0; i < Count; ++i) diff --git a/boot/freeldr/freeldr/settings.c b/boot/freeldr/freeldr/settings.c index fdf284c460c..510ac25d635 100644 --- a/boot/freeldr/freeldr/settings.c +++ b/boot/freeldr/freeldr/settings.c @@ -120,7 +120,7 @@ LoadSettings( CmdLineParse(CmdLine); return; } - else if (IsListEmpty(&IniFileSectionListHead)) + else if (IsListEmpty(IniGetFileSectionListHead())) { // ERR("LoadSettings() called but no freeldr.ini\n"); return; @@ -188,4 +188,9 @@ LoadSettings( } } +PBOOTMGRINFO GetBootMgrInfo(VOID) +{ + return &BootMgrInfo; +} + /* EOF */ diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 6da20152e32..2583517e847 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -636,4 +636,32 @@ BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) return UiVtbl.EditBox(MessageText, EditTextBuffer, Length); } +VOID +UiResetForSOS(VOID) +{ +#ifdef _M_ARM + /* Re-initialize the UI */ + UiInitialize(TRUE); +#else + /* Reset the UI and switch to MiniTui */ + UiVtbl.UnInitialize(); + UiVtbl = MiniTuiVtbl; + UiVtbl.Initialize(); +#endif + /* Disable the progress bar */ + UiProgressBar.Show = FALSE; +} + +ULONG +UiGetScreenHeight(VOID) +{ + return UiScreenHeight; +} + +UCHAR +UiGetMenuBgColor(VOID) +{ + return UiMenuBgColor; +} + /* EOF */

1 0

[reactos] 01/01: [RTL/x64] Fix a bug in RtlpUnwindInternal
by Timo Kreuzer 04 Feb '25

04 Feb '25

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=aa46e0f0a7471dc86ec91… commit aa46e0f0a7471dc86ec9118fa0f83736dd9de420 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 31 11:30:50 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 09:00:35 2025 +0200 [RTL/x64] Fix a bug in RtlpUnwindInternal Check if the stack pointer is out of bounds, before trying to unwind a frame. This will not fix any crashes, but it prevents simple crashes from going into a recursive exception. --- sdk/lib/rtl/amd64/unwind.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/sdk/lib/rtl/amd64/unwind.c b/sdk/lib/rtl/amd64/unwind.c index 72393b9404b..3a438390cb6 100644 --- a/sdk/lib/rtl/amd64/unwind.c +++ b/sdk/lib/rtl/amd64/unwind.c @@ -649,6 +649,18 @@ Exit: return NULL; } +static __inline +BOOL +RtlpIsStackPointerValid( + _In_ ULONG64 StackPointer, + _In_ ULONG64 LowLimit, + _In_ ULONG64 HighLimit) +{ + return (StackPointer >= LowLimit) && + (StackPointer < HighLimit) && + ((StackPointer & 7) == 0); +} + /*! \remark The implementation is based on the description in this blog: http://www.nynaeve.net/?p=106 @@ -699,6 +711,11 @@ RtlpUnwindInternal( /* Start looping */ while (TRUE) { + if (!RtlpIsStackPointerValid(UnwindContext.Rsp, StackLow, StackHigh)) + { + return FALSE; + } + /* Lookup the FunctionEntry for the current RIP */ FunctionEntry = RtlLookupFunctionEntry(UnwindContext.Rip, &ImageBase, NULL); if (FunctionEntry == NULL)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs