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 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

BIN
src/Boot/Windows/Release/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_AES/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_Camellia/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_Serpent/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_Twofish/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_AES/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz
View File

Binary file not shown.

BIN
src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz
View File

Binary file not shown.

4
src/Build/CMakeLists.txt
View File

@@ -11,8 +11,8 @@ elseif ( NOT DEFINED NOGUI )
endif()
# - Set version of the package
set( FULL_VERSION "1.26.14" )
set( VERSION "1.26.14" )
set( FULL_VERSION "1.26.15" )
set( VERSION "1.26.15" )
set( RELEASE "1" )
# - Set PROJECT_NAME and CONFLICT_PACKAGE values

8
src/COMReg/COMReg.rc
View File

@@ -27,8 +27,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
@@ -45,11 +45,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt COMReg"
VALUE "FileVersion", "1.26.14"
VALUE "FileVersion", "1.26.15"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt COMReg.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.14"
VALUE "ProductVersion", "1.26.15"
END
END
BLOCK "VarFileInfo"

6
src/Common/Tcdefs.h
View File

@@ -59,7 +59,7 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define TC_APP_NAME "VeraCrypt"
// Version displayed to user
#define VERSION_STRING "1.26.14"
#define VERSION_STRING "1.26.15"
#ifdef VC_EFI_CUSTOM_MODE
#define VERSION_STRING_SUFFIX "-CustomEFI"
@@ -73,9 +73,9 @@ extern unsigned short _rotl16(unsigned short value, unsigned char shift);
#define VERSION_NUM 0x0126
// Release date
#define TC_STR_RELEASE_DATE L"August 25, 2024"
#define TC_STR_RELEASE_DATE L"September 2, 2024"
#define TC_RELEASE_DATE_YEAR 2024
#define TC_RELEASE_DATE_MONTH 8
#define TC_RELEASE_DATE_MONTH 9
#define BYTES_PER_KB 1024LL
#define BYTES_PER_MB 1048576LL

8
src/ExpandVolume/ExpandVolume.rc
View File

@@ -192,8 +192,8 @@ IDR_MOUNT_RSRC_HEADER HEADER "resource.h"
//
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
@@ -210,11 +210,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt Expander"
VALUE "FileVersion", "1.26.14"
VALUE "FileVersion", "1.26.15"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptExpander.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.14"
VALUE "ProductVersion", "1.26.15"
END
END
BLOCK "VarFileInfo"

8
src/Format/Format.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 Format"
VALUE "FileVersion", "1.26.14"
VALUE "FileVersion", "1.26.15"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt Format.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.14"
VALUE "ProductVersion", "1.26.15"
END
END
BLOCK "VarFileInfo"

8
src/Mount/Mount.rc
View File

@@ -560,8 +560,8 @@ END
//
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
@@ -578,11 +578,11 @@ BEGIN
BEGIN
VALUE "CompanyName", "IDRIX"
VALUE "FileDescription", "VeraCrypt"
VALUE "FileVersion", "1.26.14"
VALUE "FileVersion", "1.26.15"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCrypt.exe"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.14"
VALUE "ProductVersion", "1.26.15"
END
END
BLOCK "VarFileInfo"

1041
src/Release/Setup Files/Product64.wxs
View File

File diff suppressed because it is too large Load Diff

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"

44
src/SetupDLL/Setup.c
View File

@@ -2336,6 +2336,38 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostInstall(MSIHANDLE hInstaller)
UINT uiRet = ERROR_INSTALL_FAILURE;
BOOL bOK = TRUE;
WCHAR szCurrentDir[MAX_PATH];
const wchar_t* oldFileNames[] = {
L"docs\\html\\en\\AddNewSystemVar.jpg",
L"docs\\html\\en\\CertificateCannotBeVerified.jpg",
L"docs\\html\\en\\CertVerifyFails.jpg",
L"docs\\html\\en\\DistributionPackageDamaged.jpg",
L"docs\\html\\en\\DownloadVS2010.jpg",
L"docs\\html\\en\\DownloadVS2019.jpg",
L"docs\\html\\en\\DownloadVSBuildTools.jpg",
L"docs\\html\\en\\gzipCommandLine.jpg",
L"docs\\html\\en\\NasmCommandLine.jpg",
L"docs\\html\\en\\RegeditPermissions-1.jpg",
L"docs\\html\\en\\RegeditPermissions-2.jpg",
L"docs\\html\\en\\RegeditPermissions-3.jpg",
L"docs\\html\\en\\RegeditPermissions-4.jpg",
L"docs\\html\\en\\SelectAdvancedSystemSettings.jpg",
L"docs\\html\\en\\SelectEnvironmentVariables.jpg",
L"docs\\html\\en\\SelectPathVariable.jpg",
L"docs\\html\\en\\SelectThisPC.jpg",
L"docs\\html\\en\\upxCommandLine.jpg",
L"docs\\html\\en\\VS2010BuildSolution.jpg",
L"docs\\html\\en\\VS2010Win32Config.jpg",
L"docs\\html\\en\\VS2010X64Config.jpg",
L"docs\\html\\en\\VS2019ARM64Config.jpg",
L"docs\\html\\en\\VS2019BuildSolution.jpg",
L"docs\\html\\en\\YasmCommandLine.jpg",
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",
};
MSILog(hInstaller, MSI_INFO_LEVEL, L"Begin VC_CustomAction_PostInstall");
@@ -2446,6 +2478,7 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostInstall(MSIHANDLE hInstaller)
WIN32_FIND_DATA f;
HANDLE h;
wchar_t szTmp[TC_MAX_PATH];
size_t i;
// delete "VeraCrypt Setup.exe" if it exists
StringCbPrintfW (szTmp, sizeof(szTmp), L"%s%s", szInstallDir.c_str(), L"VeraCrypt Setup.exe");
@@ -2454,6 +2487,16 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostInstall(MSIHANDLE hInstaller)
ForceDeleteFile(szTmp);
}
// delete files wrongly installed by previous versions in installation folder
for (i = 0; i < ARRAYSIZE(oldFileNames); i++)
{
StringCbPrintfW (szTmp, sizeof(szTmp), L"%s%s", szInstallDir.c_str(), oldFileNames[i]);
if (FileExists(szTmp))
{
ForceDeleteFile(szTmp);
}
}
StringCbPrintfW (szTmp, sizeof(szTmp), L"%s%s", szInstallDir.c_str(), L"VeraCrypt.exe");
if (Is64BitOs ())
@@ -3153,6 +3196,7 @@ EXTERN_C UINT STDAPICALLTYPE VC_CustomAction_PostUninstall(MSIHANDLE hInstaller)
EnableWow64FsRedirection (TRUE);
}
}
if (bSystemRestore && !bTempSkipSysRestore)

8
src/SetupDLL/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", "VeraCryptSetup"
VALUE "FileVersion", "1.26.14"
VALUE "FileVersion", "1.26.15"
VALUE "LegalTrademarks", "VeraCrypt"
VALUE "OriginalFilename", "VeraCryptSetup.dll"
VALUE "ProductName", "VeraCrypt"
VALUE "ProductVersion", "1.26.14"
VALUE "ProductVersion", "1.26.15"
END
END
BLOCK "VarFileInfo"

4
src/Signing/sign.bat
View File

@@ -1,7 +1,7 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86
set VC_VERSION=1.26.14
set VC_VERSION_NBRE=1.26.14
set VC_VERSION=1.26.15
set VC_VERSION_NBRE=1.26.15
set SIGNINGPATH=%~dp0
cd %SIGNINGPATH%

4
src/Signing/sign_TESTSIGNING.bat
View File

@@ -1,7 +1,7 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
set VC_VERSION=1.26.14
set VC_VERSION_NBRE=1.26.14
set VC_VERSION=1.26.15
set VC_VERSION_NBRE=1.26.15
set SIGNINGPATH=%~dp0
cd %SIGNINGPATH%

4
src/Signing/sign_test.bat
View File

@@ -1,6 +1,6 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
set VC_VERSION=1.26.14
set VC_VERSION_NBRE=1.26.14
set VC_VERSION=1.26.15
set VC_VERSION_NBRE=1.26.15
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt

4
src/Signing/sign_test_debug.bat
View File

@@ -1,6 +1,6 @@
PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
set VC_VERSION=1.26.14
set VC_VERSION_NBRE=1.26.14
set VC_VERSION=1.26.15
set VC_VERSION_NBRE=1.26.15
set PFXNAME=TestCertificate\idrix_codeSign.pfx
set PFXPASSWORD=idrix
set PFXCA=TestCertificate\idrix_TestRootCA.crt