Fix VS 2005 compatibility issue

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

diff --git a/EdkNt32Pkg/Sec/SecMain_build.xml b/EdkNt32Pkg/Sec/SecMain_build.xml
index 56b26350052c93436e9cb66bd3d922b4441f2ff2..12b1a944193fb8689408fac2cdeeb38a86d68f7a 100644 (file)
--- a/EdkNt32Pkg/Sec/SecMain_build.xml
+++ b/EdkNt32Pkg/Sec/SecMain_build.xml
@@ -99,6 +99,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <target name="sections" />\r
 \r
     <target name="output" >\r
     <target name="sections" />\r
 \r
     <target name="output" >\r

+      <if>\r
+        <available type="file" file="${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>\r
+        <then>\r
+          <var name="SLINK_FLAGS" value="${SLINK_FLAGS} ${DEST_DIR_OUTPUT}/AutoGen.h.obj"/>\r
+        </then>\r
+      </if>\r

       <OnDependency>\r
         <sourcefiles>\r
           <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />\r
       <OnDependency>\r
         <sourcefiles>\r
           <fileset dir="${DEST_DIR_OUTPUT}" includes="${OBJECTS}" />\r

diff --git a/EdkNt32Pkg/Sec/WinNtThunk.c b/EdkNt32Pkg/Sec/WinNtThunk.c
index d064fae73df8cc40eb888ecd8eefe94f0bc84fdb..2832e13fdde236f2685cc9f1d5e17c4eaf79ba72 100644 (file)
--- a/EdkNt32Pkg/Sec/WinNtThunk.c
+++ b/EdkNt32Pkg/Sec/WinNtThunk.c
@@ -45,6 +45,7 @@ Abstract:
 //  to tell if all the elements have been initailized properly.\r
 //\r
 #pragma warning(disable : 4232)\r
 //  to tell if all the elements have been initailized properly.\r
 //\r
 #pragma warning(disable : 4232)\r

+#pragma warning(disable : 4996)\r

 \r
 EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {\r
   EFI_WIN_NT_THUNK_PROTOCOL_SIGNATURE,\r
 \r
 EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {\r
   EFI_WIN_NT_THUNK_PROTOCOL_SIGNATURE,\r


@@ -137,7 +138,7 @@ EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {
   PurgeComm,\r
   SetCommTimeouts,\r
   ExitProcess,\r
   PurgeComm,\r
   SetCommTimeouts,\r
   ExitProcess,\r

-  swprintf,\r
+  _snwprintf,\r

   GetDesktopWindow,\r
   GetForegroundWindow,\r
   CreateWindowEx,\r
   GetDesktopWindow,\r
   GetForegroundWindow,\r
   CreateWindowEx,\r


@@ -173,6 +174,7 @@ EFI_WIN_NT_THUNK_PROTOCOL mWinNtThunkTable = {
   HeapFree\r
 };\r
 \r
   HeapFree\r
 };\r
 \r

+#pragma warning(default : 4996)\r

 #pragma warning(default : 4232)\r
 \r
 EFI_WIN_NT_THUNK_PROTOCOL *gWinNt = &mWinNtThunkTable;\r
 #pragma warning(default : 4232)\r
 \r
 EFI_WIN_NT_THUNK_PROTOCOL *gWinNt = &mWinNtThunkTable;\r