Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-06-10 06:46:59 -05:00
Code Activity

Windows: fix ReFS formatting during volume creation

Browse Source 
Mount temporary ReFS volumes as fixed media, since Windows does not support ReFS on removable media. Use FMIFS_HARDDISK for the FormatEx fallback while preserving the removable-media path for NTFS and exFAT.

Also make the FormatEx DONE-with-failure status explicit and guard against a missing callback parameter.
This commit is contained in:
Mounir IDRASSI
2026-05-30 16:50:33 +09:00
parent 2605adcfff
commit 19b3ebc0bb
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Common/Format.c
+8 -4
View File
@@ -822,7 +822,9 @@ error:
} }
mountOptions.ReadOnly = FALSE; mountOptions.ReadOnly = FALSE;
mountOptions.Removable = TRUE; /* mount as removal media to allow formatting without admin rights */ /* ReFS is not supported on removable media. Keep NTFS/exFAT removable
to allow formatting without admin rights. */
mountOptions.Removable = (fsType != FILESYS_REFS);
mountOptions.ProtectHiddenVolume = FALSE; mountOptions.ProtectHiddenVolume = FALSE;
mountOptions.PreserveTimestamp = bPreserveTimestamp; mountOptions.PreserveTimestamp = bPreserveTimestamp;
mountOptions.PartitionInInactiveSysEncScope = FALSE; mountOptions.PartitionInInactiveSysEncScope = FALSE;
@@ -1108,7 +1110,7 @@ LPCWSTR FormatExGetMessage (int command)
switch (command) switch (command)
{ {
case FMIFS_DONE: case FMIFS_DONE:
return L"FORMAT_FINISHED"; return L"FORMAT_FINISHED (success flag = FALSE)";
case FMIFS_STRUCTURE_PROGRESS: case FMIFS_STRUCTURE_PROGRESS:
return L"FORMAT_STRUCTURE_PROGRESS"; return L"FORMAT_STRUCTURE_PROGRESS";
case FMIFS_MEDIA_WRITE_PROTECTED: case FMIFS_MEDIA_WRITE_PROTECTED:
@@ -1152,7 +1154,7 @@ BOOLEAN __stdcall FormatExCallback (int command, DWORD subCommand, PVOID paramet
case FMIFS_STRUCTURE_PROGRESS: case FMIFS_STRUCTURE_PROGRESS:
break; break;
case FMIFS_DONE: case FMIFS_DONE:
if(*(BOOLEAN*)parameter == FALSE) { if (parameter == NULL || *(BOOLEAN*)parameter == FALSE) {
FormatExError = TRUE; FormatExError = TRUE;
} }
break; break;
@@ -1212,6 +1214,7 @@ int FormatFs (int driveNo, int clusterSize, int fsType, BOOL bFallBackExternal)
int i; int i;
WCHAR szFsFormat[16]; WCHAR szFsFormat[16];
WCHAR szLabel[2] = {0}; WCHAR szLabel[2] = {0};
DWORD mediaFlag;
switch (fsType) switch (fsType)
{ {
case FILESYS_NTFS: case FILESYS_NTFS:
@@ -1227,6 +1230,7 @@ int FormatFs (int driveNo, int clusterSize, int fsType, BOOL bFallBackExternal)
return FALSE; return FALSE;
} }
mediaFlag = (fsType == FILESYS_REFS) ? FMIFS_HARDDISK : FMIFS_REMOVAL;
if (GetSystemDirectory (dllPath, MAX_PATH)) if (GetSystemDirectory (dllPath, MAX_PATH))
{ {
@@ -1257,7 +1261,7 @@ int FormatFs (int driveNo, int clusterSize, int fsType, BOOL bFallBackExternal)
{ {
FormatExError = FALSE; FormatExError = FALSE;
FormatExErrorCommand = 0; FormatExErrorCommand = 0;
FormatEx (dir, FMIFS_REMOVAL, szFsFormat, szLabel, TRUE, clusterSize * FormatSectorSize, FormatExCallback); FormatEx (dir, mediaFlag, szFsFormat, szLabel, TRUE, clusterSize * FormatSectorSize, FormatExCallback);
} }
// The device may be referenced for some time after FormatEx() returns // The device may be referenced for some time after FormatEx() returns