From 779808545d68d77a5280a1c323066594808c2d5f Mon Sep 17 00:00:00 2001 From: lgao4 Date: Mon, 5 Jan 2009 02:20:16 +0000 Subject: [PATCH] Fix VS2005 build error git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7181 6f19259b-4bc3-4df7-8a09-765794883524 --- .../Library/FrameworkIfrSupportLib/IfrCommon.c | 4 ++-- .../Library/FrameworkIfrSupportLib/IfrOnTheFly.c | 2 +- .../Library/DxePlatDriOverLib/PlatDriOverLib.c | 1 + MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c | 2 +- .../FaultTolerantWriteDxe/FtwLite.c | 15 +++++++-------- .../PlatOverMngr/PlatOverMngr.c | 4 +++- 6 files changed, 15 insertions(+), 13 deletions(-) diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c index dd29f3319a..6ec7dc8838 100644 --- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c +++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c @@ -491,7 +491,7 @@ ExtractDataFromHiiHandle ( // // Copy the GUID information from this handle // - CopyGuid (Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid); + CopyGuid (Guid, (GUID *)(VOID *)&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid); break; case FRAMEWORK_EFI_IFR_ONE_OF_OP: @@ -764,7 +764,7 @@ ValidateDataFromHiiHandle ( for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) { if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) { - CopyGuid (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid); + CopyGuid (&Guid, (GUID *)(VOID *)&((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid); break; } Index = RawData[Index + 1] + Index; diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c index acdd3c4419..4bdc40e54b 100644 --- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c +++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c @@ -89,7 +89,7 @@ CreateFormSet ( FormSet.FormSetTitle = StringToken; FormSet.Class = Class; FormSet.SubClass = SubClass; - CopyGuid (&FormSet.Guid, Guid); + CopyGuid ((GUID *)(VOID *)&FormSet.Guid, Guid); // // Initialize the end formset data diff --git a/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c b/MdeModulePkg/Library/DxePlatDriOverLib/PlatDriOverLib.c index 1859f026c8..81570a2111 100644 --- 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 // VariableBuffer = AllocateZeroPool (VariableNeededSize); + ASSERT (VariableBuffer != NULL); ASSERT ((UINTN) VariableBuffer % sizeof(UINTN) == 0); // diff --git a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c index b9b62b2bac..0271319f2d 100644 --- a/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c +++ b/MdeModulePkg/Library/ExtendedIfrSupportLib/Form.c @@ -178,7 +178,7 @@ UpdateFormPackageData ( } ExtendOpCode = ((EFI_IFR_GUID_LABEL *) IfrOpHdr)->ExtendOpCode; - LabelNumber = ReadUnaligned16 (&((EFI_IFR_GUID_LABEL *)IfrOpHdr)->Number); + LabelNumber = ReadUnaligned16 ((UINT16 *)(VOID*)&((EFI_IFR_GUID_LABEL *)IfrOpHdr)->Number); if ((ExtendOpCode != EFI_IFR_EXTEND_OP_LABEL) || (LabelNumber != Label) || !CompareGuid ((EFI_GUID *)(UINTN)(&((EFI_IFR_GUID_LABEL *)IfrOpHdr)->Guid), &mIfrVendorGuid)) { // diff --git a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c index 76e3cb3b8f..9a999c900e 100644 --- a/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c +++ b/MdeModulePkg/Universal/FirmwareVolume/FaultTolerantWriteDxe/FtwLite.c @@ -622,13 +622,7 @@ InitializeFtwLite ( FtwLiteDevice = NULL; FtwLiteDevice = AllocatePool (sizeof (EFI_FTW_LITE_DEVICE) + Length); - if (FtwLiteDevice != NULL) { - Status = EFI_SUCCESS; - } else { - Status = EFI_OUT_OF_RESOURCES; - } - - ASSERT_EFI_ERROR (Status); + ASSERT (FtwLiteDevice != NULL); ZeroMem (FtwLiteDevice, sizeof (EFI_FTW_LITE_DEVICE)); FtwLiteDevice->Signature = FTW_LITE_DEVICE_SIGNATURE; @@ -791,7 +785,8 @@ InitializeFtwLite ( (FtwLiteDevice->FtwSpareLba == (EFI_LBA) (-1)) ) { DEBUG ((EFI_D_ERROR, "FtwLite: Working or spare FVB not ready\n")); - ASSERT_EFI_ERROR (Status); + FreePool (FtwLiteDevice); + return EFI_ABORTED; } // // Refresh workspace data from working block @@ -831,6 +826,7 @@ InitializeFtwLite ( // Status = WorkSpaceRefresh (FtwLiteDevice); if (EFI_ERROR (Status)) { + FreePool (FtwLiteDevice); return EFI_ABORTED; } } else { @@ -850,6 +846,7 @@ InitializeFtwLite ( Status = FtwReclaimWorkSpace (FtwLiteDevice, FALSE); if (EFI_ERROR (Status)) { + FreePool (FtwLiteDevice); return EFI_ABORTED; } } @@ -869,6 +866,7 @@ InitializeFtwLite ( &FtwLiteDevice->FtwLiteInstance ); if (EFI_ERROR (Status)) { + FreePool (FtwLiteDevice); return EFI_ABORTED; } // @@ -912,6 +910,7 @@ InitializeFtwLite ( Status = FtwReclaimWorkSpace (FtwLiteDevice, TRUE); if (EFI_ERROR (Status)) { DEBUG ((EFI_D_FTW_LITE, "FtwLite: Workspace reclaim - %r\n", Status)); + FreePool (FtwLiteDevice); return EFI_ABORTED; } } diff --git a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c index ebd9d18efb..e4ea60cff2 100644 --- a/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c +++ b/MdeModulePkg/Universal/PlatformDriverOverride/PlatOverMngr/PlatOverMngr.c @@ -468,6 +468,7 @@ UpdateDeviceSelectPage ( // Len = StrSize (ControllerName); NewString = AllocateZeroPool (Len + StrSize (L"--")); + ASSERT (NewString != NULL); if (EFI_ERROR (CheckMapping (ControllerDevicePath,NULL, &mMappingDataBase, NULL, NULL))) { StrCat (NewString, L"--"); } else { @@ -762,6 +763,7 @@ UpdateBindingDriverSelectPage ( // First create the driver image name // NewString = AllocateZeroPool (StrSize (DriverName)); + ASSERT (NewString != NULL); if (EFI_ERROR (CheckMapping (mControllerDevicePathProtocol[mSelectedCtrIndex], LoadedImageDevicePath, &mMappingDataBase, NULL, NULL))) { FakeNvData->DriSelection[Index] = 0x00; } else { @@ -894,7 +896,7 @@ UpdatePrioritySelectPage ( } IfrOptionList = AllocateZeroPool (sizeof (IFR_OPTION) * mSelectedDriverImageNum); - ASSERT_EFI_ERROR (IfrOptionList != NULL); + ASSERT (IfrOptionList != NULL); // // Create order list for those selected drivers // -- 2.39.2