Sync BaseTool trunk (version r2670) into EDKII BaseTools.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Gao, Liming <liming.gao@intel.com>
Reviewed-by: Liu, Yingke D (yingke.d.liu@intel.com)


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15605 6f19259b-4bc3-4df7-8a09-765794883524

BaseTools/Source/C/VfrCompile/GNUmakefile

@@ -53,10 +53,10 @@ VfrLexer.cpp VfrLexer.h: Pccts/dlg/dlg VfrParser.dlg
 	Pccts/dlg/dlg -C2 -i -CC -cl VfrLexer -o . VfrParser.dlg
 
 Pccts/antlr/antlr:
-	BIN_DIR='.' make -C Pccts/antlr
+	BIN_DIR='.' $(MAKE) -C Pccts/antlr
 
 Pccts/dlg/dlg:
-	BIN_DIR='.' make -C Pccts/dlg
+	BIN_DIR='.' $(MAKE) -C Pccts/dlg
 
 ATokenBuffer.o: Pccts/h/ATokenBuffer.cpp
 	$(CXX) -c $(VFR_CPPFLAGS) $(INC) $? -o $@
@@ -73,7 +73,7 @@ VfrSyntax.o: VfrSyntax.cpp
 clean: localClean
 
 localClean:
-	BIN_DIR='.' make -C Pccts/antlr clean
-	BIN_DIR='.' make -C Pccts/dlg clean
+	BIN_DIR='.' $(MAKE) -C Pccts/antlr clean
+	BIN_DIR='.' $(MAKE) -C Pccts/dlg clean
 	rm -f $(EXTRA_CLEAN_OBJECTS)
 

BaseTools/Source/C/VfrCompile/VfrCompiler.cpp

@@ -372,6 +372,8 @@ CVfrCompiler::CVfrCompiler (
   mPreProcessCmd = (CHAR8 *) PREPROCESSOR_COMMAND;
   mPreProcessOpt = (CHAR8 *) PREPROCESSOR_OPTIONS;
 
+  SET_RUN_STATUS (STATUS_STARTED);
+
   OptionInitialization(Argc, Argv);
 
   if ((IS_RUN_STATUS(STATUS_FAILED)) || (IS_RUN_STATUS(STATUS_DEAD))) {

BaseTools/Source/C/VfrCompile/VfrCompiler.h

@@ -60,7 +60,8 @@ typedef struct {
 } OPTIONS;
 
 typedef enum {
-  STATUS_INITIALIZED = 1,
+  STATUS_STARTED = 0,
+  STATUS_INITIALIZED,
   STATUS_PREPROCESSED,
   STATUS_COMPILEED,
   STATUS_GENBINARY,

BaseTools/Source/C/VfrCompile/VfrError.cpp

@@ -51,6 +51,7 @@ static SVFR_ERROR_HANDLE VFR_ERROR_HANDLE_TABLE [] = {
 
 static SVFR_WARNING_HANDLE VFR_WARNING_HANDLE_TABLE [] = {
   { VFR_WARNING_DEFAULT_VALUE_REDEFINED, ": default value re-defined with different value"},
+  { VFR_WARNING_STRING_TO_UINT_OVERFLOW, ": String to UINT* Overflow"},
   { VFR_WARNING_CODEUNDEFINED, ": undefined Warning Code" }
 };
 

BaseTools/Source/C/VfrCompile/VfrError.h

@@ -49,6 +49,7 @@ typedef enum {
 
 typedef enum {
   VFR_WARNING_DEFAULT_VALUE_REDEFINED = 0,
+  VFR_WARNING_STRING_TO_UINT_OVERFLOW,
   VFR_WARNING_CODEUNDEFINED
 } EFI_VFR_WARNING_CODE;
 

BaseTools/Source/C/VfrCompile/VfrFormPkg.h

@@ -2,7 +2,7 @@
   
   The definition of CFormPkg's member function
 
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2004 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials                          
 are licensed and made available under the terms and conditions of the BSD License         
 which accompanies this distribution.  The full text of the license may be found at        
@@ -1343,7 +1343,7 @@ public:
     UpdateCIfrMinMaxStepData(&mNumeric->data);
   }
 
-  EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags) {
+  EFI_VFR_RETURN_CODE SetFlags (IN UINT8 HFlags, IN UINT8 LFlags, BOOLEAN DisplaySettingsSpecified = FALSE) {
     EFI_VFR_RETURN_CODE Ret;
 
     Ret = CIfrQuestionHeader::SetFlags (HFlags);
@@ -1351,10 +1351,10 @@ public:
       return Ret;
     }
 
-    if (LFlags & EFI_IFR_DISPLAY) {
-      mNumeric->Flags = LFlags;
-    } else {
+    if (DisplaySettingsSpecified == FALSE) {
       mNumeric->Flags = LFlags | EFI_IFR_DISPLAY_UINT_DEC;
+    } else {
+      mNumeric->Flags = LFlags;
     }
     return VFR_RETURN_SUCCESS;
   }