mirrors/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-05-23 04:51:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Linux/macOS: show volume creation finalization stages

Browse Source 
Report explicit progress stages while writing volume data, writing backup headers, and flushing data to disk so the wizard does not appear stuck at 100%.

Keep the wizard in progress during Unix post-creation formatting and show status for temporary mount/device setup, mkfs invocation, and dismount.
This commit is contained in:
Mounir IDRASSI
2026-05-03 00:03:04 +09:00
parent 8b80e2fc61
commit f8837090b8
49 changed files with 574 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Core/VolumeCreator.cpp
View File

@@ -29,7 +29,9 @@
namespace VeraCrypt
{
VolumeCreator::VolumeCreator ()
: SizeDone (0)
: SizeDone (0),
Stage (ProgressStage::NotStarted),
mProgressInfo {false, 0, 0, ProgressStage::NotStarted}
{
}
@@ -58,6 +60,7 @@ namespace VeraCrypt
if (filesystemSize < 1)
throw ParameterIncorrect (SRC_POS);
Stage.Set (ProgressStage::WritingData);
DataStart = Layout->GetDataOffset (HostSize);
WriteOffset = DataStart;
endOffset = DataStart + Layout->GetDataSize (HostSize);
@@ -137,6 +140,8 @@ namespace VeraCrypt
{
SizeDone.Set (Options->Size);
Stage.Set (ProgressStage::WritingBackupHeader);
// Backup header
SecureBuffer backupHeader (Layout->GetHeaderSize());
@@ -191,19 +196,26 @@ namespace VeraCrypt
VolumeFile->Write (backupHeader);
}
Stage.Set (ProgressStage::FlushingData);
VolumeFile->Flush();
Stage.Set (ProgressStage::Finished);
}
else
Stage.Set (ProgressStage::Aborted);
}
catch (Exception &e)
{
Stage.Set (ProgressStage::Error);
ThreadException.reset (e.CloneNew());
}
catch (exception &e)
{
Stage.Set (ProgressStage::Error);
ThreadException.reset (new ExternalException (SRC_POS, StringConverter::ToExceptionString (e)));
}
catch (...)
{
Stage.Set (ProgressStage::Error);
ThreadException.reset (new UnknownException (SRC_POS));
}
@@ -214,6 +226,9 @@ namespace VeraCrypt
void VolumeCreator::CreateVolume (shared_ptr <VolumeCreationOptions> options)
{
EncryptionTest::TestAll();
SizeDone.Set (0);
Stage.Set (ProgressStage::NotStarted);
ThreadException.reset();
{
#ifdef TC_UNIX
@@ -379,6 +394,9 @@ namespace VeraCrypt
Options = options;
AbortRequested = false;
mProgressInfo.TotalSize = options->Size;
mProgressInfo.SizeDone = 0;
mProgressInfo.Stage = ProgressStage::NotStarted;
mProgressInfo.CreationInProgress = true;
struct ThreadFunctor : public Functor
@@ -412,6 +430,7 @@ namespace VeraCrypt
VolumeCreator::ProgressInfo VolumeCreator::GetProgressInfo ()
{
mProgressInfo.SizeDone = SizeDone.Get();
mProgressInfo.Stage = static_cast <ProgressStage::Enum> (Stage.Get());
return mProgressInfo;
}
}