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] Improve RamDisk loading loop (#8399)

Browse Source 
CORE-9023

Do the seek to the beginning only once before starting the loop,
but avoid doing it for each chunk read: we base ourselves on the
fact that read operations automatically advance the internal read
pointer (per the specs).
This commit is contained in:
Hermès Bélusca-Maïto
2025-09-22 23:07:58 +02:00
parent 8f6da8d78a
commit b39e6ee51c
1 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,49 +170,46 @@ RamDiskLoadVirtualFile(
}
/*
* Read it in chunks
* Read it in chunks, starting at the beginning
*/
Percent = 0;
for (TotalRead = 0; TotalRead < RamDiskFileSize; TotalRead += ChunkSize)
Position.QuadPart = 0;
Status = ArcSeek(RamFileId, &Position, SeekAbsolute);
if (Status != ESUCCESS)
goto ReadFailure;
for (TotalRead = 0, Percent = 0;
TotalRead < RamDiskFileSize;
TotalRead += ChunkSize, Percent += PercentPerChunk)
{
/* Check if we're at the last chunk */
/* If we are at the last chunk, read only what's remaining */
if ((RamDiskFileSize - TotalRead) < ChunkSize)
{
/* Only need the actual data required */
ChunkSize = (ULONG)(RamDiskFileSize - TotalRead);
}
/* Update progress */
UiUpdateProgressBar(Percent, NULL);
Percent += PercentPerChunk;
/* Copy the contents */
Position.QuadPart = TotalRead;
Status = ArcSeek(RamFileId, &Position, SeekAbsolute);
if (Status == ESUCCESS)
{
Status = ArcRead(RamFileId,
(PVOID)((ULONG_PTR)RamDiskBase + (ULONG_PTR)TotalRead),
ChunkSize,
&Count);
}
/* Check for success */
/* Copy the data */
Status = ArcRead(RamFileId,
(PVOID)((ULONG_PTR)RamDiskBase + (ULONG_PTR)TotalRead),
ChunkSize,
&Count);
if ((Status != ESUCCESS) || (Count != ChunkSize))
{
MmFreeMemory(RamDiskBase);
RamDiskBase = NULL;
RamDiskFileSize = 0;
ArcClose(RamFileId);
UiMessageBox("Failed to read RAM disk.");
return ((Status != ESUCCESS) ? Status : EIO);
Status = ((Status != ESUCCESS) ? Status : EIO);
goto ReadFailure;
}
}
UiUpdateProgressBar(100, NULL);
ArcClose(RamFileId);
return ESUCCESS;
ReadFailure:
MmFreeMemory(RamDiskBase);
RamDiskBase = NULL;
RamDiskFileSize = 0;
ArcClose(RamFileId);
UiMessageBox("Failed to read RAM disk.");
return Status;
}
ARC_STATUS