From 71dc18aaa2a57531c95465dbab302987d6562e76 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 1 Sep 2024 17:20:01 +0200 Subject: Windows: Fix MSI not installing all new documentation file. Remove old files left from old versions. Increment version to 1.26.15. --- src/Boot/Windows/Release/BootLoader.com.gz | Bin 17432 -> 17432 bytes src/Boot/Windows/Release_AES/BootLoader.com.gz | Bin 11667 -> 11664 bytes .../Windows/Release_AES_SHA2/BootLoader.com.gz | Bin 11743 -> 11743 bytes .../Windows/Release_Camellia/BootLoader.com.gz | Bin 12577 -> 12577 bytes .../Release_Camellia_SHA2/BootLoader.com.gz | Bin 12652 -> 12652 bytes src/Boot/Windows/Release_SHA2/BootLoader.com.gz | Bin 17488 -> 17488 bytes src/Boot/Windows/Release_Serpent/BootLoader.com.gz | Bin 11994 -> 11994 bytes .../Windows/Release_Serpent_SHA2/BootLoader.com.gz | Bin 12051 -> 12051 bytes src/Boot/Windows/Release_Twofish/BootLoader.com.gz | Bin 11675 -> 11675 bytes .../Windows/Release_Twofish_SHA2/BootLoader.com.gz | Bin 11723 -> 11723 bytes src/Boot/Windows/Rescue/BootLoader.com.gz | Bin 17982 -> 17982 bytes src/Boot/Windows/Rescue_AES/BootLoader.com.gz | Bin 12216 -> 12215 bytes src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz | Bin 12280 -> 12280 bytes src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz | Bin 13132 -> 13132 bytes .../Windows/Rescue_Camellia_SHA2/BootLoader.com.gz | Bin 13180 -> 13180 bytes src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz | Bin 18045 -> 18045 bytes src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz | Bin 12536 -> 12537 bytes .../Windows/Rescue_Serpent_SHA2/BootLoader.com.gz | Bin 12607 -> 12607 bytes src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz | Bin 12216 -> 12216 bytes .../Windows/Rescue_Twofish_SHA2/BootLoader.com.gz | Bin 12273 -> 12273 bytes src/Build/CMakeLists.txt | 4 +- src/COMReg/COMReg.rc | 8 +- src/Common/Tcdefs.h | 6 +- src/ExpandVolume/ExpandVolume.rc | 8 +- src/Format/Format.rc | 8 +- src/Mount/Mount.rc | 8 +- src/Release/Setup Files/Product64.wxs | 1041 ++++++++++++++++++-- src/Setup/MacOSX/veracrypt.pkgproj | 4 +- src/Setup/MacOSX/veracrypt_Legacy.pkgproj | 2 +- src/Setup/MacOSX/veracrypt_fuse-t.pkgproj | 4 +- src/Setup/Portable.rc | 8 +- src/Setup/Setup.c | 38 +- src/Setup/Setup.rc | 8 +- src/SetupDLL/Setup.c | 44 + src/SetupDLL/Setup.rc | 8 +- src/Signing/sign.bat | 4 +- src/Signing/sign_TESTSIGNING.bat | 4 +- src/Signing/sign_test.bat | 4 +- src/Signing/sign_test_debug.bat | 4 +- 39 files changed, 1067 insertions(+), 148 deletions(-) (limited to 'src') diff --git a/src/Boot/Windows/Release/BootLoader.com.gz b/src/Boot/Windows/Release/BootLoader.com.gz index fde1ac51..9bf2133e 100644 Binary files a/src/Boot/Windows/Release/BootLoader.com.gz and b/src/Boot/Windows/Release/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_AES/BootLoader.com.gz b/src/Boot/Windows/Release_AES/BootLoader.com.gz index 5322d2d1..222aa5a1 100644 Binary files a/src/Boot/Windows/Release_AES/BootLoader.com.gz and b/src/Boot/Windows/Release_AES/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz index 1428d4ec..6aebbf06 100644 Binary files a/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_AES_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Camellia/BootLoader.com.gz b/src/Boot/Windows/Release_Camellia/BootLoader.com.gz index 0ddbab54..f090cdfb 100644 Binary files a/src/Boot/Windows/Release_Camellia/BootLoader.com.gz and b/src/Boot/Windows/Release_Camellia/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz index 235eb38c..edc5e25f 100644 Binary files a/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_Camellia_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_SHA2/BootLoader.com.gz index cf45b20c..b9d83263 100644 Binary files a/src/Boot/Windows/Release_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Serpent/BootLoader.com.gz b/src/Boot/Windows/Release_Serpent/BootLoader.com.gz index 886a7520..2a9cac0b 100644 Binary files a/src/Boot/Windows/Release_Serpent/BootLoader.com.gz and b/src/Boot/Windows/Release_Serpent/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz index e7c98ced..19ab043c 100644 Binary files a/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_Serpent_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Twofish/BootLoader.com.gz b/src/Boot/Windows/Release_Twofish/BootLoader.com.gz index 6800c0a8..885190f2 100644 Binary files a/src/Boot/Windows/Release_Twofish/BootLoader.com.gz and b/src/Boot/Windows/Release_Twofish/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz b/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz index 56117413..0090b771 100644 Binary files a/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Release_Twofish_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue/BootLoader.com.gz b/src/Boot/Windows/Rescue/BootLoader.com.gz index 2f9d851a..181b2d35 100644 Binary files a/src/Boot/Windows/Rescue/BootLoader.com.gz and b/src/Boot/Windows/Rescue/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_AES/BootLoader.com.gz b/src/Boot/Windows/Rescue_AES/BootLoader.com.gz index 9cf80498..5114925b 100644 Binary files a/src/Boot/Windows/Rescue_AES/BootLoader.com.gz and b/src/Boot/Windows/Rescue_AES/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz index c70ba4ae..52382753 100644 Binary files a/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_AES_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz b/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz index 0bdf5138..60d7d41a 100644 Binary files a/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Camellia/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz index 06541034..f2a0fc22 100644 Binary files a/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Camellia_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz index 619a9a02..47e8283a 100644 Binary files a/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz b/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz index a2e8f12f..c248eb6b 100644 Binary files a/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Serpent/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz index 9ba4c9b7..e3e889e0 100644 Binary files a/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Serpent_SHA2/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz b/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz index bdd526dd..6525bcaa 100644 Binary files a/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Twofish/BootLoader.com.gz differ diff --git a/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz b/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz index fb2c1a71..9837e671 100644 Binary files a/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz and b/src/Boot/Windows/Rescue_Twofish_SHA2/BootLoader.com.gz differ diff --git a/src/Build/CMakeLists.txt b/src/Build/CMakeLists.txt index b630610d..ce3d372b 100644 --- a/src/Build/CMakeLists.txt +++ b/src/Build/CMakeLists.txt @@ -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 diff --git a/src/COMReg/COMReg.rc b/src/COMReg/COMReg.rc index 05d88a2e..8c16a632 100644 --- a/src/COMReg/COMReg.rc +++ b/src/COMReg/COMReg.rc @@ -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" diff --git a/src/Common/Tcdefs.h b/src/Common/Tcdefs.h index 2e394154..9c3f8be7 100644 --- a/src/Common/Tcdefs.h +++ b/src/Common/Tcdefs.h @@ -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 diff --git a/src/ExpandVolume/ExpandVolume.rc b/src/ExpandVolume/ExpandVolume.rc index 39cba761..69c77dc4 100644 --- a/src/ExpandVolume/ExpandVolume.rc +++ b/src/ExpandVolume/ExpandVolume.rc @@ -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" diff --git a/src/Format/Format.rc b/src/Format/Format.rc index b4e2bf4c..c988a811 100644 --- a/src/Format/Format.rc +++ b/src/Format/Format.rc @@ -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" diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc index ed3abd7f..9953469e 100644 --- a/src/Mount/Mount.rc +++ b/src/Mount/Mount.rc @@ -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" diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs index b3fff237..c869c959 100644 --- a/src/Release/Setup Files/Product64.wxs +++ b/src/Release/Setup Files/Product64.wxs @@ -4,7 +4,7 @@ - + @@ -12,7 +12,7 @@ - + @@ -221,7 +221,15 @@ - + + + + + + + + + @@ -301,6 +309,9 @@ + + + @@ -331,6 +342,9 @@ + + + @@ -355,6 +369,9 @@ + + + @@ -453,10 +470,13 @@ + + + - + @@ -561,78 +581,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -642,6 +590,9 @@ + + + @@ -699,6 +650,12 @@ + + + + + + @@ -714,6 +671,9 @@ + + + @@ -864,6 +824,9 @@ + + + @@ -1038,6 +1001,12 @@ + + + + + + @@ -1065,6 +1034,666 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1271,6 +1900,7 @@ + @@ -1281,6 +1911,7 @@ + @@ -1289,6 +1920,7 @@ + @@ -1320,14 +1952,16 @@ + + - + @@ -1362,33 +1996,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1408,11 +2019,14 @@ + + + @@ -1463,6 +2077,7 @@ + @@ -1521,6 +2136,8 @@ + + @@ -1530,6 +2147,228 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + USE_HFS+_COMPRESSION VERSION - 1.26.14 + 1.26.15 TYPE 0 @@ -1025,7 +1025,7 @@ https://osxfuse.github.io/ NAME - VeraCrypt 1.26.14 + VeraCrypt 1.26.15 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj index 6032b125..0c7d16cb 100755 --- a/src/Setup/MacOSX/veracrypt_Legacy.pkgproj +++ b/src/Setup/MacOSX/veracrypt_Legacy.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.26.14 + 1.26.15 TYPE 0 diff --git a/src/Setup/MacOSX/veracrypt_fuse-t.pkgproj b/src/Setup/MacOSX/veracrypt_fuse-t.pkgproj index 93bd3321..fb349daf 100755 --- a/src/Setup/MacOSX/veracrypt_fuse-t.pkgproj +++ b/src/Setup/MacOSX/veracrypt_fuse-t.pkgproj @@ -557,7 +557,7 @@ USE_HFS+_COMPRESSION VERSION - 1.26.14 + 1.26.15 TYPE 0 @@ -1024,7 +1024,7 @@ https://github.com/macos-fuse-t/fuse-t/releases NAME - VeraCrypt 1.26.14 + VeraCrypt 1.26.15 PAYLOAD_ONLY TREAT_MISSING_PRESENTATION_DOCUMENTS_AS_WARNING diff --git a/src/Setup/Portable.rc b/src/Setup/Portable.rc index 9f125fd7..f62e9da0 100644 --- a/src/Setup/Portable.rc +++ b/src/Setup/Portable.rc @@ -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" diff --git a/src/Setup/Setup.c b/src/Setup/Setup.c index dc8c8ccc..43ea971b 100644 --- a/src/Setup/Setup.c +++ b/src/Setup/Setup.c @@ -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); diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index e2f55ff8..a0e59660 100644 --- a/src/Setup/Setup.rc +++ b/src/Setup/Setup.rc @@ -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" diff --git a/src/SetupDLL/Setup.c b/src/SetupDLL/Setup.c index e5c3337f..00d64766 100644 --- a/src/SetupDLL/Setup.c +++ b/src/SetupDLL/Setup.c @@ -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) diff --git a/src/SetupDLL/Setup.rc b/src/SetupDLL/Setup.rc index 0f8f0685..5d260186 100644 --- a/src/SetupDLL/Setup.rc +++ b/src/SetupDLL/Setup.rc @@ -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" diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat index 46a562ed..7205849d 100644 --- a/src/Signing/sign.bat +++ b/src/Signing/sign.bat @@ -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% diff --git a/src/Signing/sign_TESTSIGNING.bat b/src/Signing/sign_TESTSIGNING.bat index e9c9f9f0..ac8d8390 100644 --- a/src/Signing/sign_TESTSIGNING.bat +++ b/src/Signing/sign_TESTSIGNING.bat @@ -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% diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat index 9c6bfd9b..c3e89a9f 100644 --- a/src/Signing/sign_test.bat +++ b/src/Signing/sign_test.bat @@ -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 diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat index 6d1b187e..fa701681 100644 --- a/src/Signing/sign_test_debug.bat +++ b/src/Signing/sign_test_debug.bat @@ -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 -- cgit v1.2.3