diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-07-01 22:46:01 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2023-07-01 22:46:01 +0200 |
| commit | 7a3daa389cf74d7a2439d943c63a888b62abfeb9 (patch) | |
| tree | 00116f5e858f7ded8ae47a0f0505430bc4ea475c /src/Common/Format.c | |
| parent | e28de414e0fbf1d7983c5edd3c91c83ea04fecbd (diff) | |
| download | VeraCrypt-7a3daa389cf74d7a2439d943c63a888b62abfeb9.tar.gz VeraCrypt-7a3daa389cf74d7a2439d943c63a888b62abfeb9.zip | |
Windows: Make API formatting fallback to format.com in case of elevation. remove dead code from ExternalFormatFs
We also modify UacFormatNtfs/UacFormatFs to return actual error code in case of failure
Diffstat (limited to 'src/Common/Format.c')
| -rw-r--r-- | src/Common/Format.c | 63 |
1 files changed, 12 insertions, 51 deletions
diff --git a/src/Common/Format.c b/src/Common/Format.c index d5514bf9..bcbb94a1 100644 --- a/src/Common/Format.c +++ b/src/Common/Format.c @@ -799,18 +799,16 @@ error: retCode = ExternalFormatFs (driveNo, volParams->clusterSize, fsType); if (retCode != 0) { - wchar_t auxLine[2048]; - StringCbPrintfW (auxLine, sizeof(auxLine), GetString ("FORMAT_EXTERNAL_FAILED"), retCode); - WarningDirect(auxLine, volParams->hwndDlg); /* fallback to using FormatEx function from fmifs.dll */ if (!Silent && !IsAdmin () && IsUacSupported ()) retCode = UacFormatFs (volParams->hwndDlg, driveNo, volParams->clusterSize, fsType); else - retCode = FormatFs (driveNo, volParams->clusterSize, fsType); + retCode = FormatFs (driveNo, volParams->clusterSize, fsType, FALSE); /* no need to fallback to format.com since we have already tried it without elevation */ if (retCode != 0) { + wchar_t auxLine[2048]; StringCbPrintfW (auxLine, sizeof(auxLine), GetString ("FORMATEX_API_FAILED"), FormatExGetMessage(retCode)); ErrorDirect(auxLine, volParams->hwndDlg); } @@ -1143,7 +1141,7 @@ BOOLEAN __stdcall FormatExCallback (int command, DWORD subCommand, PVOID paramet return (FormatExError? FALSE : TRUE); } -int FormatFs (int driveNo, int clusterSize, int fsType) +int FormatFs (int driveNo, int clusterSize, int fsType, BOOL bFallBackExternal) { wchar_t dllPath[MAX_PATH] = {0}; WCHAR dir[8] = { (WCHAR) driveNo + L'A', 0 }; @@ -1204,28 +1202,29 @@ int FormatFs (int driveNo, int clusterSize, int fsType) Sleep (4000); FreeLibrary (hModule); + + if (FormatExError && bFallBackExternal) + { + return ExternalFormatFs (driveNo, clusterSize, fsType); + } + return FormatExError? FormatExErrorCommand : 0; } -int FormatNtfs (int driveNo, int clusterSize) +int FormatNtfs (int driveNo, int clusterSize, BOOL bFallBackExternal) { - return FormatFs (driveNo, clusterSize, FILESYS_NTFS); + return FormatFs (driveNo, clusterSize, FILESYS_NTFS, bFallBackExternal); } /* call Windows format.com program to perform formatting */ int ExternalFormatFs (int driveNo, int clusterSize, int fsType) { wchar_t exePath[MAX_PATH] = {0}; - HANDLE hChildStd_IN_Rd = NULL; - HANDLE hChildStd_IN_Wr = NULL; - HANDLE hChildStd_OUT_Rd = NULL; - HANDLE hChildStd_OUT_Wr = NULL; WCHAR szFsFormat[16]; TCHAR szCmdline[2 * MAX_PATH]; STARTUPINFO siStartInfo; PROCESS_INFORMATION piProcInfo; BOOL bSuccess = FALSE; - SECURITY_ATTRIBUTES saAttr; int iRet = 0; switch (fsType) @@ -1243,35 +1242,6 @@ int ExternalFormatFs (int driveNo, int clusterSize, int fsType) return FALSE; } - /* Set the bInheritHandle flag so pipe handles are inherited. */ - saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); - saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; - - /* Create a pipe for the child process's STDOUT. */ - if ( !CreatePipe(&hChildStd_OUT_Rd, &hChildStd_OUT_Wr, &saAttr, 0) ) - return FALSE; - - /* Ensure the read handle to the pipe for STDOUT is not inherited. */ - /* Create a pipe for the child process's STDIN. */ - if ( !SetHandleInformation(hChildStd_OUT_Rd, HANDLE_FLAG_INHERIT, 0) - || !CreatePipe(&hChildStd_IN_Rd, &hChildStd_IN_Wr, &saAttr, 0)) - { - CloseHandle (hChildStd_OUT_Rd); - CloseHandle (hChildStd_OUT_Wr); - return FALSE; - } - - /* Ensure the write handle to the pipe for STDIN is not inherited. */ - if ( !SetHandleInformation(hChildStd_IN_Wr, HANDLE_FLAG_INHERIT, 0)) - { - CloseHandle (hChildStd_OUT_Rd); - CloseHandle (hChildStd_OUT_Wr); - CloseHandle (hChildStd_IN_Rd); - CloseHandle (hChildStd_IN_Wr); - return FALSE; - } - if (GetSystemDirectory (exePath, MAX_PATH)) { StringCchCatW(exePath, ARRAYSIZE(exePath), L"\\format.com"); @@ -1302,15 +1272,11 @@ int ExternalFormatFs (int driveNo, int clusterSize, int fsType) ZeroMemory( &piProcInfo, sizeof(PROCESS_INFORMATION) ); /* Set up members of the STARTUPINFO structure. - This structure specifies the STDIN and STDOUT handles for redirection. */ ZeroMemory( &siStartInfo, sizeof(STARTUPINFO) ); siStartInfo.cb = sizeof(STARTUPINFO); - siStartInfo.hStdError = hChildStd_OUT_Wr; - siStartInfo.hStdOutput = hChildStd_OUT_Wr; - siStartInfo.hStdInput = hChildStd_IN_Rd; siStartInfo.wShowWindow = SW_HIDE; - siStartInfo.dwFlags |= STARTF_USESTDHANDLES | STARTF_USESHOWWINDOW; + siStartInfo.dwFlags |= STARTF_USESHOWWINDOW; /* Create the child process. */ bSuccess = CreateProcess(NULL, @@ -1347,11 +1313,6 @@ int ExternalFormatFs (int driveNo, int clusterSize, int fsType) iRet = (int) GetLastError(); } - CloseHandle(hChildStd_OUT_Wr); - CloseHandle(hChildStd_OUT_Rd); - CloseHandle(hChildStd_IN_Rd); - CloseHandle(hChildStd_IN_Wr); - return iRet; } |