Sync BaseTools Trunk (version r2524) to EDKII main trunk.

[mirror_edk2.git] / BaseTools / Source / Python / GenFds / GuidSection.py

diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index 0ef5a23716a1000c7bfc05e988909431c4da2e13..36ad4f58ef8189f2cb13b2308179baea08b18138 100644 (file)
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -193,16 +193,20 @@ class GuidSection(GuidSectionClassObject) :
 \r
             Attribute = []\r
             HeaderLength = None\r
-            if TempFileSize > InputFileSize and TempFileSize % 4 == 0:\r
-                FileHandleIn.seek(0)\r
-                BufferIn  = FileHandleIn.read()\r
-                FileHandleOut.seek(0)\r
-                BufferOut = FileHandleOut.read()\r
-                if BufferIn == BufferOut[TempFileSize - InputFileSize:]:\r
-                    HeaderLength = str(TempFileSize - InputFileSize)\r
-            #auto sec guided attribute with process required\r
-            if HeaderLength == None:\r
-                Attribute.append('PROCESSING_REQUIRED')\r
+            if self.ExtraHeaderSize != -1:\r
+                HeaderLength = str(self.ExtraHeaderSize)\r
+\r
+            if self.ProcessRequired == "NONE" and HeaderLength == None:\r
+                if TempFileSize > InputFileSize and TempFileSize % 4 == 0:\r
+                    FileHandleIn.seek(0)\r
+                    BufferIn  = FileHandleIn.read()\r
+                    FileHandleOut.seek(0)\r
+                    BufferOut = FileHandleOut.read()\r
+                    if BufferIn == BufferOut[TempFileSize - InputFileSize:]:\r
+                        HeaderLength = str(TempFileSize - InputFileSize)\r
+                #auto sec guided attribute with process required\r
+                if HeaderLength == None:\r
+                    Attribute.append('PROCESSING_REQUIRED')\r
 \r
             FileHandleIn.close()\r
             FileHandleOut.close()\r
@@ -217,7 +221,7 @@ class GuidSection(GuidSectionClassObject) :
             if self.ProcessRequired in ("TRUE", "1"):\r
                 if 'PROCESSING_REQUIRED' not in Attribute:\r
                     Attribute.append('PROCESSING_REQUIRED')\r
-                HeaderLength = None\r
+  \r
             if self.AuthStatusValid in ("TRUE", "1"):\r
                 Attribute.append('AUTH_STATUS_VALID')\r
             GenFdsGlobalVariable.GenerateSection(OutputFile, [TempFile], Section.Section.SectionType['GUIDED'],\r