Fix VS2005 build error

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

diff --git a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
index bed424186aeec98de9f27f7ffa5d9a847c60071c..4bdc40e54bce4428f2626b34554cccec6245bd12 100644 (file)
--- a/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
+++ b/IntelFrameworkPkg/Library/FrameworkIfrSupportLib/IfrOnTheFly.c
@@ -15,7 +15,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "IfrSupportLibInternal.h"\r
 \r
 /**\r
-  Create a formset\r
+  Create a formset.\r
   \r
   The form package is a collection of forms that are intended to describe the pages that will be\r
   displayed to the user.\r
@@ -31,6 +31,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   @retval EFI_SUCCESS          Formset successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateFormSet (\r
   IN      CHAR16                    *FormSetTitle,\r
   IN      EFI_GUID                  *Guid,\r
@@ -61,20 +62,15 @@ CreateFormSet (
   //\r
   StringBuffer = AllocateZeroPool (DEFAULT_STRING_BUFFER_SIZE);\r
   if (StringBuffer == NULL) {\r
-    gBS->FreePool (FormBuffer);\r
+    FreePool (FormBuffer);\r
     return EFI_OUT_OF_RESOURCES;\r
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add FormSetTitle to the StringBuffer, get FormSetTitle's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add the FormSetTitle to the string buffer and get the StringToken\r
-  //\r
   Status = AddString (*StringBuffer, CurrentLanguage, FormSetTitle, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -93,28 +89,26 @@ CreateFormSet (
   FormSet.FormSetTitle  = StringToken;\r
   FormSet.Class         = Class;\r
   FormSet.SubClass      = SubClass;\r
-  CopyMem (&FormSet.Guid, Guid, sizeof (EFI_GUID));\r
-\r
+  CopyGuid ((GUID *)(VOID *)&FormSet.Guid, Guid);\r
+  \r
   //\r
   // Initialize the end formset data\r
   //\r
   EndFormSet.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET);\r
   EndFormSet.Header.OpCode  = FRAMEWORK_EFI_IFR_END_FORM_SET_OP;\r
 \r
-  Destination               = (UINT8 *) *FormBuffer;\r
-\r
   //\r
   // Copy the formset/endformset data to the form buffer\r
   //\r
+  Destination = (UINT8 *) *FormBuffer;\r
   CopyMem (Destination, &IfrPack, sizeof (EFI_HII_PACK_HEADER));\r
 \r
   Destination = Destination + sizeof (EFI_HII_PACK_HEADER);\r
-\r
   CopyMem (Destination, &FormSet, sizeof (FRAMEWORK_EFI_IFR_FORM_SET));\r
 \r
   Destination = Destination + sizeof (FRAMEWORK_EFI_IFR_FORM_SET);\r
-\r
   CopyMem (Destination, &EndFormSet, sizeof (FRAMEWORK_EFI_IFR_END_FORM_SET));\r
+  \r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -132,6 +126,7 @@ CreateFormSet (
   @retval EFI_SUCCESS      Form successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateForm (\r
   IN      CHAR16                    *FormTitle,\r
   IN      UINT16                    FormId,\r
@@ -146,12 +141,10 @@ CreateForm (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add FormTitle to the StringBuffer, get FormTitle's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
   Status = AddString (StringBuffer, CurrentLanguage, FormTitle, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -161,8 +154,7 @@ CreateForm (
   Form.FormId         = FormId;\r
   Form.FormTitle      = StringToken;\r
 \r
-  Status              = AddOpCode (FormBuffer, &Form);\r
-\r
+  Status = AddOpCode (FormBuffer, &Form);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -171,12 +163,12 @@ CreateForm (
   EndForm.Header.Length = sizeof (FRAMEWORK_EFI_IFR_END_FORM);\r
 \r
   Status                = AddOpCode (FormBuffer, &EndForm);\r
-\r
+  \r
   return Status;\r
 }\r
 \r
 /**\r
-  Create a SubTitle\r
+  Create a SubTitle.\r
   \r
   Subtitle strings are intended to be used by authors to separate sections of questions into semantic\r
   groups.\r
@@ -188,6 +180,7 @@ CreateForm (
   @retval EFI_SUCCESS      Subtitle successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateSubTitle (\r
   IN      CHAR16                    *SubTitle,\r
   IN OUT  VOID                      *FormBuffer,\r
@@ -200,12 +193,10 @@ CreateSubTitle (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add SubTitle to the StringBuffer, get SubTitle's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
   Status = AddString (StringBuffer, CurrentLanguage, SubTitle, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -220,7 +211,7 @@ CreateSubTitle (
 }\r
 \r
 /**\r
-  Create a line of text\r
+  Create a line of text.\r
   Unlike HTML, text is simply another tag. \r
   This tag type enables IFR to be more easily localized.\r
   \r
@@ -235,6 +226,7 @@ CreateSubTitle (
   @retval EFI_SUCCESS     Text successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateText (\r
   IN      CHAR16                    *String,\r
   IN      CHAR16                    *String2,\r
@@ -251,15 +243,10 @@ CreateText (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add first string to the StringBuffer, get first string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, String, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -272,13 +259,11 @@ CreateText (
   // Add second string, get first string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, String2, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   Text.TextTwo  = StringToken;\r
-\r
   Text.Flags    = (UINT8) (Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r
   Text.Key      = Key;\r
 \r
@@ -286,7 +271,6 @@ CreateText (
   // Add second string, get first string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, String3, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -309,6 +293,7 @@ CreateText (
   @retval EFI_SUCCESS    Hyperlink successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateGoto (\r
   IN      UINT16                    FormId,\r
   IN      CHAR16                    *Prompt,\r
@@ -322,12 +307,10 @@ CreateGoto (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -359,6 +342,7 @@ CreateGoto (
   @retval EFI_SUCCESS       One-Of box successfully created.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOneOf (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -386,15 +370,10 @@ CreateOneOf (
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -406,18 +385,16 @@ CreateOneOf (
   OneOf.Prompt        = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   OneOf.Help  = StringToken;\r
 \r
-  Status      = AddOpCode (FormBuffer, &OneOf);\r
-\r
+  Status = AddOpCode (FormBuffer, &OneOf);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -427,17 +404,16 @@ CreateOneOf (
     OneOfOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r
 \r
     //\r
-    // Add string and get token back\r
+    // Add OptionString string to the StringBuffer, get OptionString string's token\r
     //\r
-    Status              = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
+    Status = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
 \r
     OneOfOption.Option  = StringToken;\r
     OneOfOption.Value   = OptionsList[Index].Value;\r
     OneOfOption.Flags   = (UINT8) (OptionsList[Index].Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r
     OneOfOption.Key     = OptionsList[Index].Key;\r
 \r
-    Status              = AddOpCode (FormBuffer, &OneOfOption);\r
-\r
+    Status = AddOpCode (FormBuffer, &OneOfOption);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -446,8 +422,7 @@ CreateOneOf (
   EndOneOf.Header.Length  = sizeof (FRAMEWORK_EFI_IFR_END_ONE_OF);\r
   EndOneOf.Header.OpCode  = FRAMEWORK_EFI_IFR_END_ONE_OF_OP;\r
 \r
-  Status                  = AddOpCode (FormBuffer, &EndOneOf);\r
-\r
+  Status = AddOpCode (FormBuffer, &EndOneOf);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -471,6 +446,7 @@ CreateOneOf (
   @retval EFI_SUCCESS     Ordered list successfully created.\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateOrderedList (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     MaxEntries,\r
@@ -491,15 +467,10 @@ CreateOrderedList (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -511,18 +482,16 @@ CreateOrderedList (
   OrderedList.Prompt        = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
 \r
   OrderedList.Help  = StringToken;\r
 \r
-  Status            = AddOpCode (FormBuffer, &OrderedList);\r
-\r
+  Status = AddOpCode (FormBuffer, &OrderedList);\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -532,17 +501,16 @@ CreateOrderedList (
     OrderedListOption.Header.Length = sizeof (FRAMEWORK_EFI_IFR_ONE_OF_OPTION);\r
 \r
     //\r
-    // Add string and get token back\r
+    // Add OptionString string to the StringBuffer, get OptionString string's token\r
     //\r
-    Status                    = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
+    Status = AddString (StringBuffer, CurrentLanguage, OptionsList[Index].OptionString, &StringToken);\r
 \r
     OrderedListOption.Option  = StringToken;\r
     OrderedListOption.Value   = OptionsList[Index].Value;\r
     OrderedListOption.Flags   = (UINT8) (OptionsList[Index].Flags | FRAMEWORK_EFI_IFR_FLAG_CREATED);\r
     OrderedListOption.Key     = OptionsList[Index].Key;\r
 \r
-    Status                    = AddOpCode (FormBuffer, &OrderedListOption);\r
-\r
+    Status = AddOpCode (FormBuffer, &OrderedListOption);\r
     if (EFI_ERROR (Status)) {\r
       return Status;\r
     }\r
@@ -571,6 +539,7 @@ CreateOrderedList (
   @retval EFI_SUCCESS       Check box successfully created\r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateCheckBox (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -594,15 +563,10 @@ CreateCheckBox (
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -614,10 +578,9 @@ CreateCheckBox (
   CheckBox.Prompt         = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -631,7 +594,7 @@ CreateCheckBox (
 }\r
 \r
 /**\r
-  Create a numeric\r
+  Create a numeric.\r
   \r
   @param  QuestionId        Question ID of the numeric\r
   @param  DataWidth         DataWidth of the numeric\r
@@ -650,6 +613,7 @@ CreateCheckBox (
   @retval EFI_SUCCESS       Numeric is successfully created  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateNumeric (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -678,15 +642,10 @@ CreateNumeric (
   }\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -698,10 +657,9 @@ CreateNumeric (
   Numeric.Prompt        = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -736,6 +694,7 @@ CreateNumeric (
   @retval EFI_SUCCESS    String successfully created.  \r
 **/\r
 EFI_STATUS\r
+EFIAPI\r
 CreateString (\r
   IN      UINT16                    QuestionId,\r
   IN      UINT8                     DataWidth,\r
@@ -755,15 +714,10 @@ CreateString (
   STRING_REF                        StringToken;\r
 \r
   //\r
-  // Obtain current language value\r
+  // Add Prompt string to the StringBuffer, get Prompt string's token\r
   //\r
   GetCurrentLanguage (CurrentLanguage);\r
-\r
-  //\r
-  // Add first string, get first string's token\r
-  //\r
   Status = AddString (StringBuffer, CurrentLanguage, Prompt, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r
@@ -775,10 +729,9 @@ CreateString (
   String.Prompt         = StringToken;\r
 \r
   //\r
-  // Add second string, get first string's token\r
+  // Add Help string to the StringBuffer, get Help string's token\r
   //\r
   Status = AddString (StringBuffer, CurrentLanguage, Help, &StringToken);\r
-\r
   if (EFI_ERROR (Status)) {\r
     return Status;\r
   }\r