Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 11:08:02 -06:00
Code Activity

Windows: Launch Format/Expander wizards from VeraCrypt.exe using executable binaries with the same architecture.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-09-07 01:35:23 +02:00
parent 9fc98b5ea3
commit 0bd265cbde
1 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/Mount/Mount.c
View File

@@ -1288,10 +1288,25 @@ static void LaunchVolCreationWizard (HWND hwndDlg, const char *arg)
{ {
STARTUPINFO si; STARTUPINFO si;
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
char formatExeName[64];
char* suffix = NULL;
ZeroMemory (&si, sizeof (si)); ZeroMemory (&si, sizeof (si));
StringCbCopyA (formatExeName, sizeof (formatExeName), "\\VeraCrypt Format");
// check if there is a suffix in VeraCrypt file name
// in order to use the same for "VeraCrypt Format"
suffix = strrchr (tmp + 1, '-');
if (suffix)
{
StringCbCatA (formatExeName, sizeof (formatExeName), suffix);
StringCbCatA (formatExeName, sizeof (formatExeName), "\"");
}
else
StringCbCatA (formatExeName, sizeof (formatExeName), ".exe\"");
*tmp = 0; *tmp = 0;
StringCbCatA (t, sizeof(t), "\\VeraCrypt Format.exe\""); StringCbCatA (t, sizeof(t), formatExeName);
if (!FileExists(t)) if (!FileExists(t))
Error ("VOL_CREATION_WIZARD_NOT_FOUND", hwndDlg); // Display a user-friendly error message and advise what to do Error ("VOL_CREATION_WIZARD_NOT_FOUND", hwndDlg); // Display a user-friendly error message and advise what to do
@@ -1316,7 +1331,7 @@ static void LaunchVolCreationWizard (HWND hwndDlg, const char *arg)
static void LaunchVolExpander (HWND hwndDlg) static void LaunchVolExpander (HWND hwndDlg)
{ {
char t[TC_MAX_PATH] = {'"',0}; char t[TC_MAX_PATH + TC_MAX_PATH] = {'"',0};
char *tmp; char *tmp;
GetModuleFileName (NULL, t+1, sizeof(t)-1); GetModuleFileName (NULL, t+1, sizeof(t)-1);
@@ -1324,8 +1339,24 @@ static void LaunchVolExpander (HWND hwndDlg)
tmp = strrchr (t, '\\'); tmp = strrchr (t, '\\');
if (tmp) if (tmp)
{ {
char expanderExeName[64];
char* suffix = NULL;
StringCbCopyA (expanderExeName, sizeof (expanderExeName), "\\VeraCryptExpander");
// check if there is a suffix in VeraCrypt file name
// in order to use the same for "VeraCrypt Format"
suffix = strrchr (tmp + 1, '-');
if (suffix)
{
StringCbCatA (expanderExeName, sizeof (expanderExeName), suffix);
StringCbCatA (expanderExeName, sizeof (expanderExeName), "\"");
}
else
StringCbCatA (expanderExeName, sizeof (expanderExeName), ".exe\"");
*tmp = 0; *tmp = 0;
StringCbCatA (t, sizeof(t), "\\VeraCryptExpander.exe\""); StringCbCatA (t, sizeof(t), expanderExeName);
if (!FileExists(t)) if (!FileExists(t))
Error ("VOL_EXPANDER_NOT_FOUND", hwndDlg); // Display a user-friendly error message and advise what to do Error ("VOL_EXPANDER_NOT_FOUND", hwndDlg); // Display a user-friendly error message and advise what to do