Changeset 99404 in vbox for trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c

Timestamp:

Apr 14, 2023 3:17:44 PM (21 months ago)

Author:

vboxsync

Message:

Devices/EFI/FirmwareNew: Update to edk2-stable202302 and make it build, bugref:4643

Location:

trunk/src/VBox/Devices/EFI/FirmwareNew

Files:

• . (modified) (1 prop)
• ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c (modified) (14 diffs)

trunk/src/VBox/Devices/EFI/FirmwareNew/ShellPkg/Library/UefiShellDebug1CommandsLib/EditMenuBar.c

@@ -11 +11 @@
 #include "EditStatusBar.h"
 
-EDITOR_MENU_ITEM   *MenuItems;
-MENU_ITEM_FUNCTION *ControlBasedMenuFunctions;
-UINTN                 NumItems;
+EDITOR_MENU_ITEM    *MenuItems;
+MENU_ITEM_FUNCTION  *ControlBasedMenuFunctions;
+UINTN               NumItems;
 
 /**
@@ -23 +23 @@
   )
 {
-  SHELL_FREE_NON_NULL(MenuItems);
+  SHELL_FREE_NON_NULL (MenuItems);
 }
 
@@ -41 +41 @@
   CONST EDITOR_MENU_ITEM  *ItemsWalker;
 
-  for (NumItems = 0, ItemsWalker = Items ; ItemsWalker != NULL && ItemsWalker->Function != NULL ; ItemsWalker++,NumItems++);
-
-  MenuItems = AllocateZeroPool((NumItems+1) * sizeof(EDITOR_MENU_ITEM));
+  for (NumItems = 0, ItemsWalker = Items; ItemsWalker != NULL && ItemsWalker->Function != NULL; ItemsWalker++, NumItems++) {
+  }
+
+  MenuItems = AllocateZeroPool ((NumItems+1) * sizeof (EDITOR_MENU_ITEM));
   if (MenuItems == NULL) {
     return EFI_OUT_OF_RESOURCES;
   }
-  CopyMem(MenuItems, Items, (NumItems+1) * sizeof(EDITOR_MENU_ITEM));
+
+  CopyMem (MenuItems, Items, (NumItems+1) * sizeof (EDITOR_MENU_ITEM));
   return EFI_SUCCESS;
 }
@@ -66 +68 @@
   return EFI_SUCCESS;
 }
+
 /**
   Refresh function for the menu bar.
@@ -76 +79 @@
 EFI_STATUS
 MenuBarRefresh (
-  IN CONST UINTN LastRow,
-  IN CONST UINTN LastCol
+  IN CONST UINTN  LastRow,
+  IN CONST UINTN  LastCol
   )
 {
   EDITOR_MENU_ITEM  *Item;
-  UINTN                 Col;
-  UINTN                 Row;
-  UINTN                 Width;
-  CHAR16                *NameString;
-  CHAR16                *FunctionKeyString;
+  UINTN             Col;
+  UINTN             Row;
+  UINTN             Width;
+  CHAR16            *NameString;
+  CHAR16            *FunctionKeyString;
 
   //
@@ -98 +101 @@
   EditorClearLine (LastRow - 2, LastCol, LastRow);
   EditorClearLine (LastRow - 1, LastCol, LastRow);
-  EditorClearLine (LastRow    , LastCol, LastRow);
-
+  EditorClearLine (LastRow, LastCol, LastRow);
 
   //
@@ -105 +107 @@
   //
   for (Item = MenuItems; Item != NULL && Item->Function != NULL; Item++) {
-
-
-    NameString = HiiGetString(gShellDebug1HiiHandle, Item->NameToken, NULL);
-
-
-    Width             = MAX ((StrLen (NameString) + 6), 20);
+    NameString = HiiGetString (gShellDebug1HiiHandle, Item->NameToken, NULL);
+
+    Width = MAX ((StrLen (NameString) + 6), 20);
     if (((Col + Width) > LastCol)) {
       Row++;
@@ -116 +115 @@
     }
 
-    FunctionKeyString = HiiGetString(gShellDebug1HiiHandle, Item->FunctionKeyToken, NULL);
+    FunctionKeyString = HiiGetString (gShellDebug1HiiHandle, Item->FunctionKeyToken, NULL);
 
     ShellPrintEx ((INT32)(Col) - 1, (INT32)(Row) - 1, L"%E%s%N  %H%s%N  ", FunctionKeyString, NameString);
@@ -139 +138 @@
 EFI_STATUS
 MenuBarDispatchFunctionKey (
-  IN CONST EFI_INPUT_KEY   *Key
-  )
-{
-  UINTN                 Index;
-
-  Index     = Key->ScanCode - SCAN_F1;
+  IN CONST EFI_INPUT_KEY  *Key
+  )
+{
+  UINTN  Index;
+
+  Index = Key->ScanCode - SCAN_F1;
 
   //
@@ -168 +167 @@
 EFI_STATUS
 MenuBarDispatchControlHotKey (
-  IN CONST EFI_KEY_DATA   *KeyData
-  )
-{
-  UINT16                  ControlIndex;
+  IN CONST EFI_KEY_DATA  *KeyData
+  )
+{
+  UINT16  ControlIndex;
 
   //
@@ -179 +178 @@
 
   if (((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) == 0) ||
-      (KeyData->KeyState.KeyShiftState == EFI_SHIFT_STATE_VALID)) {
+      (KeyData->KeyState.KeyShiftState == EFI_SHIFT_STATE_VALID))
+  {
     //
     // For consoles that don't support/report shift state,
@@ -187 +187 @@
   } else if (((KeyData->KeyState.KeyShiftState & EFI_SHIFT_STATE_VALID) != 0) &&
              ((KeyData->KeyState.KeyShiftState & (EFI_RIGHT_CONTROL_PRESSED | EFI_LEFT_CONTROL_PRESSED)) != 0) &&
-             ((KeyData->KeyState.KeyShiftState & ~(EFI_SHIFT_STATE_VALID | EFI_RIGHT_CONTROL_PRESSED | EFI_LEFT_CONTROL_PRESSED)) == 0)) {
+             ((KeyData->KeyState.KeyShiftState & ~(EFI_SHIFT_STATE_VALID | EFI_RIGHT_CONTROL_PRESSED | EFI_LEFT_CONTROL_PRESSED)) == 0))
+  {
     //
     // For consoles that supports/reports shift state,
@@ -198 +199 @@
     }
   }
-  if ((SCAN_CONTROL_Z < ControlIndex)
-    ||(NULL == ControlBasedMenuFunctions[ControlIndex]))
+
+  if (  (SCAN_CONTROL_Z < ControlIndex)
+     || (NULL == ControlBasedMenuFunctions[ControlIndex]))
   {
-      return EFI_NOT_FOUND;
+    return EFI_NOT_FOUND;
   }
 
@@ -207 +209 @@
   return EFI_SUCCESS;
 }
-
-