Ros-diffs February 2025

ros-diffs@reactos.org

17 participants
79 discussions

[reactos] 01/06: [VCRUNTIME][VCSTARTUP] Add separate vcruntime and vcstartup lib

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9186b861a6d94023d2d5f… commit 9186b861a6d94023d2d5f74f574ea2fa82d0a04c Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Fri Jan 17 11:45:05 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Thu Feb 6 09:17:37 2025 +0200 [VCRUNTIME][VCSTARTUP] Add separate vcruntime and vcstartup lib vcruntime contains the code that is linked into ucrtbase (in VS it is also provided as vcruntime140.dll) vcstartup contains the code that is statically linked into executables that link to ucrtbase.dll. In Visual Studio this is part of msvcrt.lib (the import library for msvcrt), similar to our current msvcrtex, and it gets linked when you link to ucrtbase as well. The name is based on the folder name in the library. Both libraries share some code, but each file is only compiled once. --- dll/win32/ucrtbase/CMakeLists.txt | 4 ++ sdk/lib/CMakeLists.txt | 1 + sdk/lib/ucrt/CMakeLists.txt | 3 +- sdk/lib/ucrt/float/float.cmake | 2 +- sdk/lib/ucrt/startup/startup.cmake | 1 - sdk/lib/ucrt/vcruntime/vcruntime.cmake | 19 ------ sdk/lib/vcruntime/CMakeLists.txt | 71 ++++++++++++++++++++++ sdk/lib/{ucrt => }/vcruntime/__report_gsfailure.c | 0 .../vcruntime/__report_rangecheckfailure.c | 0 .../__scrt_uninitialize_crt.cpp | 0 .../{ucrt => }/vcruntime/__security_init_cookie.c | 4 +- sdk/lib/{ucrt => }/vcruntime/__vcrt_init.c | 0 sdk/lib/{ucrt/float => vcruntime}/_fltused.c | 0 .../vcruntime/amd64/__security_check_cookie.s | 0 .../vcruntime/i386/__security_check_cookie.s | 0 sdk/lib/{ucrt => vcruntime}/inc/internal_shared.h | 0 sdk/lib/{ucrt => vcruntime}/inc/nt.h | 0 sdk/lib/{ucrt => vcruntime}/inc/ntrtl.h | 0 sdk/lib/{ucrt => vcruntime}/inc/nturtl.h | 0 sdk/lib/{ucrt => }/vcruntime/initializers.cpp | 0 sdk/lib/{ucrt => }/vcruntime/isa_available.cpp | 0 21 files changed, 79 insertions(+), 26 deletions(-) diff --git a/dll/win32/ucrtbase/CMakeLists.txt b/dll/win32/ucrtbase/CMakeLists.txt index 7001c9e0e25..e22d60db0aa 100644 --- a/dll/win32/ucrtbase/CMakeLists.txt +++ b/dll/win32/ucrtbase/CMakeLists.txt @@ -21,9 +21,13 @@ set_entrypoint(ucrtbase __acrt_DllMain 12) target_link_libraries(ucrtbase ucrt ucrtsupport + vcruntime wine ) +# Implicitly link to vcstartup +target_link_libraries(libucrtbase vcstartup) + if(MSVC) target_link_libraries(ucrtbase runtmchk) else() diff --git a/sdk/lib/CMakeLists.txt b/sdk/lib/CMakeLists.txt index e50c21cad8c..e3344d8c621 100644 --- a/sdk/lib/CMakeLists.txt +++ b/sdk/lib/CMakeLists.txt @@ -55,6 +55,7 @@ add_subdirectory(tzlib) add_subdirectory(ucrt) add_subdirectory(udmihelp) add_subdirectory(uuid) +add_subdirectory(vcruntime) add_subdirectory(wdmguid) else() diff --git a/sdk/lib/ucrt/CMakeLists.txt b/sdk/lib/ucrt/CMakeLists.txt index a10b7b60029..f6fdd2b5e2a 100644 --- a/sdk/lib/ucrt/CMakeLists.txt +++ b/sdk/lib/ucrt/CMakeLists.txt @@ -102,7 +102,6 @@ include(stdio/stdio.cmake) include(stdlib/stdlib.cmake) include(string/string.cmake) include(time/time.cmake) -include(vcruntime/vcruntime.cmake) add_library(ucrt OBJECT ${UCRT_CONIO_SOURCES} @@ -128,5 +127,5 @@ add_library(ucrt OBJECT ${UCRT_VCRUNTIME_SOURCES} ) -#target_link_libraries(ucrt pseh) +target_link_libraries(ucrt vcruntime) add_dependencies(ucrt psdk asm) diff --git a/sdk/lib/ucrt/float/float.cmake b/sdk/lib/ucrt/float/float.cmake index a0306235771..a1b5174d50a 100644 --- a/sdk/lib/ucrt/float/float.cmake +++ b/sdk/lib/ucrt/float/float.cmake @@ -1,4 +1,4 @@ list(APPEND UCRT_FLOAT_SOURCES - float/_fltused.c + # TBD ) diff --git a/sdk/lib/ucrt/startup/startup.cmake b/sdk/lib/ucrt/startup/startup.cmake index 4bf94341ace..9bc9b454df7 100644 --- a/sdk/lib/ucrt/startup/startup.cmake +++ b/sdk/lib/ucrt/startup/startup.cmake @@ -1,6 +1,5 @@ list(APPEND UCRT_STARTUP_SOURCES - startup/__scrt_uninitialize_crt.cpp startup/abort.cpp startup/argv_data.cpp startup/argv_parsing.cpp diff --git a/sdk/lib/ucrt/vcruntime/vcruntime.cmake b/sdk/lib/ucrt/vcruntime/vcruntime.cmake deleted file mode 100644 index dc610565944..00000000000 --- a/sdk/lib/ucrt/vcruntime/vcruntime.cmake +++ /dev/null @@ -1,19 +0,0 @@ - -list(APPEND UCRT_VCRUNTIME_SOURCES - vcruntime/__report_gsfailure.c - vcruntime/__report_rangecheckfailure.c - vcruntime/__security_init_cookie.c - vcruntime/__vcrt_init.c - vcruntime/initializers.cpp - vcruntime/isa_available.cpp -) - -if(${ARCH} STREQUAL "i386") - list(APPEND UCRT_VCRUNTIME_SOURCES - vcruntime/i386/__security_check_cookie.s - ) -elseif(${ARCH} STREQUAL "amd64") - list(APPEND UCRT_VCRUNTIME_SOURCES - vcruntime/amd64/__security_check_cookie.s - ) -endif() diff --git a/sdk/lib/vcruntime/CMakeLists.txt b/sdk/lib/vcruntime/CMakeLists.txt new file mode 100644 index 00000000000..3c7076acafd --- /dev/null +++ b/sdk/lib/vcruntime/CMakeLists.txt @@ -0,0 +1,71 @@ + +# Replace the old CRT include directory with the UCRT include directory +get_property(INCLUDE_DIRS DIRECTORY . PROPERTY INCLUDE_DIRECTORIES) +list(REMOVE_ITEM INCLUDE_DIRS "${REACTOS_SOURCE_DIR}/sdk/include/crt") +set_property(DIRECTORY . PROPERTY INCLUDE_DIRECTORIES ${INCLUDE_DIRS}) +include_directories(${REACTOS_SOURCE_DIR}/sdk/include/ucrt) + +include_directories(inc) + +# Silence GCC/Clang warnings +if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR + CMAKE_C_COMPILER_ID STREQUAL "Clang") + add_compile_options( + -Wno-builtin-declaration-mismatch + -Wno-unused-function + ) +endif() + +list(APPEND VCRT_COMMON_SOURCES + __report_gsfailure.c + __report_rangecheckfailure.c + __security_init_cookie.c + __vcrt_init.c + _fltused.c + initializers.cpp + isa_available.cpp +) + +list(APPEND VCRT_RUNTIME_SOURCES + # TBD +) + +list(APPEND VCRT_STARTUP_SOURCES + __scrt_uninitialize_crt.cpp +) + +if(${ARCH} STREQUAL "i386") + list(APPEND VCRT_COMMON_SOURCES + i386/__security_check_cookie.s + ) +elseif(${ARCH} STREQUAL "amd64") + list(APPEND VCRT_COMMON_SOURCES + amd64/__security_check_cookie.s + ) +endif() + +# Common between vcstartup and vcruntime +add_library(vcrt_common ${VCRT_COMMON_SOURCES}) +target_compile_definitions(vcrt_common PRIVATE + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY +) +target_link_libraries(vcrt_common ${PSEH_LIB}) +add_dependencies(vcrt_common psdk) + +# Runtime library (linked into ucrtbase) +add_library(vcruntime ${VCRT_RUNTIME_SOURCES} $<TARGET_OBJECTS:vcrt_common>) +target_compile_definitions(vcruntime PRIVATE + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY +) +target_link_libraries(vcruntime ${PSEH_LIB}) +target_include_directories(vcruntime INTERFACE inc) + +# Startup library (inked into executables, linking to ucrtbase) +add_library(vcstartup ${VCRT_STARTUP_SOURCES} $<TARGET_OBJECTS:vcrt_common>) +target_compile_definitions(vcstartup PRIVATE + _CORECRT_BUILD + _CRT_DECLARE_GLOBAL_VARIABLES_DIRECTLY +) +target_link_libraries(vcstartup ${PSEH_LIB} libucrtbase libkernel32) diff --git a/sdk/lib/ucrt/vcruntime/__report_gsfailure.c b/sdk/lib/vcruntime/__report_gsfailure.c similarity index 100% rename from sdk/lib/ucrt/vcruntime/__report_gsfailure.c rename to sdk/lib/vcruntime/__report_gsfailure.c diff --git a/sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c b/sdk/lib/vcruntime/__report_rangecheckfailure.c similarity index 100% rename from sdk/lib/ucrt/vcruntime/__report_rangecheckfailure.c rename to sdk/lib/vcruntime/__report_rangecheckfailure.c diff --git a/sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp b/sdk/lib/vcruntime/__scrt_uninitialize_crt.cpp similarity index 100% rename from sdk/lib/ucrt/startup/__scrt_uninitialize_crt.cpp rename to sdk/lib/vcruntime/__scrt_uninitialize_crt.cpp diff --git a/sdk/lib/ucrt/vcruntime/__security_init_cookie.c b/sdk/lib/vcruntime/__security_init_cookie.c similarity index 96% rename from sdk/lib/ucrt/vcruntime/__security_init_cookie.c rename to sdk/lib/vcruntime/__security_init_cookie.c index 7488aec954d..54edfa745cb 100644 --- a/sdk/lib/ucrt/vcruntime/__security_init_cookie.c +++ b/sdk/lib/vcruntime/__security_init_cookie.c @@ -8,9 +8,7 @@ // SPDX-License-Identifier: MIT // -#include <stdlib.h> -#include <intrin.h> -#include <corecrt_internal.h> +#include <internal_shared.h> #ifdef _WIN64 #define DEFAULT_SECURITY_COOKIE 0x00002B992DDFA232ull diff --git a/sdk/lib/ucrt/vcruntime/__vcrt_init.c b/sdk/lib/vcruntime/__vcrt_init.c similarity index 100% rename from sdk/lib/ucrt/vcruntime/__vcrt_init.c rename to sdk/lib/vcruntime/__vcrt_init.c diff --git a/sdk/lib/ucrt/float/_fltused.c b/sdk/lib/vcruntime/_fltused.c similarity index 100% rename from sdk/lib/ucrt/float/_fltused.c rename to sdk/lib/vcruntime/_fltused.c diff --git a/sdk/lib/ucrt/vcruntime/amd64/__security_check_cookie.s b/sdk/lib/vcruntime/amd64/__security_check_cookie.s similarity index 100% rename from sdk/lib/ucrt/vcruntime/amd64/__security_check_cookie.s rename to sdk/lib/vcruntime/amd64/__security_check_cookie.s diff --git a/sdk/lib/ucrt/vcruntime/i386/__security_check_cookie.s b/sdk/lib/vcruntime/i386/__security_check_cookie.s similarity index 100% rename from sdk/lib/ucrt/vcruntime/i386/__security_check_cookie.s rename to sdk/lib/vcruntime/i386/__security_check_cookie.s diff --git a/sdk/lib/ucrt/inc/internal_shared.h b/sdk/lib/vcruntime/inc/internal_shared.h similarity index 100% rename from sdk/lib/ucrt/inc/internal_shared.h rename to sdk/lib/vcruntime/inc/internal_shared.h diff --git a/sdk/lib/ucrt/inc/nt.h b/sdk/lib/vcruntime/inc/nt.h similarity index 100% rename from sdk/lib/ucrt/inc/nt.h rename to sdk/lib/vcruntime/inc/nt.h diff --git a/sdk/lib/ucrt/inc/ntrtl.h b/sdk/lib/vcruntime/inc/ntrtl.h similarity index 100% rename from sdk/lib/ucrt/inc/ntrtl.h rename to sdk/lib/vcruntime/inc/ntrtl.h diff --git a/sdk/lib/ucrt/inc/nturtl.h b/sdk/lib/vcruntime/inc/nturtl.h similarity index 100% rename from sdk/lib/ucrt/inc/nturtl.h rename to sdk/lib/vcruntime/inc/nturtl.h diff --git a/sdk/lib/ucrt/vcruntime/initializers.cpp b/sdk/lib/vcruntime/initializers.cpp similarity index 100% rename from sdk/lib/ucrt/vcruntime/initializers.cpp rename to sdk/lib/vcruntime/initializers.cpp diff --git a/sdk/lib/ucrt/vcruntime/isa_available.cpp b/sdk/lib/vcruntime/isa_available.cpp similarity index 100% rename from sdk/lib/ucrt/vcruntime/isa_available.cpp rename to sdk/lib/vcruntime/isa_available.cpp

3 weeks, 4 days

[reactos] 01/01: [RTL][NTDLL_APITEST] Fix buffer overflow in RtlDosSearchPath_Ustr (#7698)

by Max Korostil

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b2bdabe7221f9b35f135… commit 2b2bdabe7221f9b35f135b013e44bce4bfd16c66 Author: Max Korostil <mrmks04(a)yandex.ru> AuthorDate: Wed Feb 5 23:17:11 2025 +0300 Commit: GitHub <noreply(a)github.com> CommitDate: Wed Feb 5 21:17:11 2025 +0100 [RTL][NTDLL_APITEST] Fix buffer overflow in RtlDosSearchPath_Ustr (#7698) In addition: - `IS_PATH_SEPARATOR(*--End)` -> `--End; IS_PATH_SEPARATOR(*End)` fix, - Use SIZE_T type for `WorstCaseLength` and `NamePlusExtLength`. --- .../apitests/ntdll/RtlDosSearchPath_Ustr.c | 19 ++++++++++++ sdk/lib/rtl/path.c | 35 ++++++++++++---------- 2 files changed, 39 insertions(+), 15 deletions(-) diff --git a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c index 29794bf4e8d..e6eb386cc29 100644 --- a/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c +++ b/modules/rostests/apitests/ntdll/RtlDosSearchPath_Ustr.c @@ -210,4 +210,23 @@ START_TEST(RtlDosSearchPath_Ustr) ok_eq_pointer(FullNameOut, NULL); ok_eq_ulong(FilePartSize, 0UL); ok_eq_ulong(LengthNeeded, 0UL); + + /* Buffer overflow test + * length(longDirName) + length(longFileName) + length(ext) = MAX_PATH + */ + RtlInitUnicodeString(&PathString, L"C:\\Program Files\\Very_long_test_path_which_can_trigger_heap_overflow_test_1234567890______________________________________________________AB"); + RtlInitUnicodeString(&FileNameString, L"this_is_long_file_name_for_checking______________________________________________________________________________CD"); + RtlInitUnicodeString(&ExtensionString, L".txt"); + StartSeh() + Status = RtlDosSearchPath_Ustr(0, + &PathString, + &FileNameString, + &ExtensionString, + &CallerBuffer, + &DynamicString, + &FullNameOut, + &FilePartSize, + &LengthNeeded); + ok_eq_hex(Status, STATUS_NO_SUCH_FILE); + EndSeh(STATUS_SUCCESS); } diff --git a/sdk/lib/rtl/path.c b/sdk/lib/rtl/path.c index e045e16ebb4..4104daeb838 100644 --- a/sdk/lib/rtl/path.c +++ b/sdk/lib/rtl/path.c @@ -2571,8 +2571,8 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, NTSTATUS Status; RTL_PATH_TYPE PathType; PWCHAR p, End, CandidateEnd, SegmentEnd; - SIZE_T SegmentSize, ByteCount, PathSize, MaxPathSize = 0; - USHORT NamePlusExtLength, WorstCaseLength, ExtensionLength = 0; + SIZE_T WorstCaseLength, NamePlusExtLength, SegmentSize, ByteCount, PathSize, MaxPathSize = 0; + USHORT ExtensionLength = 0; PUNICODE_STRING FullIsolatedPath; DPRINT("DOS Path Search: %lx %wZ %wZ %wZ %wZ %wZ\n", Flags, PathString, FileNameString, ExtensionString, CallerBuffer, DynamicString); @@ -2669,7 +2669,8 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, while (End > FileNameString->Buffer) { /* If we find a path separator, there's no extension */ - if (IS_PATH_SEPARATOR(*--End)) break; + --End; + if (IS_PATH_SEPARATOR(*End)) break; /* Otherwise, did we find an extension dot? */ if (*End == L'.') @@ -2689,17 +2690,20 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, /* Start parsing the path name, looking for path separators */ End = &PathString->Buffer[PathString->Length / sizeof(WCHAR)]; p = End; - while ((p > PathString->Buffer) && (*--p == L';')) + while (p > PathString->Buffer) { - /* This is the size of the path -- handle a trailing slash */ - PathSize = End - p - 1; - if ((PathSize) && !(IS_PATH_SEPARATOR(*(End - 1)))) PathSize++; + if (*--p == L';') + { + /* This is the size of the path -- handle a trailing slash */ + PathSize = End - p - 1; + if ((PathSize) && !(IS_PATH_SEPARATOR(*(End - 1)))) PathSize++; - /* Check if we found a bigger path than before */ - if (PathSize > MaxPathSize) MaxPathSize = PathSize; + /* Check if we found a bigger path than before */ + if (PathSize > MaxPathSize) MaxPathSize = PathSize; - /* Keep going with the path after this path separator */ - End = p; + /* Keep going with the path after this path separator */ + End = p; + } } /* This is the trailing path, run the same code as above */ @@ -2749,7 +2753,7 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, /* Now check if our initial static buffer is too small */ if (StaticCandidateString.MaximumLength < - (SegmentSize + ExtensionLength + FileNameString->Length)) + (SegmentSize + ExtensionLength + FileNameString->Length + sizeof(UNICODE_NULL))) { /* At this point we should've been using our static buffer */ ASSERT(StaticCandidateString.Buffer == StaticCandidateBuffer); @@ -2784,8 +2788,7 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, } /* Now allocate the dynamic string */ - StaticCandidateString.MaximumLength = FileNameString->Length + - WorstCaseLength; + StaticCandidateString.MaximumLength = WorstCaseLength; StaticCandidateString.Buffer = RtlpAllocateStringMemory(WorstCaseLength, TAG_USTR); if (!StaticCandidateString.Buffer) @@ -2832,6 +2835,7 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, StaticCandidateString.Length = (USHORT)(CandidateEnd - StaticCandidateString.Buffer) * sizeof(WCHAR); + ASSERT(StaticCandidateString.Length < StaticCandidateString.MaximumLength); /* Check if this file exists */ DPRINT("BUFFER: %S\n", StaticCandidateString.Buffer); @@ -2901,7 +2905,8 @@ RtlDosSearchPath_Ustr(IN ULONG Flags, while (End > p) { /* If there's a path separator, there's no extension */ - if (IS_PATH_SEPARATOR(*--End)) break; + --End; + if (IS_PATH_SEPARATOR(*End)) break; /* Othwerwise, did we find an extension dot? */ if (*End == L'.')

3 weeks, 5 days

[reactos] 11/11: [FREELDR] Fix pc98 build

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1a169fbe811b621188b4… commit a1a169fbe811b621188b41c907c8ef51304644cb Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Jan 23 09:16:36 2025 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [FREELDR] Fix pc98 build --- boot/freeldr/freeldr/arch/arcemul.c | 10 ++++++++++ boot/freeldr/freeldr/freeldr.spec | 1 + boot/freeldr/freeldr/include/machine.h | 2 ++ boot/freeldr/freeldr/miscboot.c | 6 +----- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/boot/freeldr/freeldr/arch/arcemul.c b/boot/freeldr/freeldr/arch/arcemul.c index f44ffaf7b6c..edf8d66fc45 100644 --- a/boot/freeldr/freeldr/arch/arcemul.c +++ b/boot/freeldr/freeldr/arch/arcemul.c @@ -61,4 +61,14 @@ VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers) MachVtbl.VideoGetFontsFromFirmware(RomFontPointers); } +ULONG +MachGetBootSectorLoadAddress(IN UCHAR DriveNumber) +{ +#if defined(SARCH_PC98) + return Pc98GetBootSectorLoadAddress(DriveNumber); +#else + return 0x7C00; +#endif +} + /* EOF */ diff --git a/boot/freeldr/freeldr/freeldr.spec b/boot/freeldr/freeldr/freeldr.spec index 6d7b5f9d788..eaab809e800 100644 --- a/boot/freeldr/freeldr/freeldr.spec +++ b/boot/freeldr/freeldr/freeldr.spec @@ -119,6 +119,7 @@ @ cdecl Relocator16Boot() @ stdcall RtlAssert(ptr ptr long ptr) @ cdecl StallExecutionProcessor() +@ cdecl MachGetBootSectorLoadAddress() # Additional stuff for scsiport @ stdcall CpDoesPortExist(ptr) diff --git a/boot/freeldr/freeldr/include/machine.h b/boot/freeldr/freeldr/include/machine.h index 2cab94982e1..1a44f5f14e9 100644 --- a/boot/freeldr/freeldr/include/machine.h +++ b/boot/freeldr/freeldr/include/machine.h @@ -130,6 +130,7 @@ VOID MachInit(const char *CmdLine); #define MachHwIdle() \ MachVtbl.HwIdle() + /* ARC FUNCTIONS **************************************************************/ TIMEINFO* ArcGetTime(VOID); @@ -139,5 +140,6 @@ PCONFIGURATION_COMPONENT_DATA MachHwDetect(_In_opt_ PCSTR Options); VOID MachPrepareForReactOS(VOID); VOID MachGetExtendedBIOSData(PULONG ExtendedBIOSDataArea, PULONG ExtendedBIOSDataSize); VOID MachVideoGetFontsFromFirmware(PULONG RomFontPointers); +ULONG MachGetBootSectorLoadAddress(IN UCHAR DriveNumber); /* EOF */ diff --git a/boot/freeldr/freeldr/miscboot.c b/boot/freeldr/freeldr/miscboot.c index b080fdfbed1..9d9c4bf8efb 100644 --- a/boot/freeldr/freeldr/miscboot.c +++ b/boot/freeldr/freeldr/miscboot.c @@ -161,11 +161,7 @@ LoadAndBootSector( return Status; } -#if defined(SARCH_PC98) - LoadAddress = Pc98GetBootSectorLoadAddress(BiosDriveNumber); -#else - LoadAddress = 0x7C00; -#endif + LoadAddress = MachGetBootSectorLoadAddress(BiosDriveNumber); /* * Now try to load the boot sector: disk MBR (when PartitionNumber == 0),

3 weeks, 6 days

[reactos] 10/11: [ROSLOAD] Enable registry healing code for x64

by Timo Kreuzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2b71c738b8beb8798e586… commit 2b71c738b8beb8798e586df373fad185ed24a776 Author: Timo Kreuzer <timo.kreuzer(a)reactos.org> AuthorDate: Thu Oct 3 11:49:56 2024 +0200 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Tue Feb 4 16:45:48 2025 +0200 [ROSLOAD] Enable registry healing code for x64 --- boot/freeldr/freeldr/ntldr/registry.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/registry.c b/boot/freeldr/freeldr/ntldr/registry.c index 73d6f68097e..0b81b71cf16 100644 --- a/boot/freeldr/freeldr/ntldr/registry.c +++ b/boot/freeldr/freeldr/ntldr/registry.c @@ -99,14 +99,7 @@ RegInitializeHive( _In_ BOOLEAN LoadAlternate) { NTSTATUS Status; -/* - * FIXME: Disable compilation of some parts of code for AMD64 for now, - * since it makes the FreeLdr binary size so large that it prevents - * x64 ROS from booting. - */ -#if !defined(_M_AMD64) CM_CHECK_REGISTRY_STATUS CmStatusCode; -#endif /* Initialize the hive */ Status = HvInitialize(GET_HHIVE(CmHive), @@ -128,8 +121,6 @@ RegInitializeHive( return FALSE; } -/* FIXME: See the comment above */ -#if !defined(_M_AMD64) /* Now check the hive and purge volatile data */ CmStatusCode = CmCheckRegistry(CmHive, CM_CHECK_REGISTRY_BOOTLOADER_PURGE_VOLATILES | CM_CHECK_REGISTRY_VALIDATE_HIVE); if (!CM_CHECK_REGISTRY_SUCCESS(CmStatusCode)) @@ -137,13 +128,10 @@ RegInitializeHive( ERR("CmCheckRegistry detected problems with the loaded flat hive (check code %lu)\n", CmStatusCode); return FALSE; } -#endif return TRUE; } -/* FIXME: See the comment above */ -#if !defined(_M_AMD64) /** * @brief * Loads and reads a hive log at specified @@ -418,7 +406,6 @@ RegRecoverDataHive( HiveBaseBlock->CheckSum = HvpHiveHeaderChecksum(HiveBaseBlock); return TRUE; } -#endif /** * @brief @@ -464,14 +451,6 @@ RegImportBinaryHive( CmSystemHive = FrLdrTempAlloc(sizeof(CMHIVE), 'eviH'); Success = RegInitializeHive(CmSystemHive, ChunkBase, LoadAlternate); if (!Success) -/* FIXME: See the comment above */ -#if defined(_M_AMD64) - { - ERR("Corrupted hive %p!\n", ChunkBase); - FrLdrTempFree(CmSystemHive, 'eviH'); - return FALSE; - } -#else { /* Free the buffer and retry again */ FrLdrTempFree(CmSystemHive, 'eviH'); @@ -505,7 +484,6 @@ RegImportBinaryHive( */ ((PHBASE_BLOCK)ChunkBase)->BootRecover = HBOOT_BOOT_RECOVERED_BY_HIVE_LOG; } -#endif /* Save the root key node */ SystemHive = GET_HHIVE(CmSystemHive);

3 weeks, 6 days

[reactos] 09/11: [FREELDR] Implement loading of rosload as 2nd stage loader

by Timo Kreuzer

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")

3 weeks, 6 days

[reactos] 08/11: [FREELDR] Use StallExecutionProcessor instead of KeStallExecutionProcessor

by Timo Kreuzer

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); }

3 weeks, 6 days

[reactos] 07/11: [MINIHAL] Move the definition of _MINIHAL_ to directory scope

by Timo Kreuzer

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)

3 weeks, 6 days

[reactos] 06/11: [USETUP] Install rosload.exe

by Timo Kreuzer

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 },

3 weeks, 6 days

[reactos] 05/11: [ROSLOAD] Add rosload.exe target as 2nd stage loader

by Timo Kreuzer

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)

3 weeks, 6 days

[reactos] 04/11: [FREELDR] Remove ShowBootOptions from Menu code

by Timo Kreuzer

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);

3 weeks, 6 days

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2025