diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-12-30 12:17:09 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-12-30 23:56:28 +0100 |
| commit | cdbe54e60542231f832d59389381bf9b56b710be (patch) | |
| tree | cc71665cba8e86003f65c9385a166e787b8966aa /src/ExpandVolume | |
| parent | d116eba1607ca82d90874018037a19088a4bb26d (diff) | |
| download | VeraCrypt-cdbe54e60542231f832d59389381bf9b56b710be.tar.gz VeraCrypt-cdbe54e60542231f832d59389381bf9b56b710be.zip | |
Windows: Implement Secure Desktop for password entry. Add option and command line switch to activate it.
Diffstat (limited to 'src/ExpandVolume')
| -rw-r--r-- | src/ExpandVolume/WinMain.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ExpandVolume/WinMain.cpp b/src/ExpandVolume/WinMain.cpp index 3172a45f..5ab9718c 100644 --- a/src/ExpandVolume/WinMain.cpp +++ b/src/ExpandVolume/WinMain.cpp | |||
| @@ -284,6 +284,7 @@ void LoadSettings (HWND hwndDlg) | |||
| 284 | bPreserveTimestamp = defaultMountOptions.PreserveTimestamp = ConfigReadInt ("PreserveTimestamps", TRUE); | 284 | bPreserveTimestamp = defaultMountOptions.PreserveTimestamp = ConfigReadInt ("PreserveTimestamps", TRUE); |
| 285 | bShowDisconnectedNetworkDrives = ConfigReadInt ("ShowDisconnectedNetworkDrives", FALSE); | 285 | bShowDisconnectedNetworkDrives = ConfigReadInt ("ShowDisconnectedNetworkDrives", FALSE); |
| 286 | bHideWaitingDialog = ConfigReadInt ("HideWaitingDialog", FALSE); | 286 | bHideWaitingDialog = ConfigReadInt ("HideWaitingDialog", FALSE); |
| 287 | bUseSecureDesktop = ConfigReadInt ("UseSecureDesktop", FALSE); | ||
| 287 | defaultMountOptions.Removable = ConfigReadInt ("MountVolumesRemovable", FALSE); | 288 | defaultMountOptions.Removable = ConfigReadInt ("MountVolumesRemovable", FALSE); |
| 288 | defaultMountOptions.ReadOnly = ConfigReadInt ("MountVolumesReadOnly", FALSE); | 289 | defaultMountOptions.ReadOnly = ConfigReadInt ("MountVolumesReadOnly", FALSE); |
| 289 | defaultMountOptions.ProtectHiddenVolume = FALSE; | 290 | defaultMountOptions.ProtectHiddenVolume = FALSE; |
| @@ -815,7 +816,7 @@ int ExtcvAskVolumePassword (HWND hwndDlg, const wchar_t* fileName, Password *pas | |||
| 815 | 816 | ||
| 816 | StringCbCopyW (PasswordDlgVolume, sizeof(PasswordDlgVolume), fileName); | 817 | StringCbCopyW (PasswordDlgVolume, sizeof(PasswordDlgVolume), fileName); |
| 817 | 818 | ||
| 818 | result = DialogBoxParamW (hInst, | 819 | result = SecureDesktopDialogBoxParam (hInst, |
| 819 | MAKEINTRESOURCEW (IDD_PASSWORD_DLG), hwndDlg, | 820 | MAKEINTRESOURCEW (IDD_PASSWORD_DLG), hwndDlg, |
| 820 | (DLGPROC) ExtcvPasswordDlgProc, (LPARAM) &dlgParam); | 821 | (DLGPROC) ExtcvPasswordDlgProc, (LPARAM) &dlgParam); |
| 821 | 822 | ||
| @@ -883,6 +884,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa | |||
| 883 | bPreserveTimestamp = defaultMountOptions.PreserveTimestamp = TRUE; | 884 | bPreserveTimestamp = defaultMountOptions.PreserveTimestamp = TRUE; |
| 884 | bShowDisconnectedNetworkDrives = FALSE; | 885 | bShowDisconnectedNetworkDrives = FALSE; |
| 885 | bHideWaitingDialog = FALSE; | 886 | bHideWaitingDialog = FALSE; |
| 887 | bUseSecureDesktop = FALSE; | ||
| 886 | 888 | ||
| 887 | if (UsePreferences) | 889 | if (UsePreferences) |
| 888 | { | 890 | { |