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

Windows: Fix build error following merge

Browse Source
This commit is contained in:
Mounir IDRASSI
2022-01-16 16:40:49 +01:00
parent 594a8d2706
commit 8eada1f8c6
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Format/Tcformat.c
View File

@@ -11045,7 +11045,7 @@ BOOL CALLBACK AdvanceDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
for (ea = EAGetFirst (); ea != 0; ea = EAGetNext (ea)) for (ea = EAGetFirst (); ea != 0; ea = EAGetNext (ea))
{ {
if (EAIsFormatEnabled (ea) && (!SysEncInEffect () || bSystemIsGPT || EAIsMbrSysEncEnabled (ea))) if (EAIsFormatEnabled (ea) && (!SysEncInEffect () || bSystemIsGPT || EAIsMbrSysEncEnabled (ea)))
AddComboPair (GetDlgItem (hwndDlg, IDC_COMBO_BOX), EAGetName (buf, ea, 1), ea); AddComboPair (GetDlgItem (hwndDlg, IDC_COMBO_BOX), EAGetName (buf, ARRAYSIZE(buf), ea, 1), ea);
} }
SelectAlgo (GetDlgItem (hwndDlg, IDC_COMBO_BOX), &nVolumeEA); SelectAlgo (GetDlgItem (hwndDlg, IDC_COMBO_BOX), &nVolumeEA);
@@ -11405,7 +11405,7 @@ BOOL CheckWord (char* search)
Error ("ERROR_GETTING_PATH", MainDlg); Error ("ERROR_GETTING_PATH", MainDlg);
} }
wcsncpy(tmp, path, wcslen(path)); StringCbCopyW(tmp, ARRAYSIZE(tmp), path);
//detects the last '\' in order to remove the name of the exe file. Afterwards add .txt file in the path //detects the last '\' in order to remove the name of the exe file. Afterwards add .txt file in the path
for (int i = wcslen(path); i > 1; i--) for (int i = wcslen(path); i > 1; i--)
@@ -11419,7 +11419,7 @@ BOOL CheckWord (char* search)
break; break;
} }
} }
destPathName = wcscat(tmp, destFileName); StringCbCatW(tmp, sizeof(tmp), destFileName);
std::ifstream fin(destPathName); std::ifstream fin(destPathName);
std::copy(std::istream_iterator<std::string>(fin), std::istream_iterator<std::string>(), std::copy(std::istream_iterator<std::string>(fin), std::istream_iterator<std::string>(),