Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Sample / Tools / Source / UefiVfrCompile / VfrError.h

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h
index 3becd9b6e166bde610b4eb0bb34f63c0332d2640..8c0e4c9a47fe26b20f17df3743362b8756520b97 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiVfrCompile/VfrError.h
@@ -11,7 +11,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 \r
 Module Name:\r
 \r
-VfrError.h\r
+  VfrError.h\r
 \r
 Abstract:\r
 \r
@@ -45,6 +45,8 @@ typedef enum {
   VFR_RETURN_FLAGS_UNSUPPORTED,\r
   VFR_RETURN_ERROR_ARRARY_NUM,\r
   VFR_RETURN_DATA_STRING_ERROR,\r
+  VFR_RETURN_DEFAULT_VALUE_REDEFINED,\r
+  VFR_RETURN_CONSTANT_ONLY,\r
   VFR_RETURN_CODEUNDEFINED\r
 } EFI_VFR_RETURN_CODE;\r
 \r
@@ -65,6 +67,7 @@ struct SVfrFileScopeRecord {
 \r
 class CVfrErrorHandle {\r
 private:\r
+  INT8                *mInputFileName;\r
   SVFR_ERROR_HANDLE   *mVfrErrorHandleTable;\r
   SVfrFileScopeRecord *mScopeRecordListHead;\r
   SVfrFileScopeRecord *mScopeRecordListTail;\r
@@ -73,10 +76,11 @@ public:
   CVfrErrorHandle (VOID);\r
   ~CVfrErrorHandle (VOID);\r
 \r
+  VOID  SetInputFile (IN INT8 *);\r
   VOID  ParseFileScopeRecord (IN INT8 *, IN UINT32);\r
   VOID  GetFileNameLineNum (IN UINT32, OUT INT8 **, OUT UINT32 *);\r
   UINT8 HandleError (IN EFI_VFR_RETURN_CODE, IN UINT32 LineNum = 0, IN INT8 *TokName = "\0");\r
-  VOID  PrintError (IN UINT32 LineNum = 0, IN INT8 *TokName = "\0", IN INT8 *ErrorMsg = "\0");\r
+  VOID  PrintMsg (IN UINT32 LineNum = 0, IN INT8 *TokName = "\0", IN INT8 *MsgType = "Error", IN INT8 *ErrorMsg = "\0");\r
 };\r
 \r
 #define CHECK_ERROR_RETURN(f, v) do { EFI_VFR_RETURN_CODE r; if ((r = (f)) != (v)) { return r; } } while (0)\r