1 files changed, 40 insertions, 3 deletions
diff --git a/src/Mount/Mount.h b/src/Mount/Mount.h
index 4a50ef3c..cd2636b1 100644
--- a/src/Mount/Mount.h
+++ b/src/Mount/Mount.h
@@ -5,9 +5,9 @@
  governed by the TrueCrypt License 3.0, also from the source code of
  Encryption for the Masses 2.02a, which is Copyright (c) 1998-2000 Paul Le Roux
  and which is governed by the 'License Agreement for Encryption for the Masses' 
  Modifications and additions to the original source code (contained in this file) 
- and all other portions of this file are Copyright (c) 2013-2016 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2017 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages. */
 
@@ -54,9 +54,8 @@ typedef struct
 {
 	Password *password;
 	int* pkcs5;
 	int* pim;
-	BOOL* truecryptMode;
 } PasswordDlgParam;
 
 extern VOLUME_NOTIFICATIONS_LIST VolumeNotificationsList;
 
@@ -107,9 +106,9 @@ int BackupVolumeHeader (HWND hwndDlg, BOOL bRequireConfirmation, const wchar_t *
 int RestoreVolumeHeader (HWND hwndDlg, const wchar_t *lpszVolume);
 void SecurityTokenPreferencesDialog (HWND hwndDlg);
 static BOOL CALLBACK PerformanceSettingsDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
 static BOOL CALLBACK BootLoaderPreferencesDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
-void MountSelectedVolume (HWND hwndDlg, BOOL mountWithOptions);
+void MountSelectedVolume (HWND hwndDlg, BOOL mountWithOptions, BOOL skipCachedPasswords);
 uint32 ReadDriverConfigurationFlags ();
 void HookMouseWheel (HWND hwndDlg, UINT ctrlId);
 static BOOL HandleDriveListMouseWheelEvent (UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL bListMustBePointed);
 static BOOL CALLBACK DefaultMountParametersDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam);
@@ -128,5 +127,43 @@ typedef struct
 void SetDriverConfigurationFlag (uint32 flag, BOOL state);
 BOOL MountFavoriteVolumes (HWND hwnd, BOOL systemFavorites = FALSE, BOOL logOnMount = FALSE, BOOL hotKeyMount = FALSE, const VeraCrypt::FavoriteVolume &favoriteVolumeToMount = VeraCrypt::FavoriteVolume());
 void __cdecl mountFavoriteVolumeThreadFunction (void *pArg);
 
+// A class that represents a device based on its device ID
+class CDevice
+{
+public:
+    WCHAR m_szDeviceID[MAX_PATH];
+
+    CDevice()
+    {
+        ZeroMemory(m_szDeviceID, sizeof(m_szDeviceID));
+    }
+
+    CDevice(WCHAR* szDevicePath)
+    {
+        StringCchCopyW(m_szDeviceID, MAX_PATH, szDevicePath);
+    }
+
+    CDevice(const CDevice& src)
+    {
+        StringCchCopyW(m_szDeviceID, MAX_PATH, src.m_szDeviceID);
+    }
+
+    CDevice& operator=(const CDevice& src)
+    {
+        StringCchCopyW(m_szDeviceID, MAX_PATH, src.m_szDeviceID);
+        return *this;
+    }
+
+    BOOL operator==(const CDevice& src)
+    {
+        return  wcscmp(m_szDeviceID, src.m_szDeviceID) == 0;
+    }
+
+    ~CDevice()
+    {
+    }
+};
+
+
 #endif