Retire Extended HII library class.

[mirror_edk2.git] / MdeModulePkg / Universal / SetupBrowserDxe / Setup.c

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 29b606fdeff06b5112641ea3068ebd5a643d0b39..7e948b305892ba1b4a4a5f22356646378d388550 100644 (file)
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -22,14 +22,6 @@ SETUP_DRIVER_PRIVATE_DATA  mPrivateData = {
   {\r
     SendForm,\r
     BrowserCallback\r
-  },\r
-  {\r
-    UnicodeVSPrint,\r
-    UnicodeVSPrintAsciiFormat,\r
-    UnicodeValueToString,                         \r
-    AsciiVSPrint,          \r
-    AsciiVSPrintUnicodeFormat,\r
-    AsciiValueToString\r
   }\r
 };\r
 \r
@@ -58,6 +50,7 @@ CHAR16            *gFunctionNineString;
 CHAR16            *gFunctionTenString;\r
 CHAR16            *gEnterString;\r
 CHAR16            *gEnterCommitString;\r
+CHAR16            *gEnterEscapeString;\r
 CHAR16            *gEscapeString;\r
 CHAR16            *gSaveFailed;\r
 CHAR16            *gMoveHighlight;\r
@@ -81,6 +74,7 @@ CHAR16            *gPlusString;
 CHAR16            *gMinusString;\r
 CHAR16            *gAdjustNumber;\r
 CHAR16            *gSaveChanges;\r
+CHAR16            *gOptionMismatch;\r
 \r
 CHAR16            gPromptBlockWidth;\r
 CHAR16            gOptionBlockWidth;\r
@@ -215,10 +209,10 @@ SendForm (
   OUT EFI_BROWSER_ACTION_REQUEST       *ActionRequest  OPTIONAL\r
   )\r
 {\r
-  EFI_STATUS            Status;\r
-  UI_MENU_SELECTION     *Selection;\r
-  UINTN                 Index;\r
-  FORM_BROWSER_FORMSET  *FormSet;\r
+  EFI_STATUS                    Status;\r
+  UI_MENU_SELECTION             *Selection;\r
+  UINTN                         Index;\r
+  FORM_BROWSER_FORMSET          *FormSet;\r
 \r
   Status = EFI_SUCCESS;\r
   ZeroMem (&gScreenDimensions, sizeof (EFI_SCREEN_DESCRIPTOR));\r
@@ -280,7 +274,6 @@ SendForm (
   // Ensure we are in Text mode\r
   //\r
   gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));\r
-  DisableQuietBoot ();\r
 \r
   for (Index = 0; Index < HandleCount; Index++) {\r
     Selection = AllocateZeroPool (sizeof (UI_MENU_SELECTION));\r
@@ -331,7 +324,7 @@ SendForm (
 \r
     } while (Selection->Action == UI_ACTION_REFRESH_FORMSET);\r
 \r
-    gBS->FreePool (Selection);\r
+    FreePool (Selection);\r
   }\r
 \r
   if (ActionRequest != NULL) {\r
@@ -480,14 +473,14 @@ BrowserCallback (
     if (*ResultsDataSize < BufferSize) {\r
       *ResultsDataSize = BufferSize;\r
 \r
-      gBS->FreePool (ConfigResp);\r
+      FreePool (ConfigResp);\r
       return EFI_BUFFER_TOO_SMALL;\r
     }\r
 \r
     *ResultsDataSize = BufferSize;\r
     CopyMem (ResultsData, StrPtr, BufferSize);\r
 \r
-    gBS->FreePool (ConfigResp);\r
+    FreePool (ConfigResp);\r
   } else {\r
     //\r
     // Prepare <ConfigResp>\r
@@ -532,7 +525,6 @@ InitializeSetup (
   )\r
 {\r
   EFI_STATUS                  Status;\r
-  EFI_HANDLE                  HiiDriverHandle;\r
   EFI_HII_PACKAGE_LIST_HEADER *PackageList;\r
 \r
   //\r
@@ -562,15 +554,12 @@ InitializeSetup (
   //\r
   // Publish our HII data\r
   //\r
-  Status = HiiLibCreateHiiDriverHandle (&HiiDriverHandle);\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
   PackageList = HiiLibPreparePackageList (1, &gSetupBrowserGuid, SetupBrowserStrings);\r
   ASSERT (PackageList != NULL);\r
   Status = mHiiDatabase->NewPackageList (\r
                            mHiiDatabase,\r
                            PackageList,\r
-                           HiiDriverHandle,\r
+                           ImageHandle,\r
                            &gHiiHandle\r
                            );\r
   ASSERT_EFI_ERROR (Status);\r
@@ -593,29 +582,6 @@ InitializeSetup (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  //\r
-  // Install Print protocol\r
-  //\r
-  Status = gBS->InstallProtocolInterface (\r
-                  &mPrivateData.Handle,\r
-                  &gEfiPrint2ProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &mPrivateData.Print\r
-                  );\r
-\r
-  //\r
-  // Install Ecp Print protocol, which is defined in\r
-  // Edk\Foundation\Protocol\Print\Print.h with protocol\r
-  // GUID of { 0xdf2d868e, 0x32fc, 0x4cf0, {0x8e, 0x6b, 0xff, 0xd9, 0x5d, 0x13, 0x43, 0xd0 }}\r
-  // This is support previous module that written to consume this protocol.\r
-  // \r
-  Status = gBS->InstallProtocolInterface (\r
-                  &mPrivateData.Handle,\r
-                  &gEfiPrintProtocolGuid,\r
-                  EFI_NATIVE_INTERFACE,\r
-                  &mPrivateData.Print\r
-                  );\r
-\r
   return Status;\r
 }\r
 \r
@@ -699,7 +665,7 @@ GetToken (
   Status = HiiLibGetString (HiiHandle, Token, String, &BufferLength);\r
 \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
-    gBS->FreePool (String);\r
+    FreePool (String);\r
     String = AllocateZeroPool (BufferLength);\r
     ASSERT (String != NULL);\r
 \r
@@ -760,7 +726,7 @@ NewStringCat (
   StrCpy (NewString, *Dest);\r
   StrCat (NewString, Src);\r
 \r
-  gBS->FreePool (*Dest);\r
+  FreePool (*Dest);\r
   *Dest = NewString;\r
 }\r
 \r
@@ -1050,6 +1016,7 @@ GetQuestionValue (
   CHAR16              *Progress;\r
   CHAR16              *Result;\r
   CHAR16              *Value;\r
+  CHAR16              *StringPtr;\r
   UINTN               Length;\r
   BOOLEAN             IsBufferStorage;\r
   BOOLEAN             IsString;\r
@@ -1185,7 +1152,7 @@ GetQuestionValue (
         Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
       }\r
 \r
-      gBS->FreePool (Value);\r
+      FreePool (Value);\r
     }\r
   } else {\r
     //\r
@@ -1238,13 +1205,23 @@ GetQuestionValue (
       Value = Value + 6;\r
     }\r
     if (*Value != '=') {\r
-      gBS->FreePool (Result);\r
+      FreePool (Result);\r
       return EFI_NOT_FOUND;\r
     }\r
     //\r
     // Skip '=', point to value\r
     //\r
     Value = Value + 1;\r
+\r
+    //\r
+    // Suppress <AltResp> if any\r
+    //\r
+    StringPtr = Value;\r
+    while (*StringPtr != L'\0' && *StringPtr != L'&') {\r
+      StringPtr++;\r
+    }\r
+    *StringPtr = L'\0';\r
+\r
     if (!IsBufferStorage && IsString) {\r
       //\r
       // Convert Config String to Unicode String, e.g "0041004200430044" => "ABCD"\r
@@ -1254,7 +1231,7 @@ GetQuestionValue (
     } else {\r
       Status = HexStringToBuf (Dst, &StorageWidth, Value, NULL);\r
       if (EFI_ERROR (Status)) {\r
-        gBS->FreePool (Result);\r
+        FreePool (Result);\r
         return Status;\r
       }\r
     }\r
@@ -1267,7 +1244,7 @@ GetQuestionValue (
     } else {\r
       SetValueByName (Storage, Question->VariableName, Value);\r
     }\r
-    gBS->FreePool (Result);\r
+    FreePool (Result);\r
   }\r
 \r
   return Status;\r
@@ -1437,7 +1414,7 @@ SetQuestionValue (
     }\r
 \r
     Status = SetValueByName (Storage, Question->VariableName, Value);\r
-    gBS->FreePool (Value);\r
+    FreePool (Value);\r
   }\r
 \r
   if (!Cached) {\r
@@ -1492,11 +1469,11 @@ SetQuestionValue (
                                         &Progress\r
                                         );\r
       if (EFI_ERROR (Status)) {\r
-        gBS->FreePool (ConfigResp);\r
+        FreePool (ConfigResp);\r
         return Status;\r
       }\r
     }\r
-    gBS->FreePool (ConfigResp);\r
+    FreePool (ConfigResp);\r
 \r
     //\r
     // Synchronize shadow Buffer\r
@@ -1564,7 +1541,7 @@ ValidateQuestion (
         do {\r
           CreateDialog (4, TRUE, 0, NULL, &Key, gEmptyString, PopUp, gPressEnter, gEmptyString);\r
         } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);\r
-        gBS->FreePool (PopUp);\r
+        FreePool (PopUp);\r
       }\r
 \r
       return EFI_NOT_READY;\r
@@ -1679,11 +1656,11 @@ SubmitForm (
                                         &Progress\r
                                         );\r
       if (EFI_ERROR (Status)) {\r
-        gBS->FreePool (ConfigResp);\r
+        FreePool (ConfigResp);\r
         return Status;\r
       }\r
     }\r
-    gBS->FreePool (ConfigResp);\r
+    FreePool (ConfigResp);\r
 \r
     //\r
     // Config success, update storage shadow Buffer\r
@@ -1895,6 +1872,16 @@ ExtractFormDefault (
     Question = FORM_BROWSER_STATEMENT_FROM_LINK (Link);\r
     Link = GetNextNode (&Form->StatementListHead, Link);\r
 \r
+    //\r
+    // If Question is suppressed, don't reset it to default\r
+    //\r
+    if (Question->SuppressExpression != NULL) {\r
+      Status = EvaluateExpression (FormSet, Form, Question->SuppressExpression);\r
+      if (!EFI_ERROR (Status) && Question->SuppressExpression->Result.Value.b) {\r
+        continue;\r
+      }\r
+    }\r
+\r
     //\r
     // Reset Question to its default value\r
     //\r
@@ -2011,7 +1998,7 @@ LoadStorage (
   }\r
 \r
   Status = ConfigRespToStorage (Storage, Result);\r
-  gBS->FreePool (Result);\r
+  FreePool (Result);\r
   return Status;\r
 }\r
 \r
@@ -2134,7 +2121,8 @@ GetIfrBinaryData (
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
-\r
+  ASSERT (HiiPackageList != NULL);\r
+  \r
   //\r
   // Get Form package from this HII package List\r
   //\r
@@ -2146,7 +2134,7 @@ GetIfrBinaryData (
     Package = ((UINT8 *) HiiPackageList) + Offset;\r
     CopyMem (&PackageHeader, Package, sizeof (EFI_HII_PACKAGE_HEADER));\r
 \r
-    if (PackageHeader.Type == EFI_HII_PACKAGE_FORM) {\r
+    if (PackageHeader.Type == EFI_HII_PACKAGE_FORMS) {\r
       //\r
       // Search FormSet in this Form Package\r
       //\r
@@ -2188,7 +2176,7 @@ GetIfrBinaryData (
     //\r
     // Form package not found in this Package List\r
     //\r
-    gBS->FreePool (HiiPackageList);\r
+    FreePool (HiiPackageList);\r
     return EFI_NOT_FOUND;\r
   }\r
 \r
@@ -2207,7 +2195,7 @@ GetIfrBinaryData (
   *BinaryLength = PackageHeader.Length - Offset2;\r
   *BinaryData = AllocateCopyPool (*BinaryLength, OpCodeData);\r
 \r
-  gBS->FreePool (HiiPackageList);\r
+  FreePool (HiiPackageList);\r
 \r
   if (*BinaryData == NULL) {\r
     return EFI_OUT_OF_RESOURCES;\r