From 47c081792c0e95dd8d85441d79d12565748497e3 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 28 Jun 2023 18:12:17 +0200 Subject: Windows: Add comboxbox to Format wizard to choose QuickFormat/FastCreate/FullFormat This required changes to internal logic and addition of new UI strings --- Translations/Language.ar.xml | 3 ++ Translations/Language.be.xml | 3 ++ Translations/Language.bg.xml | 3 ++ Translations/Language.ca.xml | 3 ++ Translations/Language.co.xml | 3 ++ Translations/Language.cs.xml | 3 ++ Translations/Language.da.xml | 3 ++ Translations/Language.de.xml | 3 ++ Translations/Language.el.xml | 3 ++ Translations/Language.es.xml | 3 ++ Translations/Language.et.xml | 3 ++ Translations/Language.eu.xml | 3 ++ Translations/Language.fa.xml | 3 ++ Translations/Language.fi.xml | 3 ++ Translations/Language.fr.xml | 3 ++ Translations/Language.he.xml | 3 ++ Translations/Language.hu.xml | 3 ++ Translations/Language.id.xml | 3 ++ Translations/Language.it.xml | 3 ++ Translations/Language.ja.xml | 3 ++ Translations/Language.ka.xml | 3 ++ Translations/Language.ko.xml | 3 ++ Translations/Language.lv.xml | 3 ++ Translations/Language.my.xml | 3 ++ Translations/Language.nl.xml | 3 ++ Translations/Language.nn.xml | 3 ++ Translations/Language.pl.xml | 3 ++ Translations/Language.pt-br.xml | 3 ++ Translations/Language.ro.xml | 3 ++ Translations/Language.ru.xml | 3 ++ Translations/Language.sk.xml | 3 ++ Translations/Language.sl.xml | 3 ++ Translations/Language.sv.xml | 3 ++ Translations/Language.th.xml | 3 ++ Translations/Language.tr.xml | 3 ++ Translations/Language.uk.xml | 3 ++ Translations/Language.uz.xml | 3 ++ Translations/Language.vi.xml | 3 ++ Translations/Language.zh-cn.xml | 3 ++ Translations/Language.zh-hk.xml | 3 ++ Translations/Language.zh-tw.xml | 3 ++ src/Common/Format.h | 5 +++ src/Common/Language.xml | 3 ++ src/Format/Format.rc | 4 +- src/Format/Resource.h | 3 +- src/Format/Tcformat.c | 92 ++++++++++++++++++++++++++++++++--------- 46 files changed, 208 insertions(+), 22 deletions(-) diff --git a/Translations/Language.ar.xml b/Translations/Language.ar.xml index 580f244e..70db77b1 100644 --- a/Translations/Language.ar.xml +++ b/Translations/Language.ar.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.be.xml b/Translations/Language.be.xml index 1a8152bd..a186a9e6 100644 --- a/Translations/Language.be.xml +++ b/Translations/Language.be.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.bg.xml b/Translations/Language.bg.xml index a2750d13..f2673f8b 100644 --- a/Translations/Language.bg.xml +++ b/Translations/Language.bg.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.ca.xml b/Translations/Language.ca.xml index 6e84f02b..8c0252b9 100644 --- a/Translations/Language.ca.xml +++ b/Translations/Language.ca.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.co.xml b/Translations/Language.co.xml index e6c24bf9..9ca86edf 100644 --- a/Translations/Language.co.xml +++ b/Translations/Language.co.xml @@ -1621,6 +1621,9 @@ Information about Corsican localization: A dimensione massima di %I64u Mo per u schedariu hè trapassata nant’à u lettore di l’ospite. Sbagliu : Fiascu per ottene i privileghji richiesti per attivà l’estensione rapida !\nCi vole à disattivà l’ozzione « Estensione rapida » è pruvà torna. A dimensione massima di %I64u To per un schedariu VeraCrypthè trapassata !\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.cs.xml b/Translations/Language.cs.xml index 08eb2d71..6130833f 100644 --- a/Translations/Language.cs.xml +++ b/Translations/Language.cs.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.da.xml b/Translations/Language.da.xml index cc56b68c..19b951a3 100644 --- a/Translations/Language.da.xml +++ b/Translations/Language.da.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.de.xml b/Translations/Language.de.xml index 7f78c5ea..af423c34 100644 --- a/Translations/Language.de.xml +++ b/Translations/Language.de.xml @@ -1608,6 +1608,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.el.xml b/Translations/Language.el.xml index 63a9afb1..98071900 100644 --- a/Translations/Language.el.xml +++ b/Translations/Language.el.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.es.xml b/Translations/Language.es.xml index 132a3d1e..b69ec7f4 100644 --- a/Translations/Language.es.xml +++ b/Translations/Language.es.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.et.xml b/Translations/Language.et.xml index 803f5704..d92cc266 100644 --- a/Translations/Language.et.xml +++ b/Translations/Language.et.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.eu.xml b/Translations/Language.eu.xml index 5056d953..58ac5935 100644 --- a/Translations/Language.eu.xml +++ b/Translations/Language.eu.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.fa.xml b/Translations/Language.fa.xml index 86a9bb46..527d37a5 100644 --- a/Translations/Language.fa.xml +++ b/Translations/Language.fa.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.fi.xml b/Translations/Language.fi.xml index 3a93b193..16b632b6 100644 --- a/Translations/Language.fi.xml +++ b/Translations/Language.fi.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.fr.xml b/Translations/Language.fr.xml index fc27230f..d8275b67 100644 --- a/Translations/Language.fr.xml +++ b/Translations/Language.fr.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.he.xml b/Translations/Language.he.xml index 6003d2f7..1fe9948c 100644 --- a/Translations/Language.he.xml +++ b/Translations/Language.he.xml @@ -1606,6 +1606,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.hu.xml b/Translations/Language.hu.xml index bcf8f41a..9039451f 100644 --- a/Translations/Language.hu.xml +++ b/Translations/Language.hu.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.id.xml b/Translations/Language.id.xml index 18a6c35e..3d64deb4 100644 --- a/Translations/Language.id.xml +++ b/Translations/Language.id.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.it.xml b/Translations/Language.it.xml index 8e29b848..e8d5640a 100644 --- a/Translations/Language.it.xml +++ b/Translations/Language.it.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.ja.xml b/Translations/Language.ja.xml index b34a467b..45a90360 100644 --- a/Translations/Language.ja.xml +++ b/Translations/Language.ja.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.ka.xml b/Translations/Language.ka.xml index 0e925a55..f7f4ca41 100644 --- a/Translations/Language.ka.xml +++ b/Translations/Language.ka.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.ko.xml b/Translations/Language.ko.xml index 8d6a4da0..bbe7c24c 100644 --- a/Translations/Language.ko.xml +++ b/Translations/Language.ko.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.lv.xml b/Translations/Language.lv.xml index b3bf7a9f..83577f36 100644 --- a/Translations/Language.lv.xml +++ b/Translations/Language.lv.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.my.xml b/Translations/Language.my.xml index 7b1dd0d0..e941e022 100644 --- a/Translations/Language.my.xml +++ b/Translations/Language.my.xml @@ -1607,6 +1607,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.nl.xml b/Translations/Language.nl.xml index 6ed9f556..ab4a071a 100644 --- a/Translations/Language.nl.xml +++ b/Translations/Language.nl.xml @@ -1605,6 +1605,9 @@ Maximale bestandsgrootte van %I64u MB op hoststation overschreden. Fout: de nodige rechten om 'snel uitbreiden' in te schakelen zijn niet verkregen!\nHaal het vinkje weg bij de optie 'snel uitbreiden' en probeer het opnieuw. Maximale VeraCrypt-volumegrootte van %I64u TB overschreden!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.nn.xml b/Translations/Language.nn.xml index d6125a71..41b395be 100644 --- a/Translations/Language.nn.xml +++ b/Translations/Language.nn.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.pl.xml b/Translations/Language.pl.xml index 2e807387..d6f24048 100644 --- a/Translations/Language.pl.xml +++ b/Translations/Language.pl.xml @@ -1605,6 +1605,9 @@ Przekroczono maksymalny rozmiar pliku %I64u MB na dysku hosta. Błąd: Nie udało się uzyskać wymaganych uprawnień, aby włączyć Szybkie rozszerzanie!\nOdznacz opcję Szybkie rozszerzanie i spróbuj ponownie. Przekroczono maksymalny rozmiar wolumenu VeraCrypt %I64u TB!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.pt-br.xml b/Translations/Language.pt-br.xml index 99a33581..4667b3ba 100644 --- a/Translations/Language.pt-br.xml +++ b/Translations/Language.pt-br.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.ro.xml b/Translations/Language.ro.xml index bbd940bf..1d0b9c29 100644 --- a/Translations/Language.ro.xml +++ b/Translations/Language.ro.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.ru.xml b/Translations/Language.ru.xml index 0ece318f..30f4df6d 100644 --- a/Translations/Language.ru.xml +++ b/Translations/Language.ru.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.sk.xml b/Translations/Language.sk.xml index 91fa8b31..96432c01 100644 --- a/Translations/Language.sk.xml +++ b/Translations/Language.sk.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.sl.xml b/Translations/Language.sl.xml index f75fc114..cb5a3a6f 100644 --- a/Translations/Language.sl.xml +++ b/Translations/Language.sl.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.sv.xml b/Translations/Language.sv.xml index 7f22b79f..d156e18f 100644 --- a/Translations/Language.sv.xml +++ b/Translations/Language.sv.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.th.xml b/Translations/Language.th.xml index 62a1a7b2..7f4ca18d 100644 --- a/Translations/Language.th.xml +++ b/Translations/Language.th.xml @@ -1606,6 +1606,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.tr.xml b/Translations/Language.tr.xml index 57656dcd..ecb73007 100644 --- a/Translations/Language.tr.xml +++ b/Translations/Language.tr.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.uk.xml b/Translations/Language.uk.xml index 1981fd6b..9fab76e4 100644 --- a/Translations/Language.uk.xml +++ b/Translations/Language.uk.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.uz.xml b/Translations/Language.uz.xml index d3b95a29..57b9b0ad 100644 --- a/Translations/Language.uz.xml +++ b/Translations/Language.uz.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.vi.xml b/Translations/Language.vi.xml index ea1076f8..8aecde5d 100644 --- a/Translations/Language.vi.xml +++ b/Translations/Language.vi.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.zh-cn.xml b/Translations/Language.zh-cn.xml index 4022ef81..291b7636 100644 --- a/Translations/Language.zh-cn.xml +++ b/Translations/Language.zh-cn.xml @@ -1606,6 +1606,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.zh-hk.xml b/Translations/Language.zh-hk.xml index ce5f5fbf..d485bc33 100644 --- a/Translations/Language.zh-hk.xml +++ b/Translations/Language.zh-hk.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/Translations/Language.zh-tw.xml b/Translations/Language.zh-tw.xml index f329932d..526768be 100644 --- a/Translations/Language.zh-tw.xml +++ b/Translations/Language.zh-tw.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/src/Common/Format.h b/src/Common/Format.h index f5d65f14..826b8f6c 100644 --- a/src/Common/Format.h +++ b/src/Common/Format.h @@ -91,6 +91,11 @@ BOOL MoveFilePointer (HANDLE dev, LARGE_INTEGER offset); #define FILESYS_EXFAT 3 #define FILESYS_REFS 4 +#define FORMAT_TYPE_FULL 0 +#define FORMAT_TYPE_QUICK 1 +#define FORMAT_TYPE_FAST 2 + + #ifdef __cplusplus } #endif diff --git a/src/Common/Language.xml b/src/Common/Language.xml index 822829b8..540f6867 100644 --- a/src/Common/Language.xml +++ b/src/Common/Language.xml @@ -1605,6 +1605,9 @@ Maximum file size of %I64u MB on host drive exceeded. Error: Failed to get necessary privileges to enable Quick Expand!\nPlease uncheck Quick Expand option and try again. Maximum VeraCrypt volume size of %I64u TB exceeded!\n + Full Format + Fast Create + WARNING: You should use Fast Create only in the following cases:\n\n1) The device contains no sensitive data and you do not need plausible deniability.\n2) The device has already been securely and fully encrypted.\n\nAre you sure you want to use Fast Create? diff --git a/src/Format/Format.rc b/src/Format/Format.rc index 9584fe31..273cddcc 100644 --- a/src/Format/Format.rc +++ b/src/Format/Format.rc @@ -154,7 +154,8 @@ FONT 8, "MS Shell Dlg", 0, 0, 0x0 BEGIN COMBOBOX IDC_FILESYS,50,13,36,90,CBS_DROPDOWNLIST | WS_TABSTOP COMBOBOX IDC_CLUSTERSIZE,135,13,42,90,CBS_DROPDOWNLIST | WS_TABSTOP - CONTROL "Quick Format",IDC_QUICKFORMAT,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,181,9,92,8 + COMBOBOX IDC_FORMAT_TYPE,181,8,93,131,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + CONTROL "Dynamic",SPARSE_FILE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,181,22,92,8 CONTROL "",IDC_SHOW_KEYS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,265,38,9,8 PUSHBUTTON "Abort",IDC_ABORT_BUTTON,200,75,64,14 RTEXT "Header Key: ",IDT_HEADER_KEY,2,47,76,8 @@ -178,7 +179,6 @@ BEGIN CONTROL "",IDC_RANDOM_BYTES,"Static",SS_SIMPLE | WS_GROUP,83,38,177,8,WS_EX_TRANSPARENT GROUPBOX "Randomness Collected From Mouse Movements",IDT_ENTROPY_BAR,0,175,276,18 CONTROL "",IDC_ENTROPY_BAR,"msctls_progress32",WS_BORDER,20,184,235,6 - CONTROL "Dynamic",SPARSE_FILE,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,181,21,92,8 END IDD_INTRO_PAGE_DLG DIALOGEX 0, 0, 276, 193 diff --git a/src/Format/Resource.h b/src/Format/Resource.h index c37a6f4a..d8fb8dc4 100644 --- a/src/Format/Resource.h +++ b/src/Format/Resource.h @@ -146,6 +146,7 @@ #define IDC_TB 1107 #define IDC_SKIP_RESCUE_VERIFICATION 1108 #define SPARSE_FILE 1109 +#define IDC_FORMAT_TYPE 1110 // Next default values for new objects // @@ -154,7 +155,7 @@ #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 134 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1110 +#define _APS_NEXT_CONTROL_VALUE 1111 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c index efd95caf..9c8648a8 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.c @@ -290,6 +290,7 @@ volatile BOOL quickFormat = FALSE; volatile BOOL fastCreateFile = FALSE; volatile BOOL dynamicFormat = FALSE; /* this variable represents the sparse file flag. */ volatile int fileSystem = FILESYS_NONE; +volatile int formatType = FORMAT_TYPE_FULL; volatile int clusterSize = 0; SYSENC_MULTIBOOT_CFG SysEncMultiBootCfg; @@ -4961,6 +4962,18 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa else SetWindowTextW (GetDlgItem (GetParent (hwndDlg), IDC_BOX_TITLE), GetString ("FORMAT_TITLE")); + /* Fill the format type combobox */ + SendMessage (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), CB_RESETCONTENT, 0, 0); + EnableWindow (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), TRUE); + + AddComboPair (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), GetString("FULL_FORMAT"), FORMAT_TYPE_FULL); + AddComboPair (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), GetString("IDC_QUICKFORMAT"), FORMAT_TYPE_QUICK); + if (!bDevice) // Fast Create only makes sens for file containers + AddComboPair (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), GetString("FAST_CREATE"), FORMAT_TYPE_FAST); + SendMessage (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), CB_SETCURSEL, 0, 0); + + formatType = FORMAT_TYPE_FULL; + /* Quick/Dynamic */ if (bHiddenVol) @@ -4972,8 +4985,18 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa SetCheckBox (hwndDlg, SPARSE_FILE, FALSE); EnableWindow (GetDlgItem (hwndDlg, SPARSE_FILE), FALSE); - SetCheckBox (hwndDlg, IDC_QUICKFORMAT, quickFormat); - EnableWindow (GetDlgItem (hwndDlg, IDC_QUICKFORMAT), bHiddenVolHost); + if (quickFormat) + { + formatType = FORMAT_TYPE_QUICK; + SelectAlgo (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), (int *) &formatType); + } + else if (!bDevice && fastCreateFile) + { + formatType = FORMAT_TYPE_FAST; + quickFormat = TRUE; + SelectAlgo (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), (int *) &formatType); + } + EnableWindow (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), bHiddenVolHost); } else { @@ -4983,7 +5006,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa bSparseFileSwitch = FALSE; SetCheckBox (hwndDlg, SPARSE_FILE, FALSE); EnableWindow (GetDlgItem (hwndDlg, SPARSE_FILE), FALSE); - EnableWindow (GetDlgItem (hwndDlg, IDC_QUICKFORMAT), TRUE); + EnableWindow (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), TRUE); } else { @@ -5004,8 +5027,15 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa dynamicFormat = FALSE; SetCheckBox (hwndDlg, SPARSE_FILE, FALSE); } + + if (fastCreateFile) + { + formatType = FORMAT_TYPE_FAST; + quickFormat = TRUE; + SelectAlgo (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), (int *) &formatType); + } EnableWindow (GetDlgItem (hwndDlg, SPARSE_FILE), bSparseFileSwitch); - EnableWindow (GetDlgItem (hwndDlg, IDC_QUICKFORMAT), TRUE); + EnableWindow (GetDlgItem (hwndDlg, IDC_FORMAT_TYPE), TRUE); } } @@ -5959,29 +5989,50 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa } - if (lw == IDC_QUICKFORMAT) + if (lw == IDC_FORMAT_TYPE && hw == CBN_SELCHANGE) { - if (IsButtonChecked (GetDlgItem (hCurPage, IDC_QUICKFORMAT))) + formatType = (int) SendMessage (GetDlgItem (hCurPage, IDC_FORMAT_TYPE), CB_GETITEMDATA, + SendMessage (GetDlgItem (hCurPage, IDC_FORMAT_TYPE), CB_GETCURSEL, 0, 0) , 0); + + if (formatType == FORMAT_TYPE_QUICK) { if (AskWarnYesNo("WARN_QUICK_FORMAT", MainDlg) == IDNO) - SetCheckBox (hwndDlg, IDC_QUICKFORMAT, FALSE); + { + formatType = FORMAT_TYPE_FULL; + SelectAlgo(GetDlgItem (hCurPage, IDC_FORMAT_TYPE), (int *) &formatType); + } } - else if (IsButtonChecked (GetDlgItem (hCurPage, SPARSE_FILE))) + else if (formatType == FORMAT_TYPE_FAST) { - /* sparse file require quick format */ - SetCheckBox (hwndDlg, SPARSE_FILE, FALSE); + if (AskWarnYesNo("WARN_FAST_CREATE", MainDlg) == IDNO) + { + formatType = FORMAT_TYPE_FULL; + SelectAlgo(GetDlgItem (hCurPage, IDC_FORMAT_TYPE), (int *) &formatType); + } } + return 1; } - if (lw == SPARSE_FILE && IsButtonChecked (GetDlgItem (hCurPage, SPARSE_FILE))) + if (lw == SPARSE_FILE) { - if (AskWarnYesNo("CONFIRM_SPARSE_FILE", MainDlg) == IDNO) - SetCheckBox (hwndDlg, SPARSE_FILE, FALSE); - else if (!IsButtonChecked (GetDlgItem (hCurPage, IDC_QUICKFORMAT)) && IsWindowEnabled (GetDlgItem (hCurPage, IDC_QUICKFORMAT))) + if (IsButtonChecked (GetDlgItem (hCurPage, SPARSE_FILE))) + { + if (AskWarnYesNo("CONFIRM_SPARSE_FILE", MainDlg) == IDNO) + SetCheckBox (hwndDlg, SPARSE_FILE, FALSE); + else + { + /* sparse file require quick format */ + formatType = FORMAT_TYPE_QUICK; + SelectAlgo(GetDlgItem (hCurPage, IDC_FORMAT_TYPE), (int *) &formatType); + EnableWindow(GetDlgItem (hCurPage, IDC_FORMAT_TYPE), FALSE); + } + } + else { - /* sparse file require quick format */ - SetCheckBox (hwndDlg, IDC_QUICKFORMAT, TRUE); + EnableWindow(GetDlgItem (hCurPage, IDC_FORMAT_TYPE), TRUE); + formatType = FORMAT_TYPE_FULL; + SelectAlgo(GetDlgItem (hCurPage, IDC_FORMAT_TYPE), (int *) &formatType); } return 1; } @@ -6896,7 +6947,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { // Format has been aborted (did not finish) - EnableWindow (GetDlgItem (hCurPage, IDC_QUICKFORMAT), !(bHiddenVol && !bHiddenVolHost)); + EnableWindow (GetDlgItem (hCurPage, IDC_FORMAT_TYPE), !(bHiddenVol && !bHiddenVolHost)); EnableWindow (GetDlgItem (hCurPage, SPARSE_FILE), (bSparseFileSwitch) && !(bHiddenVol && !bHiddenVolHost)); EnableWindow (GetDlgItem (hCurPage, IDC_FILESYS), TRUE); EnableWindow (GetDlgItem (hCurPage, IDC_CLUSTERSIZE), TRUE); @@ -8496,7 +8547,10 @@ retryCDDriveCheck: clusterSize = (int) SendMessage (GetDlgItem (hCurPage, IDC_CLUSTERSIZE), CB_GETITEMDATA, SendMessage (GetDlgItem (hCurPage, IDC_CLUSTERSIZE), CB_GETCURSEL, 0, 0) , 0); - quickFormat = IsButtonChecked (GetDlgItem (hCurPage, IDC_QUICKFORMAT)); + formatType = (int) SendMessage (GetDlgItem (hCurPage, IDC_FORMAT_TYPE), CB_GETITEMDATA, + SendMessage (GetDlgItem (hCurPage, IDC_FORMAT_TYPE), CB_GETCURSEL, 0, 0) , 0); + quickFormat = (formatType == FORMAT_TYPE_QUICK) || (formatType == FORMAT_TYPE_FAST); + fastCreateFile = (formatType == FORMAT_TYPE_FAST); dynamicFormat = IsButtonChecked (GetDlgItem (hCurPage, SPARSE_FILE)); if (!dynamicFormat && !bDevice && !(bHiddenVol && !bHiddenVolHost) && (nVolumeSize > (ULONGLONG) nAvailableFreeSpace)) @@ -8595,7 +8649,7 @@ retryCDDriveCheck: EnableWindow (GetDlgItem (hwndDlg, IDC_NEXT), FALSE); EnableWindow (GetDlgItem (hwndDlg, IDHELP), FALSE); EnableWindow (GetDlgItem (hwndDlg, IDCANCEL), FALSE); - EnableWindow (GetDlgItem (hCurPage, IDC_QUICKFORMAT), FALSE); + EnableWindow (GetDlgItem (hCurPage, IDC_FORMAT_TYPE), FALSE); EnableWindow (GetDlgItem (hCurPage, SPARSE_FILE), FALSE); EnableWindow (GetDlgItem (hCurPage, IDC_CLUSTERSIZE), FALSE); EnableWindow (GetDlgItem (hCurPage, IDC_FILESYS), FALSE); -- cgit v1.2.3