diff --git a/rEFIt_UEFI/entry_scan/legacy.cpp b/rEFIt_UEFI/entry_scan/legacy.cpp index daeca5806..995ab443f 100644 --- a/rEFIt_UEFI/entry_scan/legacy.cpp +++ b/rEFIt_UEFI/entry_scan/legacy.cpp @@ -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; diff --git a/rEFIt_UEFI/entry_scan/loader.cpp b/rEFIt_UEFI/entry_scan/loader.cpp index 6f959170e..2d7cbe55e 100644 --- a/rEFIt_UEFI/entry_scan/loader.cpp +++ b/rEFIt_UEFI/entry_scan/loader.cpp @@ -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()) { @@ -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; @@ -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, @@ -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) { @@ -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)" : "" ); diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp index 029d69261..2c7ea2669 100644 --- a/rEFIt_UEFI/refit/main.cpp +++ b/rEFIt_UEFI/refit/main.cpp @@ -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);