BaseTools/Pccts: Resolve GCC sting format mismatch build warning

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

diff --git a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
index 644dfddad9434506f0797a53bf3ab87c47c631cf..17ab14c021dfacea7f4f1d064bc335dc90306979 100644 (file)
--- a/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
+++ b/BaseTools/Source/C/VfrCompile/VfrFormPkg.h
@@ -2,7 +2,7 @@
   \r
   The definition of CFormPkg's member function\r
 \r
-Copyright (c) 2004 - 2015, 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
@@ -87,6 +87,10 @@ struct SPendingAssign {
   VOID   SetAddrAndLen (IN VOID *, IN UINT32);\r
   VOID   AssignValue (IN VOID *, IN UINT32);\r
   CHAR8 * GetKey (VOID);\r
+\r
+private:\r
+  SPendingAssign (IN CONST SPendingAssign&);             // Prevent copy-construction\r
+  SPendingAssign& operator= (IN CONST SPendingAssign&);  // Prevent assignment\r
 };\r
 \r
 struct SBufferNode {\r
@@ -139,6 +143,10 @@ public:
   EFI_VFR_RETURN_CODE BuildPkg (OUT PACKAGE_DATA &);\r
   EFI_VFR_RETURN_CODE GenCFile (IN CHAR8 *, IN FILE *, IN PACKAGE_DATA *PkgData = NULL);\r
 \r
+private:\r
+  CFormPkg (IN CONST CFormPkg&);             // Prevent copy-construction\r
+  CFormPkg& operator= (IN CONST CFormPkg&);  // Prevent assignment\r
+\r
 public:\r
   EFI_VFR_RETURN_CODE AssignPending (IN CHAR8 *, IN VOID *, IN UINT32, IN UINT32, IN CONST CHAR8 *Msg = NULL);\r
   VOID                DoPendingAssign (IN CHAR8 *, IN VOID *, IN UINT32);\r
@@ -154,7 +162,8 @@ public:
     );\r
   EFI_VFR_RETURN_CODE AdjustDynamicInsertOpcode (\r
     IN CHAR8              *LastFormEndAddr,\r
-    IN CHAR8              *InsertOpcodeAddr\r
+    IN CHAR8              *InsertOpcodeAddr,\r
+    IN BOOLEAN            CreateOpcodeAfterParsingVfr\r
     );\r
   CHAR8 *             GetBufAddrBaseOnOffset (\r
     IN UINT32             Offset\r
@@ -177,8 +186,23 @@ struct SIfrRecord {
   ~SIfrRecord (VOID);\r
 };\r
 \r
+\r
 #define EFI_IFR_RECORDINFO_IDX_INVALUD 0xFFFFFF\r
 #define EFI_IFR_RECORDINFO_IDX_START   0x0\r
+#define EFI_HII_MAX_SUPPORT_DEFAULT_TYPE  0x08\r
+\r
+struct QuestionDefaultRecord {\r
+  BOOLEAN     mIsDefaultIdExist[EFI_HII_MAX_SUPPORT_DEFAULT_TYPE]; // Record the default id in mAllDefaultIdArray[EFI_HII_MAX_SUPPORT_DEFAULT_TYPE]\r
+                                                                   // whether exists in current question.\r
+\r
+  SIfrRecord  *mDefaultValueRecord;   // Point to the default value record in RecordList which has smallest default Id.\r
+                                      // (for checkbox it may be NULL, because the dedault value is always true when the flag is set.)\r
+\r
+  BOOLEAN     mIsDefaultOpcode;       // whether the default value with smallest default id is given by default opcode.\r
+                                      // (for oneof and checkbox default info may be given by flag.)\r
+\r
+  UINT16      mDefaultNumber;         // The default number of this question.\r
+};\r
 \r
 class CIfrRecordInfoDB {\r
 private:\r
@@ -186,6 +210,8 @@ private:
   UINT32     mRecordCount;\r
   SIfrRecord *mIfrRecordListHead;\r
   SIfrRecord *mIfrRecordListTail;\r
+  UINT8      mAllDefaultTypeCount;\r
+  UINT16     mAllDefaultIdArray[EFI_HII_MAX_SUPPORT_DEFAULT_TYPE];\r
 \r
   SIfrRecord * GetRecordInfoFromIdx (IN UINT32);\r
   BOOLEAN          CheckQuestionOpCode (IN UINT8);\r
@@ -205,13 +231,24 @@ public:
 \r
   SIfrRecord * GetRecordInfoFromOffset (IN UINT32);\r
   VOID        IfrAdjustOffsetForRecord (VOID);\r
-  BOOLEAN     IfrAdjustDynamicOpcodeInRecords (VOID);\r
+  BOOLEAN     IfrAdjustDynamicOpcodeInRecords (IN BOOLEAN);\r
 \r
   UINT32      IfrRecordRegister (IN UINT32, IN CHAR8 *, IN UINT8, IN UINT32);\r
   VOID        IfrRecordInfoUpdate (IN UINT32, IN UINT32, IN CHAR8*, IN UINT8, IN UINT32);\r
   VOID        IfrRecordOutput (IN FILE *, IN UINT32 LineNo);\r
   VOID        IfrRecordOutput (OUT PACKAGE_DATA &);\r
-  EFI_VFR_RETURN_CODE  IfrRecordAdjust (VOID);   \r
+  EFI_VFR_RETURN_CODE  IfrRecordAdjust (VOID);\r
+  VOID        IfrUpdateRecordInfoForDynamicOpcode (IN BOOLEAN);\r
+  VOID        IfrCheckAddDefaultRecord (IN BOOLEAN, IN BOOLEAN);\r
+  VOID        IfrGetDefaultStoreInfo ();\r
+  VOID        IfrCreateDefaultRecord (IN UINT8 Size,IN UINT16 DefaultId,IN UINT8 Type,IN UINT32 LineNo,IN EFI_IFR_TYPE_VALUE Value);\r
+  VOID        IfrCreateDefaultForQuestion (IN  SIfrRecord *, IN  QuestionDefaultRecord *);\r
+  VOID        IfrParseDefaulInfoInQuestion (IN  SIfrRecord *, OUT QuestionDefaultRecord *);\r
+  VOID        IfrAddDefaultToBufferConfig (IN  UINT16, IN  SIfrRecord *,IN  EFI_IFR_TYPE_VALUE);\r
+\r
+private:\r
+  CIfrRecordInfoDB (IN CONST CIfrRecordInfoDB&);             // Prevent copy-construction\r
+  CIfrRecordInfoDB& operator= (IN CONST CIfrRecordInfoDB&);  // Prevent assignment\r
 };\r
 \r
 extern CIfrRecordInfoDB gCIfrRecordInfoDB;\r
@@ -282,6 +319,7 @@ private:
 public:\r
   CIfrOpHeader (IN UINT8 OpCode, IN VOID *StartAddr, IN UINT8 Length = 0);\r
   CIfrOpHeader (IN CIfrOpHeader &);\r
+  CIfrOpHeader& operator=(IN CONST CIfrOpHeader &);\r
 \r
   VOID IncLength (UINT8 Size) {\r
     if ((mHeader->Length + Size) > mHeader->Length) {\r