Do not lock the volume when the volume maps to a file instead of a physical disk.

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

diff --git a/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c b/Nt32Pkg/WinNtBlockIoDxe/WinNtBlockIo.c
index 3f32d2028e67fd0041f3c30b0c686a328659c9b4..12924e659fbab77db9475d748767c5e8aebd792f 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
@@ -110,14 +110,17 @@ InitializeWinNtBlockIo(
   //\r
   // Install driver model protocol(s).\r
   //\r
-  Status = EfiLibInstallAllDriverProtocols (\r
+  Status = EfiLibInstallAllDriverProtocols2 (\r
              ImageHandle,\r
              SystemTable,\r
              &gWinNtBlockIoDriverBinding,\r
              ImageHandle,\r
              &gWinNtBlockIoComponentName,\r
+             &gWinNtBlockIoComponentName2,\r
              NULL,\r
-             &gWinNtBlockIoDriverDiagnostics\r
+             NULL,\r
+             &gWinNtBlockIoDriverDiagnostics,\r
+             &gWinNtBlockIoDriverDiagnostics2\r
              );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
@@ -156,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
@@ -231,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
@@ -284,10 +287,10 @@ Returns:
       WriteProtected  = (BOOLEAN) (*Str == 'O');\r
       Str             = GetNextElementPastTerminator (Str, ';');\r
 \r
-      NumberOfBlocks  = Atoi (Str);\r
+      NumberOfBlocks  = StrDecimalToUintn (Str);\r
       if (NumberOfBlocks != 0) {\r
         Str       = GetNextElementPastTerminator (Str, ';');\r
-        BlockSize = Atoi (Str);\r
+        BlockSize = StrDecimalToUintn (Str);\r
         if (BlockSize != 0) {\r
           //\r
           // If we get here the variable is valid so do the work.\r
@@ -358,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
@@ -405,7 +408,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 CHAR16 *\r
 GetNextElementPastTerminator (\r
   IN  CHAR16  *EnvironmentVariable,\r
@@ -441,7 +443,6 @@ Returns:
   return Ptr;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoCreateMapping (\r
   IN EFI_WIN_NT_IO_PROTOCOL             *WinNtIo,\r
@@ -509,13 +510,22 @@ Returns:
 \r
   Private->ControllerNameTable  = NULL;\r
 \r
-  AddUnicodeString (\r
+  AddUnicodeString2 (\r
     "eng",\r
     gWinNtBlockIoComponentName.SupportedLanguages,\r
     &Private->ControllerNameTable,\r
-    Private->Filename\r
+    Private->Filename,\r
+    TRUE\r
+    );\r
+  AddUnicodeString2 (\r
+    "en",\r
+    gWinNtBlockIoComponentName2.SupportedLanguages,\r
+    &Private->ControllerNameTable,\r
+    Private->Filename,\r
+    FALSE\r
     );\r
 \r
+\r
   BlockIo = &Private->BlockIo;\r
   BlockIo->Revision = EFI_BLOCK_IO_PROTOCOL_REVISION;\r
   BlockIo->Media = &Private->Media;\r
@@ -576,7 +586,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoOpenDevice (\r
   WIN_NT_BLOCK_IO_PRIVATE                 *Private\r
@@ -696,7 +705,6 @@ Done:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoError (\r
   IN WIN_NT_BLOCK_IO_PRIVATE      *Private\r
@@ -766,7 +774,6 @@ Returns:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 WinNtBlockIoReadWriteCommon (\r
   IN  WIN_NT_BLOCK_IO_PRIVATE     *Private,\r
@@ -862,7 +869,6 @@ Returns:
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoReadBlocks (\r
@@ -929,7 +935,6 @@ Done:
   return Status;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoWriteBlocks (\r
@@ -967,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
@@ -979,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
@@ -999,7 +1023,6 @@ Done:
 \r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoFlushBlocks (\r
@@ -1023,7 +1046,6 @@ WinNtBlockIoFlushBlocks (
   return EFI_SUCCESS;\r
 }\r
 \r
-STATIC\r
 EFI_STATUS\r
 EFIAPI\r
 WinNtBlockIoResetBlock (\r
@@ -1063,52 +1085,6 @@ WinNtBlockIoResetBlock (
   return EFI_SUCCESS;\r
 }\r
 \r
-UINTN\r
-Atoi (\r
-  CHAR16  *String\r
-  )\r
-/*++\r
-\r
-Routine Description:\r
-\r
-  Convert a unicode string to a UINTN\r
-\r
-Arguments:\r
-\r
-  String - Unicode string.\r
-\r
-Returns:\r
-\r
-  UINTN of the number represented by String.\r
-\r
---*/\r
-{\r
-  UINTN   Number;\r
-  CHAR16  *Str;\r
-\r
-  //\r
-  // skip preceeding white space\r
-  //\r
-  Str = String;\r
-  while ((*Str) && (*Str == ' ')) {\r
-    Str++;\r
-  }\r
-  //\r
-  // Convert ot a Number\r
-  //\r
-  Number = 0;\r
-  while (*Str != '\0') {\r
-    if ((*Str >= '0') && (*Str <= '9')) {\r
-      Number = (Number * 10) +*Str - '0';\r
-    } else {\r
-      break;\r
-    }\r
-\r
-    Str++;\r
-  }\r
-\r
-  return Number;\r
-}\r
 \r
 EFI_STATUS\r
 SetFilePointer64 (\r
@@ -1132,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
@@ -1144,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