Merged in the bug fixes from EDK I.

*** Press F9 in Uefi64 FrontPage shouldnot enter sub-menu
** [FT] Some UI error on multiple platforms on framework_20080811
** [FT] UI test of How tall are you(Hex) on framework_20080811

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@5770 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
index 6a1c7280127a7b878b3d502c1c005284ddbe3f32..f0906e76cc22f68276ec3198ed86ccc55edc467d 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
+++ b/MdeModulePkg/Universal/DriverSampleDxe/NVDataStruc.h
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2007, Intel Corporation
+Copyright (c) 2007 - 2008, Intel Corporation
 All rights reserved. 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
@@ -41,7 +41,7 @@ Revision History:
 typedef struct {
   UINT16  WhatIsThePassword[20];
   UINT16  WhatIsThePassword2[20];
-  UINT16  MyStringData[20];
+  UINT16  MyStringData[40];
   UINT16  PasswordClearText[20];
   UINT16  SomethingHiddenForHtml;
   UINT8   HowOldAreYouInYearsManual;

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
index ed431a5e72b6ffe43bef15889682fafb919c508c..b248e7334d21b818ad06d0c37a634298f00c8f5a 100644 (file)
--- a/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
+++ b/MdeModulePkg/Universal/DriverSampleDxe/Vfr.vfr
@@ -276,7 +276,7 @@ formset
               flags    = INTERACTIVE,\r
               key      = 0x1236,\r
               minsize  = 6,\r
-              maxsize  = 20,\r
+              maxsize  = 40,\r
     endstring;\r
 \r
     //\r
@@ -392,7 +392,7 @@ formset
 \r
     date    year varid  = Date.Year,    // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
             prompt      = STRING_TOKEN(STR_DATE_PROMPT),\r
-            help        = STRING_TOKEN(STR_DATE_YEAR_HELP),\r
+            help        = STRING_TOKEN(STR_DATE_HELP),\r
             minimum     = 1998,\r
             maximum     = 2099,\r
             step        = 1,\r
@@ -400,7 +400,7 @@ formset
 \r
             month varid = Date.Month,    // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
             prompt      = STRING_TOKEN(STR_DATE_PROMPT),\r
-            help        = STRING_TOKEN(STR_DATE_MONTH_HELP),\r
+            help        = STRING_TOKEN(STR_DATE_HELP),\r
             minimum     = 1,\r
             maximum     = 12,\r
             step        = 1,\r
@@ -408,7 +408,7 @@ formset
 \r
             day varid   = Date.Day,          // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
             prompt      = STRING_TOKEN(STR_DATE_PROMPT),\r
-            help        = STRING_TOKEN(STR_DATE_DAY_HELP),\r
+            help        = STRING_TOKEN(STR_DATE_HELP),\r
             minimum     = 1,\r
             maximum     = 31,\r
             step        = 0x1,\r
@@ -445,7 +445,7 @@ formset
 \r
     time    hour varid  = Time.Hours,         // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
             prompt      = STRING_TOKEN(STR_TIME_PROMPT),\r
-            help        = STRING_TOKEN(STR_TIME_HOUR_HELP),\r
+            help        = STRING_TOKEN(STR_TIME_HELP),\r
             minimum     = 0,\r
             maximum     = 23,\r
             step        = 1,\r
@@ -453,7 +453,7 @@ formset
 \r
             minute varid  = Time.Minutes,       // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
             prompt        = STRING_TOKEN(STR_TIME_PROMPT),\r
-            help          = STRING_TOKEN(STR_TIME_MINUTE_HELP),\r
+            help          = STRING_TOKEN(STR_TIME_HELP),\r
             minimum       = 0,\r
             maximum       = 59,\r
             step          = 1,\r
@@ -461,7 +461,7 @@ formset
 \r
             second varid  = Time.Seconds,       // Note that it is a member of NULL, so the RTC will be the system resource to retrieve and save from\r
             prompt        = STRING_TOKEN(STR_TIME_PROMPT),\r
-            help          = STRING_TOKEN(STR_TIME_SECOND_HELP),\r
+            help          = STRING_TOKEN(STR_TIME_HELP),\r
             minimum       = 0,\r
             maximum       = 59,\r
             step          = 1,\r

diff --git a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni
index 32e93b513ceee20f2e27af4dedd10df3d4dc6872..d18ceb14fd2deed13e232ffb443f95af1b977ff9 100644 (file)
Binary files a/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni and b/MdeModulePkg/Universal/DriverSampleDxe/VfrStrings.uni differ