From dcb8390bb250780a4b8bb5fd8f91bc8e53e711bc Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Tue, 26 Jan 2016 23:22:59 +0100 Subject: Windows/Linux: Implement exFAT support. --- src/ExpandVolume/DlgExpandVolume.cpp | 7 ++++++- src/ExpandVolume/ExpandVolume.c | Bin 24775 -> 49914 bytes src/ExpandVolume/ExpandVolume.h | 3 ++- 3 files changed, 8 insertions(+), 2 deletions(-) (limited to 'src/ExpandVolume') 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 Binary files a/src/ExpandVolume/ExpandVolume.c and b/src/ExpandVolume/ExpandVolume.c 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 { -- cgit v1.2.3