Fix VS2005 build error

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

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
index dd29f3319acb69043d340506faf2184c2d54bce0..6ec7dc88387edd9c31772fd054f0966a60022cd4 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
@@ -491,7 +491,7 @@ ExtractDataFromHiiHandle (
       //\r
       // Copy the GUID information from this handle\r
       //\r
-      CopyGuid (Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
+      CopyGuid (Guid, (GUID *)(VOID *)&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
       break;\r
 \r
     case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
@@ -764,7 +764,7 @@ ValidateDataFromHiiHandle (
 \r
   for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
     if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
-      CopyGuid (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
+      CopyGuid (&Guid, (GUID *)(VOID *)&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
       break;\r
     }\r
     Index = RawData[Index + 1] + Index;\r

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
index acdd3c44191ff043ad413f36815e1797df3738f4..4bdc40e54bce4428f2626b34554cccec6245bd12 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
@@ -89,7 +89,7 @@ CreateFormSet (
   FormSet.FormSetTitle  = StringToken;\r
   FormSet.Class         = Class;\r
   FormSet.SubClass      = SubClass;\r
-  CopyGuid (&FormSet.Guid, Guid);\r
+  CopyGuid ((GUID *)(VOID *)&FormSet.Guid, Guid);\r
   \r
   //\r
   // Initialize the end formset data\r

diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
index 1859f026c854605afc6ccf876011f867d5fc004a..81570a2111deb7ed778be24bb987051a4719b2f3 100644 (file)
--- a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
+++ b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c
@@ -468,6 +468,7 @@ SaveOverridesMapping (
     // ItemIndex now points to the next PLATFORM_OVERRIDE_ITEM which is not covered by VariableNeededSize\r
     //\r
     VariableBuffer = AllocateZeroPool (VariableNeededSize);\r
+    ASSERT (VariableBuffer != NULL);\r
     ASSERT ((UINTN) VariableBuffer % sizeof(UINTN) == 0);\r
 \r
     //\r

diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
index b9b62b2bacad6a4f9a0828ef100de13b26abd319..0271319f2d2dcfaecaabc235568e488b959b5076 100644 (file)
--- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
+++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c
@@ -178,7 +178,7 @@ UpdateFormPackageData (
       }\r
 \r
       ExtendOpCode = ((EFI_IFR_GUID_LABEL *) IfrOpHdr)->ExtendOpCode;\r
-      LabelNumber = ReadUnaligned16 (&((EFI_IFR_GUID_LABEL *)IfrOpHdr)->Number);\r
+      LabelNumber = ReadUnaligned16 ((UINT16 *)(VOID*)&((EFI_IFR_GUID_LABEL *)IfrOpHdr)->Number);\r
       if ((ExtendOpCode != EFI_IFR_EXTEND_OP_LABEL) || (LabelNumber != Label) \r
           || !CompareGuid ((EFI_GUID *)(UINTN)(&((EFI_IFR_GUID_LABEL *)IfrOpHdr)->Guid), &mIfrVendorGuid)) {\r
         //\r

diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c
index 76e3cb3b8fa5b06becd73553db2216dd01a23e14..9a999c900e3a9b2fe749836360950b94d75aa783 100644 (file)
--- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c
+++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c
@@ -622,13 +622,7 @@ InitializeFtwLite (
 \r
   FtwLiteDevice = NULL;\r
   FtwLiteDevice = AllocatePool (sizeof (EFI_FTW_LITE_DEVICE) + Length);\r
-  if (FtwLiteDevice != NULL) {\r
-    Status = EFI_SUCCESS;\r
-  } else {\r
-    Status = EFI_OUT_OF_RESOURCES;\r
-  }\r
-\r
-  ASSERT_EFI_ERROR (Status);\r
+  ASSERT (FtwLiteDevice != NULL);\r
 \r
   ZeroMem (FtwLiteDevice, sizeof (EFI_FTW_LITE_DEVICE));\r
   FtwLiteDevice->Signature = FTW_LITE_DEVICE_SIGNATURE;\r
@@ -791,7 +785,8 @@ InitializeFtwLite (
       (FtwLiteDevice->FtwSpareLba == (EFI_LBA) (-1))\r
       ) {\r
     DEBUG ((EFI_D_ERROR, "FtwLite: Working or spare FVB not ready\n"));\r
-    ASSERT_EFI_ERROR (Status);\r
+    FreePool (FtwLiteDevice);\r
+    return EFI_ABORTED;\r
   }\r
   //\r
   // Refresh workspace data from working block\r
@@ -831,6 +826,7 @@ InitializeFtwLite (
       //\r
       Status = WorkSpaceRefresh (FtwLiteDevice);\r
       if (EFI_ERROR (Status)) {\r
+        FreePool (FtwLiteDevice);\r
         return EFI_ABORTED;\r
       }\r
     } else {\r
@@ -850,6 +846,7 @@ InitializeFtwLite (
       Status = FtwReclaimWorkSpace (FtwLiteDevice, FALSE);\r
 \r
       if (EFI_ERROR (Status)) {\r
+        FreePool (FtwLiteDevice);\r
         return EFI_ABORTED;\r
       }\r
     }\r
@@ -869,6 +866,7 @@ InitializeFtwLite (
                   &FtwLiteDevice->FtwLiteInstance\r
                   );\r
   if (EFI_ERROR (Status)) {\r
+    FreePool (FtwLiteDevice);\r
     return EFI_ABORTED;\r
   }\r
   //\r
@@ -912,6 +910,7 @@ InitializeFtwLite (
     Status = FtwReclaimWorkSpace (FtwLiteDevice, TRUE);\r
     if (EFI_ERROR (Status)) {\r
       DEBUG ((EFI_D_FTW_LITE, "FtwLite: Workspace reclaim - %r\n", Status));\r
+      FreePool (FtwLiteDevice);\r
       return EFI_ABORTED;\r
     }\r
   }\r

diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
index ebd9d18efbf29e534c57073a0fd349eecb04ddc4..e4ea60cff2ad75457a066fdaec47606455562d6d 100644 (file)
--- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
+++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c
@@ -468,6 +468,7 @@ UpdateDeviceSelectPage (
     //\r
     Len = StrSize (ControllerName);\r
     NewString = AllocateZeroPool (Len + StrSize (L"--"));\r
+    ASSERT (NewString != NULL);\r
     if (EFI_ERROR (CheckMapping (ControllerDevicePath,NULL, &mMappingDataBase, NULL, NULL))) {\r
       StrCat (NewString, L"--");\r
     } else {\r
@@ -762,6 +763,7 @@ UpdateBindingDriverSelectPage (
     // First create the driver image name\r
     //\r
     NewString = AllocateZeroPool (StrSize (DriverName));\r
+    ASSERT (NewString != NULL); \r
     if (EFI_ERROR (CheckMapping (mControllerDevicePathProtocol[mSelectedCtrIndex], LoadedImageDevicePath, &mMappingDataBase, NULL, NULL))) {\r
       FakeNvData->DriSelection[Index] = 0x00;\r
     } else {\r
@@ -894,7 +896,7 @@ UpdatePrioritySelectPage (
   }\r
   \r
   IfrOptionList = AllocateZeroPool (sizeof (IFR_OPTION) * mSelectedDriverImageNum);\r
-  ASSERT_EFI_ERROR (IfrOptionList != NULL);\r
+  ASSERT (IfrOptionList != NULL);\r
   //\r
   // Create order list for those selected drivers\r
   //\r