Fix ICC compatibility issues

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

diff --git a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
index 23c19017dffcb75f90822d340e024860ba9146c1..0991fc6b96653be3e491af91b2003bfe15fc3ae2 100644 (file)
--- a/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
+++ b/Nt32Pkg/Library/DxeNt32PeCoffExtraActionLib/DxeNt32PeCoffExtraActionLib.c
@@ -159,6 +159,7 @@ AddModHandle (
   PDB_NAME_TO_MOD_HANDLE  *Array;\r
   UINTN                   PreviousSize;\r
   PDB_NAME_TO_MOD_HANDLE  *TempArray;\r
+  HANDLE                  Handle;\r
 \r
   Array = mPdbNameModHandleArray;\r
   for (Index = 0; Index < mPdbNameModHandleArraySize; Index++, Array++) {\r
@@ -166,7 +167,8 @@ AddModHandle (
       //\r
       // Make a copy of the stirng and store the ModHandle\r
       //\r
-      Array->PdbPointer = mWinNt->HeapAlloc ( mWinNt->GetProcessHeap (),\r
+      Handle = mWinNt->GetProcessHeap ();\r
+      Array->PdbPointer = mWinNt->HeapAlloc ( Handle,\r
                                 HEAP_ZERO_MEMORY,\r
                                 AsciiStrLen (ImageContext->PdbPointer) + 1\r
                                ); \r

diff --git a/Nt32Pkg/ResetRuntimeDxe/reset.c b/Nt32Pkg/ResetRuntimeDxe/reset.c
index 21e44fb33f87973c0f7ebe1d405264f50df683aa..e498a3415d3d5b7969796e35966fcdebb481c1a7 100644 (file)
--- a/Nt32Pkg/ResetRuntimeDxe/reset.c
+++ b/Nt32Pkg/ResetRuntimeDxe/reset.c
@@ -41,7 +41,7 @@ WinNtResetSystem (
   IN EFI_RESET_TYPE   ResetType,\r
   IN EFI_STATUS       ResetStatus,\r
   IN UINTN            DataSize,\r
-  IN CHAR16           *ResetData OPTIONAL\r
+  IN VOID             *ResetData OPTIONAL\r
   );\r
 \r
 \r
@@ -90,7 +90,7 @@ WinNtResetSystem (
   IN EFI_RESET_TYPE   ResetType,\r
   IN EFI_STATUS       ResetStatus,\r
   IN UINTN            DataSize,\r
-  IN CHAR16           *ResetData OPTIONAL\r
+  IN VOID             *ResetData OPTIONAL\r
   )\r
 /*++\r
 \r

diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
index 29cee4f915fad31b4c100f4fb989075a17bd6cf7..be9eb78fb5c0066b71691dc241a3b23b63591218 100644 (file)
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.c
@@ -42,7 +42,7 @@ SNPNT32_GLOBAL_DATA         gSnpNt32GlobalData = {
   {\r
     0,\r
     0,\r
-    0\r
+    EfiLockUninitialized\r
   },                          //  Lock\r
   //\r
   //  Private functions\r
@@ -1083,7 +1083,7 @@ SnpNt32InitializeGlobalData (
   //\r
   //  Get the WinNT thunk\r
   //\r
-  Status = gBS->LocateProtocol (&gEfiWinNtThunkProtocolGuid, NULL, &This->WinNtThunk);\r
+  Status = gBS->LocateProtocol (&gEfiWinNtThunkProtocolGuid, NULL, (VOID **)&This->WinNtThunk);\r
 \r
   if (EFI_ERROR (Status)) {\r
     return Status;\r

diff --git a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
index d0e04ce404dfcc234d9702868acd7a4fa4d20223..8b84ef9d952fbf0d50fa19a5365993d4414ea1ff 100644 (file)
--- a/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
+++ b/Nt32Pkg/SnpNt32Dxe/SnpNt32.h
@@ -139,7 +139,7 @@ EFI_STATUS
 //\r
 #define SNP_NT32_DRIVER_SIGNATURE SIGNATURE_32 ('W', 'S', 'N', 'P')\r
 \r
-typedef struct _SNPNT32_GLOBAL_DATA {\r
+struct _SNPNT32_GLOBAL_DATA {\r
   UINT32                            Signature;\r
 \r
   //\r
@@ -160,14 +160,14 @@ typedef struct _SNPNT32_GLOBAL_DATA {
   SNPNT32_INITIALIZE_GLOBAL_DATA    InitializeGlobalData;\r
   SNPNT32_INITIALIZE_INSTANCE_DATA  InitializeInstanceData;\r
   SNPNT32_CLOSE_INSTANCE            CloseInstance;\r
-} SNPNT32_GLOBAL_DATA;\r
+};\r
 \r
 //\r
 //  Instance data for each fake SNP instance\r
 //\r
 #define SNP_NT32_INSTANCE_SIGNATURE SIGNATURE_32 ('w', 'S', 'N', 'P')\r
 \r
-typedef struct _SNPNT32_INSTANCE_DATA {\r
+struct _SNPNT32_INSTANCE_DATA {\r
   UINT32                      Signature;\r
 \r
   //\r
@@ -188,7 +188,7 @@ typedef struct _SNPNT32_INSTANCE_DATA {
   //\r
   //  Private functions\r
   //\r
-} SNPNT32_INSTANCE_DATA;\r
+};\r
 \r
 #define SNP_NT32_INSTANCE_DATA_FROM_SNP_THIS(a) \\r
   CR ( \\r

diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
index f020d6baed0e42f307d30525bb2e93252d3ddb1d..291f7a08e2ec582160192cfe7ee1012246075651 100644 (file)
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
@@ -1089,7 +1089,6 @@ This function extends the capability of SetFilePointer to accept 64 bit paramete
 {\r
   EFI_STATUS    Status;\r
   LARGE_INTEGER LargeInt;\r
-  UINT32        ErrorCode;\r
 \r
   LargeInt.QuadPart = DistanceToMove;\r
   Status            = EFI_SUCCESS;\r
@@ -1101,8 +1100,7 @@ This function extends the capability of SetFilePointer to accept 64 bit paramete
                                             MoveMethod\r
                                             );\r
 \r
-  if (LargeInt.LowPart == -1 &&\r
-      (ErrorCode = Private->WinNtThunk->GetLastError ()) != NO_ERROR) {\r
+  if (LargeInt.LowPart == -1 && Private->WinNtThunk->GetLastError () != NO_ERROR) {\r
     Status = EFI_INVALID_PARAMETER;\r
   }\r
 \r

diff --git a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
index 3e2c158ea1ad06986d67f707383a4564e77a9378..1fa6223b86f6667494b7d77658b8dbe3fbc79aa7 100644 (file)
--- a/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
+++ b/Nt32Pkg/WinNtGopDxe/WinNtGopScreen.c
@@ -140,13 +140,13 @@ WinNtGopConvertParamToEfiKey (
   // Set toggle state\r
   //    \r
   case VK_NUMLOCK:     \r
-    Private->NumLock    = !Private->NumLock;\r
+    Private->NumLock    = (BOOLEAN)(!Private->NumLock);\r
     break;\r
   case VK_SCROLL:\r
-    Private->ScrollLock = !Private->ScrollLock;\r
+    Private->ScrollLock = (BOOLEAN)(!Private->ScrollLock);\r
     break;  \r
   case VK_CAPITAL:\r
-    Private->CapsLock   = !Private->CapsLock;\r
+    Private->CapsLock   = (BOOLEAN)(!Private->CapsLock);\r
     break;  \r
   }\r
   \r
@@ -821,7 +821,6 @@ WinNtGopThreadWinMain (
 {\r
   MSG               Message;\r
   GOP_PRIVATE_DATA  *Private;\r
-  ATOM              Atom;\r
   RECT              Rect;\r
 \r
   Private = (GOP_PRIVATE_DATA *) lpParameter;\r
@@ -857,7 +856,7 @@ WinNtGopThreadWinMain (
   // Class, including the callback function, unless the Class is unregistered and\r
   // successfully registered again.\r
   //\r
-  Atom = Private->WinNtThunk->RegisterClassEx (&Private->WindowsClass);\r
+  Private->WinNtThunk->RegisterClassEx (&Private->WindowsClass);\r
 \r
   //\r
   // Setting Rect values to allow for the AdjustWindowRect to provide\r
@@ -882,7 +881,7 @@ WinNtGopThreadWinMain (
                                                 NULL,\r
                                                 NULL,\r
                                                 NULL,\r
-                                                &Private\r
+                                                (VOID **)&Private\r
                                                 );\r
 \r
   //\r
@@ -1050,8 +1049,6 @@ WinNtGopDestructor (
   GOP_PRIVATE_DATA     *Private\r
   )\r
 {\r
-  UINT32  UnregisterReturn;\r
-\r
   if (!Private->HardwareNeedsStarting) {\r
     //\r
     // BugBug: Shutdown GOP Hardware and any child devices.\r
@@ -1071,10 +1068,10 @@ WinNtGopDestructor (
       Private->WinNtThunk->TlsFree (mTlsIndex);\r
       mTlsIndex = TLS_OUT_OF_INDEXES;\r
 \r
-      UnregisterReturn = Private->WinNtThunk->UnregisterClass (\r
-                                                Private->WindowsClass.lpszClassName,\r
-                                                Private->WindowsClass.hInstance\r
-                                                );\r
+      Private->WinNtThunk->UnregisterClass (\r
+                              Private->WindowsClass.lpszClassName,\r
+                              Private->WindowsClass.hInstance\r
+                              );\r
     }\r
 \r
     WinNtGopDestroySimpleTextInForWindow (Private);\r
@@ -1111,6 +1108,5 @@ KillNtGopThread (
   IN VOID       *Context\r
   )\r
 {\r
-  EFI_STATUS  Status;\r
-  Status = WinNtGopDestructor (Context);\r
+  WinNtGopDestructor (Context);\r
 }\r

diff --git a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
index e12f14dc29af78bf4a0f443e51a38042a136821d..5a55fa428c0aa4fa8a9d710f6e3a44a9a7b7bf8d 100644 (file)
--- a/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
+++ b/Nt32Pkg/WinNtSerialIoDxe/WinNtSerialIo.c
@@ -192,7 +192,7 @@ Returns:
         DevicePathNodeLength((EFI_DEVICE_PATH_PROTOCOL *)UartNode) != sizeof(UART_DEVICE_PATH)) {\r
       goto Error;\r
     }\r
-    if (UartNode->BaudRate < 0 || UartNode->BaudRate > SERIAL_PORT_MAX_BAUD_RATE) {\r
+    if ( UartNode->BaudRate > SERIAL_PORT_MAX_BAUD_RATE) {\r
       goto Error;\r
     }\r
     if (UartNode->Parity < NoParity || UartNode->Parity > SpaceParity) {\r
@@ -339,9 +339,9 @@ Returns:
                               Node.BaudRate,\r
                               SerialIo->Mode->ReceiveFifoDepth,\r
                               SerialIo->Mode->Timeout,\r
-                              Node.Parity,\r
+                              (EFI_PARITY_TYPE)Node.Parity,\r
                               Node.DataBits,\r
-                              Node.StopBits\r
+                              (EFI_STOP_BITS_TYPE)Node.StopBits\r
                               );\r
         }\r
         break;\r
@@ -699,9 +699,9 @@ Returns:
                 This->Mode->BaudRate,\r
                 This->Mode->ReceiveFifoDepth,\r
                 This->Mode->Timeout,\r
-                This->Mode->Parity,\r
+                (EFI_PARITY_TYPE)This->Mode->Parity,\r
                 (UINT8) This->Mode->DataBits,\r
-                This->Mode->StopBits\r
+                (EFI_STOP_BITS_TYPE)This->Mode->StopBits\r
                 );\r
 }\r
 \r
@@ -774,7 +774,7 @@ Returns:
   }\r
 \r
   if (Parity == DefaultParity) {\r
-    Parity = FixedPcdGet8 (PcdUartDefaultParity);\r
+    Parity = (EFI_PARITY_TYPE) (FixedPcdGet8 (PcdUartDefaultParity));\r
   }\r
 \r
   if (DataBits == 0) {\r

diff --git a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
index 7da3eef9ce580bc9a501c049ff14e2cc80d2a2e9..1abb84185e54e252c63b2bfa00d79eeb8ab3bc77 100644 (file)
--- a/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
+++ b/Nt32Pkg/WinNtSimpleFileSystemDxe/WinNtSimpleFileSystem.c
@@ -837,6 +837,7 @@ Returns:
   BOOLEAN                           LoopFinish;\r
   UINTN                             InfoSize;\r
   EFI_FILE_INFO                     *Info;\r
+  UINTN                             Size;\r
 \r
   //\r
   // Check for obvious invalid parameters.\r
@@ -951,7 +952,10 @@ OpenRoot:
     StrCpy (NewPrivateFile->FilePath, PrivateFile->FilePath);\r
   }\r
 \r
-  NewPrivateFile->FileName = AllocatePool (StrSize (NewPrivateFile->FilePath) + StrSize (L"\\") + StrSize (FileName));\r
+  Size = StrSize (NewPrivateFile->FilePath);\r
+  Size += StrSize (L"\\");\r
+  Size += StrSize (FileName);\r
+  NewPrivateFile->FileName = AllocatePool (Size);\r
   if (NewPrivateFile->FileName == NULL) {\r
     Status = EFI_OUT_OF_RESOURCES;\r
     goto Done;\r
@@ -1107,7 +1111,9 @@ OpenRoot:
   //\r
   if (NewPrivateFile->IsDirectoryPath) {\r
 \r
-    TempFileName = AllocatePool (StrSize (NewPrivateFile->FileName) + StrSize (L"\\*"));\r
+    Size  = StrSize (NewPrivateFile->FileName);\r
+    Size += StrSize (L"\\*");\r
+    TempFileName = AllocatePool (Size);\r
     if (TempFileName == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
@@ -1560,12 +1566,12 @@ Returns:
     }\r
 \r
     Status = PrivateFile->WinNtThunk->ReadFile (\r
-                                      PrivateFile->LHandle,\r
-                                      Buffer,\r
-                                      *BufferSize,\r
-                                      BufferSize,\r
-                                      NULL\r
-                                      ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+                                        PrivateFile->LHandle,\r
+                                        Buffer,\r
+                                        *BufferSize,\r
+                                        (LPDWORD)BufferSize,\r
+                                        NULL\r
+                                        ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
     goto Done;\r
   }\r
 \r
@@ -1731,12 +1737,12 @@ Returns:
   }\r
 \r
   Status = PrivateFile->WinNtThunk->WriteFile (\r
-                                    PrivateFile->LHandle,\r
-                                    Buffer,\r
-                                    *BufferSize,\r
-                                    BufferSize,\r
-                                    NULL\r
-                                    ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
+                                      PrivateFile->LHandle,\r
+                                      Buffer,\r
+                                      *BufferSize,\r
+                                      (LPDWORD)BufferSize,\r
+                                      NULL\r
+                                      ) ? EFI_SUCCESS : EFI_DEVICE_ERROR;\r
 \r
 Done:\r
   gBS->RestoreTPL (OldTpl);\r
@@ -1780,6 +1786,7 @@ Returns:
   UINT32                  PosHigh;\r
   CHAR16                  *FileName;\r
   EFI_TPL                 OldTpl;\r
+  UINTN                   Size;\r
 \r
   if (This == NULL) {\r
     return EFI_INVALID_PARAMETER;\r
@@ -1795,7 +1802,9 @@ Returns:
       goto Done;\r
     }\r
 \r
-    FileName = AllocatePool (StrSize (PrivateFile->FileName) + StrSize (L"\\*"));\r
+    Size  = StrSize (PrivateFile->FileName);\r
+    Size += StrSize (L"\\*");\r
+    FileName = AllocatePool (Size);\r
     if (FileName == NULL) {\r
       Status = EFI_OUT_OF_RESOURCES;\r
       goto Done;\r
@@ -1825,7 +1834,7 @@ Returns:
     } else {\r
       PosHigh = (UINT32) RShiftU64 (Position, 32);\r
 \r
-      PosLow  = PrivateFile->WinNtThunk->SetFilePointer (PrivateFile->LHandle, (ULONG) Position, &PosHigh, FILE_BEGIN);\r
+      PosLow  = PrivateFile->WinNtThunk->SetFilePointer (PrivateFile->LHandle, (ULONG) Position, (PLONG)&PosHigh, FILE_BEGIN);\r
     }\r
 \r
     Status = (PosLow == 0xFFFFFFFF) ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
@@ -1888,11 +1897,11 @@ Returns:
 \r
     PositionHigh = 0;\r
     *Position = PrivateFile->WinNtThunk->SetFilePointer (\r
-                                          PrivateFile->LHandle,\r
-                                          0,\r
-                                          &PositionHigh,\r
-                                          FILE_CURRENT\r
-                                          );\r
+                                           PrivateFile->LHandle,\r
+                                           0,\r
+                                           (PLONG)&PositionHigh,\r
+                                           FILE_CURRENT\r
+                                           );\r
 \r
     Status = *Position == 0xffffffff ? EFI_DEVICE_ERROR : EFI_SUCCESS;\r
     if (EFI_ERROR (Status)) {\r
@@ -2199,10 +2208,10 @@ Returns:
     //\r
     NtStatus = PrivateFile->WinNtThunk->GetDiskFreeSpace (\r
                                           DriveNameFound ? DriveName : NULL,\r
-                                          &SectorsPerCluster,\r
-                                          &BytesPerSector,\r
-                                          &FreeClusters,\r
-                                          &TotalClusters\r
+                                          (LPDWORD)&SectorsPerCluster,\r
+                                          (LPDWORD)&BytesPerSector,\r
+                                          (LPDWORD)&FreeClusters,\r
+                                          (LPDWORD)&TotalClusters\r
                                           );\r
     if (DriveName) {\r
       FreePool (DriveName);\r
@@ -2331,6 +2340,7 @@ Returns:
   WIN32_FIND_DATA                   FindBuf;\r
   EFI_FILE_SYSTEM_INFO              *NewFileSystemInfo;\r
   EFI_TPL                           OldTpl;\r
+  UINTN                             Size;\r
 \r
   //\r
   // Check for invalid parameters.\r
@@ -2459,25 +2469,20 @@ Returns:
   //\r
   // Make full pathname from new filename and rootpath.\r
   //\r
-  if (NewFileInfo->FileName[0] == '\\') {\r
-    NewFileName = AllocatePool (StrSize (PrivateRoot->FilePath) + StrSize (L"\\") + StrSize (NewFileInfo->FileName));\r
-    if (NewFileName == NULL) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
-      goto Done;\r
-    }\r
+  Size  = StrSize (PrivateRoot->FilePath);\r
+  Size += StrSize (L"\\");\r
+  Size += StrSize (NewFileInfo->FileName);\r
+  NewFileName = AllocatePool (Size);\r
+  if (NewFileName == NULL) {\r
+    Status = EFI_OUT_OF_RESOURCES;\r
+    goto Done;\r
+  }\r
 \r
-    StrCpy (NewFileName, PrivateRoot->FilePath);\r
-    StrCat (NewFileName, L"\\");\r
+  StrCpy (NewFileName, PrivateRoot->FilePath);\r
+  StrCat (NewFileName, L"\\");\r
+  if (NewFileInfo->FileName[0] == '\\') {\r
     StrCat (NewFileName, NewFileInfo->FileName + 1);\r
   } else {\r
-    NewFileName = AllocatePool (StrSize (PrivateFile->FilePath) + StrSize (L"\\") + StrSize (NewFileInfo->FileName));\r
-    if (NewFileName == NULL) {\r
-      Status = EFI_OUT_OF_RESOURCES;\r
-      goto Done;\r
-    }\r
-\r
-    StrCpy (NewFileName, PrivateFile->FilePath);\r
-    StrCat (NewFileName, L"\\");\r
     StrCat (NewFileName, NewFileInfo->FileName);\r
   }\r
 \r
@@ -2588,7 +2593,9 @@ Returns:
 \r
       StrCpy (PrivateFile->FileName, NewFileName);\r
 \r
-      TempFileName = AllocatePool (StrSize (NewFileName) + StrSize (L"\\*"));\r
+      Size  =  StrSize (NewFileName);\r
+      Size += StrSize (L"\\*");\r
+      TempFileName = AllocatePool (Size);\r
 \r
       StrCpy (TempFileName, NewFileName);\r
 \r
@@ -2638,7 +2645,9 @@ Reopen: ;
         goto Done;\r
       }\r
 \r
-      TempFileName = AllocatePool (StrSize (OldFileName) + StrSize (L"\\*"));\r
+      Size =  StrSize (OldFileName);\r
+      Size += StrSize (L"\\*");\r
+      TempFileName = AllocatePool (Size);\r
 \r
       StrCpy (TempFileName, OldFileName);\r
 \r