Correct BlockSize when call ConfigToBlock API.

[mirror_edk2.git] / EdkCompatibilityPkg / Compatibility / FrameworkHiiOnUefiHiiThunk / ConfigAccess.c

diff --git a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
index 2969f6b34671b099f668c7ae51c453a22378c23a..4701a31457a14acdb81c99673401165eebce192f 100644 (file)
--- a/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
+++ b/EdkCompatibilityPkg/Compatibility/FrameworkHiiOnUefiHiiThunk/ConfigAccess.c
@@ -3,7 +3,7 @@
   by HII Thunk Modules. These Config access Protocols are used to thunk UEFI Config \r
   Access Callback to Framework HII Callback and EFI Variable Set/Get operations.\r
   \r
-Copyright (c) 2008, Intel Corporation\r
+Copyright (c) 2008 - 2010, Intel Corporation\r
 All rights reserved. This program and the accompanying materials\r
 are licensed and made available under the terms and conditions of the BSD License\r
 which accompanies this distribution.  The full text of the license may be found at\r
@@ -551,7 +551,6 @@ ThunkRouteConfig (
   VOID                                        *Data;\r
   UINTN                                       DataSize;\r
   UINTN                                       DataSize2;\r
-  UINTN                                       LastModifiedByteIndex;\r
   BOOLEAN                                     ResetRequired;\r
   BOOLEAN                                     DataAllocated;\r
 \r
@@ -602,11 +601,12 @@ ThunkRouteConfig (
     }\r
   }\r
 \r
+  DataSize = DataSize2;\r
   Status = mHiiConfigRoutingProtocol->ConfigToBlock (\r
                                           mHiiConfigRoutingProtocol,\r
                                           Configuration,\r
                                           Data,\r
-                                          &LastModifiedByteIndex,\r
+                                          &DataSize,\r
                                           Progress\r
                                           );\r
   if (EFI_ERROR (Status)) {\r
@@ -633,7 +633,6 @@ ThunkRouteConfig (
                     Data,\r
                     &ResetRequired\r
                     );\r
-      \r
     }\r
   }\r
 \r
@@ -700,6 +699,10 @@ CreateIfrDataArray (
         Size = StrSize (String);\r
       }\r
       break;\r
+\r
+    case EFI_IFR_TYPE_ACTION:\r
+      Size = 0;\r
+      break;\r
       \r
     default:\r
       ASSERT (FALSE);\r
@@ -755,6 +758,10 @@ CreateIfrDataArray (
           FreePool (String);\r
         }\r
         break;\r
+\r
+      case EFI_IFR_TYPE_ACTION:\r
+        break;\r
+\r
       default:\r
         ASSERT (FALSE);\r
         break;\r