lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-30 14:34:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

[FREELDR] Fix RamDisk size determination; add some traces (#8399)

Browse Source 
CORE-14603 CORE-9023

The RamDisk path specified with `/RDPATH=` can be a path to a block
device, like a disk partition, or the current boot disk (a ReactOS
specific feature added in commit 9b70d4380c), instead of being only
a file (as with Windows' NTLDR).

In this case, the `StartingAddress` and `EndingAddress` returned by
`ArcGetFileInformation()` are, per the specs, the start and end
positions of the partition as byte offsets from the start of the disk.
Therefore, the size of the partition is `== EndingAddress - StartingAddress`.

+ Add diagnostic traces in `RamDiskLoadVirtualFile()` and `RamDiskInitialize()`.

Co-authored-by: Hermès Bélusca-Maïto <hermes.belusca-maito@reactos.org>
This commit is contained in:
Hervé Poussineau
2025-05-04 21:13:46 +02:00
committed by Hermès Bélusca-Maïto
parent d8a9159145
commit 8f6da8d78a
1 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
boot/freeldr/freeldr/disk/ramdisk.c
View File

@@ -12,6 +12,9 @@
#include <freeldr.h>
#include "../ntldr/ntldropts.h"
#include <debug.h>
DBG_DEFAULT_CHANNEL(DISK);
/* GLOBALS ********************************************************************/
PVOID gInitRamDiskBase = NULL;
@@ -119,6 +122,8 @@ RamDiskLoadVirtualFile(
UiDrawProgressBarCenter("Loading RamDisk...");
/* Try opening the Ramdisk file */
TRACE("RamDiskLoadVirtualFile: Opening '%s', '%s'\n",
FileName, DefaultPath ? DefaultPath : "n/a");
Status = FsOpenFile(FileName, DefaultPath, OpenReadOnly, &RamFileId);
if (Status != ESUCCESS)
return Status;
@@ -130,16 +135,24 @@ RamDiskLoadVirtualFile(
ArcClose(RamFileId);
return Status;
}
/* NOTE: For partitions, StartingAddress/EndingAddress are the start/end
* positions of the partition as byte offsets from the start of the disk */
Information.EndingAddress.QuadPart -= Information.StartingAddress.QuadPart;
Information.StartingAddress.QuadPart = 0ULL;
TRACE("RAMDISK size: %I64u (High: %lu ; Low: %lu)\n",
Information.EndingAddress.QuadPart,
Information.EndingAddress.HighPart,
Information.EndingAddress.LowPart);
/* FIXME: For now, limit RAM disks to 4GB */
if (Information.EndingAddress.HighPart != 0)
if (Information.EndingAddress.HighPart != 0) // (RamDiskFileSize >= 0x100000000ULL)
{
ArcClose(RamFileId);
UiMessageBox("RAM disk too big.");
return ENOMEM;
}
RamDiskFileSize = Information.EndingAddress.QuadPart;
ASSERT(RamDiskFileSize < 0x100000000); // See FIXME above.
/* Allocate memory for it */
ChunkSize = 8 * 1024 * 1024;
@@ -208,6 +221,11 @@ RamDiskInitialize(
IN PCSTR LoadOptions OPTIONAL,
IN PCSTR DefaultPath OPTIONAL)
{
TRACE("RamDiskInitialize(%s, '%s', '%s')\n",
InitRamDisk ? "INIT" : "REGULAR",
LoadOptions ? LoadOptions : "n/a",
DefaultPath ? DefaultPath : "n/a");
/* Reset the RAMDISK device */
if ((RamDiskBase != gInitRamDiskBase) &&
(RamDiskFileSize != gInitRamDiskSize) &&