Code Clean up for IfrSupportLib, HiiLib, PeiExtractGuidedSectionLib and DxeExtractGui...

[mirror_edk2.git] / MdePkg / Library / HiiLib / HiiLib.c

diff --git a/MdePkg/Library/HiiLib/HiiLib.c b/MdePkg/Library/HiiLib/HiiLib.c
index efae6780bc2356d1945abeacd12c97a0e7bc7f1b..81a7241cc9dd5d20b0d810e1b442d85487fa8337 100644 (file)
--- a/MdePkg/Library/HiiLib/HiiLib.c
+++ b/MdePkg/Library/HiiLib/HiiLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   HII Library implementation that uses DXE protocols and services.\r
 \r
-  Copyright (c) 2006, Intel Corporation<BR>\r
+  Copyright (c) 2006 - 2008, Intel Corporation<BR>\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
@@ -14,10 +14,8 @@
 \r
 #include "InternalHiiLib.h"\r
 \r
-CONST EFI_HII_DATABASE_PROTOCOL   *mHiiDatabaseProt;\r
-CONST EFI_HII_STRING_PROTOCOL     *mHiiStringProt;\r
-BOOLEAN mHiiProtocolsInitialized = FALSE;\r
-\r
+CONST EFI_HII_DATABASE_PROTOCOL   *mHiiDatabaseProt = NULL;\r
+CONST EFI_HII_STRING_PROTOCOL     *mHiiStringProt = NULL;\r
 \r
 /**\r
 \r
@@ -31,7 +29,7 @@ LocateHiiProtocols (
 {\r
   EFI_STATUS  Status;\r
 \r
-  if (mHiiProtocolsInitialized) {\r
+  if (mHiiStringProt != NULL && mHiiDatabaseProt != NULL) {\r
     //\r
     // Only need to initialize the protocol instance once.\r
     //\r
@@ -43,8 +41,6 @@ LocateHiiProtocols (
 \r
   Status = gBS->LocateProtocol (&gEfiHiiStringProtocolGuid, NULL, (VOID **) &mHiiStringProt);\r
   ASSERT_EFI_ERROR (Status);\r
-\r
-  mHiiProtocolsInitialized = TRUE;\r
 }\r
 \r
 \r
@@ -112,7 +108,7 @@ InternalHiiLibPreparePackages (
   PackageListHeader = AllocateZeroPool (PackageListLength);\r
   ASSERT (PackageListHeader != NULL);\r
   \r
-  CopyMem (&PackageListHeader->PackageListGuid, GuidId, sizeof (EFI_GUID));\r
+  CopyGuid (&PackageListHeader->PackageListGuid, GuidId);\r
   PackageListHeader->PackageLength = PackageListLength;\r
 \r
   PackageListData = ((UINT8 *) PackageListHeader) + sizeof (EFI_HII_PACKAGE_LIST_HEADER);\r
@@ -304,6 +300,7 @@ HiiLibGetHiiHandles (
 \r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
       *HiiHandleBuffer = AllocateZeroPool (BufferLength);\r
+      ASSERT (*HiiHandleBuffer != NULL);\r
       Status = mHiiDatabaseProt->ListPackageLists (\r
                                      mHiiDatabaseProt,\r
                                      EFI_HII_PACKAGE_TYPE_ALL,\r
@@ -366,13 +363,14 @@ HiiLibExtractGuidFromHiiHandle (
     Status = mHiiDatabaseProt->ExportPackageLists (mHiiDatabaseProt, Handle, &BufferSize, HiiPackageList);\r
   }\r
   if (EFI_ERROR (Status)) {\r
+    FreePool (HiiPackageList);\r
     return Status;\r
   }\r
 \r
   //\r
   // Extract GUID\r
   //\r
-  CopyMem (Guid, &HiiPackageList->PackageListGuid, sizeof (EFI_GUID));\r
+  CopyGuid (Guid, &HiiPackageList->PackageListGuid);\r
 \r
   FreePool (HiiPackageList);\r
 \r