Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-12 03:18:26 -06:00
Code Activity

Windows: Fix failure to load local HTML documentation if application running with administrative privileges

Browse Source 
In this case, FileExists was called on a path with format "file:///..." and containing escape sequences, which was not recognized.
This commit is contained in:
Mounir IDRASSI
2021-02-21 18:55:49 +01:00
parent 13a1b3482c
commit 0eace45cea
1 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Common/Dlgcode.c
View File

@@ -11192,13 +11192,31 @@ void Applink (const char *dest)
if (IsAdmin ()) if (IsAdmin ())
{ {
if (buildUrl && !FileExists (url)) int openDone = 0;
if (buildUrl)
{ {
// fallbacl to online resources wchar_t pageFileName [TC_MAX_PATH] = {0};
DWORD cchUnescaped = ARRAYSIZE(pageFileName);
StringCbCopyW (pageFileName, sizeof(pageFileName), page);
/* remove escape sequences from the page name before calling FileExists function */
if (S_OK == UrlUnescapeW (pageFileName, pageFileName, &cchUnescaped, URL_UNESCAPE_INPLACE))
{
std::wstring pageFullPath = installDir;
pageFullPath += L"docs\\html\\en\\";
pageFullPath += pageFileName;
if (!FileExists (pageFullPath.c_str()))
{
// fallback to online resources
StringCbPrintfW (url, sizeof (url), L"https://www.veracrypt.fr/en/%s", page); StringCbPrintfW (url, sizeof (url), L"https://www.veracrypt.fr/en/%s", page);
SafeOpenURL (url); SafeOpenURL (url);
openDone = 1;
} }
else }
}
if (!openDone)
{ {
SafeOpenURL (url); SafeOpenURL (url);
} }
@@ -11209,7 +11227,7 @@ void Applink (const char *dest)
if (((r == ERROR_FILE_NOT_FOUND) || (r == ERROR_PATH_NOT_FOUND)) && buildUrl) if (((r == ERROR_FILE_NOT_FOUND) || (r == ERROR_PATH_NOT_FOUND)) && buildUrl)
{ {
// fallbacl to online resources // fallback to online resources
StringCbPrintfW (url, sizeof (url), L"https://www.veracrypt.fr/en/%s", page); StringCbPrintfW (url, sizeof (url), L"https://www.veracrypt.fr/en/%s", page);
ShellExecuteW (NULL, L"open", url, NULL, NULL, SW_SHOWNORMAL); ShellExecuteW (NULL, L"open", url, NULL, NULL, SW_SHOWNORMAL);
} }