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 998fc5047d7e1b14851ad7d0522ef5b526a43fbf..f9f286705f7d54772339562bbb10bed28ef3a8f7 100644 (file)
--- a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
+++ b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
@@ -1,7 +1,7 @@
-/*++\r
+/**@file\r
 \r
-Copyright (c) 2006 - 2007, Intel Corporation\r
-All rights reserved. This program and the accompanying materials\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
 http://opensource.org/licenses/bsd-license.php\r
@@ -58,7 +58,7 @@ Abstract:
 \r
   * Other names and brands may be claimed as the property of others.\r
 \r
---*/\r
+**/\r
 #include <Uefi.h>\r
 #include <WinNtDxe.h>\r
 #include <Protocol/WinNtThunk.h>\r
@@ -118,8 +118,9 @@ InitializeWinNtBlockIo(
              &gWinNtBlockIoComponentName,\r
              &gWinNtBlockIoComponentName2,\r
              NULL,\r
+             NULL,\r
              &gWinNtBlockIoDriverDiagnostics,\r
-             NULL\r
+             &gWinNtBlockIoDriverDiagnostics2\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -158,7 +159,7 @@ Returns:
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiWinNtIoProtocolGuid,\r
-                  &WinNtIo,\r
+                  (VOID **) &WinNtIo,\r
                   This->DriverBindingHandle,\r
                   Handle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -233,7 +234,7 @@ Returns:
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiWinNtIoProtocolGuid,\r
-                  &WinNtIo,\r
+                  (VOID **) &WinNtIo,\r
                   This->DriverBindingHandle,\r
                   Handle,\r
                   EFI_OPEN_PROTOCOL_BY_DRIVER\r
@@ -360,7 +361,7 @@ Returns:
   Status = gBS->OpenProtocol (\r
                   Handle,\r
                   &gEfiBlockIoProtocolGuid,\r
-                  &BlockIo,\r
+                  (VOID **) &BlockIo,\r
                   This->DriverBindingHandle,\r
                   Handle,\r
                   EFI_OPEN_PROTOCOL_GET_PROTOCOL\r
@@ -407,7 +408,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 CHAR16 *\r
 GetNextElementPastTerminator (\r
   IN  CHAR16  *EnvironmentVariable,\r
@@ -443,7 +443,6 @@ Returns:
   return Ptr;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoCreateMapping (\r
   IN EFI_WIN_NT_IO_PROTOCOL             *WinNtIo,\r
@@ -530,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
@@ -587,7 +586,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoOpenDevice (\r
   WIN_NT_BLOCK_IO_PRIVATE                 *Private\r
@@ -628,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
@@ -660,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
@@ -669,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
@@ -707,7 +705,6 @@ Done:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoError (\r
   IN WIN_NT_BLOCK_IO_PRIVATE      *Private\r
@@ -777,7 +774,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoReadWriteCommon (\r
   IN  WIN_NT_BLOCK_IO_PRIVATE     *Private,\r
@@ -836,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
@@ -862,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
@@ -873,7 +869,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoReadBlocks (\r
@@ -940,7 +935,6 @@ Done:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoWriteBlocks (\r
@@ -978,8 +972,10 @@ WinNtBlockIoWriteBlocks (
   WIN_NT_BLOCK_IO_PRIVATE *Private;\r
   UINTN                   BytesWritten;\r
   BOOL                    Flag;\r
+  BOOL                    Locked;\r
   EFI_STATUS              Status;\r
   EFI_TPL                 OldTpl;\r
+  UINTN                   BytesReturned;\r
 \r
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
 \r
@@ -990,7 +986,24 @@ WinNtBlockIoWriteBlocks (
     goto Done;\r
   }\r
 \r
+  //\r
+  // According the Windows requirement, first need to lock the volume before \r
+  // write to it.\r
+  //\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
+    Private->WinNtThunk->DeviceIoControl (Private->NtHandle, FSCTL_UNLOCK_VOLUME, NULL, 0, NULL, 0, &BytesReturned, NULL);\r
+  }\r
   if (!Flag || (BytesWritten != BufferSize)) {\r
     DEBUG ((EFI_D_INIT, "ReadBlocks: WriteFile failed. (%d)\n", Private->WinNtThunk->GetLastError ()));\r
     Status = WinNtBlockIoError (Private);\r
@@ -1010,7 +1023,6 @@ Done:
 \r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoFlushBlocks (\r
@@ -1034,7 +1046,6 @@ WinNtBlockIoFlushBlocks (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoResetBlock (\r
@@ -1097,7 +1108,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
@@ -1109,8 +1119,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