VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Mount
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-12-27 10:50:27 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-12-27 12:39:24 (GMT)
commitf4c864e88e7d1c2229abb4a454b769a08390abae (patch)
tree64acdf69ad357ccef1d7259318122b8e80852b65 /src/Mount
parenta8112b8373a9cd9c4c481895179f6b31db33d967 (diff)
downloadVeraCrypt-f4c864e88e7d1c2229abb4a454b769a08390abae.zip
VeraCrypt-f4c864e88e7d1c2229abb4a454b769a08390abae.tar.gz
Windows: implement wait dialog for the backup/restore header operations.
Diffstat (limited to 'src/Mount')
-rw-r--r--src/Mount/Mount.c78
1 files changed, 62 insertions, 16 deletions
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 92c79dd..030a118 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -1494,6 +1494,42 @@ void CALLBACK ChangePwdWaitThreadProc(void* pArg, HWND hwndDlg)
}
}
+// implementation for support of backup header operation in wait dialog mechanism
+
+typedef struct
+{
+ BOOL bRequireConfirmation;
+ char *lpszVolume;
+ int* iResult;
+} BackupHeaderThreadParam;
+
+void CALLBACK BackupHeaderWaitThreadProc(void* pArg, HWND hwndDlg)
+{
+ BackupHeaderThreadParam* pThreadParam = (BackupHeaderThreadParam*) pArg;
+
+ if (!IsAdmin () && IsUacSupported () && IsVolumeDeviceHosted (pThreadParam->lpszVolume))
+ *(pThreadParam->iResult) = UacBackupVolumeHeader (hwndDlg, pThreadParam->bRequireConfirmation, pThreadParam->lpszVolume);
+ else
+ *(pThreadParam->iResult) = BackupVolumeHeader (hwndDlg, pThreadParam->bRequireConfirmation, pThreadParam->lpszVolume);
+}
+
+// implementation for support of restoring header operation in wait dialog mechanism
+
+typedef struct
+{
+ char *lpszVolume;
+ int* iResult;
+} RestoreHeaderThreadParam;
+
+void CALLBACK RestoreHeaderWaitThreadProc(void* pArg, HWND hwndDlg)
+{
+ RestoreHeaderThreadParam* pThreadParam = (RestoreHeaderThreadParam*) pArg;
+
+ if (!IsAdmin () && IsUacSupported () && IsVolumeDeviceHosted (pThreadParam->lpszVolume))
+ *(pThreadParam->iResult) = UacRestoreVolumeHeader (hwndDlg, pThreadParam->lpszVolume);
+ else
+ *(pThreadParam->iResult) = RestoreVolumeHeader (hwndDlg, pThreadParam->lpszVolume);
+}
/* Except in response to the WM_INITDIALOG message, the dialog box procedure
should return nonzero if it processes the message, and zero if it does
@@ -6157,10 +6193,13 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
WaitCursor ();
- if (!IsAdmin () && IsUacSupported () && IsVolumeDeviceHosted (volPath))
- UacBackupVolumeHeader (hwndDlg, TRUE, volPath);
- else
- BackupVolumeHeader (hwndDlg, TRUE, volPath);
+ int iStatus = 0;
+ BackupHeaderThreadParam threadParam;
+ threadParam.bRequireConfirmation = TRUE;
+ threadParam.lpszVolume = volPath;
+ threadParam.iResult = &iStatus;
+
+ ShowWaitDialog (hwndDlg, TRUE, BackupHeaderWaitThreadProc, &threadParam);
NormalCursor ();
}
@@ -6177,10 +6216,12 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
WaitCursor ();
- if (!IsAdmin () && IsUacSupported () && IsVolumeDeviceHosted (volPath))
- UacRestoreVolumeHeader (hwndDlg, volPath);
- else
- RestoreVolumeHeader (hwndDlg, volPath);
+ int iStatus = 0;
+ RestoreHeaderThreadParam threadParam;
+ threadParam.lpszVolume = volPath;
+ threadParam.iResult = &iStatus;
+
+ ShowWaitDialog(hwndDlg, TRUE, RestoreHeaderWaitThreadProc, &threadParam);
NormalCursor ();
}
@@ -6578,10 +6619,13 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
WaitCursor ();
- if (!IsAdmin () && IsUacSupported () && IsVolumeDeviceHosted (volPath))
- UacBackupVolumeHeader (hwndDlg, TRUE, volPath);
- else
- BackupVolumeHeader (hwndDlg, TRUE, volPath);
+ int iStatus = 0;
+ BackupHeaderThreadParam threadParam;
+ threadParam.bRequireConfirmation = TRUE;
+ threadParam.lpszVolume = volPath;
+ threadParam.iResult = &iStatus;
+
+ ShowWaitDialog (hwndDlg, TRUE, BackupHeaderWaitThreadProc, &threadParam);
NormalCursor ();
}
@@ -6602,10 +6646,12 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
WaitCursor ();
- if (!IsAdmin () && IsUacSupported () && IsVolumeDeviceHosted (volPath))
- UacRestoreVolumeHeader (hwndDlg, volPath);
- else
- RestoreVolumeHeader (hwndDlg, volPath);
+ int iStatus = 0;
+ RestoreHeaderThreadParam threadParam;
+ threadParam.lpszVolume = volPath;
+ threadParam.iResult = &iStatus;
+
+ ShowWaitDialog(hwndDlg, TRUE, RestoreHeaderWaitThreadProc, &threadParam);
NormalCursor ();
}