mirror of https://github.com/acidanthera/audk.git
Fix FreePoll() bugs in some places.
Removed the dependency to MdeModulePkg in the HiiLibFramework Removed EDK_RELEASE_VERSION and EFI_SPECIFICATION_VERSION in the Framework inf file. other coding style changes git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@7218 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
gdong1
parent
fce9f9bba0
commit
1b74e1c7ff
|
|
@ -1,8 +1,8 @@
|
|||
#/** @file
|
||||
# Library instance for HII common routines.
|
||||
# Library instance for HII common routines.
|
||||
# This library instance implements the common HII routines.
|
||||
#
|
||||
# This library instance implements the common HII routines.
|
||||
# Copyright (c) 2006, Intel Corporation
|
||||
# Copyright (c) 2006, Intel Corporation.
|
||||
#
|
||||
# All rights reserved. This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
|
|
@ -21,12 +21,9 @@
|
|||
MODULE_TYPE = DXE_DRIVER
|
||||
VERSION_STRING = 1.0
|
||||
LIBRARY_CLASS = FrameworkHiiLib,HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
|
||||
EDK_RELEASE_VERSION = 0x00020000
|
||||
EFI_SPECIFICATION_VERSION = 0x00020000
|
||||
|
||||
PI_SPECIFICATION_VERSION = 0x00000009
|
||||
CONSTRUCTOR = FrameworkHiiLibConstructor
|
||||
|
||||
|
||||
#
|
||||
# The following information is for reference only and not required by the build tools.
|
||||
#
|
||||
|
|
|
|||
|
|
@ -804,6 +804,7 @@ ValidateDataFromHiiHandle (
|
|||
//
|
||||
VariableData = AllocateZeroPool (SizeOfNvStore);
|
||||
if (VariableData == NULL) {
|
||||
FreePool (OldData);
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
|
|
@ -832,6 +833,7 @@ ValidateDataFromHiiHandle (
|
|||
|
||||
VariableData = AllocatePool (SizeOfNvStore);
|
||||
if (VariableData == NULL) {
|
||||
FreePool (OldData);
|
||||
return EFI_OUT_OF_RESOURCES;
|
||||
}
|
||||
|
||||
|
|
@ -875,7 +877,7 @@ ValidateDataFromHiiHandle (
|
|||
//
|
||||
if (!GotMatch) {
|
||||
*Results = FALSE;
|
||||
return EFI_SUCCESS;
|
||||
goto EXIT;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -886,7 +888,7 @@ ValidateDataFromHiiHandle (
|
|||
//
|
||||
if (VariableData[((FRAMEWORK_EFI_IFR_CHECKBOX *) &RawData[Index])->QuestionId] > 1) {
|
||||
*Results = FALSE;
|
||||
return EFI_SUCCESS;
|
||||
goto EXIT;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -894,7 +896,7 @@ ValidateDataFromHiiHandle (
|
|||
if ((VariableData[((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->QuestionId] < ((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->Minimum) ||
|
||||
(VariableData[((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->QuestionId] > ((FRAMEWORK_EFI_IFR_NUMERIC *)&RawData[Index])->Maximum)) {
|
||||
*Results = FALSE;
|
||||
return EFI_SUCCESS;
|
||||
goto EXIT;
|
||||
}
|
||||
break;
|
||||
|
||||
|
|
@ -903,11 +905,12 @@ ValidateDataFromHiiHandle (
|
|||
Index = RawData[Index + 1] + Index;
|
||||
}
|
||||
|
||||
EXIT:
|
||||
//
|
||||
// Free our temporary repository of form data
|
||||
//
|
||||
gBS->FreePool (OldData);
|
||||
gBS->FreePool (VariableData);
|
||||
FreePool (OldData);
|
||||
FreePool (VariableData);
|
||||
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,6 +72,8 @@ CreateFormSet (
|
|||
GetCurrentLanguage (CurrentLanguage);
|
||||
Status = AddString (*StringBuffer, CurrentLanguage, FormSetTitle, &StringToken);
|
||||
if (EFI_ERROR (Status)) {
|
||||
FreePool (FormBuffer);
|
||||
FreePool (StringBuffer);
|
||||
return Status;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
#/** @file
|
||||
# EDK Internal Form Refresentation Support Library Instance.
|
||||
#
|
||||
# The library instance provides common library routines help in
|
||||
# IFR creation on-the-fly, HII variable access, HII database access, multi language supports.
|
||||
# Copyright (c) 2006 - 2007, Intel Corporation.
|
||||
# The library instance provides common library routines help in IFR creation on-the-fly,
|
||||
# HII variable access, HII database access, multi language supports.
|
||||
#
|
||||
# Copyright (c) 2006 - 2007, Intel Corporation.
|
||||
#
|
||||
# All rights reserved. This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
|
|
@ -22,8 +23,7 @@
|
|||
MODULE_TYPE = DXE_DRIVER
|
||||
VERSION_STRING = 1.0
|
||||
LIBRARY_CLASS = FrameworkIfrSupportLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
|
||||
EDK_RELEASE_VERSION = 0x00020000
|
||||
EFI_SPECIFICATION_VERSION = 0x00020000
|
||||
PI_SPECIFICATION_VERSION = 0x00000009
|
||||
|
||||
#
|
||||
# The following information is for reference only and not required by the build tools.
|
||||
|
|
@ -40,12 +40,10 @@
|
|||
IfrCommon.c
|
||||
IfrSupportLibInternal.h
|
||||
|
||||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
||||
|
||||
|
||||
[LibraryClasses]
|
||||
UefiRuntimeServicesTableLib
|
||||
UefiBootServicesTableLib
|
||||
|
|
@ -54,11 +52,8 @@
|
|||
BaseLib
|
||||
DebugLib
|
||||
|
||||
|
||||
[Guids]
|
||||
gEfiGlobalVariableGuid # ALWAYS_CONSUMED
|
||||
|
||||
gEfiGlobalVariableGuid # CONSUMED, Variable Name: L"Lan"
|
||||
|
||||
[Protocols]
|
||||
gEfiHiiProtocolGuid # PROTOCOL ALWAYS_CONSUMED
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
#/** @file
|
||||
# Component description file for the entry point to a EFIDXE Drivers
|
||||
# Component description file for the entry point to a EFIDXE Drivers
|
||||
#
|
||||
# Library to abstract Framework extensions that conflict with UEFI 2.0 Specification
|
||||
# Library to abstract Framework extensions that conflict with UEFI 2.0 Specification.
|
||||
# Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the oldconflicts
|
||||
# with library functions and supporting implementations of the old (EDK/EFI 1.10) and new
|
||||
# (EDK II/UEFI 2.0) way. This module is a DXE driver as it contains DXE enum extensions for
|
||||
# EFI event services.
|
||||
#
|
||||
# Help Port Framework/Tinao code that has conflicts with UEFI 2.0 by hiding the oldconflicts with library functions and supporting implementations of the old
|
||||
# (EDK/EFI 1.10) and new (EDK II/UEFI 2.0) way. This module is a DXE driver as it contains DXE enum extensions for EFI event services.
|
||||
# Copyright (c) 2006, Intel Corporation.
|
||||
# Copyright (c) 2006, Intel Corporation.
|
||||
#
|
||||
# All rights reserved. This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
|
|
@ -25,7 +27,6 @@
|
|||
VERSION_STRING = 1.0
|
||||
LIBRARY_CLASS = UefiLib|DXE_CORE DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
|
||||
|
||||
|
||||
#
|
||||
# VALID_ARCHITECTURES = IA32 X64 IPF EBC
|
||||
#
|
||||
|
|
@ -38,12 +39,10 @@
|
|||
UefiLib.c
|
||||
UefiLibInternal.h
|
||||
|
||||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
||||
|
||||
|
||||
[LibraryClasses]
|
||||
PrintLib
|
||||
PcdLib
|
||||
|
|
@ -59,7 +58,6 @@
|
|||
gEfiEventReadyToBootGuid # ALWAYS_CONSUMED
|
||||
gEfiEventLegacyBootGuid # ALWAYS_CONSUMED
|
||||
|
||||
|
||||
[Protocols]
|
||||
gEfiDriverBindingProtocolGuid # ALWAYS_CONSUMED
|
||||
gEfiSimpleTextOutProtocolGuid # ALWAYS_CONSUMED
|
||||
|
|
@ -84,5 +82,3 @@
|
|||
gEfiMdePkgTokenSpaceGuid.PcdComponentName2Disable
|
||||
gEfiMdePkgTokenSpaceGuid.PcdUgaConsumeSupport
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@
|
|||
|
||||
#include <Protocol/FrameworkHii.h>
|
||||
|
||||
#include <Library/HiiLib.h>
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/UefiBootServicesTableLib.h>
|
||||
#include <Library/MemoryAllocationLib.h>
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
#/** @file
|
||||
# Library instance for HII common routines.
|
||||
# Library instance for HII common routines.
|
||||
#
|
||||
# This library instance implements the common HII routines.
|
||||
# Copyright (c) 2006, Intel Corporation
|
||||
# This library instance implements the common HII routines.
|
||||
#
|
||||
# Copyright (c) 2006, Intel Corporation
|
||||
#
|
||||
# All rights reserved. This program and the accompanying materials
|
||||
# are licensed and made available under the terms and conditions of the BSD License
|
||||
|
|
@ -21,13 +22,10 @@
|
|||
MODULE_TYPE = DXE_DRIVER
|
||||
VERSION_STRING = 1.0
|
||||
LIBRARY_CLASS = HiiLib|DXE_DRIVER DXE_RUNTIME_DRIVER DXE_SAL_DRIVER DXE_SMM_DRIVER UEFI_APPLICATION UEFI_DRIVER
|
||||
EDK_RELEASE_VERSION = 0x00020000
|
||||
EFI_SPECIFICATION_VERSION = 0x00020000
|
||||
PI_SPECIFICATION_VERSION = 0x00000009
|
||||
|
||||
CONSTRUCTOR = HiiLibFrameworkConstructor
|
||||
|
||||
|
||||
|
||||
#
|
||||
# The following information is for reference only and not required by the build tools.
|
||||
#
|
||||
|
|
@ -39,10 +37,15 @@
|
|||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
IntelFrameworkPkg/IntelFrameworkPkg.dec
|
||||
|
||||
[LibraryClasses]
|
||||
MemoryAllocationLib
|
||||
UefiBootServicesTableLib
|
||||
DebugLib
|
||||
|
||||
[Protocols]
|
||||
gEfiHiiProtocolGuid # PROTOCOL ALWAYS_CONSUMED
|
||||
|
||||
[Depex]
|
||||
gEfiHiiProtocolGuid
|
||||
|
|
|
|||
Loading…
Reference in New Issue