VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/ExpandVolume
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-01-26 23:22:59 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-01-27 01:13:46 +0100
commitdcb8390bb250780a4b8bb5fd8f91bc8e53e711bc (patch)
tree16d584455558e9b2f52fe570bf45fd8795887944 /src/ExpandVolume
parent9f5b5445d720ae3cd67401c68415e2be9348869a (diff)
downloadVeraCrypt-dcb8390bb250780a4b8bb5fd8f91bc8e53e711bc.tar.gz
VeraCrypt-dcb8390bb250780a4b8bb5fd8f91bc8e53e711bc.zip
Windows/Linux: Implement exFAT support.
Diffstat (limited to 'src/ExpandVolume')
-rw-r--r--src/ExpandVolume/DlgExpandVolume.cpp7
-rw-r--r--src/ExpandVolume/ExpandVolume.cbin24775 -> 49914 bytes
-rw-r--r--src/ExpandVolume/ExpandVolume.h3
3 files changed, 8 insertions, 2 deletions
diff --git a/src/ExpandVolume/DlgExpandVolume.cpp b/src/ExpandVolume/DlgExpandVolume.cpp
index 4552056a..a54252cd 100644
--- a/src/ExpandVolume/DlgExpandVolume.cpp
+++ b/src/ExpandVolume/DlgExpandVolume.cpp
@@ -50,7 +50,7 @@
#define TIMER_INTERVAL_RANDVIEW 50
// see definition of enum EV_FileSystem
-const wchar_t * szFileSystemStr[3] = {L"RAW",L"FAT",L"NTFS"};
+const wchar_t * szFileSystemStr[4] = {L"RAW",L"FAT",L"NTFS",L"EXFAT"};
// prototypes for internal functions
BOOL CALLBACK ExpandVolSizeDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -628,6 +628,11 @@ void ExpandVolumeWizard (HWND hwndDlg, wchar_t *lpszVolume)
lpszTitle, YES_NO|MB_ICONQUESTION|MB_DEFBUTTON2) == IDNO)
goto ret;
break;
+ case EV_FS_TYPE_EXFAT:
+ if (MessageBoxW (hwndDlg,L"Warning: The VeraCrypt volume contains an exFAT file system!\n\nOnly the VeraCrypt volume itself will be expanded, but not the file system.\n\nDo you want to continue?",
+ lpszTitle, YES_NO|MB_ICONQUESTION|MB_DEFBUTTON2) == IDNO)
+ goto ret;
+ break;
default:
if (MessageBoxW (hwndDlg,L"Warning: The VeraCrypt volume contains an unknown or no file system!\n\nOnly the VeraCrypt volume itself will be expanded, the file system remains unchanged.\n\nDo you want to continue?",
lpszTitle, YES_NO|MB_ICONQUESTION|MB_DEFBUTTON2) == IDNO)
diff --git a/src/ExpandVolume/ExpandVolume.c b/src/ExpandVolume/ExpandVolume.c
index f49a9d96..d4aa763a 100644
--- a/src/ExpandVolume/ExpandVolume.c
+++ b/src/ExpandVolume/ExpandVolume.c
Binary files differ
diff --git a/src/ExpandVolume/ExpandVolume.h b/src/ExpandVolume/ExpandVolume.h
index 21c1e27d..87f0e42d 100644
--- a/src/ExpandVolume/ExpandVolume.h
+++ b/src/ExpandVolume/ExpandVolume.h
@@ -25,9 +25,10 @@ enum EV_FileSystem
EV_FS_TYPE_RAW = 0,
EV_FS_TYPE_FAT = 1,
EV_FS_TYPE_NTFS = 2,
+ EV_FS_TYPE_EXFAT = 3,
};
-extern const wchar_t * szFileSystemStr[3];
+extern const wchar_t * szFileSystemStr[4];
typedef struct
{