nihilist/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt synced 2024-11-10 21:23:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source
This commit is contained in:
Mounir IDRASSI 2015-03-02 00:14:25 +01:00
parent f09f8e3a31
commit 8e6707cc22
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Common/Dlgcode.c
View File

@ -3978,7 +3978,7 @@ void handleError (HWND hwndDlg, int code)
if (Silent) return; if (Silent) return;
switch (code) switch (code & 0x0000FFFF)
{ {
case ERR_OS_ERROR: case ERR_OS_ERROR:
handleWin32Error (hwndDlg); handleWin32Error (hwndDlg);
@ -4072,7 +4072,8 @@ void handleError (HWND hwndDlg, int code)
break; break;
case ERR_UNSUPPORTED_TRUECRYPT_FORMAT: 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; break;
default: default:

2
src/Common/Language.xml
View File

@ -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="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_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="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="TEST">Test</string>
<string lang="en" key="KEYFILE">Keyfile</string> <string lang="en" key="KEYFILE">Keyfile</string>
<string lang="en" key="VKEY_08">Backspace</string> <string lang="en" key="VKEY_08">Backspace</string>

2
src/Common/Volumes.c
View File

@ -425,7 +425,7 @@ KeyReady: ;
{ {
if (cryptoInfo->RequiredProgramVersion < 0x600 || cryptoInfo->RequiredProgramVersion > 0x71a) if (cryptoInfo->RequiredProgramVersion < 0x600 || cryptoInfo->RequiredProgramVersion > 0x71a)
{ {
status = ERR_UNSUPPORTED_TRUECRYPT_FORMAT; status = ERR_UNSUPPORTED_TRUECRYPT_FORMAT | (((int)cryptoInfo->RequiredProgramVersion) << 16);
goto err; goto err;
} }
cryptoInfo->LegacyVolume = FALSE; cryptoInfo->LegacyVolume = FALSE;