Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-12-28 01:29:44 -06:00
Code Activity

Windows: Fix MSI not installing all new documentation file. Remove old files left from old versions. Increment version to 1.26.15.

Browse Source
This commit is contained in:
Mounir IDRASSI
2024-09-01 17:20:01 +02:00
parent 61fe6cc82f
commit 71dc18aaa2
83 changed files with 1114 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Setup/MacOSX/veracrypt.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.26.14</string>
<string>1.26.15</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@@ -1025,7 +1025,7 @@ https://osxfuse.github.io/
</dict>
</array>
<key>NAME</key>
<string>VeraCrypt 1.26.14</string>
<string>VeraCrypt 1.26.15</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

2
src/Setup/MacOSX/veracrypt_Legacy.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.26.14</string>
<string>1.26.15</string>
</dict>
<key>TYPE</key>
<integer>0</integer>

4
src/Setup/MacOSX/veracrypt_fuse-t.pkgproj
View File

@@ -557,7 +557,7 @@
<key>USE_HFS+_COMPRESSION</key>
<false/>
<key>VERSION</key>
<string>1.26.14</string>
<string>1.26.15</string>
</dict>
<key>TYPE</key>
<integer>0</integer>
@@ -1024,7 +1024,7 @@ https://github.com/macos-fuse-t/fuse-t/releases
</dict>
</array>
<key>NAME</key>
<string>VeraCrypt 1.26.14</string>
<string>VeraCrypt 1.26.15</string>
<key>PAYLOAD_ONLY</key>
<false/>
<key>TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING</key>

8
src/Setup/Portable.rc
View File

@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,14,0
PRODUCTVERSION 1,26,14,0
FILEVERSION 1,26,15,0
PRODUCTVERSION 1,26,15,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -44,11 +44,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Portable"
VALUE "FileVersion", "1.26.14"
VALUE "FileVersion", "1.26.15"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Portable.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.14"
VALUE "ProductVersion", "1.26.15"
END
END
BLOCK "VarFileInfo"

38
src/Setup/Setup.c
View File

@@ -2016,6 +2016,37 @@ error:
return bOK;
}
void RemoveLegacyFiles (wchar_t *szDestDir)
{
const wchar_t* oldFileNames[] = {
L"docs\\html\\en\\BCH_Logo_48x30.png",
L"docs\\html\\en\\LinuxPrepAndBuild.sh",
L"docs\\html\\en\\LinuxPrepAndBuild.zip",
L"docs\\html\\en\\RIPEMD-160.html",
L"docs\\html\\en\\ru\\BCH_Logo_48x30.png",
L"Languages\\Language.ru - Copy.xml",
};
wchar_t szDir[TC_MAX_PATH];
wchar_t oldPath[TC_MAX_PATH];
BOOL bSlash;
size_t x, i;
StringCbCopyW (szDir, sizeof(szDir), szDestDir);
x = wcslen (szDestDir);
if (szDestDir[x - 1] == L'\\')
bSlash = TRUE;
else
bSlash = FALSE;
if (bSlash == FALSE)
StringCbCatW (szDir, sizeof(szDir), L"\\");
for (i = 0; i < ARRAYSIZE(oldFileNames); i++)
{
StringCbPrintfW (oldPath, sizeof(oldPath), L"%s%s", szDestDir, oldFileNames[i]);
StatDeleteFile (oldPath, FALSE);
}
}
void OutcomePrompt (HWND hwndDlg, BOOL bOK)
{
@@ -2199,7 +2230,6 @@ void DoInstall (void *arg)
HWND hwndDlg = (HWND) arg;
BOOL bOK = TRUE;
wchar_t path[MAX_PATH];
BootEncryption bootEnc (hwndDlg);
// Refresh the main GUI (wizard thread)
@@ -2343,6 +2373,12 @@ void DoInstall (void *arg)
bRestartRequired = TRUE; // Restart is required to apply the new memory protection settings
}
if (bOK && bUpgrade)
{
// delete legacy files
RemoveLegacyFiles (InstallationPath);
}
if (bOK)
{
UpdateProgressBarProc(100);

8
src/Setup/Setup.rc
View File

@@ -28,8 +28,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,26,14,0
PRODUCTVERSION 1,26,14,0
FILEVERSION 1,26,15,0
PRODUCTVERSION 1,26,15,0
FILEFLAGSMASK 0x17L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -46,11 +46,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Setup"
VALUE "FileVersion", "1.26.14"
VALUE "FileVersion", "1.26.15"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Setup.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.14"
VALUE "ProductVersion", "1.26.15"
END
END
BLOCK "VarFileInfo"