BaseTools/BinToPcd: Fix Python 2.7.x compatibility issue

[mirror_edk2.git] / Nt32Pkg / WinNtBlockIoDxe / WinNtBlockIo.c

diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
index 1e12dd5204e46ce9c124d669da2e26aee6c30543..f9f286705f7d54772339562bbb10bed28ef3a8f7 100644 (file)
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
@@ -1,6 +1,6 @@
 /**@file\r
 \r
-Copyright (c) 2006 - 2012, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2006 - 2013, 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
@@ -529,7 +529,7 @@ Returns:
   BlockIo = &Private->BlockIo;\r
   BlockIo->Revision = EFI_BLOCK_IO_PROTOCOL_REVISION;\r
   BlockIo->Media = &Private->Media;\r
-  BlockIo->Media->BlockSize = Private->BlockSize;\r
+  BlockIo->Media->BlockSize = (UINT32)Private->BlockSize;\r
   BlockIo->Media->LastBlock = Private->NumberOfBlocks - 1;\r
   BlockIo->Media->MediaId = 0;;\r
 \r
@@ -626,10 +626,10 @@ Returns:
   //\r
   Private->NtHandle = Private->WinNtThunk->CreateFile (\r
                                             Private->Filename,\r
-                                            Private->ReadMode,\r
-                                            Private->ShareMode,\r
+                                            (DWORD)Private->ReadMode,\r
+                                            (DWORD)Private->ShareMode,\r
                                             NULL,\r
-                                            Private->OpenMode,\r
+                                            (DWORD)Private->OpenMode,\r
                                             0,\r
                                             NULL\r
                                             );\r
@@ -658,7 +658,7 @@ Returns:
   Status = SetFilePointer64 (Private, 0, &FileSize, FILE_END);\r
 \r
   if (EFI_ERROR (Status)) {\r
-    FileSize = MultU64x32 (Private->NumberOfBlocks, Private->BlockSize);\r
+    FileSize = MultU64x32 (Private->NumberOfBlocks, (UINT32)Private->BlockSize);\r
     if (Private->DeviceType == EfiWinNtVirtualDisks) {\r
       DEBUG ((EFI_D_ERROR, "PlOpenBlock: Could not get filesize of %s\n", Private->Filename));\r
       Status = EFI_UNSUPPORTED;\r
@@ -667,10 +667,10 @@ Returns:
   }\r
 \r
   if (Private->NumberOfBlocks == 0) {\r
-    Private->NumberOfBlocks = DivU64x32 (FileSize, Private->BlockSize);\r
+    Private->NumberOfBlocks = DivU64x32 (FileSize, (UINT32)Private->BlockSize);\r
   }\r
 \r
-  EndOfFile = MultU64x32 (Private->NumberOfBlocks, Private->BlockSize);\r
+  EndOfFile = MultU64x32 (Private->NumberOfBlocks, (UINT32)Private->BlockSize);\r
 \r
   if (FileSize != EndOfFile) {\r
     //\r
@@ -832,7 +832,7 @@ Returns:
     return EFI_MEDIA_CHANGED;\r
   }\r
 \r
-  if ((UINT32) Buffer % Private->Media.IoAlign != 0) {\r
+  if ((UINTN) Buffer % Private->Media.IoAlign != 0) {\r
     return EFI_INVALID_PARAMETER;\r
   }\r
 \r
@@ -858,7 +858,7 @@ Returns:
   //\r
   // Seek to End of File\r
   //\r
-  DistanceToMove = MultU64x32 (Lba, BlockSize);\r
+  DistanceToMove = MultU64x32 (Lba, (UINT32)BlockSize);\r
   Status = SetFilePointer64 (Private, DistanceToMove, &DistanceMoved, FILE_BEGIN);\r
 \r
   if (EFI_ERROR (Status)) {\r
@@ -990,11 +990,15 @@ WinNtBlockIoWriteBlocks (
   // According the Windows requirement, first need to lock the volume before \r
   // write to it.\r
   //\r
-  Locked = Private->WinNtThunk->DeviceIoControl (Private->NtHandle, FSCTL_LOCK_VOLUME, NULL, 0, NULL, 0, &BytesReturned, NULL);\r
-  if (Locked == 0) {\r
-    DEBUG ((EFI_D_INIT, "ReadBlocks: Lock volume failed. (%d)\n", Private->WinNtThunk->GetLastError ()));\r
-    Status = WinNtBlockIoError (Private);\r
-    goto Done;\r
+  if (Private->DeviceType == EfiWinNtPhysicalDisks) {\r
+    Locked = Private->WinNtThunk->DeviceIoControl (Private->NtHandle, FSCTL_LOCK_VOLUME, NULL, 0, NULL, 0, &BytesReturned, NULL);\r
+    if (Locked == 0) {\r
+      DEBUG ((EFI_D_INIT, "ReadBlocks: Lock volume failed. (%d)\n", Private->WinNtThunk->GetLastError ()));\r
+      Status = WinNtBlockIoError (Private);\r
+      goto Done;\r
+    }\r
+  } else {\r
+    Locked = 0;\r
   }\r
   Flag = Private->WinNtThunk->WriteFile (Private->NtHandle, Buffer, (DWORD) BufferSize, (LPDWORD) &BytesWritten, NULL);\r
   if (Locked != 0) {\r