mirror of
https://github.com/reactos/reactos.git
synced 2024-10-24 23:11:33 +00:00
[VFATLIB]
- Don't overwrite format status with lock status svn path=/trunk/; revision=52436
This commit is contained in:
parent
a3b61053bc
commit
f16fa41fb2
|
@ -32,7 +32,7 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
|
||||||
HANDLE FileHandle;
|
HANDLE FileHandle;
|
||||||
PARTITION_INFORMATION PartitionInfo;
|
PARTITION_INFORMATION PartitionInfo;
|
||||||
FORMAT_CONTEXT Context;
|
FORMAT_CONTEXT Context;
|
||||||
NTSTATUS Status;
|
NTSTATUS Status, LockStatus;
|
||||||
|
|
||||||
DPRINT("VfatFormat(DriveRoot '%wZ')\n", DriveRoot);
|
DPRINT("VfatFormat(DriveRoot '%wZ')\n", DriveRoot);
|
||||||
|
|
||||||
|
@ -195,19 +195,19 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
|
||||||
Callback (PROGRESS, 0, (PVOID)&Context.Percent);
|
Callback (PROGRESS, 0, (PVOID)&Context.Percent);
|
||||||
}
|
}
|
||||||
|
|
||||||
Status = NtFsControlFile(FileHandle,
|
LockStatus = NtFsControlFile(FileHandle,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&Iosb,
|
&Iosb,
|
||||||
FSCTL_LOCK_VOLUME,
|
FSCTL_LOCK_VOLUME,
|
||||||
NULL,
|
NULL,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
0);
|
0);
|
||||||
if (!NT_SUCCESS(Status))
|
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)
|
if (PartitionInfo.PartitionType == PARTITION_FAT_12)
|
||||||
|
@ -251,19 +251,19 @@ VfatFormat(IN PUNICODE_STRING DriveRoot,
|
||||||
Status = STATUS_INVALID_PARAMETER;
|
Status = STATUS_INVALID_PARAMETER;
|
||||||
}
|
}
|
||||||
|
|
||||||
Status = NtFsControlFile(FileHandle,
|
LockStatus = NtFsControlFile(FileHandle,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
NULL,
|
NULL,
|
||||||
&Iosb,
|
&Iosb,
|
||||||
FSCTL_UNLOCK_VOLUME,
|
FSCTL_UNLOCK_VOLUME,
|
||||||
NULL,
|
NULL,
|
||||||
0,
|
0,
|
||||||
NULL,
|
NULL,
|
||||||
0);
|
0);
|
||||||
if (!NT_SUCCESS(Status))
|
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);
|
NtClose(FileHandle);
|
||||||
|
|
Loading…
Reference in a new issue