Imported Debian patch 1:0.1+git15+20130418+09259ca-0linaro1HEADdebian/1%0.1+git15+20130418+09259ca-0linaro1master

1 files changed, 85 insertions, 82 deletions

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index bcc8e020..6c019f04 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
@@ -1,7 +1,7 @@
 /** @file

 Entry and initialization module for the browser.

 

-Copyright (c) 2007 - 2012, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2007 - 2013, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -32,6 +32,7 @@ SETUP_DRIVER_PRIVATE_DATA  mPrivateData = {
 EFI_HII_DATABASE_PROTOCOL         *mHiiDatabase;

 EFI_HII_STRING_PROTOCOL           *mHiiString;

 EFI_HII_CONFIG_ROUTING_PROTOCOL   *mHiiConfigRouting;

+EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mPathFromText;

 

 UINTN           gBrowserContextCount = 0;

 LIST_ENTRY      gBrowserContextList = INITIALIZE_LIST_HEAD_VARIABLE (gBrowserContextList);

@@ -84,6 +85,7 @@ CHAR16            *gAdjustNumber;
 CHAR16            *gSaveChanges;

 CHAR16            *gOptionMismatch;

 CHAR16            *gFormSuppress;

+CHAR16            *gProtocolNotFound;

 

 CHAR16            *mUnknownString = L"!";

 

@@ -243,6 +245,11 @@ SendForm (
   gFooterHeight = FOOTER_HEIGHT + (Index / 3);

 

   //

+  // Clean the history menu list.

+  //

+  InitializeListHead (&gMenuList);

+

+  //

   // Save globals used by SendForm()

   //

   SaveBrowserContext ();

@@ -303,8 +310,6 @@ SendForm (
   //

   InitializeBrowserStrings ();

 

-  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;

-

   //

   // Ensure we are in Text mode

   //

@@ -378,6 +383,7 @@ SendForm (
   }

 

   FreeBrowserStrings ();

+  UiFreeMenuList(&gMenuList);

 

   gST->ConOut->SetAttribute (gST->ConOut, EFI_TEXT_ATTR (EFI_LIGHTGRAY, EFI_BLACK));

   gST->ConOut->ClearScreen (gST->ConOut);

@@ -557,66 +563,6 @@ BrowserCallback (
 }

 

 /**

-  Notify function will remove the formset in the maintain list 

-  once this formset is removed.

-  

-  Functions which are registered to receive notification of

-  database events have this prototype. The actual event is encoded

-  in NotifyType. The following table describes how PackageType,

-  PackageGuid, Handle, and Package are used for each of the

-  notification types.

-

-  @param PackageType  Package type of the notification.

-

-  @param PackageGuid  If PackageType is

-                      EFI_HII_PACKAGE_TYPE_GUID, then this is

-                      the pointer to the GUID from the Guid

-                      field of EFI_HII_PACKAGE_GUID_HEADER.

-                      Otherwise, it must be NULL.

-

-  @param Package  Points to the package referred to by the

-                  notification Handle The handle of the package

-                  list which contains the specified package.

-

-  @param Handle       The HII handle.

-

-  @param NotifyType   The type of change concerning the

-                      database. See

-                      EFI_HII_DATABASE_NOTIFY_TYPE.

-

-**/

-EFI_STATUS

-EFIAPI

-FormsetRemoveNotify (

-  IN UINT8                              PackageType,

-  IN CONST EFI_GUID                     *PackageGuid,

-  IN CONST EFI_HII_PACKAGE_HEADER       *Package,

-  IN EFI_HII_HANDLE                     Handle,

-  IN EFI_HII_DATABASE_NOTIFY_TYPE       NotifyType

-  )

-{

-  FORM_BROWSER_FORMSET *FormSet;

-

-  //

-  // Ignore the update for current using formset, which is handled by another notify function.

-  //

-  if (IsHiiHandleInBrowserContext (Handle)) {

-    return EFI_SUCCESS;

-  }

-  

-  //

-  // Remove the backup FormSet data when the Form Package is removed.

-  //

-  FormSet = GetFormSetFromHiiHandle (Handle);

-  if (FormSet != NULL) {

-    RemoveEntryList (&FormSet->Link);

-    DestroyFormSet (FormSet);

-  }

-  

-  return EFI_SUCCESS;

-}

-

-/**

   Initialize Setup Browser driver.

 

   @param ImageHandle     The image handle.

@@ -634,7 +580,6 @@ InitializeSetup (
   )

 {

   EFI_STATUS                  Status;

-  EFI_HANDLE                  NotifyHandle;

   EFI_INPUT_KEY               DefaultHotKey;

   EFI_STRING                  HelpString;

 

@@ -662,6 +607,12 @@ InitializeSetup (
                   );

   ASSERT_EFI_ERROR (Status);

 

+  Status = gBS->LocateProtocol (

+                  &gEfiDevicePathFromTextProtocolGuid,

+                  NULL,

+                  (VOID **) &mPathFromText

+                  );

+

   //

   // Publish our HII data

   //

@@ -726,19 +677,6 @@ InitializeSetup (
                   );

   ASSERT_EFI_ERROR (Status);

 

-  //

-  // Register notify for Form package remove

-  //

-  Status = mHiiDatabase->RegisterPackageNotify (

-                           mHiiDatabase,

-                           EFI_HII_PACKAGE_FORMS,

-                           NULL,

-                           FormsetRemoveNotify,

-                           EFI_HII_DATABASE_NOTIFY_REMOVE_PACK,

-                           &NotifyHandle

-                           );

-  ASSERT_EFI_ERROR (Status);

-

   return Status;

 }

 

@@ -2251,6 +2189,52 @@ SendDiscardInfoToDriver (
 }

 

 /**

+  Validate the FormSet. If the formset is not validate, remove it from the list.

+

+  @param  FormSet                The input FormSet which need to validate.

+

+  @retval TRUE                   The handle is validate.

+  @retval FALSE                  The handle is invalidate.

+

+**/

+BOOLEAN

+ValidateFormSet (

+  FORM_BROWSER_FORMSET    *FormSet

+  )

+{

+  EFI_HII_HANDLE          *HiiHandles;

+  UINTN                   Index;

+  BOOLEAN                 Find;

+

+  ASSERT (FormSet != NULL);

+  Find = FALSE;

+  //

+  // Get all the Hii handles

+  //

+  HiiHandles = HiiGetHiiHandles (NULL);

+  ASSERT (HiiHandles != NULL);

+

+  //

+  // Search for formset of each class type

+  //

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

+    if (HiiHandles[Index] == FormSet->HiiHandle) {

+      Find = TRUE;

+      break;

+    }

+  }

+

+  if (!Find) {

+    RemoveEntryList (&FormSet->Link);

+    DestroyFormSet (FormSet);

+  }

+

+  FreePool (HiiHandles);

+

+  return Find;

+}

+

+/**

   Discard data based on the input setting scope (Form, FormSet or System).

 

   @param  FormSet                FormSet data structure.

@@ -2357,8 +2341,11 @@ DiscardForm (
     Link = GetFirstNode (&gBrowserFormSetList);

     while (!IsNull (&gBrowserFormSetList, Link)) {

       LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);

-      DiscardForm (LocalFormSet, NULL, FormSetLevel);

       Link = GetNextNode (&gBrowserFormSetList, Link);

+      if (!ValidateFormSet(LocalFormSet)) {

+        continue;

+      }

+      DiscardForm (LocalFormSet, NULL, FormSetLevel);

       if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) {

         //

         // Remove maintain backup list after discard except for the current using FormSet.

@@ -2638,8 +2625,11 @@ SubmitForm (
     Link = GetFirstNode (&gBrowserFormSetList);

     while (!IsNull (&gBrowserFormSetList, Link)) {

       LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);

-      SubmitForm (LocalFormSet, NULL, FormSetLevel);

       Link = GetNextNode (&gBrowserFormSetList, Link);

+      if (!ValidateFormSet(LocalFormSet)) {

+        continue;

+      }

+      SubmitForm (LocalFormSet, NULL, FormSetLevel);

       if (!IsHiiHandleInBrowserContext (LocalFormSet->HiiHandle)) {

         //

         // Remove maintain backup list after save except for the current using FormSet.

@@ -3324,8 +3314,11 @@ ExtractDefault (
     Link = GetFirstNode (&gBrowserFormSetList);

     while (!IsNull (&gBrowserFormSetList, Link)) {

       LocalFormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);

-      ExtractDefault (LocalFormSet, NULL, DefaultId, FormSetLevel, GetDefaultValueScope, Storage, RetrieveValueFirst);

       Link = GetNextNode (&gBrowserFormSetList, Link);

+      if (!ValidateFormSet(LocalFormSet)) {

+        continue;

+      }

+      ExtractDefault (LocalFormSet, NULL, DefaultId, FormSetLevel, GetDefaultValueScope, Storage, RetrieveValueFirst);

     }

   }

 

@@ -4020,6 +4013,8 @@ InitializeFormSet (
     }

   }

 

+  gFunctionKeySetting = ENABLE_FUNCTION_KEY_SETTING;

+

   if ((gClassOfVfr & FORMSET_CLASS_FRONT_PAGE) == FORMSET_CLASS_FRONT_PAGE) {

     gFrontPageHandle = FormSet->HiiHandle;

     gFunctionKeySetting = NONE_FUNCTION_KEY_SETTING;

@@ -4107,6 +4102,7 @@ SaveBrowserContext (
   Context->HelpBlockWidth       = gHelpBlockWidth;

   Context->OldFormSet           = gOldFormSet;

   Context->MenuRefreshHead      = gMenuRefreshHead;

+  Context->ProtocolNotFound     = gProtocolNotFound;

 

   CopyMem (&Context->ScreenDimensions, &gScreenDimensions, sizeof (gScreenDimensions));

   CopyMem (&Context->MenuOption, &gMenuOption, sizeof (gMenuOption));

@@ -4184,6 +4180,7 @@ RestoreBrowserContext (
   gHelpBlockWidth       = Context->HelpBlockWidth;

   gOldFormSet           = Context->OldFormSet;

   gMenuRefreshHead      = Context->MenuRefreshHead;

+  gProtocolNotFound     = Context->ProtocolNotFound;

 

   CopyMem (&gScreenDimensions, &Context->ScreenDimensions, sizeof (gScreenDimensions));

   CopyMem (&gMenuOption, &Context->MenuOption, sizeof (gMenuOption));

@@ -4214,10 +4211,13 @@ GetFormSetFromHiiHandle (
   Link = GetFirstNode (&gBrowserFormSetList);

   while (!IsNull (&gBrowserFormSetList, Link)) {

     FormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);

+    Link = GetNextNode (&gBrowserFormSetList, Link);

+    if (!ValidateFormSet(FormSet)) {

+      continue;

+    }

     if (FormSet->HiiHandle == Handle) {

       return FormSet;

     }

-    Link = GetNextNode (&gBrowserFormSetList, Link);

   }

   

   return NULL;

@@ -4470,11 +4470,14 @@ SaveReminder (
   Link = GetFirstNode (&gBrowserFormSetList);

   while (!IsNull (&gBrowserFormSetList, Link)) {

     FormSet = FORM_BROWSER_FORMSET_FROM_LINK (Link);

+    Link = GetNextNode (&gBrowserFormSetList, Link);

+    if (!ValidateFormSet(FormSet)) {

+      continue;

+    }

     if (IsNvUpdateRequired (FormSet)) {

       IsDataChanged = TRUE;

       break;

     }

-    Link = GetNextNode (&gBrowserFormSetList, Link);

   }

   

   //