Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 02:58:02 -06:00
Code Activity

Complete replacement of Dismount references by Unmount in various files

Browse Source
This commit is contained in:
Mounir IDRASSI
2025-02-02 23:37:36 +01:00
parent bdbd95a51b
commit c69ba240c4
24 changed files with 477 additions and 477 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Cmdline.c
View File

@@ -66,7 +66,7 @@ BOOL CALLBACK CommandHelpDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
}
}
#if defined(TCMOUNT) && !defined(VCEXPANDER)
StringCchCatW (tmp, 8192, L"\nExamples:\n\nMount a volume as X:\tveracrypt.exe /q /v volume.hc /l X\nDismount a volume X:\tveracrypt.exe /q /d X");
StringCchCatW (tmp, 8192, L"\nExamples:\n\nMount a volume as X:\tveracrypt.exe /q /v volume.hc /l X\nUnmount a volume X:\tveracrypt.exe /q /u X");
#endif
SetWindowTextW (GetDlgItem (hwndDlg, IDC_COMMANDHELP_TEXT), tmp);

4
src/Driver/DriveFilter.c
View File

@@ -287,7 +287,7 @@ err:
static void DismountDrive (DriveFilterExtension *Extension, BOOL stopIoQueue)
{
Dump ("Dismounting drive\n");
Dump ("Unmounting drive\n");
ASSERT (Extension->DriveMounted);
if (stopIoQueue && EncryptedIoQueueIsRunning (&Extension->Queue))
@@ -301,7 +301,7 @@ static void DismountDrive (DriveFilterExtension *Extension, BOOL stopIoQueue)
Extension->DriveMounted = FALSE;
Dump ("Drive dismount done!\n");
Dump ("Drive unmount done!\n");
}
static void InvalidateVolumeKeys (EXTENSION *Extension)

24
src/Main/UserInterface.cpp
View File

@@ -1176,7 +1176,7 @@ const FileManager fileManagers[] = {
" 3) Mount the outer volume using hidden volume protection.\n"
" 4) Create a filesystem on the virtual device of the outer volume.\n"
" 5) Mount the new filesystem and fill it with data.\n"
" 6) Dismount the outer volume.\n"
" 6) Unmount the outer volume.\n"
" If at any step the hidden volume protection is triggered, start again from 1).\n"
"\n"
"--create-keyfile[=FILE_PATH]\n"
@@ -1188,9 +1188,9 @@ const FileManager fileManagers[] = {
" algorithm can be changed with option --hash. See also options -k,\n"
" --new-keyfiles, --new-password, -p, --random-source.\n"
"\n"
"-d, --dismount[=MOUNTED_VOLUME]\n"
" Dismount a mounted volume. If MOUNTED_VOLUME is not specified, all\n"
" volumes are dismounted. See below for description of MOUNTED_VOLUME.\n"
"-u, --unmount[=MOUNTED_VOLUME]\n"
" Unmount a mounted volume. If MOUNTED_VOLUME is not specified, all\n"
" volumes are unmounted. See below for description of MOUNTED_VOLUME.\n"
"\n"
"--delete-token-keyfiles\n"
" Delete keyfiles from security tokens. See also command --list-token-keyfiles.\n"
@@ -1261,7 +1261,7 @@ const FileManager fileManagers[] = {
" Filesystem type 'none' disables mounting or creating a filesystem.\n"
"\n"
"--force\n"
" Force mounting of a volume in use, dismounting of a volume in use, or\n"
" Force mounting of a volume in use, unmounting of a volume in use, or\n"
" overwriting a file. Note that this option has no effect on some platforms.\n"
"\n"
"--fs-options=OPTIONS\n"
@@ -1297,7 +1297,7 @@ const FileManager fileManagers[] = {
" readonly|ro: Mount volume as read-only.\n"
" system: Mount partition using system encryption.\n"
" timestamp|ts: Do not restore host-file modification timestamp when a volume\n"
" is dismounted (note that the operating system under certain circumstances\n"
" is unmounted (note that the operating system under certain circumstances\n"
" does not alter host-file timestamps, which may be mistakenly interpreted\n"
" to mean that this option does not work).\n"
" See also option --fs-options.\n"
@@ -1332,7 +1332,7 @@ const FileManager fileManagers[] = {
" prevented, the whole volume is switched to read-only mode. Verbose list\n"
" (-v -l) can be used to query the state of the hidden volume protection.\n"
" Warning message is displayed when a volume switched to read-only is being\n"
" dismounted.\n"
" unmounted.\n"
"\n"
"--protection-keyfiles=KEYFILE1[,KEYFILE2,KEYFILE3,...]\n"
" Use specified keyfiles to open a hidden volume to be protected. This option\n"
@@ -1353,7 +1353,7 @@ const FileManager fileManagers[] = {
" of requiring the user to type random characters.\n"
"\n"
"--slot=SLOT\n"
" Use specified slot number when mounting, dismounting, or listing a volume.\n"
" Use specified slot number when mounting, unmounting, or listing a volume.\n"
"\n"
"--size=SIZE[K|KiB|M|MiB|G|GiB|T|TiB] or --size=max\n"
" Use specified size when creating a new volume. If no suffix is indicated,\n"
@@ -1398,11 +1398,11 @@ const FileManager fileManagers[] = {
"Mount a volume prompting only for its password:\n"
"veracrypt -t -k \"\" --pim=0 --protect-hidden=no volume.hc /media/veracrypt1\n"
"\n"
"Dismount a volume:\n"
"veracrypt -d volume.hc\n"
"Unmount a volume:\n"
"veracrypt -u volume.hc\n"
"\n"
"Dismount all mounted volumes:\n"
"veracrypt -d\n"
"Unmount all mounted volumes:\n"
"veracrypt -u\n"
);
#ifndef TC_NO_GUI

4
src/Mount/Mount.c
View File

@@ -4990,7 +4990,7 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
fwprintf (af, L"action=%s\n", bAutoMount ? GetString ("MOUNT_TC_VOLUME") : GetString ("IDC_PREF_LOGON_START"));
fwprintf (af, L"open=%s\n", bAutoMount ? autoMount : L"VeraCrypt\\VeraCrypt.exe");
fwprintf (af, L"shell\\start=%s\nshell\\start\\command=VeraCrypt\\VeraCrypt.exe\n", GetString ("IDC_PREF_LOGON_START"));
fwprintf (af, L"shell\\dismount=%s\nshell\\dismount\\command=VeraCrypt\\VeraCrypt.exe /q /d\n", GetString ("UNMOUNT_ALL_TC_VOLUMES"));
fwprintf (af, L"shell\\unmount=%s\nshell\\unmount\\command=VeraCrypt\\VeraCrypt.exe /q /u\n", GetString ("UNMOUNT_ALL_TC_VOLUMES"));
CheckFileStreamWriteErrors (hwndDlg, af, dstPath);
fclose (af);
@@ -10483,7 +10483,7 @@ skipMount:
DWORD bytesOut;
DeviceIoControl (hDriver, TC_IOCTL_SET_SYSTEM_FAVORITE_VOLUME_DIRTY, NULL, 0, NULL, 0, &bytesOut, NULL);
SystemFavoritesServiceLogError (wstring (L"The filesystem of the volume mounted as ") + (wchar_t) (drive + L'A') + L": was not cleanly dismounted and needs to be checked for errors.");
SystemFavoritesServiceLogError (wstring (L"The filesystem of the volume mounted as ") + (wchar_t) (drive + L'A') + L": was not cleanly unmounted and needs to be checked for errors.");
}
}
else if (!systemFavorites && !favoriteVolumeToMount.Path.empty())

18
src/Mount/Mount.rc
View File

@@ -64,10 +64,10 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,81,116,114,10
CONTROL "Entering power saving mode",IDC_PREF_UNMOUNT_POWERSAVING,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,197,115,130,11
CONTROL "Auto-dismount volume after no data has been read/written to it for",IDC_PREF_UNMOUNT_INACTIVE,
CONTROL "Auto-unmount volume after no data has been read/written to it for",IDC_PREF_UNMOUNT_INACTIVE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,128,246,11
EDITTEXT IDC_PREF_UNMOUNT_INACTIVE_TIME,258,127,27,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
CONTROL "Force auto-dismount even if volume contains open files or directories",IDC_PREF_FORCE_AUTO_UNMOUNT,
CONTROL "Force auto-unmount even if volume contains open files or directories",IDC_PREF_FORCE_AUTO_UNMOUNT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,141,294,10
CONTROL "Open Explorer window for successfully mounted volume",IDC_PREF_OPEN_EXPLORER,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,171,316,11
@@ -83,7 +83,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,162,271,165,11
CONTROL "Temporarily cache password during ""Mount Favorite Volumes"" operations",IDC_PREF_TEMP_CACHE_ON_MULTIPLE_MOUNT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,285,294,11
CONTROL "Wipe cached passwords on auto-dismount",IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT,
CONTROL "Wipe cached passwords on auto-unmount",IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,299,296,11
CONTROL "Include PIM when caching a password",IDC_PREF_CACHE_PIM,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,313,296,10
@@ -93,9 +93,9 @@ BEGIN
GROUPBOX "Windows",IDT_WINDOWS_RELATED_SETTING,4,160,328,97
GROUPBOX "Default Mount Options",IDT_DEFAULT_MOUNT_OPTIONS,4,3,328,26
GROUPBOX "VeraCrypt Background Task",IDT_TASKBAR_ICON,4,33,328,26
GROUPBOX "Auto-Dismount",IDT_AUTO_UNMOUNT,4,94,328,62
GROUPBOX "Auto-Unmount",IDT_AUTO_UNMOUNT,4,94,328,62
LTEXT "minutes",IDT_MINUTES,289,129,39,10
LTEXT "Dismount all when:",IDT_AUTO_UNMOUNT_ON,9,104,71,20
LTEXT "Unmount all when:",IDT_AUTO_UNMOUNT_ON,9,104,71,20
GROUPBOX "Password Cache",IDT_PW_CACHE_OPTIONS,4,260,328,68
GROUPBOX "Actions to perform upon logon to Windows",IDT_LOGON,4,63,328,28
CONTROL "Don't show wait message dialog when performing operations",IDC_HIDE_WAITING_DIALOG,
@@ -256,9 +256,9 @@ BEGIN
CONTROL "Alt",IDC_HK_MOD_ALT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,216,158,43,10,WS_EX_TRANSPARENT
CONTROL "Win",IDC_HK_MOD_WIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,266,158,34,10,WS_EX_TRANSPARENT
PUSHBUTTON "Remove",IDC_HOTKEY_REMOVE,304,158,59,14
CONTROL "Play system notification sound after successful hot-key dismount",IDC_HK_UNMOUNT_PLAY_SOUND,
CONTROL "Play system notification sound after successful hot-key unmount",IDC_HK_UNMOUNT_PLAY_SOUND,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,201,348,10
CONTROL "Display balloon tooltip after successful hot-key dismount",IDC_HK_UNMOUNT_BALLOON_TOOLTIP,
CONTROL "Display balloon tooltip after successful hot-key unmount",IDC_HK_UNMOUNT_BALLOON_TOOLTIP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,213,351,10,WS_EX_TRANSPARENT
DEFPUSHBUTTON "OK",IDOK,260,236,59,14
PUSHBUTTON "Cancel",IDCANCEL,323,236,59,14
@@ -651,8 +651,8 @@ BEGIN
MENUITEM "Mount Volume with Options", IDM_MOUNT_VOLUME_OPTIONS
MENUITEM "Auto-Mount All Device-Hosted Volumes", IDM_MOUNTALL
MENUITEM SEPARATOR
MENUITEM "Dismount Volume", IDM_UNMOUNT_VOLUME
MENUITEM "Dismount All Mounted Volumes", IDM_UNMOUNTALL
MENUITEM "Unmount Volume", IDM_UNMOUNT_VOLUME
MENUITEM "Unmount All Mounted Volumes", IDM_UNMOUNTALL
MENUITEM SEPARATOR
MENUITEM "Change Volume Password...", IDM_CHANGE_PASSWORD
MENUITEM "Add/Remove Keyfiles to/from Volume...", IDM_ADD_REMOVE_VOL_KEYFILES

4
src/Release/Setup Files/Product64.wxs
View File

@@ -822,7 +822,7 @@
<File Id="fil1B5039BFF40C7C3BAA602D9AE17668E6" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Multi-User Environment.html" Checksum="yes" DiskId="1" />
</Component>
<Component Id="cmp340BBEC25292C3BE778BA8F158DB87B1" Guid="{34107694-BD63-4466-9317-E2745861F0FE}">
<File Id="filDF64E26B5CFC7EDB198C7CEA46690CA0" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Normal Dismount vs Force Dismount.html" Checksum="yes" DiskId="1" />
<File Id="filDF64E26B5CFC7EDB198C7CEA46690CA0" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Normal Unmount vs Force Unmount.html" Checksum="yes" DiskId="1" />
</Component>
<Component Id="cmpC27AA2C4496C9EFA95DCD663B031B5D0" Guid="{23C15FAB-969E-491A-802E-ADE3255F9002}">
<File Id="fil5FA8E7B0268E1EF7F9FAFA478FE0C8B1" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Notation.html" Checksum="yes" DiskId="1" />
@@ -1477,7 +1477,7 @@
<File Id="filD2991527BE5D0C1F42F6C69FD01376B1" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\ru\Multi-User Environment.html" Checksum="yes" DiskId="1" />
</Component>
<Component Id="cmp4BC713FA989ECC8EC884548781C4F29D" Guid="{191AF27B-1811-4149-9713-2B3913422D32}">
<File Id="filB4D109A8E9F7C159C41DA988EF4AE5BD" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\ru\Normal Dismount vs Force Dismount.html" Checksum="yes" DiskId="1" />
<File Id="filB4D109A8E9F7C159C41DA988EF4AE5BD" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\ru\Normal Unmount vs Force Unmount.html" Checksum="yes" DiskId="1" />
</Component>
<Component Id="cmp2CF52C3BBF31CCD0752A49C11FF294A7" Guid="{0C07FB83-253B-4229-809C-4E1DA30C3626}">
<File Id="fil4E4C69B10DB0A7BA934182EE4EEBE7A0" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\ru\Notation.html" Checksum="yes" DiskId="1" />