Upstream/CloverBootloader
1
0
Fork 0
mirror of https://github.com/CloverHackyColor/CloverBootloader.git synced 2024-11-27 12:15:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

auto merge

Browse Source 
Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-03-03 23:55:37 +03:00
commit 4e63e897cb
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rEFIt_UEFI/entry_scan/loader.cpp
View File

@ -1997,7 +1997,6 @@ STATIC VOID AddCustomEntry(IN UINTN CustomIndex,
SubMenu->AddMenuEntry(Entry, true); SubMenu->AddMenuEntry(Entry, true);
else else
MainMenu.AddMenuEntry(Entry, true); MainMenu.AddMenuEntry(Entry, true);
// AddMenuEntry(IsSubEntry ? SubMenu : &MainMenu, Entry, true);
} }
// cleanup custom // cleanup custom
if (FindCustomPath) { if (FindCustomPath) {

2
rEFIt_UEFI/gui/menu_items/menu_items.h
View File

@ -506,7 +506,6 @@ public:
VOID AddMenuItemInput(INTN Inx, CONST CHAR8 *Title, BOOLEAN Cursor); VOID AddMenuItemInput(INTN Inx, CONST CHAR8 *Title, BOOLEAN Cursor);
VOID FreeMenu(); VOID FreeMenu();
INTN FindMenuShortcutEntry(IN CHAR16 Shortcut); INTN FindMenuShortcutEntry(IN CHAR16 Shortcut);
UINTN InputDialog(IN MENU_STYLE_FUNC StyleFunc);
UINTN RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INTN *DefaultEntryIndex, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); UINTN RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INTN *DefaultEntryIndex, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry);
UINTN RunMenu(OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); UINTN RunMenu(OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry);
UINTN RunMainMenu(IN INTN DefaultSelection, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry); UINTN RunMainMenu(IN INTN DefaultSelection, OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry);
@ -516,6 +515,7 @@ public:
VOID InitAnime(); VOID InitAnime();
BOOLEAN GetAnime(); BOOLEAN GetAnime();
VOID UpdateAnime(); VOID UpdateAnime();
UINTN InputDialog();
//Style functions //Style functions
virtual VOID MainMenuStyle(IN UINTN Function, IN CONST CHAR16 *ParamText); virtual VOID MainMenuStyle(IN UINTN Function, IN CONST CHAR16 *ParamText);

1
rEFIt_UEFI/refit/IO.cpp
View File

@ -1074,6 +1074,7 @@ EFI_STATUS WaitForInputEventPoll(REFIT_MENU_SCREEN* ScreenPtr, UINTN TimeoutDefa
if (Status != EFI_TIMEOUT) { if (Status != EFI_TIMEOUT) {
break; break;
} }
Screen.UpdateAnime(); //should be moved to REFIT_MENU_SCREEN class Screen.UpdateAnime(); //should be moved to REFIT_MENU_SCREEN class
if (gSettings.PlayAsync) { if (gSettings.PlayAsync) {
CheckSyncSound(); CheckSyncSound();

30
rEFIt_UEFI/refit/menu.cpp
View File

@ -1374,7 +1374,7 @@ VOID AboutRefit(VOID)
#ifdef FIRMWARE_BUILDDATE #ifdef FIRMWARE_BUILDDATE
AboutMenu.AddMenuInfo(PoolPrint(L" Build: %a", FIRMWARE_BUILDDATE)); AboutMenu.AddMenuInfo(PoolPrint(L" Build: %a", FIRMWARE_BUILDDATE));
#else #else
AboutMenu.AboutMenu.AddMenuInfo(L" Build: unknown"); AboutMenu.AddMenuInfo(L" Build: unknown");
#endif #endif
AboutMenu.AddMenuInfo(L""); AboutMenu.AddMenuInfo(L"");
AboutMenu.AddMenuInfo(L"Based on rEFIt (c) 2006-2010 Christoph Pfisterer"); AboutMenu.AddMenuInfo(L"Based on rEFIt (c) 2006-2010 Christoph Pfisterer");
@ -2189,6 +2189,7 @@ VOID REFIT_MENU_SCREEN::AddMenuEntry(IN REFIT_MENU_ENTRY *Entry, bool freeIt)
// AddListElement((VOID ***) &(Screen->Entries), (UINTN*)&(Screen->Entries.size()), Entry); // AddListElement((VOID ***) &(Screen->Entries), (UINTN*)&(Screen->Entries.size()), Entry);
} }
// This is supposed to be a destructor ?
VOID REFIT_MENU_SCREEN::FreeMenu() VOID REFIT_MENU_SCREEN::FreeMenu()
{ {
// INTN i; // INTN i;
@ -2570,9 +2571,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT
ScrollState.LastSelection = ScrollState.CurrentSelection; ScrollState.LastSelection = ScrollState.CurrentSelection;
ScrollState.CurrentSelection = mItemID; ScrollState.CurrentSelection = mItemID;
if ( Entries[mItemID].getREFIT_INPUT_DIALOG() || Entries[mItemID].getREFIT_MENU_CHECKBIT() ) { if ( Entries[mItemID].getREFIT_INPUT_DIALOG() || Entries[mItemID].getREFIT_MENU_CHECKBIT() ) {
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
} else if (Entries[mItemID].getREFIT_MENU_SWITCH()) { } else if (Entries[mItemID].getREFIT_MENU_SWITCH()) {
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
HidePointer(); HidePointer();
} else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) { } else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) {
@ -2593,9 +2594,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT
ScrollState.CurrentSelection = mItemID; ScrollState.CurrentSelection = mItemID;
if ((Entries[mItemID].getREFIT_INPUT_DIALOG()) || if ((Entries[mItemID].getREFIT_INPUT_DIALOG()) ||
(Entries[mItemID].getREFIT_MENU_CHECKBIT())) { (Entries[mItemID].getREFIT_MENU_CHECKBIT())) {
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
} else if (Entries[mItemID].getREFIT_MENU_SWITCH()) { } else if (Entries[mItemID].getREFIT_MENU_SWITCH()) {
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
HidePointer(); HidePointer();
} else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) { } else if (!Entries[mItemID].getREFIT_INFO_DIALOG()) {
@ -2746,9 +2747,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT
case CHAR_CARRIAGE_RETURN: case CHAR_CARRIAGE_RETURN:
if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) || if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) ||
(Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) { (Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) {
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
} else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){ } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
} else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_ENTRY_CLOVER()){ } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_ENTRY_CLOVER()){
MenuExit = MENU_EXIT_DETAILS; MenuExit = MENU_EXIT_DETAILS;
@ -2759,9 +2760,9 @@ UINTN REFIT_MENU_SCREEN::RunGenericMenu(IN MENU_STYLE_FUNC StyleFunc, IN OUT INT
case ' ': //CHAR_SPACE case ' ': //CHAR_SPACE
if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) || if ((Entries[ScrollState.CurrentSelection].getREFIT_INPUT_DIALOG()) ||
(Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) { (Entries[ScrollState.CurrentSelection].getREFIT_MENU_CHECKBIT())) {
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
} else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){ } else if (Entries[ScrollState.CurrentSelection].getREFIT_MENU_SWITCH()){
MenuExit = InputDialog(StyleFunc); MenuExit = InputDialog();
ScrollState.PaintAll = TRUE; ScrollState.PaintAll = TRUE;
HidePointer(); HidePointer();
} else if (!Entries[ScrollState.CurrentSelection].getREFIT_INFO_DIALOG()) { } else if (!Entries[ScrollState.CurrentSelection].getREFIT_INFO_DIALOG()) {
@ -4423,6 +4424,7 @@ VOID REFIT_MENU_SCREEN::AddMenuItem_(REFIT_MENU_ITEM_IEM_ABSTRACT* InputBootArgs
InputBootArgs->AtClick = Cursor?ActionSelect:ActionEnter; InputBootArgs->AtClick = Cursor?ActionSelect:ActionEnter;
InputBootArgs->AtRightClick = Cursor?ActionNone:ActionDetails; InputBootArgs->AtRightClick = Cursor?ActionNone:ActionDetails;
InputBootArgs->AtDoubleClick = Cursor?ActionEnter:ActionNone; InputBootArgs->AtDoubleClick = Cursor?ActionEnter:ActionNone;
AddMenuEntry(InputBootArgs, true); AddMenuEntry(InputBootArgs, true);
} }
// //
@ -4589,6 +4591,7 @@ REFIT_MENU_ENTRY *SubMenuSpeedStep()
nya(gCPUStructure.MinRatio), nya(gCPUStructure.MaxRatio), nya(gCPUStructure.MinRatio), nya(gCPUStructure.MaxRatio),
nya(gCPUStructure.Turbo4), nya(gCPUStructure.Turbo3), nya(gCPUStructure.Turbo2), nya(gCPUStructure.Turbo1))); nya(gCPUStructure.Turbo4), nya(gCPUStructure.Turbo3), nya(gCPUStructure.Turbo2), nya(gCPUStructure.Turbo1)));
SubScreen->AddMenuItemInput(76, "Cores enabled:", TRUE); SubScreen->AddMenuItemInput(76, "Cores enabled:", TRUE);
SubScreen->AddMenuItemInput(6, "Halt Enabler", FALSE); SubScreen->AddMenuItemInput(6, "Halt Enabler", FALSE);
SubScreen->AddMenuItemInput(7, "PLimitDict:", TRUE); SubScreen->AddMenuItemInput(7, "PLimitDict:", TRUE);
@ -4721,8 +4724,8 @@ LOADER_ENTRY *SubMenuKextInjectMgmt(LOADER_ENTRY *Entry)
} }
} }
SubScreen->AddMenuInfoLine(
PoolPrint( SubScreen->AddMenuInfoLine(PoolPrint(
L"Block injected kexts for target version of macOS: %a", L"Block injected kexts for target version of macOS: %a",
ShortOSVersion)); ShortOSVersion));
@ -4798,8 +4801,7 @@ LOADER_ENTRY *SubMenuKextInjectMgmt(LOADER_ENTRY *Entry)
} }
} }
else { else {
SubScreen->AddMenuInfoLine( SubScreen->AddMenuInfoLine(PoolPrint(
PoolPrint(
L"Block injected kexts for target version of macOS: %a", L"Block injected kexts for target version of macOS: %a",
ChosenOS)); ChosenOS));
} }
@ -4882,6 +4884,7 @@ REFIT_MENU_ENTRY *SubMenuBinaries()
SubScreen->AddMenuInfoLine(PoolPrint(L"%a", gCPUStructure.BrandString)); SubScreen->AddMenuInfoLine(PoolPrint(L"%a", gCPUStructure.BrandString));
SubScreen->AddMenuInfoLine(PoolPrint(L"Real CPUID: 0x%06x", gCPUStructure.Signature)); SubScreen->AddMenuInfoLine(PoolPrint(L"Real CPUID: 0x%06x", gCPUStructure.Signature));
SubScreen->AddMenuItemInput(64, "Debug", FALSE); SubScreen->AddMenuItemInput(64, "Debug", FALSE);
SubScreen->AddMenuInfo(L"----------------------"); SubScreen->AddMenuInfo(L"----------------------");
SubScreen->AddMenuItemInput(104, "Fake CPUID:", TRUE); SubScreen->AddMenuItemInput(104, "Fake CPUID:", TRUE);
@ -5073,7 +5076,6 @@ REFIT_MENU_ENTRY *SubMenuDsdtFix()
SubScreen->AddMenuCheck("Fix Headers", FIX_HEADERS, 67); SubScreen->AddMenuCheck("Fix Headers", FIX_HEADERS, 67);
SubScreen->AddMenuCheck("Fix Mutex", FIX_MUTEX, 67); SubScreen->AddMenuCheck("Fix Mutex", FIX_MUTEX, 67);
SubScreen->AddMenuEntry(&MenuEntryReturn, false); SubScreen->AddMenuEntry(&MenuEntryReturn, false);
ModifyTitles(Entry); ModifyTitles(Entry);