VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2018-04-05 14:47:10 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2018-04-05 14:48:45 (GMT)
commitad7eb74960b94e7cc0678852244c34707b6da8c6 (patch)
tree9dc48b2fcf42d80098fa88f9ec78a1b7f6900f39 /src
parent431aae0201677409856f7bc92a1856131eea634e (diff)
downloadVeraCrypt-ad7eb74960b94e7cc0678852244c34707b6da8c6.zip
VeraCrypt-ad7eb74960b94e7cc0678852244c34707b6da8c6.tar.gz
Windows: when Secure Desktop is enabled, use it for Mount Options dialog if it is displayed before password dialog (e.g. using menu Volumes > Mount Volume with Options) since it may contains the password for hidden volume.
Diffstat (limited to 'src')
-rw-r--r--src/Mount/Mount.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 00de785..b3ad6f6 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -7637,7 +7637,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5;
mountOptions.ProtectedHidVolPim = CmdVolumePim;
- if (IDCANCEL == DialogBoxParamW (hInst,
+ if (IDCANCEL == SecureDesktopDialogBoxParam (hInst,
MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwndDlg,
(DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions))
return 1;
@@ -9577,7 +9577,7 @@ static BOOL MountFavoriteVolumeBase (HWND hwnd, const FavoriteVolume &favorite,
else
mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5;
mountOptions.ProtectedHidVolPim = CmdVolumePim;
- if (Silent || (DialogBoxParamW (hInst, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwnd, (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions) == IDCANCEL))
+ if (Silent || (SecureDesktopDialogBoxParam (hInst, MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwnd, (DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions) == IDCANCEL))
{
status = FALSE;
goto skipMount;
@@ -11394,7 +11394,7 @@ void MountSelectedVolume (HWND hwndDlg, BOOL mountWithOptions)
else
mountOptions.ProtectedHidVolPkcs5Prf = CmdVolumePkcs5;
mountOptions.ProtectedHidVolPim = CmdVolumePim;
- if (IDCANCEL == DialogBoxParamW (hInst,
+ if (IDCANCEL == SecureDesktopDialogBoxParam (hInst,
MAKEINTRESOURCEW (IDD_MOUNT_OPTIONS), hwndDlg,
(DLGPROC) MountOptionsDlgProc, (LPARAM) &mountOptions))
return;