UefiCpuPkg/PiSmmCpuDxeSmm: Add CPUID MCA support check

[mirror_edk2.git] / EmbeddedPkg / Ebl / EfiDevice.c

diff --git a/EmbeddedPkg/Ebl/EfiDevice.c b/EmbeddedPkg/Ebl/EfiDevice.c
index 7d2060936d10d18a89b2c513ec52c71c5cd73e56..f6969e7b2b05ab63067a01a3d00613832bb73c01 100644 (file)
--- a/EmbeddedPkg/Ebl/EfiDevice.c
+++ b/EmbeddedPkg/Ebl/EfiDevice.c
@@ -3,6 +3,7 @@
 \r
   Copyright (c) 2007, Intel Corporation. All rights reserved.<BR>\r
   Portions copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
+  (C) Copyright 2015 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
@@ -202,6 +203,7 @@ EblPrintLoadFileInfo (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblDeviceCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -285,6 +287,7 @@ EblDeviceCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblStartCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -340,7 +343,7 @@ EblStartCmd (
 \r
       ImageInfo->LoadOptionsSize = (UINT32)AsciiStrSize (Argv[2]);\r
       ImageInfo->LoadOptions     = AllocatePool (ImageInfo->LoadOptionsSize);\r
-      AsciiStrCpy (ImageInfo->LoadOptions, Argv[2]);\r
+      AsciiStrCpyS (ImageInfo->LoadOptions, ImageInfo->LoadOptionsSize, Argv[2]);\r
     }\r
 \r
     // Transfer control to the EFI image we loaded with LoadImage()\r
@@ -370,6 +373,7 @@ EblStartCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblLoadFvCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -426,6 +430,7 @@ EblLoadFvCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblConnectCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -548,6 +553,7 @@ CHAR8 *gMemMapType[] = {
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblMemMapCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -657,6 +663,7 @@ EblMemMapCmd (
 \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 EblGoCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -721,6 +728,7 @@ EblGoCmd (
 #define FILE_COPY_CHUNK 0x20000\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblFileCopyCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r
@@ -733,7 +741,7 @@ EblFileCopyCmd (
   UINTN         Size;\r
   UINTN         Offset;\r
   UINTN         Chunk        = FILE_COPY_CHUNK;\r
-  UINTN         FileNameLen;\r
+  UINTN         FileNameLen, DestFileNameLen;\r
   CHAR8*        DestFileName;\r
   CHAR8*        SrcFileName;\r
   CHAR8*        SrcPtr;\r
@@ -778,9 +786,10 @@ EblFileCopyCmd (
     }\r
 \r
     // Construct the destination filepath\r
-    DestFileName = (CHAR8*)AllocatePool (FileNameLen + AsciiStrLen (SrcFileName) + 1);\r
-    AsciiStrCpy (DestFileName, Argv[2]);\r
-    AsciiStrCat (DestFileName, SrcFileName);\r
+    DestFileNameLen = FileNameLen + AsciiStrLen (SrcFileName) + 1;\r
+    DestFileName = (CHAR8*)AllocatePool (DestFileNameLen);\r
+    AsciiStrCpyS (DestFileName, DestFileNameLen, Argv[2]);\r
+    AsciiStrCatS (DestFileName, DestFileNameLen, SrcFileName);\r
   }\r
 \r
   Source = EfiOpen(Argv[1], EFI_FILE_MODE_READ, 0);\r
@@ -863,6 +872,7 @@ Exit:
 }\r
 \r
 EFI_STATUS\r
+EFIAPI\r
 EblFileDiffCmd (\r
   IN UINTN  Argc,\r
   IN CHAR8  **Argv\r