diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-07-01 15:16:46 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-07-01 15:16:46 +0200 |
| commit | 0bfed6553d08131fd8e0bd725642ff8509a2a1d4 (patch) | |
| tree | a4325dd52e48b00eea5dfcd5dcb37c29f06c156d /src/Common/Format.h | |
| parent | 17dcd73936a99105c736477a9f49f2ac606440dc (diff) | |
| download | VeraCrypt-0bfed6553d08131fd8e0bd725642ff8509a2a1d4.tar.gz VeraCrypt-0bfed6553d08131fd8e0bd725642ff8509a2a1d4.zip | |
Windows: Fix formatting issue during volume creation by using /Y for format.com and specifying removal parameter in FormatEx
The usage of /Y parameter in format.com simplifies the logic and makes the code robust since we don't need to send \n to the format.com process.
Specifying RemovableMedia parameter to FormatEx fixes its failure in Windows 10 and later to perform quick format. This is also more adequate since we are mounting the volume as removable media for the formatting process.
We also add better error management in order to display adequate error message to the user in case of failure
Diffstat (limited to 'src/Common/Format.h')
| -rw-r--r-- | src/Common/Format.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Common/Format.h b/src/Common/Format.h index 826b8f6c..204feee1 100644 --- a/src/Common/Format.h +++ b/src/Common/Format.h @@ -69,14 +69,16 @@ FORMAT_VOL_PARAMETERS; #define FMIFS_CHECKDISK_PROGRESS 0x19 #define FMIFS_READ_ONLY_MODE 0x20 +#define FMIFS_REMOVAL 0xB #define FMIFS_HARDDISK 0xC extern int FormatWriteBufferSize; int TCFormatVolume (volatile FORMAT_VOL_PARAMETERS *volParams); -BOOL FormatNtfs (int driveNo, int clusterSize); -BOOL FormatFs (int driveNo, int clusterSize, int fsType); -BOOL ExternalFormatFs (int driveNo, int clusterSize, int fsType); +int FormatNtfs (int driveNo, int clusterSize); +int FormatFs (int driveNo, int clusterSize, int fsType); +int ExternalFormatFs (int driveNo, int clusterSize, int fsType); +LPCWSTR FormatExGetMessage (int command); uint64 GetVolumeDataAreaSize (BOOL hiddenVolume, uint64 volumeSize); int FormatNoFs (HWND hwndDlg, unsigned __int64 startSector, unsigned __int64 num_sectors, void *dev, PCRYPTO_INFO cryptoInfo, BOOL quickFormat, BOOL bDevice); BOOL WriteSector ( void *dev , char *sector , char *write_buf , int *write_buf_cnt , unsigned __int64 *nSecNo , unsigned __int64 startSector, PCRYPTO_INFO cryptoInfo ); |