Fix the bug that SecMain often throw exception when environment variable too large...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@870 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/EdkNt32Pkg/Nt32.fpd b/EdkNt32Pkg/Nt32.fpd
index d1cddbcdc293837c96ad9c945c7ed30c266af5c7..cc257b0fc39fcfa0f4e07767d4bbeb52023703ad 100644 (file)
--- a/EdkNt32Pkg/Nt32.fpd
+++ b/EdkNt32Pkg/Nt32.fpd
@@ -210,7 +210,7 @@
           <TokenSpaceGuidCName>gEfiEdkNt32PkgTokenSpaceGuid</TokenSpaceGuidCName>
           <DatumType>VOID*</DatumType>
           <MaxDatumSize>52</MaxDatumSize>
-          <Value>L"..\\..\\FV\\FV_RECOVERY.fd"</Value>
+          <Value>L"..\\FV\\FV_RECOVERY.fd"</Value>
         </PcdData>
         <PcdData ItemType="FIXED_AT_BUILD">
           <C_Name>PcdWinNtBootMode</C_Name>
@@ -6919,8 +6919,7 @@
   </BuildOptions>
   
   <UserExtensions UserID="TianoCore" Identifier="1">
-    <mkdir dir="${FV_DIR}/../../FV"/>
-    <concat destfile="${FV_DIR}/../../FV/FV_RECOVERY.fd" binary="true" >
+    <concat destfile="${FV_DIR}/FV_RECOVERY.fd" binary="true" >
        <fileset dir="${FV_DIR}" includes="*.fv"/>
     </concat>
   </UserExtensions>

diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index f31886978545ccd719fc480664bc3e5b79409c12..6c29d2210090f199be90505f8a5401001aec145c 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -150,7 +150,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
           <shellscript shell="cmd.exe" tmpsuffix=".cmd" >\r
             <arg line="/c"/>\r
             <arg line="call"/>\r
-            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MsvcRt.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb\r
+            "${DLINK}" /LIBPATH:"${env.MSVCDir}\Lib" /LIBPATH:"${env.MSVCDir}\PlatformSdk\Lib" /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib User32.lib Winmm.lib ${OBJECTS} ${LIBS} /base:0x10000000 /out:${BIN_DIR}\SecMain.exe /pdb:${DEST_DIR_DEBUG}\SecMain.pdb\r
           </shellscript>\r
         </sequential>\r
       </OnDependency>\r