mirror of
https://github.com/ApfelTeeSaft/reactos.git
synced 2026-09-02 04:13:34 +00:00
[VFATLIB]
- Don't overwrite format status with lock status svn path=/trunk/; revision=52436
This commit is contained in:
@@ -32,7 +32,7 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
|
||||
HANDLE FileHandle;
|
||||
PARTITION_INFORMATION PartitionInfo;
|
||||
FORMAT_CONTEXT Context;
|
||||
NTSTATUS Status;
|
||||
NTSTATUS Status, LockStatus;
|
||||
|
||||
DPRINT("VfatFormat(DriveRoot '%wZ')\n", DriveRoot);
|
||||
|
||||
@@ -194,20 +194,20 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
|
||||
Context.Percent = 0;
|
||||
Callback (PROGRESS, 0, (PVOID)&Context.Percent);
|
||||
}
|
||||
|
||||
Status = NtFsControlFile(FileHandle,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&Iosb,
|
||||
FSCTL_LOCK_VOLUME,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
0);
|
||||
if (!NT_SUCCESS(Status))
|
||||
|
||||
LockStatus = NtFsControlFile(FileHandle,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&Iosb,
|
||||
FSCTL_LOCK_VOLUME,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
0);
|
||||
if (!NT_SUCCESS(LockStatus))
|
||||
{
|
||||
DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", Status);
|
||||
DPRINT1("WARNING: Failed to lock volume for formatting! Format may fail! (Status: 0x%x)\n", LockStatus);
|
||||
}
|
||||
|
||||
if (PartitionInfo.PartitionType == PARTITION_FAT_12)
|
||||
@@ -250,20 +250,20 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
|
||||
{
|
||||
Status = STATUS_INVALID_PARAMETER;
|
||||
}
|
||||
|
||||
Status = NtFsControlFile(FileHandle,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&Iosb,
|
||||
FSCTL_UNLOCK_VOLUME,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
0);
|
||||
if (!NT_SUCCESS(Status))
|
||||
|
||||
LockStatus = NtFsControlFile(FileHandle,
|
||||
NULL,
|
||||
NULL,
|
||||
NULL,
|
||||
&Iosb,
|
||||
FSCTL_UNLOCK_VOLUME,
|
||||
NULL,
|
||||
0,
|
||||
NULL,
|
||||
0);
|
||||
if (!NT_SUCCESS(LockStatus))
|
||||
{
|
||||
DPRINT1("Failed to unlock volume (Status: 0x%x)\n", Status);
|
||||
DPRINT1("Failed to unlock volume (Status: 0x%x)\n", LockStatus);
|
||||
}
|
||||
|
||||
NtClose(FileHandle);
|
||||
|
||||
Reference in New Issue
Block a user