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

Remove incorrect space in ArgOptional. Clean few comments.

Browse Source
This commit is contained in:
jief 2020-04-28 09:54:43 +03:00
parent 67e496d6e9
commit 2135d2706b
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp
View File

@ -2544,7 +2544,6 @@ VOID REFIT_MENU_SCREEN::AddMenuCheck(CONST CHAR8 *Text, UINTN Bit, INTN ItemNum)
{ {
REFIT_MENU_CHECKBIT *InputBootArgs; REFIT_MENU_CHECKBIT *InputBootArgs;
// InputBootArgs = (__typeof__(InputBootArgs))AllocateZeroPool(sizeof(REFIT_INPUT_DIALOG));
InputBootArgs = new REFIT_MENU_CHECKBIT; InputBootArgs = new REFIT_MENU_CHECKBIT;
InputBootArgs->Title.takeValueFrom(Text); InputBootArgs->Title.takeValueFrom(Text);
// InputBootArgs->Tag = TAG_CHECKBIT_OLD; // InputBootArgs->Tag = TAG_CHECKBIT_OLD;
@ -2571,17 +2570,9 @@ VOID REFIT_MENU_SCREEN::AddMenuItem_(REFIT_MENU_ENTRY_ITEM_ABSTRACT* InputBootAr
AddMenuEntry(InputBootArgs, true); AddMenuEntry(InputBootArgs, true);
} }
//
//VOID AddMenuItem(REFIT_MENU_SCREEN *SubScreen, INTN Inx, CONST CHAR8 *Title, UINTN Tag, BOOLEAN Cursor)
//{
//// REFIT_INPUT_DIALOG *InputBootArgs = (__typeof__(InputBootArgs))AllocateZeroPool(sizeof(REFIT_INPUT_DIALOG));
// REFIT_INPUT_DIALOG *InputBootArgs = new REFIT_INPUT_DIALOG;
// AddMenuItem_(SubScreen, InputBootArgs, Inx, Title, Tag, Cursor);
//}
VOID REFIT_MENU_SCREEN::AddMenuItemInput(INTN Inx, CONST CHAR8 *Line, BOOLEAN Cursor) VOID REFIT_MENU_SCREEN::AddMenuItemInput(INTN Inx, CONST CHAR8 *Line, BOOLEAN Cursor)
{ {
// REFIT_INPUT_DIALOG *InputBootArgs = (__typeof__(InputBootArgs))AllocateZeroPool(sizeof(REFIT_INPUT_DIALOG));
REFIT_INPUT_DIALOG *InputBootArgs = new REFIT_INPUT_DIALOG; REFIT_INPUT_DIALOG *InputBootArgs = new REFIT_INPUT_DIALOG;
AddMenuItem_(InputBootArgs, Inx, Line, Cursor); AddMenuItem_(InputBootArgs, Inx, Line, Cursor);
} }

8
rEFIt_UEFI/gui/shared_with_menu.cpp
View File

@ -47,10 +47,10 @@
CONST XString ArgOptional[NUM_OPT] = { CONST XString ArgOptional[NUM_OPT] = {
"arch=i386"_XS, //0 "arch=i386"_XS, //0
"arch=x86_64"_XS, //1 "arch=x86_64"_XS, //1
"-v "_XS, //2 "-v"_XS, //2
"-f "_XS, //3 "-f"_XS, //3
"-s "_XS, //4 "-s"_XS, //4
"-x "_XS, //5 "-x"_XS, //5
"nv_disable=1"_XS, //6 "nv_disable=1"_XS, //6
"slide=0"_XS, //7 "slide=0"_XS, //7
"darkwake=0"_XS, //8 "darkwake=0"_XS, //8

9
rEFIt_UEFI/refit/menu.cpp
View File

@ -1687,12 +1687,11 @@ REFIT_MENU_ITEM_OPTIONS* newREFIT_MENU_ITEM_OPTIONS(REFIT_MENU_SCREEN **SubScree
VOID ModifyTitles(REFIT_ABSTRACT_MENU_ENTRY *ChosenEntry) VOID ModifyTitles(REFIT_ABSTRACT_MENU_ENTRY *ChosenEntry)
{ {
if (ChosenEntry->SubScreen->ID == SCREEN_DSDT) { if (ChosenEntry->SubScreen->ID == SCREEN_DSDT) {
ChosenEntry->Title.SWPrintf("DSDT fix mask [0x%08x]->", gSettings.FixDsdt); // TODO jief : cast to fix ChosenEntry->Title.SWPrintf("DSDT fix mask [0x%08x]->", gSettings.FixDsdt);
//MsgLog("@ESC: %ls\n", (*ChosenEntry)->Title); //MsgLog("@ESC: %ls\n", (*ChosenEntry)->Title);
} else if (ChosenEntry->SubScreen->ID == SCREEN_CSR) { } else if (ChosenEntry->SubScreen->ID == SCREEN_CSR) {
// CSR // CSR
// TODO jief : cast to fix ChosenEntry->Title.SWPrintf("System Integrity Protection [0x%04x]->", gSettings.CsrActiveConfig);
ChosenEntry->Title.SWPrintf("System Integrity Protection [0x%04x]->", gSettings.CsrActiveConfig); // TODO jief : cast to fix
// check for the right booter flag to allow the application // check for the right booter flag to allow the application
// of the new System Integrity Protection configuration. // of the new System Integrity Protection configuration.
if (gSettings.CsrActiveConfig != 0 && gSettings.BooterConfig == 0) { if (gSettings.CsrActiveConfig != 0 && gSettings.BooterConfig == 0) {
@ -1700,9 +1699,9 @@ VOID ModifyTitles(REFIT_ABSTRACT_MENU_ENTRY *ChosenEntry)
} }
} else if (ChosenEntry->SubScreen->ID == SCREEN_BLC) { } else if (ChosenEntry->SubScreen->ID == SCREEN_BLC) {
ChosenEntry->Title.SWPrintf("boot_args->flags [0x%04hx]->", gSettings.BooterConfig); // TODO jief : cast to fix ChosenEntry->Title.SWPrintf("boot_args->flags [0x%04hx]->", gSettings.BooterConfig);
} else if (ChosenEntry->SubScreen->ID == SCREEN_DSM) { } else if (ChosenEntry->SubScreen->ID == SCREEN_DSM) {
ChosenEntry->Title.SWPrintf("Drop OEM _DSM [0x%04hx]->", dropDSM); // TODO jief : cast to fix ChosenEntry->Title.SWPrintf("Drop OEM _DSM [0x%04hx]->", dropDSM);
} }
} }