Fix ICC build issues

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

diff --git a/Nt32Pkg/CpuRuntimeDxe/Cpu.c b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
index bcce412a337d82dc2a5b7775be7b9878669f84dd..4ac12a4e1eab07fcd6ce7ed995e8d634b4f4377a 100644 (file)
--- a/Nt32Pkg/CpuRuntimeDxe/Cpu.c
+++ b/Nt32Pkg/CpuRuntimeDxe/Cpu.c
@@ -327,7 +327,7 @@ Returns:
     return EFI_INVALID_PARAMETER;\r
   }\r
   \r
     return EFI_INVALID_PARAMETER;\r
   }\r
   \r

-  gWinNt->QueryPerformanceCounter (TimerValue);\r
+  gWinNt->QueryPerformanceCounter ((LARGE_INTEGER *)TimerValue);\r

   \r
   if (TimerPeriod != NULL) {\r
     *TimerPeriod = mTimerPeriod;\r
   \r
   if (TimerPeriod != NULL) {\r
     *TimerPeriod = mTimerPeriod;\r


@@ -532,7 +532,7 @@ Returns:
   //\r
   // Retrieve the frequency of the performance counter in Hz.\r
   //  \r
   //\r
   // Retrieve the frequency of the performance counter in Hz.\r
   //  \r

-  gWinNt->QueryPerformanceFrequency (&Frequency);\r
+  gWinNt->QueryPerformanceFrequency ((LARGE_INTEGER *)&Frequency);\r

   \r
   //\r
   // Convert frequency in Hz to a clock period in femtoseconds.\r
   \r
   //\r
   // Convert frequency in Hz to a clock period in femtoseconds.\r

diff --git a/Nt32Pkg/Sec/SecMain.inf b/Nt32Pkg/Sec/SecMain.inf
index 90597c2dfcf073d3e4f8711e99bb61dab91b3559..cfb7921f4243aa96686090487746e152d9edd942 100644 (file)
--- a/Nt32Pkg/Sec/SecMain.inf
+++ b/Nt32Pkg/Sec/SecMain.inf
@@ -3,7 +3,7 @@
 #\r
 # Main executable file of NT32 Emulator that loads PEI core after initialization finished.\r
 #\r
 #\r
 # Main executable file of NT32 Emulator that loads PEI core after initialization finished.\r
 #\r

-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2011, 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
 #  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


@@ -63,13 +63,13 @@
   \r
 [BuildOptions]\r
   MSFT:*_*_IA32_DLINK_FLAGS == /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\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\r
   \r
 [BuildOptions]\r
   MSFT:*_*_IA32_DLINK_FLAGS == /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\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\r

-  MSFT:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE\r
-  MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+  MSFT:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE\r
+  MSFT:*_*_IA32_PP_FLAGS == /nologo /E /TC /FIAutoGen.h\r

   MSFT:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
   MSFT:*_*_IA32_ASMLINK_FLAGS       == /link /nologo /tiny\r
 \r
   INTEL:*_*_IA32_DLINK_FLAGS == /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"C:\Program Files\Intel\Compiler\C++\9.1\IA32\Lib" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\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\r
   MSFT:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
   MSFT:*_*_IA32_ASMLINK_FLAGS       == /link /nologo /tiny\r
 \r
   INTEL:*_*_IA32_DLINK_FLAGS == /out:"$(BIN_DIR)\SecMain.exe" /base:0x10000000 /pdb:"$(BIN_DIR)\SecMain.pdb" /LIBPATH:"C:\Program Files\Intel\Compiler\C++\9.1\IA32\Lib" /LIBPATH:"$(VCINSTALLDIR)\Lib" /LIBPATH:"$(VCINSTALLDIR)\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\r

-  INTEL:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FI$(DEST_DIR_DEBUG)/AutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE\r
-  INTEL:*_*_IA32_PP_FLAGS == /nologo /E /TC /FI$(DEST_DIR_DEBUG)/AutoGen.h\r
+  INTEL:*_*_IA32_CC_FLAGS == /nologo /W4 /WX /Gy /c /D UNICODE /Od /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE\r
+  INTEL:*_*_IA32_PP_FLAGS == /nologo /E /TC /FIAutoGen.h\r

   INTEL:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
   INTEL:*_*_IA32_ASMLINK_FLAGS       == /link /nologo /tiny\r
   INTEL:*_*_IA32_ASM_FLAGS == /nologo /W3 /WX /c /coff /Cx /Zd /W0 /Zi\r
   INTEL:*_*_IA32_ASMLINK_FLAGS       == /link /nologo /tiny\r

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
index 3b91da8f9f49d87e39eb2fd8833955f694c187ad..5defc1601c33e61f3acab80f7d9ffe8e854d4f9e 100644 (file)
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopInput.c
@@ -246,12 +246,14 @@ Returns:
 \r
 VOID\r
 WinNtGopSimpleTextInTimerHandler (\r
 \r
 VOID\r
 WinNtGopSimpleTextInTimerHandler (\r

-  IN EFI_EVENT          Event,\r
-  IN GOP_PRIVATE_DATA   *Private\r
+  IN EFI_EVENT  Event,\r
+  IN VOID       *Context\r

   )\r
 {\r
   )\r
 {\r

-  EFI_KEY_DATA          KeyData;\r
+  GOP_PRIVATE_DATA  *Private;\r
+  EFI_KEY_DATA      KeyData;\r

 \r
 \r

+  Private = (GOP_PRIVATE_DATA *)Context;\r

   while (GopPrivateDeleteQ (Private, &Private->QueueForNotify, &KeyData) == EFI_SUCCESS) {\r
     GopPrivateInvokeRegisteredFunction (Private, &KeyData);\r
   }\r
   while (GopPrivateDeleteQ (Private, &Private->QueueForNotify, &KeyData) == EFI_SUCCESS) {\r
     GopPrivateInvokeRegisteredFunction (Private, &KeyData);\r
   }\r


@@ -330,9 +332,9 @@ GopPrivateAddKey (
       (KeyData.Key.UnicodeChar >= 1) && (KeyData.Key.UnicodeChar <= 26)\r
      ) {\r
     if ((Private->LeftShift || Private->RightShift) == Private->CapsLock) {\r
       (KeyData.Key.UnicodeChar >= 1) && (KeyData.Key.UnicodeChar <= 26)\r
      ) {\r
     if ((Private->LeftShift || Private->RightShift) == Private->CapsLock) {\r

-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar + L'a' - 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar + L'a' - 1);\r

     } else {\r
     } else {\r

-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar + L'A' - 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar + L'A' - 1);\r

     }\r
   }\r
 \r
     }\r
   }\r
 \r


@@ -352,9 +354,9 @@ GopPrivateAddKey (
   //\r
   if (Private->LeftCtrl || Private->RightCtrl) {\r
     if ((KeyData.Key.UnicodeChar >= L'a') && (KeyData.Key.UnicodeChar <= L'z')) {\r
   //\r
   if (Private->LeftCtrl || Private->RightCtrl) {\r
     if ((KeyData.Key.UnicodeChar >= L'a') && (KeyData.Key.UnicodeChar <= L'z')) {\r

-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar - L'a' + 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'a' + 1);\r

     } else if ((KeyData.Key.UnicodeChar >= L'A') && (KeyData.Key.UnicodeChar <= L'Z')) {\r
     } else if ((KeyData.Key.UnicodeChar >= L'A') && (KeyData.Key.UnicodeChar <= L'Z')) {\r

-      KeyData.Key.UnicodeChar = KeyData.Key.UnicodeChar - L'A' + 1;\r
+      KeyData.Key.UnicodeChar = (CHAR16)(KeyData.Key.UnicodeChar - L'A' + 1);\r

     }\r
   }\r
   GopPrivateAddQ (Private, &Private->QueueForRead, &KeyData);\r
     }\r
   }\r
   GopPrivateAddQ (Private, &Private->QueueForRead, &KeyData);\r