From a0f2ffb90bf004b08fc4d3e317718d5a78fb54d5 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 2 Jul 2017 17:03:03 +0200 Subject: Windows: when mounting multiple favorites, use PIM of previous favorite alongside its password if option "Include PIM when caching password" is selected alongside option "Temporarily cache password during Mount Favorite Volumes operations". --- src/Format/Tcformat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/Format/Tcformat.c') diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c index b1c31b26..5b1b0d16 100644 --- a/src/Format/Tcformat.c +++ b/src/Format/Tcformat.c @@ -5611,7 +5611,7 @@ BOOL CALLBACK PageDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa { if (lw == IDC_PIM) { - if(GetPim (hwndDlg, IDC_PIM) != 0) + if(GetPim (hwndDlg, IDC_PIM, 0) != 0) { PimValueChangedWarning = TRUE; SetDlgItemTextW (hwndDlg, IDC_PIM_HELP, GetString (SysEncInEffect ()? "PIM_SYSENC_CHANGE_WARNING" : "PIM_CHANGE_WARNING")); @@ -7582,7 +7582,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa else if (nCurPageNo == PIM_PAGE) { - volumePim = GetPim (hCurPage, IDC_PIM); + volumePim = GetPim (hCurPage, IDC_PIM, 0); if (!SysEncInEffect() && (volumePim > MAX_PIM_VALUE)) { @@ -7639,7 +7639,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa hash_algo = (int) SendMessage (GetDlgItem (hCurPage, IDC_PKCS5_PRF_ID), CB_GETITEMDATA, SendMessage (GetDlgItem (hCurPage, IDC_PKCS5_PRF_ID), CB_GETCURSEL, 0, 0), 0); - volumePim = GetPim (hCurPage, IDC_PIM); + volumePim = GetPim (hCurPage, IDC_PIM, 0); // Store the password in case we need to restore it after keyfile is applied to it if (!GetPassword (hCurPage, IDC_PASSWORD_DIRECT, szRawPassword, sizeof (szRawPassword), TRUE)) @@ -8764,7 +8764,7 @@ ovf_end: else if (nCurPageNo == PIM_PAGE) { - volumePim = GetPim (hCurPage, IDC_PIM); + volumePim = GetPim (hCurPage, IDC_PIM, 0); } else if (nCurPageNo == HIDDEN_VOL_HOST_PASSWORD_PAGE -- cgit v1.2.3