Replace some CopyMem() for GUID copy with CopyGuid().

[mirror_edk2.git] / IntelFrameworkPkg / Library / FrameworkIfrSupportLib / IfrCommon.c

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
index 9140fc6a25747d527c49e2829a29ad86bf67f2b4..dd29f3319acb69043d340506faf2184c2d54bce0 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrCommon.c
@@ -26,6 +26,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @return              whether sucess to get setting from variable\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 GetCurrentLanguage (\r
   OUT  CHAR16                       *Lang\r
   )\r
@@ -39,7 +40,6 @@ GetCurrentLanguage (
   // Getting the system language and placing it into our Global Data\r
   //\r
   Size = sizeof (Language);\r
-\r
   Status = gRT->GetVariable (\r
                   (CHAR16 *) L"Lang",\r
                   &gEfiGlobalVariableGuid,\r
@@ -47,7 +47,6 @@ GetCurrentLanguage (
                   &Size,\r
                   Language\r
                   );\r
-\r
   if (EFI_ERROR (Status)) {\r
     AsciiStrCpy (Language, "eng");\r
   }\r
@@ -80,6 +79,7 @@ GetCurrentLanguage (
   @retval EFI_SUCCESS          String successfully added to the incoming buffer\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 AddString (\r
   IN      VOID                      *StringBuffer,\r
   IN      CHAR16                    *Language,\r
@@ -146,8 +146,8 @@ AddString (
       //\r
       // Add a new stringpointer in the new buffer since we are adding a string.  Null terminate it\r
       //\r
-      PackDestination[Index] = (UINT16)(PackDestination[Index-1] +\r
-                                        StrSize((CHAR16 *)((CHAR8 *)(StringPack) + PackSource[Index-1])));\r
+      PackDestination[Index] = (UINT16)(PackDestination[Index - 1] +\r
+                                        StrSize((CHAR16 *)((CHAR8 *)(StringPack) + PackSource[Index - 1])));\r
       PackDestination[Index + 1] = (UINT16) 0;\r
 \r
       //\r
@@ -274,7 +274,7 @@ AddString (
   //\r
   // Free the newly created buffer since we don't need it anymore\r
   //\r
-  gBS->FreePool (NewBuffer);\r
+  FreePool (NewBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -288,6 +288,7 @@ AddString (
   @retval EFI_SUCCESS           Op-code data successfully inserted  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 AddOpCode (\r
   IN      VOID                      *FormBuffer,\r
   IN OUT  VOID                      *OpCodeData\r
@@ -307,12 +308,11 @@ AddOpCode (
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
-  Source      = (UINT8 *) FormBuffer;\r
-  Destination = (UINT8 *) NewBuffer;\r
-\r
   //\r
   // Copy the IFR Package header to the new buffer\r
   //\r
+  Source      = (UINT8 *) FormBuffer;\r
+  Destination = (UINT8 *) NewBuffer;\r
   CopyMem (Destination, Source, sizeof (EFI_HII_PACK_HEADER));\r
 \r
   //\r
@@ -326,7 +326,7 @@ AddOpCode (
   //\r
   for (; ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->OpCode != FRAMEWORK_EFI_IFR_END_FORM_OP;) {\r
     //\r
-    // If the this opcode is an end_form_set we better be creating and endform\r
+    // If the opcode is an end_form_set we better be creating and endform\r
     // Nonetheless, we will add data before the end_form_set.  This also provides\r
     // for interesting behavior in the code we will run, but has no bad side-effects\r
     // since we will possibly do a 0 byte copy in this particular end-case.\r
@@ -351,8 +351,8 @@ AddOpCode (
   // Prior to the end_form is where we insert the new op-code data\r
   //\r
   CopyMem (Destination, OpCodeData, ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length);\r
-  Destination       = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
-\r
+  \r
+  Destination = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length;\r
   NewBuffer->Length = (UINT32) (NewBuffer->Length + (UINT32) (((FRAMEWORK_EFI_IFR_OP_HEADER *) OpCodeData)->Length));\r
 \r
   //\r
@@ -361,14 +361,10 @@ AddOpCode (
   CopyMem (Destination, Source, ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length);\r
 \r
   //\r
-  // Adjust Source/Destination to next op-code location\r
+  // Copy end-formset data to new buffer\r
   //\r
   Destination = Destination + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r
   Source      = Source + (UINTN) ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length;\r
-\r
-  //\r
-  // Copy end-formset data to new buffer\r
-  //\r
   CopyMem (Destination, Source, ((FRAMEWORK_EFI_IFR_OP_HEADER *) Source)->Length);\r
 \r
   //\r
@@ -380,7 +376,7 @@ AddOpCode (
   //\r
   // Free the newly created buffer since we don't need it anymore\r
   //\r
-  gBS->FreePool (NewBuffer);\r
+  FreePool (NewBuffer);\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -392,6 +388,7 @@ AddOpCode (
   @return        the statue of locating HII protocol\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 GetHiiInterface (\r
   OUT  EFI_HII_PROTOCOL             **Hii\r
   )\r
@@ -424,6 +421,7 @@ GetHiiInterface (
   @retval EFI_SUCCESS           Successfully extract data from Hii database.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 ExtractDataFromHiiHandle (\r
   IN      FRAMEWORK_EFI_HII_HANDLE  HiiHandle,\r
   IN OUT  UINT16                    *ImageLength,\r
@@ -463,7 +461,7 @@ ExtractDataFromHiiHandle (
   //\r
   Status = Hii->GetForms (Hii, HiiHandle, 0, &DataLength, RawData);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (RawData);\r
+    FreePool (RawData);\r
 \r
     //\r
     // Allocate space for retrieval of IFR data\r
@@ -493,7 +491,7 @@ ExtractDataFromHiiHandle (
       //\r
       // Copy the GUID information from this handle\r
       //\r
-      CopyMem (Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+      CopyGuid (Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
       break;\r
 \r
     case FRAMEWORK_EFI_IFR_ONE_OF_OP:\r
@@ -523,7 +521,7 @@ ExtractDataFromHiiHandle (
   // Return an error if buffer is too small\r
   //\r
   if (SizeOfNvStore > *ImageLength) {\r
-    gBS->FreePool (OldData);\r
+    FreePool (OldData);\r
     *ImageLength = (UINT16) SizeOfNvStore;\r
     return EFI_BUFFER_TOO_SMALL;\r
   }\r
@@ -570,7 +568,7 @@ ExtractDataFromHiiHandle (
   //\r
   // Free our temporary repository of form data\r
   //\r
-  gBS->FreePool (OldData);\r
+  FreePool (OldData);\r
 \r
   return EFI_SUCCESS;\r
 }\r
@@ -586,7 +584,8 @@ ExtractDataFromHiiHandle (
 \r
   @return             Handle to the HII pack previously registered by the memory driver.\r
 **/\r
-FRAMEWORK_EFI_HII_HANDLE \r
+FRAMEWORK_EFI_HII_HANDLE\r
+EFIAPI\r
 FindHiiHandle (\r
   IN OUT  EFI_HII_PROTOCOL          **HiiProtocol, OPTIONAL\r
   IN      EFI_GUID                  *Guid\r
@@ -646,7 +645,7 @@ FindHiiHandle (
   //\r
   if (Status == EFI_BUFFER_TOO_SMALL) {\r
 \r
-    gBS->FreePool (HiiHandleBuffer);\r
+    FreePool (HiiHandleBuffer);\r
 \r
     HiiHandleBuffer = AllocatePool (HiiHandleBufferLength);\r
     ASSERT (HiiHandleBuffer != NULL);\r
@@ -679,7 +678,7 @@ FindHiiHandle (
   }\r
 \r
 lbl_exit:\r
-  gBS->FreePool (HiiHandleBuffer);\r
+  FreePool (HiiHandleBuffer);\r
   return HiiHandle;\r
 }\r
 \r
@@ -697,6 +696,7 @@ lbl_exit:
   @retval EFI_SUCCESS            Data successfully validated\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 ValidateDataFromHiiHandle (\r
   IN      FRAMEWORK_EFI_HII_HANDLE  HiiHandle,\r
      OUT  BOOLEAN                   *Results\r
@@ -739,7 +739,7 @@ ValidateDataFromHiiHandle (
   //\r
   Status = Hii->GetForms (Hii, HiiHandle, 0, &RawDataLength, RawData);\r
   if (EFI_ERROR (Status)) {\r
-    gBS->FreePool (RawData);\r
+    FreePool (RawData);\r
 \r
     //\r
     // Allocate space for retrieval of IFR data\r
@@ -764,10 +764,9 @@ ValidateDataFromHiiHandle (
 \r
   for (Index = 0; RawData[Index] != FRAMEWORK_EFI_IFR_END_FORM_SET_OP;) {\r
     if (RawData[Index] == FRAMEWORK_EFI_IFR_FORM_SET_OP) {\r
-      CopyMem (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid, sizeof (EFI_GUID));\r
+      CopyGuid (&Guid, &((FRAMEWORK_EFI_IFR_FORM_SET *) &RawData[Index])->Guid);\r
       break;\r
     }\r
-\r
     Index = RawData[Index + 1] + Index;\r
   }\r
 \r
@@ -829,7 +828,7 @@ ValidateDataFromHiiHandle (
       //\r
       // Free the buffer that was allocated that was too small\r
       //\r
-      gBS->FreePool (VariableData);\r
+      FreePool (VariableData);\r
 \r
       VariableData = AllocatePool (SizeOfNvStore);\r
       if (VariableData == NULL) {\r