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.
This commit is contained in:
parent
431aae0201
commit
ad7eb74960
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue