Not update the imageId for EXT1,2,4 type.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@14829 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
index ccd1975573d4fa84e911424b35fabf79ecf242d2..efa5bbb71b8b5e3002bd3bc819abfeca2198fbf6 100644 (file)
--- a/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
+++ b/MdeModulePkg/Universal/HiiDatabaseDxe/Image.c
@@ -2,7 +2,7 @@
 Implementation for EFI_HII_IMAGE_PROTOCOL.\r
 \r
 \r
 Implementation for EFI_HII_IMAGE_PROTOCOL.\r
 \r
 \r

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

 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
 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


@@ -81,7 +81,6 @@ GetImageIdOrAddress (
     case EFI_HII_IIBT_EXT1:\r
       Length8 = *(ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8));\r
       ImageBlock += Length8;\r
     case EFI_HII_IIBT_EXT1:\r
       Length8 = *(ImageBlock + sizeof (EFI_HII_IMAGE_BLOCK) + sizeof (UINT8));\r
       ImageBlock += Length8;\r

-      ImageIdCurrent++;\r

       break;\r
     case EFI_HII_IIBT_EXT2:\r
       CopyMem (\r
       break;\r
     case EFI_HII_IIBT_EXT2:\r
       CopyMem (\r


@@ -90,7 +89,6 @@ GetImageIdOrAddress (
         sizeof (UINT16)\r
         );\r
       ImageBlock += Length16;\r
         sizeof (UINT16)\r
         );\r
       ImageBlock += Length16;\r

-      ImageIdCurrent++;\r

       break;\r
     case EFI_HII_IIBT_EXT4:\r
       CopyMem (\r
       break;\r
     case EFI_HII_IIBT_EXT4:\r
       CopyMem (\r


@@ -99,7 +97,6 @@ GetImageIdOrAddress (
         sizeof (UINT32)\r
         );\r
       ImageBlock += Length32;\r
         sizeof (UINT32)\r
         );\r
       ImageBlock += Length32;\r

-      ImageIdCurrent++;\r

       break;\r
 \r
     case EFI_HII_IIBT_IMAGE_1BIT:\r
       break;\r
 \r
     case EFI_HII_IIBT_IMAGE_1BIT:\r