Ros-diffs February 2025

ros-diffs@reactos.org

17 participants
79 discussions

[reactos] 03/11: [FREELDR] Move MachInitializeBootDevices to BootMain

by Timo Kreuzer

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:

3 weeks, 6 days

[reactos] 02/11: [FREELDR] Export functions for a 2nd stage loader

by Timo Kreuzer

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}

3 weeks, 6 days

[reactos] 01/11: [FREELDR] Replace some macros/inline functions and global variables with functions

by Timo Kreuzer

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 */

3 weeks, 6 days

[reactos] 01/01: [RTL/x64] Fix a bug in RtlpUnwindInternal

by Timo Kreuzer

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)

3 weeks, 6 days

[reactos] 01/01: [CMAKE] Fix compiling i386 targets via x64 clang-cl

by Vitaly Orekhov

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7215e542b1e3cb574b249… commit 7215e542b1e3cb574b249f868f2067ed56458290 Author: Vitaly Orekhov <vkvo2000(a)vivaldi.net> AuthorDate: Mon Jan 6 16:00:15 2025 +0300 Commit: Timo Kreuzer <timo.kreuzer(a)reactos.org> CommitDate: Mon Feb 3 21:38:02 2025 +0200 [CMAKE] Fix compiling i386 targets via x64 clang-cl --- toolchain-msvc.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/toolchain-msvc.cmake b/toolchain-msvc.cmake index 12e499fd3ad..4f38f88f52f 100644 --- a/toolchain-msvc.cmake +++ b/toolchain-msvc.cmake @@ -39,6 +39,9 @@ if(USE_CLANG_CL) set(CMAKE_C_COMPILER_TARGET "arm64-pc-windows-msvc") set(CMAKE_CXX_COMPILER_TARGET "arm64-pc-windows-msvc") else() + # -m32 is required for x64 clang-cl to operate in x86 Native Tools environment + set(CMAKE_C_FLAGS "-m32") + set(CMAKE_CXX_FLAGS "-m32") set(CMAKE_C_COMPILER_TARGET "i686-pc-windows-msvc") set(CMAKE_CXX_COMPILER_TARGET "i686-pc-windows-msvc") endif()

4 weeks

[reactos] 01/01: [SDK:BUGCODES] Remove inaccurate description of CREATE_DELETE_LOCK_NOT_LOCKED

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=97ea95c80cee668dd3a11… commit 97ea95c80cee668dd3a1141146b90eae182483e4 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Feb 3 17:04:02 2025 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 3 17:04:10 2025 +0100 [SDK:BUGCODES] Remove inaccurate description of CREATE_DELETE_LOCK_NOT_LOCKED The description had nothing to do with CREATE_DELETE_LOCK_NOT_LOCKED, but instead was for EMPTY_THREAD_REAPER_LIST. And even so, descriptions for both of these BSOD codes have been removed in official MS Windows 2000 and beyond. Regarding the Thread Ripper: https://devblogs.microsoft.com/oldnewthing/20231031-00/?p=108944 --- sdk/include/reactos/mc/bugcodes.mc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk/include/reactos/mc/bugcodes.mc b/sdk/include/reactos/mc/bugcodes.mc index ec64c19b96a..ab7045d12f8 100644 --- a/sdk/include/reactos/mc/bugcodes.mc +++ b/sdk/include/reactos/mc/bugcodes.mc @@ -292,7 +292,7 @@ Severity=Success Facility=System SymbolicName=CREATE_DELETE_LOCK_NOT_LOCKED Language=English -The thread reaper was handed a thread to reap, but the thread's process' +CREATE_DELETE_LOCK_NOT_LOCKED . MessageId=0x15

4 weeks

[reactos] 01/01: [SOLITAIRE] Update Czech (cs-CZ) translation (#7451)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ba2c794db48171ae0158… commit 9ba2c794db48171ae0158b0e0e8ea9638e090816 Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Feb 3 13:11:32 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 3 13:11:32 2025 +0100 [SOLITAIRE] Update Czech (cs-CZ) translation (#7451) --- base/applications/games/solitaire/lang/cs-CZ.rc | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/base/applications/games/solitaire/lang/cs-CZ.rc b/base/applications/games/solitaire/lang/cs-CZ.rc index 3acd94595fa..4b4e6baa0a5 100644 --- a/base/applications/games/solitaire/lang/cs-CZ.rc +++ b/base/applications/games/solitaire/lang/cs-CZ.rc @@ -1,7 +1,11 @@ -/* FILE: applications/games/solitaire/lang/cs-CZ.rc - * PURPOSE: Czech Language File - * TRANSLATOR: Radek Liska aka Black_Fox (radekliska at gmail dot com) - * UPDATED: 2008-11-30 by Kario +/* + * PROJECT: ReactOS Solitaire + * LICENSE: Freeware, permission to use under Public Domain + * PURPOSE: Czech resource file + * TRANSLATORS: Copyright 2008 Radek Liška (Black_Fox) <radekliska(a)gmail.com> + * Copyright 2008 Mário Kačmár <kario(a)szm.sk> + * Copyright 2011-2017 Kamil Horníček <kamil.hornicek(a)reactos.org> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> */ LANGUAGE LANG_CZECH, SUBLANG_DEFAULT @@ -13,13 +17,13 @@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT CAPTION "Možnosti" FONT 8, "MS Shell Dlg" BEGIN - GROUPBOX "Karty", -1, 7, 7, 90, 40 + GROUPBOX "Sejmout", -1, 7, 7, 90, 40 AUTORADIOBUTTON "Sejmout &jednu", IDC_OPT_DRAWONE, 14, 19, 70, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "Sejmout &tři", IDC_OPT_DRAWTHREE, 14, 32, 70, 10 - GROUPBOX "Scoring", -1, 100, 7, 75, 53 + GROUPBOX "Skórování", -1, 100, 7, 75, 53 AUTORADIOBUTTON "&Standard", IDC_OPT_STANDARD, 107, 19, 60, 10, WS_GROUP | WS_TABSTOP AUTORADIOBUTTON "&Vegas", IDC_OPT_VEGAS, 107, 32, 60, 10 - AUTORADIOBUTTON "&None", IDC_OPT_NOSCORE, 107, 45, 60, 10 + AUTORADIOBUTTON "Žá&dné", IDC_OPT_NOSCORE, 107, 45, 60, 10 AUTOCHECKBOX "Zobrazit č&as", IDC_OPT_SHOWTIME, 7 ,51 ,65 ,10, WS_TABSTOP AUTOCHECKBOX "Stavový řád&ek", IDC_OPT_STATUSBAR, 7, 66, 64, 10, WS_TABSTOP AUTOCHECKBOX "&Ponechat skóre", IDC_OPT_KEEPSCORE, 100, 66, 65, 10, WS_TABSTOP @@ -55,7 +59,7 @@ BEGIN IDS_SOL_NAME "Solitaire" IDS_SOL_ABOUT "Solitaire by J Brown\nCardLib verze 1.0" IDS_SOL_QUIT "Ukončit rozehranou hru?" - IDS_SOL_WIN "Gratulujeme, zvítězili jste!!" + IDS_SOL_WIN "Gratulujeme, zvítězili jste!" IDS_SOL_DEAL "Rozdat znova?" IDS_SOL_SCORE "Skóre: %d" IDS_SOL_TIME "Čas: %d" @@ -69,8 +73,8 @@ BEGIN BEGIN MENUITEM "&Rozdat\tF2", IDM_GAME_NEW MENUITEM SEPARATOR - MENUITEM "&Undo", IDM_GAME_UNDO, GRAYED - MENUITEM "Rub& karet...", IDM_GAME_DECK + MENUITEM "&Zpět", IDM_GAME_UNDO, GRAYED + MENUITEM "Ru&b karet...", IDM_GAME_DECK MENUITEM "&Možnosti...", IDM_GAME_OPTIONS MENUITEM SEPARATOR MENUITEM "&Konec", IDM_GAME_EXIT

4 weeks

[reactos] 01/01: [RAPPS] Update Slovak (sk-SK) translation (#7450)

by Václav Zouzalík

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9164e9f85fcd20f4a81cd… commit 9164e9f85fcd20f4a81cd6de04d1d53aec01cf9d Author: Václav Zouzalík <Vaclav.Zouzalik(a)seznam.cz> AuthorDate: Mon Feb 3 13:05:03 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 3 13:05:03 2025 +0100 [RAPPS] Update Slovak (sk-SK) translation (#7450) --- base/applications/rapps/lang/sk-SK.rc | 163 +++++++++++++++++----------------- 1 file changed, 82 insertions(+), 81 deletions(-) diff --git a/base/applications/rapps/lang/sk-SK.rc b/base/applications/rapps/lang/sk-SK.rc index 79d38ea468a..e0107dfaa3f 100644 --- a/base/applications/rapps/lang/sk-SK.rc +++ b/base/applications/rapps/lang/sk-SK.rc @@ -2,7 +2,8 @@ * PROJECT: ReactOS Applications Manager * LICENSE: GPL-2.0-or-later (https://spdx.org/licenses/GPL-2.0-or-later) * PURPOSE: Slovak resource file - * TRANSLATOR: Copyright 2009-2010 Mário Kačmár <kario(a)szm.sk> + * TRANSLATORS: Copyright 2009-2010 Mário Kačmár <kario(a)szm.sk> + * Copyright 2024 Václav Zouzalík (Venca24) <vaclav.zouzalik(a)seznam.cz> */ LANGUAGE LANG_SLOVAK, SUBLANG_DEFAULT @@ -25,12 +26,12 @@ BEGIN MENUITEM SEPARATOR MENUITEM "&Obnoviť\tF5", ID_REFRESH MENUITEM SEPARATOR - MENUITEM "Update Data&base\tCtrl+F5", ID_RESETDB + MENUITEM "Aktualizovať data&bázu\tCtrl+F5", ID_RESETDB END POPUP "Pomocník" BEGIN MENUITEM "Pomocník\tF1", ID_HELP, GRAYED - MENUITEM "Čo je", ID_ABOUT + MENUITEM "O programe", ID_ABOUT END END @@ -38,8 +39,8 @@ IDR_LINKMENU MENU BEGIN POPUP "" BEGIN - MENUITEM "&Otvoriť linku v prehliadači", ID_OPEN_LINK - MENUITEM "&Kopírovať linku do schránky", ID_COPY_LINK + MENUITEM "&Otvoriť odkaz v prehliadači", ID_OPEN_LINK + MENUITEM "&Kopírovať odkaz do schránky", ID_COPY_LINK END END @@ -57,16 +58,16 @@ BEGIN EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Vybrať", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Zmazať inštalačné programy po nainštalovaní", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - GROUPBOX "Software source", -1, 4, 118, 240, 46 - AUTORADIOBUTTON "Use default", IDC_SOURCE_DEFAULT, 15, 132, 74, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Specified source", IDC_USE_SOURCE, 15, 147, 74, 10 + GROUPBOX "Zdroj softvéru", -1, 4, 118, 240, 46 + AUTORADIOBUTTON "Použiť predvolené", IDC_SOURCE_DEFAULT, 15, 132, 74, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Vlastný zdroj", IDC_USE_SOURCE, 15, 147, 74, 10 EDITTEXT IDC_SOURCE_URL, 97, 147, 140, 12, ES_AUTOHSCROLL | WS_DISABLED GROUPBOX "Proxy", -1, 4, 166, 240, 76 - AUTORADIOBUTTON "System proxy settings", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP - AUTORADIOBUTTON "Direct (No proxy)", IDC_NO_PROXY, 15, 195, 210, 10 + AUTORADIOBUTTON "Systémové nastavenia proxy", IDC_PROXY_DEFAULT, 15, 180, 210, 10, WS_GROUP | WS_TABSTOP + AUTORADIOBUTTON "Bez proxy servera", IDC_NO_PROXY, 15, 195, 210, 10 AUTORADIOBUTTON "Proxy", IDC_USE_PROXY, 15, 210, 74, 10 EDITTEXT IDC_PROXY_SERVER, 90, 210, 147, 12, ES_AUTOHSCROLL | WS_DISABLED - LTEXT "No proxy for", -1, 26, 226, 64, 10 + LTEXT "Žiadna proxy pre", -1, 26, 226, 64, 10 EDITTEXT IDC_NO_PROXY_FOR, 90, 225, 147, 12, ES_AUTOHSCROLL | WS_DISABLED PUSHBUTTON "Predvolené", IDC_DEFAULT_SETTINGS, 8, 245, 60, 14, WS_GROUP | WS_TABSTOP DEFPUSHBUTTON "OK", IDOK, 116, 245, 60, 14 @@ -100,10 +101,10 @@ BEGIN IDS_TOOLTIP_INSTALL "Inštalovať" IDS_TOOLTIP_UNINSTALL "Odinštalovať" IDS_TOOLTIP_MODIFY "Zmeniť" - IDS_TOOLTIP_SELECT_ALL "Select/Deselect All" + IDS_TOOLTIP_SELECT_ALL "Vybrať všetky/Zrušiť výber" IDS_TOOLTIP_SETTINGS "Nastavenia" IDS_TOOLTIP_REFRESH "Obnoviť" - IDS_TOOLTIP_UPDATE_DB "Update Database" + IDS_TOOLTIP_UPDATE_DB "Aktualizovať databázu" IDS_TOOLTIP_EXIT "Skončiť" END @@ -119,53 +120,53 @@ BEGIN IDS_INFO_VERSION "\nVerzia: " IDS_INFO_DESCRIPTION "\nPopis: " IDS_INFO_PUBLISHER "\nVydavateľ: " - IDS_INFO_HELPLINK "\nHelp Link: " - IDS_INFO_HELPPHONE "\nHelp Telephone: " - IDS_INFO_README "\nČítajMa: " + IDS_INFO_HELPLINK "\nInternetová pomoc: " + IDS_INFO_HELPPHONE "\nTelefonická pomoc: " + IDS_INFO_README "\nReadme: " IDS_INFO_REGOWNER "\nRegistrovaný vlastník: " IDS_INFO_PRODUCTID "\nID Produktu: " IDS_INFO_CONTACT "\nKontakt: " - IDS_INFO_UPDATEINFO "\nUpdate Information: " - IDS_INFO_INFOABOUT "\nInformation About: " - IDS_INFO_COMMENTS "\nComments: " - IDS_INFO_INSTLOCATION "\nInstall Location: " - IDS_INFO_INSTALLSRC "\nInstall Source: " - IDS_INFO_UNINSTALLSTR "\nUninstall String: " + IDS_INFO_UPDATEINFO "\nInformácie o aktualizáciach: " + IDS_INFO_INFOABOUT "\nInformácie o programe: " + IDS_INFO_COMMENTS "\nKomentáre: " + IDS_INFO_INSTLOCATION "\nUmiestnenie inštalácie: " + IDS_INFO_INSTALLSRC "\nZdroj inštalácie: " + IDS_INFO_UNINSTALLSTR "\nOdinstalačný reťazec: " IDS_INFO_MODIFYPATH "\nModify Path: " IDS_INFO_INSTALLDATE "\nDátum inštalácie: " - IDS_AINFO_PACKAGE_NAME "\nPackage Name: " + IDS_AINFO_PACKAGE_NAME "\nNázov balíčka: " END STRINGTABLE BEGIN IDS_AINFO_VERSION "\nVerzia: " - IDS_AINFO_AVAILABLEVERSION "\nAvailable Version: " + IDS_AINFO_AVAILABLEVERSION "\nDostupná verzia: " IDS_AINFO_DESCRIPTION "\nPopis: " IDS_AINFO_SIZE "\nVeľkosť: " IDS_AINFO_URLSITE "\nDomovská stránka: " IDS_AINFO_LICENSE "\nLicencia: " IDS_AINFO_URLDOWNLOAD "\nStiahnuť: " - IDS_AINFO_LANGUAGES "\nLanguages: " + IDS_AINFO_LANGUAGES "\nJazyky: " END STRINGTABLE BEGIN IDS_CAT_AUDIO "Audio" - IDS_CAT_DEVEL "Vývojárske" + IDS_CAT_DEVEL "Vývoj" IDS_CAT_DRIVERS "Ovládače" - IDS_CAT_EDU "Vzdelávacie" - IDS_CAT_ENGINEER "Inžinierske" - IDS_CAT_FINANCE "Finančné" + IDS_CAT_EDU "Vzdelávanie" + IDS_CAT_ENGINEER "Strojírenstvo" + IDS_CAT_FINANCE "Financie" IDS_CAT_GAMES "Hry & zábava" - IDS_CAT_GRAPHICS "Grafické" - IDS_CAT_INTERNET "Internet & sieť" + IDS_CAT_GRAPHICS "Grafika" + IDS_CAT_INTERNET "Internet a siete" IDS_CAT_LIBS "Knižnice" - IDS_CAT_OFFICE "Kancelárske" - IDS_CAT_OTHER "Iné" - IDS_CAT_SCIENCE "Vedecké" + IDS_CAT_OFFICE "Kancelária" + IDS_CAT_OTHER "Ostatné" + IDS_CAT_SCIENCE "Veda" IDS_CAT_TOOLS "Nástroje" IDS_CAT_VIDEO "Video" - IDS_CAT_THEMES "Themes" + IDS_CAT_THEMES "Vzhľad" END STRINGTABLE @@ -176,54 +177,54 @@ BEGIN IDS_WELCOME_TEXT "Vyberte si kategóriu na ľavej strane, potom vyberte aplikáciu, ktorú chcete nainštalovať alebo odinštalovať.\nWebstránka projektu ReactOS: " IDS_WELCOME_URL "https://reactos.org" - IDS_APPWIZ_TITLE "Add/Remove Programs" - IDS_APPWIZ_TEXT1 "Choose ""Applications"" or ""Updates"" to view the list of applications or updates installed on your system." - IDS_APPWIZ_TEXT2 "To remove a program or to modify its installed components, select it from the list and click on ""Uninstall"" or ""Modify""." + IDS_APPWIZ_TITLE "Pridať/Odobrať programy" + IDS_APPWIZ_TEXT1 "Vyberte ""Aplikácie"" alebo ""Aktualizácie"" pre zobrazenie zoznamu aplikácií alebo aktualizácií nainštalovaných vo vašom systéme." + IDS_APPWIZ_TEXT2 "Pre odobranie programu alebo pre zmenu jeho inštalovaných komponentov, ho vyberte zo zoznamu a kliknite na ""Odinštalovať"" alebo ""Upraviť""." END STRINGTABLE BEGIN IDS_SEARCH_TEXT "Hľadať…" IDS_APPS_COUNT "Počet programov: %d" - IDS_APPS_SELECT_COUNT "; Selected: %d" + IDS_APPS_SELECT_COUNT "; Vybrané: %d" IDS_INSTALLED "Nainštalované" IDS_AVAILABLEFORINST "Dostupné pre nainštalovanie" IDS_UPDATES "Aktualizácie" IDS_APPLICATIONS "Aplikácie" IDS_CHOOSE_FOLDER_TEXT "Vyberte priečinok, ktorý sa použije pre sťahovanie programov:" IDS_CHOOSE_FOLDER_ERROR "Zvolili ste si neexistujúci priečinok!" - IDS_URL_INVALID "The URL you have specified is invalid or not supported. Please correct it!" + IDS_URL_INVALID "Vami zadaná URL adresa nie je platná alebo nie je podporovaná. Prosím, opravte ju!" IDS_APP_REG_REMOVE "Naozaj chcete vymazať údaje o nainštalovanom programe z registrov?" IDS_INFORMATION "Informácie" - IDS_UNABLE_TO_DOWNLOAD "Unable to download the package! Address not found!" - IDS_UNABLE_TO_DOWNLOAD2 "Unable to download the package! Check Internet Connection!" + IDS_UNABLE_TO_DOWNLOAD "Súbor sa nepodarilo stiahnuť! Adresa nebola nájdená!" + IDS_UNABLE_TO_DOWNLOAD2 "Balíček sa nepodarilo stiahnuť! Skontrolujte pripojenie k Internetu" IDS_UNABLE_TO_REMOVE "Nie je možné odstrániť z registrov údaje o programe!" - IDS_UNABLE_TO_INSTALL "Unable to open installer!" - IDS_UNABLE_TO_QUERY_CERT "Unable to retrieve certificate info.\n\nDo you want to continue anyway?" - IDS_INTEG_CHECK_TITLE "Verifying package integrity…" - IDS_INTEG_CHECK_FAIL "The package did not pass the integrity check, it may have been corrupted or tampered with during downloading. Running the software is not recommended." - IDS_INTERRUPTED_DOWNLOAD "The download was interrupted. Check connection to Internet." - IDS_UNABLE_TO_WRITE "Unable to write to disk. Disk may be at capacity." - IDS_INSTALL_SELECTED "Install Selected" - IDS_SELECTEDFORINST "Selected for installation" - IDS_MISMATCH_CERT_INFO "The certificate used is unknown:\nSubject: %s\nIssuer: %s\nDo you want to continue anyway?" + IDS_UNABLE_TO_INSTALL "Nepodarilo sa otvoriť inštalátor!" + IDS_UNABLE_TO_QUERY_CERT "Nepodarilo sa získať informácie o certifikáte.\n\nChcete napriek tomu pokračovať?" + IDS_INTEG_CHECK_TITLE "Overujem integritu balíčka…" + IDS_INTEG_CHECK_FAIL "Balíček neprešiel kontrolou integrity, mohol byť poškodený alebo zmenený počas sťahovania. Spustenie tohto programu sa neodporúča." + IDS_INTERRUPTED_DOWNLOAD "Sťahovanie bolo prerušené. Skontrolujte pripojenie k Internetu." + IDS_UNABLE_TO_WRITE "Ukladanie na disk sa nepodarilo. Disk môže byť plný." + IDS_INSTALL_SELECTED "Nainštalovať vybrané" + IDS_SELECTEDFORINST "Vybrané pre inštaláciu" + IDS_MISMATCH_CERT_INFO "Neznámy certifikát:\nSubjekt: %s\nVydávateľ: %s\nChcete napriek tomu pokračovať?" IDS_UNABLE_PATH "Incorrect path format." - IDS_APP_DISPLAY_DETAILS "Details" - IDS_APP_DISPLAY_LIST "List" - IDS_APP_DISPLAY_TILE "Tile" - IDS_NO_SEARCH_RESULTS "No search results" + IDS_APP_DISPLAY_DETAILS "Podrobnosti" + IDS_APP_DISPLAY_LIST "Zoznam" + IDS_APP_DISPLAY_TILE "Dlaždice" + IDS_NO_SEARCH_RESULTS "Žiadne výsledky" END STRINGTABLE BEGIN - IDS_STATUS_INSTALLED "Installed" - IDS_STATUS_NOTINSTALLED "Not installed" - IDS_STATUS_DOWNLOADED "Downloaded" - IDS_STATUS_UPDATE_AVAILABLE "Update available" - IDS_STATUS_DOWNLOADING "Downloading…" - IDS_STATUS_INSTALLING "Installing…" - IDS_STATUS_WAITING "Waiting to install…" - IDS_STATUS_FINISHED "Finished" + IDS_STATUS_INSTALLED "Nainstalované" + IDS_STATUS_NOTINSTALLED "Nenainstalované" + IDS_STATUS_DOWNLOADED "Stiahnuté" + IDS_STATUS_UPDATE_AVAILABLE "Aktualizovateľné" + IDS_STATUS_DOWNLOADING "Sťahujem…" + IDS_STATUS_INSTALLING "Inštalujem…" + IDS_STATUS_WAITING "Čakám na inštaláciu…" + IDS_STATUS_FINISHED "Dokončené" END STRINGTABLE @@ -235,34 +236,34 @@ END STRINGTABLE BEGIN - IDS_LANGUAGE_AVAILABLE_TRANSLATION "Supports your language" - IDS_LANGUAGE_NO_TRANSLATION "Supports other languages" - IDS_LANGUAGE_ENGLISH_TRANSLATION "Supports English" - IDS_LANGUAGE_SINGLE "Single language" - IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d more)" - IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d available)" + IDS_LANGUAGE_AVAILABLE_TRANSLATION "Podporuje váš jazyk" + IDS_LANGUAGE_NO_TRANSLATION "Podporuje iné jazyky" + IDS_LANGUAGE_ENGLISH_TRANSLATION "Podporuje angličtinu" + IDS_LANGUAGE_SINGLE "Jediný jazyk" + IDS_LANGUAGE_MORE_PLACEHOLDER " (+%d ďalších)" + IDS_LANGUAGE_AVAILABLE_PLACEHOLDER " (+%d dostupných)" END STRINGTABLE BEGIN - IDS_DL_DIALOG_DB_DISP "Applications Database" - IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Updating Database…" - IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Updating Database… (Unofficial source)" + IDS_DL_DIALOG_DB_DISP "Databáza aplikácií" + IDS_DL_DIALOG_DB_DOWNLOAD_DISP "Aktualizujem databázu…" + IDS_DL_DIALOG_DB_UNOFFICIAL_DOWNLOAD_DISP "Aktualizujem databázu… (Neoficiálny zdroj)" END STRINGTABLE BEGIN - IDS_CMD_USAGE "Usage: " - IDS_CMD_NEED_PACKAGE_NAME "Error: option %1 expects one or more package name.\n" - IDS_CMD_NEED_FILE_NAME "Error: option %1 expects a file name.\n" - IDS_CMD_NEED_PARAMS "Error: option %1 expects one or more parameters.\n" - IDS_CMD_INVALID_OPTION "Error: Unknown or invalid command line option specified.\n" - IDS_CMD_FIND_RESULT_FOR "Find result for %1:\n" - IDS_CMD_PACKAGE_NOT_FOUND "Failed to find package %1.\n" - IDS_CMD_PACKAGE_INFO "Information about package %1:\n" + IDS_CMD_USAGE "Použitie: " + IDS_CMD_NEED_PACKAGE_NAME "Chyba: prepínač %1 očakáva jeden alebo viac názvov balíčkov.\n" + IDS_CMD_NEED_FILE_NAME "Chyba: prepínač %1 očakáva názov súboru.\n" + IDS_CMD_NEED_PARAMS "Chyba: prepínač %1 očakáva jeden alebo viac parametrov.\n" + IDS_CMD_INVALID_OPTION "Chyba: Neznámy alebo neplatný prepínač príkazového riadka.\n" + IDS_CMD_FIND_RESULT_FOR "Nájdi výsledok pre %1:\n" + IDS_CMD_PACKAGE_NOT_FOUND "Nepodarilo sa nájsť balíček %1.\n" + IDS_CMD_PACKAGE_INFO "Informácie o balíčku %1:\n" END STRINGTABLE BEGIN - IDS_INSTGEN_CONFIRMUNINST "Are you sure you want to uninstall %s?" + IDS_INSTGEN_CONFIRMUNINST "Ste si istí, že chcete odinštalovať %s?" END

4 weeks

[reactos] 01/01: [SHELL32] Improve French (fr-FR) translation (#7699)

by Philippe Morin

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2cdcb1f857995cbbe15eb… commit 2cdcb1f857995cbbe15eb33a2d4d5e67057c64e2 Author: Philippe Morin <fulup(a)sfr.fr> AuthorDate: Mon Feb 3 13:00:03 2025 +0100 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 3 13:00:03 2025 +0100 [SHELL32] Improve French (fr-FR) translation (#7699) Change "New" by "Nouveau". --- dll/win32/shell32/lang/fr-FR.rc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/shell32/lang/fr-FR.rc b/dll/win32/shell32/lang/fr-FR.rc index 0bb74655ef3..c38a47692fb 100644 --- a/dll/win32/shell32/lang/fr-FR.rc +++ b/dll/win32/shell32/lang/fr-FR.rc @@ -915,7 +915,7 @@ BEGIN IDS_SHELL_ABOUT_AUTHORS "&Auteurs" IDS_SHELL_ABOUT_BACK "< Précédent" - FCIDM_SHVIEW_NEW "Ne&w" /* A menu item with an ampersand */ + FCIDM_SHVIEW_NEW "&Nouveau" FCIDM_SHVIEW_NEWFOLDER "Nouveau d&ossier" FCIDM_SHVIEW_NEWLINK "Nouveau &lien" IDS_FOLDER_OPTIONS "Options du dossier"

4 weeks

[reactos] 01/01: [SHLWAPI] Remove accelerator keys from Ok and Cancel buttons (#7690)

by Jose Carlos Jesus

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c3408740b0a64ba64ee19… commit c3408740b0a64ba64ee1941f7773cb93150fd055 Author: Jose Carlos Jesus <zecarlos1957(a)hotmail.com> AuthorDate: Mon Feb 3 11:59:41 2025 +0000 Commit: GitHub <noreply(a)github.com> CommitDate: Mon Feb 3 12:59:41 2025 +0100 [SHLWAPI] Remove accelerator keys from Ok and Cancel buttons (#7690) --- dll/win32/shlwapi/lang/pt-PT.rc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/shlwapi/lang/pt-PT.rc b/dll/win32/shlwapi/lang/pt-PT.rc index ed9e5bd24c3..3f2028b52de 100644 --- a/dll/win32/shlwapi/lang/pt-PT.rc +++ b/dll/win32/shlwapi/lang/pt-PT.rc @@ -4,6 +4,7 @@ * Copyright 2004 Marcelo Duarte * Copyright 2006 Américo José Melo * Copyright 2010 Gustavo Henrique Milaré + * Copyright 2019-2025 Jose Carlos Jesus * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -46,8 +47,8 @@ FONT 8, "MS Shell Dlg" LTEXT "", IDS_ERR_USER_MSG2, 15, 5, 28, 20 LTEXT "", IDS_ERR_USER_MSG, 15, 5, 210, 8 CHECKBOX "Não &mostrar esta mensagem novamente", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP - PUSHBUTTON "&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON "&Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON "Cancelar", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Sim", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON "&Não", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP }

4 weeks

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