MdeModulePkg: Apply uncrustify changes

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

9 files changed, 420 insertions, 415 deletions

diff --git a/MdeModulePkg/Application/UiApp/FrontPage.c b/MdeModulePkg/Application/UiApp/FrontPage.c
index 4b95cccb5c..cc9569e225 100644
--- a/MdeModulePkg/Application/UiApp/FrontPage.c
+++ b/MdeModulePkg/Application/UiApp/FrontPage.c
@@ -10,29 +10,29 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "FrontPage.h"

 #include "FrontPageCustomizedUi.h"

 

-#define MAX_STRING_LEN            200

+#define MAX_STRING_LEN  200

 

-EFI_GUID   mFrontPageGuid      = FRONT_PAGE_FORMSET_GUID;

+EFI_GUID  mFrontPageGuid = FRONT_PAGE_FORMSET_GUID;

 

-BOOLEAN   mResetRequired  = FALSE;

+BOOLEAN  mResetRequired = FALSE;

 

-EFI_FORM_BROWSER2_PROTOCOL      *gFormBrowser2;

-CHAR8     *mLanguageString;

-BOOLEAN   mModeInitialized = FALSE;

+EFI_FORM_BROWSER2_PROTOCOL  *gFormBrowser2;

+CHAR8                       *mLanguageString;

+BOOLEAN                     mModeInitialized = FALSE;

 //

 // Boot video resolution and text mode.

 //

-UINT32    mBootHorizontalResolution    = 0;

-UINT32    mBootVerticalResolution      = 0;

-UINT32    mBootTextModeColumn          = 0;

-UINT32    mBootTextModeRow             = 0;

+UINT32  mBootHorizontalResolution = 0;

+UINT32  mBootVerticalResolution   = 0;

+UINT32  mBootTextModeColumn       = 0;

+UINT32  mBootTextModeRow          = 0;

 //

 // BIOS setup video resolution and text mode.

 //

-UINT32    mSetupTextModeColumn         = 0;

-UINT32    mSetupTextModeRow            = 0;

-UINT32    mSetupHorizontalResolution   = 0;

-UINT32    mSetupVerticalResolution     = 0;

+UINT32  mSetupTextModeColumn       = 0;

+UINT32  mSetupTextModeRow          = 0;

+UINT32  mSetupHorizontalResolution = 0;

+UINT32  mSetupVerticalResolution   = 0;

 

 FRONT_PAGE_CALLBACK_DATA  gFrontPagePrivate = {

   FRONT_PAGE_CALLBACK_DATA_SIGNATURE,

@@ -52,21 +52,22 @@ HII_VENDOR_DEVICE_PATH  mFrontPageHiiVendorDevicePath = {
       HARDWARE_DEVICE_PATH,

       HW_VENDOR_DP,

       {

-        (UINT8) (sizeof (VENDOR_DEVICE_PATH)),

-        (UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)

+        (UINT8)(sizeof (VENDOR_DEVICE_PATH)),

+        (UINT8)((sizeof (VENDOR_DEVICE_PATH)) >> 8)

       }

     },

     //

     // {8E6D99EE-7531-48f8-8745-7F6144468FF2}

     //

-    { 0x8e6d99ee, 0x7531, 0x48f8, { 0x87, 0x45, 0x7f, 0x61, 0x44, 0x46, 0x8f, 0xf2 } }

+    { 0x8e6d99ee, 0x7531, 0x48f8, { 0x87, 0x45, 0x7f, 0x61, 0x44, 0x46, 0x8f, 0xf2 }

+    }

   },

   {

     END_DEVICE_PATH_TYPE,

     END_ENTIRE_DEVICE_PATH_SUBTYPE,

     {

-      (UINT8) (END_DEVICE_PATH_LENGTH),

-      (UINT8) ((END_DEVICE_PATH_LENGTH) >> 8)

+      (UINT8)(END_DEVICE_PATH_LENGTH),

+      (UINT8)((END_DEVICE_PATH_LENGTH) >> 8)

     }

   }

 };

@@ -105,15 +106,16 @@ UpdateFrontPageBannerStrings (
 EFI_STATUS

 EFIAPI

 FakeExtractConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Request,

-  OUT EFI_STRING                             *Progress,

-  OUT EFI_STRING                             *Results

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Request,

+  OUT EFI_STRING                            *Progress,

+  OUT EFI_STRING                            *Results

   )

 {

-  if (Progress == NULL || Results == NULL) {

+  if ((Progress == NULL) || (Results == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

+

   *Progress = Request;

   return EFI_NOT_FOUND;

 }

@@ -137,12 +139,12 @@ FakeExtractConfig (
 EFI_STATUS

 EFIAPI

 FakeRouteConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Configuration,

-  OUT EFI_STRING                             *Progress

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Configuration,

+  OUT EFI_STRING                            *Progress

   )

 {

-  if (Configuration == NULL || Progress == NULL) {

+  if ((Configuration == NULL) || (Progress == NULL)) {

     return EFI_INVALID_PARAMETER;

   }

 

@@ -172,12 +174,12 @@ FakeRouteConfig (
 EFI_STATUS

 EFIAPI

 FrontPageCallback (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  EFI_BROWSER_ACTION                    Action,

+  IN  EFI_QUESTION_ID                       QuestionId,

+  IN  UINT8                                 Type,

+  IN  EFI_IFR_TYPE_VALUE                    *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest

   )

 {

   return UiFrontPageCallbackHandler (gFrontPagePrivate.HiiHandle, Action, QuestionId, Type, Value, ActionRequest);

@@ -193,10 +195,10 @@ UpdateFrontPageForm (
   VOID

   )

 {

-  VOID                        *StartOpCodeHandle;

-  VOID                        *EndOpCodeHandle;

-  EFI_IFR_GUID_LABEL          *StartGuidLabel;

-  EFI_IFR_GUID_LABEL          *EndGuidLabel;

+  VOID                *StartOpCodeHandle;

+  VOID                *EndOpCodeHandle;

+  EFI_IFR_GUID_LABEL  *StartGuidLabel;

+  EFI_IFR_GUID_LABEL  *EndGuidLabel;

 

   //

   // Allocate space for creation of UpdateData Buffer

@@ -209,18 +211,18 @@ UpdateFrontPageForm (
   //

   // Create Hii Extend Label OpCode as the start opcode

   //

-  StartGuidLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

+  StartGuidLabel               = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (StartOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

   StartGuidLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

   StartGuidLabel->Number       = LABEL_FRANTPAGE_INFORMATION;

   //

   // Create Hii Extend Label OpCode as the end opcode

   //

-  EndGuidLabel = (EFI_IFR_GUID_LABEL *) HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

+  EndGuidLabel               = (EFI_IFR_GUID_LABEL *)HiiCreateGuidOpCode (EndOpCodeHandle, &gEfiIfrTianoGuid, NULL, sizeof (EFI_IFR_GUID_LABEL));

   EndGuidLabel->ExtendOpCode = EFI_IFR_EXTEND_OP_LABEL;

   EndGuidLabel->Number       = LABEL_END;

 

   //

-  //Updata Front Page form

+  // Updata Front Page form

   //

   UiCustomizeFrontPage (

     gFrontPagePrivate.HiiHandle,

@@ -252,11 +254,12 @@ InitializeFrontPage (
   VOID

   )

 {

-  EFI_STATUS                  Status;

+  EFI_STATUS  Status;

+

   //

   // Locate Hii relative protocols

   //

-  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **) &gFormBrowser2);

+  Status = gBS->LocateProtocol (&gEfiFormBrowser2ProtocolGuid, NULL, (VOID **)&gFormBrowser2);

   if (EFI_ERROR (Status)) {

     return Status;

   }

@@ -265,14 +268,14 @@ InitializeFrontPage (
   // Install Device Path Protocol and Config Access protocol to driver handle

   //

   gFrontPagePrivate.DriverHandle = NULL;

-  Status = gBS->InstallMultipleProtocolInterfaces (

-                  &gFrontPagePrivate.DriverHandle,

-                  &gEfiDevicePathProtocolGuid,

-                  &mFrontPageHiiVendorDevicePath,

-                  &gEfiHiiConfigAccessProtocolGuid,

-                  &gFrontPagePrivate.ConfigAccess,

-                  NULL

-                  );

+  Status                         = gBS->InstallMultipleProtocolInterfaces (

+                                          &gFrontPagePrivate.DriverHandle,

+                                          &gEfiDevicePathProtocolGuid,

+                                          &mFrontPageHiiVendorDevicePath,

+                                          &gEfiHiiConfigAccessProtocolGuid,

+                                          &gFrontPagePrivate.ConfigAccess,

+                                          NULL

+                                          );

   ASSERT_EFI_ERROR (Status);

 

   //

@@ -288,14 +291,14 @@ InitializeFrontPage (
   ASSERT (gFrontPagePrivate.HiiHandle != NULL);

 

   //

-  //Updata Front Page banner strings

+  // Updata Front Page banner strings

   //

   UpdateFrontPageBannerStrings ();

 

   //

   // Update front page menus.

   //

-  UpdateFrontPageForm();

+  UpdateFrontPageForm ();

 

   return Status;

 }

@@ -324,15 +327,15 @@ CallFrontPage (
     );

 

   ActionRequest = EFI_BROWSER_ACTION_REQUEST_NONE;

-  Status = gFormBrowser2->SendForm (

-                            gFormBrowser2,

-                            &gFrontPagePrivate.HiiHandle,

-                            1,

-                            &mFrontPageGuid,

-                            0,

-                            NULL,

-                            &ActionRequest

-                            );

+  Status        = gFormBrowser2->SendForm (

+                                   gFormBrowser2,

+                                   &gFrontPagePrivate.HiiHandle,

+                                   1,

+                                   &mFrontPageGuid,

+                                   0,

+                                   NULL,

+                                   &ActionRequest

+                                   );

   //

   // Check whether user change any option setting which needs a reset to be effective

   //

@@ -348,11 +351,12 @@ CallFrontPage (
 

 **/

 VOID

-FreeFrontPage(

+FreeFrontPage (

   VOID

   )

 {

-  EFI_STATUS                  Status;

+  EFI_STATUS  Status;

+

   Status = gBS->UninstallMultipleProtocolInterfaces (

                   gFrontPagePrivate.DriverHandle,

                   &gEfiDevicePathProtocolGuid,

@@ -383,9 +387,9 @@ FreeFrontPage(
 **/

 VOID

 ConvertProcessorToString (

-  IN  UINT16                               ProcessorFrequency,

-  IN  UINT16                               Base10Exponent,

-  OUT CHAR16                               **String

+  IN  UINT16  ProcessorFrequency,

+  IN  UINT16  Base10Exponent,

+  OUT CHAR16  **String

   )

 {

   CHAR16  *StringBuffer;

@@ -395,13 +399,14 @@ ConvertProcessorToString (
 

   if (Base10Exponent >= 6) {

     FreqMhz = ProcessorFrequency;

-    for (Index = 0; Index < (UINT32) Base10Exponent - 6; Index++) {

+    for (Index = 0; Index < (UINT32)Base10Exponent - 6; Index++) {

       FreqMhz *= 10;

     }

   } else {

     FreqMhz = 0;

   }

-  DestMax = 0x20 / sizeof (CHAR16);

+

+  DestMax      = 0x20 / sizeof (CHAR16);

   StringBuffer = AllocateZeroPool (0x20);

   ASSERT (StringBuffer != NULL);

   UnicodeValueToStringS (StringBuffer, sizeof (CHAR16) * DestMax, LEFT_JUSTIFY, FreqMhz / 1000, 3);

@@ -415,11 +420,10 @@ ConvertProcessorToString (
     2

     );

   StrCatS (StringBuffer, DestMax, L" GHz");

-  *String = (CHAR16 *) StringBuffer;

-  return ;

+  *String = (CHAR16 *)StringBuffer;

+  return;

 }

 

-

 /**

   Convert Memory Size to a string.

 

@@ -429,8 +433,8 @@ ConvertProcessorToString (
 **/

 VOID

 ConvertMemorySizeToString (

-  IN  UINT32          MemorySize,

-  OUT CHAR16          **String

+  IN  UINT32  MemorySize,

+  OUT CHAR16  **String

   )

 {

   CHAR16  *StringBuffer;

@@ -440,9 +444,9 @@ ConvertMemorySizeToString (
   UnicodeValueToStringS (StringBuffer, 0x24, LEFT_JUSTIFY, MemorySize, 10);

   StrCatS (StringBuffer, 0x24 / sizeof (CHAR16), L" MB RAM");

 

-  *String = (CHAR16 *) StringBuffer;

+  *String = (CHAR16 *)StringBuffer;

 

-  return ;

+  return;

 }

 

 /**

@@ -459,12 +463,12 @@ ConvertMemorySizeToString (
 **/

 EFI_STATUS

 GetOptionalStringByIndex (

-  IN      CHAR8                   *OptionalStrStart,

-  IN      UINT8                   Index,

-  OUT     CHAR16                  **String

+  IN      CHAR8   *OptionalStrStart,

+  IN      UINT8   Index,

+  OUT     CHAR16  **String

   )

 {

-  UINTN          StrSize;

+  UINTN  StrSize;

 

   if (Index == 0) {

     *String = AllocateZeroPool (sizeof (CHAR16));

@@ -492,7 +496,6 @@ GetOptionalStringByIndex (
   return EFI_SUCCESS;

 }

 

-

 /**

 

   Update the banner information for the Front Page based on Smbios information.

@@ -503,22 +506,22 @@ UpdateFrontPageBannerStrings (
   VOID

   )

 {

-  UINT8                             StrIndex;

-  CHAR16                            *NewString;

-  CHAR16                            *FirmwareVersionString;

-  EFI_STATUS                        Status;

-  EFI_SMBIOS_HANDLE                 SmbiosHandle;

-  EFI_SMBIOS_PROTOCOL               *Smbios;

-  SMBIOS_TABLE_TYPE0                *Type0Record;

-  SMBIOS_TABLE_TYPE1                *Type1Record;

-  SMBIOS_TABLE_TYPE4                *Type4Record;

-  SMBIOS_TABLE_TYPE19               *Type19Record;

-  EFI_SMBIOS_TABLE_HEADER           *Record;

-  UINT64                            InstalledMemory;

-  BOOLEAN                           FoundCpu;

+  UINT8                    StrIndex;

+  CHAR16                   *NewString;

+  CHAR16                   *FirmwareVersionString;

+  EFI_STATUS               Status;

+  EFI_SMBIOS_HANDLE        SmbiosHandle;

+  EFI_SMBIOS_PROTOCOL      *Smbios;

+  SMBIOS_TABLE_TYPE0       *Type0Record;

+  SMBIOS_TABLE_TYPE1       *Type1Record;

+  SMBIOS_TABLE_TYPE4       *Type4Record;

+  SMBIOS_TABLE_TYPE19      *Type19Record;

+  EFI_SMBIOS_TABLE_HEADER  *Record;

+  UINT64                   InstalledMemory;

+  BOOLEAN                  FoundCpu;

 

   InstalledMemory = 0;

-  FoundCpu = 0;

+  FoundCpu        = 0;

 

   //

   // Update default banner string.

@@ -546,7 +549,7 @@ UpdateFrontPageBannerStrings (
   //

   // Update Front Page banner strings base on SmBios Table.

   //

-  Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **) &Smbios);

+  Status = gBS->LocateProtocol (&gEfiSmbiosProtocolGuid, NULL, (VOID **)&Smbios);

   if (EFI_ERROR (Status)) {

     //

     // Smbios protocol not found, get the default value.

@@ -580,17 +583,17 @@ UpdateFrontPageBannerStrings (
   }

 

   SmbiosHandle = SMBIOS_HANDLE_PI_RESERVED;

-  Status = Smbios->GetNext (Smbios, &SmbiosHandle, NULL, &Record, NULL);

-  while (!EFI_ERROR(Status)) {

+  Status       = Smbios->GetNext (Smbios, &SmbiosHandle, NULL, &Record, NULL);

+  while (!EFI_ERROR (Status)) {

     if (Record->Type == SMBIOS_TYPE_BIOS_INFORMATION) {

-      Type0Record = (SMBIOS_TABLE_TYPE0 *) Record;

-      StrIndex = Type0Record->BiosVersion;

-      GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type0Record + Type0Record->Hdr.Length), StrIndex, &NewString);

+      Type0Record = (SMBIOS_TABLE_TYPE0 *)Record;

+      StrIndex    = Type0Record->BiosVersion;

+      GetOptionalStringByIndex ((CHAR8 *)((UINT8 *)Type0Record + Type0Record->Hdr.Length), StrIndex, &NewString);

 

-      FirmwareVersionString = (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString);

+      FirmwareVersionString = (CHAR16 *)PcdGetPtr (PcdFirmwareVersionString);

       if (*FirmwareVersionString != 0x0000 ) {

         FreePool (NewString);

-        NewString = (CHAR16 *) PcdGetPtr (PcdFirmwareVersionString);

+        NewString = (CHAR16 *)PcdGetPtr (PcdFirmwareVersionString);

         UiCustomizeFrontPageBanner (3, TRUE, &NewString);

         HiiSetString (gFrontPagePrivate.HiiHandle, STRING_TOKEN (STR_FRONT_PAGE_BIOS_VERSION), NewString, NULL);

       } else {

@@ -601,27 +604,27 @@ UpdateFrontPageBannerStrings (
     }

 

     if (Record->Type == SMBIOS_TYPE_SYSTEM_INFORMATION) {

-      Type1Record = (SMBIOS_TABLE_TYPE1 *) Record;

-      StrIndex = Type1Record->ProductName;

-      GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type1Record + Type1Record->Hdr.Length), StrIndex, &NewString);

+      Type1Record = (SMBIOS_TABLE_TYPE1 *)Record;

+      StrIndex    = Type1Record->ProductName;

+      GetOptionalStringByIndex ((CHAR8 *)((UINT8 *)Type1Record + Type1Record->Hdr.Length), StrIndex, &NewString);

       UiCustomizeFrontPageBanner (1, TRUE, &NewString);

       HiiSetString (gFrontPagePrivate.HiiHandle, STRING_TOKEN (STR_FRONT_PAGE_COMPUTER_MODEL), NewString, NULL);

       FreePool (NewString);

     }

 

     if ((Record->Type == SMBIOS_TYPE_PROCESSOR_INFORMATION) && !FoundCpu) {

-      Type4Record = (SMBIOS_TABLE_TYPE4 *) Record;

+      Type4Record = (SMBIOS_TABLE_TYPE4 *)Record;

       //

       // The information in the record should be only valid when the CPU Socket is populated.

       //

       if ((Type4Record->Status & SMBIOS_TYPE4_CPU_SOCKET_POPULATED) == SMBIOS_TYPE4_CPU_SOCKET_POPULATED) {

         StrIndex = Type4Record->ProcessorVersion;

-        GetOptionalStringByIndex ((CHAR8*)((UINT8*)Type4Record + Type4Record->Hdr.Length), StrIndex, &NewString);

+        GetOptionalStringByIndex ((CHAR8 *)((UINT8 *)Type4Record + Type4Record->Hdr.Length), StrIndex, &NewString);

         UiCustomizeFrontPageBanner (2, TRUE, &NewString);

         HiiSetString (gFrontPagePrivate.HiiHandle, STRING_TOKEN (STR_FRONT_PAGE_CPU_MODEL), NewString, NULL);

         FreePool (NewString);

 

-        ConvertProcessorToString(Type4Record->CurrentSpeed, 6, &NewString);

+        ConvertProcessorToString (Type4Record->CurrentSpeed, 6, &NewString);

         UiCustomizeFrontPageBanner (2, FALSE, &NewString);

         HiiSetString (gFrontPagePrivate.HiiHandle, STRING_TOKEN (STR_FRONT_PAGE_CPU_SPEED), NewString, NULL);

         FreePool (NewString);

@@ -631,13 +634,19 @@ UpdateFrontPageBannerStrings (
     }

 

     if ( Record->Type == SMBIOS_TYPE_MEMORY_ARRAY_MAPPED_ADDRESS ) {

-      Type19Record = (SMBIOS_TABLE_TYPE19 *) Record;

+      Type19Record = (SMBIOS_TABLE_TYPE19 *)Record;

       if (Type19Record->StartingAddress != 0xFFFFFFFF ) {

-        InstalledMemory += RShiftU64(Type19Record->EndingAddress -

-                                     Type19Record->StartingAddress + 1, 10);

+        InstalledMemory += RShiftU64 (

+                             Type19Record->EndingAddress -

+                             Type19Record->StartingAddress + 1,

+                             10

+                             );

       } else {

-        InstalledMemory += RShiftU64(Type19Record->ExtendedEndingAddress -

-                                     Type19Record->ExtendedStartingAddress + 1, 20);

+        InstalledMemory += RShiftU64 (

+                             Type19Record->ExtendedEndingAddress -

+                             Type19Record->ExtendedStartingAddress + 1,

+                             20

+                             );

       }

     }

 

@@ -647,7 +656,7 @@ UpdateFrontPageBannerStrings (
   //

   // Now update the total installed RAM size

   //

-  ConvertMemorySizeToString ((UINT32)InstalledMemory, &NewString );

+  ConvertMemorySizeToString ((UINT32)InstalledMemory, &NewString);

   UiCustomizeFrontPageBanner (3, FALSE, &NewString);

   HiiSetString (gFrontPagePrivate.HiiHandle, STRING_TOKEN (STR_FRONT_PAGE_MEMORY_SIZE), NewString, NULL);

   FreePool (NewString);

@@ -695,7 +704,7 @@ UiSetConsoleMode (
   Status = gBS->HandleProtocol (

                   gST->ConsoleOutHandle,

                   &gEfiGraphicsOutputProtocolGuid,

-                  (VOID**)&GraphicsOutput

+                  (VOID **)&GraphicsOutput

                   );

   if (EFI_ERROR (Status)) {

     GraphicsOutput = NULL;

@@ -704,7 +713,7 @@ UiSetConsoleMode (
   Status = gBS->HandleProtocol (

                   gST->ConsoleOutHandle,

                   &gEfiSimpleTextOutProtocolGuid,

-                  (VOID**)&SimpleTextOut

+                  (VOID **)&SimpleTextOut

                   );

   if (EFI_ERROR (Status)) {

     SimpleTextOut = NULL;

@@ -733,7 +742,7 @@ UiSetConsoleMode (
   }

 

   if (GraphicsOutput != NULL) {

-    MaxGopMode  = GraphicsOutput->Mode->MaxMode;

+    MaxGopMode = GraphicsOutput->Mode->MaxMode;

   }

 

   if (SimpleTextOut != NULL) {

@@ -749,22 +758,24 @@ UiSetConsoleMode (
   //

   for (ModeNumber = 0; ModeNumber < MaxGopMode; ModeNumber++) {

     Status = GraphicsOutput->QueryMode (

-                       GraphicsOutput,

-                       ModeNumber,

-                       &SizeOfInfo,

-                       &Info

-                       );

+                               GraphicsOutput,

+                               ModeNumber,

+                               &SizeOfInfo,

+                               &Info

+                               );

     if (!EFI_ERROR (Status)) {

       if ((Info->HorizontalResolution == NewHorizontalResolution) &&

-          (Info->VerticalResolution == NewVerticalResolution)) {

+          (Info->VerticalResolution == NewVerticalResolution))

+      {

         if ((GraphicsOutput->Mode->Info->HorizontalResolution == NewHorizontalResolution) &&

-            (GraphicsOutput->Mode->Info->VerticalResolution == NewVerticalResolution)) {

+            (GraphicsOutput->Mode->Info->VerticalResolution == NewVerticalResolution))

+        {

           //

           // Current resolution is same with required resolution, check if text mode need be set

           //

           Status = SimpleTextOut->QueryMode (SimpleTextOut, SimpleTextOut->Mode->Mode, &CurrentColumn, &CurrentRow);

           ASSERT_EFI_ERROR (Status);

-          if (CurrentColumn == NewColumns && CurrentRow == NewRows) {

+          if ((CurrentColumn == NewColumns) && (CurrentRow == NewRows)) {

             //

             // If current text mode is same with required text mode. Do nothing

             //

@@ -776,7 +787,7 @@ UiSetConsoleMode (
             //

             for (Index = 0; Index < MaxTextMode; Index++) {

               Status = SimpleTextOut->QueryMode (SimpleTextOut, Index, &CurrentColumn, &CurrentRow);

-              if (!EFI_ERROR(Status)) {

+              if (!EFI_ERROR (Status)) {

                 if ((CurrentColumn == NewColumns) && (CurrentRow == NewRows)) {

                   //

                   // Required text mode is supported, set it.

@@ -795,6 +806,7 @@ UiSetConsoleMode (
                 }

               }

             }

+

             if (Index == MaxTextMode) {

               //

               // If required text mode is not supported, return error.

@@ -815,6 +827,7 @@ UiSetConsoleMode (
           }

         }

       }

+

       FreePool (Info);

     }

   }

@@ -845,19 +858,21 @@ UiSetConsoleMode (
   // Locate all the handles with GOP protocol and reconnect it.

   //

   Status = gBS->LocateHandleBuffer (

-                   ByProtocol,

-                   &gEfiSimpleTextOutProtocolGuid,

-                   NULL,

-                   &HandleCount,

-                   &HandleBuffer

-                   );

+                  ByProtocol,

+                  &gEfiSimpleTextOutProtocolGuid,

+                  NULL,

+                  &HandleCount,

+                  &HandleBuffer

+                  );

   if (!EFI_ERROR (Status)) {

     for (Index = 0; Index < HandleCount; Index++) {

       gBS->DisconnectController (HandleBuffer[Index], NULL, NULL);

     }

+

     for (Index = 0; Index < HandleCount; Index++) {

       gBS->ConnectController (HandleBuffer[Index], NULL, NULL, TRUE);

     }

+

     if (HandleBuffer != NULL) {

       FreePool (HandleBuffer);

     }

@@ -885,12 +900,12 @@ InitializeUserInterface (
   IN EFI_SYSTEM_TABLE  *SystemTable

   )

 {

-  EFI_HII_HANDLE                     HiiHandle;

-  EFI_STATUS                         Status;

-  EFI_GRAPHICS_OUTPUT_PROTOCOL       *GraphicsOutput;

-  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL    *SimpleTextOut;

-  UINTN                              BootTextColumn;

-  UINTN                              BootTextRow;

+  EFI_HII_HANDLE                   HiiHandle;

+  EFI_STATUS                       Status;

+  EFI_GRAPHICS_OUTPUT_PROTOCOL     *GraphicsOutput;

+  EFI_SIMPLE_TEXT_OUTPUT_PROTOCOL  *SimpleTextOut;

+  UINTN                            BootTextColumn;

+  UINTN                            BootTextRow;

 

   if (!mModeInitialized) {

     //

@@ -900,7 +915,7 @@ InitializeUserInterface (
     Status = gBS->HandleProtocol (

                     gST->ConsoleOutHandle,

                     &gEfiGraphicsOutputProtocolGuid,

-                    (VOID**)&GraphicsOutput

+                    (VOID **)&GraphicsOutput

                     );

     if (EFI_ERROR (Status)) {

       GraphicsOutput = NULL;

@@ -909,7 +924,7 @@ InitializeUserInterface (
     Status = gBS->HandleProtocol (

                     gST->ConsoleOutHandle,

                     &gEfiSimpleTextOutProtocolGuid,

-                    (VOID**)&SimpleTextOut

+                    (VOID **)&SimpleTextOut

                     );

     if (EFI_ERROR (Status)) {

       SimpleTextOut = NULL;

@@ -942,7 +957,7 @@ InitializeUserInterface (
     mSetupTextModeColumn       = PcdGet32 (PcdSetupConOutColumn);

     mSetupTextModeRow          = PcdGet32 (PcdSetupConOutRow);

 

-    mModeInitialized           = TRUE;

+    mModeInitialized = TRUE;

   }

 

   gBS->SetWatchdogTimer (0x0000, 0x0000, 0x0000, NULL);

@@ -976,11 +991,11 @@ InitializeUserInterface (
 VOID

 EFIAPI

 UiEntry (

-  IN BOOLEAN                      ConnectAllHappened

+  IN BOOLEAN  ConnectAllHappened

   )

 {

-  EFI_STATUS                    Status;

-  EFI_BOOT_LOGO_PROTOCOL        *BootLogo;

+  EFI_STATUS              Status;

+  EFI_BOOT_LOGO_PROTOCOL  *BootLogo;

 

   //

   // Enter Setup page.

@@ -1006,7 +1021,7 @@ UiEntry (
   //

   // Boot Logo is corrupted, report it using Boot Logo protocol.

   //

-  Status = gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID **) &BootLogo);

+  Status = gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID **)&BootLogo);

   if (!EFI_ERROR (Status) && (BootLogo != NULL)) {

     BootLogo->SetBootLogo (BootLogo, NULL, 0, 0, 0, 0);

   }

@@ -1023,7 +1038,7 @@ UiEntry (
   }

 

   //

-  //Will leave browser, check any reset required change is applied? if yes, reset system

+  // Will leave browser, check any reset required change is applied? if yes, reset system

   //

   SetupResetReminder ();

 }

@@ -1034,10 +1049,6 @@ UiEntry (
 //  user change any option setting which needs a reset to be effective, and  the reset will be applied according to  the user selection.

 //

 

-

-

-

-

 /**

   Record the info that  a reset is required.

   A  module boolean variable is used to record whether a reset is required.

@@ -1052,10 +1063,6 @@ EnableResetRequired (
   mResetRequired = TRUE;

 }

 

-

-

-

-

 /**

   Check if  user changed any option setting which needs a system reset to be effective.

 

@@ -1069,7 +1076,6 @@ IsResetRequired (
   return mResetRequired;

 }

 

-

 /**

   Check whether a reset is needed, and finish the reset reminder feature.

   If a reset is needed, Popup a menu to notice user, and finish the feature

@@ -1082,15 +1088,14 @@ SetupResetReminder (
   VOID

   )

 {

-  EFI_INPUT_KEY                 Key;

-  CHAR16                        *StringBuffer1;

-  CHAR16                        *StringBuffer2;

+  EFI_INPUT_KEY  Key;

+  CHAR16         *StringBuffer1;

+  CHAR16         *StringBuffer2;

 

   //

-  //check any reset required change is applied? if yes, reset system

+  // check any reset required change is applied? if yes, reset system

   //

   if (IsResetRequired ()) {

-

     StringBuffer1 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));

     ASSERT (StringBuffer1 != NULL);

     StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));

@@ -1110,4 +1115,3 @@ SetupResetReminder (
     gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);

   }

 }

-

diff --git a/MdeModulePkg/Application/UiApp/FrontPage.h b/MdeModulePkg/Application/UiApp/FrontPage.h
index 36207287b9..20c4f5f9a7 100644
--- a/MdeModulePkg/Application/UiApp/FrontPage.h
+++ b/MdeModulePkg/Application/UiApp/FrontPage.h
@@ -18,24 +18,23 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 //

 extern UINT8  FrontPageVfrBin[];

 

-extern EFI_FORM_BROWSER2_PROTOCOL      *gFormBrowser2;

+extern EFI_FORM_BROWSER2_PROTOCOL  *gFormBrowser2;

 

-

-#define SMBIOS_TYPE4_CPU_SOCKET_POPULATED BIT6

+#define SMBIOS_TYPE4_CPU_SOCKET_POPULATED  BIT6

 

 //

 // This is the VFR compiler generated header file which defines the

 // string identifiers.

 //

-#define PRINTABLE_LANGUAGE_NAME_STRING_ID     0x0001

+#define PRINTABLE_LANGUAGE_NAME_STRING_ID  0x0001

 

 //

 // These are defined as the same with vfr file

 //

-#define FRONT_PAGE_FORM_ID             0x1000

+#define FRONT_PAGE_FORM_ID  0x1000

 

-#define LABEL_FRANTPAGE_INFORMATION    0x1000

-#define LABEL_END                      0xffff

+#define LABEL_FRANTPAGE_INFORMATION  0x1000

+#define LABEL_END                    0xffff

 

 #define FRONT_PAGE_FORMSET_GUID \

   { \

@@ -45,22 +44,21 @@ extern EFI_FORM_BROWSER2_PROTOCOL      *gFormBrowser2;
 #define FRONT_PAGE_CALLBACK_DATA_SIGNATURE  SIGNATURE_32 ('F', 'P', 'C', 'B')

 

 typedef struct {

-  UINTN                           Signature;

+  UINTN                             Signature;

 

   //

   // HII relative handles

   //

-  EFI_HII_HANDLE                  HiiHandle;

-  EFI_HANDLE                      DriverHandle;

-  EFI_STRING_ID                   *LanguageToken;

+  EFI_HII_HANDLE                    HiiHandle;

+  EFI_HANDLE                        DriverHandle;

+  EFI_STRING_ID                     *LanguageToken;

 

   //

   // Produced protocols

   //

-  EFI_HII_CONFIG_ACCESS_PROTOCOL  ConfigAccess;

+  EFI_HII_CONFIG_ACCESS_PROTOCOL    ConfigAccess;

 } FRONT_PAGE_CALLBACK_DATA;

 

-

 #define EFI_FP_CALLBACK_DATA_FROM_THIS(a) \

   CR (a, \

       FRONT_PAGE_CALLBACK_DATA, \

@@ -93,10 +91,10 @@ typedef struct {
 EFI_STATUS

 EFIAPI

 FakeExtractConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Request,

-  OUT EFI_STRING                             *Progress,

-  OUT EFI_STRING                             *Results

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Request,

+  OUT EFI_STRING                            *Progress,

+  OUT EFI_STRING                            *Results

   );

 

 /**

@@ -118,9 +116,9 @@ FakeExtractConfig (
 EFI_STATUS

 EFIAPI

 FakeRouteConfig (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  CONST EFI_STRING                       Configuration,

-  OUT EFI_STRING                             *Progress

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  CONST EFI_STRING                      Configuration,

+  OUT EFI_STRING                            *Progress

   );

 

 /**

@@ -144,12 +142,12 @@ FakeRouteConfig (
 EFI_STATUS

 EFIAPI

 FrontPageCallback (

-  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL   *This,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest

+  IN  CONST EFI_HII_CONFIG_ACCESS_PROTOCOL  *This,

+  IN  EFI_BROWSER_ACTION                    Action,

+  IN  EFI_QUESTION_ID                       QuestionId,

+  IN  UINT8                                 Type,

+  IN  EFI_IFR_TYPE_VALUE                    *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST            *ActionRequest

   );

 

 /**

@@ -177,9 +175,9 @@ InitializeFrontPage (
 **/

 EFI_STATUS

 GetProducerString (

-  IN      EFI_GUID                  *ProducerGuid,

-  IN      EFI_STRING_ID             Token,

-  OUT     CHAR16                    **String

+  IN      EFI_GUID       *ProducerGuid,

+  IN      EFI_STRING_ID  Token,

+  OUT     CHAR16         **String

   );

 

 /**

@@ -192,7 +190,7 @@ GetProducerString (
 VOID

 EFIAPI

 UiEntry (

-  IN BOOLEAN                      ConnectAllHappened

+  IN BOOLEAN  ConnectAllHappened

   );

 

 /**

@@ -206,8 +204,7 @@ UiEntry (
 **/

 CHAR16 *

 ExtractDevicePathFromHiiHandle (

-  IN      EFI_HII_HANDLE      Handle

+  IN      EFI_HII_HANDLE  Handle

   );

 

 #endif // _FRONT_PAGE_H_

-

diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c
index e6d0be548c..f2458ec5a0 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c
+++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.c
@@ -37,7 +37,7 @@ UiCustomizeFrontPage (
   //

   // Create empty line.

   //

-  UiCreateEmptyLine(HiiHandle, StartOpCodeHandle);

+  UiCreateEmptyLine (HiiHandle, StartOpCodeHandle);

 

   //

   // Find third party drivers which need to be shown in the front page.

@@ -47,17 +47,17 @@ UiCustomizeFrontPage (
   //

   // Create empty line.

   //

-  UiCreateEmptyLine(HiiHandle, StartOpCodeHandle);

+  UiCreateEmptyLine (HiiHandle, StartOpCodeHandle);

 

   //

   // Create "Continue" menu.

   //

-  UiCreateContinueMenu(HiiHandle, StartOpCodeHandle);

+  UiCreateContinueMenu (HiiHandle, StartOpCodeHandle);

 

   //

   // Create reset menu.

   //

-  UiCreateResetMenu(HiiHandle, StartOpCodeHandle);

+  UiCreateResetMenu (HiiHandle, StartOpCodeHandle);

 }

 

 /**

@@ -80,15 +80,15 @@ UiCustomizeFrontPage (
 **/

 EFI_STATUS

 UiFrontPageCallbackHandler (

-  IN  EFI_HII_HANDLE                         HiiHandle,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest

+  IN  EFI_HII_HANDLE              HiiHandle,

+  IN  EFI_BROWSER_ACTION          Action,

+  IN  EFI_QUESTION_ID             QuestionId,

+  IN  UINT8                       Type,

+  IN  EFI_IFR_TYPE_VALUE          *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST  *ActionRequest

   )

 {

-  EFI_STATUS    Status;

+  EFI_STATUS  Status;

 

   if (UiSupportLibCallbackHandler (HiiHandle, Action, QuestionId, Type, Value, ActionRequest, &Status)) {

     return Status;

@@ -121,19 +121,21 @@ UiFrontPageCallbackHandler (
 **/

 VOID

 UiCustomizeFrontPageBanner (

-  IN     UINTN          LineIndex,

-  IN     BOOLEAN        LeftOrRight,

-  IN OUT EFI_STRING     *BannerStr

+  IN     UINTN       LineIndex,

+  IN     BOOLEAN     LeftOrRight,

+  IN OUT EFI_STRING  *BannerStr

   )

 {

   if ((LineIndex == 5) && LeftOrRight) {

     // Update STR_CUSTOMIZE_BANNER_LINE5_LEFT

-    if (PcdGetBool(PcdTestKeyUsed)) {

+    if (PcdGetBool (PcdTestKeyUsed)) {

       if (BannerStr != NULL) {

-        FreePool(*BannerStr);

+        FreePool (*BannerStr);

       }

-      *BannerStr = HiiGetString(gFrontPagePrivate.HiiHandle, STRING_TOKEN(STR_TEST_KEY_USED), NULL);

+

+      *BannerStr = HiiGetString (gFrontPagePrivate.HiiHandle, STRING_TOKEN (STR_TEST_KEY_USED), NULL);

     }

   }

+

   return;

 }

diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h
index 648f30338f..b53909e217 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h
+++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUi.h
@@ -33,9 +33,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/

 VOID

 UiCustomizeFrontPageBanner (

-  IN     UINTN          LineIndex,

-  IN     BOOLEAN        LeftOrRight,

-  IN OUT EFI_STRING     *BannerStr

+  IN     UINTN       LineIndex,

+  IN     BOOLEAN     LeftOrRight,

+  IN OUT EFI_STRING  *BannerStr

   );

 

 /**

@@ -71,12 +71,12 @@ UiCustomizeFrontPage (
 **/

 EFI_STATUS

 UiFrontPageCallbackHandler (

-  IN  EFI_HII_HANDLE                         HiiHandle,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest

+  IN  EFI_HII_HANDLE              HiiHandle,

+  IN  EFI_BROWSER_ACTION          Action,

+  IN  EFI_QUESTION_ID             QuestionId,

+  IN  UINT8                       Type,

+  IN  EFI_IFR_TYPE_VALUE          *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST  *ActionRequest

   );

 

 #endif

diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
index 858fdfc53d..8bc7883bb7 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
+++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.c
@@ -30,29 +30,28 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 // This is the VFR compiler generated header file which defines the

 // string identifiers.

 //

-#define PRINTABLE_LANGUAGE_NAME_STRING_ID     0x0001

+#define PRINTABLE_LANGUAGE_NAME_STRING_ID  0x0001

 

-#define UI_HII_DRIVER_LIST_SIZE               0x8

+#define UI_HII_DRIVER_LIST_SIZE  0x8

 

-#define FRONT_PAGE_KEY_CONTINUE               0x1000

-#define FRONT_PAGE_KEY_RESET                  0x1001

-#define FRONT_PAGE_KEY_LANGUAGE               0x1002

-#define FRONT_PAGE_KEY_DRIVER                 0x2000

+#define FRONT_PAGE_KEY_CONTINUE  0x1000

+#define FRONT_PAGE_KEY_RESET     0x1001

+#define FRONT_PAGE_KEY_LANGUAGE  0x1002

+#define FRONT_PAGE_KEY_DRIVER    0x2000

 

 typedef struct {

-  EFI_STRING_ID   PromptId;

-  EFI_STRING_ID   HelpId;

-  EFI_STRING_ID   DevicePathId;

-  EFI_GUID        FormSetGuid;

-  BOOLEAN         EmptyLineAfter;

+  EFI_STRING_ID    PromptId;

+  EFI_STRING_ID    HelpId;

+  EFI_STRING_ID    DevicePathId;

+  EFI_GUID         FormSetGuid;

+  BOOLEAN          EmptyLineAfter;

 } UI_HII_DRIVER_INSTANCE;

 

-CHAR8                        *gLanguageString;

-EFI_STRING_ID                *gLanguageToken;

-UI_HII_DRIVER_INSTANCE       *gHiiDriverList;

-extern EFI_HII_HANDLE        gStringPackHandle;

-UINT8                        gCurrentLanguageIndex;

-

+CHAR8                   *gLanguageString;

+EFI_STRING_ID           *gLanguageToken;

+UI_HII_DRIVER_INSTANCE  *gHiiDriverList;

+extern EFI_HII_HANDLE   gStringPackHandle;

+UINT8                   gCurrentLanguageIndex;

 

 /**

   Get next language from language code list (with separator ';').

@@ -68,8 +67,8 @@ UINT8                        gCurrentLanguageIndex;
 **/

 VOID

 GetNextLanguage (

-  IN OUT CHAR8      **LangCode,

-  OUT CHAR8         *Lang

+  IN OUT CHAR8  **LangCode,

+  OUT CHAR8     *Lang

   )

 {

   UINTN  Index;

@@ -79,7 +78,7 @@ GetNextLanguage (
   ASSERT (*LangCode != NULL);

   ASSERT (Lang != NULL);

 

-  Index = 0;

+  Index     = 0;

   StringPtr = *LangCode;

   while (StringPtr[Index] != 0 && StringPtr[Index] != ';') {

     Index++;

@@ -91,6 +90,7 @@ GetNextLanguage (
   if (StringPtr[Index] == ';') {

     Index++;

   }

+

   *LangCode = StringPtr + Index;

 }

 

@@ -106,13 +106,13 @@ GetNextLanguage (
 **/

 EFI_STATUS

 LanguageChangeHandler (

-  IN  EFI_IFR_TYPE_VALUE                     *Value

+  IN  EFI_IFR_TYPE_VALUE  *Value

   )

 {

-  CHAR8                         *LangCode;

-  CHAR8                         *Lang;

-  UINTN                         Index;

-  EFI_STATUS                    Status;

+  CHAR8       *LangCode;

+  CHAR8       *Lang;

+  UINTN       Index;

+  EFI_STATUS  Status;

 

   //

   // Allocate working buffer for RFC 4646 language in supported LanguageString.

@@ -120,7 +120,7 @@ LanguageChangeHandler (
   Lang = AllocatePool (AsciiStrSize (gLanguageString));

   ASSERT (Lang != NULL);

 

-  Index = 0;

+  Index    = 0;

   LangCode = gLanguageString;

   while (*LangCode != 0) {

     GetNextLanguage (&LangCode, Lang);

@@ -148,6 +148,7 @@ LanguageChangeHandler (
   } else {

     ASSERT (FALSE);

   }

+

   FreePool (Lang);

 

   return EFI_SUCCESS;

@@ -172,28 +173,30 @@ LanguageChangeHandler (
 **/

 BOOLEAN

 UiSupportLibCallbackHandler (

-  IN  EFI_HII_HANDLE                         HiiHandle,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest,

-  OUT EFI_STATUS                             *Status

+  IN  EFI_HII_HANDLE              HiiHandle,

+  IN  EFI_BROWSER_ACTION          Action,

+  IN  EFI_QUESTION_ID             QuestionId,

+  IN  UINT8                       Type,

+  IN  EFI_IFR_TYPE_VALUE          *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST  *ActionRequest,

+  OUT EFI_STATUS                  *Status

   )

 {

-  if (QuestionId != FRONT_PAGE_KEY_CONTINUE &&

-      QuestionId != FRONT_PAGE_KEY_RESET &&

-      QuestionId != FRONT_PAGE_KEY_LANGUAGE) {

+  if ((QuestionId != FRONT_PAGE_KEY_CONTINUE) &&

+      (QuestionId != FRONT_PAGE_KEY_RESET) &&

+      (QuestionId != FRONT_PAGE_KEY_LANGUAGE))

+  {

     return FALSE;

   }

 

   if (Action == EFI_BROWSER_ACTION_RETRIEVE) {

     if (QuestionId == FRONT_PAGE_KEY_LANGUAGE) {

       Value->u8 = gCurrentLanguageIndex;

-      *Status = EFI_SUCCESS;

+      *Status   = EFI_SUCCESS;

     } else {

       *Status = EFI_UNSUPPORTED;

     }

+

     return TRUE;

   }

 

@@ -213,26 +216,26 @@ UiSupportLibCallbackHandler (
 

     *Status = EFI_SUCCESS;

     switch (QuestionId) {

-    case FRONT_PAGE_KEY_CONTINUE:

-      //

-      // This is the continue - clear the screen and return an error to get out of FrontPage loop

-      //

-      *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;

-      break;

-

-    case FRONT_PAGE_KEY_LANGUAGE:

-      *Status = LanguageChangeHandler(Value);

-      break;

-

-    case FRONT_PAGE_KEY_RESET:

-      //

-      // Reset

-      //

-      gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);

-      *Status = EFI_UNSUPPORTED;

-

-    default:

-      break;

+      case FRONT_PAGE_KEY_CONTINUE:

+        //

+        // This is the continue - clear the screen and return an error to get out of FrontPage loop

+        //

+        *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;

+        break;

+

+      case FRONT_PAGE_KEY_LANGUAGE:

+        *Status = LanguageChangeHandler (Value);

+        break;

+

+      case FRONT_PAGE_KEY_RESET:

+        //

+        // Reset

+        //

+        gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);

+        *Status = EFI_UNSUPPORTED;

+

+      default:

+        break;

     }

   }

 

@@ -248,20 +251,20 @@ UiSupportLibCallbackHandler (
 **/

 VOID

 UiCreateLanguageMenu (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   )

 {

-  CHAR8                       *LangCode;

-  CHAR8                       *Lang;

-  UINTN                       LangSize;

-  CHAR8                       *CurrentLang;

-  UINTN                       OptionCount;

-  CHAR16                      *StringBuffer;

-  VOID                        *OptionsOpCodeHandle;

-  UINTN                       StringSize;

-  EFI_STATUS                  Status;

-  EFI_HII_STRING_PROTOCOL     *HiiString;

+  CHAR8                    *LangCode;

+  CHAR8                    *Lang;

+  UINTN                    LangSize;

+  CHAR8                    *CurrentLang;

+  UINTN                    OptionCount;

+  CHAR16                   *StringBuffer;

+  VOID                     *OptionsOpCodeHandle;

+  UINTN                    StringSize;

+  EFI_STATUS               Status;

+  EFI_HII_STRING_PROTOCOL  *HiiString;

 

   Lang         = NULL;

   StringBuffer = NULL;

@@ -272,17 +275,17 @@ UiCreateLanguageMenu (
   OptionsOpCodeHandle = HiiAllocateOpCodeHandle ();

   ASSERT (OptionsOpCodeHandle != NULL);

 

-  GetEfiGlobalVariable2 (L"PlatformLang", (VOID**)&CurrentLang, NULL);

+  GetEfiGlobalVariable2 (L"PlatformLang", (VOID **)&CurrentLang, NULL);

 

   //

   // Get Support language list from variable.

   //

-  GetEfiGlobalVariable2 (L"PlatformLangCodes", (VOID**)&gLanguageString, NULL);

+  GetEfiGlobalVariable2 (L"PlatformLangCodes", (VOID **)&gLanguageString, NULL);

   if (gLanguageString == NULL) {

     gLanguageString = AllocateCopyPool (

-                               AsciiStrSize ((CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)),

-                               (CHAR8 *) PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)

-                               );

+                        AsciiStrSize ((CHAR8 *)PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)),

+                        (CHAR8 *)PcdGetPtr (PcdUefiVariableDefaultPlatformLangCodes)

+                        );

     ASSERT (gLanguageString != NULL);

   }

 

@@ -291,13 +294,13 @@ UiCreateLanguageMenu (
     // Count the language list number.

     //

     LangCode = gLanguageString;

-    Lang = AllocatePool (AsciiStrSize (gLanguageString));

+    Lang     = AllocatePool (AsciiStrSize (gLanguageString));

     ASSERT (Lang != NULL);

 

     OptionCount = 0;

     while (*LangCode != 0) {

       GetNextLanguage (&LangCode, Lang);

-      OptionCount ++;

+      OptionCount++;

     }

 

     //

@@ -306,16 +309,16 @@ UiCreateLanguageMenu (
     gLanguageToken = AllocateZeroPool ((OptionCount + 1) * sizeof (EFI_STRING_ID));

     ASSERT (gLanguageToken != NULL);

 

-    Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &HiiString);

+    Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **)&HiiString);

     ASSERT_EFI_ERROR (Status);

 

-    LangCode     = gLanguageString;

-    OptionCount  = 0;

+    LangCode    = gLanguageString;

+    OptionCount = 0;

     while (*LangCode != 0) {

       GetNextLanguage (&LangCode, Lang);

 

       StringSize = 0;

-      Status = HiiString->GetString (HiiString, Lang, HiiHandle, PRINTABLE_LANGUAGE_NAME_STRING_ID, StringBuffer, &StringSize, NULL);

+      Status     = HiiString->GetString (HiiString, Lang, HiiHandle, PRINTABLE_LANGUAGE_NAME_STRING_ID, StringBuffer, &StringSize, NULL);

       if (Status == EFI_BUFFER_TOO_SMALL) {

         StringBuffer = AllocateZeroPool (StringSize);

         ASSERT (StringBuffer != NULL);

@@ -324,7 +327,7 @@ UiCreateLanguageMenu (
       }

 

       if (EFI_ERROR (Status)) {

-        LangSize = AsciiStrSize (Lang);

+        LangSize     = AsciiStrSize (Lang);

         StringBuffer = AllocatePool (LangSize * sizeof (CHAR16));

         ASSERT (StringBuffer != NULL);

         AsciiStrToUnicodeStrS (Lang, StringBuffer, LangSize);

@@ -339,31 +342,32 @@ UiCreateLanguageMenu (
   }

 

   ASSERT (gLanguageToken != NULL);

-  LangCode = gLanguageString;

+  LangCode    = gLanguageString;

   OptionCount = 0;

   if (Lang == NULL) {

     Lang = AllocatePool (AsciiStrSize (gLanguageString));

     ASSERT (Lang != NULL);

   }

+

   while (*LangCode != 0) {

     GetNextLanguage (&LangCode, Lang);

 

-    if (CurrentLang != NULL && AsciiStrCmp (Lang, CurrentLang) == 0) {

+    if ((CurrentLang != NULL) && (AsciiStrCmp (Lang, CurrentLang) == 0)) {

       HiiCreateOneOfOptionOpCode (

         OptionsOpCodeHandle,

         gLanguageToken[OptionCount],

         EFI_IFR_OPTION_DEFAULT,

         EFI_IFR_NUMERIC_SIZE_1,

-        (UINT8) OptionCount

+        (UINT8)OptionCount

         );

-      gCurrentLanguageIndex = (UINT8) OptionCount;

+      gCurrentLanguageIndex = (UINT8)OptionCount;

     } else {

       HiiCreateOneOfOptionOpCode (

         OptionsOpCodeHandle,

         gLanguageToken[OptionCount],

         0,

         EFI_IFR_NUMERIC_SIZE_1,

-        (UINT8) OptionCount

+        (UINT8)OptionCount

         );

     }

 

@@ -373,6 +377,7 @@ UiCreateLanguageMenu (
   if (CurrentLang != NULL) {

     FreePool (CurrentLang);

   }

+

   FreePool (Lang);

 

   HiiCreateOneOfOpCode (

@@ -398,8 +403,8 @@ UiCreateLanguageMenu (
 **/

 VOID

 UiCreateContinueMenu (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   )

 {

   HiiCreateActionOpCode (

@@ -421,8 +426,8 @@ UiCreateContinueMenu (
 **/

 VOID

 UiCreateEmptyLine (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   )

 {

   HiiCreateSubTitleOpCode (StartOpCodeHandle, STRING_TOKEN (STR_NULL_STRING), 0, 0, 0);

@@ -437,8 +442,8 @@ UiCreateEmptyLine (
 **/

 VOID

 UiCreateResetMenu (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   )

 {

   HiiCreateActionOpCode (

@@ -462,11 +467,11 @@ UiCreateResetMenu (
 **/

 CHAR16 *

 ExtractDevicePathFromHiiHandle (

-  IN      EFI_HII_HANDLE      Handle

+  IN      EFI_HII_HANDLE  Handle

   )

 {

-  EFI_STATUS                       Status;

-  EFI_HANDLE                       DriverHandle;

+  EFI_STATUS  Status;

+  EFI_HANDLE  DriverHandle;

 

   ASSERT (Handle != NULL);

 

@@ -479,7 +484,7 @@ ExtractDevicePathFromHiiHandle (
     return NULL;

   }

 

-  return ConvertDevicePathToText(DevicePathFromHandle (DriverHandle), FALSE, FALSE);

+  return ConvertDevicePathToText (DevicePathFromHandle (DriverHandle), FALSE, FALSE);

 }

 

 /**

@@ -496,49 +501,49 @@ ExtractDevicePathFromHiiHandle (
 **/

 BOOLEAN

 RequiredDriver (

-  IN  EFI_HII_HANDLE              HiiHandle,

-  IN  EFI_GUID                    *Guid,

-  OUT EFI_STRING_ID               *PromptId,

-  OUT EFI_STRING_ID               *HelpId,

-  OUT VOID                        *FormsetGuid

+  IN  EFI_HII_HANDLE  HiiHandle,

+  IN  EFI_GUID        *Guid,

+  OUT EFI_STRING_ID   *PromptId,

+  OUT EFI_STRING_ID   *HelpId,

+  OUT VOID            *FormsetGuid

   )

 {

-  EFI_STATUS                  Status;

-  UINT8                       ClassGuidNum;

-  EFI_GUID                    *ClassGuid;

-  EFI_IFR_FORM_SET            *Buffer;

-  UINTN                       BufferSize;

-  UINT8                       *Ptr;

-  UINTN                       TempSize;

-  BOOLEAN                     RetVal;

-

-  Status = HiiGetFormSetFromHiiHandle(HiiHandle, &Buffer,&BufferSize);

+  EFI_STATUS        Status;

+  UINT8             ClassGuidNum;

+  EFI_GUID          *ClassGuid;

+  EFI_IFR_FORM_SET  *Buffer;

+  UINTN             BufferSize;

+  UINT8             *Ptr;

+  UINTN             TempSize;

+  BOOLEAN           RetVal;

+

+  Status = HiiGetFormSetFromHiiHandle (HiiHandle, &Buffer, &BufferSize);

   if (EFI_ERROR (Status)) {

     return FALSE;

   }

 

-  RetVal = FALSE;

+  RetVal   = FALSE;

   TempSize = 0;

-  Ptr = (UINT8 *) Buffer;

-  while(TempSize < BufferSize)  {

-    TempSize += ((EFI_IFR_OP_HEADER *) Ptr)->Length;

+  Ptr      = (UINT8 *)Buffer;

+  while (TempSize < BufferSize) {

+    TempSize += ((EFI_IFR_OP_HEADER *)Ptr)->Length;

 

-    if (((EFI_IFR_OP_HEADER *) Ptr)->Length <= OFFSET_OF (EFI_IFR_FORM_SET, Flags)){

-      Ptr += ((EFI_IFR_OP_HEADER *) Ptr)->Length;

+    if (((EFI_IFR_OP_HEADER *)Ptr)->Length <= OFFSET_OF (EFI_IFR_FORM_SET, Flags)) {

+      Ptr += ((EFI_IFR_OP_HEADER *)Ptr)->Length;

       continue;

     }

 

-    ClassGuidNum = (UINT8) (((EFI_IFR_FORM_SET *)Ptr)->Flags & 0x3);

-    ClassGuid = (EFI_GUID *) (VOID *)(Ptr + sizeof (EFI_IFR_FORM_SET));

+    ClassGuidNum = (UINT8)(((EFI_IFR_FORM_SET *)Ptr)->Flags & 0x3);

+    ClassGuid    = (EFI_GUID *)(VOID *)(Ptr + sizeof (EFI_IFR_FORM_SET));

     while (ClassGuidNum-- > 0) {

-      if (!CompareGuid (Guid, ClassGuid)){

-        ClassGuid ++;

+      if (!CompareGuid (Guid, ClassGuid)) {

+        ClassGuid++;

         continue;

       }

 

       *PromptId = ((EFI_IFR_FORM_SET *)Ptr)->FormSetTitle;

-      *HelpId = ((EFI_IFR_FORM_SET *)Ptr)->Help;

-      CopyMem (FormsetGuid, &((EFI_IFR_FORM_SET *) Ptr)->Guid, sizeof (EFI_GUID));

+      *HelpId   = ((EFI_IFR_FORM_SET *)Ptr)->Help;

+      CopyMem (FormsetGuid, &((EFI_IFR_FORM_SET *)Ptr)->Guid, sizeof (EFI_GUID));

       RetVal = TRUE;

     }

   }

@@ -562,23 +567,23 @@ RequiredDriver (
 **/

 EFI_STATUS

 UiListThirdPartyDrivers (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN EFI_GUID                    *ClassGuid,

-  IN DRIVER_SPECIAL_HANDLER      SpecialHandlerFn,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE          HiiHandle,

+  IN EFI_GUID                *ClassGuid,

+  IN DRIVER_SPECIAL_HANDLER  SpecialHandlerFn,

+  IN VOID                    *StartOpCodeHandle

   )

 {

-  UINTN                       Index;

-  EFI_STRING                  String;

-  EFI_STRING_ID               Token;

-  EFI_STRING_ID               TokenHelp;

-  EFI_HII_HANDLE              *HiiHandles;

-  CHAR16                      *DevicePathStr;

-  UINTN                       Count;

-  UINTN                       CurrentSize;

-  UI_HII_DRIVER_INSTANCE      *DriverListPtr;

-  EFI_STRING                  NewName;

-  BOOLEAN                     EmptyLineAfter;

+  UINTN                   Index;

+  EFI_STRING              String;

+  EFI_STRING_ID           Token;

+  EFI_STRING_ID           TokenHelp;

+  EFI_HII_HANDLE          *HiiHandles;

+  CHAR16                  *DevicePathStr;

+  UINTN                   Count;

+  UINTN                   CurrentSize;

+  UI_HII_DRIVER_INSTANCE  *DriverListPtr;

+  EFI_STRING              NewName;

+  BOOLEAN                 EmptyLineAfter;

 

   if (gHiiDriverList != NULL) {

     FreePool (gHiiDriverList);

@@ -590,7 +595,7 @@ UiListThirdPartyDrivers (
   gHiiDriverList = AllocateZeroPool (UI_HII_DRIVER_LIST_SIZE * sizeof (UI_HII_DRIVER_INSTANCE));

   ASSERT (gHiiDriverList != NULL);

   DriverListPtr = gHiiDriverList;

-  CurrentSize = UI_HII_DRIVER_LIST_SIZE;

+  CurrentSize   = UI_HII_DRIVER_LIST_SIZE;

 

   for (Index = 0, Count = 0; HiiHandles[Index] != NULL; Index++) {

     if (!RequiredDriver (HiiHandles[Index], ClassGuid, &Token, &TokenHelp, &gHiiDriverList[Count].FormSetGuid)) {

@@ -608,10 +613,11 @@ UiListThirdPartyDrivers (
       EmptyLineAfter = FALSE;

       if (SpecialHandlerFn (String, &NewName, &EmptyLineAfter)) {

         FreePool (String);

-        String = NewName;

+        String                              = NewName;

         DriverListPtr[Count].EmptyLineAfter = EmptyLineAfter;

       }

     }

+

     DriverListPtr[Count].PromptId = HiiSetString (HiiHandle, 0, String, NULL);

     FreePool (String);

 

@@ -620,11 +626,12 @@ UiListThirdPartyDrivers (
       String = HiiGetString (gStringPackHandle, STRING_TOKEN (STR_MISSING_STRING), NULL);

       ASSERT (String != NULL);

     }

+

     DriverListPtr[Count].HelpId = HiiSetString (HiiHandle, 0, String, NULL);

     FreePool (String);

 

-    DevicePathStr = ExtractDevicePathFromHiiHandle(HiiHandles[Index]);

-    if (DevicePathStr != NULL){

+    DevicePathStr = ExtractDevicePathFromHiiHandle (HiiHandles[Index]);

+    if (DevicePathStr != NULL) {

       DriverListPtr[Count].DevicePathId = HiiSetString (HiiHandle, 0, DevicePathStr, NULL);

       FreePool (DevicePathStr);

     } else {

@@ -636,12 +643,12 @@ UiListThirdPartyDrivers (
       DriverListPtr = ReallocatePool (

                         CurrentSize * sizeof (UI_HII_DRIVER_INSTANCE),

                         (Count + UI_HII_DRIVER_LIST_SIZE)

-                          * sizeof (UI_HII_DRIVER_INSTANCE),

+                        * sizeof (UI_HII_DRIVER_INSTANCE),

                         gHiiDriverList

                         );

       ASSERT (DriverListPtr != NULL);

       gHiiDriverList = DriverListPtr;

-      CurrentSize += UI_HII_DRIVER_LIST_SIZE;

+      CurrentSize   += UI_HII_DRIVER_LIST_SIZE;

     }

   }

 

@@ -655,17 +662,17 @@ UiListThirdPartyDrivers (
       gHiiDriverList[Index].PromptId,

       gHiiDriverList[Index].HelpId,

       0,

-      (EFI_QUESTION_ID) (Index + FRONT_PAGE_KEY_DRIVER),

+      (EFI_QUESTION_ID)(Index + FRONT_PAGE_KEY_DRIVER),

       0,

       &gHiiDriverList[Index].FormSetGuid,

       gHiiDriverList[Index].DevicePathId

-    );

+      );

 

     if (gHiiDriverList[Index].EmptyLineAfter) {

       UiCreateEmptyLine (HiiHandle, StartOpCodeHandle);

     }

 

-    Index ++;

+    Index++;

   }

 

   return EFI_SUCCESS;

diff --git a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h
index 7be45849f9..c4fddebc27 100644
--- a/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h
+++ b/MdeModulePkg/Application/UiApp/FrontPageCustomizedUiSupport.h
@@ -18,8 +18,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 **/

 VOID

 UiCreateContinueMenu (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   );

 

 /**

@@ -31,8 +31,8 @@ UiCreateContinueMenu (
 **/

 VOID

 UiCreateEmptyLine (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   );

 

 /**

@@ -44,8 +44,8 @@ UiCreateEmptyLine (
 **/

 VOID

 UiCreateLanguageMenu (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   );

 

 /**

@@ -57,8 +57,8 @@ UiCreateLanguageMenu (
 **/

 VOID

 UiCreateResetMenu (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE  HiiHandle,

+  IN VOID            *StartOpCodeHandle

   );

 

 /**

@@ -77,7 +77,7 @@ BOOLEAN
   IN  CHAR16                   *DriverName,

   OUT CHAR16                   **NewName,

   OUT BOOLEAN                  *EmptyLineAfter

-);

+  );

 

 /**

   Search the drivers in the system which need to show in the front page

@@ -93,10 +93,10 @@ BOOLEAN
 **/

 EFI_STATUS

 UiListThirdPartyDrivers (

-  IN EFI_HII_HANDLE              HiiHandle,

-  IN EFI_GUID                    *ClassGuid,

-  IN DRIVER_SPECIAL_HANDLER      SpecialHandlerFn,

-  IN VOID                        *StartOpCodeHandle

+  IN EFI_HII_HANDLE          HiiHandle,

+  IN EFI_GUID                *ClassGuid,

+  IN DRIVER_SPECIAL_HANDLER  SpecialHandlerFn,

+  IN VOID                    *StartOpCodeHandle

   );

 

 /**

@@ -118,13 +118,13 @@ UiListThirdPartyDrivers (
 **/

 BOOLEAN

 UiSupportLibCallbackHandler (

-  IN  EFI_HII_HANDLE                         HiiHandle,

-  IN  EFI_BROWSER_ACTION                     Action,

-  IN  EFI_QUESTION_ID                        QuestionId,

-  IN  UINT8                                  Type,

-  IN  EFI_IFR_TYPE_VALUE                     *Value,

-  OUT EFI_BROWSER_ACTION_REQUEST             *ActionRequest,

-  OUT EFI_STATUS                             *Status

+  IN  EFI_HII_HANDLE              HiiHandle,

+  IN  EFI_BROWSER_ACTION          Action,

+  IN  EFI_QUESTION_ID             QuestionId,

+  IN  UINT8                       Type,

+  IN  EFI_IFR_TYPE_VALUE          *Value,

+  OUT EFI_BROWSER_ACTION_REQUEST  *ActionRequest,

+  OUT EFI_STATUS                  *Status

   );

 

 #endif

diff --git a/MdeModulePkg/Application/UiApp/String.c b/MdeModulePkg/Application/UiApp/String.c
index a4d0c32108..f6548fcd32 100644
--- a/MdeModulePkg/Application/UiApp/String.c
+++ b/MdeModulePkg/Application/UiApp/String.c
@@ -9,36 +9,36 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include "Ui.h"

 #include "FrontPage.h"

 

-EFI_HII_HANDLE gStringPackHandle;

+EFI_HII_HANDLE  gStringPackHandle;

 

-EFI_GUID mUiStringPackGuid = {

+EFI_GUID  mUiStringPackGuid = {

   0x136a3048, 0x752a, 0x4bf6, { 0xa7, 0x57, 0x9, 0x36, 0x11, 0x95, 0x38, 0xed }

 };

 

 EFI_GUID  mFontPackageGuid = {

-  0x78941450, 0x90ab, 0x4fb1, {0xb7, 0x5f, 0x58, 0x92, 0x14, 0xe2, 0x4a, 0xc}

+  0x78941450, 0x90ab, 0x4fb1, { 0xb7, 0x5f, 0x58, 0x92, 0x14, 0xe2, 0x4a, 0xc }

 };

 

-#define NARROW_GLYPH_NUMBER 8

-#define WIDE_GLYPH_NUMBER   75

+#define NARROW_GLYPH_NUMBER  8

+#define WIDE_GLYPH_NUMBER    75

 

 typedef struct {

   ///

   /// This 4-bytes total array length is required by HiiAddPackages()

   ///

-  UINT32                 Length;

+  UINT32                    Length;

 

   //

   // This is the Font package definition

   //

-  EFI_HII_PACKAGE_HEADER Header;

-  UINT16                 NumberOfNarrowGlyphs;

-  UINT16                 NumberOfWideGlyphs;

-  EFI_NARROW_GLYPH       NarrowArray[NARROW_GLYPH_NUMBER];

-  EFI_WIDE_GLYPH         WideArray[WIDE_GLYPH_NUMBER];

+  EFI_HII_PACKAGE_HEADER    Header;

+  UINT16                    NumberOfNarrowGlyphs;

+  UINT16                    NumberOfWideGlyphs;

+  EFI_NARROW_GLYPH          NarrowArray[NARROW_GLYPH_NUMBER];

+  EFI_WIDE_GLYPH            WideArray[WIDE_GLYPH_NUMBER];

 } FONT_PACK_BIN;

 

-FONT_PACK_BIN mFontBin = {

+FONT_PACK_BIN  mFontBin = {

   sizeof (FONT_PACK_BIN),

   {

     sizeof (FONT_PACK_BIN) - sizeof (UINT32),

@@ -260,11 +260,11 @@ InitializeStringSupport (
   )

 {

   gStringPackHandle = HiiAddPackages (

-                         &mUiStringPackGuid,

-                         gImageHandle,

-                         UiAppStrings,

-                         NULL

-                         );

+                        &mUiStringPackGuid,

+                        gImageHandle,

+                        UiAppStrings,

+                        NULL

+                        );

   ASSERT (gStringPackHandle != NULL);

 }

 

@@ -292,7 +292,7 @@ UninitializeStringSupport (
 **/

 CHAR16 *

 GetStringById (

-  IN  EFI_STRING_ID   Id

+  IN  EFI_STRING_ID  Id

   )

 {

   return HiiGetString (gStringPackHandle, Id, NULL);

diff --git a/MdeModulePkg/Application/UiApp/String.h b/MdeModulePkg/Application/UiApp/String.h
index 3dc4c3316b..2ecdb6e790 100644
--- a/MdeModulePkg/Application/UiApp/String.h
+++ b/MdeModulePkg/Application/UiApp/String.h
@@ -9,7 +9,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #ifndef _STRING_H_

 #define _STRING_H_

 

-extern EFI_HII_HANDLE gStringPackHandle;

+extern EFI_HII_HANDLE  gStringPackHandle;

 

 //

 // This is the VFR compiler generated header file which defines the

@@ -38,7 +38,7 @@ extern UINT8  BdsDxeStrings[];
 **/

 CHAR16 *

 GetStringById (

-  IN  EFI_STRING_ID   Id

+  IN  EFI_STRING_ID  Id

   );

 

 /**

diff --git a/MdeModulePkg/Application/UiApp/Ui.h b/MdeModulePkg/Application/UiApp/Ui.h
index 56e54033b8..b2947a6312 100644
--- a/MdeModulePkg/Application/UiApp/Ui.h
+++ b/MdeModulePkg/Application/UiApp/Ui.h
@@ -6,7 +6,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 

 **/

 

-

 #ifndef _BDS_MODULE_H_

 #define _BDS_MODULE_H_

 

@@ -37,18 +36,16 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 /// HII specific Vendor Device Path definition.

 ///

 typedef struct {

-  VENDOR_DEVICE_PATH             VendorDevicePath;

-  EFI_DEVICE_PATH_PROTOCOL       End;

+  VENDOR_DEVICE_PATH          VendorDevicePath;

+  EFI_DEVICE_PATH_PROTOCOL    End;

 } HII_VENDOR_DEVICE_PATH;

 

 #pragma pack()

 

-

 //

-//The interface functions related to the Setup Browser Reset Reminder feature

+// The interface functions related to the Setup Browser Reset Reminder feature

 //

 

-

 /**

   Record the info that a reset is required.

   A module boolean variable is used to record whether a reset is required.

@@ -60,8 +57,6 @@ EnableResetRequired (
   VOID

   );

 

-

-

 /**

   Check whether platform policy enables the reset reminder feature. The default is enabled.