diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-01-10 20:17:30 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-01-10 20:45:18 +0100 |
| commit | 8586c5101638143e7551db7c72067674a2817b38 (patch) | |
| tree | f6e409835c96837b947a82e306b5786f59053136 | |
| parent | fb430c403b2e0deb3f34328d3b65bd39c10b14ba (diff) | |
| download | VeraCrypt-8586c5101638143e7551db7c72067674a2817b38.tar.gz VeraCrypt-8586c5101638143e7551db7c72067674a2817b38.zip | |
Windows: Avoid wrong update of configuration XML file caused by not using the correct window handle to get some GUI fields content. Some code cleanup.
| -rw-r--r-- | src/Common/Dlgcode.c | 6 | ||||
| -rw-r--r-- | src/Common/Dlgcode.h | 2 | ||||
| -rw-r--r-- | src/ExpandVolume/WinMain.cpp | 2 | ||||
| -rw-r--r-- | src/Format/Tcformat.c | bin | 634120 -> 634106 bytes | |||
| -rw-r--r-- | src/Mount/Mount.c | 14 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index cc7f0e74..c74b9ef7 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -2251,7 +2251,7 @@ uint32 ReadEncryptionThreadPoolFreeCpuCountLimit () }
-BOOL LoadSysEncSettings (HWND hwndDlg)
+BOOL LoadSysEncSettings ()
{
BOOL status = TRUE;
DWORD size = 0;
@@ -3947,7 +3947,7 @@ start: {
#ifndef SETUP
- LoadSysEncSettings (NULL);
+ LoadSysEncSettings ();
if (!CreateDriverSetupMutex ())
{
@@ -10657,7 +10657,7 @@ BOOL InitSecurityTokenLibrary (HWND hwndDlg) try
{
- SecurityToken::InitLibrary (SecurityTokenLibraryPath, auto_ptr <GetPinFunctor> (new PinRequestHandler(hwndDlg)), auto_ptr <SendExceptionFunctor> (new WarningHandler(hwndDlg)));
+ SecurityToken::InitLibrary (SecurityTokenLibraryPath, auto_ptr <GetPinFunctor> (new PinRequestHandler(MainDlg)), auto_ptr <SendExceptionFunctor> (new WarningHandler(MainDlg)));
}
catch (Exception &e)
{
diff --git a/src/Common/Dlgcode.h b/src/Common/Dlgcode.h index 601f7ac7..f3fcc6e0 100644 --- a/src/Common/Dlgcode.h +++ b/src/Common/Dlgcode.h @@ -289,7 +289,7 @@ void CloseAppSetupMutex (void); BOOL IsTrueCryptInstallerRunning (void);
uint32 ReadDriverConfigurationFlags ();
uint32 ReadEncryptionThreadPoolFreeCpuCountLimit ();
-BOOL LoadSysEncSettings (HWND hwndDlg);
+BOOL LoadSysEncSettings ();
int LoadNonSysInPlaceEncSettings (WipeAlgorithmId *wipeAlgorithm);
void RemoveNonSysInPlaceEncNotifications (void);
void SavePostInstallTasksSettings (int command);
diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp index 4c9165d9..546e5339 100644 --- a/src/ExpandVolume/WinMain.cpp +++ b/src/ExpandVolume/WinMain.cpp @@ -242,7 +242,7 @@ void LoadSettings (HWND hwndDlg) { WipeAlgorithmId savedWipeAlgorithm = TC_WIPE_NONE; - LoadSysEncSettings (hwndDlg); + LoadSysEncSettings (); if (LoadNonSysInPlaceEncSettings (&savedWipeAlgorithm) != 0) bInPlaceEncNonSysPending = TRUE; diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c Binary files differindex 54e0d63e..ff31cdb4 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.c diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c index 1aef7a53..19b160db 100644 --- a/src/Mount/Mount.c +++ b/src/Mount/Mount.c @@ -653,7 +653,7 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL* WipeAlgorithmId savedWipeAlgorithm = TC_WIPE_NONE;
if (!bOnlyCheckModified)
- LoadSysEncSettings (hwndDlg);
+ LoadSysEncSettings ();
if (!bOnlyCheckModified && LoadNonSysInPlaceEncSettings (&savedWipeAlgorithm) != 0)
bInPlaceEncNonSysPending = TRUE;
@@ -739,7 +739,7 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL* // only check for last drive modification if history enabled
char szTmp[32] = {0};
LPARAM lLetter;
- lLetter = GetSelectedLong (GetDlgItem (hwndDlg, IDC_DRIVELIST));
+ lLetter = GetSelectedLong (GetDlgItem (MainDlg, IDC_DRIVELIST));
if (LOWORD (lLetter) != 0xffff)
StringCbPrintfA (szTmp, sizeof(szTmp), "%lc:", (wchar_t) HIWORD (lLetter));
@@ -782,9 +782,9 @@ void LoadSettingsAndCheckModified (HWND hwndDlg, BOOL bOnlyCheckModified, BOOL* // History
if (bHistoryCmdLine != TRUE)
{
- LoadCombo (GetDlgItem (hwndDlg, IDC_VOLUME), bHistory, bOnlyCheckModified, pbHistoryModified);
+ LoadCombo (GetDlgItem (MainDlg, IDC_VOLUME), bHistory, bOnlyCheckModified, pbHistoryModified);
if (!bOnlyCheckModified && CmdLineVolumeSpecified)
- SetWindowText (GetDlgItem (hwndDlg, IDC_VOLUME), szFileName);
+ SetWindowText (GetDlgItem (MainDlg, IDC_VOLUME), szFileName);
}
// Mount Options
@@ -885,7 +885,7 @@ void SaveSettings (HWND hwndDlg) if (bHistory)
{
// Drive Letter
- lLetter = GetSelectedLong (GetDlgItem (hwndDlg, IDC_DRIVELIST));
+ lLetter = GetSelectedLong (GetDlgItem (MainDlg, IDC_DRIVELIST));
if (LOWORD (lLetter) != 0xffff)
StringCbPrintfA (szTmp, sizeof(szTmp), "%lc:", (wchar_t) HIWORD (lLetter));
ConfigWriteString ("LastSelectedDrive", szTmp);
@@ -931,7 +931,7 @@ void SaveSettings (HWND hwndDlg) if (bHistoryChanged)
{
// History
- DumpCombo (GetDlgItem (hwndDlg, IDC_VOLUME), IsButtonChecked (GetDlgItem (hwndDlg, IDC_NO_HISTORY)));
+ DumpCombo (GetDlgItem (MainDlg, IDC_VOLUME), IsButtonChecked (GetDlgItem (MainDlg, IDC_NO_HISTORY)));
}
NormalCursor ();
@@ -6989,7 +6989,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa return 1;
case TC_APPMSG_SYSENC_CONFIG_UPDATE:
- LoadSysEncSettings (hwndDlg);
+ LoadSysEncSettings ();
// The wizard added VeraCrypt.exe to the system startup sequence or performed other operations that
// require us to update our cached settings.
|