VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2015-03-01 23:14:25 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2015-03-01 23:23:58 (GMT)
commit8e6707cc22846e48c62e4730980cfe17595f8c2c (patch)
treea666986f2933150b78c3b18fadf3c8251a30a25f /src/Common
parentf09f8e3a317ccfd3eaeb21a0c83b04f95dbbecfb (diff)
downloadVeraCrypt-8e6707cc22846e48c62e4730980cfe17595f8c2c.zip
VeraCrypt-8e6707cc22846e48c62e4730980cfe17595f8c2c.tar.gz
Windows: if TrueCrypt volume created with a version prior to 6.0, display this version in the error message to help users understand why it is not working.
Diffstat (limited to 'src/Common')
-rw-r--r--src/Common/Dlgcode.c5
-rw-r--r--src/Common/Language.xml2
-rw-r--r--src/Common/Volumes.c2
3 files changed, 5 insertions, 4 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index 6503c59..6ae4062 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -3978,7 +3978,7 @@ void handleError (HWND hwndDlg, int code)
if (Silent) return;
- switch (code)
+ switch (code & 0x0000FFFF)
{
case ERR_OS_ERROR:
handleWin32Error (hwndDlg);
@@ -4072,7 +4072,8 @@ void handleError (HWND hwndDlg, int code)
break;
case ERR_UNSUPPORTED_TRUECRYPT_FORMAT:
- MessageBoxW (hwndDlg, GetString ("UNSUPPORTED_TRUECRYPT_FORMAT"), lpszTitle, ICON_HAND);
+ StringCbPrintfW (szTmp, sizeof(szTmp), GetString ("UNSUPPORTED_TRUECRYPT_FORMAT"), (code >> 24), (code >> 16) & 0x000000FF);
+ MessageBoxW (hwndDlg, szTmp, lpszTitle, ICON_HAND);
break;
default:
diff --git a/src/Common/Language.xml b/src/Common/Language.xml
index 36ce2e2..61207f7 100644
--- a/src/Common/Language.xml
+++ b/src/Common/Language.xml
@@ -1238,7 +1238,7 @@
<string lang="en" key="CONFIRM_SETTING_DEGRADES_PERFORMANCE">WARNING: This setting may degrade performance.\n\nAre you sure you want to use this setting?</string>
<string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN_TITLE">Warning: VeraCrypt volume auto-dismounted</string>
<string lang="en" key="HOST_DEVICE_REMOVAL_DISMOUNT_WARN">Before you physically remove or turn off a device containing a mounted volume, you should always dismount the volume in VeraCrypt first.\n\nUnexpected spontaneous dismount is usually caused by an intermittently failing cable, drive (enclosure), etc.</string>
- <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x series</string>
+ <string lang="en" key="UNSUPPORTED_TRUECRYPT_FORMAT">This volume was created with TrueCrypt %x.%x but VeraCrypt supports only TrueCrypt volumes created with TrueCrypt 6.x/7.x series</string>
<string lang="en" key="TEST">Test</string>
<string lang="en" key="KEYFILE">Keyfile</string>
<string lang="en" key="VKEY_08">Backspace</string>
diff --git a/src/Common/Volumes.c b/src/Common/Volumes.c
index 4acb929..73598c6 100644
--- a/src/Common/Volumes.c
+++ b/src/Common/Volumes.c
@@ -425,7 +425,7 @@ KeyReady: ;
{
if (cryptoInfo->RequiredProgramVersion < 0x600 || cryptoInfo->RequiredProgramVersion > 0x71a)
{
- status = ERR_UNSUPPORTED_TRUECRYPT_FORMAT;
+ status = ERR_UNSUPPORTED_TRUECRYPT_FORMAT | (((int)cryptoInfo->RequiredProgramVersion) << 16);
goto err;
}
cryptoInfo->LegacyVolume = FALSE;