Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2026-01-07 06:08:12 -06:00
Code Activity

Windows: correctly handle WIN32 LastError when mounting. Harmonize file access checks between GUI and console. Skip ERROR_SHARING_VIOLATION in primary check in order to let the driver handle it more thoroughly.

Browse Source
This commit is contained in:
Mounir IDRASSI
2015-03-19 00:13:56 +01:00
parent f397f70fbe
commit d3db2548b5
2 changed files with 79 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Common/Dlgcode.c
View File

@@ -6317,6 +6317,7 @@ typedef struct
MOUNT_STRUCT* pmount; MOUNT_STRUCT* pmount;
BOOL* pbResult; BOOL* pbResult;
DWORD* pdwResult; DWORD* pdwResult;
DWORD dwLastError;
} MountThreadParam; } MountThreadParam;
void CALLBACK MountWaitThreadProc(void* pArg, HWND ) void CALLBACK MountWaitThreadProc(void* pArg, HWND )
@@ -6325,6 +6326,8 @@ void CALLBACK MountWaitThreadProc(void* pArg, HWND )
*(pThreadParam->pbResult) = DeviceIoControl (hDriver, TC_IOCTL_MOUNT_VOLUME, pThreadParam->pmount, *(pThreadParam->pbResult) = DeviceIoControl (hDriver, TC_IOCTL_MOUNT_VOLUME, pThreadParam->pmount,
sizeof (MOUNT_STRUCT),pThreadParam->pmount, sizeof (MOUNT_STRUCT), pThreadParam->pdwResult, NULL); sizeof (MOUNT_STRUCT),pThreadParam->pmount, sizeof (MOUNT_STRUCT), pThreadParam->pdwResult, NULL);
pThreadParam->dwLastError = GetLastError ();
} }
/************************************************************************/ /************************************************************************/
@@ -6353,7 +6356,7 @@ int MountVolume (HWND hwndDlg,
BOOL bReportWrongPassword) BOOL bReportWrongPassword)
{ {
MOUNT_STRUCT mount; MOUNT_STRUCT mount;
DWORD dwResult; DWORD dwResult, dwLastError = ERROR_SUCCESS;
BOOL bResult, bDevice; BOOL bResult, bDevice;
char root[MAX_PATH]; char root[MAX_PATH];
int favoriteMountOnArrivalRetryCount = 0; int favoriteMountOnArrivalRetryCount = 0;
@@ -6484,13 +6487,17 @@ retry:
mountThreadParam.pmount = &mount; mountThreadParam.pmount = &mount;
mountThreadParam.pbResult = &bResult; mountThreadParam.pbResult = &bResult;
mountThreadParam.pdwResult = &dwResult; mountThreadParam.pdwResult = &dwResult;
mountThreadParam.dwLastError = ERROR_SUCCESS;
ShowWaitDialog (hwndDlg, FALSE, MountWaitThreadProc, &mountThreadParam); ShowWaitDialog (hwndDlg, FALSE, MountWaitThreadProc, &mountThreadParam);
dwLastError = mountThreadParam.dwLastError;
} }
else else
{ {
bResult = DeviceIoControl (hDriver, TC_IOCTL_MOUNT_VOLUME, &mount, bResult = DeviceIoControl (hDriver, TC_IOCTL_MOUNT_VOLUME, &mount,
sizeof (mount), &mount, sizeof (mount), &dwResult, NULL); sizeof (mount), &mount, sizeof (mount), &dwResult, NULL);
dwLastError = GetLastError ();
} }
burn (&mount.VolumePassword, sizeof (mount.VolumePassword)); burn (&mount.VolumePassword, sizeof (mount.VolumePassword));
@@ -6499,6 +6506,7 @@ retry:
burn (&mount.bTrueCryptMode, sizeof (mount.bTrueCryptMode)); burn (&mount.bTrueCryptMode, sizeof (mount.bTrueCryptMode));
burn (&mount.ProtectedHidVolPkcs5Prf, sizeof (mount.ProtectedHidVolPkcs5Prf)); burn (&mount.ProtectedHidVolPkcs5Prf, sizeof (mount.ProtectedHidVolPkcs5Prf));
SetLastError (dwLastError);
if (bResult == FALSE) if (bResult == FALSE)
{ {
// Volume already open by another process // Volume already open by another process
@@ -10270,7 +10278,16 @@ BOOL VolumePathExists (const char *volumePath)
return TRUE; return TRUE;
} }
return _access (volumePath, 0) == 0; if (_access (volumePath, 0) == 0)
return TRUE;
else
{
DWORD dwResult = GetLastError ();
if (dwResult == ERROR_SHARING_VIOLATION)
return TRUE;
else
return FALSE;
}
} }

9
src/Mount/Mount.c
View File

@@ -5182,10 +5182,16 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
if (szFileName[0] != 0 && !IsMountedVolume (szFileName)) if (szFileName[0] != 0 && !IsMountedVolume (szFileName))
{ {
BOOL mounted; BOOL mounted = FALSE;
int EffectiveVolumePkcs5 = CmdVolumePkcs5; int EffectiveVolumePkcs5 = CmdVolumePkcs5;
BOOL EffectiveVolumeTrueCryptMode = CmdVolumeTrueCryptMode; BOOL EffectiveVolumeTrueCryptMode = CmdVolumeTrueCryptMode;
if (!VolumePathExists (szFileName))
{
handleWin32Error (hwndDlg);
}
else
{
/* Priority is given to command line parameters /* Priority is given to command line parameters
* Default values used only when nothing specified in command line * Default values used only when nothing specified in command line
*/ */
@@ -5251,6 +5257,7 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
NormalCursor (); NormalCursor ();
} }
}
if (UsePreferences) if (UsePreferences)
{ {