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 /src/Common | |
| 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.
Diffstat (limited to 'src/Common')
| -rw-r--r-- | src/Common/Dlgcode.c | 6 | ||||
| -rw-r--r-- | src/Common/Dlgcode.h | 2 |
2 files changed, 4 insertions, 4 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);
|