[edk2] [Patch 5/8] MdeModulePkg: Update SerialDxe inf to include the module uni
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- MdeModulePkg/Universal/SerialDxe/SerialDxe.inf | 4 1 file changed, 4 insertions(+) diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf index 145101b..164060b 100644 --- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf +++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf @@ -16,6 +16,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = SerialDxe + MODULE_UNI_FILE= SerialDxe.uni FILE_GUID = D3987D4B-971A-435F-8CAF-4967EB627241 MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 @@ -47,3 +48,6 @@ [Depex] TRUE + +[UserExtensions.TianoCore."ExtraFiles"] + SerialDxeExtra.uni -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch 7/8] NetworkPkg: Update module inf to include the missing uni file
Update DnsDxe and HttpUtilitiesDxe inf files. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- NetworkPkg/DnsDxe/DnsDxe.inf | 5 +++-- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NetworkPkg/DnsDxe/DnsDxe.inf b/NetworkPkg/DnsDxe/DnsDxe.inf index 0d1efd8..bf9dc3d 100644 --- a/NetworkPkg/DnsDxe/DnsDxe.inf +++ b/NetworkPkg/DnsDxe/DnsDxe.inf @@ -22,6 +22,7 @@ VERSION_STRING= 1.0 ENTRY_POINT = DnsDriverEntryPoint UNLOAD_IMAGE = DnsUnload + MODULE_UNI_FILE = DnsDxe.uni [Packages] MdePkg/MdePkg.dec @@ -73,6 +74,6 @@ gEfiDhcp6ServiceBindingProtocolGuid ## SOMETIMES_CONSUMES gEfiDhcp6ProtocolGuid ## SOMETIMES_CONSUMES - -[Guids] +[UserExtensions.TianoCore."ExtraFiles"] + DnsDxeExtra.uni diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf index c101e6f..ffdbcd5 100644 --- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf +++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf @@ -21,6 +21,7 @@ VERSION_STRING= 1.0 ENTRY_POINT = HttpUtilitiesDxeDriverEntryPoint UNLOAD_IMAGE = HttpUtilitiesDxeUnload + MODULE_UNI_FILE = HttpUtilitiesDxe.uni [Packages] MdePkg/MdePkg.dec @@ -47,5 +48,5 @@ [Depex] TRUE -[Guids] - +[UserExtensions.TianoCore."ExtraFiles"] + HttpUtilitiesDxeExtra.uni -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch 2/8] MdeModulePkg: Add the missing Library uni files of ImageDecode instances
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- .../BmpImageDecoderLib/BmpImageDecoderLib.inf | 1 + .../BmpImageDecoderLib/BmpImageDecoderLib.uni | 26 ++ MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf | 1 + MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni | 26 ++ .../Library/ImageDecoderLib/ImageDecoderLib.inf| 9 .../Library/ImageDecoderLib/ImageDecoderLib.uni| 26 ++ 6 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni create mode 100644 MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni create mode 100644 MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni diff --git a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf index 2d1c160..0bde46c 100644 --- a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf +++ b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf @@ -15,6 +15,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BmpImageDecoderLib + MODULE_UNI_FILE= BmpImageDecoderLib.uni FILE_GUID = DF414223-F17C-4022-A1F4-4062612AB00D MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni new file mode 100644 index 000..334144b --- /dev/null +++ b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni @@ -0,0 +1,26 @@ +// /** @file +// This library provides BMP image decoding capability. +// +// This library provides BMP image decoding capability. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"This library provides BMP image decoding capability." + +#string STR_MODULE_DESCRIPTION +#language en-US +"This library provides BMP image decoding capability." + + diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf index 673a4ce..8698f26 100644 --- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf @@ -16,6 +16,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BootLogoLib + MODULE_UNI_FILE= BootLogoLib.uni FILE_GUID = F5AE5B5C-42E8-4A9B-829D-5B631CD5367A MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni new file mode 100644 index 000..fae0335 --- /dev/null +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni @@ -0,0 +1,26 @@ +// /** @file +// This library is only intended to be used by PlatformBootManagerLib +// +// to show progress bar and logo. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"This library is only intended to be used by PlatformBootManagerLib" + +#string STR_MODULE_DESCRIPTION +#language en-US +"to show progress bar and logo." + + diff --git a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf b/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf index 5d2ee7b..7ebeec6 100644 --- a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf +++ b/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf @@ -1,21 +1,22 @@ ## @file # This library provides image decoding service by managing the different # image decoding libraries. -# +# # Copyright (c) 2011 - 2015, 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 that accompanies this distribution. # The full text
[edk2] [Patch 1/8] MdeModulePkg: Add the missing Library uni files of Ipmi instances
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- .../Library/BaseIpmiLibNull/BaseIpmiLibNull.inf| 1 + .../Library/BaseIpmiLibNull/BaseIpmiLibNull.uni| 25 ++ .../DxeIpmiLibIpmiProtocol.inf | 1 + .../DxeIpmiLibIpmiProtocol.uni | 25 ++ .../PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf| 1 + .../PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni| 25 ++ .../SmmIpmiLibSmmIpmiProtocol.inf | 1 + .../SmmIpmiLibSmmIpmiProtocol.uni | 25 ++ 8 files changed, 104 insertions(+) create mode 100644 MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni create mode 100644 MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni create mode 100644 MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni create mode 100644 MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.uni diff --git a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf b/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf index fc9d06d..efd8c0a 100644 --- a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf +++ b/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.inf @@ -16,6 +16,7 @@ [Defines] INF_VERSION = 0x00010005 BASE_NAME = BaseIpmiLibNull + MODULE_UNI_FILE = BaseIpmiLibNull.uni FILE_GUID = 46805D61-0BB8-4680-A9BE-C96C751AB5A4 MODULE_TYPE = BASE VERSION_STRING= 1.0 diff --git a/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni b/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni new file mode 100644 index 000..0e8fd69 --- /dev/null +++ b/MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni @@ -0,0 +1,25 @@ +// /** @file +// Null Instance of IPMI Library. +// +// Null Instance of IPMI Library. +// +// Copyright (c) 2015, 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 +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"Null Instance of IPMI Library." + +#string STR_MODULE_DESCRIPTION +#language en-US +"Null Instance of IPMI Library." + + diff --git a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf b/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf index 5b56b39..d756431 100644 --- a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf +++ b/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.inf @@ -16,6 +16,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = DxeIpmiLibIpmiProtocol + MODULE_UNI_FILE= DxeIpmiLibIpmiProtocol.uni FILE_GUID = 62408AD5-4EAC-432B-AB9B-C4B85BFAED02 MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni b/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni new file mode 100644 index 000..5b7814b --- /dev/null +++ b/MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni @@ -0,0 +1,25 @@ +// /** @file +// Instance of IPMI Library in DXE phase for SMS. +// +// Instance of IPMI Library in DXE phase for SMS. +// +// Copyright (c) 2015, 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 +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"Instance of IPMI Library in DXE phase for SMS." + +#string STR_MODULE_DESCRIPTION +#language en-US +"Instance of IPMI Library in DXE phase for SMS." + + diff --git a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf b/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf index e2e2646..4a3cc6c 100644 --- a/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf +++ b/MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf @@ -16,6 +16,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = PeiIpmiLibIpmiPpi +
[edk2] [Patch 4/8] MdeModulePkg: Add the missing module uni in RegularExpressionDxe
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- .../RegularExpressionDxe/RegularExpressionDxe.inf | 3 +++ .../RegularExpressionDxe/RegularExpressionDxe.uni | 26 ++ .../RegularExpressionDxeExtra.uni | 18 +++ 3 files changed, 47 insertions(+) create mode 100644 MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.uni create mode 100644 MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxeExtra.uni diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf index cfe42a6..26b88e4 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf @@ -15,6 +15,7 @@ [Defines] INF_VERSION = 0x00010018 BASE_NAME = RegularExpressionDxe + MODULE_UNI_FILE = RegularExpressionDxe.uni FILE_GUID = 3E197E9C-D8DC-42D3-89CE-B04FA9833756 MODULE_TYPE = UEFI_DRIVER VERSION_STRING = 1.0 @@ -95,3 +96,5 @@ # Oniguruma: 'type cast' : truncation from 'OnigUChar *' to 'unsigned int' MSFT:*_*_*_CC_FLAGS = /wd4305 /wd4306 +[UserExtensions.TianoCore."ExtraFiles"] + RegularExpressionDxeExtra.uni diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.uni b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.uni new file mode 100644 index 000..45a2ccf --- /dev/null +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.uni @@ -0,0 +1,26 @@ +// /** @file +// EFI_REGULAR_EXPRESSION_PROTOCOL Implementation +// +// EFI_REGULAR_EXPRESSION_PROTOCOL Implementation +// +// Copyright (c) 2015, 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 that accompanies this +// distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT +// WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"EFI_REGULAR_EXPRESSION_PROTOCOL Implementation" + +#string STR_MODULE_DESCRIPTION +#language en-US +"EFI_REGULAR_EXPRESSION_PROTOCOL Implementation" + + diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxeExtra.uni b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxeExtra.uni new file mode 100644 index 000..f83cd3a --- /dev/null +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxeExtra.uni @@ -0,0 +1,18 @@ +// /** @file +// RegularExpressionDxe Localized Strings and Content +// +// Copyright (c) 2015, 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 that accompanies this +// distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, WITHOUT +// WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_PROPERTIES_MODULE_NAME #language en-US "RegularExpressionDxe module" + + -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch 0/8] Add the missing module uni and extra uni files
Liming Gao (8): MdeModulePkg: Add the missing Library uni files of Ipmi instances MdeModulePkg: Add the missing Library uni files of ImageDecode instances MdeModulePkg: Add the missing library uni files of UI instances MdeModulePkg: Add the missing module uni in RegularExpressionDxe MdeModulePkg: Update SerialDxe inf to include the module uni UefiCpuPkg: Add the missing module uni for CpuS3DataDxe NetworkPkg: Update module inf to include the missing uni file IntelFrameworkModulePkg: Remove the undefined PCD help and prompt strings .../IntelFrameworkModulePkg.uni| 26 +- .../Library/BaseIpmiLibNull/BaseIpmiLibNull.inf| 1 + .../Library/BaseIpmiLibNull/BaseIpmiLibNull.uni| 25 ++ .../BmpImageDecoderLib/BmpImageDecoderLib.inf | 1 + .../BmpImageDecoderLib/BmpImageDecoderLib.uni | 26 ++ MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf | 1 + MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni | 26 ++ .../BootMaintenanceManagerLib.inf | 1 + .../BootMaintenanceManagerLib.uni | 26 ++ .../Library/BootManagerLib/BootManagerLib.inf | 1 + .../Library/BootManagerLib/BootManagerLib.uni | 26 ++ .../Library/DeviceManagerLib/DeviceManagerLib.inf | 1 + .../Library/DeviceManagerLib/DeviceManagerLib.uni | 26 ++ .../DxeIpmiLibIpmiProtocol.inf | 1 + .../DxeIpmiLibIpmiProtocol.uni | 25 ++ .../Library/FileExplorerLib/FileExplorerLib.inf| 1 + .../Library/FileExplorerLib/FileExplorerLib.uni| 26 ++ .../Library/ImageDecoderLib/ImageDecoderLib.inf| 9 ++--- .../Library/ImageDecoderLib/ImageDecoderLib.uni| 26 ++ .../PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.inf| 1 + .../PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni| 25 ++ .../SmmIpmiLibSmmIpmiProtocol.inf | 1 + .../SmmIpmiLibSmmIpmiProtocol.uni | 25 ++ .../RegularExpressionDxe/RegularExpressionDxe.inf | 3 ++ .../RegularExpressionDxe/RegularExpressionDxe.uni | 26 ++ .../RegularExpressionDxeExtra.uni | 18 ++ MdeModulePkg/Universal/SerialDxe/SerialDxe.inf | 4 +++ NetworkPkg/DnsDxe/DnsDxe.inf | 5 +-- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf | 5 +-- UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 4 +++ UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni | 40 ++ UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni | 20 +++ 32 files changed, 419 insertions(+), 33 deletions(-) create mode 100644 MdeModulePkg/Library/BaseIpmiLibNull/BaseIpmiLibNull.uni create mode 100644 MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni create mode 100644 MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni create mode 100644 MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni create mode 100644 MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni create mode 100644 MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.uni create mode 100644 MdeModulePkg/Library/DxeIpmiLibIpmiProtocol/DxeIpmiLibIpmiProtocol.uni create mode 100644 MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.uni create mode 100644 MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni create mode 100644 MdeModulePkg/Library/PeiIpmiLibIpmiPpi/PeiIpmiLibIpmiPpi.uni create mode 100644 MdeModulePkg/Library/SmmIpmiLibSmmIpmiProtocol/SmmIpmiLibSmmIpmiProtocol.uni create mode 100644 MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.uni create mode 100644 MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxeExtra.uni create mode 100644 UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni create mode 100644 UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch 6/8] UefiCpuPkg: Add the missing module uni for CpuS3DataDxe
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 4 +++ UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni | 40 +++ UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni | 20 ++ 3 files changed, 64 insertions(+) create mode 100644 UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni create mode 100644 UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf index 9143b87..857e12b 100644 --- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -25,6 +25,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = CpuS3DataDxe + MODULE_UNI_FILE= CpuS3DataDxe.uni FILE_GUID = 4D2E57EE-0E3F-44DD-93C4-D3B57E96945D MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 @@ -62,3 +63,6 @@ [Depex] gEfiMpServiceProtocolGuid + +[UserExtensions.TianoCore."ExtraFiles"] + CpuS3DataDxeExtra.uni diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni new file mode 100644 index 000..4a0218f --- /dev/null +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni @@ -0,0 +1,40 @@ +// /** @file +// ACPI CPU Data initialization module +// +// This module initializes the ACPI_CPU_DATA structure and registers the address +// of this structure in the PcdCpuS3DataAddress PCD. This is a generic/simple +// version of this module. It does not provide a machine check handler or CPU +// register initialization tables for ACPI S3 resume. It also only supports the +// number of CPUs reported by the MP Services Protocol, so this module does not +// support hot plug CPUs. This module can be copied into a CPU specific package +// and customized if these additional features are required. +// +// Copyright (c) 2015, Intel Corporation. All rights reserved. +// +// Copyright (c) 2015, Red Hat, Inc. +// +// This program and the accompanying materials +// are licensed and made available under the terms and conditions of the BSD License +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"ACPI CPU Data initialization module" + +#string STR_MODULE_DESCRIPTION +#language en-US +"This module initializes the ACPI_CPU_DATA structure and registers the address " +"of this structure in the PcdCpuS3DataAddress PCD. This is a generic/simple " +"version of this module. It does not provide a machine check handler or CPU " +"register initialization tables for ACPI S3 resume. It also only supports the " +"number of CPUs reported by the MP Services Protocol, so this module does not " +"support hot plug CPUs. This module can be copied into a CPU specific package " +"and customized if these additional features are required." + + diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni new file mode 100644 index 000..050f25f --- /dev/null +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni @@ -0,0 +1,20 @@ +// /** @file +// CpuS3DataDxe Localized Strings and Content +// +// Copyright (c) 2015, Intel Corporation. All rights reserved. +// +// Copyright (c) 2015, Red Hat, Inc. +// +// This program and the accompanying materials +// are licensed and made available under the terms and conditions of the BSD License +// which accompanies this distribution. The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_PROPERTIES_MODULE_NAME #language en-US "CpuS3DataDxe module" + + -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch 8/8] IntelFrameworkModulePkg: Remove the undefined PCD help and prompt strings
IntelFrameworkModulePkg.uni includes some undefined PCD help and prompt strings, which will be removed. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- .../IntelFrameworkModulePkg.uni| 26 +- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni index 019edf7..8528f5d 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni @@ -10,7 +10,7 @@ // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // @@ -102,22 +102,6 @@ "TRUE - Use the optimized timing for best PS2 detection performance.\n" "FALSE - Use the normal timing to detect PS2." -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoHorizontalResolution_PROMPT #language en-US "Video Horizontal Resolution of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoHorizontalResolution_HELP #language en-US "Specify the video horizontal resolution of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoVerticalResolution_PROMPT #language en-US "Video Vertical Resolution of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoVerticalResolution_HELP #language en-US "Specify the video vertical resolution of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutColumn_PROMPT #language en-US "Console Output Column of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutColumn_HELP #language en-US "Specify the console output column of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutRow_PROMPT #language en-US "Console Output Row of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutRow_HELP #language en-US "Specify the console output row of text setup." - #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_PROMPT #language en-US "Report StatusCode via OEM Device" #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_HELP #language en-US "Indicates if OEM device is enabled as StatusCode report device. It is only used in Framework StatusCode implementation. \n" @@ -172,14 +156,6 @@ "TRUE - The complete boot cycle has not happened before.\n" "FALSE - The complete boot cycle has happened before." -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformBootTimeOut_PROMPT #language en-US "Boot Timeout (s)" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformBootTimeOut_HELP #language en-US "The number of seconds that the firmware will wait before initiating the original default boot selection. A value of 0 indicates that the default boot selection is to be initiated immediately on boot. The value of 0x then firmware will wait for user input before booting." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHardwareErrorRecordLevel_PROMPT #language en-US "Error Level For Hardware Recorder" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHardwareErrorRecordLevel_HELP #language en-US "Error level for hardware recorder. If value 0, platform does not support feature of hardware error record." - #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_PROMPT #language en-US "Reserved Memory Base Address for OPROM" #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_HELP #language en-US "Specify memory base address for OPROM to find free memory.\n" -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch 3/8] MdeModulePkg: Add the missing library uni files of UI instances
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao--- .../BootMaintenanceManagerLib.inf | 1 + .../BootMaintenanceManagerLib.uni | 26 ++ .../Library/BootManagerLib/BootManagerLib.inf | 1 + .../Library/BootManagerLib/BootManagerLib.uni | 26 ++ .../Library/DeviceManagerLib/DeviceManagerLib.inf | 1 + .../Library/DeviceManagerLib/DeviceManagerLib.uni | 26 ++ .../Library/FileExplorerLib/FileExplorerLib.inf| 1 + .../Library/FileExplorerLib/FileExplorerLib.uni| 26 ++ 8 files changed, 108 insertions(+) create mode 100644 MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni create mode 100644 MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni create mode 100644 MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.uni create mode 100644 MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.uni diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf index 7db201d..302cb90 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf +++ b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf @@ -14,6 +14,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BootMaintenanceManagerLib + MODULE_UNI_FILE= BootMaintenanceManagerLib.uni FILE_GUID = CA9E4824-4198-4715-AA22-E2935E703A07 MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni new file mode 100644 index 000..44411c8 --- /dev/null +++ b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni @@ -0,0 +1,26 @@ +// /** @file +// Boot Maintenance Manager Library used by UiApp. +// +// Boot Maintenance Manager Library used by UiApp. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"Boot Maintenance Manager Library used by UiApp." + +#string STR_MODULE_DESCRIPTION +#language en-US +"Boot Maintenance Manager Library used by UiApp." + + diff --git a/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf index ff19516..8930414 100644 --- a/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf +++ b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf @@ -14,6 +14,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BootManagerLib + MODULE_UNI_FILE= BootManagerLib.uni FILE_GUID = CCB2DCE1-4FC8-41CB-88C5-D349E134C9FC MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni new file mode 100644 index 000..5ffa9de --- /dev/null +++ b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni @@ -0,0 +1,26 @@ +// /** @file +// Boot Manager Library used by UiApp. +// +// Boot Manager Library used by UiApp. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"Boot Manager Library used by UiApp." + +#string STR_MODULE_DESCRIPTION +#language en-US +"Boot Manager Library used by UiApp." + + diff --git a/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.inf b/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.inf index e6f703a..7baf566 100644 --- a/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.inf +++ b/MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.inf @@ -14,6 +14,7 @@ [Defines] INF_VERSION= 0x00010005
Re: [edk2] [Patch 5/8] MdeModulePkg: Update SerialDxe inf to include the module uni
Reviewed-by: Star Zeng-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 5/8] MdeModulePkg: Update SerialDxe inf to include the module uni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- MdeModulePkg/Universal/SerialDxe/SerialDxe.inf | 4 1 file changed, 4 insertions(+) diff --git a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf index 145101b..164060b 100644 --- a/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf +++ b/MdeModulePkg/Universal/SerialDxe/SerialDxe.inf @@ -16,6 +16,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = SerialDxe + MODULE_UNI_FILE= SerialDxe.uni FILE_GUID = D3987D4B-971A-435F-8CAF-4967EB627241 MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 @@ -47,3 +48,6 @@ [Depex] TRUE + +[UserExtensions.TianoCore."ExtraFiles"] + SerialDxeExtra.uni -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch 3/8] MdeModulePkg: Add the missing library uni files of UI instances
Reviewed-by: Eric Dong-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 3/8] MdeModulePkg: Add the missing library uni files of UI instances Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- .../BootMaintenanceManagerLib.inf | 1 + .../BootMaintenanceManagerLib.uni | 26 ++ .../Library/BootManagerLib/BootManagerLib.inf | 1 + .../Library/BootManagerLib/BootManagerLib.uni | 26 ++ .../Library/DeviceManagerLib/DeviceManagerLib.inf | 1 + .../Library/DeviceManagerLib/DeviceManagerLib.uni | 26 ++ .../Library/FileExplorerLib/FileExplorerLib.inf| 1 + .../Library/FileExplorerLib/FileExplorerLib.uni| 26 ++ 8 files changed, 108 insertions(+) create mode 100644 MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni create mode 100644 MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni create mode 100644 MdeModulePkg/Library/DeviceManagerLib/DeviceManagerLib.uni create mode 100644 MdeModulePkg/Library/FileExplorerLib/FileExplorerLib.uni diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf index 7db201d..302cb90 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.inf +++ b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceMana +++ gerLib.inf @@ -14,6 +14,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BootMaintenanceManagerLib + MODULE_UNI_FILE= BootMaintenanceManagerLib.uni FILE_GUID = CA9E4824-4198-4715-AA22-E2935E703A07 MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceManagerLib.uni new file mode 100644 index 000..44411c8 --- /dev/null +++ b/MdeModulePkg/Library/BootMaintenanceManagerLib/BootMaintenanceMana +++ gerLib.uni @@ -0,0 +1,26 @@ +// /** @file +// Boot Maintenance Manager Library used by UiApp. +// +// Boot Maintenance Manager Library used by UiApp. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at // +http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" +BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"Boot Maintenance Manager Library used by UiApp." + +#string STR_MODULE_DESCRIPTION +#language en-US +"Boot Maintenance Manager Library used by UiApp." + + diff --git a/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf index ff19516..8930414 100644 --- a/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf +++ b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.inf @@ -14,6 +14,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BootManagerLib + MODULE_UNI_FILE= BootManagerLib.uni FILE_GUID = CCB2DCE1-4FC8-41CB-88C5-D349E134C9FC MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni new file mode 100644 index 000..5ffa9de --- /dev/null +++ b/MdeModulePkg/Library/BootManagerLib/BootManagerLib.uni @@ -0,0 +1,26 @@ +// /** @file +// Boot Manager Library used by UiApp. +// +// Boot Manager Library used by UiApp. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at // +http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" +BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"Boot Manager Library used by UiApp." + +#string STR_MODULE_DESCRIPTION +#language en-US +"Boot Manager Library used by UiApp." + + diff --git
[edk2] [PATCH] ShellPkg: Fix memory leak in 'InternalShellExecuteDevicePath'.
Cc: Ruiyu NiCc: Jaben Carsey Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yao Jiewen Reviewed-by: Qiu Shumin --- ShellPkg/Application/Shell/ShellProtocol.c | 1 + 1 file changed, 1 insertion(+) diff --git a/ShellPkg/Application/Shell/ShellProtocol.c b/ShellPkg/Application/Shell/ShellProtocol.c index 2ddb64d..a6bf9c2 100644 --- a/ShellPkg/Application/Shell/ShellProtocol.c +++ b/ShellPkg/Application/Shell/ShellProtocol.c @@ -1468,6 +1468,7 @@ InternalShellExecuteDevicePath( if (NewHandle != NULL) { gBS->UnloadImage(NewHandle); } +FreePool (NewCmdLine); return (Status); } Status = gBS->OpenProtocol( -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg: Fix memory leak when running Shell script.
Reviewed-by: Ruiyu NiPlease separate the patch to two commits when you check in: The change to DoShellPrompt() is to fix the TAB-auto-completion memory leak. -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Qiu Shumin Sent: Wednesday, December 23, 2015 10:16 PM To: edk2-devel@lists.01.org Cc: Carsey, Jaben ; Ni, Ruiyu ; Qiu, Shumin Subject: [edk2] [PATCH v2] ShellPkg: Fix memory leak when running Shell script. When we run following script in Shell: " for %a run (1 200) echo %a memmap endfor " We may find memory leak in system. This patch free buffer in 'BufferToFreeList' to avoid this issue. Cc: Jaben Carsey Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin --- ShellPkg/Application/Shell/Shell.c | 41 ++ ShellPkg/Application/Shell/Shell.h | 23 + 2 files changed, 64 insertions(+) diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index 41c8a03..932a3a6 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -1205,6 +1205,7 @@ DoShellPrompt ( CONST CHAR16 *CurDir; UINTN BufferSize; EFI_STATUSStatus; + LIST_ENTRYOldBufferList; CurDir = NULL; @@ -1218,6 +1219,7 @@ DoShellPrompt ( return EFI_OUT_OF_RESOURCES; } + SaveBufferList(); CurDir = ShellInfoObject.NewEfiShellProtocol->GetEnv(L"cwd"); // @@ -1247,6 +1249,7 @@ DoShellPrompt ( // // Done with this command // + RestoreBufferList(); FreePool (CmdLine); return Status; } @@ -1276,6 +1279,36 @@ AddBufferToFreeList( return (Buffer); } + +/** + Create a new buffer list and stores the old one to OldBufferList + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +SaveBufferList ( + OUT LIST_ENTRY *OldBufferList + ) +{ + CopyMem (OldBufferList, , sizeof (LIST_ENTRY)); + InitializeListHead (); +} + +/** + Restore previous nodes into BufferToFreeList . + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +RestoreBufferList ( + IN OUT LIST_ENTRY *OldBufferList + ) +{ + FreeBufferList (); + CopyMem (, OldBufferList, sizeof (LIST_ENTRY)); +} + + /** Add a buffer to the Line History List @@ -2656,6 +2689,7 @@ RunScriptFileHandle ( CONST CHAR16*CurDir; UINTN LineCount; CHAR16 LeString[50]; + LIST_ENTRY OldBufferList; ASSERT(!ShellCommandGetScriptExit()); @@ -2758,6 +2792,8 @@ RunScriptFileHandle ( PrintBuffSize/sizeof(CHAR16) - 1 ); +SaveBufferList(); + // // NULL out comments // @@ -2892,15 +2928,19 @@ RunScriptFileHandle ( ShellCommandRegisterExit(FALSE, 0); Status = EFI_SUCCESS; + RestoreBufferList(); break; } if (ShellGetExecutionBreakFlag()) { + RestoreBufferList(); break; } if (EFI_ERROR(Status)) { + RestoreBufferList(); break; } if (ShellCommandGetExit()) { + RestoreBufferList(); break; } } @@ -2919,6 +2959,7 @@ RunScriptFileHandle ( NewScriptFile->CurrentCommand->Reset = TRUE; } } +RestoreBufferList(); } diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h index 5726320..351b941 100644 --- a/ShellPkg/Application/Shell/Shell.h +++ b/ShellPkg/Application/Shell/Shell.h @@ -382,5 +382,28 @@ TrimSpaces( IN CHAR16 **String ); +/** + + Create a new buffer list and stores the old one to OldBufferList + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +SaveBufferList ( + OUT LIST_ENTRY *OldBufferList + ); + +/** + Restore previous nodes into BufferToFreeList . + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +RestoreBufferList ( + IN OUT LIST_ENTRY *OldBufferList + ); + + + #endif //_SHELL_INTERNAL_HEADER_ -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] Nested FD files in one FDF
We have a need to have one FD image embedded in another (two copies of an identical FD image). So in our platform FDF file we'd like to define one FD for the "outer" region and another FD for the "inner" region. We then would like to specify in the outer FD a file that is the inner FD. Something like: [FD.Outer] 0x|0x0010 FILE = INNER.fd [FD.Inner] For this to work the build either needs to understand the dependency or at least have deterministic ordering for evaluating FDs so we can ensure that the inner one is created before the outer one. If this approach doesn't work, are there other recommendations for how to nest FDs? I've found that invoking build twice is expensive since the second invocation may try to do builds when we only want the Outer FDF to be processed. I was hoping to find a way to solve this under the existing build specs and BaseTools implementation but if this isn't possible then we could discuss extending the FDF syntax to allow a new "FD = " region within the [FD] section to specify explicit FD nesting. Thanks for the help, Eugene ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH] BaseTools AARCH64: add -mstrict-align to all AARCH64 GCC flavors
GCC for AARCH64 recognizes byte swapping sequences and replaces them with rev instructions. In some cases (i.e., with GCC version 5 and later) this may result in unaligned accesses, which are not allowed before we turn the MMU on. So move the -mstrict-align compiler switch to the shared define for all AARCH64 GCC versions. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel--- BaseTools/Conf/tools_def.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 864c9ddd382e..6bd0dcf7431c 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -4323,7 +4323,7 @@ DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double - DEFINE GCC_X64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe DEFINE GCC_IPF_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency DEFINE GCC_ARM_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -DEFINE GCC_AARCH64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address -fno-asynchronous-unwind-tables +DEFINE GCC_AARCH64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address -fno-asynchronous-unwind-tables -mstrict-align DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie DEFINE GCC_DLINK2_FLAGS_COMMON = --script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections @@ -5191,7 +5191,7 @@ DEFINE CLANG35_IA32_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) DEF(CLANG35_WARNING_OVE DEFINE CLANG35_IA32_CC_FLAGS = DEF(CLANG35_IA32_X64_CC_FLAGS) DEF(CLANG35_IA32_TARGET) DEFINE CLANG35_X64_CC_FLAGS = DEF(CLANG35_IA32_X64_CC_FLAGS) DEF(CLANG35_X64_TARGET) DEFINE CLANG35_ARM_CC_FLAGS = DEF(GCC_ARM_CC_FLAGS) DEF(CLANG35_ARM_TARGET) -mstrict-align -mllvm -arm-use-movt=0 DEF(CLANG35_WARNING_OVERRIDES) -DEFINE CLANG35_AARCH64_CC_FLAGS = DEF(GCC_AARCH64_CC_FLAGS) DEF(CLANG35_AARCH64_TARGET) -mcmodel=small -mstrict-align DEF(CLANG35_WARNING_OVERRIDES) +DEFINE CLANG35_AARCH64_CC_FLAGS = DEF(GCC_AARCH64_CC_FLAGS) DEF(CLANG35_AARCH64_TARGET) -mcmodel=small DEF(CLANG35_WARNING_OVERRIDES) ## # CLANG35 IA32 definitions -- 2.5.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2] ShellPkg: Fix memory leak when running Shell script.
Got it. Thanks. -Shumin -Original Message- From: Ni, Ruiyu Sent: Wednesday, December 23, 2015 10:28 PM To: Qiu, Shumin; edk2-devel@lists.01.org Cc: Carsey, Jaben; Qiu, Shumin Subject: RE: [edk2] [PATCH v2] ShellPkg: Fix memory leak when running Shell script. Reviewed-by: Ruiyu NiPlease separate the patch to two commits when you check in: The change to DoShellPrompt() is to fix the TAB-auto-completion memory leak. -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Qiu Shumin Sent: Wednesday, December 23, 2015 10:16 PM To: edk2-devel@lists.01.org Cc: Carsey, Jaben ; Ni, Ruiyu ; Qiu, Shumin Subject: [edk2] [PATCH v2] ShellPkg: Fix memory leak when running Shell script. When we run following script in Shell: " for %a run (1 200) echo %a memmap endfor " We may find memory leak in system. This patch free buffer in 'BufferToFreeList' to avoid this issue. Cc: Jaben Carsey Cc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin --- ShellPkg/Application/Shell/Shell.c | 41 ++ ShellPkg/Application/Shell/Shell.h | 23 + 2 files changed, 64 insertions(+) diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index 41c8a03..932a3a6 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -1205,6 +1205,7 @@ DoShellPrompt ( CONST CHAR16 *CurDir; UINTN BufferSize; EFI_STATUSStatus; + LIST_ENTRYOldBufferList; CurDir = NULL; @@ -1218,6 +1219,7 @@ DoShellPrompt ( return EFI_OUT_OF_RESOURCES; } + SaveBufferList(); CurDir = ShellInfoObject.NewEfiShellProtocol->GetEnv(L"cwd"); // @@ -1247,6 +1249,7 @@ DoShellPrompt ( // // Done with this command // + RestoreBufferList(); FreePool (CmdLine); return Status; } @@ -1276,6 +1279,36 @@ AddBufferToFreeList( return (Buffer); } + +/** + Create a new buffer list and stores the old one to OldBufferList + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +SaveBufferList ( + OUT LIST_ENTRY *OldBufferList + ) +{ + CopyMem (OldBufferList, , +sizeof (LIST_ENTRY)); + InitializeListHead (); +} + +/** + Restore previous nodes into BufferToFreeList . + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +RestoreBufferList ( + IN OUT LIST_ENTRY *OldBufferList + ) +{ + FreeBufferList (); + CopyMem (, OldBufferList, +sizeof (LIST_ENTRY)); } + + /** Add a buffer to the Line History List @@ -2656,6 +2689,7 @@ RunScriptFileHandle ( CONST CHAR16*CurDir; UINTN LineCount; CHAR16 LeString[50]; + LIST_ENTRY OldBufferList; ASSERT(!ShellCommandGetScriptExit()); @@ -2758,6 +2792,8 @@ RunScriptFileHandle ( PrintBuffSize/sizeof(CHAR16) - 1 ); +SaveBufferList(); + // // NULL out comments // @@ -2892,15 +2928,19 @@ RunScriptFileHandle ( ShellCommandRegisterExit(FALSE, 0); Status = EFI_SUCCESS; + RestoreBufferList(); break; } if (ShellGetExecutionBreakFlag()) { + RestoreBufferList(); break; } if (EFI_ERROR(Status)) { + RestoreBufferList(); break; } if (ShellCommandGetExit()) { + RestoreBufferList(); break; } } @@ -2919,6 +2959,7 @@ RunScriptFileHandle ( NewScriptFile->CurrentCommand->Reset = TRUE; } } +RestoreBufferList(); } diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h index 5726320..351b941 100644 --- a/ShellPkg/Application/Shell/Shell.h +++ b/ShellPkg/Application/Shell/Shell.h @@ -382,5 +382,28 @@ TrimSpaces( IN CHAR16 **String ); +/** + + Create a new buffer list and stores the old one to OldBufferList + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +SaveBufferList ( + OUT LIST_ENTRY *OldBufferList + ); + +/** + Restore previous nodes into BufferToFreeList . + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +RestoreBufferList ( + IN OUT LIST_ENTRY *OldBufferList + ); + + + #endif //_SHELL_INTERNAL_HEADER_ -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v2] ShellPkg: Fix memory leak when running Shell script.
When we run following script in Shell: " for %a run (1 200) echo %a memmap endfor " We may find memory leak in system. This patch free buffer in 'BufferToFreeList' to avoid this issue. Cc: Jaben CarseyCc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin --- ShellPkg/Application/Shell/Shell.c | 41 ++ ShellPkg/Application/Shell/Shell.h | 23 + 2 files changed, 64 insertions(+) diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index 41c8a03..932a3a6 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -1205,6 +1205,7 @@ DoShellPrompt ( CONST CHAR16 *CurDir; UINTN BufferSize; EFI_STATUSStatus; + LIST_ENTRYOldBufferList; CurDir = NULL; @@ -1218,6 +1219,7 @@ DoShellPrompt ( return EFI_OUT_OF_RESOURCES; } + SaveBufferList(); CurDir = ShellInfoObject.NewEfiShellProtocol->GetEnv(L"cwd"); // @@ -1247,6 +1249,7 @@ DoShellPrompt ( // // Done with this command // + RestoreBufferList(); FreePool (CmdLine); return Status; } @@ -1276,6 +1279,36 @@ AddBufferToFreeList( return (Buffer); } + +/** + Create a new buffer list and stores the old one to OldBufferList + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +SaveBufferList ( + OUT LIST_ENTRY *OldBufferList + ) +{ + CopyMem (OldBufferList, , sizeof (LIST_ENTRY)); + InitializeListHead (); +} + +/** + Restore previous nodes into BufferToFreeList . + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +RestoreBufferList ( + IN OUT LIST_ENTRY *OldBufferList + ) +{ + FreeBufferList (); + CopyMem (, OldBufferList, sizeof (LIST_ENTRY)); +} + + /** Add a buffer to the Line History List @@ -2656,6 +2689,7 @@ RunScriptFileHandle ( CONST CHAR16*CurDir; UINTN LineCount; CHAR16 LeString[50]; + LIST_ENTRY OldBufferList; ASSERT(!ShellCommandGetScriptExit()); @@ -2758,6 +2792,8 @@ RunScriptFileHandle ( PrintBuffSize/sizeof(CHAR16) - 1 ); +SaveBufferList(); + // // NULL out comments // @@ -2892,15 +2928,19 @@ RunScriptFileHandle ( ShellCommandRegisterExit(FALSE, 0); Status = EFI_SUCCESS; + RestoreBufferList(); break; } if (ShellGetExecutionBreakFlag()) { + RestoreBufferList(); break; } if (EFI_ERROR(Status)) { + RestoreBufferList(); break; } if (ShellCommandGetExit()) { + RestoreBufferList(); break; } } @@ -2919,6 +2959,7 @@ RunScriptFileHandle ( NewScriptFile->CurrentCommand->Reset = TRUE; } } +RestoreBufferList(); } diff --git a/ShellPkg/Application/Shell/Shell.h b/ShellPkg/Application/Shell/Shell.h index 5726320..351b941 100644 --- a/ShellPkg/Application/Shell/Shell.h +++ b/ShellPkg/Application/Shell/Shell.h @@ -382,5 +382,28 @@ TrimSpaces( IN CHAR16 **String ); +/** + + Create a new buffer list and stores the old one to OldBufferList + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +SaveBufferList ( + OUT LIST_ENTRY *OldBufferList + ); + +/** + Restore previous nodes into BufferToFreeList . + + @param OldBufferList The temporary list head used to store the nodes in BufferToFreeList. +**/ +VOID +RestoreBufferList ( + IN OUT LIST_ENTRY *OldBufferList + ); + + + #endif //_SHELL_INTERNAL_HEADER_ -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch 2/8] MdeModulePkg: Add the missing Library uni files of ImageDecode instances
Reviewed-by: Ruiyu Ni-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 2/8] MdeModulePkg: Add the missing Library uni files of ImageDecode instances Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- .../BmpImageDecoderLib/BmpImageDecoderLib.inf | 1 + .../BmpImageDecoderLib/BmpImageDecoderLib.uni | 26 ++ MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf | 1 + MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni | 26 ++ .../Library/ImageDecoderLib/ImageDecoderLib.inf| 9 .../Library/ImageDecoderLib/ImageDecoderLib.uni| 26 ++ 6 files changed, 85 insertions(+), 4 deletions(-) create mode 100644 MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni create mode 100644 MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni create mode 100644 MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.uni diff --git a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf index 2d1c160..0bde46c 100644 --- a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf +++ b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.inf @@ -15,6 +15,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BmpImageDecoderLib + MODULE_UNI_FILE= BmpImageDecoderLib.uni FILE_GUID = DF414223-F17C-4022-A1F4-4062612AB00D MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni new file mode 100644 index 000..334144b --- /dev/null +++ b/MdeModulePkg/Library/BmpImageDecoderLib/BmpImageDecoderLib.uni @@ -0,0 +1,26 @@ +// /** @file +// This library provides BMP image decoding capability. +// +// This library provides BMP image decoding capability. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"This library provides BMP image decoding capability." + +#string STR_MODULE_DESCRIPTION +#language en-US +"This library provides BMP image decoding capability." + + diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf index 673a4ce..8698f26 100644 --- a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.inf @@ -16,6 +16,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = BootLogoLib + MODULE_UNI_FILE= BootLogoLib.uni FILE_GUID = F5AE5B5C-42E8-4A9B-829D-5B631CD5367A MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 diff --git a/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni new file mode 100644 index 000..fae0335 --- /dev/null +++ b/MdeModulePkg/Library/BootLogoLib/BootLogoLib.uni @@ -0,0 +1,26 @@ +// /** @file +// This library is only intended to be used by PlatformBootManagerLib +// +// to show progress bar and logo. +// +// Copyright (c) 2015, 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 that accompanies this distribution. +// The full text of the license may be found at +// http://opensource.org/licenses/bsd-license.php. +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, +// WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"This library is only intended to be used by PlatformBootManagerLib" + +#string STR_MODULE_DESCRIPTION +#language en-US +"to show progress bar and logo." + + diff --git a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf b/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf index 5d2ee7b..7ebeec6 100644 --- a/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf +++ b/MdeModulePkg/Library/ImageDecoderLib/ImageDecoderLib.inf @@ -1,21 +1,22 @@ ## @file # This library provides image decoding
Re: [edk2] [Patch 8/8] IntelFrameworkModulePkg: Remove the undefined PCD help and prompt strings
Reviewed-by: Ruiyu Ni-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 8/8] IntelFrameworkModulePkg: Remove the undefined PCD help and prompt strings IntelFrameworkModulePkg.uni includes some undefined PCD help and prompt strings, which will be removed. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- .../IntelFrameworkModulePkg.uni| 26 +- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni index 019edf7..8528f5d 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni @@ -10,7 +10,7 @@ // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // @@ -102,22 +102,6 @@ "TRUE - Use the optimized timing for best PS2 detection performance.\n" "FALSE - Use the normal timing to detect PS2." -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoHorizontalResolution_PROMPT #language en-US "Video Horizontal Resolution of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoHorizontalResolution_HELP #language en-US "Specify the video horizontal resolution of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoVerticalResolution_PROMPT #language en-US "Video Vertical Resolution of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoVerticalResolution_HELP #language en-US "Specify the video vertical resolution of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutColumn_PROMPT #language en-US "Console Output Column of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutColumn_HELP #language en-US "Specify the console output column of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutRow_PROMPT #language en-US "Console Output Row of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutRow_HELP #language en-US "Specify the console output row of text setup." - #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_PROMPT #language en-US "Report StatusCode via OEM Device" #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_HELP #language en-US "Indicates if OEM device is enabled as StatusCode report device. It is only used in Framework StatusCode implementation. \n" @@ -172,14 +156,6 @@ "TRUE - The complete boot cycle has not happened before.\n" "FALSE - The complete boot cycle has happened before." -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformBootTimeOut_PROMPT #language en-US "Boot Timeout (s)" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformBootTimeOut_HELP #language en-US "The number of seconds that the firmware will wait before initiating the original default boot selection. A value of 0 indicates that the default boot selection is to be initiated immediately on boot. The value of 0x then firmware will wait for user input before booting." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHardwareErrorRecordLevel_PROMPT #language en-US "Error Level For Hardware Recorder" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHardwareErrorRecordLevel_HELP #language en-US "Error level for hardware recorder. If value 0, platform does not support feature of hardware error record." - #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_PROMPT #language en-US "Reserved Memory Base Address for OPROM" #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_HELP #language en-US "Specify memory base address for OPROM to find free memory.\n" -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch 8/8] IntelFrameworkModulePkg: Remove the undefined PCD help and prompt strings
Reviewed-by: Jeff Fan-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 8/8] IntelFrameworkModulePkg: Remove the undefined PCD help and prompt strings IntelFrameworkModulePkg.uni includes some undefined PCD help and prompt strings, which will be removed. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- .../IntelFrameworkModulePkg.uni| 26 +- 1 file changed, 1 insertion(+), 25 deletions(-) diff --git a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni index 019edf7..8528f5d 100644 --- a/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni +++ b/IntelFrameworkModulePkg/IntelFrameworkModulePkg.uni @@ -10,7 +10,7 @@ // are licensed and made available under the terms and conditions of the BSD License // which accompanies this distribution. The full text of the license may be found at // http://opensource.org/licenses/bsd-license.php -// +// // THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. // @@ -102,22 +102,6 @@ "TRUE - Use the optimized timing for best PS2 detection performance.\n" "FALSE - Use the normal timing to detect PS2." -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoHorizontalResolution_PROMPT #language en-US "Video Horizontal Resolution of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoHorizontalResolution_HELP #language en-US "Specify the video horizontal resolution of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoVerticalResolution_PROMPT #language en-US "Video Vertical Resolution of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupVideoVerticalResolution_HELP #language en-US "Specify the video vertical resolution of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutColumn_PROMPT #language en-US "Console Output Column of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutColumn_HELP #language en-US "Specify the console output column of text setup." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutRow_PROMPT #language en-US "Console Output Row of Text Setup" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdSetupConOutRow_HELP #language en-US "Specify the console output row of text setup." - #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_PROMPT #language en-US "Report StatusCode via OEM Device" #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdStatusCodeUseOEM_HELP #language en-US "Indicates if OEM device is enabled as StatusCode report device. It is only used in Framework StatusCode implementation. \n" @@ -172,14 +156,6 @@ "TRUE - The complete boot cycle has not happened before.\n" "FALSE - The complete boot cycle has happened before." -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformBootTimeOut_PROMPT #language en-US "Boot Timeout (s)" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdPlatformBootTimeOut_HELP #language en-US "The number of seconds that the firmware will wait before initiating the original default boot selection. A value of 0 indicates that the default boot selection is to be initiated immediately on boot. The value of 0x then firmware will wait for user input before booting." - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHardwareErrorRecordLevel_PROMPT #language en-US "Error Level For Hardware Recorder" - -#string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdHardwareErrorRecordLevel_HELP #language en-US "Error level for hardware recorder. If value 0, platform does not support feature of hardware error record." - #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_PROMPT #language en-US "Reserved Memory Base Address for OPROM" #string STR_gEfiIntelFrameworkModulePkgTokenSpaceGuid_PcdOpromReservedMemoryBase_HELP #language en-US "Specify memory base address for OPROM to find free memory.\n" -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] BaseTools AARCH64: add -mstrict-align to all AARCH64 GCC flavors
Reviewed-by: Liming Gao-Original Message- From: Ard Biesheuvel [mailto:ard.biesheu...@linaro.org] Sent: Wednesday, December 23, 2015 10:22 PM To: edk2-devel@lists.01.org; Gao, Liming; leif.lindh...@linaro.org Cc: Ard Biesheuvel Subject: [PATCH] BaseTools AARCH64: add -mstrict-align to all AARCH64 GCC flavors GCC for AARCH64 recognizes byte swapping sequences and replaces them with rev instructions. In some cases (i.e., with GCC version 5 and later) this may result in unaligned accesses, which are not allowed before we turn the MMU on. So move the -mstrict-align compiler switch to the shared define for all AARCH64 GCC versions. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ard Biesheuvel --- BaseTools/Conf/tools_def.template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template index 864c9ddd382e..6bd0dcf7431c 100644 --- a/BaseTools/Conf/tools_def.template +++ b/BaseTools/Conf/tools_def.template @@ -4323,7 +4323,7 @@ DEFINE GCC_IA32_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) -m32 -malign-double - DEFINE GCC_X64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mno-red-zone -Wno-address -mno-stack-arg-probe DEFINE GCC_IPF_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -minline-int-divide-min-latency DEFINE GCC_ARM_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -mabi=aapcs -fno-short-enums -save-temps -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -Wno-address -mthumb -mfloat-abi=soft -DEFINE GCC_AARCH64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address -fno-asynchronous-unwind-tables +DEFINE GCC_AARCH64_CC_FLAGS= DEF(GCC_ALL_CC_FLAGS) -mlittle-endian -fno-short-enums -save-temps -fverbose-asm -fsigned-char -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-builtin -Wno-address -fno-asynchronous-unwind-tables -mstrict-align DEFINE GCC_DLINK_FLAGS_COMMON = -nostdlib --pie DEFINE GCC_DLINK2_FLAGS_COMMON = --script=$(EDK_TOOLS_PATH)/Scripts/GccBase.lds DEFINE GCC_IA32_X64_DLINK_COMMON = DEF(GCC_DLINK_FLAGS_COMMON) --gc-sections @@ -5191,7 +5191,7 @@ DEFINE CLANG35_IA32_X64_CC_FLAGS = DEF(GCC_ALL_CC_FLAGS) DEF(CLANG35_WARNING_OVE DEFINE CLANG35_IA32_CC_FLAGS = DEF(CLANG35_IA32_X64_CC_FLAGS) DEF(CLANG35_IA32_TARGET) DEFINE CLANG35_X64_CC_FLAGS = DEF(CLANG35_IA32_X64_CC_FLAGS) DEF(CLANG35_X64_TARGET) DEFINE CLANG35_ARM_CC_FLAGS = DEF(GCC_ARM_CC_FLAGS) DEF(CLANG35_ARM_TARGET) -mstrict-align -mllvm -arm-use-movt=0 DEF(CLANG35_WARNING_OVERRIDES) -DEFINE CLANG35_AARCH64_CC_FLAGS = DEF(GCC_AARCH64_CC_FLAGS) DEF(CLANG35_AARCH64_TARGET) -mcmodel=small -mstrict-align DEF(CLANG35_WARNING_OVERRIDES) +DEFINE CLANG35_AARCH64_CC_FLAGS = DEF(GCC_AARCH64_CC_FLAGS) DEF(CLANG35_AARCH64_TARGET) -mcmodel=small DEF(CLANG35_WARNING_OVERRIDES) ## # CLANG35 IA32 definitions -- 2.5.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] Nested FD files in one FDF
Eugene: The formal way is to add this support in [FD] section. The workaround way is to create two FDF files, one is for inner FD, another is for out FD. Out FDF will use FILE statement to point to the generated inner FD image. Then, call build -p platform.dsc twice. First, call build -p platform.dsc -f inner.fdf, Last, call build -p platform.dsc -f out.fdf. Thanks Liming -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Cohen, Eugene Sent: Wednesday, December 23, 2015 10:42 PM To: edk2-devel@lists.01.org; Zhu, Yonghong Subject: [edk2] Nested FD files in one FDF We have a need to have one FD image embedded in another (two copies of an identical FD image). So in our platform FDF file we'd like to define one FD for the "outer" region and another FD for the "inner" region. We then would like to specify in the outer FD a file that is the inner FD. Something like: [FD.Outer] 0x|0x0010 FILE = INNER.fd [FD.Inner] For this to work the build either needs to understand the dependency or at least have deterministic ordering for evaluating FDs so we can ensure that the inner one is created before the outer one. If this approach doesn't work, are there other recommendations for how to nest FDs? I've found that invoking build twice is expensive since the second invocation may try to do builds when we only want the Outer FDF to be processed. I was hoping to find a way to solve this under the existing build specs and BaseTools implementation but if this isn't possible then we could discuss extending the FDF syntax to allow a new "FD = " region within the [FD] section to specify explicit FD nesting. Thanks for the help, Eugene ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch 6/8] UefiCpuPkg: Add the missing module uni for CpuS3DataDxe
Reviewed-by: Jeff Fan-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 6/8] UefiCpuPkg: Add the missing module uni for CpuS3DataDxe Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf | 4 +++ UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni | 40 +++ UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni | 20 ++ 3 files changed, 64 insertions(+) create mode 100644 UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni create mode 100644 UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf index 9143b87..857e12b 100644 --- a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.inf @@ -25,6 +25,7 @@ [Defines] INF_VERSION= 0x00010005 BASE_NAME = CpuS3DataDxe + MODULE_UNI_FILE= CpuS3DataDxe.uni FILE_GUID = 4D2E57EE-0E3F-44DD-93C4-D3B57E96945D MODULE_TYPE= DXE_DRIVER VERSION_STRING = 1.0 @@ -62,3 +63,6 @@ [Depex] gEfiMpServiceProtocolGuid + +[UserExtensions.TianoCore."ExtraFiles"] + CpuS3DataDxeExtra.uni diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni new file mode 100644 index 000..4a0218f --- /dev/null +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxe.uni @@ -0,0 +1,40 @@ +// /** @file +// ACPI CPU Data initialization module +// +// This module initializes the ACPI_CPU_DATA structure and registers +the address // of this structure in the PcdCpuS3DataAddress PCD. This +is a generic/simple // version of this module. It does not provide a +machine check handler or CPU // register initialization tables for ACPI +S3 resume. It also only supports the // number of CPUs reported by the +MP Services Protocol, so this module does not // support hot plug CPUs. +This module can be copied into a CPU specific package // and customized if these additional features are required. +// +// Copyright (c) 2015, Intel Corporation. All rights reserved. // +// Copyright (c) 2015, Red Hat, Inc. +// +// This program and the accompanying materials // are licensed and made +available under the terms and conditions of the BSD License // which +accompanies this distribution. The full text of the license may be +found at // http://opensource.org/licenses/bsd-license.php +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" +BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_MODULE_ABSTRACT +#language en-US +"ACPI CPU Data initialization module" + +#string STR_MODULE_DESCRIPTION +#language en-US +"This module initializes the ACPI_CPU_DATA structure and registers the address " +"of this structure in the PcdCpuS3DataAddress PCD. This is a generic/simple " +"version of this module. It does not provide a machine check handler or CPU " +"register initialization tables for ACPI S3 resume. It also only supports the " +"number of CPUs reported by the MP Services Protocol, so this module does not " +"support hot plug CPUs. This module can be copied into a CPU specific package " +"and customized if these additional features are required." + + diff --git a/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni new file mode 100644 index 000..050f25f --- /dev/null +++ b/UefiCpuPkg/CpuS3DataDxe/CpuS3DataDxeExtra.uni @@ -0,0 +1,20 @@ +// /** @file +// CpuS3DataDxe Localized Strings and Content // // Copyright (c) 2015, +Intel Corporation. All rights reserved. // // Copyright (c) 2015, +Red Hat, Inc. +// +// This program and the accompanying materials // are licensed and made +available under the terms and conditions of the BSD License // which +accompanies this distribution. The full text of the license may be +found at // http://opensource.org/licenses/bsd-license.php +// +// THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" +BASIS, // WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. +// +// **/ + +#string STR_PROPERTIES_MODULE_NAME #language en-US "CpuS3DataDxe module" + + -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH] ShellPkg: Fix memory leak in 'ShellOpenFileByName'.
Cc: Ruiyu NiCc: Jaben Carsey Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Yao Jiewen Reviewed-by: Qiu Shumin --- ShellPkg/Library/UefiShellLib/UefiShellLib.c | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ShellPkg/Library/UefiShellLib/UefiShellLib.c b/ShellPkg/Library/UefiShellLib/UefiShellLib.c index 44ac382..9e815c5 100644 --- a/ShellPkg/Library/UefiShellLib/UefiShellLib.c +++ b/ShellPkg/Library/UefiShellLib/UefiShellLib.c @@ -673,6 +673,7 @@ ShellOpenFileByName( EFI_STATUSStatus; EFI_FILE_INFO *FileInfo; CHAR16*FileNameCopy; + EFI_STATUSStatus2; // // ASSERT if FileName is NULL @@ -719,8 +720,12 @@ ShellOpenFileByName( FileInfo = FileFunctionMap.GetFileInfo(*FileHandle); ASSERT(FileInfo != NULL); FileInfo->Attribute = Attributes; - Status = FileFunctionMap.SetFileInfo(*FileHandle, FileInfo); + Status2 = FileFunctionMap.SetFileInfo(*FileHandle, FileInfo); FreePool(FileInfo); + if (EFI_ERROR (Status2)) { +gEfiShellProtocol->CloseFile(*FileHandle); + } + Status = Status2; } return (Status); } -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v3 2/4] ShellPkg: Refine the code logic of 'command history'.
Hi I suggest we also handle PcdShellMaxHistoryCommandCount == 0 case. I think we can add below at the begging of function. if (MaxHistoryCmdCount == 0) { return ; } Other change seems good. Reviewed by: jiewen@intel.com Thank you Yao Jiewen -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Qiu Shumin Sent: Wednesday, December 23, 2015 2:15 PM To: edk2-devel@lists.01.org Cc: Carsey, Jaben; Ni, Ruiyu; Qiu, Shumin Subject: [edk2] [PATCH v3 2/4] ShellPkg: Refine the code logic of 'command history'. Add the PCD to PcdShellMaxHistoryCommandCount indicate the max count of history commands. Cc: Jaben CarseyCc: Ruiyu Ni Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin Reviewed-by: Ruiyu Ni Reviewed-by: Jaben Carsey --- ShellPkg/Application/Shell/Shell.c | 24 +++- ShellPkg/Application/Shell/Shell.inf | 25 + ShellPkg/ShellPkg.dec| 3 +++ 3 files changed, 39 insertions(+), 13 deletions(-) diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index 3606322..41c8a03 100644 --- a/ShellPkg/Application/Shell/Shell.c +++ b/ShellPkg/Application/Shell/Shell.c @@ -1288,13 +1288,35 @@ AddLineToCommandHistory( ) { BUFFER_LIST *Node; + BUFFER_LIST *Walker; + UINT16 MaxHistoryCmdCount; + UINT16 Count; + + Count = 0; + MaxHistoryCmdCount = PcdGet16(PcdShellMaxHistoryCommandCount); Node = AllocateZeroPool(sizeof(BUFFER_LIST)); ASSERT(Node != NULL); Node->Buffer = AllocateCopyPool(StrSize(Buffer), Buffer); ASSERT(Node->Buffer != NULL); - InsertTailList(, >Link); + for ( Walker = (BUFFER_LIST*)GetFirstNode() + ; !IsNull(, >Link) + ; Walker = (BUFFER_LIST*)GetNextNode(, >Link) + ){ +Count++; + } + if (Count < MaxHistoryCmdCount){ + + InsertTailList(, >Link); } else { +Walker = (BUFFER_LIST*)GetFirstNode(); +RemoveEntryList(>Link); +if (Walker->Buffer != NULL) { + FreePool(Walker->Buffer); +} +FreePool(Walker); + + InsertTailList(, + >Link); } } /** diff --git a/ShellPkg/Application/Shell/Shell.inf b/ShellPkg/Application/Shell/Shell.inf index 09aecf7..253bfdb 100644 --- a/ShellPkg/Application/Shell/Shell.inf +++ b/ShellPkg/Application/Shell/Shell.inf @@ -95,18 +95,19 @@ gEfiDevicePathProtocolGuid ## CONSUMES [Pcd] - gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellSupportOldProtocols ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellRequireHiiPlatform ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellSupportFrameworkHii ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellPageBreakDefault ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellInsertModeDefault## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellScreenLogCount ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole ## CONSUMES - gEfiShellPkgTokenSpaceGuid.PcdShellSupplier ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellSupportLevel ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellSupportOldProtocols## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellRequireHiiPlatform ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellSupportFrameworkHii## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellPageBreakDefault ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellInsertModeDefault ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellScreenLogCount ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellMapNameLength ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellPrintBufferSize## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellForceConsole ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellSupplier ## CONSUMES + gEfiShellPkgTokenSpaceGuid.PcdShellMaxHistoryCommandCount ## CONSUMES [BuildOptions.AARCH64] # The tiny code model used by AARCH64 only supports binaries of up to 1 MB in diff --git a/ShellPkg/ShellPkg.dec b/ShellPkg/ShellPkg.dec index b2f6326..76a2b7d 100644 --- a/ShellPkg/ShellPkg.dec +++ b/ShellPkg/ShellPkg.dec @@ -101,6 +101,9 @@ ## This determines how many bytes are read out of files at a time for file operations (type, copy, etc...) gEfiShellPkgTokenSpaceGuid.PcdShellFileOperationSize|0x1000|UINT32|0x000A + + ## This determines the max count of history commands + + gEfiShellPkgTokenSpaceGuid.PcdShellMaxHistoryCommandCount|0x0020|UINT1 +
Re: [edk2] [Patch 7/8] NetworkPkg: Update module inf to include the missing uni file
Reviewed-by: Ye Ting-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 7/8] NetworkPkg: Update module inf to include the missing uni file Update DnsDxe and HttpUtilitiesDxe inf files. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- NetworkPkg/DnsDxe/DnsDxe.inf | 5 +++-- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NetworkPkg/DnsDxe/DnsDxe.inf b/NetworkPkg/DnsDxe/DnsDxe.inf index 0d1efd8..bf9dc3d 100644 --- a/NetworkPkg/DnsDxe/DnsDxe.inf +++ b/NetworkPkg/DnsDxe/DnsDxe.inf @@ -22,6 +22,7 @@ VERSION_STRING= 1.0 ENTRY_POINT = DnsDriverEntryPoint UNLOAD_IMAGE = DnsUnload + MODULE_UNI_FILE = DnsDxe.uni [Packages] MdePkg/MdePkg.dec @@ -73,6 +74,6 @@ gEfiDhcp6ServiceBindingProtocolGuid ## SOMETIMES_CONSUMES gEfiDhcp6ProtocolGuid ## SOMETIMES_CONSUMES - -[Guids] +[UserExtensions.TianoCore."ExtraFiles"] + DnsDxeExtra.uni diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf index c101e6f..ffdbcd5 100644 --- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf +++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf @@ -21,6 +21,7 @@ VERSION_STRING= 1.0 ENTRY_POINT = HttpUtilitiesDxeDriverEntryPoint UNLOAD_IMAGE = HttpUtilitiesDxeUnload + MODULE_UNI_FILE = HttpUtilitiesDxe.uni [Packages] MdePkg/MdePkg.dec @@ -47,5 +48,5 @@ [Depex] TRUE -[Guids] - +[UserExtensions.TianoCore."ExtraFiles"] + HttpUtilitiesDxeExtra.uni -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] PXE Base Code DHCP DORA timeout
Hi all, I've been attempting to get a UEFI application to use the PXE Base Code Protocol (PxeBc) to get an IP (v4) using PxeBc->Dhcp(); testing is being done on a commercial ASUS motherboard (M5A99FX Pro R2.0, firmware version 2501) in the EFI Shell. During the DORA exchange, PxeBc->Dhcp() is not sending a Request after getting the Offer from the router (I have verified the Discover and Offer packets are transmitting with a packet sniffer), causing a timeout after a few attempts. Since I am testing on a commercial motherboard, and I know PXE boot works on it in other situations, I can only assume something is wrong with the way I am trying to use PxeBc. I've tried two methods of locating/opening PxeBc: locating a handle that publishes gEfiPxeBaseCodeProtocolGuid and opening PxeBc from a valid one, and using gBS->LocateProtocol() to locate gEfiPxeBaseCodeProtocolGuid and using that. In both cases, I call PxeBc->Start() before trying Dhcp, and they both timeout in the same way. I can't be sure what all is included in the ASUS PxeBc->Dhcp() implementation, but if it follows the implementation in MdeModulePkg/Universal/Network/UefiPxeBcDxe/PxeBcImpl.c, EfiPxeBcDhcp(), the DHCP4 options should be set in the PxeBc->Dhcp() call. Are there any other steps I am missing that need to be performed to get Dhcp to complete? Any advice or pointers would be appreciated. -- Thanks, David ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch 7/8] NetworkPkg: Update module inf to include the missing uni file
Reviewed-by: Jiaxin Wu-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Liming Gao Sent: Wednesday, December 23, 2015 5:57 PM To: edk2-devel@lists.01.org Subject: [edk2] [Patch 7/8] NetworkPkg: Update module inf to include the missing uni file Update DnsDxe and HttpUtilitiesDxe inf files. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- NetworkPkg/DnsDxe/DnsDxe.inf | 5 +++-- NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NetworkPkg/DnsDxe/DnsDxe.inf b/NetworkPkg/DnsDxe/DnsDxe.inf index 0d1efd8..bf9dc3d 100644 --- a/NetworkPkg/DnsDxe/DnsDxe.inf +++ b/NetworkPkg/DnsDxe/DnsDxe.inf @@ -22,6 +22,7 @@ VERSION_STRING= 1.0 ENTRY_POINT = DnsDriverEntryPoint UNLOAD_IMAGE = DnsUnload + MODULE_UNI_FILE = DnsDxe.uni [Packages] MdePkg/MdePkg.dec @@ -73,6 +74,6 @@ gEfiDhcp6ServiceBindingProtocolGuid ## SOMETIMES_CONSUMES gEfiDhcp6ProtocolGuid ## SOMETIMES_CONSUMES - -[Guids] +[UserExtensions.TianoCore."ExtraFiles"] + DnsDxeExtra.uni diff --git a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf index c101e6f..ffdbcd5 100644 --- a/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf +++ b/NetworkPkg/HttpUtilitiesDxe/HttpUtilitiesDxe.inf @@ -21,6 +21,7 @@ VERSION_STRING= 1.0 ENTRY_POINT = HttpUtilitiesDxeDriverEntryPoint UNLOAD_IMAGE = HttpUtilitiesDxeUnload + MODULE_UNI_FILE = HttpUtilitiesDxe.uni [Packages] MdePkg/MdePkg.dec @@ -47,5 +48,5 @@ [Depex] TRUE -[Guids] - +[UserExtensions.TianoCore."ExtraFiles"] + HttpUtilitiesDxeExtra.uni -- 1.9.5.msysgit.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2 1/2] ShellPkg: Fix memory leak in function 'ManBufferFindSections'.
Reviewed by: jiewen@intel.com -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Qiu Shumin Sent: Thursday, December 24, 2015 2:10 PM To: edk2-devel@lists.01.org Cc: Ni, Ruiyu; Carsey, Jaben; Qiu, Shumin; Yao, Jiewen Subject: [edk2] [PATCH v2 1/2] ShellPkg: Fix memory leak in function 'ManBufferFindSections'. Cc: Yao JiewenCc: Ruiyu Ni Cc: Jaben Carsey Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin --- ShellPkg/Application/Shell/ShellManParser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ShellPkg/Application/Shell/ShellManParser.c b/ShellPkg/Application/Shell/ShellManParser.c index 6c18491..222cdaf 100644 --- a/ShellPkg/Application/Shell/ShellManParser.c +++ b/ShellPkg/Application/Shell/ShellManParser.c @@ -215,6 +215,7 @@ ManBufferFindSections( SectionLen = StrLen(SectionName); SectionName = StrStr(Sections, SectionName); if (SectionName == NULL) { + SHELL_FREE_NON_NULL(TempString); continue; } if (*(SectionName + SectionLen) == CHAR_NULL || *(SectionName + SectionLen) == L',') { @@ -250,6 +251,7 @@ ManBufferFindSections( } SHELL_FREE_NON_NULL(TempString); } + SHELL_FREE_NON_NULL(TempString); if (!Found && !EFI_ERROR(Status)) { return (EFI_NOT_FOUND); } -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH 0/3] ShellPkg: Fix memory leak in 'map' command.
Reviewed-by: Ruiyu Ni-Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Qiu Shumin Sent: Thursday, December 24, 2015 3:30 PM To: edk2-devel@lists.01.org Cc: Qiu, Shumin Subject: [edk2] [PATCH 0/3] ShellPkg: Fix memory leak in 'map' command. Qiu Shumin (3): ShellPkg: Fix memory leak in function 'ShellCommandCreateInitialMappingsAndPaths'. ShellPkg: Fix memory leak in function 'ShellCommandConsistMappingInitialize'. ShellPkg: Fix memory leak in function 'EfiShellSetCurDir' and 'EfiShellSetMap'. ShellPkg/Application/Shell/ShellProtocol.c | 9 + ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c | 1 + ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 3 +++ 3 files changed, 13 insertions(+) -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 0/3] ShellPkg: Fix memory leak in 'map' command.
Qiu Shumin (3): ShellPkg: Fix memory leak in function 'ShellCommandCreateInitialMappingsAndPaths'. ShellPkg: Fix memory leak in function 'ShellCommandConsistMappingInitialize'. ShellPkg: Fix memory leak in function 'EfiShellSetCurDir' and 'EfiShellSetMap'. ShellPkg/Application/Shell/ShellProtocol.c | 9 + ShellPkg/Library/UefiShellCommandLib/ConsistMapping.c | 1 + ShellPkg/Library/UefiShellCommandLib/UefiShellCommandLib.c | 3 +++ 3 files changed, 13 insertions(+) -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch] MdeModulePkg/BootManagerMenu: Fix bug that boots to undesired option
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu NiCc: Eric Dong --- .../BootManagerMenuApp/BootManagerMenu.c | 68 ++ 1 file changed, 45 insertions(+), 23 deletions(-) diff --git a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c index a8d5c03..9547c7e 100644 --- a/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c +++ b/MdeModulePkg/Application/BootManagerMenuApp/BootManagerMenu.c @@ -242,7 +242,48 @@ IsBootManagerMenu ( return (BOOLEAN) (!EFI_ERROR (Status) && (BootOption->OptionNumber == BootManagerMenu.OptionNumber)); } - + +/** + Return whether to ignore the boot option. + + @param BootOption Pointer to EFI_BOOT_MANAGER_LOAD_OPTION to check. + + @retval TRUE Ignore the boot optin. + @retval FALSE Do not ignore the boot option. +**/ +BOOLEAN +IgnoreBootOption ( + IN EFI_BOOT_MANAGER_LOAD_OPTION *BootOption + ) +{ + EFI_STATUSStatus; + EFI_DEVICE_PATH_PROTOCOL *ImageDevicePath; + + // + // Ignore myself. + // + Status = gBS->HandleProtocol (gImageHandle, , (VOID **) ); + ASSERT_EFI_ERROR (Status); + if (CompareMem (BootOption->FilePath, ImageDevicePath, GetDevicePathSize (ImageDevicePath)) == 0) { +return TRUE; + } + + // + // Do not ignore Boot Manager Menu. + // + if (IsBootManagerMenu (BootOption)) { +return FALSE; + } + + // + // Ignore the hidden/inactive boot option. + // + if (((BootOption->Attributes & LOAD_OPTION_HIDDEN) != 0) || ((BootOption->Attributes & LOAD_OPTION_ACTIVE) == 0)) { +return TRUE; + } + + return FALSE; +} /** This funciton uses to initialize boot menu data @@ -262,18 +303,13 @@ InitializeBootMenuData ( OUT BOOT_MENU_POPUP_DATA *BootMenuData ) { - EFI_STATUSStatus; UINTN Index; UINTN StrIndex; - EFI_DEVICE_PATH_PROTOCOL *ImageDevicePath; if (BootOption == NULL || BootMenuData == NULL) { return EFI_INVALID_PARAMETER; } - Status = gBS->HandleProtocol (gImageHandle, , (VOID **) ); - ASSERT_EFI_ERROR (Status); - BootMenuData->TitleToken[0] = STRING_TOKEN (STR_BOOT_POPUP_MENU_TITLE_STRING); BootMenuData->PtrTokens = AllocateZeroPool (BootOptionCount * sizeof (EFI_STRING_ID)); ASSERT (BootMenuData->PtrTokens != NULL); @@ -282,18 +318,7 @@ InitializeBootMenuData ( // Skip boot option which created by BootNext Variable // for (StrIndex = 0, Index = 0; Index < BootOptionCount; Index++) { -// -// Don't display the hidden/inactive boot option except setup application. -// -if BootOption[Index].Attributes & LOAD_OPTION_HIDDEN) != 0) || ((BootOption[Index].Attributes & LOAD_OPTION_ACTIVE) == 0)) && -!IsBootManagerMenu ([Index])) { - continue; -} - -// -// Don't display myself -// -if (CompareMem (BootOption[Index].FilePath, ImageDevicePath, GetDevicePathSize (ImageDevicePath)) == 0) { +if (IgnoreBootOption ([Index])) { continue; } @@ -640,13 +665,10 @@ BootFromSelectOption ( ASSERT (BootOptions != NULL); for (ItemNum = 0, Index = 0; Index < BootOptionCount; Index++) { -// -// Don't display the hidden/inactive boot option except setup application. -// -if BootOptions[Index].Attributes & LOAD_OPTION_HIDDEN) != 0) || ((BootOptions[Index].Attributes & LOAD_OPTION_ACTIVE) == 0)) && -!IsBootManagerMenu ([Index])) { +if (IgnoreBootOption ([Index])) { continue; } + if (ItemNum++ == SelectItem) { EfiBootManagerBoot ([Index]); break; -- 2.6.2.windows.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH 0/2] ShellPkg: Fix memory leak when Shell run help command
Qiu Shumin (2): ShellPkg: Fix memory leak in function 'ManBufferFindSections'. ShellPkg: Fix memory leak in function 'ShellCommandRunHelp'. ShellPkg/Application/Shell/ShellManParser.c| 1 + ShellPkg/Library/UefiShellLevel3CommandsLib/Help.c | 2 ++ 2 files changed, 3 insertions(+) -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [PATCH v2 1/2] ShellPkg: Fix memory leak in function 'ManBufferFindSections'.
Cc: Yao JiewenCc: Ruiyu Ni Cc: Jaben Carsey Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Qiu Shumin --- ShellPkg/Application/Shell/ShellManParser.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ShellPkg/Application/Shell/ShellManParser.c b/ShellPkg/Application/Shell/ShellManParser.c index 6c18491..222cdaf 100644 --- a/ShellPkg/Application/Shell/ShellManParser.c +++ b/ShellPkg/Application/Shell/ShellManParser.c @@ -215,6 +215,7 @@ ManBufferFindSections( SectionLen = StrLen(SectionName); SectionName = StrStr(Sections, SectionName); if (SectionName == NULL) { + SHELL_FREE_NON_NULL(TempString); continue; } if (*(SectionName + SectionLen) == CHAR_NULL || *(SectionName + SectionLen) == L',') { @@ -250,6 +251,7 @@ ManBufferFindSections( } SHELL_FREE_NON_NULL(TempString); } + SHELL_FREE_NON_NULL(TempString); if (!Found && !EFI_ERROR(Status)) { return (EFI_NOT_FOUND); } -- 1.9.5.msysgit.1 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] runtime driver again
I hope there are some people knowing how to develop a runtime driver, and if you do, please help me (I am almost desperate thanks to the runtime driver)and give some guides. I would really, really appreciate it. 发送自 Windows 10 版邮件应用 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch V2] Nt32Pkg/WinNtSimpleFileSystemDxe: Fix memory leak
Reviewed by: jiewen@intel.com -Original Message- From: edk2-devel [mailto:edk2-devel-boun...@lists.01.org] On Behalf Of Ruiyu Ni Sent: Wednesday, December 23, 2015 5:06 PM To: edk2-devel@lists.01.org Cc: Ni, Ruiyu; Yao, Jiewen Subject: [edk2] [Patch V2] Nt32Pkg/WinNtSimpleFileSystemDxe: Fix memory leak Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu NiCc: Jiewen Yao --- Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c index 1c300b6..feef184 100644 --- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c +++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c @@ -1,6 +1,6 @@ /**@file -Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved. +Copyright (c) 2006 - 2015, 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 which accompanies this distribution. The full text of the license may be found at @@ -628,6 +628,7 @@ Returns: StrCat (TempFileName, L"\\*"); PrivateFile->LHandle = PrivateFile->WinNtThunk->FindFirstFile (TempFileName, >FindBuf); + FreePool (TempFileName); if (PrivateFile->LHandle == INVALID_HANDLE_VALUE) { PrivateFile->IsValidFindBuf = FALSE; @@ -1188,6 +1189,7 @@ Returns: Status = EFI_NOT_FOUND; } + FreePool (TempFileName); goto Done; } @@ -1196,6 +1198,7 @@ Returns: // StrCat (TempFileName, L"\\*"); NewPrivateFile->LHandle = NewPrivateFile->WinNtThunk->FindFirstFile (TempFileName, >FindBuf); +FreePool (TempFileName); if (NewPrivateFile->LHandle == INVALID_HANDLE_VALUE) { NewPrivateFile->IsValidFindBuf = FALSE; @@ -1276,12 +1279,14 @@ Returns: Status = WinNtSimpleFileSystemGetInfo (>EfiFile, , , Info); if (EFI_ERROR (Status)) { + FreePool (Info); goto Done; } Info->Attribute = Attributes; WinNtSimpleFileSystemSetInfo (>EfiFile, , InfoSize, Info); +FreePool (Info); } Done: @@ -1361,6 +1366,10 @@ Returns: FreePool (PrivateFile->FileName); } + if (PrivateFile->FilePath) { +FreePool (PrivateFile->FilePath); + } + FreePool (PrivateFile); gBS->RestoreTPL (OldTpl); @@ -1431,6 +1440,7 @@ Returns: } FreePool (PrivateFile->FileName); + FreePool (PrivateFile->FilePath); FreePool (PrivateFile); gBS->RestoreTPL (OldTpl); -- 1.9.5.github.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
[edk2] [Patch V2] Nt32Pkg/WinNtSimpleFileSystemDxe: Fix memory leak
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu NiCc: Jiewen Yao --- Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c index 1c300b6..feef184 100644 --- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c +++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c @@ -1,6 +1,6 @@ /**@file -Copyright (c) 2006 - 2013, Intel Corporation. All rights reserved. +Copyright (c) 2006 - 2015, 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 which accompanies this distribution. The full text of the license may be found at @@ -628,6 +628,7 @@ Returns: StrCat (TempFileName, L"\\*"); PrivateFile->LHandle = PrivateFile->WinNtThunk->FindFirstFile (TempFileName, >FindBuf); + FreePool (TempFileName); if (PrivateFile->LHandle == INVALID_HANDLE_VALUE) { PrivateFile->IsValidFindBuf = FALSE; @@ -1188,6 +1189,7 @@ Returns: Status = EFI_NOT_FOUND; } + FreePool (TempFileName); goto Done; } @@ -1196,6 +1198,7 @@ Returns: // StrCat (TempFileName, L"\\*"); NewPrivateFile->LHandle = NewPrivateFile->WinNtThunk->FindFirstFile (TempFileName, >FindBuf); +FreePool (TempFileName); if (NewPrivateFile->LHandle == INVALID_HANDLE_VALUE) { NewPrivateFile->IsValidFindBuf = FALSE; @@ -1276,12 +1279,14 @@ Returns: Status = WinNtSimpleFileSystemGetInfo (>EfiFile, , , Info); if (EFI_ERROR (Status)) { + FreePool (Info); goto Done; } Info->Attribute = Attributes; WinNtSimpleFileSystemSetInfo (>EfiFile, , InfoSize, Info); +FreePool (Info); } Done: @@ -1361,6 +1366,10 @@ Returns: FreePool (PrivateFile->FileName); } + if (PrivateFile->FilePath) { +FreePool (PrivateFile->FilePath); + } + FreePool (PrivateFile); gBS->RestoreTPL (OldTpl); @@ -1431,6 +1440,7 @@ Returns: } FreePool (PrivateFile->FileName); + FreePool (PrivateFile->FilePath); FreePool (PrivateFile); gBS->RestoreTPL (OldTpl); -- 1.9.5.github.0 ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH v2 0/5] ArmVirtPkg: add ARM support to ArmVirtXen
On 21 December 2015 at 18:59, Stefano Stabelliniwrote: > On Wed, 16 Dec 2015, Ard Biesheuvel wrote: >> By special request, this implements ARM support to the ArmVirtXen >> platform. This time, I managed to test it myself under Xen on actual >> AArch64 hardware, after I figured out that 64-bit supports 32-bit guests >> as well. >> >> Changes since v1: >> - two patches have been merged, and hence dropped from this series >> - new patch #1 which fixes an interworking issue with XenHypercall2() >> - added Laszlo's acks to patches #2 to #5 >> >> Ard Biesheuvel (5): >> OvfmPkg/XenHypercallLib: add missing GCC_ASM_EXPORT to XenHypercall2 >> ArmVirtPkg/XenRelocatablePlatformLib: rewrite DTB memory node >> retrieval in C >> ArmVirtPkg/PrePiRelocatable: add ARM support >> ArmVirtPkg/ArmXenRelocatablePlatformLib: add ARM support >> ArmVirtPkg/ArmVirtXen: add ARM support > > It works fine, thanks Ard! > Great! Thanks for testing ___ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel