From c98400a2b7f035b6873480889b701380b66853a2 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 17 Dec 2014 12:09:25 +0100 Subject: Windows: in silent mode, don't show the wait dialog during mount operation --- src/Common/Dlgcode.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c index 1dbbbd29..0105de4f 100644 --- a/src/Common/Dlgcode.c +++ b/src/Common/Dlgcode.c @@ -6363,15 +6363,23 @@ retry: mount.bPartitionInInactiveSysEncScope = TRUE; } - MountThreadParam threadParam; - threadParam.hwnd = hwndDlg; - threadParam.pmount = &mount; - threadParam.pbResult = &bResult; - threadParam.pdwResult = &dwResult; - - DialogBoxParamW (hInst, - MAKEINTRESOURCEW (IDD_STATIC_MODAL_WAIT_DLG), hwndDlg, - (DLGPROC) MountWaitDlgProc, (LPARAM) &threadParam); + if (!quiet) + { + MountThreadParam threadParam; + threadParam.hwnd = hwndDlg; + threadParam.pmount = &mount; + threadParam.pbResult = &bResult; + threadParam.pdwResult = &dwResult; + + DialogBoxParamW (hInst, + MAKEINTRESOURCEW (IDD_STATIC_MODAL_WAIT_DLG), hwndDlg, + (DLGPROC) MountWaitDlgProc, (LPARAM) &threadParam); + } + else + { + bResult = DeviceIoControl (hDriver, TC_IOCTL_MOUNT_VOLUME, &mount, + sizeof (mount), &mount, sizeof (mount), &dwResult, NULL); + } burn (&mount.VolumePassword, sizeof (mount.VolumePassword)); burn (&mount.ProtectedHidVolPassword, sizeof (mount.ProtectedHidVolPassword)); -- cgit v1.2.3