VfrCompile: fix invalid comparison between pointer and integer

[mirror_edk2.git] / BaseTools / Source / C / VfrCompile / VfrCompiler.h

diff --git a/BaseTools/Source/C/VfrCompile/VfrCompiler.h b/BaseTools/Source/C/VfrCompile/VfrCompiler.h
index c32325f0b717efbc00e77db66735fa25ae08378e..b8f39dfa6ca7b500972af60c4f98c063239cb3bc 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrCompiler.h
+++ b/BaseTools/Source/C/VfrCompile/VfrCompiler.h
@@ -2,7 +2,7 @@
   \r
   VfrCompiler internal defintions.\r
 \r
-Copyright (c) 2004 - 2008, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -20,10 +20,10 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include "EfiVfr.h"\r
 #include "VfrFormPkg.h"\r
 #include "VfrUtilityLib.h"\r
+#include "ParseInf.h"\r
 \r
 #define PROGRAM_NAME                       "VfrCompile"\r
-#define VFR_COMPILER_VERSION               " 1.95 (UEFI 2.1)"\r
-#define VFR_COMPILER_UPDATE_TIME           " updated on 2009/05/20"\r
+#define VFR_COMPILER_VERSION               " 2.01 (UEFI 2.4) "\r
 //\r
 // This is how we invoke the C preprocessor on the VFR source file\r
 // to resolve #defines, #includes, etc. To make C source files\r
@@ -41,23 +41,29 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #define VFR_RECORDLIST_FILENAME_EXTENSION   ".lst"\r
 \r
 typedef struct {\r
-  CHAR8   VfrFileName[MAX_PATH];\r
-  CHAR8   RecordListFile[MAX_PATH];\r
-  CHAR8   PkgOutputFileName[MAX_PATH];\r
-  CHAR8   COutputFileName[MAX_PATH];\r
+  CHAR8   *VfrFileName;\r
+  CHAR8   *RecordListFile;\r
+  CHAR8   *PkgOutputFileName;\r
+  CHAR8   *COutputFileName;\r
   bool    CreateRecordListFile;\r
   bool    CreateIfrPkgFile;\r
-  CHAR8   OutputDirectory[MAX_PATH];\r
-  CHAR8   PreprocessorOutputFileName[MAX_PATH];\r
-  CHAR8   VfrBaseFileName[MAX_PATH];  // name of input VFR file with no path or extension\r
+  CHAR8   *OutputDirectory;\r
+  CHAR8   *PreprocessorOutputFileName;\r
+  CHAR8   *VfrBaseFileName;  // name of input VFR file with no path or extension\r
   CHAR8   *IncludePaths;\r
   bool    SkipCPreprocessor;\r
   CHAR8   *CPreprocessorOptions;\r
   BOOLEAN CompatibleMode;\r
+  BOOLEAN HasOverrideClassGuid;\r
+  EFI_GUID OverrideClassGuid;\r
+  BOOLEAN WarningAsError;\r
+  BOOLEAN AutoDefault;\r
+  BOOLEAN CheckDefault;\r
 } OPTIONS;\r
 \r
 typedef enum {\r
-  STATUS_INITIALIZED = 1,\r
+  STATUS_STARTED = 0,\r
+  STATUS_INITIALIZED,\r
   STATUS_PREPROCESSED,\r
   STATUS_COMPILEED,\r
   STATUS_GENBINARY,\r
@@ -95,6 +101,7 @@ public:
   ~CVfrCompiler ();\r
 \r
   VOID                Usage (VOID);\r
+  VOID                Version (VOID);\r
 \r
   VOID                PreProcess (VOID);\r
   VOID                Compile (VOID);\r