Skip to content

boot: Detect newer ReactOS images #64

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thrimbor merged 1 commit into from
May 29, 2025
Merged

boot: Detect newer ReactOS images #64

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions boot/LoadReactOS.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,21 +241,26 @@ int LoadReactOSFATX(FATXPartition *partition, CONFIGENTRY *config) {
}

CONFIGENTRY *DetectReactOSCD(int cdromId) {
long dwSize;
long dwFreeldrSize, dwSetupldrSize;
CONFIGENTRY *config;

dwSize = BootIso9660GetFile(cdromId, "/loader/setupldr.sys", FREELDR_LOAD_AREA, FREELDR_MAX_SIZE);
dwFreeldrSize = BootIso9660GetFile(cdromId, "/loader/freeldr.sys", FREELDR_LOAD_AREA, FREELDR_MAX_SIZE);

// Failed to load freeloader
if (dwSize <= 0)
return NULL;
if (dwFreeldrSize <= 0)
{
/* Try setupldr.sys for older versions of ReactOS */
dwSetupldrSize = BootIso9660GetFile(cdromId, "/loader/setupldr.sys", FREELDR_LOAD_AREA, FREELDR_MAX_SIZE);
if (dwSetupldrSize <= 0)
return NULL;
}

// Freeloader found
config = (CONFIGENTRY *)malloc(sizeof(CONFIGENTRY));
memset(config, 0x00, sizeof(CONFIGENTRY));
config->bootSystem = SYS_REACTOS;
strcpy(config->title, "ReactOS");
strcpy(config->szPath, "/loader/setupldr.sys");
strcpy(config->szPath, (dwFreeldrSize > 0) ? "/loader/freeldr.sys" : "/loader/setupldr.sys");

return config;
}
Expand Down
Loading