Skip to content

Minor fix #807

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

Closed
YBronst wants to merge 4 commits into from
+6 −8
Closed

Minor fix #807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5753b62
Minor fix
YBronst Feb 25, 2026
f751d02
Merge branch 'CloverHackyColor:master' into master
YBronst Feb 25, 2026
1407006
Revert XStringW FileName
YBronst Feb 25, 2026
b321f57
Update main.cpp
YBronst Feb 25, 2026
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
2 changes: 1 addition & 1 deletion rEFIt_UEFI/entry_scan/legacy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ DBG(" Volume->LegacyOS.Name=%ls\n", Volume->LegacyOS.Name.wc_str());
Entry->Title.SWPrintf("Boot %ls from %ls", LoaderTitle.wc_str(), VolDesc.wc_str());
}
}
// DBG(" Entry->Title=%ls\n", Entry->Title.wc_str());
DBG(" Entry->Title=%ls\n", Entry->Title.wc_str());

Entry->Row = 0;
Entry->ShortcutLetter = (Hotkey == 0) ? ShortcutLetter : Hotkey;
Expand Down
10 changes: 4 additions & 6 deletions rEFIt_UEFI/entry_scan/loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1294,9 +1294,9 @@ STATIC LOADER_ENTRY *CreateLoaderEntry(
Entry->LoaderType = OSTYPE_OTHER;
break;
}
// DBG("OSIconName=%ls \n", OSIconName.wc_str());
// DBG("OSIconName=%ls \n", OSIconName.wc_str());
Entry->OSName = OSIconName.subString(0, OSIconName.indexOf(',')); // TODO
// SmbiosList.AddReference(OSName.forgetDataWithoutFreeing(), true);
// SmbiosList.AddReference(OSName.forgetDataWithoutFreeing(), true);

Entry->Title = FullTitle;
if (Entry->Title.isEmpty() && Volume->VolLabel.notEmpty()) {
Expand Down Expand Up @@ -1428,7 +1428,6 @@ void LOADER_ENTRY::AddDefaultMenu() {
UINT64 VolumeSize;
EFI_GUID Guid;
XBool KernelIs64BitOnly;
XStringW OldOSName{OSName};

constexpr LString8 quietLitteral = "quiet"_XS8;
constexpr LString8 splashLitteral = "splash"_XS8;
Expand Down Expand Up @@ -1628,7 +1627,6 @@ void LOADER_ENTRY::AddDefaultMenu() {
SubEntry->Title.SWPrintf("Run %ls", FileName.wc_str());
SubScreen->AddMenuEntry(SubEntry, true);
}
OSName = OldOSName;
}

LOADER_ENTRY *AddLoaderEntry(IN CONST XStringW &LoaderPath,
Expand Down Expand Up @@ -2310,7 +2308,7 @@ void ScanLoader(void)
Volume, NULL, OSTYPE_WINEFI, 0);
}

#if defined(ANDX86)
#if defined(ANDX86)
if (true) { // gSettings.AndroidScan
// check for Android loaders
for (UINTN Index = 0; Index < AndroidEntryDataCount; ++Index) {
Expand Down Expand Up @@ -2551,7 +2549,7 @@ void ScanLoader(void)
DBG("Entries list before ordering\n");
for (size_t idx = 0; idx < MainMenu.Entries.sizeIncludingHidden(); idx++) {
if (MainMenu.Entries.ElementAt(idx).getLOADER_ENTRY()) {
DBG(" Entry %zd : %ls%s \n", idx,
DBG(" Entry %zd : %ls%s\n", idx,
MainMenu.Entries.ElementAt(idx).Title.wc_str(),
MainMenu.Entries.ElementAt(idx).Hidden ? " (hidden)" : ""
);
Expand Down
2 changes: 1 addition & 1 deletion rEFIt_UEFI/refit/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ void LOADER_ENTRY::StartLoader()
pos = setKextAtPos(&kextArray, "IOSkywalkFamily.kext"_XS8, pos);
pos = setKextAtPos(&kextArray, "FakePCIID.kext"_XS8, pos);
pos = setKextAtPos(&kextArray, "FakePCIID_XHCIMux.kext"_XS8, pos);
pos = setKextAtPos(&kextArray, "AMDRyzenCPUPowerManagement.kext"_XS8,
pos = setKextAtPos(&kextArray, "AMDRyzenCPUPowerManagement.kext"_XS8,
pos);
pos = setKextAtPos(&kextArray, "SMCAMDProcessor.kext"_XS8, pos);
pos = setKextAtPos(&kextArray, "AppleALC.kext"_XS8, pos);
Expand Down
Loading