From 8586c5101638143e7551db7c72067674a2817b38 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Sun, 10 Jan 2016 20:17:30 +0100
Subject: 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.

---
 src/Common/Dlgcode.c | 6 +++---
 src/Common/Dlgcode.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/Common')

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);
-- 
cgit v1.2.3