Sync patches r13947, r13983, r14072, r14076, r14077, r14102, r14206, r14207 and r14219 from main trunk.

1. Check mHiiPackageListUpdated before set it to FALSE.
2. Update the HiiConfigToBlock to follow spec.
3. Refine the menu display logic, support menus with more than one page of options.
4. Update the code of processing device path info in browser to follow UEFI spec.
5. Refine the sample about how to convert the device path to string.
6. Update the logic: Not remove the form set data, add check before browser use form set data to avoid use the useless form set data.
7. Update the code to follow UEFI spec, do the discard action when return EFI_BROWSER_ACTION_REQUEST_EXIT.


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/branches/UDK2010.SR1@14249 6f19259b-4bc3-4df7-8a09-765794883524

12 files changed, 348 insertions, 245 deletions

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
index e7c1202..8af59f8 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.c
@@ -2,7 +2,7 @@
 This is an example of how a driver might export data to the HII protocol to be

 later utilized by the Setup Protocol

 

-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2004 - 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

@@ -1795,11 +1795,14 @@ DriverSampleInit (
   BOOLEAN                         ActionFlag;

   EFI_STRING                      ConfigRequestHdr;

   MY_EFI_VARSTORE_DATA            *VarStoreConfig;

+  EFI_DEVICE_PATH_TO_TEXT_PROTOCOL *PathToText;

 

   //

   // Initialize the local variables.

   //

   ConfigRequestHdr = NULL;

+  NewString        = NULL;

+  PathToText       = NULL;

   //

   // Initialize screen dimensions for SendForm().

   // Remove 3 characters from top and bottom

@@ -1915,15 +1918,26 @@ DriverSampleInit (
   }

 

   PrivateData->HiiHandle[1] = HiiHandle[1];

+ 

+  Status = gBS->LocateProtocol (

+                  &gEfiDevicePathToTextProtocolGuid,

+                  NULL,

+                  (VOID **) &PathToText

+                  );

+  ASSERT_EFI_ERROR (Status);

 

   //

   // Update the device path string.

   //

-  if (HiiSetString (HiiHandle[0], STRING_TOKEN (STR_DEVICE_PATH), (EFI_STRING) &mHiiVendorDevicePath0, NULL) == 0) {

+  NewString = PathToText->ConvertDevicePathToText((EFI_DEVICE_PATH_PROTOCOL*)&mHiiVendorDevicePath0, FALSE, FALSE);

+  if (HiiSetString (HiiHandle[0], STRING_TOKEN (STR_DEVICE_PATH), NewString, NULL) == 0) {

     DriverSampleUnload (ImageHandle);

     return EFI_OUT_OF_RESOURCES;

   }

-  

+  if (NewString != NULL) {

+    FreePool (NewString);

+  }

+

   //

   // Very simple example of how one would update a string that is already

   // in the HII database

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
index 29f4611..5babd47 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSample.h
@@ -1,6 +1,6 @@
 /** @file

 

-Copyright (c) 2007 - 2009, 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

@@ -31,6 +31,7 @@ Revision History
 #include <Protocol/HiiConfigAccess.h>

 #include <Protocol/HiiDatabase.h>

 #include <Protocol/HiiString.h>

+#include <Protocol/DevicePathToText.h>

 

 #include <Guid/MdeModuleHii.h>

 #include <Library/DebugLib.h>

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
index cffd2f3..f7ddbf5 100644
--- a/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
+++ b/MdeModulePkg/Universal/DriverSampleDxe/DriverSampleDxe.inf
@@ -2,7 +2,7 @@
 # This is a sample driver which show how HII protocol, VFR and UNI files are used to

 # create a driver which can be dipslayed and configured by a UEFI HII Form Browser.

 #

-# Copyright (c) 2007 - 2010, 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

@@ -70,6 +70,7 @@
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES

   gEfiSimpleTextInputExProtocolGuid             ## CONSUMES

 

+  gEfiDevicePathToTextProtocolGuid              ## CONSUMES

 

 [Depex]

   gEfiSimpleTextOutProtocolGuid AND gEfiHiiDatabaseProtocolGuid AND gEfiVariableArchProtocolGuid AND gEfiVariableWriteArchProtocolGuid

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
index 356b730..6f8d84c 100644
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/ConfigRouting.c
@@ -3783,18 +3783,14 @@ HiiConfigToBlock (
     Status = EFI_INVALID_PARAMETER;

     goto Exit;

   }

-  //

-  // Skip '&'

-  //

-  StringPtr++;

 

   //

   // Parse each <ConfigElement> if exists

-  // Only <BlockConfig> format is supported by this help function.

+  // Only '&'<BlockConfig> format is supported by this help function.

   // <BlockConfig> ::= 'OFFSET='<Number>&'WIDTH='<Number>&'VALUE='<Number>

   //

-  while (*StringPtr != 0 && StrnCmp (StringPtr, L"OFFSET=", StrLen (L"OFFSET=")) == 0) {

-    StringPtr += StrLen (L"OFFSET=");

+  while (*StringPtr != 0 && StrnCmp (StringPtr, L"&OFFSET=", StrLen (L"&OFFSET=")) == 0) {

+    StringPtr += StrLen (L"&OFFSET=");

     //

     // Get Offset

     //

@@ -3813,7 +3809,7 @@ HiiConfigToBlock (
 

     StringPtr += Length;

     if (StrnCmp (StringPtr, L"&WIDTH=", StrLen (L"&WIDTH=")) != 0) {

-      *Progress = StringPtr - Length - StrLen (L"OFFSET=") - 1;

+      *Progress = StringPtr - Length - StrLen (L"&OFFSET=");

       Status = EFI_INVALID_PARAMETER;

       goto Exit;

     }

@@ -3854,7 +3850,7 @@ HiiConfigToBlock (
 

     StringPtr += Length;

     if (*StringPtr != 0 && *StringPtr != L'&') {

-      *Progress = StringPtr - Length - 7;

+      *Progress = StringPtr - Length - StrLen (L"&VALUE=");

       Status = EFI_INVALID_PARAMETER;

       goto Exit;

     }

@@ -3873,20 +3869,18 @@ HiiConfigToBlock (
     Value = NULL;

 

     //

-    // If '\0', parsing is finished. Otherwise skip '&' to continue

+    // If '\0', parsing is finished.

     //

     if (*StringPtr == 0) {

       break;

     }

-

-    StringPtr++;

   }

   

   //

-  // The input string is ConfigAltResp format.

+  // The input string is not ConfigResp format, return error.

   //

-  if ((*StringPtr != 0) && (StrnCmp (StringPtr, L"&GUID=", StrLen (L"&GUID=")) != 0)) {

-    *Progress = StringPtr - 1;

+  if (*StringPtr != 0) {

+    *Progress = StringPtr;

     Status = EFI_INVALID_PARAMETER;

     goto Exit;

   }

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
index ab3ab11..976608f 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Expression.c
@@ -1,7 +1,7 @@
 /** @file

 Utility functions for expression evaluation.

 

-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

@@ -2210,6 +2210,7 @@ EvaluateExpression (
   UINT8                   *TempBuffer;

   EFI_TIME                EfiTime;

   EFI_HII_VALUE           QuestionVal;

+  EFI_DEVICE_PATH_PROTOCOL *DevicePath;

 

   //

   // Save current stack offset.

@@ -2469,17 +2470,22 @@ EvaluateExpression (
       }

 

       if (OpCode->DevicePath != 0) {

+        Value->Type = EFI_IFR_TYPE_UNDEFINED;

+

         StrPtr = GetToken (OpCode->DevicePath, FormSet->HiiHandle);

-        if (StrPtr == NULL) {

-          Value->Type = EFI_IFR_TYPE_UNDEFINED;

-          break;

+        if (StrPtr != NULL && mPathFromText != NULL) {

+          DevicePath = mPathFromText->ConvertTextToDevicePath(StrPtr);

+          if (DevicePath != NULL && GetQuestionValueFromForm(DevicePath, NULL, &OpCode->Guid, Value->Value.u16, &QuestionVal)) {

+            Value = &QuestionVal;

+          }

+          if (DevicePath != NULL) {

+            FreePool (DevicePath);

+          }

         }

 

-        if (!GetQuestionValueFromForm((EFI_DEVICE_PATH_PROTOCOL*)StrPtr, NULL, &OpCode->Guid, Value->Value.u16, &QuestionVal)){

-          Value->Type = EFI_IFR_TYPE_UNDEFINED;

-          break;

+        if (StrPtr != NULL) {

+          FreePool (StrPtr);

         }

-        Value = &QuestionVal;

       } else if (CompareGuid (&OpCode->Guid, &gZeroGuid) != 0) {

         if (!GetQuestionValueFromForm(NULL, FormSet->HiiHandle, &OpCode->Guid, Value->Value.u16, &QuestionVal)){

           Value->Type = EFI_IFR_TYPE_UNDEFINED;

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
index b8612e8..c3854aa 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Presentation.c
@@ -1,7 +1,7 @@
 /** @file

 Utility functions for UI presentation.

 

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

+Copyright (c) 2004 - 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

@@ -602,6 +602,7 @@ InitializeBrowserStrings (
   gSaveChanges          = GetToken (STRING_TOKEN (SAVE_CHANGES), gHiiHandle);

   gOptionMismatch       = GetToken (STRING_TOKEN (OPTION_MISMATCH), gHiiHandle);

   gFormSuppress         = GetToken (STRING_TOKEN (FORM_SUPPRESSED), gHiiHandle);

+  gProtocolNotFound     = GetToken (STRING_TOKEN (PROTOCOL_NOT_FOUND), gHiiHandle);

   return ;

 }

 

@@ -642,6 +643,7 @@ FreeBrowserStrings (
   FreePool (gSaveChanges);

   FreePool (gOptionMismatch);

   FreePool (gFormSuppress);

+  FreePool (gProtocolNotFound);

   return ;

 }

 

@@ -1252,6 +1254,7 @@ ProcessCallBackFunction (
           break;

 

         case EFI_BROWSER_ACTION_REQUEST_EXIT:

+          DiscardFormIsRequired = TRUE;

           Selection->Action = UI_ACTION_EXIT;

           break;

 

@@ -1437,6 +1440,15 @@ SetupBrowser (
 

   do {

     //

+    // IFR is updated, force to reparse the IFR binary

+    //

+    if (mHiiPackageListUpdated) {

+      Selection->Action = UI_ACTION_REFRESH_FORMSET;

+      mHiiPackageListUpdated = FALSE;

+      break;

+    }

+

+    //

     // Initialize Selection->Form

     //

     if (Selection->FormId == 0) {

@@ -1477,11 +1489,6 @@ SetupBrowser (
     }

 

     //

-    // Reset FormPackage update flag

-    //

-    mHiiPackageListUpdated = FALSE;

-

-    //

     // Before display new form, invoke ConfigAccess.Callback() with EFI_BROWSER_ACTION_FORM_OPEN

     // for each question with callback flag.

     // New form may be the first form, or the different form after another form close.

@@ -1564,11 +1571,6 @@ SetupBrowser (
         gResetRequired = TRUE;

       }

 

-      //

-      // Reset FormPackage update flag

-      //

-      mHiiPackageListUpdated = FALSE;

-

       if ((ConfigAccess != NULL) && 

           ((Statement->QuestionFlags & EFI_IFR_FLAG_CALLBACK) == EFI_IFR_FLAG_CALLBACK) && 

           (Statement->Operand != EFI_IFR_PASSWORD_OP)) {

@@ -1597,17 +1599,6 @@ SetupBrowser (
           ProcessCallBackFunction(Selection, Statement, EFI_BROWSER_ACTION_CHANGED, FALSE);

         }

       }

-

-      //

-      // Check whether Form Package has been updated during Callback

-      //

-      if (mHiiPackageListUpdated && (Selection->Action == UI_ACTION_REFRESH_FORM)) {

-        //

-        // Force to reparse IFR binary of target Formset

-        //

-        mHiiPackageListUpdated = FALSE;

-        Selection->Action = UI_ACTION_REFRESH_FORMSET;

-      }

     }

 

     //

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.c
index 6859fdf..c1b74a1 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"!";

 

@@ -557,66 +559,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 +576,6 @@ InitializeSetup (
   )

 {

   EFI_STATUS                  Status;

-  EFI_HANDLE                  NotifyHandle;

   EFI_INPUT_KEY               DefaultHotKey;

   EFI_STRING                  HelpString;

 

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

   ASSERT_EFI_ERROR (Status);

 

+  Status = gBS->LocateProtocol (

+                  &gEfiDevicePathFromTextProtocolGuid,

+                  NULL,

+                  (VOID **) &mPathFromText

+                  );

+

   //

   // Publish our HII data

   //

@@ -726,19 +673,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 +2185,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 +2337,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 +2621,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.

@@ -3308,8 +3294,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);

     }

   }

 

@@ -3497,7 +3486,7 @@ LoadStorage (
   //

   // Convert Result from <ConfigAltResp> to <ConfigResp>

   //

-  StrPtr = StrStr (Result, L"ALTCFG");

+  StrPtr = StrStr (Result, L"&GUID=");

   if (StrPtr != NULL) {

     *StrPtr = L'\0';

   }

@@ -4091,6 +4080,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));

@@ -4168,6 +4158,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));

@@ -4198,10 +4189,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;

@@ -4454,11 +4448,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);

   }

   

   //

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
index e11cdc1..8e32cb4 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Setup.h
@@ -1,7 +1,7 @@
 /** @file

 Private MACRO, structure and function definitions for Setup Browser module.

 

-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

@@ -30,6 +30,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Protocol/HiiDatabase.h>

 #include <Protocol/HiiString.h>

 #include <Protocol/UserManager.h>

+#include <Protocol/DevicePathFromText.h>

 

 #include <Guid/MdeModuleHii.h>

 #include <Guid/HiiPlatformSetupFormset.h>

@@ -546,6 +547,7 @@ typedef struct {
   CHAR16                *SaveChanges;

   CHAR16                *OptionMismatch;

   CHAR16                *FormSuppress;

+  CHAR16                *ProtocolNotFound;

   CHAR16                PromptBlockWidth;

   CHAR16                OptionBlockWidth;

   CHAR16                HelpBlockWidth;

@@ -597,6 +599,7 @@ typedef enum {
 extern EFI_HII_DATABASE_PROTOCOL         *mHiiDatabase;

 extern EFI_HII_STRING_PROTOCOL           *mHiiString;

 extern EFI_HII_CONFIG_ROUTING_PROTOCOL   *mHiiConfigRouting;

+extern EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL *mPathFromText;

 

 extern BANNER_DATA           *gBannerData;

 extern EFI_HII_HANDLE        gFrontPageHandle;

@@ -647,6 +650,7 @@ extern CHAR16            *gAdjustNumber;
 extern CHAR16            *gSaveChanges;

 extern CHAR16            *gOptionMismatch;

 extern CHAR16            *gFormSuppress;

+extern CHAR16            *gProtocolNotFound;

 

 extern CHAR16            gPromptBlockWidth;

 extern CHAR16            gOptionBlockWidth;

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
index 6c7820c..0d008d0 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf
@@ -1,7 +1,7 @@
 ## @file

 # The DXE driver produces FORM BROWSER protocols defined in UEFI HII 2.1 specificatin.

 #

-# Copyright (c) 2007 - 2011, 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

@@ -74,6 +74,7 @@
   gEfiHiiDatabaseProtocolGuid                   ## CONSUMES

   gEfiUnicodeCollation2ProtocolGuid             ## CONSUMES

   gEfiUserManagerProtocolGuid                   ## SOMETIMES_CONSUMES

+  gEfiDevicePathFromTextProtocolGuid            ## SOMETIMES_CONSUMES

 

 [FeaturePcd]

   gEfiMdeModulePkgTokenSpaceGuid.PcdFrameworkCompatibilitySupport          ## CONSUMES

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserStr.uni b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserStr.uni
index b155a55..bb6414d 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserStr.uni
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserStr.uni
diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
index 6960785..f302b7c 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.c
@@ -1,7 +1,7 @@
 /** @file

 Utility functions for User Interface functions.

 

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

+Copyright (c) 2004 - 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

@@ -1502,36 +1502,34 @@ UpdateOptionSkipLines (
 

   Row           = 0;

   OptionString  = NULL;

+  Width         = (UINT16) gOptionBlockWidth;

+  OriginalRow   = 0;

+  GlyphWidth    = 1;

+  

   ProcessOptions (Selection, MenuOption, FALSE, &OptionString);

+  if (OptionString == NULL) {

+    return;

+  }

 

-  if (OptionString != NULL) {

-    Width               = (UINT16) gOptionBlockWidth;

-

-    OriginalRow         = Row;

-    GlyphWidth          = 1;

-

-    for (Index = 0; GetLineByWidth (OptionString, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {

+  for (Index = 0; GetLineByWidth (OptionString, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {

+    //

+    // If there is more string to process print on the next row and increment the Skip value

+    //

+    if (StrLen (&OptionString[Index]) != 0) {

+      Row++;

       //

-      // If there is more string to process print on the next row and increment the Skip value

+      // Since the Number of lines for this menu entry may or may not be reflected accurately

+      // since the prompt might be 1 lines and option might be many, and vice versa, we need to do

+      // some testing to ensure we are keeping this in-sync.

       //

-      if (StrLen (&OptionString[Index]) != 0) {

-        Row++;

-        //

-        // Since the Number of lines for this menu entry may or may not be reflected accurately

-        // since the prompt might be 1 lines and option might be many, and vice versa, we need to do

-        // some testing to ensure we are keeping this in-sync.

-        //

-        // If the difference in rows is greater than or equal to the skip value, increase the skip value

-        //

-        if ((Row - OriginalRow) >= MenuOption->Skip) {

-          MenuOption->Skip++;

-        }

+      // If the difference in rows is greater than or equal to the skip value, increase the skip value

+      //

+      if ((Row - OriginalRow) >= MenuOption->Skip) {

+        MenuOption->Skip++;

       }

-

-      FreePool (OutputString);

     }

 

-    Row = OriginalRow;

+    FreePool (OutputString);

   }

 

   if (OptionString != NULL) {

@@ -1607,6 +1605,10 @@ ValueIsScroll (
 

   @return The row distance from current MenuOption to next selectable MenuOption.

 

+  @retval -1       Reach the begin of the menu, still can't find the selectable menu.

+  @retval Value    Find the selectable menu, maybe the truly selectable, maybe the l

+                   last menu showing at current form.

+

 **/

 INTN

 MoveToNextStatement (

@@ -1627,41 +1629,56 @@ MoveToNextStatement (
 

   while (TRUE) {

     NextMenuOption = MENU_OPTION_FROM_LINK (Pos);

+    //

+    // NextMenuOption->Row == 0 means this menu has not calculate

+    // the NextMenuOption->Skip value yet, just calculate here.

+    //

     if (NextMenuOption->Row == 0) {

       UpdateOptionSkipLines (Selection, NextMenuOption);

     }

     

     if (GoUp && (PreMenuOption != NextMenuOption)) {

       //

-      // Current Position doesn't need to be caculated when go up.

-      // Caculate distanct at first when go up

+      // In this case, still can't find the selectable menu,

+      // return the last one in the showing form.

       //

       if ((UINTN) Distance + NextMenuOption->Skip > GapToTop) {

         NextMenuOption = PreMenuOption;

         break;

       }

+

+      //

+      // Current Position doesn't need to be caculated when go up.

+      // Caculate distanct at first when go up

+      //      

       Distance += NextMenuOption->Skip;

     }

+

     if (IsSelectable (NextMenuOption)) {

       break;

     }

+

+    //

+    // Arrive at begin of the menu list.

+    //

     if ((GoUp ? Pos->BackLink : Pos->ForwardLink) == &gMenuOption) {

-      //

-      // Arrive at top.

-      //

       Distance = -1;

       break;

     }

+

     if (!GoUp) {

       //

-      // Caculate distanct at later when go down

+      // In this case, still can't find the selectable menu,

+      // return the last one in the showing form.

       //

       if ((UINTN) Distance + NextMenuOption->Skip > GapToTop) {

         NextMenuOption = PreMenuOption;

         break;

       }

+

       Distance += NextMenuOption->Skip;

     }

+

     PreMenuOption = NextMenuOption;

     Pos = (GoUp ? Pos->BackLink : Pos->ForwardLink);

   }

@@ -1969,12 +1986,7 @@ ProcessGotoOpCode (
 {

   CHAR16                          *StringPtr;

   UINTN                           StringLen;

-  UINTN                           BufferSize;

   EFI_DEVICE_PATH_PROTOCOL        *DevicePath;

-  CHAR16                          TemStr[2];

-  UINT8                           *DevicePathBuffer;

-  UINTN                           Index;

-  UINT8                           DigitUint8;

   FORM_BROWSER_FORM               *RefForm;

   EFI_INPUT_KEY                   Key;

   EFI_STATUS                      Status;

@@ -2003,38 +2015,32 @@ ProcessGotoOpCode (
     if (Selection->Form->ModalForm) {

       return Status;

     }

-    //

-    // Goto another Hii Package list

-    //

-    Selection->Action = UI_ACTION_REFRESH_FORMSET;

-    BufferSize = StrLen (StringPtr) / 2;

-    DevicePath = AllocatePool (BufferSize);

-    ASSERT (DevicePath != NULL);

 

     //

-    // Convert from Device Path String to DevicePath Buffer in the reverse order.

+    // Goto another Hii Package list

     //

-    DevicePathBuffer = (UINT8 *) DevicePath;

-    for (Index = 0; StringPtr[Index] != L'\0'; Index ++) {

-      TemStr[0] = StringPtr[Index];

-      DigitUint8 = (UINT8) StrHexToUint64 (TemStr);

-      if (DigitUint8 == 0 && TemStr[0] != L'0') {

-        //

-        // Invalid Hex Char as the tail.

-        //

-        break;

+    if (mPathFromText != NULL) {

+      DevicePath = mPathFromText->ConvertTextToDevicePath(StringPtr);

+      if (DevicePath != NULL) {

+        Selection->Handle = DevicePathToHiiHandle (DevicePath);

+        FreePool (DevicePath);

       }

-      if ((Index & 1) == 0) {

-        DevicePathBuffer [Index/2] = DigitUint8;

-      } else {

-        DevicePathBuffer [Index/2] = (UINT8) ((DevicePathBuffer [Index/2] << 4) + DigitUint8);

+      FreePool (StringPtr);

+    } else {

+      //

+      // Not found the EFI_DEVICE_PATH_FROM_TEXT_PROTOCOL protocol.

+      //

+      do {

+        CreateDialog (4, TRUE, 0, NULL, &Key, gEmptyString, gProtocolNotFound, gPressEnter, gEmptyString);

+      } while (Key.UnicodeChar != CHAR_CARRIAGE_RETURN);

+      if (Repaint != NULL) {

+        *Repaint = TRUE;

       }

+      FreePool (StringPtr);

+      return Status;

     }

-    FreePool (StringPtr);

-

-    Selection->Handle = DevicePathToHiiHandle (DevicePath);

-    FreePool (DevicePath);

 

+    Selection->Action = UI_ACTION_REFRESH_FORMSET;

     if (Selection->Handle == NULL) {

       //

       // If target Hii Handle not found, exit

@@ -2151,7 +2157,6 @@ UiDisplayMenu (
 {

   INTN                            SkipValue;

   INTN                            Difference;

-  INTN                            OldSkipValue;

   UINTN                           DistanceValue;

   UINTN                           Row;

   UINTN                           Col;

@@ -2232,7 +2237,6 @@ UiDisplayMenu (
   UpArrow             = FALSE;

   DownArrow           = FALSE;

   SkipValue           = 0;

-  OldSkipValue        = 0;

   MenuRefreshEntry    = gMenuRefreshHead;

 

   NextMenuOption      = NULL;

@@ -2333,6 +2337,9 @@ UiDisplayMenu (
         Temp            = (UINTN) SkipValue;

         Temp2           = (UINTN) SkipValue;

 

+        //

+        // 1. Clear the screen.

+        //

         if (Selection->Form->ModalForm) {

           ClearLines (

             LocalScreen.LeftColumn + ModalSkipColumn,

@@ -2353,6 +2360,9 @@ UiDisplayMenu (
         UiFreeRefreshList ();

         MinRefreshInterval = 0;

 

+        //

+        // 2.Paint the menu.

+        //

         for (Link = TopOfScreen; Link != &gMenuOption; Link = Link->ForwardLink) {

           MenuOption          = MENU_OPTION_FROM_LINK (Link);

           MenuOption->Row     = Row;

@@ -2392,7 +2402,13 @@ UiDisplayMenu (
               );

           }

 

+          //

+          // 2.1. Paint the description.

+          //

           for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {

+            //

+            // Temp means need to skip how many lines from the start.

+            //

             if ((Temp == 0) && (Row <= BottomRow)) {

               PrintStringAt (MenuOption->Col, Row, OutputString);

             }

@@ -2414,6 +2430,9 @@ UiDisplayMenu (
           Temp  = 0;

           Row   = OriginalRow;

 

+          //

+          // 2.2. Paint the option string.

+          //

           Status = ProcessOptions (Selection, MenuOption, FALSE, &OptionString);

           if (EFI_ERROR (Status)) {

             //

@@ -2470,7 +2489,7 @@ UiDisplayMenu (
           }

 

           //

-          // If Question has refresh guid, register the op-code.

+          // 2.4 Special process for Test opcode with test two.

           //

           if (!CompareGuid (&Statement->RefreshGuid, &gZeroGuid)) {

             if (gMenuEventGuidRefreshHead == NULL) {

@@ -2578,11 +2597,10 @@ UiDisplayMenu (
           gST->ConOut->SetAttribute (gST->ConOut, PcdGet8 (PcdBrowserFieldTextColor) | FIELD_BACKGROUND);

 

           //

-          // Need to handle the bottom of the display

+          // 3. Update the row info which will be used by next menu.

           //

-          if (MenuOption->Skip > 1) {

+          if (Link == TopOfScreen) {

             Row += MenuOption->Skip - SkipValue;

-            SkipValue = 0;

           } else {

             Row += MenuOption->Skip;

           }

@@ -2634,6 +2652,16 @@ UiDisplayMenu (
       // NewPos:     Current menu option that need to hilight

       //

       ControlFlag = CfUpdateHelpString;

+      if (TopOfScreen == &MenuOption->Link) {

+        Temp = SkipValue;

+      } else {

+        Temp = 0;

+      }

+      if (NewPos == TopOfScreen) {

+        Temp2 = SkipValue;

+      } else {

+        Temp2 = 0;

+      }

       if (InitializedFlag) {

         InitializedFlag = FALSE;

         MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);

@@ -2666,7 +2694,7 @@ UiDisplayMenu (
             SavedMenuOption = MENU_OPTION_FROM_LINK (Link);

             Index += SavedMenuOption->Skip;

             if (Link == TopOfScreen) {

-              Index -= OldSkipValue;

+              Index -= SkipValue;

             }

             Link = Link->ForwardLink;

           }

@@ -2724,7 +2752,6 @@ UiDisplayMenu (
               //

               SkipValue    = 0;

               TopOfScreen  = Link;

-              OldSkipValue = SkipValue;

             } else {

               //

               // Check whether need to skip some line for menu shows at the top of the page.

@@ -2732,7 +2759,6 @@ UiDisplayMenu (
               SkipValue = Index - BottomRow - 1;

               if (SkipValue > 0 && SkipValue < (INTN) SavedMenuOption->Skip) {

                 TopOfScreen     = Link;

-                OldSkipValue    = SkipValue;

               } else {

                 SkipValue       = 0;

                 TopOfScreen     = Link->ForwardLink;

@@ -2774,17 +2800,22 @@ UiDisplayMenu (
             GlyphWidth          = 1;

 

             for (Index = 0; GetLineByWidth (OptionString, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {

-              if (MenuOption->Row >= TopRow && MenuOption->Row <= BottomRow) {

+              if ((Temp == 0) && (MenuOption->Row >= TopRow) && (MenuOption->Row <= BottomRow)) {

                 PrintStringAt (MenuOption->OptCol, MenuOption->Row, OutputString);

               }

               //

               // If there is more string to process print on the next row and increment the Skip value

               //

               if (StrLen (&OptionString[Index]) != 0) {

-                MenuOption->Row++;

+                if (Temp == 0) {

+                  MenuOption->Row++;

+                }

               }

 

               FreePool (OutputString);

+              if (Temp != 0) {

+                Temp--;

+              }

             }

 

             MenuOption->Row = OriginalRow;

@@ -2803,17 +2834,22 @@ UiDisplayMenu (
               GlyphWidth  = 1;

 

               for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {

-                if (MenuOption->Row >= TopRow && MenuOption->Row <= BottomRow) {

+                if ((Temp == 0) && (MenuOption->Row >= TopRow) && (MenuOption->Row <= BottomRow)) {

                   PrintStringAt (MenuOption->Col, MenuOption->Row, OutputString);

                 }

                 //

                 // If there is more string to process print on the next row and increment the Skip value

                 //

                 if (StrLen (&MenuOption->Description[Index]) != 0) {

-                  MenuOption->Row++;

+                  if (Temp == 0) {

+                    MenuOption->Row++;

+                  }

                 }

 

                 FreePool (OutputString);

+                if (Temp != 0) {

+                  Temp--;

+                }

               }

 

               MenuOption->Row = OriginalRow;

@@ -2875,17 +2911,22 @@ UiDisplayMenu (
           GlyphWidth          = 1;

 

           for (Index = 0; GetLineByWidth (OptionString, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {

-            if (MenuOption->Row >= TopRow && MenuOption->Row <= BottomRow) {

+            if ((Temp2 == 0) && (MenuOption->Row >= TopRow) && (MenuOption->Row <= BottomRow) ) {

               PrintStringAt (MenuOption->OptCol, MenuOption->Row, OutputString);

             }

             //

             // If there is more string to process print on the next row and increment the Skip value

             //

             if (StrLen (&OptionString[Index]) != 0) {

+              if (Temp2 == 0) {

               MenuOption->Row++;

+              }

             }

 

             FreePool (OutputString);

+            if (Temp2 != 0) {

+              Temp2--;

+            }

           }

 

           MenuOption->Row = OriginalRow;

@@ -2899,17 +2940,22 @@ UiDisplayMenu (
             GlyphWidth          = 1;

 

             for (Index = 0; GetLineByWidth (MenuOption->Description, Width, &GlyphWidth, &Index, &OutputString) != 0x0000;) {

-              if (MenuOption->Row >= TopRow && MenuOption->Row <= BottomRow) {

+              if ((Temp2 == 0) && (MenuOption->Row >= TopRow) && (MenuOption->Row <= BottomRow) ) {

                 PrintStringAt (MenuOption->Col, MenuOption->Row, OutputString);

               }

               //

               // If there is more string to process print on the next row and increment the Skip value

               //

               if (StrLen (&MenuOption->Description[Index]) != 0) {

-                MenuOption->Row++;

+                if (Temp2 == 0) {

+                  MenuOption->Row++;

+                }

               }

 

               FreePool (OutputString);

+              if (Temp2 != 0) {

+                Temp2--;

+              }

             }

 

             MenuOption->Row = OriginalRow;

@@ -3424,7 +3470,6 @@ UiDisplayMenu (
           TopOfScreen = NewPos;

           Repaint     = TRUE;

           SkipValue = 0;

-          OldSkipValue = 0;

         } else if (!IsSelectable (NextMenuOption)) {

           //

           // Continue to go up until scroll to next page or the selectable option is found.

@@ -3453,9 +3498,15 @@ UiDisplayMenu (
       break;

 

     case CfUiPageUp:

+      //

+      // SkipValue means lines is skipped when show the top menu option.

+      //

       ControlFlag     = CfCheckSelection;

 

       ASSERT(NewPos != NULL);

+      //

+      // Already at the first menu option, so do nothing.

+      //

       if (NewPos->BackLink == &gMenuOption) {

         NewLine = FALSE;

         Repaint = FALSE;

@@ -3464,8 +3515,22 @@ UiDisplayMenu (
 

       NewLine   = TRUE;

       Repaint   = TRUE;

+

+      //

+      // SkipValue > (BottomRow - TopRow + 1) means current menu has more than one

+      // form of options to be show, so just update the SkipValue to show the next

+      // parts of options.

+      //

+      if (SkipValue > (INTN) (BottomRow - TopRow + 1)) {

+        SkipValue -= BottomRow - TopRow + 1;

+        break;

+      }

+

       Link      = TopOfScreen;

-      Index     = BottomRow;

+      //

+      // First minus the menu of the top screen, it's value is SkipValue.

+      //

+      Index     = (BottomRow + 1) - SkipValue;

       while ((Index >= TopRow) && (Link->BackLink != &gMenuOption)) {

         Link = Link->BackLink;

         PreviousMenuOption = MENU_OPTION_FROM_LINK (Link);

@@ -3473,13 +3538,13 @@ UiDisplayMenu (
           UpdateOptionSkipLines (Selection, PreviousMenuOption);

         }        

         if (Index < PreviousMenuOption->Skip) {

-          Index = 0;

           break;

         }

         Index = Index - PreviousMenuOption->Skip;

       }

       

       if ((Link->BackLink == &gMenuOption) && (Index >= TopRow)) {

+        SkipValue = 0;

         if (TopOfScreen == &gMenuOption) {

           TopOfScreen = gMenuOption.ForwardLink;

           NewPos      = gMenuOption.BackLink;

@@ -3498,10 +3563,13 @@ UiDisplayMenu (
           MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);

         }

       } else {

-        if (Index + 1 < TopRow) {

+        if (Index >= TopRow) {

           //

-          // Back up the previous option.

+          // At here, only case "Index < PreviousMenuOption->Skip" can reach here.

           //

+          SkipValue = PreviousMenuOption->Skip - (Index - TopRow);

+        } else {

+          SkipValue = PreviousMenuOption->Skip - (TopRow - Index);

           Link = Link->ForwardLink;

         }

 

@@ -3532,6 +3600,9 @@ UiDisplayMenu (
       break;

 

     case CfUiPageDown:

+      //

+      // SkipValue means lines is skipped when show the top menu option.

+      //

       ControlFlag     = CfCheckSelection;

 

       ASSERT (NewPos != NULL);

@@ -3545,47 +3616,62 @@ UiDisplayMenu (
       Repaint = TRUE;

       Link    = TopOfScreen;

       NextMenuOption = MENU_OPTION_FROM_LINK (Link);

-      Index = TopRow;

-      while ((Index <= BottomRow) && (Link->ForwardLink != &gMenuOption)) {

-        Index = Index + NextMenuOption->Skip;

+      Index = TopRow + NextMenuOption->Skip - SkipValue;

+      //

+      // Count to the menu option which will show at the top of the next form.

+      //

+      while ((Index <= BottomRow + 1) && (Link->ForwardLink != &gMenuOption)) {

         Link           = Link->ForwardLink;

         NextMenuOption = MENU_OPTION_FROM_LINK (Link);

+        Index = Index + NextMenuOption->Skip;

       }

 

-      if ((Link->ForwardLink == &gMenuOption) && (Index <= BottomRow)) {

+      if ((Link->ForwardLink == &gMenuOption) && (Index <= BottomRow + 1)) {

         //

         // Finally we know that NewPos is the last MenuOption can be focused.

         //

         Repaint = FALSE;

         MoveToNextStatement (Selection, TRUE, &Link, Index - TopRow);

+        SkipValue = 0;

       } else {

-        if (Index - 1 > BottomRow) {

+        //

+        // Calculate the skip line for top of screen menu.

+        //

+        if (Link == TopOfScreen) {

           //

-          // Back up the previous option.

+          // The top of screen menu option occupies the entire form.

           //

-          Link = Link->BackLink;

+          SkipValue += BottomRow - TopRow + 1;

+        } else {

+          SkipValue = NextMenuOption->Skip - (Index - (BottomRow + 1));

         }

-        //

-        // There are more MenuOption needing scrolling down.

-        //

+

         TopOfScreen = Link;

         MenuOption = NULL;

         //

-        // Move to the option in Next page.

+        // Move to the Next selectable menu.

         //

         MoveToNextStatement (Selection, FALSE, &Link, BottomRow - TopRow);

       }

 

       //

+      // Save the menu as the next highlight menu.

+      //

+      NewPos  = Link;

+

+      //

       // If we encounter a Date/Time op-code set, rewind to the first op-code of the set.

       // Don't do this when we are already in the last page.

       //

-      NewPos  = Link;

       AdjustDateAndTimePosition (TRUE, &TopOfScreen);

       AdjustDateAndTimePosition (TRUE, &NewPos);

       break;

 

     case CfUiDown:

+      //

+      // SkipValue means lines is skipped when show the top menu option.

+      // NewPos  points to the menu which is highlighted now.

+      //

       ControlFlag = CfCheckSelection;

       //

       // Since the behavior of hitting the down arrow on a Date/Time op-code is intended

@@ -3604,8 +3690,14 @@ UiDisplayMenu (
         NewPos          = NewPos->ForwardLink;

 

         Difference      = 0;

+        //

+        // Current menu not at the bottom of the form.

+        //

         if (BottomRow >= MenuOption->Row + MenuOption->Skip) {

-          Difference    = MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - MenuOption->Row - MenuOption->Skip);

+          //

+          // Find the next selectable menu.

+          //

+          Difference = MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - MenuOption->Row - MenuOption->Skip);

           //

           // We hit the end of MenuOption that can be focused

           // so we simply scroll to the first page.

@@ -3623,7 +3715,8 @@ UiDisplayMenu (
             }

             NewPos        = gMenuOption.ForwardLink;

             MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);

-    

+

+            SkipValue = 0;

             //

             // If we are at the end of the list and sitting on a Date/Time op, rewind to the head.

             //

@@ -3633,11 +3726,9 @@ UiDisplayMenu (
           }

         }

         NextMenuOption  = MENU_OPTION_FROM_LINK (NewPos);

-

-        //

-        // An option might be multi-line, so we need to reflect that data in the overall skip value

-        //

-        UpdateOptionSkipLines (Selection, NextMenuOption);

+        if (NextMenuOption->Row == 0) {

+          UpdateOptionSkipLines (Selection, NextMenuOption);

+        }

         DistanceValue  = Difference + NextMenuOption->Skip;

 

         Temp = MenuOption->Row + MenuOption->Skip + DistanceValue - 1;

@@ -3662,18 +3753,16 @@ UiDisplayMenu (
             //

             // If bottom op-code is more than one line or top op-code is more than one line

             //

-            if ((DistanceValue > 1) || (MenuOption->Skip > 1)) {

+            if ((DistanceValue > 1) || (SavedMenuOption->Skip > 1)) {

               //

               // Is the bottom op-code greater than or equal in size to the top op-code?

               //

-              if ((Temp - BottomRow) >= (SavedMenuOption->Skip - OldSkipValue)) {

+              if ((Temp - BottomRow) >= (SavedMenuOption->Skip - SkipValue)) {

                 //

                 // Skip the top op-code

                 //

                 TopOfScreen     = TopOfScreen->ForwardLink;

-                Difference      = (Temp - BottomRow) - (SavedMenuOption->Skip - OldSkipValue);

-

-                OldSkipValue    = Difference;

+                Difference      = (Temp - BottomRow) - (SavedMenuOption->Skip - SkipValue);

 

                 SavedMenuOption = MENU_OPTION_FROM_LINK (TopOfScreen);

 

@@ -3693,20 +3782,17 @@ UiDisplayMenu (
                 // SkipValue, set the skips to one less than what is required.

                 //

                 SkipValue = Difference - 1;

-

               } else {

                 //

                 // Since we will act on this op-code in the next routine, and increment the

                 // SkipValue, set the skips to one less than what is required.

                 //

-                SkipValue = OldSkipValue + (Temp - BottomRow) - 1;

+                SkipValue += (Temp - BottomRow) - 1;

               }

             } else {

-              if ((OldSkipValue + 1) == (INTN) SavedMenuOption->Skip) {

+              if ((SkipValue + 1) == (INTN) SavedMenuOption->Skip) {

                 TopOfScreen = TopOfScreen->ForwardLink;

                 break;

-              } else {

-                SkipValue = OldSkipValue;

               }

             }

             //

@@ -3728,7 +3814,6 @@ UiDisplayMenu (
           } while (SavedMenuOption->Skip == 0);

 

           Repaint       = TRUE;

-          OldSkipValue  = SkipValue;

         } else if (!IsSelectable (NextMenuOption)) {

           //

           // Continue to go down until scroll to next page or the selectable option is found.

@@ -3750,9 +3835,18 @@ UiDisplayMenu (
           Repaint     = TRUE;

           MenuOption  = NULL;

         } else {

+          //

+          // Need to remove the current highlight menu.

+          // MenuOption saved the last highlight menu info.

+          //

           MenuOption = MENU_OPTION_FROM_LINK (SavedListEntry);

         }

+

+        SkipValue     = 0;

         NewLine       = TRUE;

+        //

+        // Get the next highlight menu.

+        //

         NewPos        = gMenuOption.ForwardLink;

         MoveToNextStatement (Selection, FALSE, &NewPos, BottomRow - TopRow);

       }

diff --git a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
index c9064f3..dc4facf 100644
--- a/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
+++ b/MdeModulePkg/Universal/SetupBrowserDxe/Ui.h
@@ -1,7 +1,7 @@
 /** @file

 Private structure, MACRO and function definitions for User Interface related functionalities.

 

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

+Copyright (c) 2004 - 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